From patchwork Fri Oct 7 01:33:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koba Ko X-Patchwork-Id: 1687256 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=WAUffRDc; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Mk9nf4TSPz23jg for ; Fri, 7 Oct 2022 12:33:57 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ogcFC-0006O8-J4; Fri, 07 Oct 2022 01:33:42 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ogcFB-0006Nn-85 for kernel-team@lists.ubuntu.com; Fri, 07 Oct 2022 01:33:41 +0000 Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 0AA803F486 for ; Fri, 7 Oct 2022 01:33:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1665106421; bh=V8wIh9InDx4uTK2qdARap0tVRcdiHNcPRYTlvGUEcFQ=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WAUffRDcJhvf8d2GLz5Fz5+2+jrHXBsBawOgWLKe22ZJ7U5M+gPKmH0ECKl/X9Who v93T2tRRCQUgNy6BpH80sNaS+bOiaNvzEKFrE8cmmU7Qbh3bVLiAX7CepT7lDsi2/p ijzxxQYs7lOxx35CCqfNj9KErqHUAcifeNCWIHCiaXjUTOfBxpASfrk+SnwwWUjItX sSma71d8bjY2NPcli5P7bhGt0F0InpAllFObmT0WToDzD9CMILn2MnQ+lFjPm9nXkH bU3CjL8wrf4toWbfTjiE3Lqoo0AcaFBav9LW3ZigIRU14/Kfbq0NrEAp/KULVPXTqA PlXowRP3m/0kw== Received: by mail-pf1-f200.google.com with SMTP id br14-20020a056a00440e00b00548434985cdso2019951pfb.8 for ; Thu, 06 Oct 2022 18:33:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V8wIh9InDx4uTK2qdARap0tVRcdiHNcPRYTlvGUEcFQ=; b=MHFl7cPSPGnn4sKRRM/no8N78mRj7sw1Efq6zwCn0xOK+d7y3JnWT1C56W3yz3VGZ/ gff+Z5qjdtmaMKIVpB4VxdWgA1TaBpix+RdTpCxyY116tSVUsJX3crxlNEnAcVejBtzv Ros5jobIJjgMXv3JHmQmrSzcX4HAibOxiC6dmSIWRIt3N6TF0irFR9ro51Zk5qm2Iqc9 u3xAQTSHAD3cMwWa+uZcpBRMl+HXEANr++JdTGOKybMFqLzclFuHOznvF1Se8v60QueR EcQNrYtUweAbUzxCI4QdeM7cvEI/nUnMBk6HCB+bODSEjGajHPWcZLEMEmuutn34kmc0 CCag== X-Gm-Message-State: ACrzQf2FT1FL1LM9z0mph1TQuikDoodq71wni2xCrJwRxDy03miqnDZ3 Hs+vedMvLzekE8zdHk3xN6+PZCf5b045LKB5sDc8VN5/3EjtQ9xCsyG525LFNhmW/hh1KxqQ3X4 qj9y2D7w7thK5MTvAsSUKZxlKackprq9GGZjzL9dPXQ== X-Received: by 2002:a17:90a:1648:b0:209:6bb1:63d2 with SMTP id x8-20020a17090a164800b002096bb163d2mr13989383pje.154.1665106419366; Thu, 06 Oct 2022 18:33:39 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4d9FbiFtcDntUXk7Vh9YzXeOj77FFGldnoh0gGEHrm2ZADcrZOR0vC7FHad7q7S+GHTXLjkA== X-Received: by 2002:a17:90a:1648:b0:209:6bb1:63d2 with SMTP id x8-20020a17090a164800b002096bb163d2mr13989363pje.154.1665106419057; Thu, 06 Oct 2022 18:33:39 -0700 (PDT) Received: from canonical.com (2001-b011-3815-5261-41ae-8d0d-5748-f9ad.dynamic-ip6.hinet.net. [2001:b011:3815:5261:41ae:8d0d:5748:f9ad]) by smtp.gmail.com with ESMTPSA id y124-20020a636482000000b004542159ce86sm403976pgb.53.2022.10.06.18.33.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Oct 2022 18:33:38 -0700 (PDT) From: Koba Ko To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/6 V2][SRU][J] x86/cpu: Drop spurious underscore from RAPTOR_LAKE #define Date: Fri, 7 Oct 2022 09:33:29 +0800 Message-Id: <20221007013334.326785-2-koba.ko@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221007013334.326785-1-koba.ko@canonical.com> References: <20221007013334.326785-1-koba.ko@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Tony Luck BugLink: https://bugs.launchpad.net/bugs/1990161 Convention for all the other "lake" CPUs is all one word. So s/RAPTOR_LAKE/RAPTORLAKE/ Fixes: fbdb5e8f2926 ("x86/cpu: Add Raptor Lake to Intel family") Reported-by: Rui Zhang Signed-off-by: Tony Luck Signed-off-by: Dave Hansen Link: https://lkml.kernel.org/r/20211119170832.1034220-1-tony.luck@intel.com (cherry picked from commit 7d697f0d5737768fa1039b8953b67c08d8d406d1) Signed-off-by: Koba Ko --- arch/x86/include/asm/intel-family.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h index 27158436f322d..048b6d5aff504 100644 --- a/arch/x86/include/asm/intel-family.h +++ b/arch/x86/include/asm/intel-family.h @@ -108,6 +108,8 @@ #define INTEL_FAM6_ALDERLAKE 0x97 /* Golden Cove / Gracemont */ #define INTEL_FAM6_ALDERLAKE_L 0x9A /* Golden Cove / Gracemont */ +#define INTEL_FAM6_RAPTORLAKE 0xB7 + /* "Small Core" Processors (Atom) */ #define INTEL_FAM6_ATOM_BONNELL 0x1C /* Diamondville, Pineview */ From patchwork Fri Oct 7 01:33:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koba Ko X-Patchwork-Id: 1687257 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=vyfzS6+z; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Mk9nf4FqSz23jd for ; Fri, 7 Oct 2022 12:33:57 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ogcFE-0006Oc-V7; Fri, 07 Oct 2022 01:33:44 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ogcFD-0006OL-3r for kernel-team@lists.ubuntu.com; Fri, 07 Oct 2022 01:33:43 +0000 Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id B060D3F486 for ; Fri, 7 Oct 2022 01:33:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1665106422; bh=OkpaZ8xBgX/gOwPR/iwCQHG6+zx1f4IcqM2JqQIm9RY=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=vyfzS6+z9SdejwBUqCDhoy5GWcYL2p0CGLnwo0PNP+Yj0JWDn3dCyLzRz7VdAvJcy wZYnOmSlNwpzEUXHmMX6sn9SJRaFyOHHu5sMRTs/n+YurhRrMEiQbwOCmWNMHobSqH HzvsNsTG5AQD3xd6v9AqjRtemFaLuilR05Ot0QAdTuA3PKRZnzXpScEcLt7kZdTsKn xtSN6HWdqfKVIM+SgSLSoXB/2aCnr5FccMC5/rv6/M58iQsG9pjLpDXh7BijwQGVYf J6b4HLVKtvqHlG6u3VzxfgVnZZrLv6mtqoBD5HZS4nHROr4UNhfa2yH/mggpK2wLoW ZrnVnb1fcvBHA== Received: by mail-pf1-f200.google.com with SMTP id h1-20020a62b401000000b0056161cd284fso2003809pfn.16 for ; Thu, 06 Oct 2022 18:33:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OkpaZ8xBgX/gOwPR/iwCQHG6+zx1f4IcqM2JqQIm9RY=; b=UmuAxCyoHMOkj5DeohybAQ/ucyOLB4SlCtUgcJP901ljba7aKVyzSX0pFJACS/9Wci m2/NlyCeqy98dtPmYSd8CVpbz+DsExtYCq6XUvalOgnqueFRdZpytJ/TrxKUK0WrEY7p 1pF+NkirZ5E24hVFAKkJYzpGCm5wAo1/9NNqtWcBZj/xxLNsNgKEDDRMS5uS33Ae18ml F5DZV30YgXJfuYNnAYi2hAful164Rxhw64hAzVNFPji+p6I+efEi+qdhDbTmAGlFvGnq DLVVZhKZZy1B7ZIXmZidJoaTQPkkTHXtuFuYsH8tmrRT8hpi0BpmBGSoqMKA/xLRzRU4 wCdw== X-Gm-Message-State: ACrzQf1I9cx4bB18huhumsfZ4PUhzMFTTomoo6DtGxGuVH/nKB93nzm9 T8Wycd+NHoyy/Qozo+XbDO3vI2Gf6g/ve4MHsM1GM4D2S1k+73V+oA7tnioShPp1TW+R5VCQotz cTA0q9tcHM3DuMncJ2QoWgTQct6MYwxz7iMYCWvmQ9A== X-Received: by 2002:a17:90b:4acf:b0:205:eef7:7716 with SMTP id mh15-20020a17090b4acf00b00205eef77716mr13165739pjb.19.1665106421183; Thu, 06 Oct 2022 18:33:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM57Nauw1AO0yKSow1AKTSXVaIOWvfvIXlE5CluUMf1kAKH2uA8Id6wn6xZRSiMK+3YFVtPClg== X-Received: by 2002:a17:90b:4acf:b0:205:eef7:7716 with SMTP id mh15-20020a17090b4acf00b00205eef77716mr13165718pjb.19.1665106420849; Thu, 06 Oct 2022 18:33:40 -0700 (PDT) Received: from canonical.com (2001-b011-3815-5261-41ae-8d0d-5748-f9ad.dynamic-ip6.hinet.net. [2001:b011:3815:5261:41ae:8d0d:5748:f9ad]) by smtp.gmail.com with ESMTPSA id k11-20020aa79d0b000000b00561beff1e09sm268476pfp.164.2022.10.06.18.33.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Oct 2022 18:33:40 -0700 (PDT) From: Koba Ko To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/6 V2][SRU][J] x86/cpu: Add new Alderlake and Raptorlake CPU model numbers Date: Fri, 7 Oct 2022 09:33:30 +0800 Message-Id: <20221007013334.326785-3-koba.ko@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221007013334.326785-1-koba.ko@canonical.com> References: <20221007013334.326785-1-koba.ko@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Tony Luck BugLink: https://bugs.launchpad.net/bugs/1990161 Intel is subdividing the mobile segment with additional models with the same codename. Using the Intel "N" and "P" suffices for these will be less confusing than trying to map to some different naming convention. Signed-off-by: Tony Luck Signed-off-by: Borislav Petkov Acked-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/r/YlS7n7Xtso9BXZA2@agluck-desk3.sc.intel.com (cherry picked from commit 3ccce9340326df40ba4462d4d2a1692b6387a68e) Signed-off-by: Koba Ko --- arch/x86/include/asm/intel-family.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h index 048b6d5aff504..def6ca121111c 100644 --- a/arch/x86/include/asm/intel-family.h +++ b/arch/x86/include/asm/intel-family.h @@ -26,6 +26,7 @@ * _G - parts with extra graphics on * _X - regular server parts * _D - micro server parts + * _N,_P - other mobile parts * * Historical OPTDIFFs: * @@ -107,8 +108,10 @@ #define INTEL_FAM6_ALDERLAKE 0x97 /* Golden Cove / Gracemont */ #define INTEL_FAM6_ALDERLAKE_L 0x9A /* Golden Cove / Gracemont */ +#define INTEL_FAM6_ALDERLAKE_N 0xBE #define INTEL_FAM6_RAPTORLAKE 0xB7 +#define INTEL_FAM6_RAPTORLAKE_P 0xBA /* "Small Core" Processors (Atom) */ From patchwork Fri Oct 7 01:33:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koba Ko X-Patchwork-Id: 1687259 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=pi0BUgGM; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Mk9nf3fvSz1yqk for ; Fri, 7 Oct 2022 12:33:57 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ogcFI-0006Q7-9H; Fri, 07 Oct 2022 01:33:48 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ogcFG-0006On-LE for kernel-team@lists.ubuntu.com; Fri, 07 Oct 2022 01:33:46 +0000 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id EA6DF3F465 for ; Fri, 7 Oct 2022 01:33:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1665106424; bh=TjsYIHW4RDTvfnGBquPTgZxMt1vqK3mzbkobnYwFL74=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pi0BUgGM8b7u49bp7nadofBsfCM8vjCZeflf0Hmt2aUVez5tOefeTHnxW1ysbXYW2 O2RRvqizww2/bbSACJyu/4osGmUKZsXD+E7YgIfvBJ5LJ5HpLXSVLdqwlhtxOcs1Sv mHCad5ZA/9WWQtqxm9sHlR5KX+g0loQbRR/+Ek0CBJi4kSBqKSMgfwUfgCarQMqr30 N+fTXEjGnjf6NCVPuXP64SL57mCqcH0SJrYten7MIvA9IwUDmerObtmTIn1ZTBKAjo S80xH3HOQGZRxlI9u9KcF+9ZNJAusnR7izH+rqhkRdU6/lQNT8Tt4PWk561ZcFuRr6 5OmepGuodYFfg== Received: by mail-pl1-f199.google.com with SMTP id m3-20020a170902bb8300b0017f7e7e4385so2370783pls.20 for ; Thu, 06 Oct 2022 18:33:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TjsYIHW4RDTvfnGBquPTgZxMt1vqK3mzbkobnYwFL74=; b=QZ9xMuMECeIwk3Jrvcv+Yo+0XMw3aKfy/bOudHIsJ+Ggc6hmjFqj70Bh+ZrqKnFzH9 y1MfAsxaQ4rWp9Alr6I9w9Y5pWxtvB3qKcZwHp4K5cWK3hErhxip4cx0Xj2tP3HZuLYS A6f11ShahmD850S526zlTBMqO5uHasUZhb14sNd5uCoAC472hH9DRbGOnRlBUs3TDh2I VIiqqb8XMAbeU52RB/Px1wkcudOX2MUe6+/+bsrrrV/6mud94A0TEdMyDjSdUxGUtzmH Z4eaXGJJoN9CIaTeuOgtztJFfO34rd0aiu2pRreC8bQzFA/rfGplY14vDQVT17YCJOqI qXaw== X-Gm-Message-State: ACrzQf09LauUmk3zm9MdQALJV/T8cmsnxaLT7BYhl5xUC2qvNE/0XQag EW1qX1rs4IKhnHwGxDvQxIfzFnpqoJJdL5MlWySXIsFp4VjrZGjh3UGoEgwisfQk0DsdedWeuyC yymbaDpJi2jxgznH2VooKlVXMz21L3NUXzw8KUYJczQ== X-Received: by 2002:a63:5a08:0:b0:43c:9fcc:cc54 with SMTP id o8-20020a635a08000000b0043c9fcccc54mr2255884pgb.229.1665106423321; Thu, 06 Oct 2022 18:33:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4dD/cYlbQsnw54BjGLm9GTZ/NNo4L4JyMT0KpQnY9+dSUs85W0RLf7Sdx35HAqsiMmEGp9Iw== X-Received: by 2002:a63:5a08:0:b0:43c:9fcc:cc54 with SMTP id o8-20020a635a08000000b0043c9fcccc54mr2255866pgb.229.1665106423018; Thu, 06 Oct 2022 18:33:43 -0700 (PDT) Received: from canonical.com (2001-b011-3815-5261-41ae-8d0d-5748-f9ad.dynamic-ip6.hinet.net. [2001:b011:3815:5261:41ae:8d0d:5748:f9ad]) by smtp.gmail.com with ESMTPSA id p7-20020a170902e74700b0016ef87334aesm258452plf.162.2022.10.06.18.33.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Oct 2022 18:33:42 -0700 (PDT) From: Koba Ko To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/6 V2][SRU][J] x86/cpu: Add new Raptor Lake CPU model number Date: Fri, 7 Oct 2022 09:33:31 +0800 Message-Id: <20221007013334.326785-4-koba.ko@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221007013334.326785-1-koba.ko@canonical.com> References: <20221007013334.326785-1-koba.ko@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Tony Luck BugLink: https://bugs.launchpad.net/bugs/1990161 Note1: Model 0xB7 already claimed the "no suffix" #define for a regular client part, so add (yet another) suffix "S" to distinguish this new part from the earlier one. Note2: the RAPTORLAKE* and ALDERLAKE* processors are very similar from a software enabling point of view. There are no known features that have model-specific enabling and also differ between the two. In other words, every single place that list *one* or more RAPTORLAKE* or ALDERLAKE* processors should list all of them. Note3: This is being merged before there is an in-tree user. Merging this provides an "anchor" so that the different folks can update their subsystems (like perf) in parallel to use this define and test it. [ dhansen: add a note about why this has no in-tree users yet ] Signed-off-by: Tony Luck Signed-off-by: Dave Hansen Link: https://lkml.kernel.org/r/20220823174819.223941-1-tony.luck@intel.com (cherry picked from commit ea902bcc1943f7539200ec464de3f54335588774) Signed-off-by: Koba Ko --- arch/x86/include/asm/intel-family.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h index def6ca121111c..aeb38023a7039 100644 --- a/arch/x86/include/asm/intel-family.h +++ b/arch/x86/include/asm/intel-family.h @@ -27,6 +27,7 @@ * _X - regular server parts * _D - micro server parts * _N,_P - other mobile parts + * _S - other client parts * * Historical OPTDIFFs: * @@ -112,6 +113,7 @@ #define INTEL_FAM6_RAPTORLAKE 0xB7 #define INTEL_FAM6_RAPTORLAKE_P 0xBA +#define INTEL_FAM6_RAPTORLAKE_S 0xBF /* "Small Core" Processors (Atom) */ From patchwork Fri Oct 7 01:33:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koba Ko X-Patchwork-Id: 1687260 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=ff3Xk6td; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Mk9nf3hp4z23jL for ; Fri, 7 Oct 2022 12:33:58 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ogcFI-0006Qf-MH; Fri, 07 Oct 2022 01:33:48 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ogcFH-0006Po-3b for kernel-team@lists.ubuntu.com; Fri, 07 Oct 2022 01:33:47 +0000 Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id D5A123F486 for ; Fri, 7 Oct 2022 01:33:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1665106426; bh=eQFF3plsPuRKlwnsF7KhFQWhtD4pripKPAPUTf4Xyjo=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ff3Xk6tdX72owimALCQEyNkjQobnX+b+uOj9TDwWbmYigLcim3FBjq/r1ddJMROJz n1+PkyZEZ5aJbA32GTho9ej+R5XQweHG9BYgKXCSrh4RXGDuCm5Yy1FMrwjVK2I16p 597WVBf9Y0lk7igP+v4+7yppYEuL+r7Y3rx++0StrMpFr+02wF5qMZ1RNpazWWlKZT iLhHxgF8Pl0YeN/Wt19eB+vC2Sf7ZKcx2tI7ocZUVTlhhGWVQv7gRPtTjmoOodqQqK USNrHeCOytv0FolwZQJtmNwy86s26XmxUPuDHBx/ZhwKjLait314F6By3XCqv6wMBk CRWCU52+l6acQ== Received: by mail-pg1-f200.google.com with SMTP id b11-20020a630c0b000000b0044c0bb18323so2044587pgl.17 for ; Thu, 06 Oct 2022 18:33:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eQFF3plsPuRKlwnsF7KhFQWhtD4pripKPAPUTf4Xyjo=; b=0WY+xaUXueQT9DQpEYgrOJXGNSoOrxaVgUqkKN88v3f4qTTsO6lcfskLKjxwhB8avP zj4mmNe01BJsTOyu2LqaB2cUbzH0GCTGxT3zSfaO4CfWeRL8A4VhLVm8o/8imz3BgWSL 5jkkognM6Z+BoSXjnKjGX5HMCdbl+HsS+Ui1x2o+czlOKllHjeN1+WYAhwLykHruWoji Ag4kEzjXVZVAoh9LYYD4vV3FlB7z6LvzSgPPJdfOvHauRrFJ7gI+2N/GxfDH0oB3TWWS 3qFE42K2WKbYMpAux+84ch1EWUbSpxlwvfM37HWmLZvJOwBErIqNA2N9P1zMXNNHBn7X 5OgA== X-Gm-Message-State: ACrzQf00VhMGKPVWICw0nZCHmfcELtPkQGFNxNacta/o3zkcIMkbHvnq m1WWQfHaiIcCOgyKHJAhKz9sYI0R9jLqguep0Ug4qNKBENKfGvCLqkHrL1VgDyRIgadAcC3o0EF Y/BY3cHcZr8xLKg6tNqMp/lqr50W0aYaN13aytIoZDA== X-Received: by 2002:a05:6a00:1591:b0:562:543a:8097 with SMTP id u17-20020a056a00159100b00562543a8097mr2737322pfk.38.1665106425283; Thu, 06 Oct 2022 18:33:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7vzQBpjRsn5JMlm1trTJlgCjK0XH/i3abDDdRT2JW7/QAGX5g9Kr5nj97qNiaR8IanXq299A== X-Received: by 2002:a05:6a00:1591:b0:562:543a:8097 with SMTP id u17-20020a056a00159100b00562543a8097mr2737304pfk.38.1665106424987; Thu, 06 Oct 2022 18:33:44 -0700 (PDT) Received: from canonical.com (2001-b011-3815-5261-41ae-8d0d-5748-f9ad.dynamic-ip6.hinet.net. [2001:b011:3815:5261:41ae:8d0d:5748:f9ad]) by smtp.gmail.com with ESMTPSA id b8-20020a170903228800b00176ea6ce0efsm272162plh.109.2022.10.06.18.33.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Oct 2022 18:33:44 -0700 (PDT) From: Koba Ko To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/6 V2][SRU][J] powercap: intel_rapl: add support for RaptorLake Date: Fri, 7 Oct 2022 09:33:32 +0800 Message-Id: <20221007013334.326785-5-koba.ko@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221007013334.326785-1-koba.ko@canonical.com> References: <20221007013334.326785-1-koba.ko@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Zhang Rui BugLink: https://bugs.launchpad.net/bugs/1990161 Add intel_rapl support for the RaptorLake platform. Signed-off-by: Zhang Rui Signed-off-by: Rafael J. Wysocki (cherry picked from commit ae0dc7ed1a7c713ee9ba563a328d3b4d59223d7c) Signed-off-by: Koba Ko --- drivers/powercap/intel_rapl_common.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c index f0d65382806af..19883bde48588 100644 --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c @@ -1050,6 +1050,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { X86_MATCH_INTEL_FAM6_MODEL(ROCKETLAKE, &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, &rapl_defaults_core), + X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &rapl_defaults_spr_server), X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD, &rapl_defaults_core), From patchwork Fri Oct 7 01:33:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koba Ko X-Patchwork-Id: 1687262 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=NS2bY/9W; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Mk9nk3293z1yqk for ; Fri, 7 Oct 2022 12:34:02 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ogcFN-0006XE-HN; Fri, 07 Oct 2022 01:33:53 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ogcFK-0006RL-MJ for kernel-team@lists.ubuntu.com; Fri, 07 Oct 2022 01:33:50 +0000 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id E5B733F465 for ; Fri, 7 Oct 2022 01:33:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1665106428; bh=rDxXYfbVK3j4By9ACHst7/D03eByWewUng6SHqsBVxg=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NS2bY/9WFKjHZEMjLHaIDLB4OVzRb9CtjQ0wrKO5eMFwiO9RpRHvZdDp1Ysa8KCa1 i3xlGMpxlnzDfLULHzG3ivBN+998s2gq9igWE1lGbrbukatzeGYtIZSUDUYh7urFKz R90+ABxUr81t5PGBKN72ttTx9x3tESklR5dh21cUDA63Tg24d5/8+avHMVQkfXYUmP XuuHnpBdh+sdz0+f9+xg4qTbVWYCBNNM7gRurh/AD40332CZaToLmCJt+qqCnp3XhI LbT+0QhmMdRdi/2gNcq48T0t6kU619Eck8MkFk5K6bJ+OIxWoC9H/AndlTijt46jve pQV+miZkKG/Ng== Received: by mail-pj1-f71.google.com with SMTP id pc10-20020a17090b3b8a00b00202be8d81d2so3884207pjb.1 for ; Thu, 06 Oct 2022 18:33:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rDxXYfbVK3j4By9ACHst7/D03eByWewUng6SHqsBVxg=; b=XshpztWq3gQMhI9kaEEeicABEjtkvsKhP+7N9mvS2wREEBSav1gi1pl3pBlEncRzfg scjQAlax4FkzDSERMF//RW2WhFnXYu0ueU8bCwzE4Vdki6eVHy+Zs0XXImllXLp+UlzE bV5jeW9NR6ksUF52KMJ92RZmA6gjwSm5NZtrzJdyVwCwD749YeZNW1S56QHObetqLG/M dQuteHrohDz4XE4C7WR+zZtlJIsgo8wtuRPVbx6jE90Jxse5g19G2H46xFOvc7MKz+rU NVa0vfcKw30hWkW6PVr32oTyRx4BS3mbaQU1KyF9tIu1b2S9lj+F8PHGDrtHuUmDSMtN CcDg== X-Gm-Message-State: ACrzQf2l6pWAyG7f+7UNPVSHYVOR7HSCjNyVga0PpEoU3OAV/YpRQGgW vi5TUggckj6JkLQCgyTWIr/X2aIyE8cn6Wn2tyx9QRPUXrZ6IwG9u3Y+kyKyD2JVb5RStTw4dI+ nRqJhyRe/wq5ElmxJFejC+pITH4Axo+glqtL2TQWeQA== X-Received: by 2002:a05:6a00:a29:b0:54e:6aed:c655 with SMTP id p41-20020a056a000a2900b0054e6aedc655mr2520955pfh.25.1665106427212; Thu, 06 Oct 2022 18:33:47 -0700 (PDT) X-Google-Smtp-Source: AMsMyM78S3VzFlOIWWZZfU1PAtK2wBfO5ZQl+9ukOLo43DvyROfC6FGikUgVhw8YPgCi29kuVnxs9g== X-Received: by 2002:a05:6a00:a29:b0:54e:6aed:c655 with SMTP id p41-20020a056a000a2900b0054e6aedc655mr2520942pfh.25.1665106426836; Thu, 06 Oct 2022 18:33:46 -0700 (PDT) Received: from canonical.com (2001-b011-3815-5261-41ae-8d0d-5748-f9ad.dynamic-ip6.hinet.net. [2001:b011:3815:5261:41ae:8d0d:5748:f9ad]) by smtp.gmail.com with ESMTPSA id i14-20020a170902cf0e00b0017cc29a5536sm289529plg.17.2022.10.06.18.33.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Oct 2022 18:33:46 -0700 (PDT) From: Koba Ko To: kernel-team@lists.ubuntu.com Subject: [PATCH 5/6 V2][SRU][J] powercap: intel_rapl: Add support for RAPTORLAKE_P Date: Fri, 7 Oct 2022 09:33:33 +0800 Message-Id: <20221007013334.326785-6-koba.ko@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221007013334.326785-1-koba.ko@canonical.com> References: <20221007013334.326785-1-koba.ko@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: George D Sworo BugLink: https://bugs.launchpad.net/bugs/1990161 Add RAPTORLAKE_P to the list of supported processor models in the Intel RAPL power capping driver. Signed-off-by: George D Sworo Acked-by: Zhang Rui Tested-by: Sumeet Pawnikar [ rjw: Minor changelog edits ] Signed-off-by: Rafael J. Wysocki (cherry picked from commit 2755714656d0f2f41adfe231f3865e72da2cbe39) Signed-off-by: Koba Ko --- drivers/powercap/intel_rapl_common.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c index 19883bde48588..7544fc293d7ef 100644 --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c @@ -1051,6 +1051,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, &rapl_defaults_core), + X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &rapl_defaults_spr_server), X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD, &rapl_defaults_core), From patchwork Fri Oct 7 01:33:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koba Ko X-Patchwork-Id: 1687261 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=tKqxfADk; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Mk9ng6j7Fz23jj for ; Fri, 7 Oct 2022 12:33:59 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ogcFM-0006VA-3a; Fri, 07 Oct 2022 01:33:52 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ogcFL-0006Tx-0c for kernel-team@lists.ubuntu.com; Fri, 07 Oct 2022 01:33:51 +0000 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id AF8913F486 for ; Fri, 7 Oct 2022 01:33:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1665106430; bh=wGicy5pFA7wEgWpI3uBBcwue/rJrKooYFOJH0YceS0E=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tKqxfADkUAmb/ERDtYcVQdUNRZxwJVPcNwFu7iKz9TCU7l7txqdyl0h3YQ1UMS0nJ u/AChzbuOc8dlOXMmNWYP3ExjcU3UhDBCEmeG7iXYgHV1iVVRf25OvV1yHxiSb+Kas eC304vfi70/5Of0OrCRYDgjUWwe/daOmHeMhnKhk34hJbpv9PoCvEsxgT+rgXL6Yst hnWfhM3pAz5rkXX+R4AXrvQ75qoK4mkeqZmTpI6JeKMmWSKQuCAdETLkuCpsAngVnL tyPJB2JH4Tl+vWBuW38PVkuZ1KLR1fVuipRSk1JXpXZYcUmFywUuGtvouZCmRytR1b qKTXT+razNpnQ== Received: by mail-pl1-f200.google.com with SMTP id c8-20020a170902d48800b0017cdfc41a38so2368112plg.15 for ; Thu, 06 Oct 2022 18:33:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wGicy5pFA7wEgWpI3uBBcwue/rJrKooYFOJH0YceS0E=; b=LpcbLaHCurEO98WgnkMp4sUc/tbhFNBwQUo3NZ3A35v1I5wsZ7prw+NTLQ35ZiPyLU lkHc9Sey2t0GiOVh8zTwwU8hWqiDd9NNUtOuZXcKTnEaQp5zE5x+x39bbjH8A+tULbRH rUazq3vptgnm8sjgvvbLm2q5SCK1/5ToiXhLbZl+top/0OFpXTNFWVSlrp4ZLn7twmvJ vpi8jUScX6N68Br3+En+viFbxmZg52DBrNXSOXkR+4sey786bU5SsLTiGcGjmT5f8P2m A7azukNUJJPnAqzgqoWv2qk22Ga4XBubPeG1aSb6dZs2lYxBiLsgGpltRAw4neakh4pZ 0KEA== X-Gm-Message-State: ACrzQf2Wjqtp/AvNkMLnVINA/47RNdfMCivwEFmi97YjPIazVba5NkGC v9KXT9wnTwvFJ+BMzW+F5Xs1oMtKsm1LBbhwvcCqdEp5FntnqAvw+TnQsuDBY0mKohbefr0LVry c5yRvxzVEkri3uG/dcL3JbCAdK+Oc0/nIWH6G+Yolyg== X-Received: by 2002:a17:90a:6883:b0:20a:d58b:d690 with SMTP id a3-20020a17090a688300b0020ad58bd690mr13830496pjd.241.1665106428980; Thu, 06 Oct 2022 18:33:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6Qoud3HPKllS71zKBb8iSm5j+c6qxwYTqN7dkqtmITvLUOWHlEkzFY4lz5lA0CJ9gtrtq1qg== X-Received: by 2002:a17:90a:6883:b0:20a:d58b:d690 with SMTP id a3-20020a17090a688300b0020ad58bd690mr13830472pjd.241.1665106428613; Thu, 06 Oct 2022 18:33:48 -0700 (PDT) Received: from canonical.com (2001-b011-3815-5261-41ae-8d0d-5748-f9ad.dynamic-ip6.hinet.net. [2001:b011:3815:5261:41ae:8d0d:5748:f9ad]) by smtp.gmail.com with ESMTPSA id c2-20020aa79522000000b005625ef68eecsm287515pfp.31.2022.10.06.18.33.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Oct 2022 18:33:48 -0700 (PDT) From: Koba Ko To: kernel-team@lists.ubuntu.com Subject: [PATCH 6/6 V2][SRU][J] powercap: intel_rapl: Add support for RAPTORLAKE_S Date: Fri, 7 Oct 2022 09:33:34 +0800 Message-Id: <20221007013334.326785-7-koba.ko@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221007013334.326785-1-koba.ko@canonical.com> References: <20221007013334.326785-1-koba.ko@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Zhang Rui BugLink: https://bugs.launchpad.net/bugs/1990161 Add intel_rapl support for RAPTORLAKE_S platform, which behaves the same as RAPTORLAKE and RAPTORLAKE_P platforms. Signed-off-by: Zhang Rui Signed-off-by: Rafael J. Wysocki (cherry picked from commit 0d7a23b5f8e162bf2c5caab06f5df4aee2619073) Signed-off-by: Koba Ko --- drivers/powercap/intel_rapl_common.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c index 7544fc293d7ef..97d14f6027d19 100644 --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c @@ -1052,6 +1052,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, &rapl_defaults_core), + X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &rapl_defaults_spr_server), X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD, &rapl_defaults_core),