| Message ID | 260ee0c6c9481ceae79b967a95b5e9fe76c2eabc.1450036445.git.jerry.hoemann@hpe.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Mon, Dec 14, 2015 at 2:54 AM, Jerry Hoemann <jerry.hoemann@hpe.com> wrote: > The ACPI spec speicifies that arguments "Revision ID" and > "Function Index" to a _DSM are type "Integer." Type Integers > are 64 bit quantities. > > The function evaluate_dsm specifies these types as simple "int" > which are 32 bits. Correct type passed to acpi_evaluate_dsm > and its callers and derived callers to pass correct type. > > acpi_check_dsm and acpi_evaluate_dsm_typed had similar issue > and were corrected as well. > > Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com> The changes look OK to me, but this is not ACPICA material. Please change the subject to something like "ACPI / utils: Fix acpi_evaluate_dsm() argument type". Thanks, Rafael
On Mon, Dec 14, 2015 at 03:07:22AM +0100, Rafael J. Wysocki wrote: > On Mon, Dec 14, 2015 at 2:54 AM, Jerry Hoemann <jerry.hoemann@hpe.com> wrote: > > The ACPI spec speicifies that arguments "Revision ID" and > > "Function Index" to a _DSM are type "Integer." Type Integers > > are 64 bit quantities. > > > > The function evaluate_dsm specifies these types as simple "int" > > which are 32 bits. Correct type passed to acpi_evaluate_dsm > > and its callers and derived callers to pass correct type. > > > > acpi_check_dsm and acpi_evaluate_dsm_typed had similar issue > > and were corrected as well. > > > > Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com> > > The changes look OK to me, but this is not ACPICA material. > > Please change the subject to something like "ACPI / utils: Fix > acpi_evaluate_dsm() argument type". > > Thanks, > Rafael Will do. thanks.
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index 475c907..049cba4 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c @@ -628,7 +628,7 @@ acpi_status acpi_evaluate_lck(acpi_handle handle, int lock) * some old BIOSes do expect a buffer or an integer etc. */ union acpi_object * -acpi_evaluate_dsm(acpi_handle handle, const u8 *uuid, int rev, int func, +acpi_evaluate_dsm(acpi_handle handle, const u8 *uuid, u64 rev, u64 func, union acpi_object *argv4) { acpi_status ret; @@ -677,7 +677,7 @@ EXPORT_SYMBOL(acpi_evaluate_dsm); * functions. Currently only support 64 functions at maximum, should be * enough for now. */ -bool acpi_check_dsm(acpi_handle handle, const u8 *uuid, int rev, u64 funcs) +bool acpi_check_dsm(acpi_handle handle, const u8 *uuid, u64 rev, u64 funcs) { int i; u64 mask = 0; diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 5ba8fb6..37a7006 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -61,12 +61,12 @@ bool acpi_ata_match(acpi_handle handle); bool acpi_bay_match(acpi_handle handle); bool acpi_dock_match(acpi_handle handle); -bool acpi_check_dsm(acpi_handle handle, const u8 *uuid, int rev, u64 funcs); +bool acpi_check_dsm(acpi_handle handle, const u8 *uuid, u64 rev, u64 funcs); union acpi_object *acpi_evaluate_dsm(acpi_handle handle, const u8 *uuid, - int rev, int func, union acpi_object *argv4); + u64 rev, u64 func, union acpi_object *argv4); static inline union acpi_object * -acpi_evaluate_dsm_typed(acpi_handle handle, const u8 *uuid, int rev, int func, +acpi_evaluate_dsm_typed(acpi_handle handle, const u8 *uuid, u64 rev, u64 func, union acpi_object *argv4, acpi_object_type type) { union acpi_object *obj;
The ACPI spec speicifies that arguments "Revision ID" and "Function Index" to a _DSM are type "Integer." Type Integers are 64 bit quantities. The function evaluate_dsm specifies these types as simple "int" which are 32 bits. Correct type passed to acpi_evaluate_dsm and its callers and derived callers to pass correct type. acpi_check_dsm and acpi_evaluate_dsm_typed had similar issue and were corrected as well. Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com> --- drivers/acpi/utils.c | 4 ++-- include/acpi/acpi_bus.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)