* [PATCH v5 1/7] arm_mpam: Fix the RIS index range check in mpam_ris_create_locked
2026-11-09 10:05 [PATCH v5 0/7] arm-mpam: Add basic device tree support for resctrl Yin Li
@ 2026-11-09 10:05 ` Yin Li
2026-11-09 10:05 ` [PATCH v5 2/7] arm_mpam: Fix MSC MMIO window size off-by-one with resource_size() Yin Li
` (5 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Yin Li @ 2026-11-09 10:05 UTC (permalink / raw)
To: James Morse, Rob Herring, Shanker Donthineni, Ben Horgan,
Krzysztof Kozlowski, Conor Dooley, Catalin Marinas,
Greg Kroah-Hartman, Rafael J. Wysocki, Danilo Krummrich,
Reinette Chatre, Fenghua Yu, Jonathan Cameron, Bjorn Andersson,
Konrad Dybcio, Gavin Shan
Cc: Yin Li, Andre Przywara, Drew Fustini, Ilpo Järvinen,
Shaopeng Tan, trilok.soni, aiqun.yu, ganapatrao.kulkarni,
Srivathsa L Rao, Huang Yiwei, linux-arm-kernel, linux-arm-msm,
linux-kernel, driver-core, devicetree, Ping Li, stable
The RIS selector field is defined as MPAMCFG_PART_SEL_RIS (bits 27:24),
which is 4 bits wide and gives valid indices 0..15. MPAM_MSC_MAX_NUM_RIS
is defined as 16, so the check should use >= to reject index 16 and
above. The previous > check incorrectly accepted index 16 as valid.
Fixes: 01fb4b822472 ("arm_mpam: Add the class and component structures for firmware described ris")
Cc: stable@vger.kernel.org
Signed-off-by: Yin Li <yin.li@oss.qualcomm.com>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Ben Horgan <ben.horgan@arm.com>
Reviewed-by: Srivathsa L Rao <srivathsa.rao@oss.qualcomm.com>
---
drivers/resctrl/mpam_devices.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/resctrl/mpam_devices.c b/drivers/resctrl/mpam_devices.c
index c067b6d57d71..05f785328dc2 100644
--- a/drivers/resctrl/mpam_devices.c
+++ b/drivers/resctrl/mpam_devices.c
@@ -700,7 +700,7 @@ static int mpam_ris_create_locked(struct mpam_msc *msc, u8 ris_idx,
lockdep_assert_held(&mpam_list_lock);
- if (ris_idx > MPAM_MSC_MAX_NUM_RIS)
+ if (ris_idx >= MPAM_MSC_MAX_NUM_RIS)
return -EINVAL;
if (test_and_set_bit(ris_idx, &msc->ris_idxs))
--
2.34.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v5 2/7] arm_mpam: Fix MSC MMIO window size off-by-one with resource_size()
2026-11-09 10:05 [PATCH v5 0/7] arm-mpam: Add basic device tree support for resctrl Yin Li
2026-11-09 10:05 ` [PATCH v5 1/7] arm_mpam: Fix the RIS index range check in mpam_ris_create_locked Yin Li
@ 2026-11-09 10:05 ` Yin Li
2026-11-09 10:05 ` [PATCH v5 3/7] dt-bindings: arm: Add MPAM MSC binding Yin Li
` (4 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Yin Li @ 2026-11-09 10:05 UTC (permalink / raw)
To: James Morse, Rob Herring, Shanker Donthineni, Ben Horgan,
Krzysztof Kozlowski, Conor Dooley, Catalin Marinas,
Greg Kroah-Hartman, Rafael J. Wysocki, Danilo Krummrich,
Reinette Chatre, Fenghua Yu, Jonathan Cameron, Bjorn Andersson,
Konrad Dybcio, Gavin Shan
Cc: Yin Li, Andre Przywara, Drew Fustini, Ilpo Järvinen,
Shaopeng Tan, trilok.soni, aiqun.yu, ganapatrao.kulkarni,
Srivathsa L Rao, Huang Yiwei, linux-arm-kernel, linux-arm-msm,
linux-kernel, driver-core, devicetree, Ping Li, stable,
kernel test robot, Jinjie Ruan
struct resource uses an inclusive end address, so the window size is
end - start + 1. do_mpam_msc_drv_probe() computed it as end - start,
which is one byte too small.
mapped_hwpage_sz is used by the register access bounds checks, which
have the form "offset + width > mapped_hwpage_sz". With the size one
byte too small, an access to the last register in the window is
incorrectly flagged as out of bounds: for a 0x1000 window, a 4-byte
access at offset 0xFFC (bytes 0xFFC..0xFFF, legal) computes
0xFFC + 4 = 0x1000 > 0xFFF and falsely warns.
Use resource_size() so the size is correct. The ">" bounds checks are
correct as-is once the size is accurate and are left unchanged.
Fixes: f04046f2577a ("arm_mpam: Add probe/remove for mpam msc driver and kbuild boiler plate")
Cc: stable@vger.kernel.org
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202609030809.ObirDhR3-lkp@intel.com/
Signed-off-by: Yin Li <yin.li@oss.qualcomm.com>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Ben Horgan <ben.horgan@arm.com>
Reviewed-by: Jinjie Ruan <ruanjinjie@huawei.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: Srivathsa L Rao <srivathsa.rao@oss.qualcomm.com>
---
drivers/resctrl/mpam_devices.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/resctrl/mpam_devices.c b/drivers/resctrl/mpam_devices.c
index 05f785328dc2..bea231dac7e6 100644
--- a/drivers/resctrl/mpam_devices.c
+++ b/drivers/resctrl/mpam_devices.c
@@ -2506,7 +2506,7 @@ static struct mpam_msc *do_mpam_msc_drv_probe(struct platform_device *pdev)
dev_err_once(dev, "Failed to map MSC base address\n");
return ERR_CAST(io);
}
- msc->mapped_hwpage_sz = msc_res->end - msc_res->start;
+ msc->mapped_hwpage_sz = resource_size(msc_res);
msc->mapped_hwpage = io;
} else if (msc->iface == MPAM_IFACE_PCC) {
u32 mpam_fb_msc_id;
--
2.34.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v5 3/7] dt-bindings: arm: Add MPAM MSC binding
2026-11-09 10:05 [PATCH v5 0/7] arm-mpam: Add basic device tree support for resctrl Yin Li
2026-11-09 10:05 ` [PATCH v5 1/7] arm_mpam: Fix the RIS index range check in mpam_ris_create_locked Yin Li
2026-11-09 10:05 ` [PATCH v5 2/7] arm_mpam: Fix MSC MMIO window size off-by-one with resource_size() Yin Li
@ 2026-11-09 10:05 ` Yin Li
2026-11-09 10:05 ` [PATCH v5 4/7] cacheinfo: Expose the code to generate a cache-id from a device_node Yin Li
` (3 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Yin Li @ 2026-11-09 10:05 UTC (permalink / raw)
To: James Morse, Rob Herring, Shanker Donthineni, Ben Horgan,
Krzysztof Kozlowski, Conor Dooley, Catalin Marinas,
Greg Kroah-Hartman, Rafael J. Wysocki, Danilo Krummrich,
Reinette Chatre, Fenghua Yu, Jonathan Cameron, Bjorn Andersson,
Konrad Dybcio, Gavin Shan
Cc: Yin Li, Andre Przywara, Drew Fustini, Ilpo Järvinen,
Shaopeng Tan, trilok.soni, aiqun.yu, ganapatrao.kulkarni,
Srivathsa L Rao, Huang Yiwei, linux-arm-kernel, linux-arm-msm,
linux-kernel, driver-core, devicetree, Ping Li
From: Rob Herring <robh@kernel.org>
The binding is designed around the assumption that an MSC will usually
be a sub-block of something else such as a memory controller or cache
controller. A memory-controller MSC may also stand on its own as a
top-level node, without being nested under a dedicated controller
node.
A key part of MPAM is we need to know about all of the MSCs in the system
before it can be enabled. This drives the need for the genericish
'arm,mpam-msc' compatible. Though we can't assume an MSC is accessible
until a h/w specific driver potentially enables the h/w.
This binding covers only the properties currently used in practice; it
can be extended as additional features are needed.
Cc: James Morse <james.morse@arm.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: James Morse <james.morse@arm.com>
[ Yin Li and Huang Yiwei: use oneOf for the compatible to allow both
standalone arm,mpam-msc and the two-item combination; fix schema
field order and yamllint spacing; reduce to minimal binding covering
only properties in current use, dropping RIS child nodes, the
explicit arm,mpam-device phandle form, cpus and interrupt-names;
replace the memory-controller example with a new top-level one,
showing the MSC as a direct child of the root node ]
Co-developed-by: Huang Yiwei <huang.yiwei@oss.qualcomm.com>
Signed-off-by: Huang Yiwei <huang.yiwei@oss.qualcomm.com>
Signed-off-by: Yin Li <yin.li@oss.qualcomm.com>
---
.../devicetree/bindings/arm/arm,mpam-msc.yaml | 62 ++++++++++++++++++++++
1 file changed, 62 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/arm,mpam-msc.yaml b/Documentation/devicetree/bindings/arm/arm,mpam-msc.yaml
new file mode 100644
index 000000000000..b52599b47a1c
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/arm,mpam-msc.yaml
@@ -0,0 +1,62 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/arm,mpam-msc.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Arm Memory System Resource Partitioning and Monitoring (MPAM)
+
+maintainers:
+ - Rob Herring <robh@kernel.org>
+
+description: |
+ The Arm MPAM specification can be found here:
+
+ https://developer.arm.com/documentation/ddi0598/latest
+
+properties:
+ compatible:
+ oneOf:
+ - const: arm,mpam-msc # Further details are discoverable
+ - items:
+ - const: arm,mpam-memory-controller-msc
+ - const: arm,mpam-msc
+
+ reg:
+ maxItems: 1
+ description: A memory region containing registers as defined in the MPAM
+ specification.
+
+ arm,not-ready-us:
+ description: The maximum time in microseconds for monitoring data to be
+ accurate after a settings change. For more information, see the
+ Not-Ready (NRDY) bit description in the MPAM specification.
+
+additionalProperties: false
+
+examples:
+ - |
+ L3: cache-controller@30000000 {
+ compatible = "foo,a-l3-cache", "cache";
+ cache-level = <3>;
+ cache-unified;
+ reg = <0x0 0x30000000 0x0 0x2000>;
+ ranges = <0x0 0x30000000 0x2000>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ msc@0 {
+ compatible = "arm,mpam-msc";
+ reg = <0x0 0x2000>;
+ arm,not-ready-us = <1>;
+ /* CPU affinity implied by parent cache node */
+ };
+ };
+
+ ddr_msc: msc@40000000 {
+ compatible = "arm,mpam-memory-controller-msc", "arm,mpam-msc";
+ reg = <0x40000000 0x1000>;
+ arm,not-ready-us = <10>;
+ };
+
+...
--
2.34.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v5 4/7] cacheinfo: Expose the code to generate a cache-id from a device_node
2026-11-09 10:05 [PATCH v5 0/7] arm-mpam: Add basic device tree support for resctrl Yin Li
` (2 preceding siblings ...)
2026-11-09 10:05 ` [PATCH v5 3/7] dt-bindings: arm: Add MPAM MSC binding Yin Li
@ 2026-11-09 10:05 ` Yin Li
2026-11-09 10:05 ` [PATCH v5 5/7] arm_mpam: Add device tree support for MSC probing Yin Li
` (2 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Yin Li @ 2026-11-09 10:05 UTC (permalink / raw)
To: James Morse, Rob Herring, Shanker Donthineni, Ben Horgan,
Krzysztof Kozlowski, Conor Dooley, Catalin Marinas,
Greg Kroah-Hartman, Rafael J. Wysocki, Danilo Krummrich,
Reinette Chatre, Fenghua Yu, Jonathan Cameron, Bjorn Andersson,
Konrad Dybcio, Gavin Shan
Cc: Yin Li, Andre Przywara, Drew Fustini, Ilpo Järvinen,
Shaopeng Tan, trilok.soni, aiqun.yu, ganapatrao.kulkarni,
Srivathsa L Rao, Huang Yiwei, linux-arm-kernel, linux-arm-msm,
linux-kernel, driver-core, devicetree, Ping Li
From: James Morse <james.morse@arm.com>
The MPAM driver identifies caches by id for use with resctrl. It
needs to know the cache-id when probe-ing, but the value isn't set
in cacheinfo until device_initcall(). Even after device_initcall(),
the cache-id is only available if at least one CPU associated with
the cache is online.
Instead of making the driver wait, expose the code that generates the
cache-id. The parts of the MPAM driver that run early can use this to
set up the resctrl structures before cacheinfo is ready in
device_initcall().
Signed-off-by: James Morse <james.morse@arm.com>
Signed-off-by: Yin Li <yin.li@oss.qualcomm.com>
---
drivers/base/cacheinfo.c | 17 ++++++++++++-----
include/linux/cacheinfo.h | 1 +
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
index eb8a907f6d50..a4b10f3a9007 100644
--- a/drivers/base/cacheinfo.c
+++ b/drivers/base/cacheinfo.c
@@ -243,8 +243,7 @@ static bool match_cache_node(struct device_node *cpu,
#define arch_compact_of_hwid(_x) (_x)
#endif
-static void cache_of_set_id(struct cacheinfo *this_leaf,
- struct device_node *cache_node)
+u32 cache_of_calculate_id(struct device_node *cache_node)
{
struct device_node *cpu;
u32 min_id = ~0;
@@ -255,15 +254,23 @@ static void cache_of_set_id(struct cacheinfo *this_leaf,
id = arch_compact_of_hwid(id);
if (FIELD_GET(GENMASK_ULL(63, 32), id)) {
of_node_put(cpu);
- return;
+ return ~0;
}
if (match_cache_node(cpu, cache_node))
min_id = min(min_id, id);
}
- if (min_id != ~0) {
- this_leaf->id = min_id;
+ return min_id;
+}
+
+static void cache_of_set_id(struct cacheinfo *this_leaf,
+ struct device_node *cache_node)
+{
+ u32 id = cache_of_calculate_id(cache_node);
+
+ if (id != ~0) {
+ this_leaf->id = id;
this_leaf->attributes |= CACHE_ID;
}
}
diff --git a/include/linux/cacheinfo.h b/include/linux/cacheinfo.h
index 56fa646df0d1..469d490968ac 100644
--- a/include/linux/cacheinfo.h
+++ b/include/linux/cacheinfo.h
@@ -114,6 +114,7 @@ int acpi_get_cache_info(unsigned int cpu,
#endif
const struct attribute_group *cache_get_priv_group(struct cacheinfo *this_leaf);
+u32 cache_of_calculate_id(struct device_node *np);
/*
* Get the cacheinfo structure for the cache associated with @cpu at
--
2.34.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v5 5/7] arm_mpam: Add device tree support for MSC probing
2026-11-09 10:05 [PATCH v5 0/7] arm-mpam: Add basic device tree support for resctrl Yin Li
` (3 preceding siblings ...)
2026-11-09 10:05 ` [PATCH v5 4/7] cacheinfo: Expose the code to generate a cache-id from a device_node Yin Li
@ 2026-11-09 10:05 ` Yin Li
2026-11-09 10:05 ` [PATCH v5 6/7] arm_mpam: Add support for memory controller MSC on DT platforms Yin Li
2026-11-09 10:05 ` [PATCH v5 7/7] arm64: dts: qcom: nord: Add MPAM MSC nodes for the L2 caches Yin Li
6 siblings, 0 replies; 10+ messages in thread
From: Yin Li @ 2026-11-09 10:05 UTC (permalink / raw)
To: James Morse, Rob Herring, Shanker Donthineni, Ben Horgan,
Krzysztof Kozlowski, Conor Dooley, Catalin Marinas,
Greg Kroah-Hartman, Rafael J. Wysocki, Danilo Krummrich,
Reinette Chatre, Fenghua Yu, Jonathan Cameron, Bjorn Andersson,
Konrad Dybcio, Gavin Shan
Cc: Yin Li, Andre Przywara, Drew Fustini, Ilpo Järvinen,
Shaopeng Tan, trilok.soni, aiqun.yu, ganapatrao.kulkarni,
Srivathsa L Rao, Huang Yiwei, linux-arm-kernel, linux-arm-msm,
linux-kernel, driver-core, devicetree, Ping Li
From: James Morse <james.morse@arm.com>
The MPAM driver currently discovers MSCs only via ACPI. Add a device
tree path so MSCs can be probed on DT-based platforms: parse MSC nodes
from the device tree, compute cache-id and affinity from the cache
nodes and create the RIS entries.
Signed-off-by: James Morse <james.morse@arm.com>
[ Yin Li: drop the ACPI-only stub of mpam_get_cpumask_from_cache_id();
use of_node_get() for the cache parent to avoid a refcount underflow;
reject out-of-range ris_idx after of_property_read_reg() before
narrowing to u8; use u32 instead of unsigned long for cache-id values
and compare against ~0U; fix mpam_dt_create_foundling_msc() to iterate
MSC child nodes rather than creating a device for the cache node itself ]
Signed-off-by: Yin Li <yin.li@oss.qualcomm.com>
---
drivers/resctrl/mpam_devices.c | 250 +++++++++++++++++++++++++++++++++++++---
drivers/resctrl/mpam_internal.h | 2 +-
2 files changed, 234 insertions(+), 18 deletions(-)
diff --git a/drivers/resctrl/mpam_devices.c b/drivers/resctrl/mpam_devices.c
index bea231dac7e6..78caa8ae1349 100644
--- a/drivers/resctrl/mpam_devices.c
+++ b/drivers/resctrl/mpam_devices.c
@@ -22,6 +22,9 @@
#include <linux/lockdep.h>
#include <linux/mailbox_client.h>
#include <linux/mutex.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_platform.h>
#include <linux/platform_device.h>
#include <linux/printk.h>
#include <linux/property.h>
@@ -263,6 +266,171 @@ static void mpam_free_garbage(void)
}
}
+/* Called recursively to walk the list of caches from a particular CPU */
+static void __mpam_get_cpumask_from_cache_id(int cpu, struct device_node *cache_node,
+ u32 cache_id,
+ u32 cache_level,
+ cpumask_t *affinity)
+{
+ int err;
+ u32 iter_level;
+ u32 iter_cache_id;
+ struct device_node *iter_node __free(device_node) = of_find_next_cache_node(cache_node);
+
+ if (!iter_node)
+ return;
+
+ err = of_property_read_u32(iter_node, "cache-level", &iter_level);
+ if (err)
+ return;
+
+ /*
+ * get_cpu_cacheinfo_id() isn't ready until sometime
+ * during device_initcall(). Use cache_of_calculate_id().
+ */
+ iter_cache_id = cache_of_calculate_id(iter_node);
+ if (iter_cache_id == ~0U)
+ return;
+
+ if (iter_level == cache_level && iter_cache_id == cache_id)
+ cpumask_set_cpu(cpu, affinity);
+
+ if (iter_level < cache_level)
+ __mpam_get_cpumask_from_cache_id(cpu, iter_node, cache_id,
+ cache_level, affinity);
+}
+
+/*
+ * The cacheinfo structures are only populated when CPUs are online.
+ * This helper walks the device tree to include offline CPUs too.
+ */
+int mpam_get_cpumask_from_cache_id(u32 cache_id, u32 cache_level,
+ cpumask_t *affinity)
+{
+ int cpu;
+
+ if (!acpi_disabled)
+ return acpi_pptt_get_cpumask_from_cache_id(cache_id, affinity);
+
+ for_each_possible_cpu(cpu) {
+ struct device_node *cpu_node __free(device_node) = of_get_cpu_node(cpu, NULL);
+ if (!cpu_node) {
+ pr_err("Failed to find cpu%d device node\n", cpu);
+ return -ENOENT;
+ }
+
+ __mpam_get_cpumask_from_cache_id(cpu, cpu_node, cache_id,
+ cache_level, affinity);
+ }
+
+ return 0;
+}
+
+static int get_cpumask_from_cache(struct device_node *cache,
+ cpumask_t *affinity)
+{
+ int err;
+ u32 cache_level;
+ u32 cache_id;
+
+ err = of_property_read_u32(cache, "cache-level", &cache_level);
+ if (err) {
+ pr_err("Failed to read cache-level from cache node\n");
+ return -ENOENT;
+ }
+
+ cache_id = cache_of_calculate_id(cache);
+ if (cache_id == ~0U) {
+ pr_err("Failed to calculate cache-id from cache node\n");
+ return -ENOENT;
+ }
+
+ return mpam_get_cpumask_from_cache_id(cache_id, cache_level, affinity);
+}
+
+static int mpam_dt_count_msc(void)
+{
+ int count = 0;
+ struct device_node *np;
+
+ for_each_compatible_node(np, NULL, "arm,mpam-msc") {
+ if (of_device_is_available(np))
+ count++;
+ }
+
+ return count;
+}
+
+static int mpam_dt_parse_resource(struct mpam_msc *msc, struct device_node *np,
+ u8 ris_idx)
+{
+ int err = 0;
+ u32 level = 0;
+ u32 cache_id;
+ struct device *dev = &msc->pdev->dev;
+ struct device_node *cache __free(device_node) = NULL;
+ struct device_node *parent __free(device_node) = of_get_parent(np);
+
+ if (of_device_is_compatible(np, "arm,mpam-cache")) {
+ cache = of_parse_phandle(np, "arm,mpam-device", 0);
+ if (!cache) {
+ dev_err_once(dev, "Failed to read phandle\n");
+ return -EINVAL;
+ }
+ } else if (of_device_is_compatible(parent, "cache")) {
+ cache = of_node_get(parent);
+ } else {
+ /* For now, only caches are supported */
+ cache = NULL;
+ return err;
+ }
+
+ err = of_property_read_u32(cache, "cache-level", &level);
+ if (err) {
+ dev_err_once(dev, "Failed to read cache-level\n");
+ return err;
+ }
+
+ cache_id = cache_of_calculate_id(cache);
+ if (cache_id == ~0U) {
+ dev_err_once(dev, "Failed to calculate cache-id\n");
+ return -ENOENT;
+ }
+
+ return mpam_ris_create(msc, ris_idx, MPAM_CLASS_CACHE, level, cache_id);
+}
+
+static int mpam_dt_parse_resources(struct mpam_msc *msc, void *ignored)
+{
+ u64 ris_idx = 0;
+ int err, num_ris = 0;
+ struct device_node *np;
+
+ np = msc->pdev->dev.of_node;
+ for_each_available_child_of_node_scoped(np, iter) {
+ err = of_property_read_reg(iter, 0, &ris_idx, NULL);
+ if (!err) {
+ /*
+ * ris_idx is read as u64 but indexes a 4-bit RIS selector
+ * (0..MPAM_MSC_MAX_NUM_RIS). Reject out-of-range values here,
+ * before it is narrowed to u8, so a large value cannot be
+ * truncated into a valid-looking index.
+ */
+ if (ris_idx >= MPAM_MSC_MAX_NUM_RIS)
+ return -EINVAL;
+ num_ris++;
+ err = mpam_dt_parse_resource(msc, iter, ris_idx);
+ if (err)
+ return err;
+ }
+ }
+
+ if (!num_ris)
+ err = mpam_dt_parse_resource(msc, np, 0);
+
+ return err;
+}
+
/*
* Once mpam is enabled, new requestors cannot further reduce the available
* partid. Assert that the size is fixed, and new requestors will be turned
@@ -629,16 +797,6 @@ mpam_vmsc_find(struct mpam_component *comp, struct mpam_msc *msc)
return mpam_vmsc_alloc(comp, msc);
}
-/*
- * The cacheinfo structures are only populated when CPUs are online.
- * This helper walks the acpi tables to include offline CPUs too.
- */
-int mpam_get_cpumask_from_cache_id(unsigned long cache_id, u32 cache_level,
- cpumask_t *affinity)
-{
- return acpi_pptt_get_cpumask_from_cache_id(cache_id, affinity);
-}
-
/*
* cpumask_of_node() only knows about online CPUs. This can't tell us whether
* a class is represented on all possible CPUs.
@@ -2392,15 +2550,34 @@ static int mpam_msc_setup_error_irq(struct mpam_msc *msc)
*/
static void update_msc_accessibility(struct mpam_msc *msc)
{
+ struct device *dev = &msc->pdev->dev;
+ struct device_node *parent;
u32 affinity_id;
int err;
- err = device_property_read_u32(&msc->pdev->dev, "cpu_affinity",
- &affinity_id);
- if (err)
+ if (!acpi_disabled) {
+ err = device_property_read_u32(&msc->pdev->dev, "cpu_affinity",
+ &affinity_id);
+ if (err)
+ cpumask_copy(&msc->accessibility, cpu_possible_mask);
+ else
+ acpi_pptt_get_cpus_from_container(affinity_id,
+ &msc->accessibility);
+
+ return;
+ }
+
+ /* Where an MSC can be accessed from depends on the path to of_node. */
+ parent = of_get_parent(msc->pdev->dev.of_node);
+ if (parent == of_root) {
cpumask_copy(&msc->accessibility, cpu_possible_mask);
- else
- acpi_pptt_get_cpus_from_container(affinity_id, &msc->accessibility);
+ } else {
+ if (of_device_is_compatible(parent, "cache"))
+ get_cpumask_from_cache(parent, &msc->accessibility);
+ else
+ dev_err_once(dev, "Cannot determine accessibility of MSC.\n");
+ }
+ of_node_put(parent);
}
/*
@@ -2561,7 +2738,10 @@ static int mpam_msc_drv_probe(struct platform_device *pdev)
return PTR_ERR(msc);
/* Create RIS entries described by firmware */
- err = acpi_mpam_parse_resources(msc, plat_data);
+ if (!acpi_disabled)
+ err = acpi_mpam_parse_resources(msc, plat_data);
+ else
+ err = mpam_dt_parse_resources(msc, plat_data);
if (err) {
mpam_msc_drv_remove(pdev);
return err;
@@ -2574,15 +2754,45 @@ static int mpam_msc_drv_probe(struct platform_device *pdev)
return 0;
}
+static const struct of_device_id mpam_of_match[] = {
+ { .compatible = "arm,mpam-msc", },
+ {},
+};
+MODULE_DEVICE_TABLE(of, mpam_of_match);
+
static struct platform_driver mpam_msc_driver = {
.driver = {
.name = "mpam_msc",
.suppress_bind_attrs = true,
+ .of_match_table = of_match_ptr(mpam_of_match),
},
.probe = mpam_msc_drv_probe,
.remove = mpam_msc_drv_remove,
};
+/*
+ * MSCs that are declared by the firmware as being part of a cache may not
+ * be created automatically as platform devices, since there is no
+ * dedicated cache driver.
+ *
+ * Deal with theo MSCs here.
+ */
+static void mpam_dt_create_foundling_msc(void)
+{
+ for_each_compatible_node_scoped(cache, NULL, "cache") {
+ for_each_child_of_node_scoped(cache, child) {
+ if (!of_match_node(mpam_of_match, child))
+ continue;
+ if (!of_device_is_available(child))
+ continue;
+ if (of_node_check_flag(child, OF_POPULATED))
+ continue;
+ if (!of_platform_device_create(child, NULL, NULL))
+ pr_err("Failed to create MSC device for %pOF\n", child);
+ }
+ }
+}
+
/* Any of these features mean the BWA_WD field is valid. */
static bool mpam_has_bwa_wd_feature(struct mpam_props *props)
{
@@ -3455,12 +3665,18 @@ static int __init mpam_msc_driver_init(void)
init_srcu_struct(&mpam_srcu);
- fw_num_msc = acpi_mpam_count_msc();
+ if (!acpi_disabled)
+ fw_num_msc = acpi_mpam_count_msc();
+ else
+ fw_num_msc = mpam_dt_count_msc();
if (fw_num_msc <= 0) {
pr_err("No MSC devices found in firmware\n");
return -EINVAL;
}
+ if (acpi_disabled)
+ mpam_dt_create_foundling_msc();
+
return platform_driver_register(&mpam_msc_driver);
}
diff --git a/drivers/resctrl/mpam_internal.h b/drivers/resctrl/mpam_internal.h
index 1f86cc158100..cd122f308eab 100644
--- a/drivers/resctrl/mpam_internal.h
+++ b/drivers/resctrl/mpam_internal.h
@@ -519,7 +519,7 @@ int mpam_msmon_read(struct mpam_component *comp, struct mon_cfg *ctx,
enum mpam_device_features, u64 *val);
void mpam_msmon_reset_mbwu(struct mpam_component *comp, struct mon_cfg *ctx);
-int mpam_get_cpumask_from_cache_id(unsigned long cache_id, u32 cache_level,
+int mpam_get_cpumask_from_cache_id(u32 cache_id, u32 cache_level,
cpumask_t *affinity);
#ifdef CONFIG_RESCTRL_FS
--
2.34.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v5 6/7] arm_mpam: Add support for memory controller MSC on DT platforms
2026-11-09 10:05 [PATCH v5 0/7] arm-mpam: Add basic device tree support for resctrl Yin Li
` (4 preceding siblings ...)
2026-11-09 10:05 ` [PATCH v5 5/7] arm_mpam: Add device tree support for MSC probing Yin Li
@ 2026-11-09 10:05 ` Yin Li
2026-11-09 11:27 ` Ping Li
2026-11-09 10:05 ` [PATCH v5 7/7] arm64: dts: qcom: nord: Add MPAM MSC nodes for the L2 caches Yin Li
6 siblings, 1 reply; 10+ messages in thread
From: Yin Li @ 2026-11-09 10:05 UTC (permalink / raw)
To: James Morse, Rob Herring, Shanker Donthineni, Ben Horgan,
Krzysztof Kozlowski, Conor Dooley, Catalin Marinas,
Greg Kroah-Hartman, Rafael J. Wysocki, Danilo Krummrich,
Reinette Chatre, Fenghua Yu, Jonathan Cameron, Bjorn Andersson,
Konrad Dybcio, Gavin Shan
Cc: Yin Li, Andre Przywara, Drew Fustini, Ilpo Järvinen,
Shaopeng Tan, trilok.soni, aiqun.yu, ganapatrao.kulkarni,
Srivathsa L Rao, Huang Yiwei, linux-arm-kernel, linux-arm-msm,
linux-kernel, driver-core, devicetree, Ping Li
From: Shanker Donthineni <sdonthineni@nvidia.com>
The MPAM DT path only handles cache MSCs. Memory-controller MSCs
cannot be probed yet.
Add support to discover memory-controller MSCs from the device tree:
derive the component id from the NUMA node and create a 'memory' class
RIS, and treat a memory parent as accessible from all CPUs.
Signed-off-by: Shanker Donthineni <sdonthineni@nvidia.com>
[ morse: split out of a bigger patch, added affinity piece ]
Signed-off-by: James Morse <james.morse@arm.com>
[ Yin Li: fix context offset conflicts; use u32 instead of unsigned long
for component_id and compare against ~0U; remove the unused memory
node reference in the arm,mpam-memory-controller-msc path ]
Signed-off-by: Yin Li <yin.li@oss.qualcomm.com>
---
drivers/resctrl/mpam_devices.c | 54 ++++++++++++++++++++++++++++++------------
1 file changed, 39 insertions(+), 15 deletions(-)
diff --git a/drivers/resctrl/mpam_devices.c b/drivers/resctrl/mpam_devices.c
index 78caa8ae1349..e0ac6ef83d6e 100644
--- a/drivers/resctrl/mpam_devices.c
+++ b/drivers/resctrl/mpam_devices.c
@@ -365,10 +365,12 @@ static int mpam_dt_parse_resource(struct mpam_msc *msc, struct device_node *np,
u8 ris_idx)
{
int err = 0;
- u32 level = 0;
- u32 cache_id;
+ u32 class_id = 0;
+ u32 component_id = 0;
struct device *dev = &msc->pdev->dev;
+ enum mpam_class_types type = MPAM_CLASS_UNKNOWN;
struct device_node *cache __free(device_node) = NULL;
+ struct device_node *memory __free(device_node) = NULL;
struct device_node *parent __free(device_node) = of_get_parent(np);
if (of_device_is_compatible(np, "arm,mpam-cache")) {
@@ -377,27 +379,47 @@ static int mpam_dt_parse_resource(struct mpam_msc *msc, struct device_node *np,
dev_err_once(dev, "Failed to read phandle\n");
return -EINVAL;
}
+ type = MPAM_CLASS_CACHE;
+
} else if (of_device_is_compatible(parent, "cache")) {
cache = of_node_get(parent);
+ type = MPAM_CLASS_CACHE;
+ } else if (of_device_is_compatible(np, "arm,mpam-memory")) {
+ memory = of_parse_phandle(np, "arm,mpam-device", 0);
+ if (!memory) {
+ dev_err_once(dev, "Failed to read phandle\n");
+ return -EINVAL;
+ }
+ type = MPAM_CLASS_MEMORY;
+ } else if (of_device_is_compatible(np, "arm,mpam-memory-controller-msc")) {
+ type = MPAM_CLASS_MEMORY;
} else {
- /* For now, only caches are supported */
- cache = NULL;
- return err;
- }
-
- err = of_property_read_u32(cache, "cache-level", &level);
- if (err) {
- dev_err_once(dev, "Failed to read cache-level\n");
+ /*
+ * For now, only caches and memory controllers are
+ * supported.
+ */
return err;
}
- cache_id = cache_of_calculate_id(cache);
- if (cache_id == ~0U) {
- dev_err_once(dev, "Failed to calculate cache-id\n");
- return -ENOENT;
+ /* Determine the class and component ids, based on type. */
+ if (type == MPAM_CLASS_CACHE) {
+ err = of_property_read_u32(cache, "cache-level", &class_id);
+ if (err) {
+ dev_err_once(dev, "Failed to read cache-level\n");
+ return err;
+ }
+ component_id = cache_of_calculate_id(cache);
+ if (component_id == ~0U) {
+ dev_err_once(dev, "Failed to calculate cache-id\n");
+ return -ENOENT;
+ }
+ } else if (type == MPAM_CLASS_MEMORY) {
+ err = of_node_to_nid(np);
+ component_id = (err == NUMA_NO_NODE) ? 0 : err;
+ class_id = MPAM_CLASS_ID_DEFAULT;
}
- return mpam_ris_create(msc, ris_idx, MPAM_CLASS_CACHE, level, cache_id);
+ return mpam_ris_create(msc, ris_idx, type, class_id, component_id);
}
static int mpam_dt_parse_resources(struct mpam_msc *msc, void *ignored)
@@ -2574,6 +2596,8 @@ static void update_msc_accessibility(struct mpam_msc *msc)
} else {
if (of_device_is_compatible(parent, "cache"))
get_cpumask_from_cache(parent, &msc->accessibility);
+ else if (of_device_is_compatible(parent, "memory"))
+ cpumask_copy(&msc->accessibility, cpu_possible_mask);
else
dev_err_once(dev, "Cannot determine accessibility of MSC.\n");
}
--
2.34.1
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v5 6/7] arm_mpam: Add support for memory controller MSC on DT platforms
2026-11-09 10:05 ` [PATCH v5 6/7] arm_mpam: Add support for memory controller MSC on DT platforms Yin Li
@ 2026-11-09 11:27 ` Ping Li
2026-11-11 9:42 ` Yin Li
0 siblings, 1 reply; 10+ messages in thread
From: Ping Li @ 2026-11-09 11:27 UTC (permalink / raw)
To: yin.li
Cc: sdonthineni, james.morse, robh, ben.horgan, linux-arm-kernel,
devicetree, linux-kernel, Ping Li
Tested-by: Ping Li <leeonion.muyu@gmail.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v5 6/7] arm_mpam: Add support for memory controller MSC on DT platforms
2026-11-09 11:27 ` Ping Li
@ 2026-11-11 9:42 ` Yin Li
0 siblings, 0 replies; 10+ messages in thread
From: Yin Li @ 2026-11-11 9:42 UTC (permalink / raw)
To: Ping Li
Cc: sdonthineni, james.morse, robh, ben.horgan, linux-arm-kernel,
devicetree, linux-kernel
On 11/9/2026 7:27 PM, Ping Li wrote:
> Tested-by: Ping Li <leeonion.muyu@gmail.com>
Hi Ping,
Thank you for the Tested-by — it really helps move v5 forward.
To help the maintainers evaluate this series more quickly, could you
share some additional information about your use case?
1. Your SoC or platform name (if publicly available), or a brief
description (e.g. "server SoC with an MPAM MSC on the DDR egress
path").
2. The typical workload scenario where memory bandwidth QoS is useful
for you (e.g. isolating bandwidth between tenants, preventing certain
workloads from saturating DDR, etc.).
3. Which specific features did you verify on v5? (MSC probe, resctrl
mount, MB allocation, mbm_total_bytes monitoring, etc.)
A real usage log showing the memory controller MSC working through
resctrl would also be very helpful — similar to what we have for the
cache MSC:
```
root@qcom-armv8a:/sys/fs/resctrl# cat schemata
L2:0=fff;65536=fff;131072=fff
root@qcom-armv8a:/sys/fs/resctrl# echo "L2:0=111;65536=222;131072=333" >
schemata
root@qcom-armv8a:/sys/fs/resctrl# cat schemata
L2:0=111;65536=222;131072=333
root@qcom-armv8a:/sys/fs/resctrl#
```
This would give the maintainers a clearer picture of the real-world
value of these patches and help speed up the review.
Thanks,
Yin
--
Thx and BRs,
Yin
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v5 7/7] arm64: dts: qcom: nord: Add MPAM MSC nodes for the L2 caches
2026-11-09 10:05 [PATCH v5 0/7] arm-mpam: Add basic device tree support for resctrl Yin Li
` (5 preceding siblings ...)
2026-11-09 10:05 ` [PATCH v5 6/7] arm_mpam: Add support for memory controller MSC on DT platforms Yin Li
@ 2026-11-09 10:05 ` Yin Li
6 siblings, 0 replies; 10+ messages in thread
From: Yin Li @ 2026-11-09 10:05 UTC (permalink / raw)
To: James Morse, Rob Herring, Shanker Donthineni, Ben Horgan,
Krzysztof Kozlowski, Conor Dooley, Catalin Marinas,
Greg Kroah-Hartman, Rafael J. Wysocki, Danilo Krummrich,
Reinette Chatre, Fenghua Yu, Jonathan Cameron, Bjorn Andersson,
Konrad Dybcio, Gavin Shan
Cc: Yin Li, Andre Przywara, Drew Fustini, Ilpo Järvinen,
Shaopeng Tan, trilok.soni, aiqun.yu, ganapatrao.kulkarni,
Srivathsa L Rao, Huang Yiwei, linux-arm-kernel, linux-arm-msm,
linux-kernel, driver-core, devicetree, Ping Li
Add an MPAM MSC device node for each L2 cache. Each MSC is nested
directly under its L2 cache node so that the cache node is the MSC's
parent device and its CPU affinity is derived from that cache.
The L2 cache nodes are placed directly under the root node rather than
under their CPU nodes, to allow the MSC register region to be mapped:
CPU nodes do not provide an MMIO address space, so an MSC nested under
a CPU-parented cache node cannot be mapped.
Co-developed-by: Huang Yiwei <huang.yiwei@oss.qualcomm.com>
Signed-off-by: Huang Yiwei <huang.yiwei@oss.qualcomm.com>
Signed-off-by: Yin Li <yin.li@oss.qualcomm.com>
---
arch/arm64/boot/dts/qcom/nord.dtsi | 72 ++++++++++++++++++++++++++++----------
1 file changed, 54 insertions(+), 18 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/nord.dtsi b/arch/arm64/boot/dts/qcom/nord.dtsi
index fdbe290350dd..285c6a3e5cb7 100644
--- a/arch/arm64/boot/dts/qcom/nord.dtsi
+++ b/arch/arm64/boot/dts/qcom/nord.dtsi
@@ -23,12 +23,6 @@ cpu0: cpu@0 {
power-domain-names = "psci", "perf";
next-level-cache = <&l2_0>;
#cooling-cells = <2>;
-
- l2_0: l2-cache {
- compatible = "cache";
- cache-level = <2>;
- cache-unified;
- };
};
cpu1: cpu@100 {
@@ -95,12 +89,6 @@ cpu6: cpu@10000 {
enable-method = "psci";
next-level-cache = <&l2_10000>;
#cooling-cells = <2>;
-
- l2_10000: l2-cache {
- compatible = "cache";
- cache-level = <2>;
- cache-unified;
- };
};
cpu7: cpu@10100 {
@@ -167,12 +155,6 @@ cpu12: cpu@20000 {
power-domain-names = "psci", "perf";
next-level-cache = <&l2_20000>;
#cooling-cells = <2>;
-
- l2_20000: l2-cache {
- compatible = "cache";
- cache-level = <2>;
- cache-unified;
- };
};
cpu13: cpu@20100 {
@@ -907,6 +889,60 @@ dump_mem: mem-dump-region {
};
};
+ l2_0: cache@19870000 {
+ compatible = "qcom,nord-l2-cache", "cache";
+ cache-level = <2>;
+ cache-unified;
+ cache-size = <0xc00000>;
+ reg = <0x0 0x19870000 0x0 0x2000>;
+ ranges = <0x0 0x0 0x19870000 0x2000>;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ msc@0 {
+ compatible = "arm,mpam-msc";
+ reg = <0x0 0x2000>;
+ arm,not-ready-us = <1>;
+ };
+ };
+
+ l2_10000: cache@1a870000 {
+ compatible = "qcom,nord-l2-cache", "cache";
+ cache-level = <2>;
+ cache-unified;
+ cache-size = <0xc00000>;
+ reg = <0x0 0x1a870000 0x0 0x2000>;
+ ranges = <0x0 0x0 0x1a870000 0x2000>;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ msc@0 {
+ compatible = "arm,mpam-msc";
+ reg = <0x0 0x2000>;
+ arm,not-ready-us = <1>;
+ };
+ };
+
+ l2_20000: cache@1b870000 {
+ compatible = "qcom,nord-l2-cache", "cache";
+ cache-level = <2>;
+ cache-unified;
+ cache-size = <0xc00000>;
+ reg = <0x0 0x1b870000 0x0 0x2000>;
+ ranges = <0x0 0x0 0x1b870000 0x2000>;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ msc@0 {
+ compatible = "arm,mpam-msc";
+ reg = <0x0 0x2000>;
+ arm,not-ready-us = <1>;
+ };
+ };
+
soc: soc@0 {
compatible = "simple-bus";
#address-cells = <2>;
--
2.34.1
^ permalink raw reply [flat|nested] 10+ messages in thread