From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5EE9C433EF for ; Fri, 29 Oct 2021 08:03:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BBABA61157 for ; Fri, 29 Oct 2021 08:03:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232388AbhJ2IFf (ORCPT ); Fri, 29 Oct 2021 04:05:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232341AbhJ2IF1 (ORCPT ); Fri, 29 Oct 2021 04:05:27 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B3CFC061570; Fri, 29 Oct 2021 01:02:59 -0700 (PDT) Date: Fri, 29 Oct 2021 08:02:56 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1635494577; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HRHNSvx1OPiWTsSzO9rVesh3ApXU8ExQyCKhuNF5EY8=; b=uIhmN4uX7dmyvvawL5BsW09PrNn0aHgtDtLPbjQW6ljoIJ8gFGjC4dcEwbsH5sorEmnkvj 3szfkVHNw5CtlryLqmb1fZxliLI/XSiqjpY77he5m1+JN/o1UTAbCQOLsxTGqODXNjgIm8 R8OVF9btpDMhbubZpJs4knXbUgxhpYTOL/AxYUCV9TXVq/M87jitdXQy+AZJ8hnLDWtR2d bxCLvasPBxS/E2YGYLHXOMzEmktqRLHrodmErsHERGUNv9/I5lY0D7KMqBdVrIPp5URP9k d4tAIDx4ZLSi/UY/iNRJ4mJbt2GUzncGggQcn6VXZhn4ttKuGp3MiX4xS9yw0A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1635494577; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HRHNSvx1OPiWTsSzO9rVesh3ApXU8ExQyCKhuNF5EY8=; b=BZ0ItI9bh0yXMvRLVzmlxjV98poiuSHicwv33vMHMAo6OkQ6FEeK8s9z6ghsiyZospn8uO +6n2GVp9NvllXLCA== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: objtool/core] x86,bugs: Unconditionally allow spectre_v2=retpoline,amd Cc: "Peter Zijlstra (Intel)" , Borislav Petkov , Josh Poimboeuf , Alexei Starovoitov , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20211026120310.487348118@infradead.org> References: <20211026120310.487348118@infradead.org> MIME-Version: 1.0 Message-ID: <163549457692.626.3278446834263098579.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the objtool/core branch of tip: Commit-ID: f8a66d608a3e471e1202778c2a36cbdc96bae73b Gitweb: https://git.kernel.org/tip/f8a66d608a3e471e1202778c2a36cbdc96bae73b Author: Peter Zijlstra AuthorDate: Tue, 26 Oct 2021 14:01:46 +02:00 Committer: Peter Zijlstra CommitterDate: Thu, 28 Oct 2021 23:25:29 +02:00 x86,bugs: Unconditionally allow spectre_v2=retpoline,amd Currently Linux prevents usage of retpoline,amd on !AMD hardware, this is unfriendly and gets in the way of testing. Remove this restriction. Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Borislav Petkov Acked-by: Josh Poimboeuf Tested-by: Alexei Starovoitov Link: https://lore.kernel.org/r/20211026120310.487348118@infradead.org --- arch/x86/kernel/cpu/bugs.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index ecfca3b..ba43597 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -882,13 +882,6 @@ static enum spectre_v2_mitigation_cmd __init spectre_v2_parse_cmdline(void) return SPECTRE_V2_CMD_AUTO; } - if (cmd == SPECTRE_V2_CMD_RETPOLINE_AMD && - boot_cpu_data.x86_vendor != X86_VENDOR_HYGON && - boot_cpu_data.x86_vendor != X86_VENDOR_AMD) { - pr_err("retpoline,amd selected but CPU is not AMD. Switching to AUTO select\n"); - return SPECTRE_V2_CMD_AUTO; - } - spec_v2_print_cond(mitigation_options[i].option, mitigation_options[i].secure); return cmd;