From patchwork Thu Feb 27 22:48:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13995322 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) (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 35D651AA1E4; Thu, 27 Feb 2025 22:48:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.9 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740696521; cv=none; b=CT6+4GtXDI1ja22D9nR2g6J1n/v+4IZ/EEmTr24DNJztINy7BzD6tbmBF7Quha+Vwgn+7pf5IE3GNQX2CdbsKHN/rFIBenyHzlGbAKJzI3Cul0X0l/OcGOfikAhFzQXq7kOpxMbOrRn/BaO+wjSqyXNNO4iOYqAY4nefnOXCPYc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740696521; c=relaxed/simple; bh=brG2Wad/ONqxpi3EfYHQF1xtjKk5coID4SyaddPLRWE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VuMq2mjKXQGIkKd2Zqo2vU00zqtktVaKrQqUQK0z/gsm4ZnGjL5vuHtFNDmykei6tLnaFMzwm7ZMiDytdFmB0cJrsUiIFVJ0EBAKJvLlKWkucQ7/bFNV5WqbYS6jm/0/mUxDRzu1aASzRPPoE3xzqWA2G64I3GDoEU3Ig5nW3W0= 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=HXSUA5z3; arc=none smtp.client-ip=198.175.65.9 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="HXSUA5z3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1740696520; x=1772232520; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=brG2Wad/ONqxpi3EfYHQF1xtjKk5coID4SyaddPLRWE=; b=HXSUA5z3LR75RWHCj8mU6MX8PtbTc6s6f1KdZzqYk3K3aFyDRcdFF/1T +bkpK/Zb7N3omKV817Jw+p0jYL2YqbCanZHOatjFJcLIvEIVkzcHHgdBx 2gTPzA+S9SWbYQ/GqN2qBlrUMNdaCjQmH8/wEMbtjuWtcuhF90WlzqBt2 CyakiZElnuZPGC72Nk2xz/YQmbJAYZVCvO+YZQbdJKTira9Oy3PKTsKqx iEjKF1gofvukDrWA2l8/+QYqhH4lGRlxYgzdfe2HUcpYorzM8Z4/VvxzE 2vDZyxiEkEkvEJ0oxsupTT4kU7rxMO22nNoLVTWJGqpFYZEncIkkubI4F A==; X-CSE-ConnectionGUID: 5qe0JB59QbikkMa2exxmHw== X-CSE-MsgGUID: Ls7sTOpjSoy0+ZdEWMOJEA== X-IronPort-AV: E=McAfee;i="6700,10204,11358"; a="64077560" X-IronPort-AV: E=Sophos;i="6.13,320,1732608000"; d="scan'208";a="64077560" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2025 14:48:39 -0800 X-CSE-ConnectionGUID: Ch6+C6PhRb6uFs0lLTE0Mg== X-CSE-MsgGUID: pUI98d4zTBWjHCjyS32nPg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,320,1732608000"; d="scan'208";a="117187045" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by orviesa006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2025 14:48:38 -0800 From: Tony Luck To: "Rafael J. Wysocki" , Len Brown Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v2 1/4] ACPICA: Define MRRM ACPI table Date: Thu, 27 Feb 2025 14:48:25 -0800 Message-ID: <20250227224828.306537-2-tony.luck@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250227224828.306537-1-tony.luck@intel.com> References: <20250227224828.306537-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Patch for reference, this has already been applied to https://github.com/acpica/acpica and will in due course make its way into Linux when the next ACPICA release is ported over. Signed-off-by: Tony Luck --- include/acpi/actbl1.h | 7 +++++++ include/acpi/actbl2.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index 387fc821703a..07cb62541884 100644 --- a/include/acpi/actbl1.h +++ b/include/acpi/actbl1.h @@ -110,6 +110,13 @@ struct acpi_whea_header { u64 mask; /* Bitmask required for this register instruction */ }; +/* Larger subtable header (when Length can exceed 255) */ + +struct acpi_subtable_header_16 { + u16 type; + u16 length; +}; + /* https://docs.microsoft.com/en-us/windows-hardware/drivers/ddi/acpitabl/ns-acpitabl-aspt_table */ #define ASPT_REVISION_ID 0x01 struct acpi_table_aspt { diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h index 2e917a8f8bca..662a1bc927ea 100644 --- a/include/acpi/actbl2.h +++ b/include/acpi/actbl2.h @@ -37,6 +37,7 @@ #define ACPI_SIG_MCHI "MCHI" /* Management Controller Host Interface table */ #define ACPI_SIG_MPAM "MPAM" /* Memory System Resource Partitioning and Monitoring Table */ #define ACPI_SIG_MPST "MPST" /* Memory Power State Table */ +#define ACPI_SIG_MRRM "MRRM" /* Memory Range and Region Mapping table */ #define ACPI_SIG_MSDM "MSDM" /* Microsoft Data Management Table */ #define ACPI_SIG_NFIT "NFIT" /* NVDIMM Firmware Interface Table */ #define ACPI_SIG_NHLT "NHLT" /* Non HD Audio Link Table */ @@ -1736,6 +1737,47 @@ struct acpi_msct_proximity { u64 memory_capacity; /* In bytes */ }; +/******************************************************************************* + * + * MRRM - Memory Range and Region Mapping (MRRM) table + * Conforms to "Intel Resource Director Technology Architecture Specification" + * Version 1.1, January 2025 + * + ******************************************************************************/ + +struct acpi_table_mrrm { + struct acpi_table_header header; /* Common ACPI table header */ + u8 max_mem_region; /* Max Memory Regions supported */ + u8 flags; /* Region assignment type */ + u8 reserved[26]; + u8 memory_range_entry[]; +}; + +/* Flags */ +#define ACPI_MRRM_FLAGS_REGION_ASSIGNMENT_OS (1<<0) + +/******************************************************************************* + * + * Memory Range entry - Memory Range entry in MRRM table + * + ******************************************************************************/ + +struct acpi_mrrm_mem_range_entry { + struct acpi_subtable_header_16 header; + u32 reserved0; /* Reserved */ + u64 addr_base; /* Base addr of the mem range */ + u64 addr_len; /* Length of the mem range */ + u16 region_id_flags; /* Valid local or remote Region-ID */ + u8 local_region_id; /* Platform-assigned static local Region-ID */ + u8 remote_region_id; /* Platform-assigned static remote Region-ID */ + u32 reserved1; /* Reserved */ + /* Region-ID Programming Registers[] */ +}; + +/* Values for region_id_flags above */ +#define ACPI_MRRM_VALID_REGION_ID_FLAGS_LOCAL (1<<0) +#define ACPI_MRRM_VALID_REGION_ID_FLAGS_REMOTE (1<<1) + /******************************************************************************* * * MSDM - Microsoft Data Management table From patchwork Thu Feb 27 22:48:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13995323 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) (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 CE9CA2036FA; Thu, 27 Feb 2025 22:48:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.9 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740696522; cv=none; b=kcHhHKXLEMfPVdyJkUGIEaCI5anDVEkGj0aq2916mJZnhyieKld6yCsG2KvlHbW21bKxbb+gxDRld1v5x2ed68XrWsyzIHyC2lrhK5ksrKZ0pzwpLQilO110Zuew0Bg8LF/F8uoe3LgY0At0LJjsz1YMxW3Ko74B6jUCrVQl7/0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740696522; c=relaxed/simple; bh=3Yu9IE/Z9DkuRxYELdGayJyznkA5d5/ZrNOPeDv0jwk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VU+MJg3CEoNM374ytZRtghAXwYzC+//fBtLEEO9BtszO6mZh9UI+CrHSLmqVTl+TOnOuLv6cOKiat1evApZTy5WWtIw655aiX+1EJ3FD1abhnEPicPWFzIOL6MTD/ET6aUWw36nhI57JUMvTVMjfKATtX99kK2RXzcA+UCqtMZk= 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=k+0XG61J; arc=none smtp.client-ip=198.175.65.9 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="k+0XG61J" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1740696521; x=1772232521; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3Yu9IE/Z9DkuRxYELdGayJyznkA5d5/ZrNOPeDv0jwk=; b=k+0XG61JskxK5E/WXWPc4Ea4VZtl8ps4DKPjeNdsbvge90XoNwRsWqUK q1ufHx+xaWb13VZ+F9lPLUSE3peht+3t9HQ6XyU2syQmjvfRvLNksKfEb v0oITbXWoCLws5sm3AGTVsbQh1TwhpSb1E/4WkM9ZOiUObXyOsv30rQyF XUcRgFDeVUyFfm8ByE5t0sWPuAI04a32G/HwqXT7RGB/hiU01bOgLpQg/ epMRGgfiBuqpLOITsxHGl8tbrXQuaNncERQSaGinYVUGAANRZp+I0otBy lK3NTvEtD0dU/abhnXf7EagtiwxqKxftPvF0KdLs9cSi0heg0m3QA2yCY Q==; X-CSE-ConnectionGUID: oSTuSMKRTyyndjTjaya3hg== X-CSE-MsgGUID: fgaRz3RRTEeEQPE5xOgNpQ== X-IronPort-AV: E=McAfee;i="6700,10204,11358"; a="64077564" X-IronPort-AV: E=Sophos;i="6.13,320,1732608000"; d="scan'208";a="64077564" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2025 14:48:39 -0800 X-CSE-ConnectionGUID: Lx3V3JjlSrStGHsEoI7DYg== X-CSE-MsgGUID: ae51hzlcSme4pz0e/Q4YXw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,320,1732608000"; d="scan'208";a="117187049" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by orviesa006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2025 14:48:39 -0800 From: Tony Luck To: "Rafael J. Wysocki" , Len Brown Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v2 2/4] ACPI/MRRM: Create /sys/firmware/acpi/memory_ranges/rangeX ABI Date: Thu, 27 Feb 2025 14:48:26 -0800 Message-ID: <20250227224828.306537-3-tony.luck@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250227224828.306537-1-tony.luck@intel.com> References: <20250227224828.306537-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Perf and resctrl users need an enumeration of which memory addresses are bound to which "region" tag. Parse the ACPI MRRM table and add /sys entries for each memory range describing base address, length, and which region tags apply for same-socket and cross-socket access. [Derived from code developed by Fenghua Yu ] Signed-off-by: Tony Luck --- include/linux/acpi.h | 6 ++ drivers/acpi/acpi_mrrm.c | 161 +++++++++++++++++++++++++++++++++++++++ arch/x86/Kconfig | 1 + drivers/acpi/Kconfig | 3 + drivers/acpi/Makefile | 1 + 5 files changed, 172 insertions(+) create mode 100644 drivers/acpi/acpi_mrrm.c diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 4e495b29c640..677a9c4fa355 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -773,6 +773,12 @@ int acpi_get_local_u64_address(acpi_handle handle, u64 *addr); int acpi_get_local_address(acpi_handle handle, u32 *addr); const char *acpi_get_subsystem_id(acpi_handle handle); +#ifdef CONFIG_ACPI_MRRM +int acpi_mrrm_max_mem_region(void); +#else +static inline int acpi_mrrm_max_mem_region(void) { return -ENOENT; } +#endif + #else /* !CONFIG_ACPI */ #define acpi_disabled 1 diff --git a/drivers/acpi/acpi_mrrm.c b/drivers/acpi/acpi_mrrm.c new file mode 100644 index 000000000000..1f7d0381a628 --- /dev/null +++ b/drivers/acpi/acpi_mrrm.c @@ -0,0 +1,161 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2025, Intel Corporation. + * + * Memory Range and Region Mapping (MRRM) structure + * + * Parse and report the platform's MRRM table in /sys. + */ + +#define pr_fmt(fmt) "acpi/mrrm: " fmt + +#include +#include +#include +#include + +static int max_mem_region = -ENOENT; + +/* Access for use by resctrl file system */ +int acpi_mrrm_max_mem_region(void) +{ + return max_mem_region; +} + +struct mrrm_mem_range_entry { + u64 base; + u64 length; + u8 local_region_id; + u8 remote_region_id; +}; + +static struct mrrm_mem_range_entry *mrrm_mem_range_entry; +static u32 mrrm_mem_entry_num; + +static __init int acpi_parse_mrrm(struct acpi_table_header *table) +{ + struct acpi_mrrm_mem_range_entry *mre_entry; + struct acpi_table_mrrm *mrrm; + void *mre, *mrrm_end; + int mre_count = 0; + + mrrm = (struct acpi_table_mrrm *)table; + if (!mrrm) + return -ENODEV; + + if (mrrm->flags & ACPI_MRRM_FLAGS_REGION_ASSIGNMENT_OS) + return -EOPNOTSUPP; + + mrrm_end = (void *)mrrm + mrrm->header.length - 1; + mre = (void *)mrrm + sizeof(struct acpi_table_mrrm); + while (mre < mrrm_end) { + mre_entry = mre; + mre_count++; + mre += mre_entry->header.length; + } + if (!mre_count) { + pr_info(FW_BUG "No ranges listed in MRRM table\n"); + return -EINVAL; + } + + mrrm_mem_range_entry = kmalloc_array(mre_count, sizeof(*mrrm_mem_range_entry), + GFP_KERNEL | __GFP_ZERO); + if (!mrrm_mem_range_entry) + return -ENOMEM; + + mre = (void *)mrrm + sizeof(struct acpi_table_mrrm); + while (mre < mrrm_end) { + struct mrrm_mem_range_entry *e; + + mre_entry = mre; + e = mrrm_mem_range_entry + mrrm_mem_entry_num; + + e->base = mre_entry->addr_base; + e->length = mre_entry->addr_len; + + if (mre_entry->region_id_flags & ACPI_MRRM_VALID_REGION_ID_FLAGS_LOCAL) + e->local_region_id = mre_entry->local_region_id; + else + e->local_region_id = -1; + if (mre_entry->region_id_flags & ACPI_MRRM_VALID_REGION_ID_FLAGS_REMOTE) + e->remote_region_id = mre_entry->remote_region_id; + else + e->remote_region_id = -1; + + mrrm_mem_entry_num++; + mre += mre_entry->header.length; + } + + max_mem_region = mrrm->max_mem_region; + + return 0; +} + +#define RANGE_ATTR(name) \ +static ssize_t name##_show(struct kobject *kobj, \ + struct kobj_attribute *attr, char *buf) \ +{ \ + struct mrrm_mem_range_entry *mre; \ + const char *kname = kobject_name(kobj); \ + int n, ret; \ + \ + ret = kstrtoint(kname + 5, 10, &n); \ + if (ret) \ + return ret; \ + \ + mre = mrrm_mem_range_entry + n; \ + \ + return sysfs_emit(buf, "0x%lx\n", (unsigned long)mre->name); \ +} \ +static struct kobj_attribute name##_attr = __ATTR_RO(name) + +RANGE_ATTR(base); +RANGE_ATTR(length); +RANGE_ATTR(local_region_id); +RANGE_ATTR(remote_region_id); + +static struct attribute *memory_range_attrs[] = { + &base_attr.attr, + &length_attr.attr, + &local_region_id_attr.attr, + &remote_region_id_attr.attr, + NULL +}; + +ATTRIBUTE_GROUPS(memory_range); + +static __init int add_boot_memory_ranges(void) +{ + struct kobject *pkobj, *kobj; + int ret = -EINVAL; + char *name; + + pkobj = kobject_create_and_add("memory_ranges", acpi_kobj); + + for (int i = 0; i < mrrm_mem_entry_num; i++) { + name = kasprintf(GFP_KERNEL, "range%d", i); + if (!name) + break; + + kobj = kobject_create_and_add(name, pkobj); + + ret = sysfs_create_groups(kobj, memory_range_groups); + if (ret) + return ret; + } + + return ret; +} + +static __init int mrrm_init(void) +{ + int ret; + + ret = acpi_table_parse(ACPI_SIG_MRRM, acpi_parse_mrrm); + + if (ret < 0) + return ret; + + return add_boot_memory_ranges(); +} +device_initcall(mrrm_init); diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index be2c311f5118..f77af6b3c6cb 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -36,6 +36,7 @@ config X86_64 select ARCH_HAS_ELFCORE_COMPAT select ZONE_DMA32 select EXECMEM if DYNAMIC_FTRACE + select ACPI_MRRM if ACPI config FORCE_DYNAMIC_FTRACE def_bool y diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index d81b55f5068c..4f9aea2d0bc8 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -576,6 +576,9 @@ config ACPI_FFH Enable this feature if you want to set up and install the FFH Address Space handler to handle FFH OpRegion in the firmware. +config ACPI_MRRM + bool + source "drivers/acpi/pmic/Kconfig" config ACPI_VIOT diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 40208a0f5dfb..5092b518fc9b 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -62,6 +62,7 @@ acpi-$(CONFIG_ACPI_WATCHDOG) += acpi_watchdog.o acpi-$(CONFIG_ACPI_PRMT) += prmt.o acpi-$(CONFIG_ACPI_PCC) += acpi_pcc.o acpi-$(CONFIG_ACPI_FFH) += acpi_ffh.o +acpi-$(CONFIG_ACPI_MRRM) += acpi_mrrm.o # Address translation acpi-$(CONFIG_ACPI_ADXL) += acpi_adxl.o From patchwork Thu Feb 27 22:48:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13995324 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) (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 E6F5623E339; Thu, 27 Feb 2025 22:48:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.9 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740696523; cv=none; b=YXRtTleZvCX5VshOnBmYZsbT+0nLKKMr5qzL5k/MlBDw6W/LksgY6OXCHgJT7dSmM+Mq3SjGiREO8Y+xblcQezJRbV0m8154UFwRaX65O67HOkh5FjKw/wT49sp7mdetXXV+8YEybVst3fCJEcORJGvaNpYrr9fg5YaLf5WvYmk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740696523; c=relaxed/simple; bh=FIMs4VAiybrc8QrSGXhSrl0CkOILDLgkNgxLuSmq4Yk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JYXzHRUfhjikCtlNL4cmFrWihAY7GgBvtFtUxUTIMzvlG+3ZurvdlGlAoz+Rxx43e2R13+3kOl/Od7ywab9PguGolCTa6ERBJ/FP9JDYWwnB1pBlF80WfzdApMTl5QKuC3wi3kkubtxELHwyU2K6NZYNWHXqoWNK1VK0qd794U0= 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=PLG5yFrt; arc=none smtp.client-ip=198.175.65.9 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="PLG5yFrt" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1740696522; x=1772232522; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=FIMs4VAiybrc8QrSGXhSrl0CkOILDLgkNgxLuSmq4Yk=; b=PLG5yFrtKedevXVHDe2199A//yBTB8iZxzgzmNh7EUUu8ZeXg5OwUa8z 2k5d6o+qqpQfJs6220LoZkQxhwT39LRRbUOUxtzOOtpjZhunI3kJ6E26l GCEWNci1+bOKx1LBb/OQ5ajMZ9OpKiI/tfgnb0E/DW1Y1/fOsavn7kIf0 ZOvQD4PTgGg18EeFKG4CL8GAQkQjKalYEUcj/zcnmFwQdkkTvtUkYek+2 LVGW8soS1DIpflAsWajHkkt/IcFY9JawM6q/4+5uRhas9M1tJMnZuV9cT AAFf1MyXLtxQ1OsEupyKVIq6VQzFa12c+nvhcQAoV9EuO1SGSFf5qpuME w==; X-CSE-ConnectionGUID: +GwKNAQXRdac/k9Xs2SiAA== X-CSE-MsgGUID: 0pzID/GJRG2ukyv6VExsgg== X-IronPort-AV: E=McAfee;i="6700,10204,11358"; a="64077567" X-IronPort-AV: E=Sophos;i="6.13,320,1732608000"; d="scan'208";a="64077567" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2025 14:48:39 -0800 X-CSE-ConnectionGUID: 6LcY9jrsR2+ZW8ferErEPg== X-CSE-MsgGUID: doWqpQjJRhSO4HnPgdFhJQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,320,1732608000"; d="scan'208";a="117187053" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by orviesa006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2025 14:48:39 -0800 From: Tony Luck To: "Rafael J. Wysocki" , Len Brown Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v2 3/4] ACPI: Add documentation for exposing MRRM data Date: Thu, 27 Feb 2025 14:48:27 -0800 Message-ID: <20250227224828.306537-4-tony.luck@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250227224828.306537-1-tony.luck@intel.com> References: <20250227224828.306537-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Initial implementation provides enumeration of the address ranges and BIOS assigned region IDs for each range. Signed-off-by: Tony Luck --- Documentation/ABI/testing/sysfs-firmware-acpi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-firmware-acpi b/Documentation/ABI/testing/sysfs-firmware-acpi index 5249ad5a96d9..a3369cf95546 100644 --- a/Documentation/ABI/testing/sysfs-firmware-acpi +++ b/Documentation/ABI/testing/sysfs-firmware-acpi @@ -248,3 +248,19 @@ Description: # cat ff_pwr_btn 7 enabled +What: /sys/firmware/acpi/memory_ranges/rangeX +Date: February 2025 +Contact: Tony Luck +Description: + On systems with the ACPI MRRM table reports the + parameters for each range. + + base: Starting system physical address. + + length: Length of this range in bytes. + + local_region_id: ID associated with access by agents + local to this range of addresses. + + remote_region_id: ID associated with access by agents + non-local to this range of addresses. From patchwork Thu Feb 27 22:48:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13995325 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) (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 59C7323E352; Thu, 27 Feb 2025 22:48:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.9 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740696524; cv=none; b=eUPqpSLJnGLBKFuFaGbNkA+VSdHAxyHDCIGNYnVuvHnkhwRmhSdJ5UzIqZI5WR0t/rzHVC463EEfYoZvRwgx25MhpUq/Nn13xgMJ6vC0LerAfupySt5Ztxr5fdWgSFMi4VHD77RV77KGrnxaIcSKLkN38w5Dq7T52nCcrMVRsLU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740696524; c=relaxed/simple; bh=5dLuIAnj4GerB++3zMLGjP08kKlVE0y/APjV7HD4j0I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CwvJ2pJ/4QbTOj0sALOUfMzYtwrYv2O5xiUT/Gwpg9UWsNYKtxpa92CNnxAapV+rLNcpmHw/rCfuDk7f3GDZ514WTbvU6X18CHL4H1QbquLLgDKnF54mKCmlEPKnNIvyeCgy2JZN5nSqOYiQ8K7oKTCtBcYXYCSxq07E5bqoKn0= 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=KhhXveEp; arc=none smtp.client-ip=198.175.65.9 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="KhhXveEp" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1740696522; x=1772232522; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5dLuIAnj4GerB++3zMLGjP08kKlVE0y/APjV7HD4j0I=; b=KhhXveEp0pES82fjIObBWHU+msFPgZR9eAsOJAEeB2Nod0yeFNeVncr1 Ccith8YE82XRscKHpEt3z4NE3v5kc2TjagxRqFMneBP0EHazuN29VjSoE lFbTnpBCwBr/g5tfbf0SuO9Rh2PiJismp1JtSokB3hKaCxyxsIjBssmZk UPFCvsyFgrowDuw3LY3/Y+RUerdMfEc1TJrEmU5aJjduUPIlBoxa491mC XczTn6/pzF5WiUIojNv1meGThZj9IoK6T4tC5dqa3fMnJzul5kqv/2cEs 3DatW/BPx91HIZdnoQdAabHKNt72G5HeTH5KuZSTMpIKCJy8gowHzdv9l g==; X-CSE-ConnectionGUID: TBWivM9LSdGRmtkkQmBj6A== X-CSE-MsgGUID: YxMj/IwkT32giSQ2IP8zQQ== X-IronPort-AV: E=McAfee;i="6700,10204,11358"; a="64077570" X-IronPort-AV: E=Sophos;i="6.13,320,1732608000"; d="scan'208";a="64077570" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2025 14:48:40 -0800 X-CSE-ConnectionGUID: R2pLDkmiRtKb9+XyaT7yvw== X-CSE-MsgGUID: a9f4NdGZTIWS7KICWckfQw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,320,1732608000"; d="scan'208";a="117187056" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by orviesa006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2025 14:48:39 -0800 From: Tony Luck To: "Rafael J. Wysocki" , Len Brown Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v2 4/4] acpi_mrrm: fake for testing, do not apply! Date: Thu, 27 Feb 2025 14:48:28 -0800 Message-ID: <20250227224828.306537-5-tony.luck@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250227224828.306537-1-tony.luck@intel.com> References: <20250227224828.306537-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Dummy MRRM table for a 2 socket system with memory map: LocalAccess RemoteAccess 0-3.5G DDR on socket 0 0 1 2G-512G More DDR on socket 0 0 1 512G-1T DDR on socket 1 0 1 1T-2T Reserved for CXL on socket 0 2 3 2T-3T Reserved for CXL on socket 1 2 3 This tags all local DDR access in region 0, remote DDR in region 1, local CXL in region 2, and remote CXL in region 3. Presented to user like this: $ cd /sys/firmware/acpi $ grep ^ memory_ranges/*/* memory_ranges/range0/base:0x0 memory_ranges/range0/length:0xe0000000 memory_ranges/range0/local_region_id:0x0 memory_ranges/range0/remote_region_id:0x1 memory_ranges/range1/base:0x100000000 memory_ranges/range1/length:0x7f00000000 memory_ranges/range1/local_region_id:0x0 memory_ranges/range1/remote_region_id:0x1 memory_ranges/range2/base:0x8000000000 memory_ranges/range2/length:0x8000000000 memory_ranges/range2/local_region_id:0x0 memory_ranges/range2/remote_region_id:0x1 memory_ranges/range3/base:0x10000000000 memory_ranges/range3/length:0x100000000000 memory_ranges/range3/local_region_id:0x2 memory_ranges/range3/remote_region_id:0x3 memory_ranges/range4/base:0x200000000000 memory_ranges/range4/length:0x100000000000 memory_ranges/range4/local_region_id:0x2 memory_ranges/range4/remote_region_id:0x3 Signed-off-by: Tony Luck --- drivers/acpi/acpi_mrrm.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/acpi/acpi_mrrm.c b/drivers/acpi/acpi_mrrm.c index 1f7d0381a628..16f0ca7072e0 100644 --- a/drivers/acpi/acpi_mrrm.c +++ b/drivers/acpi/acpi_mrrm.c @@ -147,11 +147,35 @@ static __init int add_boot_memory_ranges(void) return ret; } +#define FAKE 1 +#ifdef FAKE +static const u8 fake_mrrm[] = { + 0x4D,0x52,0x52,0x4D,0xE0,0x00,0x00,0x00,0x01,0x3A,0x49,0x4E,0x54,0x45,0x4C,0x00, + 0x49,0x4E,0x54,0x45,0x4C,0x20,0x49,0x44,0x02,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, + 0x12,0x12,0x24,0x20,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x01,0x00,0x00,0x00,0x00, + 0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x7F,0x00,0x00,0x00,0x03,0x00,0x00,0x01,0x00,0x00,0x00,0x00, + 0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x03,0x00,0x00,0x01,0x00,0x00,0x00,0x00, + 0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x03,0x00,0x02,0x03,0x00,0x00,0x00,0x00, + 0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x03,0x00,0x02,0x03,0x00,0x00,0x00,0x00 +}; +#endif + static __init int mrrm_init(void) { int ret; +#ifdef FAKE + ret = acpi_parse_mrrm((struct acpi_table_header *)fake_mrrm); +#else ret = acpi_table_parse(ACPI_SIG_MRRM, acpi_parse_mrrm); +#endif if (ret < 0) return ret;