Commit 25b1fa8d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull PCI fixes from Bjorn Helgaas:

 - Workaround Apex TPU class code issue that prevents resource
   assignment (Bjorn Helgaas)

 - Update MAINTAINERS to add Rob Herring for native PCI controller
   drivers (Lorenzo Pieralisi)

* tag 'pci-v5.7-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  MAINTAINERS: Add Rob Herring and remove Andy Murray as PCI reviewers
  PCI: Move Apex Edge TPU class quirk to fix BAR assignment
parents 7adc4b39 ef46738c

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -13050,7 +13050,7 @@ F: drivers/pci/controller/pci-xgene-msi.c 








PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS









M:	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>









R:	Andrew Murray <amurray@thegoodpenguin.co.uk>









R:	Rob Herring <robh@kernel.org>









L:	linux-pci@vger.kernel.org









S:	Supported









Q:	http://patchwork.ozlabs.org/project/linux-pci/list/
































drivers/pci/quirks.c



+7
−0






























Original line number
Diff line number
Diff line







@@ -5567,3 +5567,10 @@ static void pci_fixup_no_d0_pme(struct pci_dev *dev)







	dev->pme_support &= ~(PCI_PM_CAP_PME_D0 >> PCI_PM_CAP_PME_SHIFT);









}









DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ASMEDIA, 0x2142, pci_fixup_no_d0_pme);



















static void apex_pci_fixup_class(struct pci_dev *pdev)









{









	pdev->class = (PCI_CLASS_SYSTEM_OTHER << 8) | pdev->class;









}









DECLARE_PCI_FIXUP_CLASS_HEADER(0x1ac1, 0x089a,









			       PCI_CLASS_NOT_DEFINED, 8, apex_pci_fixup_class);
























drivers/staging/gasket/apex_driver.c



+0
−7






























Original line number
Diff line number
Diff line







@@ -570,13 +570,6 @@ static const struct pci_device_id apex_pci_ids[] = {







	{ PCI_DEVICE(APEX_PCI_VENDOR_ID, APEX_PCI_DEVICE_ID) }, { 0 }









};



















static void apex_pci_fixup_class(struct pci_dev *pdev)









{









	pdev->class = (PCI_CLASS_SYSTEM_OTHER << 8) | pdev->class;









}









DECLARE_PCI_FIXUP_CLASS_HEADER(APEX_PCI_VENDOR_ID, APEX_PCI_DEVICE_ID,









			       PCI_CLASS_NOT_DEFINED, 8, apex_pci_fixup_class);



















static int apex_pci_probe(struct pci_dev *pci_dev,









			  const struct pci_device_id *id)









{


































































CRA Git | Maintained and supported by SUSTech CRA and CCSE