From nobody Mon Feb 9 00:54:17 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4FB03311597; Wed, 31 Dec 2025 22:49:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767221391; cv=none; b=jHcZwVRD/B8tRx9oktwZvBafH2f1BhaNaKAjqRUHAMBmpe8/LlHnaQXUk3HvMb7qwPFc/FqQnt9r7Mo5PVSG1gORRK4zHy53QrCXKD7ovWB1781ZBL+8MDZPk825UYjGxWBQ4yko+vdtuZcY39XRXoyQ1NtAV04JCbBJ3+mgR4Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767221391; c=relaxed/simple; bh=in/xnkNiTpHbayfsNE+28SycgPONgivGOwAsXcQTePA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JsO5iEo1Eq/Wa7vvYlxBQaYvbQx3N3z4Chl9RC0LCplO+GSeeeV04cUIgZoTzbe+0ZHYRLcAceiQVuKTqsmWi2nuAj0SGwYuQ1cEb7x1ui8vGJLoaR61e4qIAbDYFBC5hxZ8gCiLTTx7XPel1Ubc+cAOnFVwl5cLdmblyau5C7M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=nAl0rtpw; arc=none smtp.client-ip=192.198.163.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="nAl0rtpw" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1767221389; x=1798757389; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=in/xnkNiTpHbayfsNE+28SycgPONgivGOwAsXcQTePA=; b=nAl0rtpwwwrjMsLs00/3rzoPgeeDeptOYlUVk9IXDIHy5NndFCOPgET3 sOdeO/bsa9jnaaB8GTSnB7uOETP5K9dBhFdG+pFedSQ/tLI+zKSZZqs8P pETGmqcdBwPTglWJYaTzW9C+6Ns4yiySG3HNYwHXortNVxvEqXvxYKnrG /2L7Qqo48kieivoT/ypFTg6cegDXgyngwX+o3IjFJPbRpWIDfhQpg0GFL aFltb2cYwgO0i2hWQW0FC4d7d2ca7ISU21jt0vdET6VmuCazeTqfRavxl SGG2oJRnQ/CR3F4fwp65Kyor01pEqrvPhK3kmaCifhte/KSXwIw0WQwOo g==; X-CSE-ConnectionGUID: BqQfsXVNRNKA7t9P3EDdBQ== X-CSE-MsgGUID: OYgcQBJWRD6nOajggHzdfw== X-IronPort-AV: E=McAfee;i="6800,10657,11658"; a="68816665" X-IronPort-AV: E=Sophos;i="6.21,193,1763452800"; d="scan'208";a="68816665" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Dec 2025 14:49:43 -0800 X-CSE-ConnectionGUID: GEUdedGHTzqb3xILLekS+A== X-CSE-MsgGUID: YXTfXg4dROW9EhJ8CSQMtA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,193,1763452800"; d="scan'208";a="232611040" Received: from 9cc2c43eec6b.jf.intel.com ([10.54.77.43]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Dec 2025 14:49:42 -0800 From: Zide Chen To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Ian Rogers , Adrian Hunter , Alexander Shishkin , Andi Kleen , Eranian Stephane Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Dapeng Mi , Zide Chen , Xudong Hao , Falcon Thomas Subject: [PATCH V2 13/13] perf/x86/intel/uncore: Add Nova Lake support Date: Wed, 31 Dec 2025 14:42:30 -0800 Message-ID: <20251231224233.113839-14-zide.chen@intel.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251231224233.113839-1-zide.chen@intel.com> References: <20251231224233.113839-1-zide.chen@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Nova Lake uncore PMON largely follows Panther Lake and supports CBOX, iMC, cNCU, SANTA, sNCU, and HBO units. As with Panther Lake, CBOX, cNCU, and SANTA are not enumerated via discovery tables. Their programming model matches Panther Lake, with differences limited to MSR addresses and the number of boxes or counters per box. The remaining units are enumerated via discovery tables using a new base MSR (0x711) and otherwise reuse the Panther Lake implementation. Nova Lake also supports iMC free-running counters. Signed-off-by: Zide Chen Reviewed-by: Dapeng Mi --- V2: new patch arch/x86/events/intel/uncore.c | 9 ++++++ arch/x86/events/intel/uncore.h | 1 + arch/x86/events/intel/uncore_discovery.h | 2 ++ arch/x86/events/intel/uncore_snb.c | 40 ++++++++++++++++++++++++ 4 files changed, 52 insertions(+) diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c index 07a9a2826398..2607bf178658 100644 --- a/arch/x86/events/intel/uncore.c +++ b/arch/x86/events/intel/uncore.c @@ -1817,6 +1817,13 @@ static const struct uncore_plat_init ptl_uncore_init= __initconst =3D { .domain[0].global_init =3D uncore_mmio_global_init, }; =20 +static const struct uncore_plat_init nvl_uncore_init __initconst =3D { + .cpu_init =3D nvl_uncore_cpu_init, + .mmio_init =3D ptl_uncore_mmio_init, + .domain[0].discovery_base =3D PACKAGE_UNCORE_DISCOVERY_MSR, + .domain[0].global_init =3D uncore_mmio_global_init, +}; + static const struct uncore_plat_init icx_uncore_init __initconst =3D { .cpu_init =3D icx_uncore_cpu_init, .pci_init =3D icx_uncore_pci_init, @@ -1916,6 +1923,8 @@ static const struct x86_cpu_id intel_uncore_match[] _= _initconst =3D { X86_MATCH_VFM(INTEL_LUNARLAKE_M, &lnl_uncore_init), X86_MATCH_VFM(INTEL_PANTHERLAKE_L, &ptl_uncore_init), X86_MATCH_VFM(INTEL_WILDCATLAKE_L, &ptl_uncore_init), + X86_MATCH_VFM(INTEL_NOVALAKE, &nvl_uncore_init), + X86_MATCH_VFM(INTEL_NOVALAKE_L, &nvl_uncore_init), X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X, &spr_uncore_init), X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X, &spr_uncore_init), X86_MATCH_VFM(INTEL_GRANITERAPIDS_X, &gnr_uncore_init), diff --git a/arch/x86/events/intel/uncore.h b/arch/x86/events/intel/uncore.h index 564cb26c4468..c35918c01afa 100644 --- a/arch/x86/events/intel/uncore.h +++ b/arch/x86/events/intel/uncore.h @@ -636,6 +636,7 @@ void adl_uncore_cpu_init(void); void lnl_uncore_cpu_init(void); void mtl_uncore_cpu_init(void); void ptl_uncore_cpu_init(void); +void nvl_uncore_cpu_init(void); void tgl_uncore_mmio_init(void); void tgl_l_uncore_mmio_init(void); void adl_uncore_mmio_init(void); diff --git a/arch/x86/events/intel/uncore_discovery.h b/arch/x86/events/int= el/uncore_discovery.h index 63b8f7634e42..e1330342b92e 100644 --- a/arch/x86/events/intel/uncore_discovery.h +++ b/arch/x86/events/intel/uncore_discovery.h @@ -4,6 +4,8 @@ #define UNCORE_DISCOVERY_MSR 0x201e /* Base address of uncore perfmon discovery table for CBB domain */ #define CBB_UNCORE_DISCOVERY_MSR 0x710 +/* Base address of uncore perfmon discovery table for the package */ +#define PACKAGE_UNCORE_DISCOVERY_MSR 0x711 =20 /* Generic device ID of a discovery table device */ #define UNCORE_DISCOVERY_TABLE_DEVICE 0x09a7 diff --git a/arch/x86/events/intel/uncore_snb.c b/arch/x86/events/intel/unc= ore_snb.c index c663b00b68fe..e8e44741200e 100644 --- a/arch/x86/events/intel/uncore_snb.c +++ b/arch/x86/events/intel/uncore_snb.c @@ -256,6 +256,19 @@ /* PTL cNCU register */ #define PTL_UNC_CNCU_MSR_OFFSET 0x140 =20 +/* NVL cNCU register */ +#define NVL_UNC_CNCU_BOX_CTL 0x202e +#define NVL_UNC_CNCU_FIXED_CTR 0x2028 +#define NVL_UNC_CNCU_FIXED_CTRL 0x2022 + +/* NVL SANTA register */ +#define NVL_UNC_SANTA_CTR0 0x2048 +#define NVL_UNC_SANTA_CTRL0 0x2042 + +/* NVL CBOX register */ +#define NVL_UNC_CBOX_PER_CTR0 0x2108 +#define NVL_UNC_CBOX_PERFEVTSEL0 0x2102 + DEFINE_UNCORE_FORMAT_ATTR(event, event, "config:0-7"); DEFINE_UNCORE_FORMAT_ATTR(umask, umask, "config:8-15"); DEFINE_UNCORE_FORMAT_ATTR(chmask, chmask, "config:8-11"); @@ -1979,3 +1992,30 @@ void ptl_uncore_cpu_init(void) } =20 /* end of Panther Lake uncore support */ + +/* Nova Lake uncore support */ + +static struct intel_uncore_type *nvl_msr_uncores[] =3D { + &mtl_uncore_cbox, + &ptl_uncore_santa, + &mtl_uncore_cncu, + NULL +}; + +void nvl_uncore_cpu_init(void) +{ + mtl_uncore_cbox.num_boxes =3D 12; + mtl_uncore_cbox.perf_ctr =3D NVL_UNC_CBOX_PER_CTR0, + mtl_uncore_cbox.event_ctl =3D NVL_UNC_CBOX_PERFEVTSEL0, + + ptl_uncore_santa.perf_ctr =3D NVL_UNC_SANTA_CTR0, + ptl_uncore_santa.event_ctl =3D NVL_UNC_SANTA_CTRL0, + + mtl_uncore_cncu.box_ctl =3D NVL_UNC_CNCU_BOX_CTL; + mtl_uncore_cncu.fixed_ctr =3D NVL_UNC_CNCU_FIXED_CTR; + mtl_uncore_cncu.fixed_ctl =3D NVL_UNC_CNCU_FIXED_CTRL; + + uncore_msr_uncores =3D nvl_msr_uncores; +} + +/* end of Nova Lake uncore support */ --=20 2.52.0