@@ -36,6 +36,10 @@
#define SVSB_CCI BIT(2)
#define SVSB_GPU BIT(3)
+/* svs bank 2-line type */
+#define SVSB_LOW BIT(4)
+#define SVSB_HIGH BIT(5)
+
/* svs bank mode support */
#define SVSB_MODE_ALL_DISABLE 0
#define SVSB_MODE_INIT01 BIT(1)
@@ -280,6 +284,7 @@ struct thermal_parameter {
* @volts: bank voltages
* @reg_data: bank register data of each phase
* @freq_base: reference frequency for bank init
+ * @turn_freq_base: refenrece frequency for turn point
* @vboot: voltage request for bank init01 stage only
* @volt_step: bank voltage step
* @volt_base: bank voltage base
@@ -300,6 +305,8 @@ struct thermal_parameter {
* @hw_id: bank hardware identification
* @ctl0: bank thermal sensor selection
* @cpu_id: cpu core id for SVS CPU only
+ * @turn_pt: turn point informs which opp_volt calculated by high/low bank.
+ * @type: bank type to represent it is 2-line (high/low) bank or 1-line bank.
*
* Other structure members which are not listed above are svs platform
* efuse data for bank init
@@ -325,6 +332,7 @@ struct svs_bank {
u32 volts[16];
u32 reg_data[SVSB_PHASE_NUM][SVS_REG_NUM];
u32 freq_base;
+ u32 turn_freq_base;
u32 vboot;
u32 volt_step;
u32 volt_base;
@@ -364,6 +372,8 @@ struct svs_bank {
u32 hw_id;
u32 ctl0;
u32 cpu_id;
+ u32 turn_pt;
+ u32 type;
};
/*
@@ -441,6 +451,37 @@ static u32 svs_bank_volt_to_opp_volt(u32 svsb_volt, u32 svsb_volt_step,
return (svsb_volt * svsb_volt_step) + svsb_volt_base;
}
+static u32 svs_opp_volt_to_bank_volt(u32 opp_u_volt, u32 svsb_volt_step,
+ u32 svsb_volt_base)
+{
+ return (opp_u_volt - svsb_volt_base) / svsb_volt_step;
+}
+
+static int svs_sync_bank_volts_from_opp(struct svs_bank *svsb)
+{
+ struct dev_pm_opp *opp;
+ u32 i, opp_u_volt;
+
+ for (i = 0; i < svsb->opp_count; i++) {
+ opp = dev_pm_opp_find_freq_exact(svsb->opp_dev,
+ svsb->opp_freqs[i],
+ true);
+ if (IS_ERR(opp)) {
+ dev_err(svsb->dev, "cannot find freq = %u (%ld)\n",
+ svsb->opp_freqs[i], PTR_ERR(opp));
+ return PTR_ERR(opp);
+ }
+
+ opp_u_volt = dev_pm_opp_get_voltage(opp);
+ svsb->volts[i] = svs_opp_volt_to_bank_volt(opp_u_volt,
+ svsb->volt_step,
+ svsb->volt_base);
+ dev_pm_opp_put(opp);
+ }
+
+ return 0;
+}
+
static int svs_get_bank_zone_temperature(const char *tzone_name,
int *tzone_temp)
{
@@ -456,7 +497,7 @@ static int svs_get_bank_zone_temperature(const char *tzone_name,
static int svs_adjust_pm_opp_volts(struct svs_bank *svsb, bool force_update)
{
int tzone_temp, ret = -EPERM;
- u32 i, svsb_volt, opp_volt, temp_offset = 0;
+ u32 i, svsb_volt, opp_volt, temp_offset = 0, opp_start, opp_stop;
mutex_lock(&svsb->lock);
@@ -470,6 +511,21 @@ static int svs_adjust_pm_opp_volts(struct svs_bank *svsb, bool force_update)
goto unlock_mutex;
}
+ /*
+ * 2-line bank updates its corresponding opp volts.
+ * 1-line bank updates all opp volts.
+ */
+ if (svsb->type == SVSB_HIGH) {
+ opp_start = 0;
+ opp_stop = svsb->turn_pt;
+ } else if (svsb->type == SVSB_LOW) {
+ opp_start = svsb->turn_pt;
+ opp_stop = svsb->opp_count;
+ } else {
+ opp_start = 0;
+ opp_stop = svsb->opp_count;
+ }
+
/* Get thermal effect */
if (svsb->phase == SVSB_PHASE_MON) {
if (svsb->temp > svsb->temp_upper_bound &&
@@ -491,10 +547,16 @@ static int svs_adjust_pm_opp_volts(struct svs_bank *svsb, bool force_update)
temp_offset += svsb->tzone_high_temp_offset;
else if (tzone_temp <= svsb->tzone_low_temp)
temp_offset += svsb->tzone_low_temp_offset;
+
+ /* 2-line bank takes thermal factor to update all opp volts */
+ if (svsb->type == SVSB_HIGH || svsb->type == SVSB_LOW) {
+ opp_start = 0;
+ opp_stop = svsb->opp_count;
+ }
}
/* vmin <= svsb_volt (opp_volt) <= signed-off (default) voltage */
- for (i = 0; i < svsb->opp_count; i++) {
+ for (i = opp_start; i < opp_stop; i++) {
if (svsb->phase == SVSB_PHASE_MON) {
svsb_volt = max(svsb->volts[i] + svsb->volt_offset +
temp_offset, svsb->vmin);
@@ -545,6 +607,181 @@ static u32 interpolate(u32 f0, u32 f1, u32 v0, u32 v1, u32 fx)
return DIV_ROUND_UP(vx, 100);
}
+static void svs_get_vops_v3(struct svs_platform *svsp)
+{
+ struct svs_bank *svsb = svsp->pbank;
+ u32 i, vop_i, *vop, vop74, vop30, mask7_0 = GENMASK(7, 0);
+ u32 b_sft, bits8 = 8, shift_byte = 0, reg_4bytes = 4;
+ u32 middle_index = (svsb->opp_count / 2);
+ u32 opp_start = 0, opp_stop = 0, turn_pt = svsb->turn_pt;
+
+ /* get vops v3 doesn't use mon mode voltages */
+ if (svsb->phase == SVSB_PHASE_MON)
+ return;
+
+ vop74 = svs_readl(svsp, VOP74);
+ vop30 = svs_readl(svsp, VOP30);
+
+ if (turn_pt < middle_index) {
+ if (svsb->type == SVSB_HIGH) {
+ /* We attain volts[0 ~ (turn_pt - 1)] */
+ for (i = 0; i < turn_pt; i++) {
+ b_sft = bits8 * (shift_byte % reg_4bytes);
+ vop = (shift_byte < reg_4bytes) ? &vop30 :
+ &vop74;
+ svsb->volts[i] = (*vop >> b_sft) & mask7_0;
+ shift_byte++;
+ }
+ } else if (svsb->type == SVSB_LOW) {
+ /*
+ * We attain volts[turn_pt] +
+ * volts[vop_i ~ (opp_count - 1)]
+ */
+ vop_i = svsb->opp_count - 7;
+ svsb->volts[turn_pt] = vop30 & mask7_0;
+ shift_byte++;
+ for (i = vop_i; i < svsb->opp_count; i++) {
+ b_sft = bits8 * (shift_byte % reg_4bytes);
+ vop = (shift_byte < reg_4bytes) ? &vop30 :
+ &vop74;
+ svsb->volts[i] = (*vop >> b_sft) & mask7_0;
+ shift_byte++;
+ }
+
+ /*
+ * We attain volts[turn_pt + 1 ~ (vop_i - 1)]
+ * by interpolate
+ */
+ for (i = turn_pt + 1; i < vop_i; i++)
+ svsb->volts[i] =
+ interpolate(svsb->freqs_pct[turn_pt],
+ svsb->freqs_pct[vop_i],
+ svsb->volts[turn_pt],
+ svsb->volts[vop_i],
+ svsb->freqs_pct[i]);
+ }
+ } else {
+ if (svsb->type == SVSB_HIGH) {
+ /* We attain volts[0] + volts[vop_i ~ (turn_pt - 1)] */
+ vop_i = turn_pt - 7;
+ svsb->volts[0] = vop30 & mask7_0;
+ shift_byte++;
+ for (i = vop_i; i < turn_pt; i++) {
+ b_sft = bits8 * (shift_byte % reg_4bytes);
+ vop = (shift_byte < reg_4bytes) ? &vop30 :
+ &vop74;
+ svsb->volts[i] = (*vop >> b_sft) & mask7_0;
+ shift_byte++;
+ }
+
+ /* We attain volts[1 ~ (vop_i - 1)] by interpolate */
+ for (i = 1; i < vop_i; i++)
+ svsb->volts[i] =
+ interpolate(svsb->freqs_pct[0],
+ svsb->freqs_pct[vop_i],
+ svsb->volts[0],
+ svsb->volts[vop_i],
+ svsb->freqs_pct[i]);
+ } else if (svsb->type == SVSB_LOW) {
+ /* We attain volts[turn_pt ~ (opp_count - 1)] */
+ for (i = turn_pt; i < svsb->opp_count; i++) {
+ b_sft = bits8 * (shift_byte % reg_4bytes);
+ vop = (shift_byte < reg_4bytes) ? &vop30 :
+ &vop74;
+ svsb->volts[i] = (*vop >> b_sft) & mask7_0;
+ shift_byte++;
+ }
+ }
+ }
+
+ if (svsb->type == SVSB_HIGH) {
+ opp_start = 0;
+ opp_stop = svsb->turn_pt;
+ } else if (svsb->type == SVSB_LOW) {
+ opp_start = svsb->turn_pt;
+ opp_stop = svsb->opp_count;
+ }
+
+ for (i = opp_start; i < opp_stop; i++)
+ svsb->volts[i] -= svsb->dvt_fixed;
+}
+
+static void svs_set_freqs_pct_v3(struct svs_platform *svsp)
+{
+ struct svs_bank *svsb = svsp->pbank;
+ u32 i, freq_i, *freq_pct, freq_pct74 = 0, freq_pct30 = 0;
+ u32 b_sft, bits8 = 8, shift_byte = 0, reg_4bytes = 4;
+ u32 middle_index = (svsb->opp_count / 2), mask7_0 = GENMASK(7, 0);
+ u32 turn_pt = middle_index;
+
+ for (i = 0; i < svsb->opp_count; i++) {
+ if (svsb->opp_freqs[i] <= svsb->turn_freq_base) {
+ svsb->turn_pt = i;
+ break;
+ }
+ }
+
+ turn_pt = svsb->turn_pt;
+
+ /* Target is to fill out freq_pct74 / freq_pct30 */
+ if (turn_pt < middle_index) {
+ if (svsb->type == SVSB_HIGH) {
+ /* We select freqs_pct[0 ~ (turn_pt - 1)] */
+ for (i = 0; i < turn_pt; i++) {
+ b_sft = bits8 * (shift_byte % reg_4bytes);
+ freq_pct = (shift_byte < reg_4bytes) ?
+ &freq_pct30 : &freq_pct74;
+ *freq_pct |= (svsb->freqs_pct[i] << b_sft);
+ shift_byte++;
+ }
+ } else if (svsb->type == SVSB_LOW) {
+ /*
+ * We select freqs_pct[turn_pt] +
+ * freqs_pct[(opp_count - 7) ~ (opp_count -1)]
+ */
+ freq_pct30 = svsb->freqs_pct[turn_pt] & mask7_0;
+ shift_byte++;
+ freq_i = svsb->opp_count - 7;
+ for (i = freq_i; i < svsb->opp_count; i++) {
+ b_sft = bits8 * (shift_byte % reg_4bytes);
+ freq_pct = (shift_byte < reg_4bytes) ?
+ &freq_pct30 : &freq_pct74;
+ *freq_pct |= (svsb->freqs_pct[i] << b_sft);
+ shift_byte++;
+ }
+ }
+ } else {
+ if (svsb->type == SVSB_HIGH) {
+ /*
+ * We select freqs_pct[0] +
+ * freqs_pct[(turn_pt - 7) ~ (turn_pt - 1)]
+ */
+ freq_pct30 = svsb->freqs_pct[0] & mask7_0;
+ shift_byte++;
+ freq_i = turn_pt - 7;
+ for (i = freq_i; i < turn_pt; i++) {
+ b_sft = bits8 * (shift_byte % reg_4bytes);
+ freq_pct = (shift_byte < reg_4bytes) ?
+ &freq_pct30 : &freq_pct74;
+ *freq_pct |= (svsb->freqs_pct[i] << b_sft);
+ shift_byte++;
+ }
+ } else if (svsb->type == SVSB_LOW) {
+ /* We select freqs_pct[turn_pt ~ (opp_count - 1)] */
+ for (i = turn_pt; i < svsb->opp_count; i++) {
+ b_sft = bits8 * (shift_byte % reg_4bytes);
+ freq_pct = (shift_byte < reg_4bytes) ?
+ &freq_pct30 : &freq_pct74;
+ *freq_pct |= (svsb->freqs_pct[i] << b_sft);
+ shift_byte++;
+ }
+ }
+ }
+
+ svs_writel(svsp, freq_pct74, FREQPCT74);
+ svs_writel(svsp, freq_pct30, FREQPCT30);
+}
+
static void svs_get_vops_v2(struct svs_platform *svsp)
{
struct svs_bank *svsb = svsp->pbank;
@@ -856,6 +1093,25 @@ static int svs_init02(struct svs_platform *svsp)
}
}
+ /*
+ * 2-line high/low bank update its corresponding opp voltages only.
+ * Therefore, we sync voltages from opp for high/low bank voltages
+ * consistency.
+ */
+ for (idx = 0; idx < svsp->bank_num; idx++) {
+ svsb = &svsp->banks[idx];
+
+ if (!(svsb->mode_support & SVSB_MODE_INIT02))
+ continue;
+
+ if (svsb->type == SVSB_HIGH || svsb->type == SVSB_LOW) {
+ if (svs_sync_bank_volts_from_opp(svsb)) {
+ dev_err(svsb->dev, "sync volt fail\n");
+ return -EPERM;
+ }
+ }
+ }
+
return 0;
}
@@ -1099,7 +1355,12 @@ static int svs_resource_setup(struct svs_platform *svsp)
svsb->name = "SVSB_CCI";
break;
case SVSB_GPU:
- svsb->name = "SVSB_GPU";
+ if (svsb->type == SVSB_HIGH)
+ svsb->name = "SVSB_GPU_HIGH";
+ else if (svsb->type == SVSB_LOW)
+ svsb->name = "SVSB_GPU_LOW";
+ else
+ svsb->name = "SVSB_GPU";
break;
default:
WARN_ON(1);
@@ -1161,6 +1422,88 @@ static int svs_resource_setup(struct svs_platform *svsp)
return 0;
}
+static bool svs_mt8192_efuse_parsing(struct svs_platform *svsp)
+{
+ struct svs_bank *svsb;
+ struct nvmem_cell *cell;
+ u32 idx, i, ft_pgm, vmin, golden_temp;
+
+ for (i = 0; i < svsp->efuse_num; i++)
+ if (svsp->efuse[i])
+ dev_info(svsp->dev, "M_HW_RES%d: 0x%08x\n",
+ i, svsp->efuse[i]);
+
+ /* Svs efuse parsing */
+ ft_pgm = svsp->efuse[0] & GENMASK(7, 0);
+ vmin = (svsp->efuse[19] >> 4) & GENMASK(1, 0);
+
+ for (idx = 0; idx < svsp->bank_num; idx++) {
+ svsb = &svsp->banks[idx];
+
+ if (svsb->sw_id != SVSB_GPU)
+ return false;
+
+ if (vmin == 0x1)
+ svsb->vmin = 0x1e;
+
+ if (ft_pgm == 0)
+ svsb->init01_volt_flag = SVSB_INIT01_VOLT_IGNORE;
+
+ if (svsb->type == SVSB_LOW) {
+ svsb->mtdes = svsp->efuse[10] & GENMASK(7, 0);
+ svsb->bdes = (svsp->efuse[10] >> 16) & GENMASK(7, 0);
+ svsb->mdes = (svsp->efuse[10] >> 24) & GENMASK(7, 0);
+ svsb->dcbdet = (svsp->efuse[17]) & GENMASK(7, 0);
+ svsb->dcmdet = (svsp->efuse[17] >> 8) & GENMASK(7, 0);
+ svsb->vmax += svsb->dvt_fixed;
+ } else if (svsb->type == SVSB_HIGH) {
+ svsb->mtdes = svsp->efuse[9] & GENMASK(7, 0);
+ svsb->bdes = (svsp->efuse[9] >> 16) & GENMASK(7, 0);
+ svsb->mdes = (svsp->efuse[9] >> 24) & GENMASK(7, 0);
+ svsb->dcbdet = (svsp->efuse[17] >> 16) & GENMASK(7, 0);
+ svsb->dcmdet = (svsp->efuse[17] >> 24) & GENMASK(7, 0);
+ svsb->vmax += svsb->dvt_fixed;
+ }
+ }
+
+ /* Thermal efuse parsing */
+ cell = nvmem_cell_get(svsp->dev, "t-calibration-data");
+ if (IS_ERR_OR_NULL(cell)) {
+ dev_err(svsp->dev, "no thermal cell, no mon mode\n");
+ for (idx = 0; idx < svsp->bank_num; idx++) {
+ svsb = &svsp->banks[idx];
+ svsb->mode_support &= ~SVSB_MODE_MON;
+ }
+
+ return true;
+ }
+
+ svsp->tefuse = nvmem_cell_read(cell, &svsp->tefuse_num);
+ svsp->tefuse_num /= sizeof(u32);
+ nvmem_cell_put(cell);
+
+ for (i = 0; i < svsp->tefuse_num; i++)
+ if (svsp->tefuse[i] != 0)
+ break;
+
+ if (i == svsp->tefuse_num)
+ golden_temp = 50; /* All thermal efuse data are 0 */
+ else
+ golden_temp = (svsp->tefuse[0] >> 24) & GENMASK(7, 0);
+
+ for (idx = 0; idx < svsp->bank_num; idx++) {
+ svsb = &svsp->banks[idx];
+
+ if (svsb->sw_id != SVSB_GPU)
+ return false;
+
+ svsb->mts = 500;
+ svsb->bts = (((500 * golden_temp + 250460) / 1000) - 25) * 4;
+ }
+
+ return true;
+}
+
static bool svs_mt8183_efuse_parsing(struct svs_platform *svsp)
{
struct thermal_parameter tp;
@@ -1583,10 +1926,11 @@ static int svs_status_debug_show(struct seq_file *m, void *v)
ret = svs_get_bank_zone_temperature(svsb->tzone_name, &tzone_temp);
if (ret)
- seq_printf(m, "%s: no \"%s\" zone?\n", svsb->name,
- svsb->tzone_name);
+ seq_printf(m, "%s: no \"%s\" zone? turn_pt = %u\n",
+ svsb->name, svsb->tzone_name, svsb->turn_pt);
else
- seq_printf(m, "%s: temperature = %d\n", svsb->name, tzone_temp);
+ seq_printf(m, "%s: temperature = %d, turn_pt = %u\n",
+ svsb->name, tzone_temp, svsb->turn_pt);
for (i = 0; i < svsb->opp_count; i++) {
opp = dev_pm_opp_find_freq_exact(svsb->opp_dev,
@@ -1719,6 +2063,81 @@ static int svs_create_svs_debug_cmds(struct svs_platform *svsp)
return 0;
}
+static struct svs_bank svs_mt8192_banks[] = {
+ {
+ .sw_id = SVSB_GPU,
+ .hw_id = 0,
+ .tzone_name = "gpu1",
+ .buck_name = "mali",
+ .mode_support = SVSB_MODE_INIT02,
+ .opp_count = 14,
+ .freq_base = 688000000,
+ .turn_freq_base = 688000000,
+ .vboot = 0x38,
+ .volt_step = 6250,
+ .volt_base = 400000,
+ .volt_offset = 0,
+ .vmax = 0x60,
+ .vmin = 0x1a,
+ .dthi = 0x1,
+ .dtlo = 0xfe,
+ .det_window = 0xa28,
+ .det_max = 0xffff,
+ .age_config = 0x555555,
+ .agem = 0,
+ .dc_config = 0x1,
+ .dvt_fixed = 0x1,
+ .vco = 0x18,
+ .chk_shift = 0x87,
+ .temp_upper_bound = 0x64,
+ .temp_lower_bound = 0xb2,
+ .tzone_high_temp = 85000,
+ .tzone_high_temp_offset = 0,
+ .tzone_low_temp = 25000,
+ .tzone_low_temp_offset = 7,
+ .core_sel = 0x0fff0100,
+ .int_st = BIT(0),
+ .ctl0 = 0x00540003,
+ .type = SVSB_LOW,
+ },
+ {
+ .sw_id = SVSB_GPU,
+ .hw_id = 1,
+ .tzone_name = "gpu1",
+ .buck_name = "mali",
+ .mode_support = SVSB_MODE_INIT02 | SVSB_MODE_MON,
+ .opp_count = 14,
+ .freq_base = 902000000,
+ .turn_freq_base = 688000000,
+ .vboot = 0x38,
+ .volt_step = 6250,
+ .volt_base = 400000,
+ .volt_offset = 0,
+ .vmax = 0x60,
+ .vmin = 0x1a,
+ .dthi = 0x1,
+ .dtlo = 0xfe,
+ .det_window = 0xa28,
+ .det_max = 0xffff,
+ .age_config = 0x555555,
+ .agem = 0,
+ .dc_config = 0x1,
+ .dvt_fixed = 0x6,
+ .vco = 0x18,
+ .chk_shift = 0x87,
+ .temp_upper_bound = 0x64,
+ .temp_lower_bound = 0xb2,
+ .tzone_high_temp = 85000,
+ .tzone_high_temp_offset = 0,
+ .tzone_low_temp = 25000,
+ .tzone_low_temp_offset = 7,
+ .core_sel = 0x0fff0101,
+ .int_st = BIT(1),
+ .ctl0 = 0x00540003,
+ .type = SVSB_HIGH,
+ },
+};
+
static struct svs_bank svs_mt8183_banks[] = {
{
.sw_id = SVSB_CPU_LITTLE,
@@ -1865,6 +2284,48 @@ static struct svs_bank svs_mt8183_banks[] = {
},
};
+static int svs_get_svs_mt8192_platform_data(struct svs_platform *svsp)
+{
+ struct device *dev;
+ struct svs_bank *svsb;
+ u32 idx;
+
+ svsp->name = "mt8192-svs";
+ svsp->banks = svs_mt8192_banks;
+ svsp->efuse_parsing = svs_mt8192_efuse_parsing;
+ svsp->set_freqs_pct = svs_set_freqs_pct_v3;
+ svsp->get_vops = svs_get_vops_v3;
+ svsp->regs = svs_regs_v2;
+ svsp->irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT;
+ svsp->bank_num = ARRAY_SIZE(svs_mt8192_banks);
+ svsp->efuse_check = 9;
+
+ svsp->rst = devm_reset_control_get_optional(svsp->dev, "svs_rst");
+ if (IS_ERR(svsp->rst)) {
+ dev_err_probe(svsp->dev, PTR_ERR(svsp->rst),
+ "cannot get svs reset control\n");
+ return PTR_ERR(svsp->rst);
+ }
+
+ dev = svs_add_device_link(svsp, "lvts");
+ if (IS_ERR(dev))
+ return PTR_ERR(dev);
+
+ for (idx = 0; idx < svsp->bank_num; idx++) {
+ svsb = &svsp->banks[idx];
+
+ if (svsb->type == SVSB_HIGH)
+ svsb->opp_dev = svs_add_device_link(svsp, "mali");
+ else if (svsb->type == SVSB_LOW)
+ svsb->opp_dev = svs_get_subsys_device(svsp, "mali");
+
+ if (IS_ERR(svsb->opp_dev))
+ return PTR_ERR(svsb->opp_dev);
+ }
+
+ return 0;
+}
+
static int svs_get_svs_mt8183_platform_data(struct svs_platform *svsp)
{
struct device *dev;
@@ -1920,6 +2381,9 @@ static const struct of_device_id mtk_svs_of_match[] = {
{
.compatible = "mediatek,mt8183-svs",
.data = &svs_get_svs_mt8183_platform_data,
+ }, {
+ .compatible = "mediatek,mt8192-svs",
+ .data = &svs_get_svs_mt8192_platform_data,
}, {
/* Sentinel */
},
Signed-off-by: Roger Lu <roger.lu@mediatek.com> --- drivers/soc/mediatek/mtk-svs.c | 476 ++++++++++++++++++++++++++++++++- 1 file changed, 470 insertions(+), 6 deletions(-)