| Message ID | 20230310101715.69209-1-slark_xiao@163.com |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp792802wrd;
Fri, 10 Mar 2023 02:33:23 -0800 (PST)
X-Google-Smtp-Source:
AK7set/CXGa9WccIU/GERf219ylK74aWOPFaFiBaKsH+LHnuURaVMpYC+LTfg4epOvEszEg+a3nK
X-Received: by 2002:a62:3285:0:b0:5cd:229e:f1d8 with SMTP id
y127-20020a623285000000b005cd229ef1d8mr16853250pfy.4.1678444403115;
Fri, 10 Mar 2023 02:33:23 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1678444403; cv=none;
d=google.com; s=arc-20160816;
b=VaZsbSBNL31W2hS1BQsQq+3j86ObmpqizK91CXxgZ2myEOSx7Jd47pcKS3eXe8bGO7
2WCmCjvqDWjpotIJU83gUwBZEZ+ztMHSDKf8Q7gW9t7rm7vDTZj8+iC3EW8hyW8fOkkH
XU1tnRXOdfqoDbGmyMRxinUcOGj9ivROkQZb0HdMrBx8oJFMbkgMwQhiPVruRV+96+eG
kBmiY3vsiLj8kaw7FjVbBjTO5rivhWqJYpG61AxCdiOgeZaF5tQHZnPFLo0sqEw8UkZ4
BxqdtSg1VvK1SsrxZxL7TyFggxWJY4b224zsigTDg0j+RGhc+lEAtcovGWPQaRaavbBj
gFPA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:message-id:date:subject:cc:to:from:dkim-signature;
bh=ovFLqx1Bf6i8X0C5fFEA/SoD0OZdlMeBnF2sAwARGF0=;
b=Nz7xUp1kCZ1E/BCRDyragIcClNKJiLlzgc6snudFuStJAd4z3eXFb6lix+gxL1g9E2
INGn7MKpPusEzh9IIRjJa5aIJIHO8+E2UJs5wB5TFzorLN84wJnAHFWsCVqWDQMCBe/U
nqA82jtTKdPu4WgyJlRijMqmakzxmsTSr368RiquUT1TATjpNWeJX1W5GJAAJ4y+PM6A
Re/NF9LUT/jiOYuY7wOeQHU5xMxW0Uy2ZOrfFPtieeTfGwMV6o2Yjxkg3BhUtAbVaG25
nry7scPkMx66/0kPmRHdoUVgWW3+vnNeCGD2Hkc0Vesomzp/ljB1dw0ClAHavmM1V7LC
UeRw==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@163.com header.s=s110527 header.b=mNG8jiFx;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
a132-20020a621a8a000000b005a8bc2293c3si1604929pfa.263.2023.03.10.02.33.10;
Fri, 10 Mar 2023 02:33:23 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@163.com header.s=s110527 header.b=mNG8jiFx;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S229928AbjCJKSD (ORCPT <rfc822;carlos.wei.hk@gmail.com>
+ 99 others); Fri, 10 Mar 2023 05:18:03 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37236 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229597AbjCJKSA (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Fri, 10 Mar 2023 05:18:00 -0500
Received: from m12.mail.163.com (m12.mail.163.com [123.126.96.234])
by lindbergh.monkeyblade.net (Postfix) with ESMTP id 8BBB19ECA;
Fri, 10 Mar 2023 02:17:57 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com;
s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=ovFLq
x1Bf6i8X0C5fFEA/SoD0OZdlMeBnF2sAwARGF0=; b=mNG8jiFxY1caMezlLiFF0
ZLt2nqH+hwf4lHRxS8nvi+94dQdbJXLvWJh/e+1AaT7nc3L4l0Kco2cY5uLWLhWy
SYLaT1+7OucUlzPDk0yWloHeQJMHy3RXSQCSHNTn8157sqmGi80Z0mKKOklxvpzm
H08jT0/CXcSIrvM+KOOx3k=
Received: from jbd-ThinkPad-X1-Nano-Gen-1.. (unknown [223.104.68.74])
by smtp16 (Coremail) with SMTP id MNxpCgCnkUfmAwtkDRU7HA--.61346S2;
Fri, 10 Mar 2023 18:18:16 +0800 (CST)
From: Slark Xiao <slark_xiao@163.com>
To: mani@kernel.org, loic.poulain@linaro.org, fabio.porcedda@gmail.com
Cc: mhi@lists.linux.dev, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org, Slark Xiao <slark_xiao@163.com>
Subject: [PATCH] bus: mhi: host: pci_generic: Revert "Add a secondary AT port
to Telit FN990"
Date: Fri, 10 Mar 2023 18:17:15 +0800
Message-Id: <20230310101715.69209-1-slark_xiao@163.com>
X-Mailer: git-send-email 2.34.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-CM-TRANSID: MNxpCgCnkUfmAwtkDRU7HA--.61346S2
X-Coremail-Antispam: 1Uf129KBjvdXoW7Xry8Ww1fGF4kKrWfWryUKFg_yoWktrg_Ca
n2grn7G3yxXr98Zr4Iq3WkZrWjya45X3WDA3WxtrnYq3srt3srWrs0qFZYvrna9a9xCrZr
Cw45XrW7Ar12kjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT
9fnUUvcSsGvfC2KfnxnUUI43ZEXa7sRRPl15UUUUU==
X-Originating-IP: [223.104.68.74]
X-CM-SenderInfo: xvod2y5b0lt0i6rwjhhfrp/1tbivxQuZFWB32rMRgAAsK
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,
RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham
autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1759976518264969246?=
X-GMAIL-MSGID: =?utf-8?q?1759976518264969246?=
|
| Series |
bus: mhi: host: pci_generic: Revert "Add a secondary AT port to Telit FN990"
|
|
Commit Message
Slark Xiao
March 10, 2023, 10:17 a.m. UTC
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(-)
Comments
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), };