D50978.id157593.diff
No OneTemporary
Actions

Size

818 B

Referenced Files

None

Subscribers

None

D50978.id157593.diff
View Options

	diff --git a/sys/dev/psci/smccc_errata.c b/sys/dev/psci/smccc_errata.c
	--- a/sys/dev/psci/smccc_errata.c
	+++ b/sys/dev/psci/smccc_errata.c
	@@ -70,7 +70,8 @@
	{
	int32_t version;

	- if (smccc_get_version() < SMCCC_MAKE_VERSION(1, 1))
	+ /* Check if Errata ABI is supported */
	+ if (smccc_arch_features(EM_VERSION) != SMCCC_RET_SUCCESS)
	return;

	/* Check we have Errata 1.0 or later */
	diff --git a/sys/dev/psci/smccc_trng.c b/sys/dev/psci/smccc_trng.c
	--- a/sys/dev/psci/smccc_trng.c
	+++ b/sys/dev/psci/smccc_trng.c
	@@ -69,8 +69,8 @@
	{
	int32_t version;

	- /* TRNG depends on SMCCC 1.1 (per the spec) */
	- if (smccc_get_version() < SMCCC_MAKE_VERSION(1, 1))
	+ /* Check if TRNG is supported */
	+ if (smccc_arch_features(TRNG_VERSION) != SMCCC_RET_SUCCESS)
	return;

	/* Check we have TRNG 1.0 or later */