diff options
| author | Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> | 2015-05-22 14:31:37 +0100 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-01-20 19:26:29 +0800 |
| commit | cdbe2fd2de013a5c8de43fc05960c4a4da814504 (patch) | |
| tree | 6fe4548b34fb48a966eb02599d3cbbf771c4168e | |
| parent | d7484ac8ee716568d87ce153c497713dacedb36f (diff) | |
drivers: firmware: psci: add INVALID_ADDRESS return value
PSCI 1.0 introduces the INVALID_ADDRESS return value for functions
that take an address as input parameter (eg CPU_SUSPEND).
This patch adds INVALID_ADDRESS return value to kernel code and
updates the PSCI to linux error conversion to take it into account.
The kernel error value associated to INVALID_ADDRESS is set to
the error returned when the PSCI error code is INVALID_PARAMETERS
to comply with current call sites expected return value, given
that the kernel at present has no use for the additional error
information reported.
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Sudeep Holla <sudeep.holla@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Jisheng Zhang <jszhang@marvell.com>
(cherry picked from commit 2217d7c68e5caf50ec86b8c75c76bf06eb4b2c45)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
| -rw-r--r-- | drivers/firmware/psci.c | 1 | ||||
| -rw-r--r-- | include/uapi/linux/psci.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index a6956007dd38..3c86418964c7 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -78,6 +78,7 @@ static int psci_to_linux_errno(int errno) case PSCI_RET_NOT_SUPPORTED: return -EOPNOTSUPP; case PSCI_RET_INVALID_PARAMS: + case PSCI_RET_INVALID_ADDRESS: return -EINVAL; case PSCI_RET_DENIED: return -EPERM; diff --git a/include/uapi/linux/psci.h b/include/uapi/linux/psci.h index 310d83e0a91b..64469e64688f 100644 --- a/include/uapi/linux/psci.h +++ b/include/uapi/linux/psci.h @@ -86,5 +86,6 @@ #define PSCI_RET_INTERNAL_FAILURE -6 #define PSCI_RET_NOT_PRESENT -7 #define PSCI_RET_DISABLED -8 +#define PSCI_RET_INVALID_ADDRESS -9 #endif /* _UAPI_LINUX_PSCI_H */ |