superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

firmware: exynos-acpm: fix PMIC returned errno 

ACPM PMIC command handlers returned a u8 value when they should
have returned either zero or negative error codes.
Translate the APM PMIC errno to linux errno.

Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/linux-input/aElHlTApXj-W_o1r@stanley.mountain/
Fixes: a88927b534 ("firmware: add Exynos ACPM protocol driver")
Cc: stable@vger.kernel.org
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
pull/1354/merge
Tudor Ambarus 2025-09-08 14:02:00 +00:00 committed by Krzysztof Kozlowski
parent 187a3426a6
commit 1da4cbefed
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/firmware/samsung/exynos-acpm-pmic.c
View File

@ -4,7 +4,9 @@
* Copyright 2020 Google LLC. * Copyright 2020 Google LLC.
* Copyright 2024 Linaro Ltd. * Copyright 2024 Linaro Ltd.
*/ */
#include <linux/array_size.h>
#include <linux/bitfield.h> #include <linux/bitfield.h>
#include <linux/errno.h>
#include <linux/firmware/samsung/exynos-acpm-protocol.h> #include <linux/firmware/samsung/exynos-acpm-protocol.h>
#include <linux/ktime.h> #include <linux/ktime.h>
#include <linux/types.h> #include <linux/types.h>
@ -33,6 +35,19 @@ enum exynos_acpm_pmic_func {
ACPM_PMIC_BULK_WRITE, ACPM_PMIC_BULK_WRITE,
}; };
static const int acpm_pmic_linux_errmap[] = {
[0] = 0, /* ACPM_PMIC_SUCCESS */
[1] = -EACCES, /* Read register can't be accessed or issues to access it. */
[2] = -EACCES, /* Write register can't be accessed or issues to access it. */
};
static int acpm_pmic_to_linux_err(int err)
{
if (err >= 0 && err < ARRAY_SIZE(acpm_pmic_linux_errmap))
return acpm_pmic_linux_errmap[err];
return -EIO;
}
static inline u32 acpm_pmic_set_bulk(u32 data, unsigned int i) static inline u32 acpm_pmic_set_bulk(u32 data, unsigned int i)
{ {
return (data & ACPM_PMIC_BULK_MASK) << (ACPM_PMIC_BULK_SHIFT * i); return (data & ACPM_PMIC_BULK_MASK) << (ACPM_PMIC_BULK_SHIFT * i);
@ -79,7 +94,7 @@ int acpm_pmic_read_reg(const struct acpm_handle *handle,
*buf = FIELD_GET(ACPM_PMIC_VALUE, xfer.rxd[1]); *buf = FIELD_GET(ACPM_PMIC_VALUE, xfer.rxd[1]);
return FIELD_GET(ACPM_PMIC_RETURN, xfer.rxd[1]); return acpm_pmic_to_linux_err(FIELD_GET(ACPM_PMIC_RETURN, xfer.rxd[1]));
} }
static void acpm_pmic_init_bulk_read_cmd(u32 cmd[4], u8 type, u8 reg, u8 chan, static void acpm_pmic_init_bulk_read_cmd(u32 cmd[4], u8 type, u8 reg, u8 chan,
@ -110,7 +125,7 @@ int acpm_pmic_bulk_read(const struct acpm_handle *handle,
if (ret) if (ret)
return ret; return ret;
ret = FIELD_GET(ACPM_PMIC_RETURN, xfer.rxd[1]); ret = acpm_pmic_to_linux_err(FIELD_GET(ACPM_PMIC_RETURN, xfer.rxd[1]));
if (ret) if (ret)
return ret; return ret;
@ -150,7 +165,7 @@ int acpm_pmic_write_reg(const struct acpm_handle *handle,
if (ret) if (ret)
return ret; return ret;
return FIELD_GET(ACPM_PMIC_RETURN, xfer.rxd[1]); return acpm_pmic_to_linux_err(FIELD_GET(ACPM_PMIC_RETURN, xfer.rxd[1]));
} }
static void acpm_pmic_init_bulk_write_cmd(u32 cmd[4], u8 type, u8 reg, u8 chan, static void acpm_pmic_init_bulk_write_cmd(u32 cmd[4], u8 type, u8 reg, u8 chan,
@ -190,7 +205,7 @@ int acpm_pmic_bulk_write(const struct acpm_handle *handle,
if (ret) if (ret)
return ret; return ret;
return FIELD_GET(ACPM_PMIC_RETURN, xfer.rxd[1]); return acpm_pmic_to_linux_err(FIELD_GET(ACPM_PMIC_RETURN, xfer.rxd[1]));
} }
static void acpm_pmic_init_update_cmd(u32 cmd[4], u8 type, u8 reg, u8 chan, static void acpm_pmic_init_update_cmd(u32 cmd[4], u8 type, u8 reg, u8 chan,
@ -220,5 +235,5 @@ int acpm_pmic_update_reg(const struct acpm_handle *handle,
if (ret) if (ret)
return ret; return ret;
return FIELD_GET(ACPM_PMIC_RETURN, xfer.rxd[1]); return acpm_pmic_to_linux_err(FIELD_GET(ACPM_PMIC_RETURN, xfer.rxd[1]));
} }