mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Drew Fustini (Tenstorrent)" <fustini@kernel.org>
To: Sunil V L <sunilvl@oss.qualcomm.com>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>,
	"Len Brown" <lenb@kernel.org>, "Paul Walmsley" <pjw@kernel.org>,
	"Palmer Dabbelt" <palmer@dabbelt.com>,
	"Albert Ou" <aou@eecs.berkeley.edu>,
	"Alexandre Ghiti" <alex@ghiti.fr>,
	"Atish Patra" <atish.patra@linux.dev>,
	"Anup Patel" <anup.patel@oss.qualcomm.com>,
	"Chen Pei" <cp0613@linux.alibaba.com>,
	"yunhui cui" <cuiyunhui@bytedance.com>,
	"Reinette Chatre" <reinette.chatre@intel.com>,
	"Radim Krčmář" <radim.krcmar@oss.qualcomm.com>,
	"Zeng Heng" <zengheng@picoheart.com>,
	"Conor Dooley" <conor.dooley@microchip.com>,
	"Ben Horgan" <ben.horgan@arm.com>,
	"James Morse" <james.morse@arm.com>,
	"Tony Luck" <tony.luck@intel.com>,
	"Adrien Ricciardi" <aricciardi@baylibre.com>,
	"Zhanpeng Zhang" <zhangzhanpeng.jasper@bytedance.com>,
	"Gong Shuai" <gong.shuai@sanechips.com.cn>,
	"Gong Shuai" <gsh517@gmail.com>,
	"Weiwei Li" <liwei1518@gmail.com>,
	"Liu Zhiwei" <zhiwei_liu@linux.alibaba.com>,
	"Kornel Dulęba" <mindal@semihalf.com>,
	"Samuel Holland" <samuel.holland@sifive.com>,
	guo.wenjia23@zte.com.cn, liu.qingtao2@zte.com.cn,
	"Dave Martin" <Dave.Martin@arm.com>,
	"Babu Moger" <babu.moger@amd.com>,
	"Fenghua Yu" <fenghuay@nvidia.com>,
	"Peter Newman" <peternewman@google.com>,
	"Shaopeng Tan" <tan.shaopeng@jp.fujitsu.com>,
	"Jonathan Cameron" <jic23@kernel.org>,
	"Catalin Marinas" <catalin.marinas@arm.com>,
	linux-acpi@vger.kernel.org, linux-riscv@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	"Drew Fustini (Tenstorrent)" <fustini@kernel.org>
Subject: [PATCH 3/3] riscv_cbqri: Bind to RQSC platform devices
Date: Tue, 17 Nov 2026 14:11:29 -0800	[thread overview]
Message-ID: <20261117-acpi-rqsc-v1-3-381ce645751e@kernel.org> (raw)
In-Reply-To: <20261117-acpi-rqsc-v1-0-381ce645751e@kernel.org>

Let the capacity controller driver probe the "cbqri-capacity" platform
devices created from the RQSC table. The cache is named by its PPTT
Cache ID and the PPTT gives its level. Select ACPI_RQSC so the table is
parsed and drop the OF dependency.

No change for device tree systems.

Signed-off-by: Drew Fustini (Tenstorrent) <fustini@kernel.org>
---
 drivers/resctrl/Kconfig          |  11 ++--
 drivers/resctrl/cbqri_capacity.c | 111 ++++++++++++++++++++++++++++-----------
 2 files changed, 87 insertions(+), 35 deletions(-)

diff --git a/drivers/resctrl/Kconfig b/drivers/resctrl/Kconfig
index 844dfd75e2aa..491c867f8c5c 100644
--- a/drivers/resctrl/Kconfig
+++ b/drivers/resctrl/Kconfig
@@ -35,6 +35,7 @@ config ARM64_MPAM_RESCTRL_FS
 menuconfig RISCV_CBQRI
 	bool "RISC-V CBQRI support"
 	depends on RISCV && RISCV_ISA_SSQOSID
+	select ACPI_RQSC if ACPI
 	select ARCH_HAS_CPU_RESCTRL
 	default y
 	help
@@ -47,14 +48,14 @@ if RISCV_CBQRI
 
 config RISCV_CBQRI_CAPACITY
 	bool "RISC-V CBQRI cache capacity-allocation controller"
-	depends on OF
 	help
 	  Enable driver for a RISC-V CBQRI capacity controller that
-	  governs a CPU cache, matching the "riscv,cbqri-capacity-controller"
-	  compatible. The controller's cache phandle gives the cache level and
-	  id, which the driver registers as a resctrl cache-allocation resource.
+	  governs a CPU cache, described in device tree by the
+	  "riscv,cbqri-capacity-controller" compatible or in ACPI by the RQSC
+	  table. The firmware description gives the cache level and id, which
+	  the driver registers as a resctrl cache-allocation resource.
 
-	  Say N unless your device tree describes a CBQRI capacity controller.
+	  Say N unless your firmware describes a CBQRI capacity controller.
 
 endif
 
diff --git a/drivers/resctrl/cbqri_capacity.c b/drivers/resctrl/cbqri_capacity.c
index 6f3d06c4f74b..7013f1a50ffd 100644
--- a/drivers/resctrl/cbqri_capacity.c
+++ b/drivers/resctrl/cbqri_capacity.c
@@ -3,11 +3,14 @@
  * Platform driver for a RISC-V CBQRI capacity controller that backs a CPU
  * cache. The controller is described in device tree by the generic
  * "riscv,cbqri-capacity-controller" compatible together with a phandle to the
- * cache node it governs. The driver hands it to the CBQRI core, which probes
- * the capabilities register and exposes a controller that supports allocation
- * as the resctrl cache allocation resource for that cache.
+ * cache node it governs, or in ACPI by the RQSC table, whose parser creates a
+ * "cbqri-capacity" platform device that carries the PPTT Cache ID of the
+ * cache. The driver hands it to the CBQRI core, which probes the capabilities
+ * register and exposes a controller that supports allocation as the resctrl
+ * cache allocation resource for that cache.
  */
 
+#include <linux/acpi.h>
 #include <linux/cacheinfo.h>
 #include <linux/cpu.h>
 #include <linux/device-id/of.h>
@@ -15,45 +18,32 @@
 #include <linux/ioport.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
+#include <linux/property.h>
 #include <linux/riscv_cbqri.h>
 #include <linux/types.h>
 
-static int cbqri_capacity_probe(struct platform_device *pdev)
+static int cbqri_capacity_of_cache(struct device *dev, u32 *cache_level,
+				   u32 *cache_id)
 {
-	struct device *dev = &pdev->dev;
-	struct cbqri_controller_info info = {};
 	struct device_node *cache_np;
-	struct resource *res;
-	void __iomem *base;
-	u32 rcid_count, cache_level, cache_id;
 	bool found = false;
 	int cpu, ret;
 
-	base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
-	if (IS_ERR(base))
-		return PTR_ERR(base);
-
-	ret = of_property_read_u32(dev->of_node, "riscv,cbqri-rcid", &rcid_count);
-	if (ret) {
-		dev_err(dev, "missing riscv,cbqri-rcid\n");
-		return ret;
-	}
-
 	cache_np = of_parse_phandle(dev->of_node, "riscv,cbqri-cache", 0);
 	if (!cache_np) {
 		dev_err(dev, "missing riscv,cbqri-cache phandle\n");
 		return -EINVAL;
 	}
 
-	ret = of_property_read_u32(cache_np, "cache-level", &cache_level);
+	ret = of_property_read_u32(cache_np, "cache-level", cache_level);
 	if (ret) {
 		dev_err(dev, "%pOF: missing cache-level\n", cache_np);
 		goto out_put;
 	}
 
-	if (cache_level != 2 && cache_level != 3) {
+	if (*cache_level != 2 && *cache_level != 3) {
 		dev_err(dev, "%pOF: unsupported cache-level %u\n",
-			cache_np, cache_level);
+			cache_np, *cache_level);
 		ret = -EINVAL;
 		goto out_put;
 	}
@@ -73,10 +63,10 @@ static int cbqri_capacity_probe(struct platform_device *pdev)
 	 */
 	cpus_read_lock();
 	for_each_online_cpu(cpu) {
-		struct cacheinfo *ci = get_cpu_cacheinfo_level(cpu, cache_level);
+		struct cacheinfo *ci = get_cpu_cacheinfo_level(cpu, *cache_level);
 
 		if (ci && ci->fw_token == cache_np) {
-			cache_id = ci->id;
+			*cache_id = ci->id;
 			found = true;
 			break;
 		}
@@ -85,11 +75,74 @@ static int cbqri_capacity_probe(struct platform_device *pdev)
 
 	if (!found) {
 		dev_err(dev, "%pOF: no online hart reports an L%u cache with a cache id for this node\n",
-			cache_np, cache_level);
+			cache_np, *cache_level);
 		ret = -ENODEV;
-		goto out_put;
 	}
 
+out_put:
+	of_node_put(cache_np);
+	return ret;
+}
+
+/*
+ * The RQSC table names the cache by its PPTT Cache ID, which the table parser
+ * passes on in the riscv,cbqri-cache-id property. cacheinfo takes the cache
+ * id from the same PPTT field, and the PPTT gives the level of the cache.
+ */
+static int cbqri_capacity_acpi_cache(struct device *dev, u32 *cache_level,
+				     u32 *cache_id)
+{
+	int level, ret;
+
+	ret = device_property_read_u32(dev, "riscv,cbqri-cache-id", cache_id);
+	if (ret) {
+		dev_err(dev, "missing riscv,cbqri-cache-id\n");
+		return ret;
+	}
+
+	level = find_acpi_cache_level_from_id(*cache_id);
+	if (level < 0) {
+		dev_err(dev, "no PPTT cache with Cache ID %u\n", *cache_id);
+		return level;
+	}
+
+	if (level != 2 && level != 3) {
+		dev_err(dev, "unsupported cache level %d for Cache ID %u\n",
+			level, *cache_id);
+		return -EINVAL;
+	}
+
+	*cache_level = level;
+
+	return 0;
+}
+
+static int cbqri_capacity_probe(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct cbqri_controller_info info = {};
+	struct resource *res;
+	void __iomem *base;
+	u32 rcid_count, cache_level, cache_id;
+	int ret;
+
+	base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
+	if (IS_ERR(base))
+		return PTR_ERR(base);
+
+	ret = device_property_read_u32(dev, "riscv,cbqri-rcid", &rcid_count);
+	if (ret) {
+		dev_err(dev, "missing riscv,cbqri-rcid\n");
+		return ret;
+	}
+
+	if (dev->of_node)
+		ret = cbqri_capacity_of_cache(dev, &cache_level, &cache_id);
+	else
+		ret = cbqri_capacity_acpi_cache(dev, &cache_level, &cache_id);
+	if (ret)
+		return ret;
+
 	info.type = CBQRI_CONTROLLER_TYPE_CAPACITY;
 	info.base = base;
 	info.addr = res->start;
@@ -101,15 +154,13 @@ static int cbqri_capacity_probe(struct platform_device *pdev)
 	ret = riscv_cbqri_register_cc(&info);
 	if (ret) {
 		dev_err(dev, "failed to register capacity controller: %d\n", ret);
-		goto out_put;
+		return ret;
 	}
 
 	dev_info(dev, "registered L%u capacity controller at %pa (cache_id=%u, rcid=%u)\n",
 		 cache_level, &info.addr, cache_id, rcid_count);
 
-out_put:
-	of_node_put(cache_np);
-	return ret;
+	return 0;
 }
 
 static const struct of_device_id cbqri_capacity_of_match[] = {

-- 
2.43.0


      parent reply	other threads:[~2026-11-17 22:11 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-17 22:11 [PATCH 0/3] ACPI: RISC-V: Add support for the RQSC table Drew Fustini (Tenstorrent)
2026-11-17 22:11 ` [PATCH 1/3] ACPI: RISC-V: Add RQSC table definitions Drew Fustini (Tenstorrent)
2026-11-17 22:11 ` [PATCH 2/3] ACPI: RISC-V: Enumerate CBQRI controllers from the RQSC table Drew Fustini (Tenstorrent)
2026-11-17 22:11 ` Drew Fustini (Tenstorrent) [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261117-acpi-rqsc-v1-3-381ce645751e@kernel.org \
    --to=fustini@kernel.org \
    --cc=Dave.Martin@arm.com \
    --cc=alex@ghiti.fr \
    --cc=anup.patel@oss.qualcomm.com \
    --cc=aou@eecs.berkeley.edu \
    --cc=aricciardi@baylibre.com \
    --cc=atish.patra@linux.dev \
    --cc=babu.moger@amd.com \
    --cc=ben.horgan@arm.com \
    --cc=catalin.marinas@arm.com \
    --cc=conor.dooley@microchip.com \
    --cc=cp0613@linux.alibaba.com \
    --cc=cuiyunhui@bytedance.com \
    --cc=fenghuay@nvidia.com \
    --cc=gong.shuai@sanechips.com.cn \
    --cc=gsh517@gmail.com \
    --cc=guo.wenjia23@zte.com.cn \
    --cc=james.morse@arm.com \
    --cc=jic23@kernel.org \
    --cc=lenb@kernel.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-riscv@lists.infradead.org \
    --cc=liu.qingtao2@zte.com.cn \
    --cc=liwei1518@gmail.com \
    --cc=mindal@semihalf.com \
    --cc=palmer@dabbelt.com \
    --cc=peternewman@google.com \
    --cc=pjw@kernel.org \
    --cc=radim.krcmar@oss.qualcomm.com \
    --cc=rafael@kernel.org \
    --cc=reinette.chatre@intel.com \
    --cc=samuel.holland@sifive.com \
    --cc=sunilvl@oss.qualcomm.com \
    --cc=tan.shaopeng@jp.fujitsu.com \
    --cc=tony.luck@intel.com \
    --cc=zengheng@picoheart.com \
    --cc=zhangzhanpeng.jasper@bytedance.com \
    --cc=zhiwei_liu@linux.alibaba.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®