p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ACPICA: Use local 64-bit divide support for string conversions 

ACPICA commit f230f4df26d07b97ef00be39156ecee64250447d

On 32-bit platforms, 64-bit divide often requires a library
function which may not be present in the build.

Link: https://github.com/acpica/acpica/commit/f230f4df
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Bob Moore 2017-11-17 15:42:16 -08:00 committed by Rafael J. Wysocki
parent 8ca86e82b9
commit db53f7f0eb
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/acpi/acpica/utstrsuppt.c
View File

@ -52,10 +52,9 @@ static acpi_status
acpi_ut_insert_digit(u64 *accumulated_value, u32 base, int ascii_digit); acpi_ut_insert_digit(u64 *accumulated_value, u32 base, int ascii_digit);
static acpi_status static acpi_status
acpi_ut_strtoul_multiply64(u64 multiplicand, u64 multiplier, u64 *out_product); acpi_ut_strtoul_multiply64(u64 multiplicand, u32 base, u64 *out_product);
static acpi_status static acpi_status acpi_ut_strtoul_add64(u64 addend1, u32 digit, u64 *out_sum);
acpi_ut_strtoul_add64(u64 addend1, u64 addend2, u64 *out_sum);
/******************************************************************************* /*******************************************************************************
* *
@ -357,7 +356,7 @@ acpi_ut_insert_digit(u64 *accumulated_value, u32 base, int ascii_digit)
* FUNCTION: acpi_ut_strtoul_multiply64 * FUNCTION: acpi_ut_strtoul_multiply64
* *
* PARAMETERS: multiplicand - Current accumulated converted integer * PARAMETERS: multiplicand - Current accumulated converted integer
* multiplier - Base/Radix * base - Base/Radix
* out_product - Where the product is returned * out_product - Where the product is returned
* *
* RETURN: Status and 64-bit product * RETURN: Status and 64-bit product
@ -369,25 +368,32 @@ acpi_ut_insert_digit(u64 *accumulated_value, u32 base, int ascii_digit)
******************************************************************************/ ******************************************************************************/
static acpi_status static acpi_status
acpi_ut_strtoul_multiply64(u64 multiplicand, u64 multiplier, u64 *out_product) acpi_ut_strtoul_multiply64(u64 multiplicand, u32 base, u64 *out_product)
{ {
u64 val; u64 val;
u64 quotient;
/* Exit if either operand is zero */ /* Exit if either operand is zero */
*out_product = 0; *out_product = 0;
if (!multiplicand || !multiplier) { if (!multiplicand || !base) {
return (AE_OK); return (AE_OK);
} }
/* Check for 64-bit overflow before the actual multiplication */ /*
* Check for 64-bit overflow before the actual multiplication.
acpi_ut_short_divide(ACPI_UINT64_MAX, (u32)multiplier, &val, NULL); *
if (multiplicand > val) { * Notes: 64-bit division is often not supported on 32-bit platforms
* (it requires a library function), Therefore ACPICA has a local
* 64-bit divide function. Also, Multiplier is currently only used
* as the radix (8/10/16), to the 64/32 divide will always work.
*/
acpi_ut_short_divide(ACPI_UINT64_MAX, base, &quotient, NULL);
if (multiplicand > quotient) {
return (AE_NUMERIC_OVERFLOW); return (AE_NUMERIC_OVERFLOW);
} }
val = multiplicand * multiplier; val = multiplicand * base;
/* Check for 32-bit overflow if necessary */ /* Check for 32-bit overflow if necessary */
@ -404,7 +410,7 @@ acpi_ut_strtoul_multiply64(u64 multiplicand, u64 multiplier, u64 *out_product)
* FUNCTION: acpi_ut_strtoul_add64 * FUNCTION: acpi_ut_strtoul_add64
* *
* PARAMETERS: addend1 - Current accumulated converted integer * PARAMETERS: addend1 - Current accumulated converted integer
* addend2 - New hex value/char * digit - New hex value/char
* out_sum - Where sum is returned (Accumulator) * out_sum - Where sum is returned (Accumulator)
* *
* RETURN: Status and 64-bit sum * RETURN: Status and 64-bit sum
@ -415,17 +421,17 @@ acpi_ut_strtoul_multiply64(u64 multiplicand, u64 multiplier, u64 *out_product)
* *
******************************************************************************/ ******************************************************************************/
static acpi_status acpi_ut_strtoul_add64(u64 addend1, u64 addend2, u64 *out_sum) static acpi_status acpi_ut_strtoul_add64(u64 addend1, u32 digit, u64 *out_sum)
{ {
u64 sum; u64 sum;
/* Check for 64-bit overflow before the actual addition */ /* Check for 64-bit overflow before the actual addition */
if ((addend1 > 0) && (addend2 > (ACPI_UINT64_MAX - addend1))) { if ((addend1 > 0) && (digit > (ACPI_UINT64_MAX - addend1))) {
return (AE_NUMERIC_OVERFLOW); return (AE_NUMERIC_OVERFLOW);
} }
sum = addend1 + addend2; sum = addend1 + digit;
/* Check for 32-bit overflow if necessary */ /* Check for 32-bit overflow if necessary */