shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

BACKPORT: firmware: smccc: Drop smccc_version enum and use ARM_SMCCC_VERSION_1_x instead

Browse Source 
Instead of maintaining 2 sets of enums/macros for tracking SMCCC version,
let us drop smccc_version enum and use ARM_SMCCC_VERSION_1_x directly
instead.

This is in preparation to drop smccc_version here and move it separately
under drivers/firmware/smccc.

Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Tested-by: Etienne Carriere <etienne.carriere@st.com>
Reviewed-by: Steven Price <steven.price@arm.com>
Reviewed-by: Etienne Carriere <etienne.carriere@st.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20200518091222.27467-5-sudeep.holla@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
(cherry picked from commit ad5a57dfe4)

Change-Id: I8b3625d3adbaea003c1dadcbc028c62a2f4f59ba
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
This commit is contained in:
Sudeep Holla
2020-05-18 10:12:19 +01:00
committed by Tao Huang
parent 79f41c9c36
commit e80884e89e
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/firmware/psci.c
View File

@@ -61,12 +61,12 @@ bool psci_tos_resident_on(int cpu)
struct psci_operations psci_ops = {
.conduit = PSCI_CONDUIT_NONE,
.smccc_version = SMCCC_VERSION_1_0,
.smccc_version = ARM_SMCCC_VERSION_1_0,
};
enum arm_smccc_conduit arm_smccc_1_1_get_conduit(void)
{
if (psci_ops.smccc_version < SMCCC_VERSION_1_1)
if (psci_ops.smccc_version < ARM_SMCCC_VERSION_1_1)
return SMCCC_CONDUIT_NONE;
switch (psci_ops.conduit) {
@@ -537,8 +537,8 @@ static void __init psci_init_smccc(void)
if (feature != PSCI_RET_NOT_SUPPORTED) {
u32 ret;
ret = invoke_psci_fn(ARM_SMCCC_VERSION_FUNC_ID, 0, 0, 0);
if (ret == ARM_SMCCC_VERSION_1_1) {
psci_ops.smccc_version = SMCCC_VERSION_1_1;
if (ret >= ARM_SMCCC_VERSION_1_1) {
psci_ops.smccc_version = ret;
ver = ret;
}
}

7
include/linux/psci.h
View File

@@ -31,11 +31,6 @@ enum psci_conduit {
PSCI_CONDUIT_HVC,
};
enum smccc_version {
SMCCC_VERSION_1_0,
SMCCC_VERSION_1_1,
};
struct psci_operations {
u32 (*get_version)(void);
int (*cpu_suspend)(u32 state, unsigned long entry_point);
@@ -46,7 +41,7 @@ struct psci_operations {
unsigned long lowest_affinity_level);
int (*migrate_info_type)(void);
enum psci_conduit conduit;
enum smccc_version smccc_version;
u32 smccc_version;
};
extern struct psci_operations psci_ops;