[PATCH v3] PCI: mediatek: Configure FC and FTS for functions other than 0

[PATCH v3] PCI: mediatek: Configure FC and FTS for functions other than 0

[Ryder Lee]

PCI_FUNC(port->slot << 3)" is always 0, so previously
mtk_pcie_startup_port() only configured FC credits and FTs for
function 0.

Compute "func" correctly so we also configure functions other than
0. This affects MT2701 and MT7623.

Addresses-Coverity-ID: 1437218 ("Wrong operator used")
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
---
v2 & v3 - update commit log
---
 drivers/pci/controller/pcie-mediatek.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c
index cf4c18f0c25a..1980b01cee35 100644
--- a/drivers/pci/controller/pcie-mediatek.c
+++ b/drivers/pci/controller/pcie-mediatek.c
@@ -760,7 +760,7 @@ static struct pci_ops mtk_pcie_ops = {
 static int mtk_pcie_startup_port(struct mtk_pcie_port *port)
 {
 	struct mtk_pcie *pcie = port->pcie;
-	u32 func = PCI_FUNC(port->slot << 3);
+	u32 func = PCI_FUNC(port->slot);
 	u32 slot = PCI_SLOT(port->slot << 3);
 	u32 val;
 	int err;
-- 
2.18.0

Re: [PATCH v3] PCI: mediatek: Configure FC and FTS for functions other than 0

[Frank Wunderlich]

How can i verify (triggering bug without patch)?
regards Frank

Re: [PATCH v3] PCI: mediatek: Configure FC and FTS for functions other than 0

[Krzysztof Wilczyński]

[+cc Lorenzo for visiblity]

Hi,

Thank you for taking care of this!

[...]
> PCI_FUNC(port->slot << 3)" is always 0, so previously
> mtk_pcie_startup_port() only configured FC credits and FTs for
> function 0.
[...]

A small nit.  The commit message is missing the opening quote, see
Bjorn's suggestion:

  https://lore.kernel.org/linux-pci/20201104131054.GA307984@bjorn-Precision-5520/

But, it's probably not worth sending another patch, and perhaps either
Bjorn or Lorenzo could fix this when applying changes.

Reviewed-by: Krzysztof Wilczyński <kw@linux.com>

Krzysztof

Re: [PATCH v3] PCI: mediatek: Configure FC and FTS for functions other than 0

[Lorenzo Pieralisi]

On Sun, Feb 21, 2021 at 08:29:02PM +0100, Krzysztof Wilczyński wrote:
> [+cc Lorenzo for visiblity]
> 
> Hi,
> 
> Thank you for taking care of this!
> 
> [...]
> > PCI_FUNC(port->slot << 3)" is always 0, so previously
> > mtk_pcie_startup_port() only configured FC credits and FTs for
> > function 0.
> [...]
> 
> A small nit.  The commit message is missing the opening quote, see
> Bjorn's suggestion:
> 
>   https://lore.kernel.org/linux-pci/20201104131054.GA307984@bjorn-Precision-5520/
> 
> But, it's probably not worth sending another patch, and perhaps either
> Bjorn or Lorenzo could fix this when applying changes.
> 
> Reviewed-by: Krzysztof Wilczyński <kw@linux.com>

Thanks, I will do. Can I apply it or there are still pending review
comments to address ?

Lorenzo

Re: [PATCH v3] PCI: mediatek: Configure FC and FTS for functions other than 0

[Krzysztof Wilczyński]

Hi Lorenzo,

[...]
> > A small nit.  The commit message is missing the opening quote, see
> > Bjorn's suggestion:
> > 
> >   https://lore.kernel.org/linux-pci/20201104131054.GA307984@bjorn-Precision-5520/
> > 
> > But, it's probably not worth sending another patch, and perhaps either
> > Bjorn or Lorenzo could fix this when applying changes.
> > 
> > Reviewed-by: Krzysztof Wilczyński <kw@linux.com>
> 
> Thanks, I will do. Can I apply it or there are still pending review
> comments to address ?

Nothing from me, so it's good to go, I'd say.  Thank you!

Krzysztof

Re: [PATCH v3] PCI: mediatek: Configure FC and FTS for functions other than 0

[Lorenzo Pieralisi]

On Thu, 5 Nov 2020 04:58:33 +0800, Ryder Lee wrote:
> PCI_FUNC(port->slot << 3)" is always 0, so previously
> mtk_pcie_startup_port() only configured FC credits and FTs for
> function 0.
> 
> Compute "func" correctly so we also configure functions other than
> 0. This affects MT2701 and MT7623.

Applied to pci/mediatek, thanks!

[1/1] PCI: mediatek: Configure FC and FTS for functions other than 0
      https://git.kernel.org/lpieralisi/pci/c/31ec9c2746

Thanks,
Lorenzo