From patchwork Wed Jun 15 08:29: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: 1643518 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=obk3sXEy; dkim-atps=neutral Authentication-Results: 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=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LNJQY4Ltsz9vFw for ; Wed, 15 Jun 2022 18:30:13 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1o1OPd-0001xE-5S; Wed, 15 Jun 2022 08:30:05 +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 1o1OPW-0001lq-MX for kernel-team@lists.ubuntu.com; Wed, 15 Jun 2022 08:29:58 +0000 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (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 627073F1A3 for ; Wed, 15 Jun 2022 08:29:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1655281798; bh=HKGhI58+FPqwBXmYXuSOGqhGs6+5Ya9Mhtj/hFL36NY=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=obk3sXEyqMZApUrS2WOqu7PEXMZFNGYvRKVu+ZlQvgffogdf48dczvhkOIn8HSGOD ajq2uPA1uw/HjHSQqwiJlkxONVjJ/Eyn9VXy2q6ZZgJkRB4HGKw8WehPgxsj7fqGye DTJGuTsgaFePZ8Y3zKI7ISo/PQC9BeHbmMXCCCSGWYOSkuHTLghTHaI79VAxt9jlJg Q39K3Moq5vGwce3zbao5zp1pr26OF3De8a6UW6chD48kT37QRCGpmjTo/oZcqwo76c 4jBDRghcC7azl5jow8UznMuLJgJtOsBW5lZUsn0WlOy0R0XgD0vKPDbly4kbRZMb/g 54SCqlrRLJkeQ== Received: by mail-pl1-f197.google.com with SMTP id z9-20020a170903018900b00168b66bbde2so6231212plg.12 for ; Wed, 15 Jun 2022 01:29:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HKGhI58+FPqwBXmYXuSOGqhGs6+5Ya9Mhtj/hFL36NY=; b=DgvfO5BD8bx9ItG1yfao43vvQ7XfSY31lr8rzSmYwOsak6xa2jos811RgAXMZUkHcD d2Ti5VmDdFnJpO5oeZ/xPGZ0kn1HgX6loudzqR7flMZkDK0RrfXJSkL7AC5XY96B/4Rp dmI/V8ye2Ic8ZtLVAvoIZezXtx3Z3GJkr9wQRthUk2yVrMe4HvBv6YD3/tCOwCb3oj9a XdSur+fq4wCYXx+aN22r8SxOLduMTS36CFpsbkZgf0IoE6Z9cao4FuY7OsFlv910z/oS c1Uh0GswWBGplwTYBl4DIGZclSHFon37NJ4dV9xjQiZ1UFDww1JemIxuKwyAPSxwwISu mqEg== X-Gm-Message-State: AJIora8Xd/9H4opLgON1fFTDEJ8TU4QXUOH8HJDplq6H2C3Lidd1w/dK 4Cj2xNsd3ecbdRhS9cqP9MBq/RcrSZF+MzrCHvmjJw0K5ppKXJJ6Dt2NqtmRxLu4BIYYu/96i+L NwjJgZlinwvg1h1iJXkIVciTxhuxh0nwdJ/cdP10ZzQ== X-Received: by 2002:a17:90a:bf02:b0:1e2:fadf:3f15 with SMTP id c2-20020a17090abf0200b001e2fadf3f15mr8811229pjs.91.1655281797598; Wed, 15 Jun 2022 01:29:57 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s5bPj3JAgrOBg4z/AR884mht9aOoFxWKUscSiCMfJHSaWSNs9LVtND2av0lGByZa3xh2elMQ== X-Received: by 2002:a17:90a:bf02:b0:1e2:fadf:3f15 with SMTP id c2-20020a17090abf0200b001e2fadf3f15mr8811207pjs.91.1655281797242; Wed, 15 Jun 2022 01:29:57 -0700 (PDT) Received: from canonical.com (2001-b011-3815-3eb1-fbbb-4d66-1ffd-7b1d.dynamic-ip6.hinet.net. [2001:b011:3815:3eb1:fbbb:4d66:1ffd:7b1d]) by smtp.gmail.com with ESMTPSA id x17-20020a170902ec9100b0016372486febsm8681637plg.297.2022.06.15.01.29.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 01:29:56 -0700 (PDT) From: Koba Ko To: kernel-team@lists.ubuntu.com Subject: [PATCH 07/13][SRU][OEM-5.17] perf/x86/uncore: Add new Alder Lake and Raptor Lake support Date: Wed, 15 Jun 2022 16:29:33 +0800 Message-Id: <20220615082939.278128-8-koba.ko@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220615082939.278128-1-koba.ko@canonical.com> References: <20220615082939.278128-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: Kan Liang BugLink: https://bugs.launchpad.net/bugs/1978794 From the perspective of the uncore PMU, there is nothing changed for the new Alder Lake N and Raptor Lake P. Add new PCIIDs of IMC. Signed-off-by: Kan Liang Signed-off-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/r/20220504194413.1003071-5-kan.liang@linux.intel.com (cherry picked from commit f758bc5a91233bb5b5b6994a8e72ba4eba0e9ab2) Signed-off-by: Koba Ko --- arch/x86/events/intel/uncore.c | 3 ++ arch/x86/events/intel/uncore_snb.c | 56 ++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c index e497da9bf4270..db6c31bca8092 100644 --- a/arch/x86/events/intel/uncore.c +++ b/arch/x86/events/intel/uncore.c @@ -1828,6 +1828,9 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = { X86_MATCH_INTEL_FAM6_MODEL(ROCKETLAKE, &rkl_uncore_init), X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, &adl_uncore_init), X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, &adl_uncore_init), + X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_N, &adl_uncore_init), + X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, &adl_uncore_init), + X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, &adl_uncore_init), X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &spr_uncore_init), X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &snr_uncore_init), {}, diff --git a/arch/x86/events/intel/uncore_snb.c b/arch/x86/events/intel/uncore_snb.c index cd7026f161c20..87728ff5b323c 100644 --- a/arch/x86/events/intel/uncore_snb.c +++ b/arch/x86/events/intel/uncore_snb.c @@ -79,6 +79,36 @@ #define PCI_DEVICE_ID_INTEL_ADL_14_IMC 0x4650 #define PCI_DEVICE_ID_INTEL_ADL_15_IMC 0x4668 #define PCI_DEVICE_ID_INTEL_ADL_16_IMC 0x4670 +#define PCI_DEVICE_ID_INTEL_ADL_17_IMC 0x4614 +#define PCI_DEVICE_ID_INTEL_ADL_18_IMC 0x4617 +#define PCI_DEVICE_ID_INTEL_ADL_19_IMC 0x4618 +#define PCI_DEVICE_ID_INTEL_ADL_20_IMC 0x461B +#define PCI_DEVICE_ID_INTEL_ADL_21_IMC 0x461C +#define PCI_DEVICE_ID_INTEL_RPL_1_IMC 0xA700 +#define PCI_DEVICE_ID_INTEL_RPL_2_IMC 0xA702 +#define PCI_DEVICE_ID_INTEL_RPL_3_IMC 0xA706 +#define PCI_DEVICE_ID_INTEL_RPL_4_IMC 0xA709 +#define PCI_DEVICE_ID_INTEL_RPL_5_IMC 0xA701 +#define PCI_DEVICE_ID_INTEL_RPL_6_IMC 0xA703 +#define PCI_DEVICE_ID_INTEL_RPL_7_IMC 0xA704 +#define PCI_DEVICE_ID_INTEL_RPL_8_IMC 0xA705 +#define PCI_DEVICE_ID_INTEL_RPL_9_IMC 0xA706 +#define PCI_DEVICE_ID_INTEL_RPL_10_IMC 0xA707 +#define PCI_DEVICE_ID_INTEL_RPL_11_IMC 0xA708 +#define PCI_DEVICE_ID_INTEL_RPL_12_IMC 0xA709 +#define PCI_DEVICE_ID_INTEL_RPL_13_IMC 0xA70a +#define PCI_DEVICE_ID_INTEL_RPL_14_IMC 0xA70b +#define PCI_DEVICE_ID_INTEL_RPL_15_IMC 0xA715 +#define PCI_DEVICE_ID_INTEL_RPL_16_IMC 0xA716 +#define PCI_DEVICE_ID_INTEL_RPL_17_IMC 0xA717 +#define PCI_DEVICE_ID_INTEL_RPL_18_IMC 0xA718 +#define PCI_DEVICE_ID_INTEL_RPL_19_IMC 0xA719 +#define PCI_DEVICE_ID_INTEL_RPL_20_IMC 0xA71A +#define PCI_DEVICE_ID_INTEL_RPL_21_IMC 0xA71B +#define PCI_DEVICE_ID_INTEL_RPL_22_IMC 0xA71C +#define PCI_DEVICE_ID_INTEL_RPL_23_IMC 0xA728 +#define PCI_DEVICE_ID_INTEL_RPL_24_IMC 0xA729 +#define PCI_DEVICE_ID_INTEL_RPL_25_IMC 0xA72A #define IMC_UNCORE_DEV(a) \ @@ -1186,10 +1216,36 @@ static const struct pci_device_id tgl_uncore_pci_ids[] = { IMC_UNCORE_DEV(ADL_14), IMC_UNCORE_DEV(ADL_15), IMC_UNCORE_DEV(ADL_16), + IMC_UNCORE_DEV(ADL_17), + IMC_UNCORE_DEV(ADL_18), + IMC_UNCORE_DEV(ADL_19), + IMC_UNCORE_DEV(ADL_20), + IMC_UNCORE_DEV(ADL_21), IMC_UNCORE_DEV(RPL_1), IMC_UNCORE_DEV(RPL_2), IMC_UNCORE_DEV(RPL_3), IMC_UNCORE_DEV(RPL_4), + IMC_UNCORE_DEV(RPL_5), + IMC_UNCORE_DEV(RPL_6), + IMC_UNCORE_DEV(RPL_7), + IMC_UNCORE_DEV(RPL_8), + IMC_UNCORE_DEV(RPL_9), + IMC_UNCORE_DEV(RPL_10), + IMC_UNCORE_DEV(RPL_11), + IMC_UNCORE_DEV(RPL_12), + IMC_UNCORE_DEV(RPL_13), + IMC_UNCORE_DEV(RPL_14), + IMC_UNCORE_DEV(RPL_15), + IMC_UNCORE_DEV(RPL_16), + IMC_UNCORE_DEV(RPL_17), + IMC_UNCORE_DEV(RPL_18), + IMC_UNCORE_DEV(RPL_19), + IMC_UNCORE_DEV(RPL_20), + IMC_UNCORE_DEV(RPL_21), + IMC_UNCORE_DEV(RPL_22), + IMC_UNCORE_DEV(RPL_23), + IMC_UNCORE_DEV(RPL_24), + IMC_UNCORE_DEV(RPL_25), { /* end: all zeroes */ } };