From nobody Mon Feb 9 10:50:27 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67841C001B0 for ; Wed, 9 Aug 2023 20:05:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231927AbjHIUFD (ORCPT ); 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the perf/core branch of tip: Commit-ID: 535445621a66faa7050c21d9d668595116285648 Gitweb: https://git.kernel.org/tip/535445621a66faa7050c21d9d66859511= 6285648 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/int= el-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 */ =20 -#define INTEL_FAM6_LAKEFIELD 0x8A /* Sunny Cove / Tremont */ - #define INTEL_FAM6_ROCKETLAKE 0xA7 /* Cypress Cove */ =20 #define INTEL_FAM6_TIGERLAKE_L 0x8C /* Willow Cove */ @@ -112,20 +110,24 @@ #define INTEL_FAM6_GRANITERAPIDS_X 0xAD #define INTEL_FAM6_GRANITERAPIDS_D 0xAE =20 +/* "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 */ =20 -#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 =20 #define INTEL_FAM6_METEORLAKE 0xAC #define INTEL_FAM6_METEORLAKE_L 0xAA =20 -#define INTEL_FAM6_LUNARLAKE_M 0xBD - #define INTEL_FAM6_ARROWLAKE 0xC6 =20 +#define INTEL_FAM6_LUNARLAKE_M 0xBD + /* "Small Core" Processors (Atom/E-Core) */ =20 #define INTEL_FAM6_ATOM_BONNELL 0x1C /* Diamondville, Pineview */