Skip to content

Commit 6779b50

Browse files
committed
Merge tag 'pci-v7.1-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
Pull PCI fixes from Bjorn Helgaas: - Remove obsolete PCIe maintainer addresses (Florian Eckert, Hans Zhang) - Restore a brcmstb link speed assignment that was inadvertently removed, reducing bcm2712 performance (Florian Fainelli) * tag 'pci-v7.1-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci: PCI: brcmstb: Assign pcie->gen from of_pci_get_max_link_speed() MAINTAINERS: Remove Jianjun Wang as PCIe mediatek maintainer MAINTAINERS: Remove Chuanhua Lei as PCIe intel-gw maintainer
2 parents 68993ce + ed831e7 commit 6779b50

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

MAINTAINERS

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20744,15 +20744,13 @@ F: Documentation/devicetree/bindings/pci/intel,keembay-pcie*
2074420744
F: drivers/pci/controller/dwc/pcie-keembay.c
2074520745

2074620746
PCIE DRIVER FOR INTEL LGM GW SOC
20747-
M: Chuanhua Lei <lchuanhua@maxlinear.com>
2074820747
L: linux-pci@vger.kernel.org
20749-
S: Maintained
20748+
S: Orphan
2075020749
F: Documentation/devicetree/bindings/pci/intel-gw-pcie.yaml
2075120750
F: drivers/pci/controller/dwc/pcie-intel-gw.c
2075220751

2075320752
PCIE DRIVER FOR MEDIATEK
2075420753
M: Ryder Lee <ryder.lee@mediatek.com>
20755-
M: Jianjun Wang <jianjun.wang@mediatek.com>
2075620754
L: linux-pci@vger.kernel.org
2075720755
L: linux-mediatek@lists.infradead.org (moderated for non-subscribers)
2075820756
S: Supported

drivers/pci/controller/pcie-brcmstb.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2072,8 +2072,10 @@ static int brcm_pcie_probe(struct platform_device *pdev)
20722072
return PTR_ERR(pcie->clk);
20732073

20742074
ret = of_pci_get_max_link_speed(np);
2075-
if (pcie_get_link_speed(ret) == PCI_SPEED_UNKNOWN)
2075+
if (ret < 0 || ret > 3)
20762076
pcie->gen = 0;
2077+
else
2078+
pcie->gen = ret;
20772079

20782080
pcie->ssc = of_property_read_bool(np, "brcm,enable-ssc");
20792081

0 commit comments

Comments
 (0)