From patchwork Wed Aug 9 20:04:59 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: 133599 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp43433vqi; Wed, 9 Aug 2023 15:22:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEyeh7gM3kzeVCcuAh+XL3yn0fg7WWTnfKbH0UJzGVId6G7nWJiMKYaBTnmf226pIcfo5JD X-Received: by 2002:a17:902:ab97:b0:1b3:ea47:796c with SMTP id f23-20020a170902ab9700b001b3ea47796cmr420630plr.29.1691619774479; Wed, 09 Aug 2023 15:22:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691619774; cv=none; d=google.com; s=arc-20160816; b=FAOAAjcyWqKjEdiOVrWkF5lhziM08pXLVOwyMPusvH5YDoYBMqBwMfn7g2b4VOwGEc 6mIY+ZBaTkK2dL9lhPIC0qSVBcHLF0hrLsCDFdOM/bOwmPhCr6aS1INUTMkbiEQQgzwg LTIkPZTz1dVbJBuSBOdgji6CjsqiAbFouBfTWWnQK5Va59HaSvEV/JLyReAzVjc1Wipx jcF/VFqeFZAlGwe5aVQL0OTGVuNo/IxUdWbyekLaM8dKgEAJm4TurBIznpPNq1oAwbYv TUYZmaI0VksFM7g7URCwPSYVEoEYJIHF5UtoM4tpL+ARmAbqBdNVBQkPAhzsL46g0as3 6HgA== 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=xbiAmCZaVy53YE76gpz4MPrLnnEcjNC+PAxBoPng2BU=; fh=X0V9mrJohNhBNUNO0jzAC2109lTMK/mES5U4bQdCj5c=; b=BzhyezKdZU5o4MlKmYT0sSoWitQfjT8cuYDln1ZPvpexDTNiPotyARytvT4lPUIN1F mbl2UbsbJymOEzGmAWqFQUfbwv63BC6N7pDYKepwit74gdJyrldg8PIo2iXGfW4gxCYy BWcBX8ZNTfnAEkypMS7z01jUe5rF2jbXS4+/juSDQivs951hjGFw8/W8hj2ilp8wJi9J 7b+he3BVMZUP4GQmnRdCXFH4TS9F79CbJQpjfWUqa4vts9OIOAa4BYfxZ9P1SWfXae8P 38LyDJMUcampQiIMUhVzkumAxEsi8oCyaMHMdeQEZXBWiuGmhaEQ7fSD3rFAAhoIZ7GO fm4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=gqMY9Ode; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=jVPHP7cB; 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 j8-20020a170903024800b001b89bd6fd59si82205plh.215.2023.08.09.15.22.40; Wed, 09 Aug 2023 15:22:54 -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=gqMY9Ode; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=jVPHP7cB; 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 S231483AbjHIUFD (ORCPT + 99 others); Wed, 9 Aug 2023 16:05:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229583AbjHIUFC (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 C70F610C4; Wed, 9 Aug 2023 13:05:01 -0700 (PDT) Date: Wed, 09 Aug 2023 20:04:59 -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=xbiAmCZaVy53YE76gpz4MPrLnnEcjNC+PAxBoPng2BU=; b=gqMY9OdeDdw9yt27sJMrtGDvSTLeRi0+27qPfaoBgZCL75ty/um9KyPQ8dBy2pm4i7MLMo 3O3Wah3qk8vKnrltr5zqulxHVpymzywIDKs2s1zMOVaKNwmiOKCjAwDalPirDljB6so6Hc i6pPyhQUmn0soniHgg2qwsUmAdw7hCzbAcnINYi4rGDsYQx+RtfEXWc2S3HUymUGBMwrpN LOlJNBJn0Yiwt8vIxbkDVCPVhqzsMYuQaxuWk7mk2dbEdZ6/lbmrSM3WE6sJZNsp2PWejD FMIhd7+jke8euvL5yHhyEGYvVrSzpWwy8WjLoA6Lr9Lo1ksY3yl/1pq0Yz5rGw== 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=xbiAmCZaVy53YE76gpz4MPrLnnEcjNC+PAxBoPng2BU=; b=jVPHP7cB7iqBeD7WAZ4oGDeoP6EbSTEJdlSQwz+RLha1mtaOYcPJxrJed4Ir7O85dejeIZ CrdoQOXsr46GVsBg== 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: Update Hybrids Cc: "Peter Zijlstra (Intel)" , "Rafael J. Wysocki" , Hans de Goede , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230807150405.828551866@infradead.org> References: <20230807150405.828551866@infradead.org> MIME-Version: 1.0 Message-ID: <169161149973.27769.14108344421147236589.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: 1773588223050369621 X-GMAIL-MSGID: 1773791896324103362 The following commit has been merged into the perf/core branch of tip: Commit-ID: 535445621a66faa7050c21d9d668595116285648 Gitweb: https://git.kernel.org/tip/535445621a66faa7050c21d9d668595116285648 Author: Peter Zijlstra AuthorDate: Mon, 07 Aug 2023 14:38:09 +02:00 Committer: Peter Zijlstra CommitterDate: Wed, 09 Aug 2023 21:51:07 +02:00 x86/cpu: Update Hybrids Give the hybrid thingies their own section, appropriately between Core and Atom. Add the Raptor Lake uarch names. Put Lunar Lake after Arrow Lake per interweb guidance. Signed-off-by: Peter Zijlstra (Intel) Acked-by: Rafael J. Wysocki Acked-by: Hans de Goede Link: https://lore.kernel.org/r/20230807150405.828551866@infradead.org --- arch/x86/include/asm/intel-family.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h index 49d40ee..5fcd85f 100644 --- a/arch/x86/include/asm/intel-family.h +++ b/arch/x86/include/asm/intel-family.h @@ -98,8 +98,6 @@ #define INTEL_FAM6_ICELAKE_L 0x7E /* Sunny Cove */ #define INTEL_FAM6_ICELAKE_NNPI 0x9D /* Sunny Cove */ -#define INTEL_FAM6_LAKEFIELD 0x8A /* Sunny Cove / Tremont */ - #define INTEL_FAM6_ROCKETLAKE 0xA7 /* Cypress Cove */ #define INTEL_FAM6_TIGERLAKE_L 0x8C /* Willow Cove */ @@ -112,20 +110,24 @@ #define INTEL_FAM6_GRANITERAPIDS_X 0xAD #define INTEL_FAM6_GRANITERAPIDS_D 0xAE +/* "Hybrid" Processors (P-Core/E-Core) */ + +#define INTEL_FAM6_LAKEFIELD 0x8A /* Sunny Cove / Tremont */ + #define INTEL_FAM6_ALDERLAKE 0x97 /* Golden Cove / Gracemont */ #define INTEL_FAM6_ALDERLAKE_L 0x9A /* Golden Cove / Gracemont */ -#define INTEL_FAM6_RAPTORLAKE 0xB7 +#define INTEL_FAM6_RAPTORLAKE 0xB7 /* Raptor Cove / Enhanced Gracemont */ #define INTEL_FAM6_RAPTORLAKE_P 0xBA #define INTEL_FAM6_RAPTORLAKE_S 0xBF #define INTEL_FAM6_METEORLAKE 0xAC #define INTEL_FAM6_METEORLAKE_L 0xAA -#define INTEL_FAM6_LUNARLAKE_M 0xBD - #define INTEL_FAM6_ARROWLAKE 0xC6 +#define INTEL_FAM6_LUNARLAKE_M 0xBD + /* "Small Core" Processors (Atom/E-Core) */ #define INTEL_FAM6_ATOM_BONNELL 0x1C /* Diamondville, Pineview */