diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-05-21 15:02:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-05-21 15:02:12 -0700 |
| commit | 6779b50faa562e6cca1aa6a4649a4d764c6c7e28 (patch) | |
| tree | c50f50098c31bb77c5078ac553bb4d531425c1a8 /drivers | |
| parent | 68993ced0f618e36cf33388f1e50223e5e6e78cc (diff) | |
| parent | ed831e7ea1a860bdbab3eadeb95f7f73e9d212df (diff) | |
| download | linux-next-6779b50faa562e6cca1aa6a4649a4d764c6c7e28.tar.gz linux-next-6779b50faa562e6cca1aa6a4649a4d764c6c7e28.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/controller/pcie-brcmstb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index 714bcab97b60..08a0e7091ced 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -2072,8 +2072,10 @@ static int brcm_pcie_probe(struct platform_device *pdev) return PTR_ERR(pcie->clk); ret = of_pci_get_max_link_speed(np); - if (pcie_get_link_speed(ret) == PCI_SPEED_UNKNOWN) + if (ret < 0 || ret > 3) pcie->gen = 0; + else + pcie->gen = ret; pcie->ssc = of_property_read_bool(np, "brcm,enable-ssc"); |