On 5/13/25 10:15, James Morse wrote:
> resctrl_types.h contains common types and constants to enable architectures
> to use these types in their definitions within asm/resctrl.h
>
> enum resctrl_event_id was placed in resctrl_types.h for
> resctrl_arch_get_cdp_enabled() and resctrl_arch_set_cdp_enabled(), but
> these two functions are no longer inlined by any architecture.
>
> Move enum resctrl_event_id to resctrl.h
>
> Signed-off-by: James Morse <james.morse@arm.com>
> Tested-by: Babu Moger <babu.moger@amd.com>
> Tested-by: Shaopeng Tan <tan.shaopeng@jp.fujitsu.com>
> Reviewed-by: Reinette Chatre <reinette.chatre@intel.com>
Reviewed-by: Fenghua Yu <fenghuay@nvidia.com>
Thanks.
-Fenghua
> ---
> Changes since v9:
> * Replaced commit message with Reinette's version.
>
> Changes since v8:
> * This patch is new.
> ---
> include/linux/resctrl.h | 10 ++++++++++
> include/linux/resctrl_types.h | 10 ----------
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h
> index b9d1f2916e9c..5ef972cbf56b 100644
> --- a/include/linux/resctrl.h
> +++ b/include/linux/resctrl.h
> @@ -48,6 +48,16 @@ int proc_resctrl_show(struct seq_file *m,
> for_each_rdt_resource((r)) \
> if ((r)->mon_capable)
>
> +enum resctrl_res_level {
> + RDT_RESOURCE_L3,
> + RDT_RESOURCE_L2,
> + RDT_RESOURCE_MBA,
> + RDT_RESOURCE_SMBA,
> +
> + /* Must be the last */
> + RDT_NUM_RESOURCES,
> +};
> +
> /**
> * enum resctrl_conf_type - The type of configuration.
> * @CDP_NONE: No prioritisation, both code and data are controlled or monitored.
> diff --git a/include/linux/resctrl_types.h b/include/linux/resctrl_types.h
> index a66e7936943e..a25fb9c4070d 100644
> --- a/include/linux/resctrl_types.h
> +++ b/include/linux/resctrl_types.h
> @@ -34,16 +34,6 @@
> /* Max event bits supported */
> #define MAX_EVT_CONFIG_BITS GENMASK(6, 0)
>
> -enum resctrl_res_level {
> - RDT_RESOURCE_L3,
> - RDT_RESOURCE_L2,
> - RDT_RESOURCE_MBA,
> - RDT_RESOURCE_SMBA,
> -
> - /* Must be the last */
> - RDT_NUM_RESOURCES,
> -};
> -
> /*
> * Event IDs, the values match those used to program IA32_QM_EVTSEL before
> * reading IA32_QM_CTR on RDT systems.