Commit c29de841 authored by Keith Busch's avatar Keith Busch Committed by Bjorn Helgaas
Browse files

PCI: portdrv: Initialize service drivers directly 



The PCI port driver saves the PCI state after initializing the device with
the applicable service devices.  This was, however, before the service
drivers were even registered because PCI probe happens before the
device_initcall initialized those service drivers.  The config space state
that the services set up were not being saved.  The end result would cause
PCI devices to not react to events that the drivers think they did if the
PCI state ever needed to be restored.

Fix this by changing the service drivers from using the init calls to
having the portdrv driver calling the services directly.  This will get the
state saved as desired, while making the relationship between the port
driver and the services under it more explicit in the code.

Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarSinan Kaya <okaya@kernel.org>
parent a0d58937

drivers/pci/hotplug/pciehp_core.c

+1 −2
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static struct pcie_port_service_driver hpdriver_portdrv = { 
#endif	/* PM */

};



static int __init pcied_init(void)

int __init pcie_hp_init(void)

{

	int retval = 0;
@@ -298,4 +298,3 @@ static int __init pcied_init(void) 


	return retval;

}
 
device_initcall(pcied_init);

drivers/pci/pcie/aer.c

+1 −2
Original line number Diff line number Diff line
@@ -1569,10 +1569,9 @@ static struct pcie_port_service_driver aerdriver = { 
 *

 * Invoked when AER root service driver is loaded.

 */

static int __init aer_service_init(void)

int __init pcie_aer_init(void)

{

	if (!pci_aer_available() || aer_acpi_firmware_first())

		return -ENXIO;

	return pcie_port_service_register(&aerdriver);

}
 
device_initcall(aer_service_init);

drivers/pci/pcie/dpc.c

+1 −2
Original line number Diff line number Diff line
@@ -282,8 +282,7 @@ static struct pcie_port_service_driver dpcdriver = { 
	.reset_link	= dpc_reset_link,

};



static int __init dpc_service_init(void)

int __init pcie_dpc_init(void)

{

	return pcie_port_service_register(&dpcdriver);

}
 
device_initcall(dpc_service_init);

drivers/pci/pcie/pme.c

+1 −2
Original line number Diff line number Diff line
@@ -446,8 +446,7 @@ static struct pcie_port_service_driver pcie_pme_driver = { 
/**

 * pcie_pme_service_init - Register the PCIe PME service driver.

 */

static int __init pcie_pme_service_init(void)

int __init pcie_pme_init(void)

{

	return pcie_port_service_register(&pcie_pme_driver);

}
 
device_initcall(pcie_pme_service_init);

drivers/pci/pcie/portdrv.h

+24 −0
Original line number Diff line number Diff line
@@ -23,6 +23,30 @@ 


#define PCIE_PORT_DEVICE_MAXSERVICES   4



#ifdef CONFIG_PCIEAER

int pcie_aer_init(void);

#else

static inline int pcie_aer_init(void) { return 0; }

#endif



#ifdef CONFIG_HOTPLUG_PCI_PCIE

int pcie_hp_init(void);

#else

static inline int pcie_hp_init(void) { return 0; }

#endif



#ifdef CONFIG_PCIE_PME

int pcie_pme_init(void);

#else

static inline int pcie_pme_init(void) { return 0; }

#endif



#ifdef CONFIG_PCIE_DPC

int pcie_dpc_init(void);

#else

static inline int pcie_dpc_init(void) { return 0; }

#endif



/* Port Type */

#define PCIE_ANY_PORT			(~0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE