Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcb0453d authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI/PM: Move pcie_clear_root_pme_status() to core 



Move pcie_clear_root_pme_status() from the port driver to the PCI core so
it will be available even when the port driver isn't present.  No
functional change intended.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent ef794260

drivers/pci/pci.c

+9 −0
Original line number Diff line number Diff line
@@ -1683,6 +1683,15 @@ int pci_set_pcie_reset_state(struct pci_dev *dev, enum pcie_reset_state state) 
}

EXPORT_SYMBOL_GPL(pci_set_pcie_reset_state);



/**

 * pcie_clear_root_pme_status - Clear root port PME interrupt status.

 * @dev: PCIe root port or event collector.

 */

void pcie_clear_root_pme_status(struct pci_dev *dev)

{

	pcie_capability_set_dword(dev, PCI_EXP_RTSTA, PCI_EXP_RTSTA_PME);

}



/**

 * pci_check_pme_status - Check if given device has generated PME.

 * @dev: Device to check.

drivers/pci/pci.h

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ void pci_update_current_state(struct pci_dev *dev, pci_power_t state); 
void pci_power_up(struct pci_dev *dev);

void pci_disable_enabled_device(struct pci_dev *dev);

int pci_finish_runtime_suspend(struct pci_dev *dev);

void pcie_clear_root_pme_status(struct pci_dev *dev);

int __pci_pme_wakeup(struct pci_dev *dev, void *ign);

void pci_pme_restore(struct pci_dev *dev);

bool pci_dev_keep_suspended(struct pci_dev *dev);

drivers/pci/pcie/portdrv.h

+0 −2
Original line number Diff line number Diff line
@@ -93,8 +93,6 @@ void pcie_port_bus_unregister(void); 


struct pci_dev;



void pcie_clear_root_pme_status(struct pci_dev *dev);



#ifdef CONFIG_HOTPLUG_PCI_PCIE

extern bool pciehp_msi_disabled;

drivers/pci/pcie/portdrv_pci.c

+0 −9
Original line number Diff line number Diff line
@@ -49,15 +49,6 @@ __setup("pcie_ports=", pcie_port_setup); 


/* global data */



/**

 * pcie_clear_root_pme_status - Clear root port PME interrupt status.

 * @dev: PCIe root port or event collector.

 */

void pcie_clear_root_pme_status(struct pci_dev *dev)

{

	pcie_capability_set_dword(dev, PCI_EXP_RTSTA, PCI_EXP_RTSTA_PME);

}



static int pcie_portdrv_restore_config(struct pci_dev *dev)

{

	int retval;