ACPI: utils: introduce acpi_get_local_u64_address()

The ACPI _ADR is a 64-bit value. We changed the definitions in commit
ca6f998cf9a2 ("ACPI: bus: change _ADR representation to 64 bits") but
some helpers still assume the value is a 32-bit value.

This patch adds a new helper to extract the full 64-bits. The existing
32-bit helper is kept for backwards-compatibility and cases where the
_ADR is known to fit in a 32-bit value.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20240528192936.16180-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 202234ba54bd93989aed1d43fb152e78ed1797b1..ae93842822733e1358652905976efedd111fa76d 100644 (file)
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -277,15 +277,25 @@ acpi_evaluate_integer(acpi_handle handle,
 
 EXPORT_SYMBOL(acpi_evaluate_integer);
 
-int acpi_get_local_address(acpi_handle handle, u32 *addr)
+int acpi_get_local_u64_address(acpi_handle handle, u64 *addr)
 {
-       unsigned long long adr;
        acpi_status status;
 
-       status = acpi_evaluate_integer(handle, METHOD_NAME__ADR, NULL, &adr);
+       status = acpi_evaluate_integer(handle, METHOD_NAME__ADR, NULL, addr);
        if (ACPI_FAILURE(status))
                return -ENODATA;
+       return 0;
+}
+EXPORT_SYMBOL(acpi_get_local_u64_address);
+
+int acpi_get_local_address(acpi_handle handle, u32 *addr)
+{
+       u64 adr;
+       int ret;
 
+       ret = acpi_get_local_u64_address(handle, &adr);
+       if (ret < 0)
+               return ret;
        *addr = (u32)adr;
        return 0;
 }

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 28c3fb2bef0daacbd524476dc3a4fd97de29b22c..65e7177bcb02d24adf90507d6c337d092218a5b0 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -761,6 +761,7 @@ static inline u64 acpi_arch_get_root_pointer(void)
 }
 #endif
 
+int acpi_get_local_u64_address(acpi_handle handle, u64 *addr);
 int acpi_get_local_address(acpi_handle handle, u32 *addr);
 const char *acpi_get_subsystem_id(acpi_handle handle);