ACPI: EC: Install EC address space handler at the namespace root
Subsystems (2)
v2 cover ACPI: EC: Install EC address space handler at the namespace root
Hi Everyone,
This is an update of
https://lore.kernel.org/linux-acpi/5787281.DvuYhMxLoT@kreacher/
which was a follow up for the discussion in:
Patch [1/2] has been updated to avoid possible issues related to systems with defective platform firmware and patch [2/2] is a resend with a couple of tags added.
Thanks!
PATCH v2 1/2 ACPI: EC: Install address space handler at the namespace root
From: Rafael J. Wysocki <[email protected]>
It is reported that _DSM evaluation fails in ucsi_acpi_dsm() on Lenovo IdeaPad Pro 5 due to a missing address space handler for the EC address space:
ACPI Error: No handler for Region [ECSI] (000000007b8176ee) [EmbeddedControl] (20230628/evregion-130)
This happens because if there is no ECDT, the EC driver only registers the EC address space handler for operation regions defined in the EC device scope of the ACPI namespace while the operation region being accessed by the _DSM in question is located beyond that scope.
To address this, modify the ACPI EC driver to install the EC address space handler at the root of the ACPI namespace for the first EC that can be found regardless of whether or not an ECDT is present.
Note that this change is consistent with some examples in the ACPI specification in which EC operation regions located outside the EC device scope are used (for example, see Section 9.17.15 in ACPI 6.5), so the current behavior of the EC driver is arguably questionable.
---
v1 -> v2:
* Update the changelog to correctly cover the driver behavior when ECDT is present
* Install the address space handler at the namespace root for first_ec only
* Set first_ec before calling ec_install_handlers() in
acpi_ec_setup() (Hans)
--- drivers/acpi/ec.c | 25 ++++++++++++++++--------- drivers/acpi/internal.h | 1 - 2 files changed, 16 insertions(+), 10 deletions(-)
drivers/acpi/ec.c +16 -9
@@ -1482,13 +1482,14 @@ static bool install_gpio_irq_event_handlstatic int ec_install_handlers (struct acpi_ec *ec,struct acpi_device *device,bool call_reg) { +acpi_handle scope_handle = ec == first_ec ?ACPI_ROOT_OBJECT : ec->handle;acpi_status status;acpi_ec_start (ec, false);if (!test_bit (EC_FLAGS_EC_HANDLER_INSTALLED , &ec->flags)) {acpi_ec_enter_noirq (ec); - status =acpi_install_address_space_handler_no_reg (ec->handle, + status =acpi_install_address_space_handler_no_reg (scope_handle,ACPI_ADR_SPACE_EC , &acpi_ec_space_handler,NULL , ec);
@@ -1497,11 +1498,10 @@ static int ec_install_handlers(struct acreturn -ENODEV ; }set_bit (EC_FLAGS_EC_HANDLER_INSTALLED , &ec->flags); - ec->address_space_handler_holder = ec->handle; }if (call_reg && !test_bit (EC_FLAGS_EC_REG_CALLED , &ec->flags)) { -acpi_execute_reg_methods (ec->handle,ACPI_ADR_SPACE_EC ); +acpi_execute_reg_methods (scope_handle,ACPI_ADR_SPACE_EC );set_bit (EC_FLAGS_EC_REG_CALLED , &ec->flags); }
@@ -1553,10 +1553,13 @@ static int ec_install_handlers(struct acstatic void ec_remove_handlers (struct acpi_ec *ec) { +acpi_handle scope_handle = ec == first_ec ?ACPI_ROOT_OBJECT : ec->handle; +if (test_bit (EC_FLAGS_EC_HANDLER_INSTALLED , &ec->flags)) {if (ACPI_FAILURE (acpi_remove_address_space_handler ( - ec->address_space_handler_holder, -ACPI_ADR_SPACE_EC , &acpi_ec_space_handler))) + scope_handle, +ACPI_ADR_SPACE_EC , + &acpi_ec_space_handler)))pr_err ("failed to remove space handler\n" );clear_bit (EC_FLAGS_EC_HANDLER_INSTALLED , &ec->flags); }
@@ -1595,14 +1598,18 @@ static int acpi_ec_setup(struct acpi_ec {int ret; - ret =ec_install_handlers (ec, device, call_reg); -if (ret) -return ret; -/* First EC capable of handling transactions */ if (!first_ec) first_ec = ec; + ret =ec_install_handlers (ec, device, call_reg); +if (ret) { +if (ec == first_ec) + first_ec =NULL ; + +return ret; + } +pr_info ("EC_CMD/EC_SC=0x%lx, EC_DATA=0x%lx\n" , ec->command_addr, ec->data_addr);
drivers/acpi/internal.h +0 -1
@@ -186,7 +186,6 @@ enum acpi_ec_event_state {struct acpi_ec {acpi_handle handle; -acpi_handle address_space_handler_holder;int gpe;int irq;unsigned long command_addr;
Re: [PATCH v2 1/2] ACPI: EC: Install address space handler at the namespace root
Quoted 21 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
It is reported that
_DSMevaluation fails inucsi_acpi_dsm()on Lenovo IdeaPad Pro 5 due to a missing address space handler for the EC address space:ACPI Error: No handler for Region [ECSI] (
000000007b8176ee) [EmbeddedControl] (20230628/evregion-130)This happens because if there is no ECDT, the EC driver only registers the EC address space handler for operation regions defined in the EC device scope of the ACPI namespace while the operation region being accessed by the
_DSMin question is located beyond that scope.To address this, modify the ACPI EC driver to install the EC address space handler at the root of the ACPI namespace for the first EC that can be found regardless of whether or not an ECDT is present.
Note that this change is consistent with some examples in the ACPI specification in which EC operation regions located outside the EC device scope are used (for example, see Section 9.17.15 in ACPI 6.5), so the current behavior of the EC driver is arguably questionable.
...
drivers/acpi/ec.c static bool install_gpio_irq_event_handl · line 1495
Quoted 5 lines
drivers/acpi/ec.c +1
-1- status =acpi_install_address_space_handler_no_reg (ec->handle, + status =acpi_install_address_space_handler_no_reg (scope_handle,ACPI_ADR_SPACE_EC , &acpi_ec_space_handler,NULL , ec);
Looking at this...
drivers/acpi/ec.c static int ec_install_handlers(struct ac · line 1562
Quoted 4 lines
drivers/acpi/ec.c +3
-0if (ACPI_FAILURE (acpi_remove_address_space_handler ( + scope_handle, +ACPI_ADR_SPACE_EC , + &acpi_ec_space_handler)))
...and this, I believe you can move scope_handle to the previous line and align the rest for the sake of consistency and slightly better readability.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Rafael J. Wysocki
maintainerRe: [PATCH v2 1/2] ACPI: EC: Install address space handler at the namespace root
Quoted 34 lines · Andy Shevchenko
Quoted 21 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
It is reported that
_DSMevaluation fails inucsi_acpi_dsm()on Lenovo IdeaPad Pro 5 due to a missing address space handler for the EC address space:ACPI Error: No handler for Region [ECSI] (
000000007b8176ee) [EmbeddedControl] (20230628/evregion-130)This happens because if there is no ECDT, the EC driver only registers the EC address space handler for operation regions defined in the EC device scope of the ACPI namespace while the operation region being accessed by the
_DSMin question is located beyond that scope.To address this, modify the ACPI EC driver to install the EC address space handler at the root of the ACPI namespace for the first EC that can be found regardless of whether or not an ECDT is present.
Note that this change is consistent with some examples in the ACPI specification in which EC operation regions located outside the EC device scope are used (for example, see Section 9.17.15 in ACPI 6.5), so the current behavior of the EC driver is arguably questionable.
...
drivers/acpi/ec.c static bool install_gpio_irq_event_handl · line 1495
Quoted 5 lines
drivers/acpi/ec.c +1
-1- status =acpi_install_address_space_handler_no_reg (ec->handle, + status =acpi_install_address_space_handler_no_reg (scope_handle,ACPI_ADR_SPACE_EC , &acpi_ec_space_handler,NULL , ec);Looking at this...
Quoted 7 lines
drivers/acpi/ec.c static int ec_install_handlers(struct ac · line 1562
Quoted 4 lines
if (ACPI_FAILURE(acpi_remove_address_space_handler(drivers/acpi/ec.c +3
-0+ scope_handle, +ACPI_ADR_SPACE_EC , + &acpi_ec_space_handler)))...and this, I believe you can move
scope_handleto the previous line and align the rest for the sake of consistency and slightly better readability.
Well, I prefer to cut a separate cleanup patch to make this more consistent.
PATCH v2 2/2 platform/x86: wmi: Remove custom EC address space handler
In reply to Rafael J. WysockiFrom: Rafael J. Wysocki <[email protected]>
The custom EC address space handler in the WMI driver was only needed because the EC driver did not install its address space handler for EC operation regions beyond the EC device scope in the ACPI namespace.
That has just changed, so the custom EC address handler is not needed any more and it can be removed.
---
v1 -> v2: Add R-by tags from Heikki and Armin.
Note that this is on top of acpi-6.9-rc1, so it may need to be rebased before applying.
--- drivers/platform/x86/wmi.c | 62 --------------------------------------------- 1 file changed, 62 deletions(-)
drivers/platform/x86/wmi.c +0 -62
@@ -1153,47 +1153,6 @@ static int parse_wdg(struct device *wmi_return 0 ; } -/* -* WMI can have EmbeddedControl access regions. In which case, we just want to -* hand these off to the EC driver. -*/ -static acpi_status -acpi_wmi_ec_space_handler (u32 function,acpi_physical_address address, -u32 bits,u64 *value, -void *handler_context,void *region_context) -{ -int result =0 ; -u8 temp =0 ; - -if ((address >0xFF ) || !value) -return AE_BAD_PARAMETER ; - -if (function !=ACPI_READ && function !=ACPI_WRITE ) -return AE_BAD_PARAMETER ; - -if (bits !=8 ) -return AE_BAD_PARAMETER ; - -if (function ==ACPI_READ ) { - result =ec_read (address, &temp); - *value = temp; - }else { - temp =0xff & *value; - result =ec_write (address, temp); - } - -switch (result) { -case -EINVAL : -return AE_BAD_PARAMETER ; -case -ENODEV : -return AE_NOT_FOUND ; -case -ETIME : -return AE_TIME ; -default : -return AE_OK ; - } -} -static int wmi_get_notify_data (struct wmi_block *wblock,union acpi_object **obj) {struct acpi_buffer data = {ACPI_ALLOCATE_BUFFER ,NULL };
@@ -1308,14 +1267,6 @@ static void acpi_wmi_remove_notify_handlacpi_remove_notify_handler (acpi_device->handle,ACPI_ALL_NOTIFY , acpi_wmi_notify_handler); } -static void acpi_wmi_remove_address_space_handler (void *data) -{ -struct acpi_device *acpi_device = data; - -acpi_remove_address_space_handler (acpi_device->handle,ACPI_ADR_SPACE_EC , - &acpi_wmi_ec_space_handler); -} -static void acpi_wmi_remove_bus_device (void *data) {struct device *wmi_bus_dev = data;
@@ -1347,19 +1298,6 @@ static int acpi_wmi_probe(struct platfordev_set_drvdata (&device->dev, wmi_bus_dev); - status =acpi_install_address_space_handler (acpi_device->handle, -ACPI_ADR_SPACE_EC , - &acpi_wmi_ec_space_handler, -NULL ,NULL ); -if (ACPI_FAILURE (status)) { -dev_err (&device->dev,"Error installing EC region handler\n" ); -return -ENODEV ; - } - error =devm_add_action_or_reset (&device->dev, acpi_wmi_remove_address_space_handler, - acpi_device); -if (error <0 ) -return error; - status =acpi_install_notify_handler (acpi_device->handle,ACPI_ALL_NOTIFY , acpi_wmi_notify_handler, wmi_bus_dev);if (ACPI_FAILURE (status)) {
Hi,
Quoted 6 lines · Rafael J. Wysocki
Hi Everyone,
This is an update of
https://lore.kernel.org/linux-acpi/5787281.DvuYhMxLoT@kreacher/
Quoted 7 lines
which was a follow up for the discussion in:
Patch [1/2] has been updated to avoid possible issues related to systems with defective platform firmware and patch [2/2] is a resend with a couple of tags added.
Thanks, the series looks good to me:
for the series.
I assume you are going to send this in as a fix for 6.10 ?
In that case feel free to merge both patches through the linux-pm tree.
Regards,
Hans
Rafael J. Wysocki
maintainerQuoted 18 lines · Hans de Goede
Hi,
Quoted 6 lines · Rafael J. Wysocki
Hi Everyone,
This is an update of
https://lore.kernel.org/linux-acpi/5787281.DvuYhMxLoT@kreacher/
Quoted 7 lines
which was a follow up for the discussion in:
Patch [1/2] has been updated to avoid possible issues related to systems with defective platform firmware and patch [2/2] is a resend with a couple of tags added.
Quoted 7 lines
Thanks, the series looks good to me:
Reviewed-by Hans de Goede <[email protected]>for the series.
I assume you are going to send this in as a fix for 6.10 ?
Yes, I am.
Quoted 2 lines
In that case feel free to merge both patches through the linux-pm tree.
Thank you!
Hi,
Quoted 25 lines · Rafael J. Wysocki
Quoted 24 lines · Hans de Goede
Hi,
Quoted 6 lines · Rafael J. Wysocki
Hi Everyone,
This is an update of
https://lore.kernel.org/linux-acpi/5787281.DvuYhMxLoT@kreacher/
Quoted 7 lines
which was a follow up for the discussion in:
Patch [1/2] has been updated to avoid possible issues related to systems with defective platform firmware and patch [2/2] is a resend with a couple of tags added.
Thanks, the series looks good to me:
Reviewed-by Hans de Goede <[email protected]>for the series.
Quoted 8 lines
Quoted 1 line
I assume you are going to send this in as a fix for 6.10 ?
Yes, I am.
Quoted 2 lines
In that case feel free to merge both patches through the linux-pm tree.
Thank you!
Hmm, I just realized that this:
Is part of the main pdx86 pull-request for 6.10 which I'm going to send to Linus in the next 10 minutes or so. So that is going to conflict with your 2/2.
Options:
a) You only send 1/2 upstream as a fix and I'll then send a rebased 2/2 upstream as part of the first pdx86 pull-request.
b) You merge the git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
platform-drivers-x86-v6.10-1 tag (which is the tag for the pull-request
I'm about to send to Linus) and rebase on top of that before sending
a pull-request for both to Linus.
Either way works for me.
Regards,
Hans
Hi,
Quoted 41 lines · Hans de Goede
Hi,
Quoted 25 lines · Rafael J. Wysocki
Quoted 24 lines · Hans de Goede
Hi,
Quoted 6 lines · Rafael J. Wysocki
Hi Everyone,
This is an update of
https://lore.kernel.org/linux-acpi/5787281.DvuYhMxLoT@kreacher/
Quoted 7 lines
which was a follow up for the discussion in:
Patch [1/2] has been updated to avoid possible issues related to systems with defective platform firmware and patch [2/2] is a resend with a couple of tags added.
Thanks, the series looks good to me:
Reviewed-by Hans de Goede <[email protected]>for the series.
Quoted 8 lines
Quoted 1 line
I assume you are going to send this in as a fix for 6.10 ?
Yes, I am.
Quoted 2 lines
In that case feel free to merge both patches through the linux-pm tree.
Thank you!
Hmm, I just realized that this:
Quoted 8 lines
Is part of the main pdx86 pull-request for 6.10 which I'm going to send to Linus in the next 10 minutes or so. So that is going to conflict with your 2/2.
Options:
a) You only send 1/2 upstream as a fix and I'll then send a rebased 2/2 upstream as part of the first pdx86 pull-request.
That should be "as part of the first pdx86 fixes pull-request" (for 6.10).
Quoted 6 lines
b) You merge the
git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
platform-drivers-x86-v6.10-1 tag (which is the tag for the pull-request
I'm about to send to Linus) and rebase on top of that before sending
a pull-request for both to Linus.Either way works for me.
Regards,
Hans
Rafael J. Wysocki
maintainerHi,
Quoted 48 lines · Hans de Goede
Hi,
Quoted 25 lines · Rafael J. Wysocki
Quoted 24 lines · Hans de Goede
Hi,
Quoted 6 lines · Rafael J. Wysocki
Hi Everyone,
This is an update of
https://lore.kernel.org/linux-acpi/5787281.DvuYhMxLoT@kreacher/
Quoted 7 lines
which was a follow up for the discussion in:
Patch [1/2] has been updated to avoid possible issues related to systems with defective platform firmware and patch [2/2] is a resend with a couple of tags added.
Thanks, the series looks good to me:
Reviewed-by Hans de Goede <[email protected]>for the series.
Quoted 8 lines
Quoted 1 line
I assume you are going to send this in as a fix for 6.10 ?
Yes, I am.
Quoted 2 lines
In that case feel free to merge both patches through the linux-pm tree.
Thank you!
Hmm, I just realized that this:
Is part of the main pdx86 pull-request for 6.10 which I'm going to send to Linus in the next 10 minutes or so. So that is going to conflict with your 2/2.
Options:
Quoted 7 lines
a) You only send 1/2 upstream as a fix and I'll then send a rebased 2/2 upstream as part of the first pdx86 pull-request.
b) You merge the
git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
platform-drivers-x86-v6.10-1 tag (which is the tag for the pull-request
I'm about to send to Linus) and rebase on top of that before sending
a pull-request for both to Linus.
I would rather wait for Linus to merge your PR and merge my changes on top of his merge.
Hi,
Quoted 54 lines · Rafael J. Wysocki
Hi,
Quoted 51 lines · Hans de Goede
Hi,
Quoted 25 lines · Rafael J. Wysocki
Quoted 24 lines · Hans de Goede
Hi,
Quoted 6 lines · Rafael J. Wysocki
Hi Everyone,
This is an update of
https://lore.kernel.org/linux-acpi/5787281.DvuYhMxLoT@kreacher/
Quoted 7 lines
which was a follow up for the discussion in:
Patch [1/2] has been updated to avoid possible issues related to systems with defective platform firmware and patch [2/2] is a resend with a couple of tags added.
Thanks, the series looks good to me:
Reviewed-by Hans de Goede <[email protected]>for the series.
Quoted 8 lines
Quoted 1 line
I assume you are going to send this in as a fix for 6.10 ?
Yes, I am.
Quoted 2 lines
In that case feel free to merge both patches through the linux-pm tree.
Thank you!
Hmm, I just realized that this:
Is part of the main pdx86 pull-request for 6.10 which I'm going to send to Linus in the next 10 minutes or so. So that is going to conflict with your 2/2.
Options:
a) You only send 1/2 upstream as a fix and I'll then send a rebased 2/2 upstream as part of the first pdx86 pull-request.
Quoted 7 lines
Quoted 4 lines
b) You merge the
git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
platform-drivers-x86-v6.10-1 tag (which is the tag for the pull-request
I'm about to send to Linus) and rebase on top of that before sending
a pull-request for both to Linus.I would rather wait for Linus to merge your PR and merge my changes on top of his merge.
That is fine too. I just send out the pull-request so hopefully Linus will merge it soon(ish).
Note (stating the obvious) when rebasing 2/2 you will pretty much need to remove all the new code added by:
Regards,
Hans
Rafael J. Wysocki
maintainerHi,
Quoted 66 lines · Hans de Goede
Hi,
Quoted 54 lines · Rafael J. Wysocki
Hi,
Quoted 51 lines · Hans de Goede
Hi,
Quoted 25 lines · Rafael J. Wysocki
Quoted 24 lines · Hans de Goede
Hi,
Quoted 6 lines · Rafael J. Wysocki
Hi Everyone,
This is an update of
https://lore.kernel.org/linux-acpi/5787281.DvuYhMxLoT@kreacher/
Quoted 7 lines
which was a follow up for the discussion in:
Patch [1/2] has been updated to avoid possible issues related to systems with defective platform firmware and patch [2/2] is a resend with a couple of tags added.
Thanks, the series looks good to me:
Reviewed-by Hans de Goede <[email protected]>for the series.
Quoted 8 lines
Quoted 1 line
I assume you are going to send this in as a fix for 6.10 ?
Yes, I am.
Quoted 2 lines
In that case feel free to merge both patches through the linux-pm tree.
Thank you!
Hmm, I just realized that this:
Is part of the main pdx86 pull-request for 6.10 which I'm going to send to Linus in the next 10 minutes or so. So that is going to conflict with your 2/2.
Options:
a) You only send 1/2 upstream as a fix and I'll then send a rebased 2/2 upstream as part of the first pdx86 pull-request.
Quoted 7 lines
Quoted 4 lines
b) You merge the
git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
platform-drivers-x86-v6.10-1 tag (which is the tag for the pull-request
I'm about to send to Linus) and rebase on top of that before sending
a pull-request for both to Linus.I would rather wait for Linus to merge your PR and merge my changes on top of his merge.
Quoted 7 lines
That is fine too. I just send out the pull-request so hopefully Linus will merge it soon(ish).
Note (stating the obvious) when rebasing 2/2 you will pretty much need to remove all the new code added by:
I see, thanks for the notice!
Quoted 8 lines · Rafael J. Wysocki
Hi Everyone,
This is an update of
https://lore.kernel.org/linux-acpi/5787281.DvuYhMxLoT@kreacher/
which was a follow up for the discussion in:
Quoted 10 lines
Patch [1/2] has been updated to avoid possible issues related to systems with defective platform firmware and patch [2/2] is a resend with a couple of tags added.
Thanks!
Looks great, thanks.
Quoted 6 lines · Rafael J. Wysocki
Hi Everyone,
This is an update of
https://lore.kernel.org/linux-acpi/5787281.DvuYhMxLoT@kreacher/
Quoted 7 lines
which was a follow up for the discussion in:
Patch [1/2] has been updated to avoid possible issues related to systems with defective platform firmware and patch [2/2] is a resend with a couple of tags added.
FWIW, LGTM (and I followed the discussions around this)
Signature · 2 lines
With Best Regards, Andy Shevchenko