ACPI: export acpi_bus_get_status_handle()
Subsystems (3)
PATCH v3 1/5 ACPI: export acpi_bus_get_status_handle()
Some modular drivers need this, export it.
---
Changes in v2:
-This is a new patch in v2 of this patch-set
Changes in v3:
-Use EXPORT_SYMBOL_GPL instead of EXPORT_SYMBOL
--- drivers/acpi/bus.c | 1 + 1 file changed, 1 insertion(+)
drivers/acpi/bus.c +1 -0
@@ -108,6 +108,7 @@ acpi_status acpi_bus_get_status_handle(acpi_handle handle, }return status; } +EXPORT_SYMBOL_GPL (acpi_bus_get_status_handle);int acpi_bus_get_status (struct acpi_device *device) {
Signature · 1 line
2.14.3
PATCH v3 2/5 PCI: acpiphp_ibm: prepare for acpi_get_object_info() no longer returning status
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.
---
Changes in v2:
-Use () after function names in commit message
-Add Bjorn's Acked-by
--- drivers/pci/hotplug/acpiphp_ibm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/pci/hotplug/acpiphp_ibm.c +4 -1
@@ -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",
Signature · 1 line
2.14.3
PATCH v3 3/5 ACPI / bus: Do not call _STA on battery devices with unmet dependencies
In reply to Hans de GoedeThe battery code uses acpi_device->dep_unmet to check for unmet deps and if there are unmet deps it does not bind to the device to avoid errors about missing OpRegions when calling ACPI methods on the device.
The missing OpRegions when there are unmet deps problem also applies to the _STA method of some battery devices and calling it too early results in errors like these:
[ 0.123579] ACPI Error: No handler for Region [ECRM] (00000000ba9edc4c)
[GenericSerialBus] (20170831/evregion-166)
[ 0.123601] ACPI Error: Region GenericSerialBus (ID=9) has no handler
(20170831/exfldio-299)
[ 0.123618] ACPI Error: Method parse/execution failed
\_SB.I2C1.BAT1._STA, AE_NOT_EXIST (20170831/psparse-550)This commit fixes these errors happening when acpi_get_bus_status gets called by checking dep_unmet for battery devices and reporting a status of 0 until all dependencies are met.
--- drivers/acpi/bus.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/acpi/bus.c +6 -0
@@ -120,6 +120,12 @@ int acpi_bus_get_status(struct acpi_device *device)return 0 ; } +/* Battery devices must have their deps met before calling _STA */ +if (acpi_device_is_battery (device) && device->dep_unmet) { +acpi_set_device_status (device,0 ); +return 0 ; + } + status =acpi_bus_get_status_handle (device->handle, &sta);if (ACPI_FAILURE (status))return -ENODEV ;
Signature · 1 line
2.14.3
PATCH v3 4/5 ACPI / scan: Use acpi_bus_get_status for initial status of ACPI_TYPE_DEVICE devs
In reply to Hans de GoedeThe acpi_get_bus_status wrapper for acpi_bus_get_status_handle has some code to handle certain device quirks, in some cases we also need this quirk handling for the initial _STA call.
Specifically on some devices calling _STA before all _DEP dependencies are met results in errors like these:
[ 0.123579] ACPI Error: No handler for Region [ECRM] (00000000ba9edc4c)
[GenericSerialBus] (20170831/evregion-166)
[ 0.123601] ACPI Error: Region GenericSerialBus (ID=9) has no handler
(20170831/exfldio-299)
[ 0.123618] ACPI Error: Method parse/execution failed
\_SB.I2C1.BAT1._STA, AE_NOT_EXIST (20170831/psparse-550)acpi_get_bus_status already has code to avoid this, so by using it we also silence these errors from the initial _STA call.
Note that in order for the acpi_get_bus_status handling for this to work, we initialize dep_unmet to 1 until acpi_device_dep_initialize gets called, this means that battery devices will be instantiated with an initial status of 0. This is not a problem, acpi_bus_attach will get called soon after the instantiation anyways and it will update the status as first point of order.
---
Note if we were to:
1) move the acpi_bus_init_power call from acpi_bus_get_power_flags to acpi_bus_attach, which already calls acpi_bus_init_power for uninitialized devices; and
2) move the acpi_bus_get_wakeup_device_flags call from acpi_add_single_object to acpi_bus_attach. This one is tricky, because acpi_device_add checks wakeup.flags.valid which gets set by this. And the acpi_wakeup_gpe_init call actually is the troublesome one because it uses acpi_match_device_ids which relies on the status...
Then we can entirely rely on the acpi_bus_get_status call in acpi_bus_attach and remove the acpi_bus_get_status call from the device-instantiation path.
--- drivers/acpi/scan.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
drivers/acpi/scan.c +17 -3
@@ -1565,6 +1565,8 @@ void acpi_init_device_object(struct acpi_device *device, acpi_handle handle,device_initialize (&device->dev);dev_set_uevent_suppress (&device->dev, true);acpi_init_coherency (device); +/* Assume there are unmet deps until acpi_device_dep_initialize runs */ + device->dep_unmet =1 ; }void acpi_device_add_finalize (struct acpi_device *device)
@@ -1588,6 +1590,14 @@ static int acpi_add_single_object(struct acpi_device **child, }acpi_init_device_object (device, handle, type, sta); +/* +* For ACPI_BUS_TYPE_DEVICE getting the status is delayed till here so +* that we can call acpi_bus_get_status and use its quirk handling. +* Note this must be done before the get power-/wakeup_dev-flags calls. +*/ +if (type ==ACPI_BUS_TYPE_DEVICE ) +acpi_bus_get_status (device); +acpi_bus_get_power_flags (device);acpi_bus_get_wakeup_device_flags (device);
@@ -1660,9 +1670,11 @@ static int acpi_bus_type_and_status(acpi_handle handle, int *type,return -ENODEV ; *type =ACPI_BUS_TYPE_DEVICE ; - status =acpi_bus_get_status_handle (handle, sta); -if (ACPI_FAILURE (status)) - *sta =0 ; +/* +* acpi_add_single_object updates this once we've an acpi_device +* so that acpi_bus_get_status' quirk handling can be used. +*/ + *sta =0 ;break ;case ACPI_TYPE_PROCESSOR : *type =ACPI_BUS_TYPE_PROCESSOR ;
@@ -1760,6 +1772,8 @@ static void acpi_device_dep_initialize(struct acpi_device *adev)acpi_status status;int i; + adev->dep_unmet =0 ; +if (!acpi_has_method (adev->handle,"_DEP" ))return ;
Signature · 1 line
2.14.3
PATCH v3 5/5 ACPICA: Remove calling of _STA from acpi_get_object_info
In reply to Hans de GoedeAs the comment above it indicates, acpi_get_object_info is intended for early probe usage and as such should not call any methods which may rely on OpRegions, before this commit it was also calling _STA, which on some systems does rely on OpRegions.
Calling _STA before things are ready leads to errors such as these:
[ 0.123579] ACPI Error: No handler for Region [ECRM] (00000000ba9edc4c)
[GenericSerialBus] (20170831/evregion-166)
[ 0.123601] ACPI Error: Region GenericSerialBus (ID=9) has no handler
(20170831/exfldio-299)
[ 0.123618] ACPI Error: Method parse/execution failed
\_SB.I2C1.BAT1._STA, AE_NOT_EXIST (20170831/psparse-550)End 2015 support for the _SUB method was removed for exactly the same reason. Removing current_status from struct acpi_device_info only has a limit impact. Within ACPICA it is only used by 2 debug messages, both of which are modified to no longer print it with this commit.
Outside of ACPICA, for Linux there is only one user. For which a patch to remove the dependency on the current_status field is available.
--- drivers/acpi/acpica/dbdisply.c | 5 ++--- drivers/acpi/acpica/nsdumpdv.c | 5 ++--- drivers/acpi/acpica/nsxfname.c | 19 ++++--------------- include/acpi/actypes.h | 2 -- 4 files changed, 8 insertions(+), 23 deletions(-)
drivers/acpi/acpica/dbdisply.c +2 -3
@@ -642,9 +642,8 @@ void acpi_db_display_object_type(char *object_arg)return ; } -acpi_os_printf ("ADR: %8.8X%8.8X, STA: %8.8X, Flags: %X\n" , -ACPI_FORMAT_UINT64 (info->address), - info->current_status, info->flags); +acpi_os_printf ("ADR: %8.8X%8.8X, Flags: %X\n" , +ACPI_FORMAT_UINT64 (info->address), info->flags); acpi_os_printf("S1D-%2.2X S2D-%2.2X S3D-%2.2X S4D-%2.2X\n", info->highest_dstates[0], info->highest_dstates[1],
drivers/acpi/acpica/nsdumpdv.c +2 -3
@@ -88,10 +88,9 @@ acpi_ns_dump_one_device(acpi_handle obj_handle, }ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES , -" HID: %s, ADR: %8.8X%8.8X, Status: %X\n" , +" HID: %s, ADR: %8.8X%8.8X\n" , info->hardware_id.value, -ACPI_FORMAT_UINT64 (info->address), - info->current_status)); + ACPI_FORMAT_UINT64(info->address));ACPI_FREE (info); }
drivers/acpi/acpica/nsxfname.c +4 -15
@@ -241,7 +241,7 @@ static char *acpi_ns_copy_device_id(struct acpi_pnp_device_id *dest,* namespace node and possibly by running several standard * control methods (Such as in the case of a device.) * -* For Device and Processor objects, run the Device _HID, _UID, _CID, _STA, +* For Device and Processor objects, run the Device _HID, _UID, _CID, * _CLS, _ADR, _sx_w, and _sx_d methods. * * Note: Allocates the return buffer, must be freed by the caller.
@@ -250,8 +250,9 @@ static char *acpi_ns_copy_device_id(struct acpi_pnp_device_id *dest,* discovery namespace traversal. Therefore, no complex methods can be * executed, especially those that access operation regions. Therefore, do * not add any additional methods that could cause problems in this area. -* this was the fate of the _SUB method which was found to cause such -* problems and was removed (11/2015). +* Because of this reason support for the following methods has been removed: +* 1) _SUB method was removed (11/2015) +* 2) _STA method was removed (01/2018) * ******************************************************************************/
@@ -374,20 +375,8 @@ acpi_get_object_info(acpi_handle handle,* Notes: none of these methods are required, so they may or may * not be present for this device. The Info->Valid bitfield is used * to indicate which methods were found and run successfully. -* -* For _STA, if the method does not exist, then (as per the ACPI -* specification), the returned current_status flags will indicate -* that the device is present/functional/enabled. Otherwise, the -* current_status flags reflect the value returned from _STA. */ -/* Execute the Device._STA method */ - - status =acpi_ut_execute_STA (node, &info->current_status); -if (ACPI_SUCCESS (status)) { - valid |=ACPI_VALID_STA ; - } -/* Execute the Device._ADR method */ status = acpi_ut_evaluate_numeric_object(METHOD_NAME__ADR, node,
include/acpi/actypes.h +0 -2
@@ -1191,7 +1191,6 @@ struct acpi_device_info {u8 flags;/* Miscellaneous info */ u8 highest_dstates[4 ];/* _sx_d values: 0xFF indicates not valid */ u8 lowest_dstates[5 ];/* _sx_w values: 0xFF indicates not valid */ -u32 current_status;/* _STA value */ u64 address;/* _ADR value */ struct acpi_pnp_device_id hardware_id;/* _HID value */ struct acpi_pnp_device_id unique_id;/* _UID value */
@@ -1205,7 +1204,6 @@ struct acpi_device_info {/* Flags for Valid field above (acpi_get_object_info) */ -#define ACPI_VALID_STA 0x0001#define ACPI_VALID_ADR 0x0002#define ACPI_VALID_HID 0x0004#define ACPI_VALID_UID 0x0008
Signature · 1 line
2.14.3
Moore
Re: [Devel] [PATCH v3 5/5] ACPICA: Remove calling of _STA from acpi_get_object_info
For ACPICA, this is a change to a published public interface. A change to this will potentially affect many operating systems, so we would be very hesitant to change it in the core ACPICA code.
Bob
Quoted 157 lines
-----Original Message-----
From: Hans de Goede [mailto:hdegoede(a)redhat.com]
Sent: Friday, January 26, 2018 7:03 AM
To: Rafael J . Wysocki <rjw(a)rjwysocki.net>; Len Brown <lenb(a)kernel.org>; Moore, Robert <robert.moore(a)intel.com>; Schmauss, Erik <erik.schmauss(a)intel.com>; Bjorn Helgaas <bhelgaas(a)google.com>
Cc: Hans de Goede <hdegoede(a)redhat.com>; linux-acpi(a)vger.kernel.org; devel(a)acpica.org; linux-pci(a)vger.kernel.org
Subject: [PATCH v3 5/5] ACPICA: Remove calling of_STAfromacpi_get_object_infoAs the comment above it indicates,
acpi_get_object_infois intended for early probe usage and as such should not call any methods which may rely on OpRegions, before this commit it was also calling_STA, which on some systems does rely on OpRegions.Calling
_STAbefore things are ready leads to errors such as these:[ 0.123579] ACPI Error: No handler for Region [ECRM] (00000000ba9edc4c) [GenericSerialBus] (20170831/evregion-166) [ 0.123601] ACPI Error: Region GenericSerialBus (ID=9) has no handler (20170831/exfldio-299) [ 0.123618] ACPI Error: Method parse/execution failed \_SB.I2C1.BAT1._STA, AE_NOT_EXIST (20170831/psparse-550)End 2015 support for the
_SUBmethod was removed for exactly the same reason. Removingcurrent_statusfrom structacpi_device_infoonly has a limit impact. Within ACPICA it is only used by 2 debug messages, both of which are modified to no longer print it with this commit.Outside of ACPICA, for Linux there is only one user. For which a patch to remove the dependency on the
current_statusfield is available.Signed-off-by Hans de Goede <hdegoede(a)redhat.com>--- drivers/acpi/acpica/dbdisply.c | 5 ++--- drivers/acpi/acpica/nsdumpdv.c | 5 ++--- drivers/acpi/acpica/nsxfname.c | 19 ++++--------------- include/acpi/actypes.h | 2 -- 4 files changed, 8 insertions(+), 23 deletions(-)(quoted diff) +0
-0
b/drivers/acpi/acpica/dbdisply.cindex5a606eac0c22..7b5eb33fe962100644drivers/acpi/acpica/dbdisply.c +2
-3@@ -642,9 +642,8 @@ void acpi_db_display_object_type(char *object_arg)return ; } -acpi_os_printf ("ADR: %8.8X%8.8X, STA: %8.8X, Flags: %X\n" , -ACPI_FORMAT_UINT64 (info->address), - info->current_status, info->flags); +acpi_os_printf ("ADR: %8.8X%8.8X, Flags: %X\n" , +ACPI_FORMAT_UINT64 (info->address), info->flags); acpi_os_printf("S1D-%2.2X S2D-%2.2X S3D-%2.2X S4D-%2.2X\n", info->highest_dstates[0], info->highest_dstates[1],(quoted diff) +0
-0
b/drivers/acpi/acpica/nsdumpdv.cindex5026594763ea..573a5f36f01a100644drivers/acpi/acpica/nsdumpdv.c +2
-3@@ -88,10 +88,9 @@ acpi_ns_dump_one_device(acpi_handle obj_handle, }ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES , -" HID: %s, ADR: %8.8X%8.8X, Status: %X\n" , +" HID: %s, ADR: %8.8X%8.8X\n" , info->hardware_id.value, -ACPI_FORMAT_UINT64 (info->address), - info->current_status)); + ACPI_FORMAT_UINT64(info->address));ACPI_FREE (info); }(quoted diff) +0
-0
b/drivers/acpi/acpica/nsxfname.cindex 106966235805..0a9c600c2599 100644drivers/acpi/acpica/nsxfname.c +1
-1@@ -241,7 +241,7 @@ static char *acpi_ns_copy_device_id(structacpi_pnp_device_id *dest, * namespace node and possibly by running several standard * control methods (Such as in the case of a device.) * - * For Device and Processor objects, run the Device _HID, _UID, _CID, _STA, + * For Device and Processor objects, run the Device _HID, _UID, _CID, * _CLS, _ADR, _sx_w, and _sx_d methods.*
* Note: Allocates the return buffer, must be freed by the caller.drivers/acpi/acpica/nsxfname.c +0
-0@@ -250,8 +250,9 @@ static char *acpi_ns_copy_device_id(structacpi_pnp_device_id *dest, * discovery namespace traversal. Therefore, no complex methods can be * executed, especially those that access operation regions. Therefore,do
* not add any additional methods that could cause problems in this
area.
- * this was the fate of the_SUBmethod which was found to cause such
- * problems and was removed (11/2015).
+ * Because of this reason support for the following methods has been removed:
+ * 1)_SUBmethod was removed (11/2015)
+ * 2)_STAmethod was removed (01/2018)
*************************************************************************
******/drivers/acpi/acpica/nsxfname.c +0
-0@@ -374,20 +375,8 @@ acpi_get_object_info(acpi_handle handle,* Notes: none of these methods are required, so they may or may
* not be present for this device. TheInfo->Validbitfield
is useddrivers/acpi/acpica/nsxfname.c +0
-2* to indicate which methods were found and run successfully. -* -* For _STA, if the method does not exist, then (as per the ACPI
drivers/acpi/acpica/nsxfname.c +0
-1-* specification), the returned current_status flags will indicate
drivers/acpi/acpica/nsxfname.c +0
-1-* that the device is present/functional/enabled. Otherwise, the
drivers/acpi/acpica/nsxfname.c +0
-8-* current_status flags reflect the value returned from _STA. */ -/* Execute the Device._STA method */ - - status =acpi_ut_execute_STA (node, &info->current_status); -if (ACPI_SUCCESS (status)) { - valid |=ACPI_VALID_STA ; - } -/* Execute the Device._ADR method */ status = acpi_ut_evaluate_numeric_object(METHOD_NAME__ADR,node, diff --git
a/include/acpi/actypes.hb/include/acpi/actypes.hindex4f077edb9b81..220ef8674763100644include/acpi/actypes.h +0
-0@@ -1191,7 +1191,6 @@ struct acpi_device_info {u8 flags;/* Miscellaneous info */ u8 highest_dstates[4 ];/* _sx_d values: 0xFF indicates not valid */
include/acpi/actypes.h +0
-3u8 lowest_dstates[5 ];/* _sx_w values: 0xFF indicates not valid */ -u32 current_status;/* _STA value */ u64 address;/* _ADR value */ struct acpi_pnp_device_id hardware_id;/* _HID value */ struct acpi_pnp_device_id unique_id;/* _UID value */ @@ -1205,7 +1204,6 @@ struct acpi_device_info {/* Flags for Valid field above (acpi_get_object_info) */ -#define ACPI_VALID_STA 0x0001#define ACPI_VALID_ADR 0x0002#define ACPI_VALID_HID 0x0004#define ACPI_VALID_UID 0x0008 --2.14.3
Re: [PATCH v3 5/5] ACPICA: Remove calling of _STA from acpi_get_object_info
Hi,
Quoted 1 line · Robert
For ACPICA, this is a change to a published public interface. A change to this will potentially affect many operating systems, so we would be very hesitant to change it in the core ACPICA code.
From the acpi_get_object_info() documentation in drivers/acpi/acpica/nsxfname.c:
* Note: This interface is intended to be used during the initial device
* discovery namespace traversal. Therefore, no complex methods can be
* executed, especially those that access operation regions.
Since _STA can call Opregions, IMHO it does not belong in acpi_get_object_info() and as Erik mentioned _STA can have side-effects then that seems like another reason to NOT call it from acpi_get_object_info().
But I can understand that you don't want to outright change the behavior of acpi_get_object_info() to call _STA since it has always done this, still calling _STA can be a problem in some cases.
Perhaps we can give acpi_get_object_info() a flags argument, or if you want to preserve the current interface ad a new acpi_get_object_info_no_sta() call (and use flags under the hood so that we still have only 1 implementation) ?
Regards,
Hans
Quoted 162 lines
Bob
Quoted 157 lines
-----Original Message-----
From: Hans de Goede [mailto:[email protected]]
Sent: Friday, January 26, 2018 7:03 AM
To: Rafael J . Wysocki <[email protected]>; Len Brown <[email protected]>; Moore, Robert <[email protected]>; Schmauss, Erik <[email protected]>; Bjorn Helgaas <[email protected]>
Cc: Hans de Goede <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: [PATCH v3 5/5] ACPICA: Remove calling of_STAfromacpi_get_object_infoAs the comment above it indicates,
acpi_get_object_infois intended for early probe usage and as such should not call any methods which may rely on OpRegions, before this commit it was also calling_STA, which on some systems does rely on OpRegions.Calling
_STAbefore things are ready leads to errors such as these:[ 0.123579] ACPI Error: No handler for Region [ECRM] (00000000ba9edc4c) [GenericSerialBus] (20170831/evregion-166) [ 0.123601] ACPI Error: Region GenericSerialBus (ID=9) has no handler (20170831/exfldio-299) [ 0.123618] ACPI Error: Method parse/execution failed \_SB.I2C1.BAT1._STA, AE_NOT_EXIST (20170831/psparse-550)End 2015 support for the
_SUBmethod was removed for exactly the same reason. Removingcurrent_statusfrom structacpi_device_infoonly has a limit impact. Within ACPICA it is only used by 2 debug messages, both of which are modified to no longer print it with this commit.Outside of ACPICA, for Linux there is only one user. For which a patch to remove the dependency on the
current_statusfield is available.Signed-off-by Hans de Goede <[email protected]>--- drivers/acpi/acpica/dbdisply.c | 5 ++--- drivers/acpi/acpica/nsdumpdv.c | 5 ++--- drivers/acpi/acpica/nsxfname.c | 19 ++++--------------- include/acpi/actypes.h | 2 -- 4 files changed, 8 insertions(+), 23 deletions(-)(quoted diff) +0
-0
b/drivers/acpi/acpica/dbdisply.cindex5a606eac0c22..7b5eb33fe962100644drivers/acpi/acpica/dbdisply.c +2
-3@@ -642,9 +642,8 @@ void acpi_db_display_object_type(char *object_arg)return ; } -acpi_os_printf ("ADR: %8.8X%8.8X, STA: %8.8X, Flags: %X\n" , -ACPI_FORMAT_UINT64 (info->address), - info->current_status, info->flags); +acpi_os_printf ("ADR: %8.8X%8.8X, Flags: %X\n" , +ACPI_FORMAT_UINT64 (info->address), info->flags); acpi_os_printf("S1D-%2.2X S2D-%2.2X S3D-%2.2X S4D-%2.2X\n", info->highest_dstates[0], info->highest_dstates[1],(quoted diff) +0
-0
b/drivers/acpi/acpica/nsdumpdv.cindex5026594763ea..573a5f36f01a100644drivers/acpi/acpica/nsdumpdv.c +2
-3@@ -88,10 +88,9 @@ acpi_ns_dump_one_device(acpi_handle obj_handle, }ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES , -" HID: %s, ADR: %8.8X%8.8X, Status: %X\n" , +" HID: %s, ADR: %8.8X%8.8X\n" , info->hardware_id.value, -ACPI_FORMAT_UINT64 (info->address), - info->current_status)); + ACPI_FORMAT_UINT64(info->address));ACPI_FREE (info); }(quoted diff) +0
-0
b/drivers/acpi/acpica/nsxfname.cindex 106966235805..0a9c600c2599 100644drivers/acpi/acpica/nsxfname.c +1
-1@@ -241,7 +241,7 @@ static char *acpi_ns_copy_device_id(structacpi_pnp_device_id *dest, * namespace node and possibly by running several standard * control methods (Such as in the case of a device.) * - * For Device and Processor objects, run the Device _HID, _UID, _CID, _STA, + * For Device and Processor objects, run the Device _HID, _UID, _CID, * _CLS, _ADR, _sx_w, and _sx_d methods.*
* Note: Allocates the return buffer, must be freed by the caller.drivers/acpi/acpica/nsxfname.c +0
-0@@ -250,8 +250,9 @@ static char *acpi_ns_copy_device_id(structacpi_pnp_device_id *dest, * discovery namespace traversal. Therefore, no complex methods can be * executed, especially those that access operation regions. Therefore,do
* not add any additional methods that could cause problems in this
area.
- * this was the fate of the_SUBmethod which was found to cause such
- * problems and was removed (11/2015).
+ * Because of this reason support for the following methods has been removed:
+ * 1)_SUBmethod was removed (11/2015)
+ * 2)_STAmethod was removed (01/2018)
*************************************************************************
******/drivers/acpi/acpica/nsxfname.c +0
-0@@ -374,20 +375,8 @@ acpi_get_object_info(acpi_handle handle,* Notes: none of these methods are required, so they may or may
* not be present for this device. TheInfo->Validbitfield
is used
* to indicate which methods were found and run successfully.drivers/acpi/acpica/nsxfname.c +0
-2-* -* For _STA, if the method does not exist, then (as per the ACPI
drivers/acpi/acpica/nsxfname.c +0
-1-* specification), the returned current_status flags will indicate
drivers/acpi/acpica/nsxfname.c +0
-1-* that the device is present/functional/enabled. Otherwise, the
drivers/acpi/acpica/nsxfname.c +0
-8-* current_status flags reflect the value returned from _STA. */ -/* Execute the Device._STA method */ - - status =acpi_ut_execute_STA (node, &info->current_status); -if (ACPI_SUCCESS (status)) { - valid |=ACPI_VALID_STA ; - } -/* Execute the Device._ADR method */ status = acpi_ut_evaluate_numeric_object(METHOD_NAME__ADR,node, diff --git
a/include/acpi/actypes.hb/include/acpi/actypes.hindex4f077edb9b81..220ef8674763100644include/acpi/actypes.h +0
-0@@ -1191,7 +1191,6 @@ struct acpi_device_info {u8 flags;/* Miscellaneous info */ u8 highest_dstates[4 ];/* _sx_d values: 0xFF indicates not valid */
u8 lowest_dstates[5]; /*_sx_wvalues:0xFFindicates not valid */include/acpi/actypes.h +0
-3-u32 current_status;/* _STA value */ u64 address;/* _ADR value */ struct acpi_pnp_device_id hardware_id;/* _HID value */ struct acpi_pnp_device_id unique_id;/* _UID value */ @@ -1205,7 +1204,6 @@ struct acpi_device_info {/* Flags for Valid field above (acpi_get_object_info) */ -#define ACPI_VALID_STA 0x0001#define ACPI_VALID_ADR 0x0002#define ACPI_VALID_HID 0x0004#define ACPI_VALID_UID 0x0008 --2.14.3
Rafael J. Wysocki
Re: [Devel] [PATCH v3 5/5] ACPICA: Remove calling of _STA from acpi_get_object_info
Quoted 26 lines · Hans de Goede
Hi,
Quoted 4 lines · Robert
For ACPICA, this is a change to a published public interface. A change to this will potentially affect many operating systems, so we would be very hesitant to change it in the core ACPICA code.
From the
acpi_get_object_info()documentation indrivers/acpi/acpica/nsxfname.c:* Note: This interface is intended to be used during the initial device
* discovery namespace traversal. Therefore, no complex methods can be
* executed, especially those that access operation regions.Since
_STAcan call Opregions, IMHO it does not belong inacpi_get_object_info()
and as Erik mentioned_STAcan have side-effects then that seems like another
reason to NOT call it fromacpi_get_object_info().But I can understand that you don't want to outright change the behavior of
acpi_get_object_info()to call_STAsince it has always done this, still calling_STAcan be a problem in some cases.
Quoted 5 lines
Perhaps we can give
acpi_get_object_info()a flags argument, or if you want to
preserve the current interface ad a newacpi_get_object_info_no_sta()call (and
use flags under the hood so that we still have only 1 implementation) ?
Let's first get the [1-4/5] from this series in (as the last patch depends on them AFAICS) and then we'll see.
Thanks,
Rafael
Re: [PATCH v3 5/5] ACPICA: Remove calling of _STA from acpi_get_object_info
In reply to Hans de GoedeHi,
Quoted 15 lines · Hans de Goede
Hi,
Quoted 1 line · Robert
For ACPICA, this is a change to a published public interface. A change to this will potentially affect many operating systems, so we would be very hesitant to change it in the core ACPICA code.
From the
acpi_get_object_info()documentation indrivers/acpi/acpica/nsxfname.c:* Note: This interface is intended to be used during the initial device
* discovery namespace traversal. Therefore, no complex methods can be
* executed, especially those that access operation regions.Since
_STAcan call Opregions, IMHO it does not belong inacpi_get_object_info()and as Erik mentioned_STAcan have side-effects then that seems like another reason to NOT call it fromacpi_get_object_info().
Quoted 7 lines
But I can understand that you don't want to outright change the behavior of
acpi_get_object_info()to call_STAsince it has always done this, still calling_STAcan be a problem in some cases.Perhaps we can give
acpi_get_object_info()a flags argument, or if you want to preserve the current interface ad a newacpi_get_object_info_no_sta()call (and use flags under the hood so that we still have only 1 implementation) ?
Erm, ping? It would be nice to get some feedback on my suggestions how to deal with this... ?
Regards,
Hans
Quoted 168 lines
Regards,
Hans
Quoted 162 lines
Bob
Quoted 157 lines
-----Original Message-----
From: Hans de Goede [mailto:[email protected]]
Sent: Friday, January 26, 2018 7:03 AM
To: Rafael J . Wysocki <[email protected]>; Len Brown <[email protected]>; Moore, Robert <[email protected]>; Schmauss, Erik <[email protected]>; Bjorn Helgaas <[email protected]>
Cc: Hans de Goede <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: [PATCH v3 5/5] ACPICA: Remove calling of_STAfromacpi_get_object_infoAs the comment above it indicates,
acpi_get_object_infois intended for early probe usage and as such should not call any methods which may rely on OpRegions, before this commit it was also calling_STA, which on some systems does rely on OpRegions.Calling
_STAbefore things are ready leads to errors such as these:[ 0.123579] ACPI Error: No handler for Region [ECRM] (
00000000ba9edc4c)
[GenericSerialBus] (20170831/evregion-166)
[ 0.123601] ACPI Error: Region GenericSerialBus (ID=9) has no handler (20170831/exfldio-299)
[ 0.123618] ACPI Error: Method parse/execution failed \_SB.I2C1.BAT1._STA,AE_NOT_EXIST(20170831/psparse-550)End 2015 support for the
_SUBmethod was removed for exactly the same reason. Removingcurrent_statusfrom structacpi_device_infoonly has a limit impact. Within ACPICA it is only used by 2 debug messages, both of which are modified to no longer print it with this commit.Outside of ACPICA, for Linux there is only one user. For which a patch to remove the dependency on the
current_statusfield is available.Signed-off-by Hans de Goede <[email protected]>---
drivers/acpi/acpica/dbdisply.c| 5 ++---drivers/acpi/acpica/nsdumpdv.c| 5 ++---drivers/acpi/acpica/nsxfname.c| 19 ++++--------------- include/acpi/actypes.h | 2 --4 files changed, 8 insertions(+), 23 deletions(-)(quoted diff) +0
-0
b/drivers/acpi/acpica/dbdisply.cindex5a606eac0c22..7b5eb33fe962100644drivers/acpi/acpica/dbdisply.c +2
-3@@ -642,9 +642,8 @@ void acpi_db_display_object_type(char *object_arg) return; } - acpi_os_printf("ADR: %8.8X%8.8X, STA: %8.8X, Flags: %X\n", - ACPI_FORMAT_UINT64(info->address), - info->current_status, info->flags); + acpi_os_printf("ADR: %8.8X%8.8X, Flags: %X\n", + ACPI_FORMAT_UINT64(info->address), info->flags); acpi_os_printf("S1D-%2.2X S2D-%2.2X S3D-%2.2X S4D-%2.2X\n", info->highest_dstates[0], info->highest_dstates[1],(quoted diff) +0
-0
b/drivers/acpi/acpica/nsdumpdv.cindex5026594763ea..573a5f36f01a100644drivers/acpi/acpica/nsdumpdv.c +2
-3@@ -88,10 +88,9 @@ acpi_ns_dump_one_device(acpi_handle obj_handle, } ACPI_DEBUG_PRINT_RAW((ACPI_DB_TABLES, - " HID: %s, ADR: %8.8X%8.8X, Status: %X\n", + " HID: %s, ADR: %8.8X%8.8X\n", info->hardware_id.value, - ACPI_FORMAT_UINT64(info->address), - info->current_status)); + ACPI_FORMAT_UINT64(info->address)); ACPI_FREE(info); }(quoted diff) +0
-0
b/drivers/acpi/acpica/nsxfname.cindex 106966235805..0a9c600c2599 100644drivers/acpi/acpica/nsxfname.c +1
-1@@ -241,7 +241,7 @@ static char *acpi_ns_copy_device_id(structacpi_pnp_device_id *dest, * namespace node and possibly by running several standard * control methods (Such as in the case of a device.) * - * For Device and Processor objects, run the Device _HID, _UID, _CID, _STA, + * For Device and Processor objects, run the Device _HID, _UID, _CID, * _CLS, _ADR, _sx_w, and _sx_d methods.*
* Note: Allocates the return buffer, must be freed by the caller.drivers/acpi/acpica/nsxfname.c +0
-0@@ -250,8 +250,9 @@ static char *acpi_ns_copy_device_id(structacpi_pnp_device_id *dest, * discovery namespace traversal. Therefore, no complex methods can be * executed, especially those that access operation regions. Therefore,do
* not add any additional methods that could cause problems in this area.
- * this was the fate of the_SUBmethod which was found to cause such
- * problems and was removed (11/2015).
+ * Because of this reason support for the following methods has been removed:
+ * 1)_SUBmethod was removed (11/2015)
+ * 2)_STAmethod was removed (01/2018)
*************************************************************************
******/drivers/acpi/acpica/nsxfname.c +0
-0@@ -374,20 +375,8 @@ acpi_get_object_info(acpi_handle handle, * Notes: none of these methods are required, so they may ormay
* not be present for this device. TheInfo->Validbitfield is used
* to indicate which methods were found and run successfully. - *
- * For_STA, if the method does not exist, then (as per the ACPI
- * specification), the returnedcurrent_statusflags will indicate
- * that the device is present/functional/enabled. Otherwise, the
- *current_statusflags reflect the value returned from_STA. */- /* Execute the Device._STA method */
drivers/acpi/acpica/nsxfname.c +0
-6- - status = acpi_ut_execute_STA(node, &info->current_status); - if (ACPI_SUCCESS(status)) { - valid |= ACPI_VALID_STA; - } -/* Execute the Device._ADR method */
status = acpi_ut_evaluate_numeric_object(METHOD_NAME__ADR, node, diff --git
a/include/acpi/actypes.hb/include/acpi/actypes.hindex4f077edb9b81..220ef8674763100644include/acpi/actypes.h +0
-0@@ -1191,7 +1191,6 @@ struct acpi_device_info {u8 flags; /* Miscellaneous info */
u8 highest_dstates[4]; /*_sx_dvalues:0xFFindicates not valid */
u8 lowest_dstates[5]; /*_sx_wvalues:0xFFindicates not valid */ - u32 current_status; /*_STAvalue */
u64 address; /*_ADRvalue */
structacpi_pnp_device_idhardware_id; /*_HIDvalue */ structacpi_pnp_device_idunique_id; /*_UIDvalue */include/acpi/actypes.h +0
-1@@ -1205,7 +1204,6 @@ struct acpi_device_info { /* Flags for Valid field above (acpi_get_object_info) */ -#define ACPI_VALID_STA 0x0001 #define ACPI_VALID_ADR 0x0002 #define ACPI_VALID_HID 0x0004 #define ACPI_VALID_UID 0x0008Signature · 1 line
2.14.3
Re: [PATCH v3 5/5] ACPICA: Remove calling of _STA from acpi_get_object_info
In reply to Hans de GoedeHi,
Quoted 15 lines · Hans de Goede
Hi,
Quoted 1 line · Robert
For ACPICA, this is a change to a published public interface. A change to this will potentially affect many operating systems, so we would be very hesitant to change it in the core ACPICA code.
From the
acpi_get_object_info()documentation indrivers/acpi/acpica/nsxfname.c:* Note: This interface is intended to be used during the initial device
* discovery namespace traversal. Therefore, no complex methods can be
* executed, especially those that access operation regions.Since
_STAcan call Opregions, IMHO it does not belong inacpi_get_object_info()and as Erik mentioned_STAcan have side-effects then that seems like another reason to NOT call it fromacpi_get_object_info().
Quoted 7 lines
But I can understand that you don't want to outright change the behavior of
acpi_get_object_info()to call_STAsince it has always done this, still calling_STAcan be a problem in some cases.Perhaps we can give
acpi_get_object_info()a flags argument, or if you want to preserve the current interface ad a newacpi_get_object_info_no_sta()call (and use flags under the hood so that we still have only 1 implementation) ?
p.s.
A cleaner fix might simply be to make whether or not acpi_get_object_info() calls _STA configurable, by say doing something like this in acconfig.h:
#ifndef ACPI_GET_OBJ_INFO_WITH_STA
#define ACPI_GET_OBJ_INFO_WITH_STA 1
#endif
And then in aclinux.h:
#define ACPI_GET_OBJ_INFO_WITH_STA 0
And instead of removing the calling of _STA all together as my initial patch did, wrap it in:
#if ACPI_GET_OBJ_INFO_WITH_STA
#endif
Shall I respin the patch to do this ?
Regards,
Hans
Quoted 158 lines
Quoted 158 lines
Quoted 157 lines
-----Original Message-----
From: Hans de Goede [mailto:[email protected]]
Sent: Friday, January 26, 2018 7:03 AM
To: Rafael J . Wysocki <[email protected]>; Len Brown <[email protected]>; Moore, Robert <[email protected]>; Schmauss, Erik <[email protected]>; Bjorn Helgaas <[email protected]>
Cc: Hans de Goede <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: [PATCH v3 5/5] ACPICA: Remove calling of_STAfromacpi_get_object_infoAs the comment above it indicates,
acpi_get_object_infois intended for early probe usage and as such should not call any methods which may rely on OpRegions, before this commit it was also calling_STA, which on some systems does rely on OpRegions.Calling
_STAbefore things are ready leads to errors such as these:[ 0.123579] ACPI Error: No handler for Region [ECRM] (
00000000ba9edc4c)
[GenericSerialBus] (20170831/evregion-166)
[ 0.123601] ACPI Error: Region GenericSerialBus (ID=9) has no handler (20170831/exfldio-299)
[ 0.123618] ACPI Error: Method parse/execution failed \_SB.I2C1.BAT1._STA,AE_NOT_EXIST(20170831/psparse-550)End 2015 support for the
_SUBmethod was removed for exactly the same reason. Removingcurrent_statusfrom structacpi_device_infoonly has a limit impact. Within ACPICA it is only used by 2 debug messages, both of which are modified to no longer print it with this commit.Outside of ACPICA, for Linux there is only one user. For which a patch to remove the dependency on the
current_statusfield is available.Signed-off-by Hans de Goede <[email protected]>---
drivers/acpi/acpica/dbdisply.c| 5 ++---drivers/acpi/acpica/nsdumpdv.c| 5 ++---drivers/acpi/acpica/nsxfname.c| 19 ++++--------------- include/acpi/actypes.h | 2 --4 files changed, 8 insertions(+), 23 deletions(-)(quoted diff) +0
-0
b/drivers/acpi/acpica/dbdisply.cindex5a606eac0c22..7b5eb33fe962100644drivers/acpi/acpica/dbdisply.c +2
-3@@ -642,9 +642,8 @@ void acpi_db_display_object_type(char *object_arg) return; } - acpi_os_printf("ADR: %8.8X%8.8X, STA: %8.8X, Flags: %X\n", - ACPI_FORMAT_UINT64(info->address), - info->current_status, info->flags); + acpi_os_printf("ADR: %8.8X%8.8X, Flags: %X\n", + ACPI_FORMAT_UINT64(info->address), info->flags); acpi_os_printf("S1D-%2.2X S2D-%2.2X S3D-%2.2X S4D-%2.2X\n", info->highest_dstates[0], info->highest_dstates[1],(quoted diff) +0
-0
b/drivers/acpi/acpica/nsdumpdv.cindex5026594763ea..573a5f36f01a100644drivers/acpi/acpica/nsdumpdv.c +2
-3@@ -88,10 +88,9 @@ acpi_ns_dump_one_device(acpi_handle obj_handle, } ACPI_DEBUG_PRINT_RAW((ACPI_DB_TABLES, - " HID: %s, ADR: %8.8X%8.8X, Status: %X\n", + " HID: %s, ADR: %8.8X%8.8X\n", info->hardware_id.value, - ACPI_FORMAT_UINT64(info->address), - info->current_status)); + ACPI_FORMAT_UINT64(info->address)); ACPI_FREE(info); }(quoted diff) +0
-0
b/drivers/acpi/acpica/nsxfname.cindex 106966235805..0a9c600c2599 100644drivers/acpi/acpica/nsxfname.c +1
-1@@ -241,7 +241,7 @@ static char *acpi_ns_copy_device_id(structacpi_pnp_device_id *dest, * namespace node and possibly by running several standard * control methods (Such as in the case of a device.) * - * For Device and Processor objects, run the Device _HID, _UID, _CID, _STA, + * For Device and Processor objects, run the Device _HID, _UID, _CID, * _CLS, _ADR, _sx_w, and _sx_d methods.*
* Note: Allocates the return buffer, must be freed by the caller.drivers/acpi/acpica/nsxfname.c +0
-0@@ -250,8 +250,9 @@ static char *acpi_ns_copy_device_id(structacpi_pnp_device_id *dest, * discovery namespace traversal. Therefore, no complex methods can be * executed, especially those that access operation regions. Therefore,do
* not add any additional methods that could cause problems in this area.
- * this was the fate of the_SUBmethod which was found to cause such
- * problems and was removed (11/2015).
+ * Because of this reason support for the following methods has been removed:
+ * 1)_SUBmethod was removed (11/2015)
+ * 2)_STAmethod was removed (01/2018)
*************************************************************************
******/drivers/acpi/acpica/nsxfname.c +0
-0@@ -374,20 +375,8 @@ acpi_get_object_info(acpi_handle handle, * Notes: none of these methods are required, so they may ormay
* not be present for this device. TheInfo->Validbitfield is used
* to indicate which methods were found and run successfully. - *
- * For_STA, if the method does not exist, then (as per the ACPI
- * specification), the returnedcurrent_statusflags will indicate
- * that the device is present/functional/enabled. Otherwise, the
- *current_statusflags reflect the value returned from_STA. */- /* Execute the Device._STA method */
drivers/acpi/acpica/nsxfname.c +0
-6- - status = acpi_ut_execute_STA(node, &info->current_status); - if (ACPI_SUCCESS(status)) { - valid |= ACPI_VALID_STA; - } -/* Execute the Device._ADR method */
status = acpi_ut_evaluate_numeric_object(METHOD_NAME__ADR, node, diff --git
a/include/acpi/actypes.hb/include/acpi/actypes.hindex4f077edb9b81..220ef8674763100644include/acpi/actypes.h +0
-0@@ -1191,7 +1191,6 @@ struct acpi_device_info {u8 flags; /* Miscellaneous info */
u8 highest_dstates[4]; /*_sx_dvalues:0xFFindicates not valid */
u8 lowest_dstates[5]; /*_sx_wvalues:0xFFindicates not valid */ - u32 current_status; /*_STAvalue */
u64 address; /*_ADRvalue */
structacpi_pnp_device_idhardware_id; /*_HIDvalue */ structacpi_pnp_device_idunique_id; /*_UIDvalue */include/acpi/actypes.h +0
-1@@ -1205,7 +1204,6 @@ struct acpi_device_info { /* Flags for Valid field above (acpi_get_object_info) */ -#define ACPI_VALID_STA 0x0001 #define ACPI_VALID_ADR 0x0002 #define ACPI_VALID_HID 0x0004 #define ACPI_VALID_UID 0x0008Signature · 1 line
2.14.3