From patchwork Wed Nov 29 11:22:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 171272 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a5a7:0:b0:403:3b70:6f57 with SMTP id d7csp267777vqn; Wed, 29 Nov 2023 03:23:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IG/xZhT8sHCX7bhFPM1zdPg1d0UOk/Ap00MDrYC4USU/ig+4OI+juetMe3izK2r3jG9GTLL X-Received: by 2002:a17:90b:4f48:b0:285:bb77:1f79 with SMTP id pj8-20020a17090b4f4800b00285bb771f79mr10807138pjb.30.1701256987228; Wed, 29 Nov 2023 03:23:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701256987; cv=none; d=google.com; s=arc-20160816; b=GFrnkw9lkpeNJSLlEUzpv0HgtIMcKfuCSr6nXZyAodMomdzRuT9+BE50qGjAaNACjZ pB24Pim8cSxJs7DQf8hFXNPjFJX+148+hwh+iI3mKFDsJQIBdsjrucsBQsa/UBTWxkbD 61wuaDPLRyFTv1rqGlOzTNLaHZldaq17Yhruv84K1TFoSC+wvG8kSbGkyU/xFC/zwmb/ 1Ii/Um3aDFTN/W94LQAq3PJLJaX2ndTMxIw2rElkuK2cnPF/2n0d5ypNBZkZWbxVjsVS fn53OO++I9AXNo14PyFitIX0ul2w0R4K0AjKAbiceVqQXPw4dSZFeom2sFD9CsJoDpqG 9rDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=anY+yYbVYxDCgtJGB2+zgOIlzKFzZFRqE7Fg+5xOJzM=; fh=UD1ZRCSS/l4PYbuMk1gSsIJwAKOC33PKfkYvw4GUlo4=; b=pYMzDZpc+oQ0J4Nho6TCKGf/MNpeAbv6++v3VKJHALBNCRH1jCWPrp9BeObfcY5coG zpxH1uGGKi0H47fp/DhHQilLGyaAsfrNo5TvDglRIgNbDR67G8zrk80R6Qt7xCD3X1c+ IbqVgKi+L5Kp3lAfHURo2OJvlOLiWvT6p8WuE5L5v5GoQHNODltM3P4yiVmvdRjEpxc8 ut2tLA2WH4J117gV4OpR5y5uDf2t1KS66kTf6ZTst813fbeKYcNYA7GeX0KkXMbLoyNY s1p4VEfsOBNSUesx932rnIRuqLbBRK4xF6jIkoqomgQahH5fVC/6rMJZbTmqL+PBWtNA F8IQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=jIq50YJz; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=evz7qc94; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id n7-20020a170902d2c700b001cffca283fasi3332116plc.144.2023.11.29.03.23.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 03:23:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=jIq50YJz; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=evz7qc94; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 2B5778031E33; Wed, 29 Nov 2023 03:23:05 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233003AbjK2LWs (ORCPT + 99 others); Wed, 29 Nov 2023 06:22:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232166AbjK2LW1 (ORCPT ); Wed, 29 Nov 2023 06:22:27 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87A211999; Wed, 29 Nov 2023 03:22:33 -0800 (PST) Date: Wed, 29 Nov 2023 11:22:31 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1701256952; 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=anY+yYbVYxDCgtJGB2+zgOIlzKFzZFRqE7Fg+5xOJzM=; b=jIq50YJzBTc5ve9MwheEKPf6e7VQVQ76kvHJP9htIN1dlOQ3lEBtMoIg4u0Ujrgt0TG4wd G0+GCsIAAIx3WJQXtGbMIgSFjwR32/v4lxqBUa2G9Pr2jRpYCtvO/3uHzShJSV59aEdfyC 7ooh6YKzd/O7pSUPcle14CHgm2J8agxCN2ijfXNeBTZYyex260S2+kZAsnjoWG23MOzJUz Od8KjEBK5Ir1+nW+IrbbsK2Pm5m5xUKDkFs84Hk9pX9elaLzYuKdz0gW3YC08jczR0PiwF dQdiZDW8H+kO31zWdda4CKizQHOV7kWHuKQFs7RmrQbWf04CB/bapoDR8xokrw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1701256952; 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=anY+yYbVYxDCgtJGB2+zgOIlzKFzZFRqE7Fg+5xOJzM=; b=evz7qc94nAIYrjvpkImx7qxpdCrUURrUTkyX1LpTkVpX55pdJGV2Z9pkWrMYkUDukiBC8l L50Lt5L9JY1U97AA== From: "tip-bot2 for Borislav Petkov (AMD)" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cpu] x86/CPU/AMD: Move erratum 1076 fix into the Zen1 init function Cc: "Borislav Petkov (AMD)" , Nikolay Borisov , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231120104152.13740-5-bp@alien8.de> References: <20231120104152.13740-5-bp@alien8.de> MIME-Version: 1.0 Message-ID: <170125695160.398.4842656235205898970.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 29 Nov 2023 03:23:05 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783079421349674381 X-GMAIL-MSGID: 1783897246967435168 The following commit has been merged into the x86/cpu branch of tip: Commit-ID: 0da91912fc150d6d321b15e648bead202ced1a27 Gitweb: https://git.kernel.org/tip/0da91912fc150d6d321b15e648bead202ced1a27 Author: Borislav Petkov (AMD) AuthorDate: Wed, 01 Nov 2023 12:31:44 +01:00 Committer: Borislav Petkov (AMD) CommitterDate: Wed, 29 Nov 2023 12:11:59 +01:00 x86/CPU/AMD: Move erratum 1076 fix into the Zen1 init function No functional changes. Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Nikolay Borisov Link: http://lore.kernel.org/r/20231120104152.13740-5-bp@alien8.de --- arch/x86/kernel/cpu/amd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 3d74347..ebe6be8 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -1024,6 +1024,11 @@ static void init_amd_zn(struct cpuinfo_x86 *c) #ifdef CONFIG_NUMA node_reclaim_distance = 32; #endif +} + +static void init_amd_zen(struct cpuinfo_x86 *c) +{ + fix_erratum_1386(c); /* Fix up CPUID bits, but only if not virtualised. */ if (!cpu_has(c, X86_FEATURE_HYPERVISOR)) { @@ -1074,11 +1079,6 @@ static void zenbleed_check(struct cpuinfo_x86 *c) } } -static void init_amd_zen(struct cpuinfo_x86 *c) -{ - fix_erratum_1386(c); -} - static void init_amd_zen2(struct cpuinfo_x86 *c) { fix_erratum_1386(c);