From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) (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 497BB22068D for ; Sat, 6 Jun 2026 02:43:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.19 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780713814; cv=none; b=kREfiGRdLNMlnitdaLHmivhKvyrAR3FKCBOF7UasJXepmwdODsV1yXhY41h43vSL8Cf/yB++rqn6cU9x1wa6zNQBTbCaOHrmFR7ROK8BPga2XwunSpG2hwfvWs65HI/EfpPAsrgFEMnwhNkZIfSrv0YqCWwmFAWHUGDQhmVmRzc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780713814; c=relaxed/simple; bh=YMgY9dYtJ0jgo09Am5FJC7XwC9n+mBt9lyZ4IoETPKs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PBSbJML+IfuEua82fCQmOmEbYE3I8ygQypcYWoF2bXYi3TfUHAZXyvaFID0pU0jcGerrkr/UwJTEFRGUo9BK4Y1KmGaiY+AtMRgtGAZbNugWsEZfLqqPCDzOales4ldb2FRYfSPN3ZYglUs0ITNkDx4xWCJRLhnFSm4mCRAlxvE= 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=JWoZ3Ih6; arc=none smtp.client-ip=198.175.65.19 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="JWoZ3Ih6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1780713813; x=1812249813; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YMgY9dYtJ0jgo09Am5FJC7XwC9n+mBt9lyZ4IoETPKs=; b=JWoZ3Ih6wtI+yYNgEDiClSCMSdBgg5gZJGz6e0+NrWWdV8FUFjkTk6LU plJOYHbcchq0HPJGo+CV9FbPsb74fSrS6WPUc9lu4U3RXCPvw7ewUSG1S u28CCk2pxARFh1AQ95l7Y8TLjUOPo8FdkEXcGVpXnUEftRlgn/k/hAEQO Svi/HWD3e7W3UFlyL8vcvz30WgyaRFTDAj6TcFwiCpkY5ic30THiGhNSE G20WmEZRASH3N1hsUec20hnBUJVE0g8vJeK9KS9MeXBJlN5kDD06MadWY Kv4StmSeGc/qBwPX8r0hRVhwY2gpy79++5ruXwTH+lRfSkbz21nwlMsI+ g==; X-CSE-ConnectionGUID: kIIuHq4wR8C3dj4DIIY7uA== X-CSE-MsgGUID: bGbOwFihQCCFR68BJNXIEQ== X-IronPort-AV: E=McAfee;i="6800,10657,11808"; a="81523438" X-IronPort-AV: E=Sophos;i="6.24,189,1774335600"; d="scan'208";a="81523438" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jun 2026 19:43:33 -0700 X-CSE-ConnectionGUID: SvR8SV6sQU6WqbCOmXZvKQ== X-CSE-MsgGUID: S/brv2K+StSAXFHjg7sBrA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,189,1774335600"; d="scan'208";a="244844406" Received: from chenyu-dev.sh.intel.com ([10.239.62.107]) by orviesa008.jf.intel.com with ESMTP; 05 Jun 2026 19:43:29 -0700 From: Chen Yu To: tony.luck@intel.com, reinette.chatre@intel.com Cc: x86@kernel.org, linux-kernel@vger.kernel.org, bp@alien8.de, tglx@kernel.org, mingo@redhat.com, dave.hansen@linux.intel.com, hpa@zytor.com, dave.martin@arm.com, james.morse@arm.com, fenghuay@nvidia.com, babu.moger@amd.com, anil.keshavamurthy@broadcom.com Subject: [PATCH v3 2/6] x86/resctrl: Parse ACPI CMRC table Date: Sat, 6 Jun 2026 10:33:40 +0800 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The CMRC (Cache Monitoring Registers for CPU Agents Description) sub-table of ERDT describes the MMIO registers used to read cache monitoring counters (e.g. LLC occupancy) for an RMD. Parse each CMRC sub-table, ioremap its register window, and save the CMRC pointer in the corresponding ERDT domain entry so that later monitoring code can read the counters via MMIO. Suggested-by: Tony Luck Signed-off-by: Chen Yu --- v2->v3: Make the macros tabular format. (Thomas Gleixner) --- arch/x86/kernel/cpu/resctrl/erdt.c | 44 ++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/erdt.c b/arch/x86/kernel/cpu/resctrl/erdt.c index 51597a6e0058..8d0b9f4ad6d8 100644 --- a/arch/x86/kernel/cpu/resctrl/erdt.c +++ b/arch/x86/kernel/cpu/resctrl/erdt.c @@ -33,8 +33,9 @@ static bool erdt_enabled_flag; static DEFINE_XARRAY(erdt_domain_xa); -#define ERDT_VALID_VERSION 1 -#define RMDD_FLAG_CPU_DOMAIN BIT(0) +#define ERDT_VALID_VERSION 1 +#define CMRC_VALID_INDEX_FUNC_VERSION 1 +#define RMDD_FLAG_CPU_DOMAIN BIT(0) static u32 valid_subtbl_mask; @@ -136,6 +137,7 @@ static void erdt_iounmap_domain(struct erdt_domain_info *domain) static void cleanup_one_domain(struct erdt_domain_info *d) { erdt_iounmap_domain(d); + kfree(d->cmrc); kfree(d); } @@ -147,6 +149,40 @@ static __init bool cacd_init(struct erdt_domain_info *d, struct acpi_subtbl_hdr_ return *l3_cache_id != -1; } +static __init bool cmrc_init(struct erdt_domain_info *d, struct acpi_subtbl_hdr_16 *subtbl) +{ + struct acpi_erdt_cmrc *cmrc = (struct acpi_erdt_cmrc *)subtbl; + + if (subtbl->length < sizeof(*cmrc)) { + pr_warn(FW_BUG "Truncated CMRC subtable\n"); + return false; + } + + if (cmrc->index_fn != CMRC_VALID_INDEX_FUNC_VERSION) { + pr_info("Unknown CMRC index function %d\n", cmrc->index_fn); + return false; + } + + if (!cmrc->clump_size) { + pr_warn(FW_BUG "CMRC clump_size is zero\n"); + return false; + } + + d->base[ERDT_MMIO_CMRC_BASE] = erdt_ioremap_checked(cmrc->cmt_reg_base, + cmrc->cmt_reg_size, "CMRC base"); + if (!d->base[ERDT_MMIO_CMRC_BASE]) + return false; + + d->cmrc = kmemdup(cmrc, subtbl->length, GFP_KERNEL); + if (!d->cmrc) { + iounmap(d->base[ERDT_MMIO_CMRC_BASE]); + d->base[ERDT_MMIO_CMRC_BASE] = NULL; + return false; + } + + return true; +} + static inline struct acpi_subtbl_hdr_16 *rmdd_subtbl(struct acpi_erdt_rmdd *rmdd) { return (void *)rmdd + sizeof(*rmdd); @@ -208,6 +244,10 @@ static __init bool parse_rmdd_entry(struct acpi_subtbl_hdr_16 *rmdd_hdr) if (cacd_init(domain_info, subtbl, &l3_cache_id)) subtbl_mask |= BIT(ACPI_ERDT_TYPE_CACD); break; + case ACPI_ERDT_TYPE_CMRC: + if (cmrc_init(domain_info, subtbl)) + subtbl_mask |= BIT(ACPI_ERDT_TYPE_CMRC); + break; default: break; } -- 2.25.1