ACPI / utils: Add acpi_evaluate_reg() helper
Subsystems (4)
PATCH v2 1/2 ACPI / utils: Add acpi_evaluate_reg() helper
With a recent fix to the pinctrl-cherryview driver we now have 2 drivers open-coding the parameter building / passing for calling _REG on an ACPI handle.
Add a helper for this, so that these 2 drivers can be converted to this helper.
---
Changes in v2:
- Fix spelling error in commit message
- Add Andy's Suggested-by and Reviewed-by
--- drivers/acpi/utils.c | 25 +++++++++++++++++++++++++ include/acpi/acpi_bus.h | 1 + 2 files changed, 26 insertions(+)
drivers/acpi/utils.c +25 -0
@@ -605,6 +605,31 @@ acpi_status acpi_evaluate_lck(acpi_handle handle, int lock)return status; } +/** +* acpi_evaluate_reg: Evaluate _REG method to register OpRegion presence +* @handle: ACPI device handle +* @space_id: ACPI address space id to register OpRegion presence for +* @function: Parameter to pass to _REG one of ACPI_REG_CONNECT or +* ACPI_REG_DISCONNECT +* +* Evaluate device's _REG method to register OpRegion presence. +*/ +acpi_status acpi_evaluate_reg (acpi_handle handle,u8 space_id,u32 function) +{ +struct acpi_object_list arg_list; +union acpi_object params[2 ]; + + params[0 ].type =ACPI_TYPE_INTEGER ; + params[0 ].integer.value = space_id; + params[1 ].type =ACPI_TYPE_INTEGER ; + params[1 ].integer.value = function; + arg_list.count =2 ; + arg_list.pointer = params; + +return acpi_evaluate_object (handle,"_REG" , &arg_list,NULL ); +} +EXPORT_SYMBOL (acpi_evaluate_reg); +/** * acpi_evaluate_dsm - evaluate device's _DSM method * @handle: ACPI device handle
include/acpi/acpi_bus.h +1 -0
@@ -44,6 +44,7 @@ acpi_status acpi_execute_simple_method(acpi_handle handle, char *method, u64 arg);acpi_status acpi_evaluate_ej0 (acpi_handle handle);acpi_status acpi_evaluate_lck (acpi_handle handle,int lock); +acpi_status acpi_evaluate_reg (acpi_handle handle,u8 space_id,u32 function);bool acpi_ata_match (acpi_handle handle);bool acpi_bay_match (acpi_handle handle);bool acpi_dock_match (acpi_handle handle);
Signature · 1 line
2.26.0
PATCH v2 2/2 ACPI / hotplug / PCI: Use the new acpi_evaluate_reg() helper
Use the new acpi_evaluate_reg() helper in the acpiphp_glue.c code.
---
Changes in v2:
- Leave comment about not caring about _REG errors in place
- Add Bjorn's Acked-by
- Add Andy's Reviewed-by
--- drivers/pci/hotplug/acpiphp_glue.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
drivers/pci/hotplug/acpiphp_glue.c +3 -10
@@ -385,19 +385,12 @@ static unsigned char acpiphp_max_busnr(struct pci_bus *bus)static void acpiphp_set_acpi_region (struct acpiphp_slot *slot) {struct acpiphp_func *func; -union acpi_object params[2 ]; -struct acpi_object_list arg_list;list_for_each_entry (func, &slot->funcs, sibling) { - arg_list.count =2 ; - arg_list.pointer = params; - params[0 ].type =ACPI_TYPE_INTEGER ; - params[0 ].integer.value =ACPI_ADR_SPACE_PCI_CONFIG ; - params[1 ].type =ACPI_TYPE_INTEGER ; - params[1 ].integer.value =1 ;/* _REG is optional, we don't care about if there is failure */ -acpi_evaluate_object (func_to_handle (func),"_REG" , &arg_list, -NULL ); +acpi_evaluate_reg (func_to_handle (func), +ACPI_ADR_SPACE_PCI_CONFIG , +ACPI_REG_CONNECT ); } }
Signature · 1 line
2.26.0
Rafael J. Wysocki
AppliedRe: [PATCH v2 2/2] ACPI / hotplug / PCI: Use the new acpi_evaluate_reg() helper
Quoted 32 lines · CEST Hans de Goede
Use the new
acpi_evaluate_reg()helper in theacpiphp_glue.ccode.Acked-by Bjorn Helgaas <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>Signed-off-by Hans de Goede <[email protected]>---
Changes in v2:
- Leave comment about not caring about_REGerrors in place
- Add Bjorn's Acked-by
- Add Andy's Reviewed-by--- drivers/pci/hotplug/acpiphp_glue.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)drivers/pci/hotplug/acpiphp_glue.c +0
-7@@ -385,19 +385,12 @@ static unsigned char acpiphp_max_busnr(struct pci_bus *bus)static void acpiphp_set_acpi_region (struct acpiphp_slot *slot) {struct acpiphp_func *func; -union acpi_object params[2 ]; -struct acpi_object_list arg_list;list_for_each_entry (func, &slot->funcs, sibling) { - arg_list.count =2 ; - arg_list.pointer = params; - params[0 ].type =ACPI_TYPE_INTEGER ; - params[0 ].integer.value =ACPI_ADR_SPACE_PCI_CONFIG ; - params[1 ].type =ACPI_TYPE_INTEGER ;
drivers/pci/hotplug/acpiphp_glue.c static unsigned char acpiphp_max_busnr(struct pci_bus *bus) · line 396
Quoted 10 lines
drivers/pci/hotplug/acpiphp_glue.c +3
-3- params[1 ].integer.value =1 ;/* _REG is optional, we don't care about if there is failure */ -acpi_evaluate_object (func_to_handle (func),"_REG" , &arg_list, -NULL ); +acpi_evaluate_reg (func_to_handle (func), +ACPI_ADR_SPACE_PCI_CONFIG , +ACPI_REG_CONNECT ); } }
Applied as 5.8 material along with the [1/2], thanks!