| Message ID | 20230911183354.11487-3-linux@fw-web.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | add LVTS support for mt7988 | expand |
Il 11/09/23 20:33, Frank Wunderlich ha scritto: > From: Frank Wunderlich <frank-w@public-files.de> > > The upcoming mt7988 has different temperature coefficients so we > cannot use constants in the functions lvts_golden_temp_init, > lvts_golden_temp_init and lvts_raw_to_temp anymore. > > Add a field in the lvts_ctrl pointing to the lvts_data which now > contains the soc-specific temperature coefficents. > > Signed-off-by: Frank Wunderlich <frank-w@public-files.de> > --- > drivers/thermal/mediatek/lvts_thermal.c | 56 ++++++++++++++++++------- > 1 file changed, 41 insertions(+), 15 deletions(-) > > diff --git a/drivers/thermal/mediatek/lvts_thermal.c b/drivers/thermal/mediatek/lvts_thermal.c > index effd9b00a424..c1004b4da3b6 100644 > --- a/drivers/thermal/mediatek/lvts_thermal.c > +++ b/drivers/thermal/mediatek/lvts_thermal.c > @@ -80,8 +80,8 @@ > #define LVTS_SENSOR_MAX 4 > #define LVTS_GOLDEN_TEMP_MAX 62 > #define LVTS_GOLDEN_TEMP_DEFAULT 50 > -#define LVTS_COEFF_A -250460 > -#define LVTS_COEFF_B 250460 > +#define LVTS_COEFF_A_MT8195 -250460 > +#define LVTS_COEFF_B_MT8195 250460 > > #define LVTS_MSR_IMMEDIATE_MODE 0 > #define LVTS_MSR_FILTERED_MODE 1 > @@ -94,7 +94,7 @@ > #define LVTS_MINIMUM_THRESHOLD 20000 > > static int golden_temp = LVTS_GOLDEN_TEMP_DEFAULT; > -static int coeff_b = LVTS_COEFF_B; > +static int coeff_b; This could be renamed to `golden_temp_offset` > > struct lvts_sensor_data { > int dt_id; > @@ -109,9 +109,15 @@ struct lvts_ctrl_data { > int mode; > }; > > +struct formula_coeff { > + int a; > + int b; > +}; > + > struct lvts_data { > const struct lvts_ctrl_data *lvts_ctrl; > int num_lvts_ctrl; > + struct formula_coeff coeff; You can just add the coefficients here directly... and while at it you can also make it self explanatory, because the "A" coefficient is a factor while the "B" coefficient is just an offset. int temp_factor; <--- coeff_a int temp_offset; <--- coeff_b > }; > > struct lvts_sensor { > @@ -126,6 +132,7 @@ struct lvts_sensor { > > struct lvts_ctrl { > struct lvts_sensor sensors[LVTS_SENSOR_MAX]; > + const struct lvts_data *lvts_data; > u32 calibration[LVTS_SENSOR_MAX]; > u32 hw_tshut_raw_temp; > int num_lvts_sensor; > @@ -247,21 +254,21 @@ static void lvts_debugfs_exit(struct lvts_domain *lvts_td) { } > > #endif > > -static int lvts_raw_to_temp(u32 raw_temp) > +static int lvts_raw_to_temp(u32 raw_temp, struct formula_coeff coeff) > { > int temperature; > > - temperature = ((s64)(raw_temp & 0xFFFF) * LVTS_COEFF_A) >> 14; > + temperature = ((s64)(raw_temp & 0xFFFF) * coeff.a) >> 14; so that this also becomes more readable: static int lvts_raw_to_temp(u32 raw_temp, int temp_factor) { int temperature; temperature = ((s64)(raw_temp & 0xFFFF) * temp_factor) >> 14; temperature += golden_temp_offset; return temperature; } where temp_factor is lvts_data.temp_factor, and golden_temp_offset is a rename of `static int coeff_b`. Cheers, Angelo
Hi > Gesendet: Mittwoch, 13. September 2023 um 10:03 Uhr > Von: "AngeloGioacchino Del Regno" <angelogioacchino.delregno@collabora.com> > Il 11/09/23 20:33, Frank Wunderlich ha scritto: > > From: Frank Wunderlich <frank-w@public-files.de> > > > > The upcoming mt7988 has different temperature coefficients so we > > cannot use constants in the functions lvts_golden_temp_init, > > lvts_golden_temp_init and lvts_raw_to_temp anymore. > > > > Add a field in the lvts_ctrl pointing to the lvts_data which now > > contains the soc-specific temperature coefficents. > > > > Signed-off-by: Frank Wunderlich <frank-w@public-files.de> > > --- > > drivers/thermal/mediatek/lvts_thermal.c | 56 ++++++++++++++++++------- > > 1 file changed, 41 insertions(+), 15 deletions(-) > > > > diff --git a/drivers/thermal/mediatek/lvts_thermal.c b/drivers/thermal/mediatek/lvts_thermal.c > > index effd9b00a424..c1004b4da3b6 100644 > > --- a/drivers/thermal/mediatek/lvts_thermal.c > > +++ b/drivers/thermal/mediatek/lvts_thermal.c > > @@ -80,8 +80,8 @@ > > #define LVTS_SENSOR_MAX 4 > > #define LVTS_GOLDEN_TEMP_MAX 62 > > #define LVTS_GOLDEN_TEMP_DEFAULT 50 > > -#define LVTS_COEFF_A -250460 > > -#define LVTS_COEFF_B 250460 > > +#define LVTS_COEFF_A_MT8195 -250460 > > +#define LVTS_COEFF_B_MT8195 250460 > > > > #define LVTS_MSR_IMMEDIATE_MODE 0 > > #define LVTS_MSR_FILTERED_MODE 1 > > @@ -94,7 +94,7 @@ > > #define LVTS_MINIMUM_THRESHOLD 20000 > > > > static int golden_temp = LVTS_GOLDEN_TEMP_DEFAULT; > > -static int coeff_b = LVTS_COEFF_B; > > +static int coeff_b; > > This could be renamed to `golden_temp_offset` > > > > > struct lvts_sensor_data { > > int dt_id; > > @@ -109,9 +109,15 @@ struct lvts_ctrl_data { > > int mode; > > }; > > > > +struct formula_coeff { > > + int a; > > + int b; > > +}; > > + > > struct lvts_data { > > const struct lvts_ctrl_data *lvts_ctrl; > > int num_lvts_ctrl; > > + struct formula_coeff coeff; > > You can just add the coefficients here directly... and while at it you can > also make it self explanatory, because the "A" coefficient is a factor while > the "B" coefficient is just an offset. > > int temp_factor; <--- coeff_a > int temp_offset; <--- coeff_b makes sense...imho very good idea. originally i took the naming based on the Constants which maybe should be changed too? > > }; > > > > struct lvts_sensor { > > @@ -126,6 +132,7 @@ struct lvts_sensor { > > > > struct lvts_ctrl { > > struct lvts_sensor sensors[LVTS_SENSOR_MAX]; > > + const struct lvts_data *lvts_data; > > u32 calibration[LVTS_SENSOR_MAX]; > > u32 hw_tshut_raw_temp; > > int num_lvts_sensor; > > @@ -247,21 +254,21 @@ static void lvts_debugfs_exit(struct lvts_domain *lvts_td) { } > > > > #endif > > > > -static int lvts_raw_to_temp(u32 raw_temp) > > +static int lvts_raw_to_temp(u32 raw_temp, struct formula_coeff coeff) > > { > > int temperature; > > > > - temperature = ((s64)(raw_temp & 0xFFFF) * LVTS_COEFF_A) >> 14; > > + temperature = ((s64)(raw_temp & 0xFFFF) * coeff.a) >> 14; > > so that this also becomes more readable: > > static int lvts_raw_to_temp(u32 raw_temp, int temp_factor) > { > int temperature; > > temperature = ((s64)(raw_temp & 0xFFFF) * temp_factor) >> 14; > temperature += golden_temp_offset; > > return temperature; > } > > where temp_factor is lvts_data.temp_factor, and golden_temp_offset is a > rename of `static int coeff_b`. right and passing an int (instead of struct) is easier and more readable too. > Cheers, > Angelo > >
diff --git a/drivers/thermal/mediatek/lvts_thermal.c b/drivers/thermal/mediatek/lvts_thermal.c index effd9b00a424..c1004b4da3b6 100644 --- a/drivers/thermal/mediatek/lvts_thermal.c +++ b/drivers/thermal/mediatek/lvts_thermal.c @@ -80,8 +80,8 @@ #define LVTS_SENSOR_MAX 4 #define LVTS_GOLDEN_TEMP_MAX 62 #define LVTS_GOLDEN_TEMP_DEFAULT 50 -#define LVTS_COEFF_A -250460 -#define LVTS_COEFF_B 250460 +#define LVTS_COEFF_A_MT8195 -250460 +#define LVTS_COEFF_B_MT8195 250460 #define LVTS_MSR_IMMEDIATE_MODE 0 #define LVTS_MSR_FILTERED_MODE 1 @@ -94,7 +94,7 @@ #define LVTS_MINIMUM_THRESHOLD 20000 static int golden_temp = LVTS_GOLDEN_TEMP_DEFAULT; -static int coeff_b = LVTS_COEFF_B; +static int coeff_b; struct lvts_sensor_data { int dt_id; @@ -109,9 +109,15 @@ struct lvts_ctrl_data { int mode; }; +struct formula_coeff { + int a; + int b; +}; + struct lvts_data { const struct lvts_ctrl_data *lvts_ctrl; int num_lvts_ctrl; + struct formula_coeff coeff; }; struct lvts_sensor { @@ -126,6 +132,7 @@ struct lvts_sensor { struct lvts_ctrl { struct lvts_sensor sensors[LVTS_SENSOR_MAX]; + const struct lvts_data *lvts_data; u32 calibration[LVTS_SENSOR_MAX]; u32 hw_tshut_raw_temp; int num_lvts_sensor; @@ -247,21 +254,21 @@ static void lvts_debugfs_exit(struct lvts_domain *lvts_td) { } #endif -static int lvts_raw_to_temp(u32 raw_temp) +static int lvts_raw_to_temp(u32 raw_temp, struct formula_coeff coeff) { int temperature; - temperature = ((s64)(raw_temp & 0xFFFF) * LVTS_COEFF_A) >> 14; + temperature = ((s64)(raw_temp & 0xFFFF) * coeff.a) >> 14; temperature += coeff_b; return temperature; } -static u32 lvts_temp_to_raw(int temperature) +static u32 lvts_temp_to_raw(int temperature, struct formula_coeff coeff) { u32 raw_temp = ((s64)(coeff_b - temperature)) << 14; - raw_temp = div_s64(raw_temp, -LVTS_COEFF_A); + raw_temp = div_s64(raw_temp, -coeff.a); return raw_temp; } @@ -269,6 +276,9 @@ static u32 lvts_temp_to_raw(int temperature) static int lvts_get_temp(struct thermal_zone_device *tz, int *temp) { struct lvts_sensor *lvts_sensor = thermal_zone_device_priv(tz); + struct lvts_ctrl *lvts_ctrl = container_of(lvts_sensor, struct lvts_ctrl, + sensors[lvts_sensor->id]); + const struct lvts_data *lvts_data = lvts_ctrl->lvts_data; void __iomem *msr = lvts_sensor->msr; u32 value; int rc; @@ -301,7 +311,7 @@ static int lvts_get_temp(struct thermal_zone_device *tz, int *temp) if (rc) return -EAGAIN; - *temp = lvts_raw_to_temp(value & 0xFFFF); + *temp = lvts_raw_to_temp(value & 0xFFFF, lvts_data->coeff); return 0; } @@ -348,10 +358,13 @@ static bool lvts_should_update_thresh(struct lvts_ctrl *lvts_ctrl, int high) static int lvts_set_trips(struct thermal_zone_device *tz, int low, int high) { struct lvts_sensor *lvts_sensor = thermal_zone_device_priv(tz); - struct lvts_ctrl *lvts_ctrl = container_of(lvts_sensor, struct lvts_ctrl, sensors[lvts_sensor->id]); + struct lvts_ctrl *lvts_ctrl = container_of(lvts_sensor, struct lvts_ctrl, + sensors[lvts_sensor->id]); + const struct lvts_data *lvts_data = lvts_ctrl->lvts_data; void __iomem *base = lvts_sensor->base; - u32 raw_low = lvts_temp_to_raw(low != -INT_MAX ? low : LVTS_MINIMUM_THRESHOLD); - u32 raw_high = lvts_temp_to_raw(high); + u32 raw_low = lvts_temp_to_raw(low != -INT_MAX ? low : LVTS_MINIMUM_THRESHOLD, + lvts_data->coeff); + u32 raw_high = lvts_temp_to_raw(high, lvts_data->coeff); bool should_update_thresh; lvts_sensor->low_thresh = low; @@ -692,7 +705,7 @@ static int lvts_calibration_read(struct device *dev, struct lvts_domain *lvts_td return 0; } -static int lvts_golden_temp_init(struct device *dev, u32 *value) +static int lvts_golden_temp_init(struct device *dev, u32 *value, struct formula_coeff coeff) { u32 gt; @@ -701,7 +714,7 @@ static int lvts_golden_temp_init(struct device *dev, u32 *value) if (gt && gt < LVTS_GOLDEN_TEMP_MAX) golden_temp = gt; - coeff_b = golden_temp * 500 + LVTS_COEFF_B; + coeff_b = golden_temp * 500 + coeff.b; return 0; } @@ -724,7 +737,7 @@ static int lvts_ctrl_init(struct device *dev, struct lvts_domain *lvts_td, * The golden temp information is contained in the first chunk * of efuse data. */ - ret = lvts_golden_temp_init(dev, (u32 *)lvts_td->calib); + ret = lvts_golden_temp_init(dev, (u32 *)lvts_td->calib, lvts_data->coeff); if (ret) return ret; @@ -735,6 +748,7 @@ static int lvts_ctrl_init(struct device *dev, struct lvts_domain *lvts_td, for (i = 0; i < lvts_data->num_lvts_ctrl; i++) { lvts_ctrl[i].base = lvts_td->base + lvts_data->lvts_ctrl[i].offset; + lvts_ctrl[i].lvts_data = lvts_data; ret = lvts_sensor_init(dev, &lvts_ctrl[i], &lvts_data->lvts_ctrl[i]); @@ -758,7 +772,7 @@ static int lvts_ctrl_init(struct device *dev, struct lvts_domain *lvts_td, * after initializing the calibration. */ lvts_ctrl[i].hw_tshut_raw_temp = - lvts_temp_to_raw(lvts_data->lvts_ctrl[i].hw_tshut_temp); + lvts_temp_to_raw(lvts_data->lvts_ctrl[i].hw_tshut_temp, lvts_data->coeff); lvts_ctrl[i].low_thresh = INT_MIN; lvts_ctrl[i].high_thresh = INT_MIN; @@ -1223,6 +1237,8 @@ static int lvts_probe(struct platform_device *pdev) if (irq < 0) return irq; + coeff_b = lvts_data->coeff.b; + ret = lvts_domain_init(dev, lvts_td, lvts_data); if (ret) return dev_err_probe(dev, ret, "Failed to initialize the lvts domain\n"); @@ -1338,11 +1354,21 @@ static const struct lvts_ctrl_data mt8195_lvts_ap_data_ctrl[] = { static const struct lvts_data mt8195_lvts_mcu_data = { .lvts_ctrl = mt8195_lvts_mcu_data_ctrl, .num_lvts_ctrl = ARRAY_SIZE(mt8195_lvts_mcu_data_ctrl), + + .coeff = { + .a = LVTS_COEFF_A_MT8195, + .b = LVTS_COEFF_B_MT8195, + }, }; static const struct lvts_data mt8195_lvts_ap_data = { .lvts_ctrl = mt8195_lvts_ap_data_ctrl, .num_lvts_ctrl = ARRAY_SIZE(mt8195_lvts_ap_data_ctrl), + + .coeff = { + .a = LVTS_COEFF_A_MT8195, + .b = LVTS_COEFF_B_MT8195, + }, }; static const struct of_device_id lvts_of_match[] = {