From patchwork Tue Oct 27 13:45:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 289752 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08178C64E75 for ; Tue, 27 Oct 2020 15:27:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D00F3222C8 for ; Tue, 27 Oct 2020 15:26:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603812419; bh=WehOnmvMEltJu9ZF5Z1xoC8xUIS8r926y7Ds5a440hM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=a6Rp0HiQg/Fsen6vRlFEwaYuJCYru/JUeT7qn/1YKcIGcaUJSIoNX99y6u9oBOhLf 7NeFUxFHWhCvnQbNoIqpiM/2VCFE+0sso/8+wyaJrWNF6s3MNqHvDNFhL3yfHVz9a+ jM3sdMcGIKNqUhJala+FI0YBfzZeVvl+RVnP8X5M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1797288AbgJ0PWn (ORCPT ); Tue, 27 Oct 2020 11:22:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:37558 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1797282AbgJ0PWl (ORCPT ); Tue, 27 Oct 2020 11:22:41 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8477B2076D; Tue, 27 Oct 2020 15:22:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603812161; bh=WehOnmvMEltJu9ZF5Z1xoC8xUIS8r926y7Ds5a440hM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q/5QchdVq2bD1qERrwKRziA5TT3SjQlnRf9T6v0oOt9+PX+B2KJ5Og84b6LfMdJQV Pjh6G9aIQblTivwsVUENAH5flIAE++H2UcVaX1K1Hk25efyeIl4Pbf3zBry8gEuLCt S3GK701KTkWQjN8+w5y6yb4W4EsCklSi1GRTjJV4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marc Zyngier , Will Deacon Subject: [PATCH 5.9 072/757] arm64: Make use of ARCH_WORKAROUND_1 even when KVM is not enabled Date: Tue, 27 Oct 2020 14:45:22 +0100 Message-Id: <20201027135453.923355479@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marc Zyngier 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: Signed-off-by: Marc Zyngier Signed-off-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- 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;