From patchwork Wed Aug 9 20:05:00 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: 133540 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:9d8d:b0:139:fa0d:b2d with SMTP id d13csp154186rwo; Wed, 9 Aug 2023 14:28:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFeH2s2xgdzBU3rEBlKr4u/riuELl3Qnccs0+/aGk/wxvuJmZ28lWQE/y9bsnkMvbAP8qyC X-Received: by 2002:a05:6808:2222:b0:3a7:652c:be73 with SMTP id bd34-20020a056808222200b003a7652cbe73mr689762oib.39.1691616497739; Wed, 09 Aug 2023 14:28:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691616497; cv=none; d=google.com; s=arc-20160816; b=MrYNJvMc3UmqQ+EMlxOwndZnibtSAeJXR8k+oG5pse2KUHlixbcrSti9e3tcR0wZI1 FtFPIAip2gzewKqNV5I2XgLbLvKUkxtUPBoBwJsrZw7yR4DSUfreAe+Wik5kswunxXzb 5mM2OiDQfgtf6Fcb5FCp5E6TqqkLT9wGRli5XcmnPtn1Eh1D94W1Pzt4FIsJsdTtmZRY G1VM2abFQ1Ube+K7Uus+EBrFxA+WuO+tIz2pc752067UW3dPFn/MaUaS+uFsdf+E9kQE 7atJfz1g+B9I6p7pwAY9hzv09+gZ9PAmkYJUCKkPHnbkt3ngFFN1oFsqTK/vzQbSnZTk At4Q== 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=jfwImcTI7YaZYZrzmlihZWVOTd+VrMC3wiA0U3w+xDg=; fh=X0V9mrJohNhBNUNO0jzAC2109lTMK/mES5U4bQdCj5c=; b=U3Z3AIYwUtWvoaE75bXLPeSHqEa8j4+bh/Z7phNHacb7GDQR57kDkBtOGOXvgMJbrD H9S/VGNEh7V5eNw1dL1jq/eNrWLdAaVH5w6B9Zduvoco+8j2FWIbReCZtWq+TZK2dGRK h2Cxu4vtXpw4wvq7IPKiM1TRB7mYcc/kNniflZLys7lWzQVitWYvwmT7XDnRIsJfPVeB HS/499+UKwtU8Kkl97ifSMGjcTL2WmZ8sXFMWKL/q6QkiiOp1yLLf3dJBdw/+mY7j+fg acUtokswzWxJ72bKTw6gBjRjiRfZQ30lRKcdQTVU+lOKi9IPfYQOWK3qAwF3doILlJgq wsDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=g02pWa5r; dkim=neutral (no key) header.i=@linutronix.de header.b=SGWljJYD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id pf16-20020a17090b1d9000b00267b5046410si2438111pjb.81.2023.08.09.14.28.04; Wed, 09 Aug 2023 14:28:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=g02pWa5r; dkim=neutral (no key) header.i=@linutronix.de header.b=SGWljJYD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S232921AbjHIUFG (ORCPT + 99 others); Wed, 9 Aug 2023 16:05:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230229AbjHIUFC (ORCPT ); Wed, 9 Aug 2023 16:05:02 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B02310D4; Wed, 9 Aug 2023 13:05:02 -0700 (PDT) Date: Wed, 09 Aug 2023 20:05:00 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691611500; 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=jfwImcTI7YaZYZrzmlihZWVOTd+VrMC3wiA0U3w+xDg=; b=g02pWa5rGxq/IhPWRz5L5ginA7VzCbT5kMA6ml4aKruJfyPUO5IVwevFZUM0MiJQy7EKOz 0EInhxfs35m4cl1A6E8cHCPUUgnh0xDPEgpoG/P+sP8/JCYG/bIfgHF8LuYj5ovPOtkclB lDHriQcjdf+5Zdno2JVQ3wEcac3C9f+NbwFItBcnYVhJNxswBC2ezKQJPJx0AUP+P5Iovm n4ImEQWufpCbZHnkwUzwwZb+IUKCLqS3iIsfol2Xca2h8tcUyl4j0jvobA+HQORrqjVqjP d/ZbKtwQlXnA4MNGgZf350HKu8qkfdImvKiq3H8sIsPuvLNNNmJgSxO2knn6lw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691611500; 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=jfwImcTI7YaZYZrzmlihZWVOTd+VrMC3wiA0U3w+xDg=; b=SGWljJYDSoa0ShuDlRHzeOMG35gvbEfXvvegN45Tl1jO/i/7tkYZLaD41/wEnA0zcyewWW idgxnEOyBSdsTqBQ== 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: perf/core] x86/cpu: Fix Crestmont uarch Cc: "Peter Zijlstra (Intel)" , "Rafael J. Wysocki" , Hans de Goede , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230807150405.757666627@infradead.org> References: <20230807150405.757666627@infradead.org> MIME-Version: 1.0 Message-ID: <169161150022.27769.13986653864659019340.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773592440047554195 X-GMAIL-MSGID: 1773788460808052719 The following commit has been merged into the perf/core branch of tip: Commit-ID: 0cfd8fbadd6833d243c9a9d8649ba4a9f4361c93 Gitweb: https://git.kernel.org/tip/0cfd8fbadd6833d243c9a9d8649ba4a9f4361c93 Author: Peter Zijlstra AuthorDate: Mon, 07 Aug 2023 14:38:08 +02:00 Committer: Peter Zijlstra CommitterDate: Wed, 09 Aug 2023 21:51:06 +02:00 x86/cpu: Fix Crestmont uarch Sierra Forest and Grand Ridge are both E-core only using Crestmont micro-architecture, They fit the pre-existing naming scheme prefectly fine, adhere to it. Signed-off-by: Peter Zijlstra (Intel) Acked-by: Rafael J. Wysocki Acked-by: Hans de Goede Link: https://lore.kernel.org/r/20230807150405.757666627@infradead.org --- arch/x86/include/asm/intel-family.h | 5 ++--- drivers/edac/i10nm_base.c | 2 +- drivers/platform/x86/intel/speed_select_if/isst_if_common.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h index 4041326..49d40ee 100644 --- a/arch/x86/include/asm/intel-family.h +++ b/arch/x86/include/asm/intel-family.h @@ -155,9 +155,8 @@ #define INTEL_FAM6_ATOM_GRACEMONT 0xBE /* Alderlake N */ -#define INTEL_FAM6_SIERRAFOREST_X 0xAF - -#define INTEL_FAM6_GRANDRIDGE 0xB6 +#define INTEL_FAM6_ATOM_CRESTMONT_X 0xAF /* Sierra Forest */ +#define INTEL_FAM6_ATOM_CRESTMONT 0xB6 /* Grand Ridge */ /* Xeon Phi */ diff --git a/drivers/edac/i10nm_base.c b/drivers/edac/i10nm_base.c index a897b6a..5abf997 100644 --- a/drivers/edac/i10nm_base.c +++ b/drivers/edac/i10nm_base.c @@ -906,7 +906,7 @@ static const struct x86_cpu_id i10nm_cpuids[] = { X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SAPPHIRERAPIDS_X, X86_STEPPINGS(0x0, 0xf), &spr_cfg), X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(EMERALDRAPIDS_X, X86_STEPPINGS(0x0, 0xf), &spr_cfg), X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(GRANITERAPIDS_X, X86_STEPPINGS(0x0, 0xf), &gnr_cfg), - X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SIERRAFOREST_X, X86_STEPPINGS(0x0, 0xf), &gnr_cfg), + X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(ATOM_CRESTMONT_X, X86_STEPPINGS(0x0, 0xf), &gnr_cfg), {} }; MODULE_DEVICE_TABLE(x86cpu, i10nm_cpuids); diff --git a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c index 1f59ac5..47e5a94 100644 --- a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c +++ b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c @@ -720,7 +720,7 @@ static struct miscdevice isst_if_char_driver = { static const struct x86_cpu_id hpm_cpu_ids[] = { X86_MATCH_INTEL_FAM6_MODEL(GRANITERAPIDS_X, NULL), - X86_MATCH_INTEL_FAM6_MODEL(SIERRAFOREST_X, NULL), + X86_MATCH_INTEL_FAM6_MODEL(ATOM_CRESTMONT_X, NULL), {} };