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

Commit 64ae499c authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Bjorn Helgaas
Browse files

Merge branch 'pci/portdrv' 

  - move pcieport_if.h to drivers/pci/pcie/ to encapsulate it (Frederick
    Lawler)

  - merge pcieport_if.h into portdrv.h (Bjorn Helgaas)

  - move workaround for BIOS PME issue from portdrv to PCI core (Bjorn
    Helgaas)

  - completely disable portdrv with "pcie_ports=compat" (Bjorn Helgaas)

  - remove portdrv link order dependency (Bjorn Helgaas)

  - remove support for unused VC portdrv service (Bjorn Helgaas)

  - simplify portdrv feature permission checking (Bjorn Helgaas)

  - remove "pcie_hp=nomsi" parameter (use "pci=nomsi" instead) (Bjorn
    Helgaas)

  - remove unnecessary "pcie_ports=auto" parameter (Bjorn Helgaas)

  - use cached AER capability offset (Frederick Lawler)

  - don't enable DPC if BIOS hasn't granted AER control (Mika Westerberg)

  - rename pcie-dpc.c to dpc.c (Bjorn Helgaas)

* pci/portdrv:
  PCI/DPC: Rename from pcie-dpc.c to dpc.c
  PCI/DPC: Do not enable DPC if AER control is not allowed by the BIOS
  PCI/AER: Use cached AER Capability offset
  PCI/portdrv: Rename and reverse sense of pcie_ports_auto
  PCI/portdrv: Encapsulate pcie_ports_auto inside the port driver
  PCI/portdrv: Remove unnecessary "pcie_ports=auto" parameter
  PCI/portdrv: Remove "pcie_hp=nomsi" kernel parameter
  PCI/portdrv: Remove unnecessary include of <linux/pci-aspm.h>
  PCI/portdrv: Simplify PCIe feature permission checking
  PCI/portdrv: Remove unused PCIE_PORT_SERVICE_VC
  PCI/portdrv: Remove pcie_port_bus_type link order dependency
  PCI/portdrv: Disable port driver in compat mode
  PCI/PM: Clear PCIe PME Status bit for Root Complex Event Collectors
  PCI/PM: Clear PCIe PME Status bit in core, not PCIe port driver
  PCI/PM: Move pcie_clear_root_pme_status() to core
  PCI/portdrv: Merge pcieport_if.h into portdrv.h
  PCI/portdrv: Move pcieport_if.h to drivers/pci/pcie/

Conflicts:
	drivers/pci/pcie/Makefile
	drivers/pci/pcie/portdrv.h
parents ac30aa59 e02602bd

Documentation/admin-guide/kernel-parameters.txt

+7 −12
Original line number Diff line number Diff line
@@ -3130,18 +3130,13 @@ 
		force	Enable ASPM even on devices that claim not to support it.

			WARNING: Forcing ASPM on may cause system lockups.



	pcie_hp=	[PCIE] PCI Express Hotplug driver options:

		nomsi	Do not use MSI for PCI Express Native Hotplug (this

			makes all PCIe ports use INTx for hotplug services).



	pcie_ports=	[PCIE] PCIe ports handling:

		auto	Ask the BIOS whether or not to use native PCIe services

			associated with PCIe ports (PME, hot-plug, AER).  Use

			them only if that is allowed by the BIOS.

		native	Use native PCIe services associated with PCIe ports

			unconditionally.

		compat	Treat PCIe ports as PCI-to-PCI bridges, disable the PCIe

			ports driver.

	pcie_ports=	[PCIE] PCIe port services handling:

		native	Use native PCIe services (PME, AER, DPC, PCIe hotplug)

			even if the platform doesn't give the OS permission to

			use them.  This may cause conflicts if the platform

			also tries to use these services.

		compat	Disable native PCIe services (PME, AER, DPC, PCIe

			hotplug).



	pcie_port_pm=	[PCIE] PCIe port power management handling:

		off	Disable power management of all PCIe ports

drivers/acpi/pci_root.c

+11 −2
Original line number Diff line number Diff line
@@ -873,6 +873,7 @@ struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root, 
	struct acpi_device *device = root->device;

	int node = acpi_get_node(device->handle);

	struct pci_bus *bus;

	struct pci_host_bridge *host_bridge;



	info->root = root;

	info->bridge = device;
@@ -897,9 +898,17 @@ struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root, 
	if (!bus)

		goto out_release_info;



	host_bridge = to_pci_host_bridge(bus->bridge);

	if (!(root->osc_control_set & OSC_PCI_EXPRESS_NATIVE_HP_CONTROL))

		host_bridge->native_hotplug = 0;

	if (!(root->osc_control_set & OSC_PCI_EXPRESS_AER_CONTROL))

		host_bridge->native_aer = 0;

	if (!(root->osc_control_set & OSC_PCI_EXPRESS_PME_CONTROL))

		host_bridge->native_pme = 0;



	pci_scan_child_bus(bus);

	pci_set_host_bridge_release(to_pci_host_bridge(bus->bridge),

				    acpi_pci_root_release_info, info);

	pci_set_host_bridge_release(host_bridge, acpi_pci_root_release_info,

				    info);

	if (node != NUMA_NO_NODE)

		dev_printk(KERN_DEBUG, &bus->dev, "on NUMA node %d\n", node);

	return bus;

drivers/pci/hotplug/pciehp.h

+2 −1
Original line number Diff line number Diff line
@@ -20,10 +20,11 @@ 
#include <linux/pci_hotplug.h>

#include <linux/delay.h>

#include <linux/sched/signal.h>		/* signal_pending() */

#include <linux/pcieport_if.h>

#include <linux/mutex.h>

#include <linux/workqueue.h>



#include "../pcie/portdrv.h"



#define MY_NAME	"pciehp"



extern bool pciehp_poll_mode;

drivers/pci/pci-driver.c

+57 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/suspend.h>

#include <linux/kexec.h>

#include "pci.h"

#include "pcie/portdrv.h"



struct pci_dynid {

	struct list_head node;
@@ -712,6 +713,18 @@ static void pci_pm_complete(struct device *dev) 
#endif /* !CONFIG_PM_SLEEP */



#ifdef CONFIG_SUSPEND

static void pcie_pme_root_status_cleanup(struct pci_dev *pci_dev)

{

	/*

	 * Some BIOSes forget to clear Root PME Status bits after system

	 * wakeup, which breaks ACPI-based runtime wakeup on PCI Express.

	 * Clear those bits now just in case (shouldn't hurt).

	 */

	if (pci_is_pcie(pci_dev) &&

	    (pci_pcie_type(pci_dev) == PCI_EXP_TYPE_ROOT_PORT ||

	     pci_pcie_type(pci_dev) == PCI_EXP_TYPE_RC_EC))

		pcie_clear_root_pme_status(pci_dev);

}



static int pci_pm_suspend(struct device *dev)

{
@@ -871,6 +884,8 @@ static int pci_pm_resume_noirq(struct device *dev) 
	if (pci_has_legacy_pm_support(pci_dev))

		return pci_legacy_resume_early(dev);



	pcie_pme_root_status_cleanup(pci_dev);



	if (drv && drv->pm && drv->pm->resume_noirq)

		error = drv->pm->resume_noirq(dev);
@@ -1572,8 +1587,49 @@ struct bus_type pci_bus_type = { 
};

EXPORT_SYMBOL(pci_bus_type);



#ifdef CONFIG_PCIEPORTBUS

static int pcie_port_bus_match(struct device *dev, struct device_driver *drv)

{

	struct pcie_device *pciedev;

	struct pcie_port_service_driver *driver;



	if (drv->bus != &pcie_port_bus_type || dev->bus != &pcie_port_bus_type)

		return 0;



	pciedev = to_pcie_device(dev);

	driver = to_service_driver(drv);



	if (driver->service != pciedev->service)

		return 0;



	if (driver->port_type != PCIE_ANY_PORT &&

	    driver->port_type != pci_pcie_type(pciedev->port))

		return 0;



	return 1;

}



struct bus_type pcie_port_bus_type = {

	.name		= "pci_express",

	.match		= pcie_port_bus_match,

};

EXPORT_SYMBOL_GPL(pcie_port_bus_type);

#endif



static int __init pci_driver_init(void)

{

	return bus_register(&pci_bus_type);

	int ret;



	ret = bus_register(&pci_bus_type);

	if (ret)

		return ret;



#ifdef CONFIG_PCIEPORTBUS

	ret = bus_register(&pcie_port_bus_type);

	if (ret)

		return ret;

#endif



	return 0;

}

postcore_initcall(pci_driver_init);

drivers/pci/pci.c

+9 −0
Original line number Diff line number Diff line
@@ -1684,6 +1684,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.