Commit b03799b0 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Bjorn Helgaas
Browse files

PCI: shpchp: Separate existence of SHPC and permission to use it 



The shpchp driver registers for all PCI bridge devices.  Its probe method
should fail if either (1) the bridge doesn't have an SHPC or (2) the OS
isn't allowed to use it (the platform firmware may be operating the SHPC
itself).

Separate these two tests into:

  - A new shpc_capable() that looks for the SHPC hardware and is applicable
    on all systems (ACPI and non-ACPI), and

  - A simplified acpi_get_hp_hw_control_from_firmware() that we call only
    when we already know an SHPC exists and there may be ACPI methods to
    either request permission to use it (_OSC) or transfer control to the
    OS (OSHP).

acpi_get_hp_hw_control_from_firmware() is implemented when CONFIG_ACPI=y,
but does nothing if the current platform doesn't support ACPI.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent 6f6f4246

drivers/pci/hotplug/acpi_pcihp.c

+19 −17
Original line number Diff line number Diff line
@@ -73,20 +73,6 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *pdev) 
	acpi_handle chandle, handle;

	struct acpi_buffer string = { ACPI_ALLOCATE_BUFFER, NULL };



	/*

	 * Per PCI firmware specification, we should run the ACPI _OSC

	 * method to get control of hotplug hardware before using it. If

	 * an _OSC is missing, we look for an OSHP to do the same thing.

	 * To handle different BIOS behavior, we look for _OSC on a root

	 * bridge preferentially (according to PCI fw spec). Later for

	 * OSHP within the scope of the hotplug controller and its parents,

	 * up to the host bridge under which this controller exists.

	 */

	if (shpchp_is_native(pdev))

		return 0;



	/* If _OSC exists, we should not evaluate OSHP */



	/*

	 * If there's no ACPI host bridge (i.e., ACPI support is compiled

	 * into the kernel but the hardware platform doesn't support ACPI),
@@ -97,9 +83,25 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *pdev) 
	if (!root)

		return 0;



	if (root->osc_support_set)

		goto no_control;

	/*

	 * If _OSC exists, it determines whether we're allowed to manage

	 * the SHPC.  We executed it while enumerating the host bridge.

	 */

	if (root->osc_support_set) {

		if (host->native_shpc_hotplug)

			return 0;

		return -ENODEV;

	}



	/*

	 * In the absence of _OSC, we're always allowed to manage the SHPC.

	 * However, if an OSHP method is present, we must execute it so the

	 * firmware can transfer control to the OS, e.g., direct interrupts

	 * to the OS instead of to the firmware.

	 *

	 * N.B. The PCI Firmware Spec (r3.2, sec 4.8) does not endorse

	 * searching up the ACPI hierarchy, so the loops below are suspect.

	 */

	handle = ACPI_HANDLE(&pdev->dev);

	if (!handle) {

		/*
@@ -128,7 +130,7 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *pdev) 
		if (ACPI_FAILURE(status))

			break;

	}

no_control:



	pci_info(pdev, "Cannot get control of SHPC hotplug\n");

	kfree(string.pointer);

	return -ENODEV;

drivers/pci/hotplug/shpchp_core.c

+21 −0
Original line number Diff line number Diff line
@@ -270,11 +270,30 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value) 
	return 0;

}



static bool shpc_capable(struct pci_dev *bridge)

{

	/*

	 * It is assumed that AMD GOLAM chips support SHPC but they do not

	 * have SHPC capability.

	 */

	if (bridge->vendor == PCI_VENDOR_ID_AMD &&

	    bridge->device == PCI_DEVICE_ID_AMD_GOLAM_7450)

		return true;



	if (pci_find_capability(bridge, PCI_CAP_ID_SHPC))

		return true;



	return false;

}



static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	int rc;

	struct controller *ctrl;



	if (!shpc_capable(pdev))

		return -ENODEV;



	if (acpi_get_hp_hw_control_from_firmware(pdev))

		return -ENODEV;
@@ -303,6 +322,7 @@ static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (rc)

		goto err_cleanup_slots;



	pdev->shpc_managed = 1;

	return 0;



err_cleanup_slots:
@@ -319,6 +339,7 @@ static void shpc_remove(struct pci_dev *dev) 
{

	struct controller *ctrl = pci_get_drvdata(dev);



	dev->shpc_managed = 0;

	shpchp_remove_ctrl_files(ctrl);

	ctrl->hpc_ops->release_ctlr(ctrl);

	kfree(ctrl);

drivers/pci/pci-acpi.c

+1 −18
Original line number Diff line number Diff line
@@ -403,24 +403,7 @@ bool pciehp_is_native(struct pci_dev *bridge) 
 */

bool shpchp_is_native(struct pci_dev *bridge)

{

	const struct pci_host_bridge *host;



	if (!IS_ENABLED(CONFIG_HOTPLUG_PCI_SHPC))

		return false;



	/*

	 * It is assumed that AMD GOLAM chips support SHPC but they do not

	 * have SHPC capability.

	 */

	if (bridge->vendor == PCI_VENDOR_ID_AMD &&

	    bridge->device == PCI_DEVICE_ID_AMD_GOLAM_7450)

		return true;



	if (!pci_find_capability(bridge, PCI_CAP_ID_SHPC))

		return false;



	host = pci_find_host_bridge(bridge->bus);

	return host->native_shpc_hotplug;

	return bridge->shpc_managed;

}



/**

include/linux/pci.h

+1 −0
Original line number Diff line number Diff line
@@ -388,6 +388,7 @@ struct pci_dev { 
	unsigned int	is_virtfn:1;

	unsigned int	reset_fn:1;

	unsigned int	is_hotplug_bridge:1;

	unsigned int	shpc_managed:1;		/* SHPC owned by shpchp */

	unsigned int	is_thunderbolt:1;	/* Thunderbolt controller */

	unsigned int	__aer_firmware_first_valid:1;

	unsigned int	__aer_firmware_first:1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE