Re: [PATCH v12 1/5] riscv_cbqri: Add capacity controller core

From: Drew Fustini

Date: Thu Nov 19 2026 - 19:22:02 EST


On Thu, Nov 19, 2026 at 12:08:46AM +0000, Jonathan Cameron wrote:
> On Sat, 14 Nov 2026 14:06:21 -0800
> Drew Fustini <fustini@xxxxxxxxxx> wrote:
>
> > Add the core for RISC-V CBQRI capacity controllers: the register
> > layout, the capability probe, and the allocation operations that
> > program a capacity block mask for an RCID and read it back.
> >
> > A discovery layer maps the register block and describes the controller
> > in a cbqri_controller_info descriptor. riscv_cbqri_register_cc() probes
> > the controller from that descriptor and adds it to the controller list,
> > which stays private to the core. The core owns the controller state
> > after registration, so nothing in it depends on how the controller was
> > discovered. The caller keeps the register mapping alive.
> >
> > Tested-by: Zeng Heng <zengheng@xxxxxxxxxxxxx>
> > Reviewed-by: Zeng Heng <zengheng@xxxxxxxxxxxxx>
> > Co-developed-by: Adrien Ricciardi <aricciardi@xxxxxxxxxxxx>
> > Signed-off-by: Adrien Ricciardi <aricciardi@xxxxxxxxxxxx>
> > Signed-off-by: Drew Fustini <fustini@xxxxxxxxxx>
>
> A couple more drive by comments.

Thanks for your attention!

> > diff --git a/drivers/resctrl/cbqri_devices.c b/drivers/resctrl/cbqri_devices.c
> > new file mode 100644
> > index 000000000000..5522872f5cc1
> > --- /dev/null
> > +++ b/drivers/resctrl/cbqri_devices.c
>
>
> > +
> > +/* Read the configured CBM for closid on the AT half via READ_LIMIT. */
> > +int cbqri_read_cache_config(struct cbqri_controller *ctrl, u32 closid,
> > + u32 at, u32 *cbm_out)
> > +{
> > + int err;
> > +
> > + guard(mutex)(&ctrl->lock);
> > +
> > + err = cbqri_cc_alloc_op(ctrl, CBQRI_CC_ALLOC_CTL_OP_READ_LIMIT, closid, at, 0);
> > + if (err == 0) {
> > + /*
> > + * resctrl exposes the CBM as a u32 and cbqri_probe_cc() rejects
> > + * ncblks > 32, so the mask fits the low 32-bit word of the
> > + * cc_block_mask register.
> > + */
> > + *cbm_out = readl(ctrl->base + CBQRI_CC_BLOCK_MASK_OFF);
> > + }
> > +
> > + return err;
> Unless this gets more complex in later patches I'd do
> if (err)
> return err;
>
> /*
> * resctrl exposes the CBM as a u32 and cbqri_probe_cc() rejects
> * ncblks > 32, so the mask fits the low 32-bit word of the
> * cc_block_mask register.
> */
> *cbm_out = readl(ctrl->base + CBQRI_CC_BLOCK_MASK_OFF);
>
> return 0;
>
> Just to keep error handling out of line and that
> comment block less indented.

It doesn't get more complex so I will change it.

[..]
> > + /* The resctrl glue keys its domains on cache_id, one controller each. */
> > + list_for_each_entry(other, &cbqri_controllers, list) {
> > + if (other->cache.cache_level == info->cache_level &&
> > + other->cache.cache_id == info->cache_id) {
> > + pr_warn("CC at %pa duplicates the L%u cache id %u controller at %pa, skipping\n",
> > + &ctrl->addr, info->cache_level, info->cache_id,
> > + &other->addr);
> > + return -EEXIST;
> > + }
> > + }
> > +
> > + list_add_tail(&ctrl->list, &cbqri_controllers);
> > + retain_and_null_ptr(ctrl);
>
> Common trick for this is something like:
>
> list_add_tail(&no_free_ptr(ctrl)->list, &cbqri_controllers);
>
> because it couples ownership passing with stopping the autofree
> magic. I'd personally only use retain_and_null_ptr() in cases where I need
> to check for success of the ownership being handed off.

Thanks, I will use no_free_ptr.

[..]
> > +/**
> > + * struct cbqri_controller_info - registration descriptor
> > + * @addr: MMIO base address of the controller's register interface
> > + * @size: size of the MMIO region
> > + * @type: controller type (capacity)
> > + * @rcid_count: number of supported RCIDs
> > + * @cache_id: cache id used as the resctrl domain id
> > + * @cache_level: cache level (2 or 3) the controller backs
> > + * @base: mapped register block, which the caller keeps mapped for
> > + * the life of the system
> Out of order documentation is unusual. Why?

No reason, I'll fix it.

Thanks,
Drew