ACPI: PCI: PM: Power up PCI devices with ACPI companions upfront
Subsystems (3)
cover ACPI: PCI: PM: Power up PCI devices with ACPI companions upfront
Hi All,
There are cases in which the power state of a PCI device depends on an ACPI power resource (or more of them) in such a way that when the given power resource is in the "off" state, the PCI device depending on it is in D3cold.
On some systems, the initial state of these power resources is "off", so the kernel should not access the config space of PCI devices depending on them, until the power resources in question are turned "on", but currently that is not respected during PCI device enumeration. Namely, the PCI device enumeration code walks the entire bus and enumerates all of the devices it can find, including the ones whose initial power state in principle depends on the ACPI power resources in the "off" state.
Apparently, most of the time, the config space of such devices is accessible regardless of the state of the ACPI power resource associated with the PCI device, so the device enumeration is successful, but there are two potential issues related to this behavior. First off, even if the given PCI device is accessible when the ACPI power resource depended on by it is "off", changing its configuration may confuse the platform firmware and lead to problems when the ACPI power resource in question is turned "on". Second, the PCI device may not be actually accessible at all when the ACPI power resource depended on by it is "off", in which case it won't be found during the PCI enumeration of devices.
This patch series addresses that problem by turning "on" all ACPI power resources depended on by PCI devices before attempting to access the config space of those devices for the first time.
The first two patches introduce the requisite machinery and the actual change of behavior is done in the last patch.
Thanks!
PATCH 1/3 ACPI: bus: Introduce acpi_dev_for_each_child()
From: Rafael J. Wysocki <[email protected]>
Introduce a wrapper around device_for_each_child() to iterate over the children of a given ACPI device object.
This function will be used in subsequent change sets.
--- drivers/acpi/bus.c | 6 ++++++ include/acpi/acpi_bus.h | 2 ++ 2 files changed, 8 insertions(+)
drivers/acpi/bus.c +6 -0
@@ -1070,6 +1070,12 @@ int acpi_bus_for_each_dev(int (*fn)(stru }EXPORT_SYMBOL_GPL (acpi_bus_for_each_dev); +int acpi_dev_for_each_child (struct acpi_device *adev, +int (*fn)(struct device *,void *),void *data) +{ +return device_for_each_child (&adev->dev, data, fn); +} +/* -------------------------------------------------------------------------- Initialization/Cleanup -------------------------------------------------------------------------- */
include/acpi/acpi_bus.h +2 -0
@@ -481,6 +481,8 @@ void acpi_initialize_hp_context(struct aextern struct bus_type acpi_bus_type;int acpi_bus_for_each_dev (int (*fn)(struct device *,void *),void *data); +int acpi_dev_for_each_child (struct acpi_device *adev, +int (*fn)(struct device *,void *),void *data);/* * Events
PATCH 2/3 ACPI: PM: Introduce acpi_dev_power_up_children_with_adr()
In reply to Rafael J. WysockiFrom: Rafael J. Wysocki <[email protected]>
Introduce a function powering up all of the children of a given ACPI device object that are power-manageable and hold valid _ADR ACPI objects so as to make it possible to prepare the corresponding "physical" devices for enumeration carried out by a bus type driver, like PCI.
This function will be used in a subsequent change set.
--- drivers/acpi/device_pm.c | 30 ++++++++++++++++++++++++++++++ include/acpi/acpi_bus.h | 1 + 2 files changed, 31 insertions(+)
drivers/acpi/device_pm.c +30 -0
@@ -427,6 +427,36 @@ bool acpi_bus_power_manageable(acpi_hand }EXPORT_SYMBOL (acpi_bus_power_manageable); +static int acpi_power_up_if_adr_present (struct device *dev,void *not_used) +{ +struct acpi_device *adev; + + adev =to_acpi_device (dev); +if (!(adev->flags.power_manageable && adev->pnp.type.bus_address)) +return 0 ; + +acpi_handle_debug (adev->handle,"Power state: %s\n" , +acpi_power_state_string (adev->power.state)); + +if (adev->power.state ==ACPI_STATE_D3_COLD ) +return acpi_device_set_power (adev,ACPI_STATE_D0 ); + +return 0 ; +} + +/** +* acpi_dev_power_up_children_with_adr - Power up childres with valid _ADR +* @adev: Parent ACPI device object. +* +* Change the power states of the direct children of @adev that are in D3cold +* and hold valid _ADR objects to D0 in order to allow bus (e.g. PCI) +* enumeration code to access them. +*/ +void acpi_dev_power_up_children_with_adr (struct acpi_device *adev) +{ +acpi_dev_for_each_child (adev, acpi_power_up_if_adr_present,NULL ); +} +#ifdef CONFIG_PM static DEFINE_MUTEX (acpi_pm_notifier_lock);static DEFINE_MUTEX (acpi_pm_notifier_install_lock);
include/acpi/acpi_bus.h +1 -0
@@ -525,6 +525,7 @@ int acpi_device_fix_up_power(struct acpiint acpi_bus_update_power (acpi_handle handle,int *state_p);int acpi_device_update_power (struct acpi_device *device,int *state_p);bool acpi_bus_power_manageable (acpi_handle handle); +void acpi_dev_power_up_children_with_adr (struct acpi_device *adev);int acpi_device_power_add_dependent (struct acpi_device *adev,struct device *dev); void acpi_device_power_remove_dependent(struct acpi_device *adev,
PATCH 3/3 PCI: ACPI: PM: Power up devices in D3cold before scanning them
In reply to Rafael J. WysockiFrom: Rafael J. Wysocki <[email protected]>
The initial configuration of ACPI power resources on some systems implies that some PCI devices on them are initially in D3cold.
In some cases, especially for PCIe Root Ports, this is a "logical" D3cold, meaning that the configuration space of the device is accessible, but some of its functionality may be missing, but it very well may be real D3cold, in which case the device will not be accessible at all. However, the PCI bus type driver will need to access its configuration space in order to enumerate it.
To prevent possible device enumeration failures that may ensue as a result of ACPI power resources being initially in the "off" state, power up all children of the host bridge ACPI device object that hold valid _ADR objects (which indicates that they will be enumerated by the PCI bus type driver) and do that to all children of the ACPI device objects corresponding to PCI bridges (including PCIe ports).
--- drivers/acpi/pci_root.c | 2 ++ drivers/pci/pci-acpi.c | 3 +++ 2 files changed, 5 insertions(+)
drivers/acpi/pci_root.c +2 -0
@@ -927,6 +927,8 @@ struct pci_bus *acpi_pci_root_create(str host_bridge->preserve_config =1 ;ACPI_FREE (obj); +acpi_dev_power_up_children_with_adr (device); +pci_scan_child_bus (bus);pci_set_host_bridge_release (host_bridge, acpi_pci_root_release_info, info);
drivers/pci/pci-acpi.c +3 -0
@@ -1374,6 +1374,9 @@ void pci_acpi_setup(struct device *dev,acpi_pci_wakeup (pci_dev, false);acpi_device_power_add_dependent (adev, dev); + +if (pci_is_bridge (pci_dev)) +acpi_dev_power_up_children_with_adr (adev); }void pci_acpi_cleanup (struct device *dev,struct acpi_device *adev)
Re: [PATCH v1 3/3] PCI: ACPI: PM: Power up devices in D3cold before scanning them
Quoted 20 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
The initial configuration of ACPI power resources on some systems implies that some PCI devices on them are initially in D3cold.
In some cases, especially for PCIe Root Ports, this is a "logical" D3cold, meaning that the configuration space of the device is accessible, but some of its functionality may be missing, but it very well may be real D3cold, in which case the device will not be accessible at all. However, the PCI bus type driver will need to access its configuration space in order to enumerate it.
To prevent possible device enumeration failures that may ensue as a result of ACPI power resources being initially in the "off" state, power up all children of the host bridge ACPI device object that hold valid
_ADRobjects (which indicates that they will be enumerated by the PCI bus type driver) and do that to all children of the ACPI device objects corresponding to PCI bridges (including PCIe ports).
Quoted 1 line
Signed-off-by Rafael J. Wysocki <[email protected]>
Quoted 35 lines
--- drivers/acpi/pci_root.c | 2 ++ drivers/pci/pci-acpi.c | 3 +++ 2 files changed, 5 insertions(+)Index:
linux-pm/drivers/acpi/pci_root.c
===================================================================drivers/acpi/pci_root.c +2
-0@@ -927,6 +927,8 @@ struct pci_bus *acpi_pci_root_create(str host_bridge->preserve_config =1 ;ACPI_FREE (obj); +acpi_dev_power_up_children_with_adr (device); +pci_scan_child_bus (bus);pci_set_host_bridge_release (host_bridge, acpi_pci_root_release_info, info);Index:
linux-pm/drivers/pci/pci-acpi.c
===================================================================drivers/pci/pci-acpi.c +3
-0@@ -1374,6 +1374,9 @@ void pci_acpi_setup(struct device *dev,acpi_pci_wakeup (pci_dev, false);acpi_device_power_add_dependent (adev, dev); + +if (pci_is_bridge (pci_dev)) +acpi_dev_power_up_children_with_adr (adev); }void pci_acpi_cleanup (struct device *dev,struct acpi_device *adev)
Hi Rafael,
Quoted 6 lines · Rafael J. Wysocki
Hi All,
There are cases in which the power state of a PCI device depends on an ACPI power resource (or more of them) in such a way that when the given power resource is in the "off" state, the PCI device depending on it is in D3cold.
Quoted 7 lines
On some systems, the initial state of these power resources is "off", so the kernel should not access the config space of PCI devices depending on them, until the power resources in question are turned "on", but currently that is not respected during PCI device enumeration. Namely, the PCI device enumeration code walks the entire bus and enumerates all of the devices it can find, including the ones whose initial power state in principle depends on the ACPI power resources in the "off" state.
I guess these devices do not have _PRE() method either.
Quoted 11 lines
Apparently, most of the time, the config space of such devices is accessible regardless of the state of the ACPI power resource associated with the PCI device, so the device enumeration is successful, but there are two potential issues related to this behavior. First off, even if the given PCI device is accessible when the ACPI power resource depended on by it is "off", changing its configuration may confuse the platform firmware and lead to problems when the ACPI power resource in question is turned "on". Second, the PCI device may not be actually accessible at all when the ACPI power resource depended on by it is "off", in which case it won't be found during the PCI enumeration of devices.
Quoted 3 lines
This patch series addresses that problem by turning "on" all ACPI power resources depended on by PCI devices before attempting to access the config space of those devices for the first time.
Makes sense.
For the series,
Rafael J. Wysocki
maintainerQuoted 18 lines · Mika Westerberg
Hi Rafael,
Quoted 6 lines · Rafael J. Wysocki
Hi All,
There are cases in which the power state of a PCI device depends on an ACPI power resource (or more of them) in such a way that when the given power resource is in the "off" state, the PCI device depending on it is in D3cold.
Quoted 7 lines
On some systems, the initial state of these power resources is "off", so the kernel should not access the config space of PCI devices depending on them, until the power resources in question are turned "on", but currently that is not respected during PCI device enumeration. Namely, the PCI device enumeration code walks the entire bus and enumerates all of the devices it can find, including the ones whose initial power state in principle depends on the ACPI power resources in the "off" state.
Quoted 1 line
I guess these devices do not have
_PRE()method either.
Personally, I haven't seen any ACPI tables containing any _PRE yet.
Quoted 15 lines
Quoted 11 lines
Apparently, most of the time, the config space of such devices is accessible regardless of the state of the ACPI power resource associated with the PCI device, so the device enumeration is successful, but there are two potential issues related to this behavior. First off, even if the given PCI device is accessible when the ACPI power resource depended on by it is "off", changing its configuration may confuse the platform firmware and lead to problems when the ACPI power resource in question is turned "on". Second, the PCI device may not be actually accessible at all when the ACPI power resource depended on by it is "off", in which case it won't be found during the PCI enumeration of devices.
Quoted 3 lines
This patch series addresses that problem by turning "on" all ACPI power resources depended on by PCI devices before attempting to access the config space of those devices for the first time.
Quoted 5 lines
Makes sense.
For the series,
Reviewed-by Mika Westerberg <[email protected]>
Thanks!