| Message ID | 20230310101715.69209-1-slark_xiao@163.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | bus: mhi: host: pci_generic: Revert "Add a secondary AT port to Telit FN990" | expand |
On Fri, Mar 10, 2023 at 06:17:15PM +0800, Slark Xiao wrote: > This reverts commit 2d5253a096c6057bbf7caa5520856dcdf7eca8bb. > There are 2 commits with commit message "Add a secondary AT > port to Telit FN990". But the last one 2d5253a096 was added Btw, we usually refer the commit SHA by 12 digits. Like, 2d5253a096c6. I can fix it up while applying. > on Foxconn devices. Actually the second AT port of Foxconn > devices doesn't work in PCIe mode. And the commit message > mismatch with the changes. So we need to remove it. > Sigh... the subject itself was wrong :( thanks for catching. > Signed-off-by: Slark Xiao <slark_xiao@163.com> For future Foxconn patches, please help with the review to catch issues like this. Unfortunately, I do not own any Foxconn modems :/ Reviewed-by: Manivannan Sadhasivam <mani@kernel.org> Thanks, Mani > --- > drivers/bus/mhi/host/pci_generic.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/bus/mhi/host/pci_generic.c b/drivers/bus/mhi/host/pci_generic.c > index 6e13c43a84d1..91d02f84ba21 100644 > --- a/drivers/bus/mhi/host/pci_generic.c > +++ b/drivers/bus/mhi/host/pci_generic.c > @@ -343,8 +343,6 @@ static const struct mhi_channel_config mhi_foxconn_sdx55_channels[] = { > MHI_CHANNEL_CONFIG_DL(13, "MBIM", 32, 0), > MHI_CHANNEL_CONFIG_UL(32, "DUN", 32, 0), > MHI_CHANNEL_CONFIG_DL(33, "DUN", 32, 0), > - MHI_CHANNEL_CONFIG_UL(92, "DUN2", 32, 1), > - MHI_CHANNEL_CONFIG_DL(93, "DUN2", 32, 1), > MHI_CHANNEL_CONFIG_HW_UL(100, "IP_HW0_MBIM", 128, 2), > MHI_CHANNEL_CONFIG_HW_DL(101, "IP_HW0_MBIM", 128, 3), > }; > -- > 2.34.1 >
Il giorno ven 10 mar 2023 alle ore 11:31 Manivannan Sadhasivam <mani@kernel.org> ha scritto: > > On Fri, Mar 10, 2023 at 06:17:15PM +0800, Slark Xiao wrote: > > This reverts commit 2d5253a096c6057bbf7caa5520856dcdf7eca8bb. > > There are 2 commits with commit message "Add a secondary AT > > port to Telit FN990". But the last one 2d5253a096 was added > > Btw, we usually refer the commit SHA by 12 digits. Like, 2d5253a096c6. > I can fix it up while applying. > > > on Foxconn devices. Actually the second AT port of Foxconn > > devices doesn't work in PCIe mode. And the commit message > > mismatch with the changes. So we need to remove it. > > > > Sigh... the subject itself was wrong :( thanks for catching. > > > Signed-off-by: Slark Xiao <slark_xiao@163.com> > > For future Foxconn patches, please help with the review to catch issues like > this. Unfortunately, I do not own any Foxconn modems :/ > > Reviewed-by: Manivannan Sadhasivam <mani@kernel.org> Reviewed-by: Fabio Porcedda <fabio.porcedda@gmail.com> Just to clarify, the original patch change just the Telit FN990: https://lore.kernel.org/netdev/CAMZdPi8gGrbkKnDR+WLadF92shJbwH-ksQY+dbpgfZ21iAp9ug@mail.gmail.com/ The problem is caused by the fact that it was merged two times and the second time was merged wrongly. The correct one is commit 479aa3b0ec2e000ac99dd0661936d9685d6cac64 and the wrong one is 2d5253a096c6057bbf7caa5520856dcdf7eca8bb. BR Fabio > Thanks, > Mani > > > --- > > drivers/bus/mhi/host/pci_generic.c | 2 -- > > 1 file changed, 2 deletions(-) > > > > diff --git a/drivers/bus/mhi/host/pci_generic.c b/drivers/bus/mhi/host/pci_generic.c > > index 6e13c43a84d1..91d02f84ba21 100644 > > --- a/drivers/bus/mhi/host/pci_generic.c > > +++ b/drivers/bus/mhi/host/pci_generic.c > > @@ -343,8 +343,6 @@ static const struct mhi_channel_config mhi_foxconn_sdx55_channels[] = { > > MHI_CHANNEL_CONFIG_DL(13, "MBIM", 32, 0), > > MHI_CHANNEL_CONFIG_UL(32, "DUN", 32, 0), > > MHI_CHANNEL_CONFIG_DL(33, "DUN", 32, 0), > > - MHI_CHANNEL_CONFIG_UL(92, "DUN2", 32, 1), > > - MHI_CHANNEL_CONFIG_DL(93, "DUN2", 32, 1), > > MHI_CHANNEL_CONFIG_HW_UL(100, "IP_HW0_MBIM", 128, 2), > > MHI_CHANNEL_CONFIG_HW_DL(101, "IP_HW0_MBIM", 128, 3), > > }; > > -- > > 2.34.1 > > > > -- > மணிவண்ணன் சதாசிவம்
On Fri, Mar 10, 2023 at 11:33:56AM +0100, Fabio Porcedda wrote: > Il giorno ven 10 mar 2023 alle ore 11:31 Manivannan Sadhasivam > <mani@kernel.org> ha scritto: > > > > On Fri, Mar 10, 2023 at 06:17:15PM +0800, Slark Xiao wrote: > > > This reverts commit 2d5253a096c6057bbf7caa5520856dcdf7eca8bb. > > > There are 2 commits with commit message "Add a secondary AT > > > port to Telit FN990". But the last one 2d5253a096 was added > > > > Btw, we usually refer the commit SHA by 12 digits. Like, 2d5253a096c6. > > I can fix it up while applying. > > > > > on Foxconn devices. Actually the second AT port of Foxconn > > > devices doesn't work in PCIe mode. And the commit message > > > mismatch with the changes. So we need to remove it. > > > > > > > Sigh... the subject itself was wrong :( thanks for catching. > > > > > Signed-off-by: Slark Xiao <slark_xiao@163.com> > > > > For future Foxconn patches, please help with the review to catch issues like > > this. Unfortunately, I do not own any Foxconn modems :/ > > > > Reviewed-by: Manivannan Sadhasivam <mani@kernel.org> > > Reviewed-by: Fabio Porcedda <fabio.porcedda@gmail.com> > > Just to clarify, the original patch change just the Telit FN990: > https://lore.kernel.org/netdev/CAMZdPi8gGrbkKnDR+WLadF92shJbwH-ksQY+dbpgfZ21iAp9ug@mail.gmail.com/ > > The problem is caused by the fact that it was merged two times and the > second time was merged wrongly. > The correct one is commit 479aa3b0ec2e000ac99dd0661936d9685d6cac64 and > the wrong one is 2d5253a096c6057bbf7caa5520856dcdf7eca8bb. > Ah, so the patch was merged into netdev first and then through MHI, then git ended up with a resolution :( Thanks, Mani > BR > Fabio > > > Thanks, > > Mani > > > > > --- > > > drivers/bus/mhi/host/pci_generic.c | 2 -- > > > 1 file changed, 2 deletions(-) > > > > > > diff --git a/drivers/bus/mhi/host/pci_generic.c b/drivers/bus/mhi/host/pci_generic.c > > > index 6e13c43a84d1..91d02f84ba21 100644 > > > --- a/drivers/bus/mhi/host/pci_generic.c > > > +++ b/drivers/bus/mhi/host/pci_generic.c > > > @@ -343,8 +343,6 @@ static const struct mhi_channel_config mhi_foxconn_sdx55_channels[] = { > > > MHI_CHANNEL_CONFIG_DL(13, "MBIM", 32, 0), > > > MHI_CHANNEL_CONFIG_UL(32, "DUN", 32, 0), > > > MHI_CHANNEL_CONFIG_DL(33, "DUN", 32, 0), > > > - MHI_CHANNEL_CONFIG_UL(92, "DUN2", 32, 1), > > > - MHI_CHANNEL_CONFIG_DL(93, "DUN2", 32, 1), > > > MHI_CHANNEL_CONFIG_HW_UL(100, "IP_HW0_MBIM", 128, 2), > > > MHI_CHANNEL_CONFIG_HW_DL(101, "IP_HW0_MBIM", 128, 3), > > > }; > > > -- > > > 2.34.1 > > > > > > > -- > > மணிவண்ணன் சதாசிவம் > > > > -- > Fabio Porcedda
On Fri, Mar 10, 2023 at 06:17:15PM +0800, Slark Xiao wrote: > This reverts commit 2d5253a096c6057bbf7caa5520856dcdf7eca8bb. > There are 2 commits with commit message "Add a secondary AT > port to Telit FN990". But the last one 2d5253a096 was added > on Foxconn devices. Actually the second AT port of Foxconn > devices doesn't work in PCIe mode. And the commit message > mismatch with the changes. So we need to remove it. > > Signed-off-by: Slark Xiao <slark_xiao@163.com> Applied to mhi-next after ammending the commit message to reflect the bad merge. Thanks, Mani > --- > drivers/bus/mhi/host/pci_generic.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/bus/mhi/host/pci_generic.c b/drivers/bus/mhi/host/pci_generic.c > index 6e13c43a84d1..91d02f84ba21 100644 > --- a/drivers/bus/mhi/host/pci_generic.c > +++ b/drivers/bus/mhi/host/pci_generic.c > @@ -343,8 +343,6 @@ static const struct mhi_channel_config mhi_foxconn_sdx55_channels[] = { > MHI_CHANNEL_CONFIG_DL(13, "MBIM", 32, 0), > MHI_CHANNEL_CONFIG_UL(32, "DUN", 32, 0), > MHI_CHANNEL_CONFIG_DL(33, "DUN", 32, 0), > - MHI_CHANNEL_CONFIG_UL(92, "DUN2", 32, 1), > - MHI_CHANNEL_CONFIG_DL(93, "DUN2", 32, 1), > MHI_CHANNEL_CONFIG_HW_UL(100, "IP_HW0_MBIM", 128, 2), > MHI_CHANNEL_CONFIG_HW_DL(101, "IP_HW0_MBIM", 128, 3), > }; > -- > 2.34.1 >
On 10/03/2023 12:17, Slark Xiao wrote: > This reverts commit 2d5253a096c6057bbf7caa5520856dcdf7eca8bb. > There are 2 commits with commit message "Add a secondary AT > port to Telit FN990". But the last one 2d5253a096 was added > on Foxconn devices. Actually the second AT port of Foxconn > devices doesn't work in PCIe mode. And the commit message > mismatch with the changes. So we need to remove it. > > Signed-off-by: Slark Xiao <slark_xiao@163.com> Probably also: Fixes: 2d5253a096c6 ("bus: mhi: host: pci_generic: Add a secondary AT port to Telit FN990") > --- > drivers/bus/mhi/host/pci_generic.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/bus/mhi/host/pci_generic.c b/drivers/bus/mhi/host/pci_generic.c > index 6e13c43a84d1..91d02f84ba21 100644 > --- a/drivers/bus/mhi/host/pci_generic.c > +++ b/drivers/bus/mhi/host/pci_generic.c > @@ -343,8 +343,6 @@ static const struct mhi_channel_config mhi_foxconn_sdx55_channels[] = { > MHI_CHANNEL_CONFIG_DL(13, "MBIM", 32, 0), > MHI_CHANNEL_CONFIG_UL(32, "DUN", 32, 0), > MHI_CHANNEL_CONFIG_DL(33, "DUN", 32, 0), > - MHI_CHANNEL_CONFIG_UL(92, "DUN2", 32, 1), > - MHI_CHANNEL_CONFIG_DL(93, "DUN2", 32, 1), > MHI_CHANNEL_CONFIG_HW_UL(100, "IP_HW0_MBIM", 128, 2), > MHI_CHANNEL_CONFIG_HW_DL(101, "IP_HW0_MBIM", 128, 3), > };
On Fri, Mar 10, 2023 at 02:18:23PM +0200, Dmitry Baryshkov wrote: > On 10/03/2023 12:17, Slark Xiao wrote: > > This reverts commit 2d5253a096c6057bbf7caa5520856dcdf7eca8bb. > > There are 2 commits with commit message "Add a secondary AT > > port to Telit FN990". But the last one 2d5253a096 was added > > on Foxconn devices. Actually the second AT port of Foxconn > > devices doesn't work in PCIe mode. And the commit message > > mismatch with the changes. So we need to remove it. > > > > Signed-off-by: Slark Xiao <slark_xiao@163.com> > > Probably also: > > Fixes: 2d5253a096c6 ("bus: mhi: host: pci_generic: Add a secondary AT port > to Telit FN990") > Added fixes tag and CCed stable for backporting to 6.2. Thanks, Mani > > --- > > drivers/bus/mhi/host/pci_generic.c | 2 -- > > 1 file changed, 2 deletions(-) > > > > diff --git a/drivers/bus/mhi/host/pci_generic.c b/drivers/bus/mhi/host/pci_generic.c > > index 6e13c43a84d1..91d02f84ba21 100644 > > --- a/drivers/bus/mhi/host/pci_generic.c > > +++ b/drivers/bus/mhi/host/pci_generic.c > > @@ -343,8 +343,6 @@ static const struct mhi_channel_config mhi_foxconn_sdx55_channels[] = { > > MHI_CHANNEL_CONFIG_DL(13, "MBIM", 32, 0), > > MHI_CHANNEL_CONFIG_UL(32, "DUN", 32, 0), > > MHI_CHANNEL_CONFIG_DL(33, "DUN", 32, 0), > > - MHI_CHANNEL_CONFIG_UL(92, "DUN2", 32, 1), > > - MHI_CHANNEL_CONFIG_DL(93, "DUN2", 32, 1), > > MHI_CHANNEL_CONFIG_HW_UL(100, "IP_HW0_MBIM", 128, 2), > > MHI_CHANNEL_CONFIG_HW_DL(101, "IP_HW0_MBIM", 128, 3), > > }; > > -- > With best wishes > Dmitry >
diff --git a/drivers/bus/mhi/host/pci_generic.c b/drivers/bus/mhi/host/pci_generic.c index 6e13c43a84d1..91d02f84ba21 100644 --- a/drivers/bus/mhi/host/pci_generic.c +++ b/drivers/bus/mhi/host/pci_generic.c @@ -343,8 +343,6 @@ static const struct mhi_channel_config mhi_foxconn_sdx55_channels[] = { MHI_CHANNEL_CONFIG_DL(13, "MBIM", 32, 0), MHI_CHANNEL_CONFIG_UL(32, "DUN", 32, 0), MHI_CHANNEL_CONFIG_DL(33, "DUN", 32, 0), - MHI_CHANNEL_CONFIG_UL(92, "DUN2", 32, 1), - MHI_CHANNEL_CONFIG_DL(93, "DUN2", 32, 1), MHI_CHANNEL_CONFIG_HW_UL(100, "IP_HW0_MBIM", 128, 2), MHI_CHANNEL_CONFIG_HW_DL(101, "IP_HW0_MBIM", 128, 3), };
This reverts commit 2d5253a096c6057bbf7caa5520856dcdf7eca8bb. There are 2 commits with commit message "Add a secondary AT port to Telit FN990". But the last one 2d5253a096 was added on Foxconn devices. Actually the second AT port of Foxconn devices doesn't work in PCIe mode. And the commit message mismatch with the changes. So we need to remove it. Signed-off-by: Slark Xiao <slark_xiao@163.com> --- drivers/bus/mhi/host/pci_generic.c | 2 -- 1 file changed, 2 deletions(-)