Re: [PATCH 3/3] riscv_cbqri: Bind to RQSC platform devices
From: Jonathan Cameron
Date: Wed Nov 18 2026 - 18:49:19 EST
On Tue, 17 Nov 2026 14:11:29 -0800
"Drew Fustini (Tenstorrent)" <fustini@xxxxxxxxxx> wrote:
> 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@xxxxxxxxxx>
Has the DT support landed? If not feels like a few tweaks in that
would make this less noisy.
If not, see below for one tidy up I'd make here if you can't push
it back to that series.
You almost never want to do manual device_node puts these days!
It's one of the nicest places to use the cleanup.h magic.
> ---
> 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
> -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);
Whilst you are here.
struct device_node *cache_np __free(device_node) =
of_parse_phandle();
and drop all the gotos. I haven't checked but if there is
a path where you want to hang on to it, no_free_ptr() that.
> 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;
> +}
>