D42404.id129951.diff
No OneTemporary
Actions

Size

827 B

Referenced Files

None

Subscribers

None

D42404.id129951.diff
View Options

	diff --git a/sys/arm64/arm64/cpu_errata.c b/sys/arm64/arm64/cpu_errata.c
	--- a/sys/arm64/arm64/cpu_errata.c
	+++ b/sys/arm64/arm64/cpu_errata.c
	@@ -40,6 +40,7 @@

	#include <machine/cpu.h>

	+#include <dev/psci/psci.h>
	#include <dev/psci/smccc.h>

	typedef void (cpu_quirk_install)(void);
	@@ -117,6 +118,9 @@
	static void
	install_psci_bp_hardening(void)
	{
	+ /* SMCCC depends on PSCI. If PSCI is missing so is SMCCC */
	+ if (!psci_present)
	+ return;

	if (smccc_arch_features(SMCCC_ARCH_WORKAROUND_1) != SMCCC_RET_SUCCESS)
	return;
	@@ -140,6 +144,10 @@
	}
	}

	+ /* SMCCC depends on PSCI. If PSCI is missing so is SMCCC */
	+ if (!psci_present)
	+ return;
	+
	/* Enable the workaround on this CPU if it's enabled in the firmware */
	if (smccc_arch_features(SMCCC_ARCH_WORKAROUND_2) != SMCCC_RET_SUCCESS)
	return;