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

firmware: smccc: Add HAVE_ARM_SMCCC_DISCOVERY to identify SMCCC v1.1 and above 



SMCCC v1.0 lacked discoverability of version and features. To accelerate
adoption of few mitigations and protect systems more rapidly from various
vulnerability, PSCI v1.0 was updated to add SMCCC discovery mechanism
though the PSCI firmware implementation of PSCI_FEATURES(SMCCC_VERSION)
which returns success on firmware compliant to SMCCC v1.1 and above.

This inturn makes SMCCC v1.1 and above dependent on ARM_PSCI_FW for
backward compatibility. Let us introduce a new hidden config for the
same to build more features on top of SMCCC v1.1 and above.

While at it, also sort alphabetically the psci entry.

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-2-sudeep.holla@arm.com


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

drivers/firmware/Kconfig

+2 −4
Original line number Diff line number Diff line
@@ -295,15 +295,13 @@ config TURRIS_MOX_RWTM 
	  other manufacturing data and also utilize the Entropy Bit Generator

	  for hardware random number generation.



config HAVE_ARM_SMCCC

	bool



source "drivers/firmware/psci/Kconfig"

source "drivers/firmware/broadcom/Kconfig"

source "drivers/firmware/google/Kconfig"

source "drivers/firmware/efi/Kconfig"

source "drivers/firmware/imx/Kconfig"

source "drivers/firmware/meson/Kconfig"

source "drivers/firmware/psci/Kconfig"

source "drivers/firmware/smccc/Kconfig"

source "drivers/firmware/tegra/Kconfig"

source "drivers/firmware/xilinx/Kconfig"

drivers/firmware/smccc/Kconfig

0 → 100644
+16 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config HAVE_ARM_SMCCC

	bool

	help

	  Include support for the Secure Monitor Call (SMC) and Hypervisor

	  Call (HVC) instructions on Armv7 and above architectures.



config HAVE_ARM_SMCCC_DISCOVERY

	bool

	depends on ARM_PSCI_FW

	default y

	help

	 SMCCC v1.0 lacked discoverability and hence PSCI v1.0 was updated

	 to add SMCCC discovery mechanism though the PSCI firmware

	 implementation of PSCI_FEATURES(SMCCC_VERSION) which returns

	 success on firmware compliant to SMCCC v1.1 and above.

CRA Git | Maintained and supported by SUSTech CRA and CCSE