From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) (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 E881036F916 for ; Sat, 13 Jun 2026 08:06:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.16 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781338016; cv=none; b=NFZXNTKlMPzNi3R4+vI+uJkgg04G7azm1+Q0UcUENW4QU3tX9I371GRdFVqGFtlkA+MDfYyRxK5zdamEg5aKWm+kAPwNZffcyVLAA+hzAapCpzITqWnZO5QGOInsxZleHAaFmVZICR7R/XQ+qOvPDrA2p4b03esnsAd/WSrGkWA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781338016; c=relaxed/simple; bh=fpIt33Owkoll5TLH3hktFe08DFZFi6hhcdD/0aJBdaU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jzvVryzY89s86jI+Z+z9HfhzZXY2ajT9t96u34wEn379xhb42q4HnZPyco5YPs35KVzlLk6SBL4QJJ4OdkNYA5wUPf4vo7Aauicr5xqJ2bwV+lB2AMwWRrpOPiKh7K8Zm4NOndlJXuj13dO0LI+PovE+V/BfUqXk4NhhP9M1Sr4= 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=nzh/KWus; arc=none smtp.client-ip=198.175.65.16 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="nzh/KWus" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1781338016; x=1812874016; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fpIt33Owkoll5TLH3hktFe08DFZFi6hhcdD/0aJBdaU=; b=nzh/KWusMLcg1d95rFJNpgyBaRdrXfHui/gLWrfRJVZ7v5whrpERAeoC LS8OWkHxPWzYw0fnoKscEEKJKfLcgp5EIu4vp+PolVA1NbwiXFnwMJjCQ i6oU7FG3RUF5j0ckvMvXPzX4QAIWHa4T6/xECG4MS3Rr0SA1bjvOn5bE4 Egrq6l+V3aNZmqGYmN8QRYAqp0HVm9R3gjJ1AHnHvn12mKoKM9kj7Nfh4 OYwail9qnA1aqK1Q7ccD3wTbCPycPqjNQd5vmI0CEyD/AyNl8z8DIV1eN /CtsKQzePxh2sp1mO/bMNPC7B8W9+CsjDvDkrKn/MuBWaV85Xbrfd6SPS g==; X-CSE-ConnectionGUID: eAfn4L0zQriWMhPdhhDE5Q== X-CSE-MsgGUID: ffssQ1bKTkKKJKRgUxqGsg== X-IronPort-AV: E=McAfee;i="6800,10657,11815"; a="82351237" X-IronPort-AV: E=Sophos;i="6.24,202,1774335600"; d="scan'208";a="82351237" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2026 01:06:55 -0700 X-CSE-ConnectionGUID: W6uBw+SYRYOvX1fcQFMPyA== X-CSE-MsgGUID: 0sjiU5COQzW+Ikom+MX1vA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,202,1774335600"; d="scan'208";a="240665348" Received: from chenyu-dev.sh.intel.com ([10.239.62.107]) by fmviesa009.fm.intel.com with ESMTP; 13 Jun 2026 01:06:50 -0700 From: Chen Yu To: tony.luck@intel.com, reinette.chatre@intel.com Cc: x86@kernel.org, linux-kernel@vger.kernel.org, tglx@kernel.org, bp@alien8.de, 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 v4 2/6] x86/resctrl: Parse ACPI CMRC table Date: Sat, 13 Jun 2026 15:57:01 +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 Reviewed-by: Thomas Gleixner Tested-by: Hongyu Ning Signed-off-by: Chen Yu --- v3->v4: Add Thomas and Hongyu's tags. 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 b43dcc06f009..a1d5de82d5c9 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); } @@ -146,6 +148,40 @@ static __init bool cacd_init(struct acpi_subtbl_hdr_16 *subtbl, int *l3_cache_id 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); @@ -203,6 +239,10 @@ static __init bool parse_rmdd_entry(struct acpi_subtbl_hdr_16 *rmdd_hdr) if (cacd_init(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