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

Commit f8415222 authored by Lukas Wunner's avatar Lukas Wunner Committed by Bjorn Helgaas
Browse files

PCI: Use cached copy of PCI_EXP_SLTCAP_HPC bit 



We cache the PCI_EXP_SLTCAP_HPC bit in pci_dev->is_hotplug_bridge on device
probe, so there's no need to read it again on allocation of port service
devices.

No functional change intended.

Signed-off-by: default avatarLukas Wunner <lukas@wunner.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 4d88d5a7

drivers/pci/pcie/portdrv_core.c

+8 −14
Original line number Diff line number Diff line
@@ -254,7 +254,6 @@ static void cleanup_service_irqs(struct pci_dev *dev) 
static int get_port_device_capability(struct pci_dev *dev)

{

	int services = 0;

	u32 reg32;

	int cap_mask = 0;

	int err;
@@ -273,20 +272,15 @@ static int get_port_device_capability(struct pci_dev *dev) 
	}



	/* Hot-Plug Capable */

	if ((cap_mask & PCIE_PORT_SERVICE_HP) &&

	    pcie_caps_reg(dev) & PCI_EXP_FLAGS_SLOT) {

		pcie_capability_read_dword(dev, PCI_EXP_SLTCAP, &reg32);

		if (reg32 & PCI_EXP_SLTCAP_HPC) {

	if ((cap_mask & PCIE_PORT_SERVICE_HP) && dev->is_hotplug_bridge) {

		services |= PCIE_PORT_SERVICE_HP;

		/*

			 * Disable hot-plug interrupts in case they have been

			 * enabled by the BIOS and the hot-plug service driver

			 * is not loaded.

		 * Disable hot-plug interrupts in case they have been enabled

		 * by the BIOS and the hot-plug service driver is not loaded.

		 */

		pcie_capability_clear_word(dev, PCI_EXP_SLTCTL,

			  PCI_EXP_SLTCTL_CCIE | PCI_EXP_SLTCTL_HPIE);

	}

	}

	/* AER capable */

	if ((cap_mask & PCIE_PORT_SERVICE_AER)

	    && pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR)) {