| Message ID | 20231128185605.3027653-5-srinivas.pandruvada@linux.intel.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | TPMI update for new defines and permissions | expand |
On Tue, 28 Nov 2023, Srinivas Pandruvada wrote: > Move TPMI ID definitions to common include file. In this way other > feature drivers don't have to redefine. > > Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > --- > drivers/platform/x86/intel/tpmi.c | 13 ------------- > include/linux/intel_tpmi.h | 13 +++++++++++++ > 2 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/drivers/platform/x86/intel/tpmi.c b/drivers/platform/x86/intel/tpmi.c > index 44773c210324..14575da91d2c 100644 > --- a/drivers/platform/x86/intel/tpmi.c > +++ b/drivers/platform/x86/intel/tpmi.c > @@ -176,19 +176,6 @@ struct tpmi_feature_state { > u32 locked:1; > } __packed; > > -/* > - * List of supported TMPI IDs. > - * Some TMPI IDs are not used by Linux, so the numbers are not consecutive. > - */ > -enum intel_tpmi_id { > - TPMI_ID_RAPL = 0, /* Running Average Power Limit */ > - TPMI_ID_PEM = 1, /* Power and Perf excursion Monitor */ > - TPMI_ID_UNCORE = 2, /* Uncore Frequency Scaling */ > - TPMI_ID_SST = 5, /* Speed Select Technology */ > - TPMI_CONTROL_ID = 0x80, /* Special ID for getting feature status */ > - TPMI_INFO_ID = 0x81, /* Special ID for PCI BDF and Package ID information */ > -}; > - > /* > * The size from hardware is in u32 units. This size is from a trusted hardware, > * but better to verify for pre silicon platforms. Set size to 0, when invalid. > diff --git a/include/linux/intel_tpmi.h b/include/linux/intel_tpmi.h > index a240e15ef77f..6c31768cdb83 100644 > --- a/include/linux/intel_tpmi.h > +++ b/include/linux/intel_tpmi.h > @@ -12,6 +12,19 @@ > #define TPMI_MINOR_VERSION(val) FIELD_GET(GENMASK(4, 0), val) > #define TPMI_MAJOR_VERSION(val) FIELD_GET(GENMASK(7, 5), val) > > +/* > + * List of supported TMPI IDs. > + * Some TMPI IDs are not used by Linux, so the numbers are not consecutive. > + */ > +enum intel_tpmi_id { > + TPMI_ID_RAPL = 0, /* Running Average Power Limit */ > + TPMI_ID_PEM = 1, /* Power and Perf excursion Monitor */ > + TPMI_ID_UNCORE = 2, /* Uncore Frequency Scaling */ > + TPMI_ID_SST = 5, /* Speed Select Technology */ > + TPMI_CONTROL_ID = 0x80, /* Special ID for getting feature status */ > + TPMI_INFO_ID = 0x81, /* Special ID for PCI BDF and Package ID information */ > +}; While at it, could you align the comments to start at the same column so it would slightly less messy to read. Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
diff --git a/drivers/platform/x86/intel/tpmi.c b/drivers/platform/x86/intel/tpmi.c index 44773c210324..14575da91d2c 100644 --- a/drivers/platform/x86/intel/tpmi.c +++ b/drivers/platform/x86/intel/tpmi.c @@ -176,19 +176,6 @@ struct tpmi_feature_state { u32 locked:1; } __packed; -/* - * List of supported TMPI IDs. - * Some TMPI IDs are not used by Linux, so the numbers are not consecutive. - */ -enum intel_tpmi_id { - TPMI_ID_RAPL = 0, /* Running Average Power Limit */ - TPMI_ID_PEM = 1, /* Power and Perf excursion Monitor */ - TPMI_ID_UNCORE = 2, /* Uncore Frequency Scaling */ - TPMI_ID_SST = 5, /* Speed Select Technology */ - TPMI_CONTROL_ID = 0x80, /* Special ID for getting feature status */ - TPMI_INFO_ID = 0x81, /* Special ID for PCI BDF and Package ID information */ -}; - /* * The size from hardware is in u32 units. This size is from a trusted hardware, * but better to verify for pre silicon platforms. Set size to 0, when invalid. diff --git a/include/linux/intel_tpmi.h b/include/linux/intel_tpmi.h index a240e15ef77f..6c31768cdb83 100644 --- a/include/linux/intel_tpmi.h +++ b/include/linux/intel_tpmi.h @@ -12,6 +12,19 @@ #define TPMI_MINOR_VERSION(val) FIELD_GET(GENMASK(4, 0), val) #define TPMI_MAJOR_VERSION(val) FIELD_GET(GENMASK(7, 5), val) +/* + * List of supported TMPI IDs. + * Some TMPI IDs are not used by Linux, so the numbers are not consecutive. + */ +enum intel_tpmi_id { + TPMI_ID_RAPL = 0, /* Running Average Power Limit */ + TPMI_ID_PEM = 1, /* Power and Perf excursion Monitor */ + TPMI_ID_UNCORE = 2, /* Uncore Frequency Scaling */ + TPMI_ID_SST = 5, /* Speed Select Technology */ + TPMI_CONTROL_ID = 0x80, /* Special ID for getting feature status */ + TPMI_INFO_ID = 0x81, /* Special ID for PCI BDF and Package ID information */ +}; + /** * struct intel_tpmi_plat_info - Platform information for a TPMI device instance * @cdie_mask: Mask of all compute dies in the partition
Move TPMI ID definitions to common include file. In this way other feature drivers don't have to redefine. Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> --- drivers/platform/x86/intel/tpmi.c | 13 ------------- include/linux/intel_tpmi.h | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-)