Message ID | 20201020214544.3206838-3-swboyd@chromium.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=VJiZ=D3=lists.infradead.org=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@kernel.org> 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 AD967C4363A for <linux-arm-kernel@archiver.kernel.org>; Tue, 20 Oct 2020 21:47:26 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2E95722247 for <linux-arm-kernel@archiver.kernel.org>; Tue, 20 Oct 2020 21:47:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="U0LYc2gr"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Z+FcLcao" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2E95722247 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=AJdwrhUvk0Xa6104U67W+k1fxd4kI2siNUlD4ouf/sU=; b=U0LYc2grXj9pkIYmo51JULMMY ECQD22hWQUmhDs/9aNtx+5yNgVbHqvUF///NVtRi8SbCAjMQsrsOUiYsCtZEAogFzLCNbX9dKy6Tq I4mSyKKk14HjM+91I29x0/VcQb8ihn56Ysrvba8XCU1UpwNMlLaM3vVoC0T1buYzyVox4SL10h87A U7tbWOxMQMn2g72zBupREj/p7YhMZmWzIS2w/r6Ftx+7kO6HCCwoAarSZ5dJ/DtU2HsJv0zB3k7Rm VBDvx83xAhM1gX4DfZ27bHxt9wgLnDs5OwdbHgY9FHCki8BlhbM45/Crqn6kRX3qibPMYl9hoce2l 1dBQzMHNg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUzS7-0003Yd-N2; Tue, 20 Oct 2020 21:45:55 +0000 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUzS2-0003X4-Oy for linux-arm-kernel@lists.infradead.org; Tue, 20 Oct 2020 21:45:52 +0000 Received: by mail-pl1-x641.google.com with SMTP id b19so105445pld.0 for <linux-arm-kernel@lists.infradead.org>; Tue, 20 Oct 2020 14:45:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EKYiVVRrzVkrErxQtSxcT+GQiEsMi07e5G3dENOaLqw=; b=Z+FcLcaod/VZGPF2GtdVfd0ALicaU6PfKQMIhxY8thzaR7yDLW/wBn+0EwPHXpxygS QUwn/eL4hpdRn11PtPysOCZL+pRr3Y1/b6afuHE4xT0J4eomenZztUwxZuumvpk/yhI9 Ma6663KynXN6D6yUUv+Vktd+Hgl11C5TUv8YA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EKYiVVRrzVkrErxQtSxcT+GQiEsMi07e5G3dENOaLqw=; b=BrNtrwUCdb5nkhwj71xrlCBxDOi25tsfg2JvSySlrc+/Bb9gwm1Td1wz+bFajmeK/F fNIE8QeDVAQMq4jt4wWjAWaH+IClfXd+bjez0/MuWf4AByXKw6AsqGB+q2I8bh5cBjHf 5gIF1qWNFktk5Xgn+0HAtdW6lZRhO/mWhQvsi0358b3G09zu+BugZSpdbq72oWgqDSqN qsZaPKN5ZLuxV0wB/HhKbhkN/XEII5BlA3OR5MYf5pA4xgIEzH8AB0XhX5fTRnxO6nl7 ngRZNsrFYYbovYy9d1D99LtoHOfA3bROvt2PEvkRyJwHYaxg6GM8FspltVdGu6PpMLQh wvNQ== X-Gm-Message-State: AOAM532wntuJDxIvAmpEHqZwYk/6B36PGr9NBQcWLqVjC5KO7pgS6pen /8ZbsWzXcolRaZkM0X2ot0QbTg== X-Google-Smtp-Source: ABdhPJwrpZMCxZrhVgdpeQPdj7AT2MuT2CD7S+OE320FHWa0arI8QRP8nB8sE113IHQNMou+gtQVqA== X-Received: by 2002:a17:902:6b07:b029:d3:ebaa:d028 with SMTP id o7-20020a1709026b07b02900d3ebaad028mr4941341plk.11.1603230349052; Tue, 20 Oct 2020 14:45:49 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:201:3e52:82ff:fe6c:83ab]) by smtp.gmail.com with ESMTPSA id j23sm130751pgh.31.2020.10.20.14.45.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 14:45:48 -0700 (PDT) From: Stephen Boyd <swboyd@chromium.org> To: Will Deacon <will@kernel.org>, Catalin Marinas <catalin.marinas@arm.com> Subject: [PATCH 2/2] arm64: proton-pack: Update comment to reflect new function name Date: Tue, 20 Oct 2020 14:45:44 -0700 Message-Id: <20201020214544.3206838-3-swboyd@chromium.org> X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog In-Reply-To: <20201020214544.3206838-1-swboyd@chromium.org> References: <20201020214544.3206838-1-swboyd@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201020_174550_869362_200E602C X-CRM114-Status: GOOD ( 15.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: Marc Zyngier <maz@kernel.org>, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org |
Series |
arm64: Fixes for spectre-v2 detection in guest kernels
|
expand
|
diff --git a/arch/arm64/kernel/proton-pack.c b/arch/arm64/kernel/proton-pack.c index 00bd54f63f4f..106857685145 100644 --- a/arch/arm64/kernel/proton-pack.c +++ b/arch/arm64/kernel/proton-pack.c @@ -203,8 +203,8 @@ static void install_bp_hardening_cb(bp_hardening_cb_t fn) __SMCCC_WORKAROUND_1_SMC_SZ; /* - * detect_harden_bp_fw() passes NULL for the hyp_vecs start/end if - * we're a guest. Skip the hyp-vectors work. + * Vinz Clortho takes the hyp_vecs start/end "keys" at + * the door when we're a guest. Skip the hyp-vectors work. */ if (!is_hyp_mode_available()) { __this_cpu_write(bp_hardening_data.fn, fn);
The function detect_harden_bp_fw() is gone after commit d4647f0a2ad7 ("arm64: Rewrite Spectre-v2 mitigation code"). Update this comment to reflect the new state of affairs. Cc: Marc Zyngier <maz@kernel.org> Fixes: d4647f0a2ad7 ("arm64: Rewrite Spectre-v2 mitigation code") Signed-off-by: Stephen Boyd <swboyd@chromium.org> --- arch/arm64/kernel/proton-pack.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)