Commit 6cd33649 authored Aug 27, 2014 by Bjorn Helgaas

PCI: Add pci_configure_device() during enumeration



Some platforms can tell the OS how to configure PCI devices, e.g., how to
set cache line size, error reporting enables, etc.  ACPI defines _HPP and
_HPX methods for this purpose.

This configuration was previously done by some of the hotplug drivers using
pci_configure_slot().  But not all hotplug drivers did this, and per the
spec (ACPI rev 5.0, sec 6.2.7), we can also do it for "devices not
configured by the BIOS at system boot."

Move this configuration into the PCI core by adding pci_configure_device()
and calling it from pci_device_add(), so we do this for all devices as we
enumerate them.

This is based on pci_configure_slot(), which is used by hotplug drivers.
I omitted:

  - pcie_bus_configure_settings() because it configures MPS and MRRS, which
    requires global knowledge of the fabric and must be done later, and

  - configuration of subordinate devices; that will happen when we call
    pci_device_add() for those devices.

Because pci_configure_slot() was only done by hotplug drivers, this initial
version of pci_configure_device() only configures hot-added devices,
ignoring anything added during boot.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>

parent 589fcc23

drivers/pci/probe.c

+25 −0

Original line number	Diff line number	Diff line
		@@ -1386,6 +1386,29 @@ void pci_configure_slot(struct pci_dev *dev)
		}
		EXPORT_SYMBOL_GPL(pci_configure_slot);

		static void pci_configure_device(struct pci_dev *dev)
		{
		struct hotplug_params hpp;
		int ret;

		if (system_state == SYSTEM_BOOTING)
		return;

		if (!(dev->hdr_type == PCI_HEADER_TYPE_NORMAL \|\|
		(dev->hdr_type == PCI_HEADER_TYPE_BRIDGE &&
		(dev->class >> 8) == PCI_CLASS_BRIDGE_PCI)))
		return;

		memset(&hpp, 0, sizeof(hpp));
		ret = pci_get_hp_params(dev, &hpp);
		if (ret)
		return;

		program_hpp_type2(dev, hpp.t2);
		program_hpp_type1(dev, hpp.t1);
		program_hpp_type0(dev, hpp.t0);
		}

		static void pci_release_capabilities(struct pci_dev *dev)
		{
		pci_vpd_release(dev);
		@@ -1523,6 +1546,8 @@ void pci_device_add(struct pci_dev dev, struct pci_bus bus)
		{
		int ret;

		pci_configure_device(dev);

		device_initialize(&dev->dev);
		dev->dev.release = pci_release_dev;

Admin message