Commit f2ae9706 authored by Sudeep Holla's avatar Sudeep Holla Committed by Will Deacon
Browse files

firmware: smccc: Refactor SMCCC specific bits into separate file 



In order to add newer SMCCC v1.1+ functionality and to avoid cluttering
PSCI firmware driver with SMCCC bits, let us move the SMCCC specific
details under drivers/firmware/smccc/smccc.c

We can also drop conduit and smccc_version from psci_operations structure
as SMCCC was the sole user and now it maintains those.

No functionality change in this patch though.

Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Tested-by: default avatarEtienne Carriere <etienne.carriere@st.com>
Reviewed-by: default avatarEtienne Carriere <etienne.carriere@st.com>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20200518091222.27467-6-sudeep.holla@arm.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent ad5a57df

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -15474,6 +15474,15 @@ M: Nicolas Pitre <nico@fluxnic.net> 
S:	Odd Fixes

F:	drivers/net/ethernet/smsc/smc91x.*









SECURE MONITOR CALL(SMC) CALLING CONVENTION (SMCCC)









M:	Mark Rutland <mark.rutland@arm.com>









M:	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>









M:	Sudeep Holla <sudeep.holla@arm.com>









L:	linux-arm-kernel@lists.infradead.org









S:	Maintained









F:	drivers/firmware/smccc/









F:	include/linux/arm-smccc.h

















SMIA AND SMIA++ IMAGE SENSOR DRIVER









M:	Sakari Ailus <sakari.ailus@linux.intel.com>









L:	linux-media@vger.kernel.org
































drivers/firmware/Makefile



+2
−1






























Original line number
Diff line number
Diff line







@@ -23,12 +23,13 @@ obj-$(CONFIG_TRUSTED_FOUNDATIONS) += trusted_foundations.o







obj-$(CONFIG_TURRIS_MOX_RWTM)	+= turris-mox-rwtm.o



















obj-$(CONFIG_ARM_SCMI_PROTOCOL)	+= arm_scmi/









obj-y				+= psci/









obj-y				+= broadcom/









obj-y				+= meson/









obj-$(CONFIG_GOOGLE_FIRMWARE)	+= google/









obj-$(CONFIG_EFI)		+= efi/









obj-$(CONFIG_UEFI_CPER)		+= efi/









obj-y				+= imx/









obj-y				+= psci/









obj-y				+= smccc/









obj-y				+= tegra/









obj-y				+= xilinx/
























drivers/firmware/psci/psci.c



+5
−15






























Original line number
Diff line number
Diff line







@@ -46,25 +46,14 @@







 * require cooperation with a Trusted OS driver.









 */









static int resident_cpu = -1;









struct psci_operations psci_ops;









static enum arm_smccc_conduit psci_conduit = SMCCC_CONDUIT_NONE;



















bool psci_tos_resident_on(int cpu)









{









	return cpu == resident_cpu;









}



















struct psci_operations psci_ops = {









	.conduit = SMCCC_CONDUIT_NONE,









	.smccc_version = ARM_SMCCC_VERSION_1_0,









};



















enum arm_smccc_conduit arm_smccc_1_1_get_conduit(void)









{









	if (psci_ops.smccc_version < ARM_SMCCC_VERSION_1_1)









		return SMCCC_CONDUIT_NONE;



















	return psci_ops.conduit;









}



















typedef unsigned long (psci_fn)(unsigned long, unsigned long,









				unsigned long, unsigned long);









static psci_fn *invoke_psci_fn;








@@ -90,6 +79,7 @@ static u32 psci_function_id[PSCI_FN_MAX];

















static u32 psci_cpu_suspend_feature;









static bool psci_system_reset2_supported;









void __init arm_smccc_version_init(u32 version, enum arm_smccc_conduit conduit);



















static inline bool psci_has_ext_power_state(void)









{








@@ -242,7 +232,7 @@ static void set_conduit(enum arm_smccc_conduit conduit)







		WARN(1, "Unexpected PSCI conduit %d\n", conduit);









	}



















	psci_ops.conduit = conduit;









	psci_conduit = conduit;









}



















static int get_set_conduit_method(struct device_node *np)








@@ -412,7 +402,7 @@ static void __init psci_init_smccc(void)







		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 = ret;









			arm_smccc_version_init(ret, psci_conduit);









			ver = ret;









		}









	}
































drivers/firmware/smccc/Makefile
0 → 100644



+3
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0









#









obj-$(CONFIG_HAVE_ARM_SMCCC_DISCOVERY)	+= smccc.o
























drivers/firmware/smccc/smccc.c
0 → 100644



+26
−0






























Original line number
Diff line number
Diff line









// SPDX-License-Identifier: GPL-2.0-only









/*









 * Copyright (C) 2020 Arm Limited









 */



















#define pr_fmt(fmt) "smccc: " fmt



















#include <linux/init.h>









#include <linux/arm-smccc.h>



















static u32 smccc_version = ARM_SMCCC_VERSION_1_0;









static enum arm_smccc_conduit smccc_conduit = SMCCC_CONDUIT_NONE;



















void __init arm_smccc_version_init(u32 version, enum arm_smccc_conduit conduit)









{









	smccc_version = version;









	smccc_conduit = conduit;









}



















enum arm_smccc_conduit arm_smccc_1_1_get_conduit(void)









{









	if (smccc_version < ARM_SMCCC_VERSION_1_1)









		return SMCCC_CONDUIT_NONE;



















	return smccc_conduit;









}
































































CRA Git | Maintained and supported by SUSTech CRA and CCSE