lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 072/757] arm64: Make use of ARCH_WORKAROUND_1 even when KVM is not enabled
    Date
    From: Marc Zyngier <maz@kernel.org>

    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 | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    --- a/arch/arm64/kernel/cpu_errata.c
    +++ b/arch/arm64/kernel/cpu_errata.c
    @@ -234,14 +234,17 @@ static int detect_harden_bp_fw(void)
    smccc_end = NULL;
    break;

    -#if IS_ENABLED(CONFIG_KVM)
    case SMCCC_CONDUIT_SMC:
    cb = call_smc_arch_workaround_1;
    +#if IS_ENABLED(CONFIG_KVM)
    smccc_start = __smccc_workaround_1_smc;
    smccc_end = __smccc_workaround_1_smc +
    __SMCCC_WORKAROUND_1_SMC_SZ;
    - break;
    +#else
    + smccc_start = NULL;
    + smccc_end = NULL;
    #endif
    + break;

    default:
    return -1;

    \
     
     \ /
      Last update: 2020-10-27 16:40    [W:2.176 / U:0.448 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site