On Thu, Jan 18, 2018 at 05:03:56PM +0100, Hans de Goede wrote:
> acpi_get_object_info is intended for early probe usage and as such should
> not call any methods which may rely on OpRegions, but it used to also call
> _STA to get the status, which on some systems does rely on OpRegions, this
> behavior and the acpi_device_info.current_status member are being removed.
>
> This commit prepares the acpiphp_ibm code for this by having it get the
> status itself using acpi_bus_get_status_handle. Note no error handling is
> necessary on any errors acpi_bus_get_status_handle leaves the value of
> the passed in current_status at its 0 initialization value.
>
> Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Please add "()" after function names above, then
Acked-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
I assume this will be merged by Rafael along with the rest of the series.
It would be nice to fix the run-on sentences in the changelog as well.
> ---
> drivers/pci/hotplug/acpiphp_ibm.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
> index 984c7e8cec5a..8472c4a27f70 100644
> --- a/drivers/pci/hotplug/acpiphp_ibm.c
> +++ b/drivers/pci/hotplug/acpiphp_ibm.c
> @@ -399,6 +399,7 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
> u32 lvl, void *context, void **rv)
> {
> acpi_handle *phandle = (acpi_handle *)context;
> + unsigned long long current_status = 0;
> acpi_status status;
> struct acpi_device_info *info;
> int retval = 0;
> @@ -410,7 +411,9 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
> return retval;
> }
>
> - if (info->current_status && (info->valid & ACPI_VALID_HID) &&
> + acpi_bus_get_status_handle(handle, ¤t_status);
> +
> + if (current_status && (info->valid & ACPI_VALID_HID) &&
> (!strcmp(info->hardware_id.string, IBM_HARDWARE_ID1) ||
> !strcmp(info->hardware_id.string, IBM_HARDWARE_ID2))) {
> pr_debug("found hardware: %s, handle: %p\n",
> --
> 2.14.3
>
