kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PCI/AER: Move pcie_aer_get_firmware_first() to portdrv.h

Browse source 
Move pcie_aer_get_firmware_first() to portdrv.h, where it can be more
easily shared between AER and DPC.  Then DPC no longer needs to include
aer/aerdrv.h.  No functional change intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Keith Busch <keith.busch@intel.com>
This commit is contained in:
Bjorn Helgaas 2018-06-08 08:40:16 -05:00 committed by Bjorn Helgaas
parent 16c33b1595
commit 0544b04b79
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/pci/pcie/aer/aerdrv.h
View file

@ -78,14 +78,4 @@ struct aer_rpc {
irqreturn_t aer_irq(int irq, void *context); irqreturn_t aer_irq(int irq, void *context);
#ifdef CONFIG_ACPI_APEI
int pcie_aer_get_firmware_first(struct pci_dev *pci_dev);
#else
static inline int pcie_aer_get_firmware_first(struct pci_dev *pci_dev)
{
if (pci_dev->__aer_firmware_first_valid)
return pci_dev->__aer_firmware_first;
return 0;
}
#endif
#endif /* _AERDRV_H_ */ #endif /* _AERDRV_H_ */

1
drivers/pci/pcie/dpc.c
View file

@ -13,7 +13,6 @@
#include "portdrv.h" #include "portdrv.h"
#include "../pci.h" #include "../pci.h"
#include "aer/aerdrv.h"
struct dpc_dev { struct dpc_dev {
struct pcie_device *dev; struct pcie_device *dev;

11
drivers/pci/pcie/portdrv.h
View file

@ -110,6 +110,17 @@ static inline bool pcie_pme_no_msi(void) { return false; }
static inline void pcie_pme_interrupt_enable(struct pci_dev *dev, bool en) {} static inline void pcie_pme_interrupt_enable(struct pci_dev *dev, bool en) {}
#endif /* !CONFIG_PCIE_PME */ #endif /* !CONFIG_PCIE_PME */
#ifdef CONFIG_ACPI_APEI
int pcie_aer_get_firmware_first(struct pci_dev *pci_dev);
#else
static inline int pcie_aer_get_firmware_first(struct pci_dev *pci_dev)
{
if (pci_dev->__aer_firmware_first_valid)
return pci_dev->__aer_firmware_first;
return 0;
}
#endif
struct pcie_port_service_driver *pcie_port_find_service(struct pci_dev *dev, struct pcie_port_service_driver *pcie_port_find_service(struct pci_dev *dev,
u32 service); u32 service);
struct device *pcie_port_find_device(struct pci_dev *dev, u32 service); struct device *pcie_port_find_device(struct pci_dev *dev, u32 service);