Commit 3db903a8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v5.14-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI fixes from Bjorn Helgaas:

 - Add Rahul Tanwar as Intel LGM Gateway PCIe maintainer (Rahul Tanwar)

 - Add Jim Quinlan et al as Broadcom STB PCIe maintainers (Jim Quinlan)

 - Increase D3hot-to-D0 delay for AMD Renoir/Cezanne XHCI (Marcin
   Bachry)

 - Correct iomem_get_mapping() usage for legacy_mem sysfs (Krzysztof
   Wilczyński)

* tag 'pci-v5.14-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI/sysfs: Use correct variable for the legacy_mem sysfs object
  PCI: Increase D3 delay for AMD Renoir/Cezanne XHCI
  MAINTAINERS: Add Jim Quinlan et al as Broadcom STB PCIe maintainers
  MAINTAINERS: Add Rahul Tanwar as Intel LGM Gateway PCIe maintainer
parents a27c75e5 045a9277

MAINTAINERS

+17 −0
Original line number Diff line number Diff line
@@ -3866,6 +3866,16 @@ L: bcm-kernel-feedback-list@broadcom.com 
S:	Maintained

F:	drivers/mtd/nand/raw/brcmnand/









BROADCOM STB PCIE DRIVER









M:	Jim Quinlan <jim2101024@gmail.com>









M:	Nicolas Saenz Julienne <nsaenz@kernel.org>









M:	Florian Fainelli <f.fainelli@gmail.com>









M:	bcm-kernel-feedback-list@broadcom.com









L:	linux-pci@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml









F:	drivers/pci/controller/pcie-brcmstb.c

















BROADCOM SYSTEMPORT ETHERNET DRIVER









M:	Florian Fainelli <f.fainelli@gmail.com>









L:	bcm-kernel-feedback-list@broadcom.com








@@ -14430,6 +14440,13 @@ S:	Maintained







F:	Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt









F:	drivers/pci/controller/dwc/pcie-histb.c

















PCIE DRIVER FOR INTEL LGM GW SOC









M:	Rahul Tanwar <rtanwar@maxlinear.com>









L:	linux-pci@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/pci/intel-gw-pcie.yaml









F:	drivers/pci/controller/dwc/pcie-intel-gw.c

















PCIE DRIVER FOR MEDIATEK









M:	Ryder Lee <ryder.lee@mediatek.com>









M:	Jianjun Wang <jianjun.wang@mediatek.com>
































drivers/pci/pci-sysfs.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -978,7 +978,7 @@ void pci_create_legacy_files(struct pci_bus *b)







	b->legacy_mem->size = 1024*1024;









	b->legacy_mem->attr.mode = 0600;









	b->legacy_mem->mmap = pci_mmap_legacy_mem;









	b->legacy_io->mapping = iomem_get_mapping();









	b->legacy_mem->mapping = iomem_get_mapping();









	pci_adjust_legacy_attr(b, pci_mmap_mem);









	error = device_create_bin_file(&b->dev, b->legacy_mem);









	if (error)
































drivers/pci/quirks.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -1900,6 +1900,7 @@ static void quirk_ryzen_xhci_d3hot(struct pci_dev *dev)







}









DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x15e0, quirk_ryzen_xhci_d3hot);









DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x15e1, quirk_ryzen_xhci_d3hot);









DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1639, quirk_ryzen_xhci_d3hot);



















#ifdef CONFIG_X86_IO_APIC









static int dmi_disable_ioapicreroute(const struct dmi_system_id *d)