]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
arm64: Make use of ARCH_WORKAROUND_1 even when KVM is not enabled
authorMarc Zyngier <maz@kernel.org>
Thu, 16 Jul 2020 16:11:08 +0000 (17:11 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Oct 2020 09:07:11 +0000 (10:07 +0100)
commitdd6120a8e1f3c505b59cc5285d2848d389a90d96
tree23d893f586a8e3679a4523f2f9d7a06ff6437ab6
parentcb6c316cd99ae51ad30efb11ca834b758ac805b0
arm64: Make use of ARCH_WORKAROUND_1 even when KVM is not enabled

commit b11483ef5a502663732c6ca1b58d14ff9eedd6f7 upstream.

We seem to be pretending that we don't have any firmware mitigation
when KVM is not compiled in, which is not quite expected.

Bring back the mitigation in this case.

Fixes: 4db61fef16a1 ("arm64: kvm: Modernize __smccc_workaround_1_smc_start annotations")
Cc: <stable@vger.kernel.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm64/kernel/cpu_errata.c