Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp620423pxj; Fri, 14 May 2021 11:17:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwifXOST/Nkc+H/otGOmMbbvk2dnzh6nkMuhi0U2YHvLJ5VCTeT+eeXYPB10M+YpQW52Qs8 X-Received: by 2002:a17:906:1e15:: with SMTP id g21mr50074952ejj.241.1621016248318; Fri, 14 May 2021 11:17:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621016248; cv=none; d=google.com; s=arc-20160816; b=qpWgURAUMxoS43R0hxH7P6sm6ZouIq/OHLbiilOGEGbCaM4KLO9S7pc7pHFXV06w0c BCEdq+RrpTYrP4tmL+R8l5/aq39Rxkyv3WgRZ8yz5QjPGruO3GDDe5G5W1RwGQ2Pos+x rDBB4FKZICGBlhn8VQoXiBU5Du+oyBZ/1RCLwdeX1oNZqnjhY98WzWZEAdYgVRBw8NWy WLVoG5M7uBlT69VPwqPJAdHUk2BXcBwT9uSh+GzBfoMiwB98DoYtlXYPijeLPhnVvCk0 iBl5AVcwhzeO9Ep3XPS9FvED+vr44d6EaUSv1OGhIrwjOUgiyAdlGK5fyxytoNZu+7Ni Ccdw== 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=y2TRdEOo2opgyxg4Ofb2+3cG+kZ9FdY0Z3rbJ6w55A4=; b=eK68UXDc91a1X6D+qzpDP74y7+CFyTDmDa74lMY5qbNpfwrK6ze38yO4YQfGSQyhT5 UmWb5GwZHhceuQF7Xfl/vPXEbRCvHdxFFOnteaI5ArQYlSd7Wzu0vTCL/uNwLnBLxv2n IIx6lKxrGHLeSgs8FIe2v867ry2UkZtSiYOKoPBV+6EKxfCjqEUxuRNcaGNM9JRsuPG0 kg6yT/wdX0975BrVxcoaXSi4AOFZS3iuguPW0Ywx8qYrxwFAjDlc2Uu9Lj7v7YKjrWjE BnXOAc+0pn4FqLkKs3o7PPauARo26iQTNGU25CiHvAFtGbQexPI1XniR4iKBq0NcNIH8 fi3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="ZoUEhU1/"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=iMRf3Tj4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 24si6615789ejx.746.2021.05.14.11.17.03; Fri, 14 May 2021 11:17:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="ZoUEhU1/"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=iMRf3Tj4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233557AbhENMgp (ORCPT + 99 others); Fri, 14 May 2021 08:36:45 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:36476 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233360AbhENMgl (ORCPT ); Fri, 14 May 2021 08:36:41 -0400 Date: Fri, 14 May 2021 12:35:28 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1620995729; 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=y2TRdEOo2opgyxg4Ofb2+3cG+kZ9FdY0Z3rbJ6w55A4=; b=ZoUEhU1/c3YEn78s5J0bW5BKGm/Ue0e8eKmXR9CQh0iEOtnQHP9xj8ONJ+N08ZqlG75ZMD eIKD+mtPR2mzSpsc+49lYQh5tQg6CZZdYdDZF7AHXmAQdDPF28dKc8SKzET/dLnZB9rE7A zY6MdWhvB3aFORZKdibRK/zguXheJh2yxuHaSkxOD4w5RyNLTknnYzd0Uoge5IL0bSL7q6 CZvzC9UK/mVJEiRXqEuyIEigQeXiwCLsATt0Kh/WfywuEkjzgvACKgj9RJBe/k0CQ3/vx8 cKM6Rm25otTu/pW5bNf7GrOasd6ebFWkrLSpUksyTqDk2dcV7+X2Aev9g0iW5w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1620995729; 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=y2TRdEOo2opgyxg4Ofb2+3cG+kZ9FdY0Z3rbJ6w55A4=; b=iMRf3Tj4S9ew341/UiLj+deQMYM5Bx7nGSDfbBbF2o+MxWr1GZE41WBiA1/yaVLGZ96e4U 4Z1aAhg03INzGiBg== From: "tip-bot2 for Andi Kleen" 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: Fix core name for Sapphire Rapids Cc: Andi Kleen , Borislav Petkov , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20210513163904.3083274-1-ak@linux.intel.com> References: <20210513163904.3083274-1-ak@linux.intel.com> MIME-Version: 1.0 Message-ID: <162099572850.29796.9809922742922576170.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 x86/cpu branch of tip: Commit-ID: 28188cc461f6cf8b7d28de4f6df52014cc1d5e39 Gitweb: https://git.kernel.org/tip/28188cc461f6cf8b7d28de4f6df52014cc1d5e39 Author: Andi Kleen AuthorDate: Thu, 13 May 2021 09:39:04 -07:00 Committer: Borislav Petkov CommitterDate: Fri, 14 May 2021 14:31:14 +02:00 x86/cpu: Fix core name for Sapphire Rapids Sapphire Rapids uses Golden Cove, not Willow Cove. Fixes: 53375a5a218e ("x86/cpu: Resort and comment Intel models") Signed-off-by: Andi Kleen Signed-off-by: Borislav Petkov Link: https://lkml.kernel.org/r/20210513163904.3083274-1-ak@linux.intel.com --- arch/x86/include/asm/intel-family.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h index 955b06d..2715843 100644 --- a/arch/x86/include/asm/intel-family.h +++ b/arch/x86/include/asm/intel-family.h @@ -102,7 +102,8 @@ #define INTEL_FAM6_TIGERLAKE_L 0x8C /* Willow Cove */ #define INTEL_FAM6_TIGERLAKE 0x8D /* Willow Cove */ -#define INTEL_FAM6_SAPPHIRERAPIDS_X 0x8F /* Willow Cove */ + +#define INTEL_FAM6_SAPPHIRERAPIDS_X 0x8F /* Golden Cove */ #define INTEL_FAM6_ALDERLAKE 0x97 /* Golden Cove / Gracemont */ #define INTEL_FAM6_ALDERLAKE_L 0x9A /* Golden Cove / Gracemont */