On Fri, 2024-08-23 at 15:48 +0300, Ilpo Järvinen wrote:
> On Wed, 21 Aug 2024, Tero Kristo wrote:
>
> > Add efficiency latency control support to the TPMI uncore driver.
> > This
> > defines two new threshold values for controlling uncore frequency,
> > low
> > threshold and high threshold. When CPU utilization is below low
> > threshold,
> > the user configurable floor latency control frequency can be used
> > by the
> > system. When CPU utilization is above high threshold, the uncore
> > frequency
> > is increased in 100MHz steps until power limit is reached.
> >
> > Signed-off-by: Tero Kristo <tero.kristo@xxxxxxxxxxxxxxx>
> > ---
> > .../uncore-frequency-common.h | 4 +
> > .../uncore-frequency/uncore-frequency-tpmi.c | 153
> > +++++++++++++++++-
> > 2 files changed, 155 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/platform/x86/intel/uncore-frequency/uncore-
> > frequency-common.h b/drivers/platform/x86/intel/uncore-
> > frequency/uncore-frequency-common.h
> > index 4c245b945e4e..b5c7311bfa05 100644
> > --- a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-
> > common.h
> > +++ b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-
> > common.h
> > @@ -70,6 +70,10 @@ enum uncore_index {
> > UNCORE_INDEX_MIN_FREQ,
> > UNCORE_INDEX_MAX_FREQ,
> > UNCORE_INDEX_CURRENT_FREQ,
> > + UNCORE_INDEX_EFF_LAT_CTRL_LOW_THRESHOLD,
> > + UNCORE_INDEX_EFF_LAT_CTRL_HIGH_THRESHOLD,
> > + UNCORE_INDEX_EFF_LAT_CTRL_HIGH_THRESHOLD_ENABLE,
> > + UNCORE_INDEX_EFF_LAT_CTRL_FREQ,
> > };
> >
> > int uncore_freq_common_init(int (*read)(struct uncore_data *data,
> > unsigned int *value,
> > diff --git a/drivers/platform/x86/intel/uncore-frequency/uncore-
> > frequency-tpmi.c b/drivers/platform/x86/intel/uncore-
> > frequency/uncore-frequency-tpmi.c
> > index 9fa3037c03d1..3a83b6ce54a5 100644
> > --- a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-
> > tpmi.c
> > +++ b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-
> > tpmi.c
> > @@ -30,6 +30,7 @@
> >
> > #define UNCORE_MAJOR_VERSION 0
> > #define UNCORE_MINOR_VERSION 2
> > +#define UNCORE_ELC_SUPPORTED_VERSION 2
> > #define UNCORE_HEADER_INDEX 0
> > #define UNCORE_FABRIC_CLUSTER_OFFSET 8
> >
> > @@ -46,6 +47,7 @@ struct tpmi_uncore_struct;
> > /* Information for each cluster */
> > struct tpmi_uncore_cluster_info {
> > bool root_domain;
> > + bool elc_supported;
> > u8 __iomem *cluster_base;
> > struct uncore_data uncore_data;
> > struct tpmi_uncore_struct *uncore_root;
> > @@ -75,6 +77,10 @@ struct tpmi_uncore_struct {
> > /* Bit definitions for CONTROL register */
> > #define
> > UNCORE_MAX_RATIO_MASK GENMASK_ULL(14, 8)
> > #define
> > UNCORE_MIN_RATIO_MASK GENMASK_ULL(21, 15)
> > +#define
> > UNCORE_EFF_LAT_CTRL_RATIO_MASK GENMASK_ULL(28, 22)
> > +#define
> > UNCORE_EFF_LAT_CTRL_LOW_THRESHOLD_MASK GENMASK_ULL(38, 32)
> > +#define UNCORE_EFF_LAT_CTRL_HIGH_THRESHOLD_ENABLE BIT(39)
> > +#define
> > UNCORE_EFF_LAT_CTRL_HIGH_THRESHOLD_MASK GENMASK_ULL(46, 40)
> >
> > /* Helper function to read MMIO offset for max/min control
> > frequency */
> > static void read_control_freq(struct tpmi_uncore_cluster_info
> > *cluster_info,
> > @@ -89,6 +95,48 @@ static void read_control_freq(struct
> > tpmi_uncore_cluster_info *cluster_info,
> > *value = FIELD_GET(UNCORE_MIN_RATIO_MASK, control)
> > * UNCORE_FREQ_KHZ_MULTIPLIER;
> > }
> >
> > +/* Helper function to read efficiency latency control values over
> > MMIO */
> > +static int read_eff_lat_ctrl(struct uncore_data *data, unsigned
> > int *val, enum uncore_index index)
> > +{
> > + struct tpmi_uncore_cluster_info *cluster_info;
> > + u64 ctrl;
> > +
> > + cluster_info = container_of(data, struct
> > tpmi_uncore_cluster_info, uncore_data);
> > + if (cluster_info->root_domain)
> > + return -ENODATA;
> > +
> > + if (!cluster_info->elc_supported)
> > + return -EOPNOTSUPP;
> > +
> > + ctrl = readq(cluster_info->cluster_base +
> > UNCORE_CONTROL_INDEX);
> > +
> > + switch (index) {
> > + case UNCORE_INDEX_EFF_LAT_CTRL_LOW_THRESHOLD:
> > + *val =
> > FIELD_GET(UNCORE_EFF_LAT_CTRL_LOW_THRESHOLD_MASK, ctrl);
> > + *val *= 100;
> > + *val = DIV_ROUND_UP(*val,
> > FIELD_MAX(UNCORE_EFF_LAT_CTRL_LOW_THRESHOLD_MASK));
> > + break;
> > +
> > + case UNCORE_INDEX_EFF_LAT_CTRL_HIGH_THRESHOLD:
> > + *val =
> > FIELD_GET(UNCORE_EFF_LAT_CTRL_HIGH_THRESHOLD_MASK, ctrl);
> > + *val *= 100;
> > + *val = DIV_ROUND_UP(*val,
> > FIELD_MAX(UNCORE_EFF_LAT_CTRL_HIGH_THRESHOLD_MASK));
> > + break;
> > +
> > + case UNCORE_INDEX_EFF_LAT_CTRL_HIGH_THRESHOLD_ENABLE:
> > + *val =
> > FIELD_GET(UNCORE_EFF_LAT_CTRL_HIGH_THRESHOLD_ENABLE, ctrl);
> > + break;
> > + case UNCORE_INDEX_EFF_LAT_CTRL_FREQ:
> > + *val = FIELD_GET(UNCORE_EFF_LAT_CTRL_RATIO_MASK,
> > ctrl) * UNCORE_FREQ_KHZ_MULTIPLIER;
> > + break;
> > +
> > + default:
> > + return -EOPNOTSUPP;
> > + }
> > +
> > + return 0;
> > +}
> > +
> > #define UNCORE_MAX_RATIO FIELD_MAX(UNCORE_MAX_RATIO_MASK)
> >
> > /* Helper for sysfs read for max/min frequencies. Called under
> > mutex locks */
> > @@ -137,6 +185,77 @@ static int uncore_read_control_freq(struct
> > uncore_data *data, unsigned int *valu
> > return 0;
> > }
> >
> > +/* Helper function for writing efficiency latency control values
> > over MMIO */
> > +static int write_eff_lat_ctrl(struct uncore_data *data, unsigned
> > int val, enum uncore_index index)
> > +{
> > + struct tpmi_uncore_cluster_info *cluster_info;
> > + u64 control;
> > +
> > + cluster_info = container_of(data, struct
> > tpmi_uncore_cluster_info, uncore_data);
> > +
> > + if (cluster_info->root_domain)
> > + return -ENODATA;
> > +
> > + if (!cluster_info->elc_supported)
> > + return -EOPNOTSUPP;
> > +
> > + switch (index) {
> > + case UNCORE_INDEX_EFF_LAT_CTRL_LOW_THRESHOLD:
> > + if (val > 100)
> > + return -EINVAL;
> > + break;
> > +
> > + case UNCORE_INDEX_EFF_LAT_CTRL_HIGH_THRESHOLD:
> > + if (val > 100)
> > + return -EINVAL;
> > + break;
> > +
> > + case UNCORE_INDEX_EFF_LAT_CTRL_HIGH_THRESHOLD_ENABLE:
> > + if (val > 1)
> > + return -EINVAL;
> > + break;
> > +
> > + case UNCORE_INDEX_EFF_LAT_CTRL_FREQ:
> > + val /= UNCORE_FREQ_KHZ_MULTIPLIER;
> > + if (val >
> > FIELD_MAX(UNCORE_EFF_LAT_CTRL_RATIO_MASK))
> > + return -EINVAL;
> > + break;
> > +
> > + default:
> > + return -EOPNOTSUPP;
> > + }
> > +
> > + control = readq(cluster_info->cluster_base +
> > UNCORE_CONTROL_INDEX);
> > +
> > + if (index == UNCORE_INDEX_EFF_LAT_CTRL_LOW_THRESHOLD) {
> > + val *=
> > FIELD_MAX(UNCORE_EFF_LAT_CTRL_LOW_THRESHOLD_MASK);
> > + val /= 100;
> > + control &=
> > ~UNCORE_EFF_LAT_CTRL_LOW_THRESHOLD_MASK;
> > + control |=
> > FIELD_PREP(UNCORE_EFF_LAT_CTRL_LOW_THRESHOLD_MASK, val);
> > + }
> > +
> > + if (index == UNCORE_INDEX_EFF_LAT_CTRL_HIGH_THRESHOLD) {
> > + val *=
> > FIELD_MAX(UNCORE_EFF_LAT_CTRL_HIGH_THRESHOLD_MASK);
> > + val /= 100;
> > + control &=
> > ~UNCORE_EFF_LAT_CTRL_HIGH_THRESHOLD_MASK;
> > + control |=
> > FIELD_PREP(UNCORE_EFF_LAT_CTRL_HIGH_THRESHOLD_MASK, val);
> > + }
> > +
> > + if (index ==
> > UNCORE_INDEX_EFF_LAT_CTRL_HIGH_THRESHOLD_ENABLE) {
> > + control &=
> > ~UNCORE_EFF_LAT_CTRL_HIGH_THRESHOLD_ENABLE;
> > + control |=
> > FIELD_PREP(UNCORE_EFF_LAT_CTRL_HIGH_THRESHOLD_ENABLE, val);
> > + }
> > +
> > + if (index == UNCORE_INDEX_EFF_LAT_CTRL_FREQ) {
> > + control &= ~UNCORE_EFF_LAT_CTRL_RATIO_MASK;
> > + control |=
> > FIELD_PREP(UNCORE_EFF_LAT_CTRL_RATIO_MASK, val);
> > + }
>
> Why are these not using switch/case?
>
I think they can reuse. Just need to repeat readq(). Something like
attached:
diff --git a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-tpmi.c b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-tpmi.c
index e6047fbbea76..2a338d6b8bbf 100644
--- a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-tpmi.c
+++ b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-tpmi.c
@@ -191,50 +191,44 @@ static int write_eff_lat_ctrl(struct uncore_data *data, unsigned int val, enum u
case UNCORE_INDEX_EFF_LAT_CTRL_LOW_THRESHOLD:
if (val > FIELD_MAX(UNCORE_EFF_LAT_CTRL_LOW_THRESHOLD_MASK))
return -EINVAL;
+
+ control = readq(cluster_info->cluster_base + UNCORE_CONTROL_INDEX);
+ control &= ~UNCORE_EFF_LAT_CTRL_LOW_THRESHOLD_MASK;
+ control |= FIELD_PREP(UNCORE_EFF_LAT_CTRL_LOW_THRESHOLD_MASK, val);
break;
case UNCORE_INDEX_EFF_LAT_CTRL_HIGH_THRESHOLD:
if (val > FIELD_MAX(UNCORE_EFF_LAT_CTRL_HIGH_THRESHOLD_MASK))
return -EINVAL;
+
+ control = readq(cluster_info->cluster_base + UNCORE_CONTROL_INDEX);
+ control &= ~UNCORE_EFF_LAT_CTRL_HIGH_THRESHOLD_MASK;
+ control |= FIELD_PREP(UNCORE_EFF_LAT_CTRL_HIGH_THRESHOLD_MASK, val);
break;
case UNCORE_INDEX_EFF_LAT_CTRL_HIGH_THRESHOLD_ENABLE:
if (val > 1)
return -EINVAL;
+
+ control = readq(cluster_info->cluster_base + UNCORE_CONTROL_INDEX);
+ control &= ~UNCORE_EFF_LAT_CTRL_HIGH_THRESHOLD_ENABLE;
+ control |= FIELD_PREP(UNCORE_EFF_LAT_CTRL_HIGH_THRESHOLD_ENABLE, val);
break;
case UNCORE_INDEX_EFF_LAT_CTRL_FREQ:
val /= UNCORE_FREQ_KHZ_MULTIPLIER;
if (val > FIELD_MAX(UNCORE_EFF_LAT_CTRL_RATIO_MASK))
return -EINVAL;
+
+ control = readq(cluster_info->cluster_base + UNCORE_CONTROL_INDEX);
+ control &= ~UNCORE_EFF_LAT_CTRL_RATIO_MASK;
+ control |= FIELD_PREP(UNCORE_EFF_LAT_CTRL_RATIO_MASK, val);
break;
default:
return -EOPNOTSUPP;
}
- control = readq(cluster_info->cluster_base + UNCORE_CONTROL_INDEX);
-
- if (index == UNCORE_INDEX_EFF_LAT_CTRL_LOW_THRESHOLD) {
- control &= ~UNCORE_EFF_LAT_CTRL_LOW_THRESHOLD_MASK;
- control |= FIELD_PREP(UNCORE_EFF_LAT_CTRL_LOW_THRESHOLD_MASK, val);
- }
-
- if (index == UNCORE_INDEX_EFF_LAT_CTRL_HIGH_THRESHOLD) {
- control &= ~UNCORE_EFF_LAT_CTRL_HIGH_THRESHOLD_MASK;
- control |= FIELD_PREP(UNCORE_EFF_LAT_CTRL_HIGH_THRESHOLD_MASK, val);
- }
-
- if (index == UNCORE_INDEX_EFF_LAT_CTRL_HIGH_THRESHOLD_ENABLE) {
- control &= ~UNCORE_EFF_LAT_CTRL_HIGH_THRESHOLD_ENABLE;
- control |= FIELD_PREP(UNCORE_EFF_LAT_CTRL_HIGH_THRESHOLD_ENABLE, val);
- }
-
- if (index == UNCORE_INDEX_EFF_LAT_CTRL_FREQ) {
- control &= ~UNCORE_EFF_LAT_CTRL_RATIO_MASK;
- control |= FIELD_PREP(UNCORE_EFF_LAT_CTRL_RATIO_MASK, val);
- }
-
writeq(control, cluster_info->cluster_base + UNCORE_CONTROL_INDEX);
return 0;
