Skip to content

L
linux
Commit 259919b3 authored by AngeloGioacchino Del Regno's avatar AngeloGioacchino Del Regno
Browse files
Options

soc: mediatek: mtk-svs: Convert sw_id and type to enumerations 

The sw_id and type specifiers currently are defined as BIT(x) for
unknown reasons: nothing in this code makes any AND/OR check for
those, and that would never happen anyway because both sw_id and
type are exclusive, as in:
 - There will never be a bank that is for both CPU and GPU, or
   for CPU and CCI together;
 - A bank cannot be contemporarily of one-line and two-line type,
   as much as it cannot contemporarily have both HIGH and LOW roles

Change those definitions to enumerations and also add some kerneldoc
to better describe what they are for and what they indicate.

While at it, also change the names adding _SWID or _TYPE to increase
human readability.

Link: https://lore.kernel.org/r/20231121125044.78642-4-angelogioacchino.delregno@collabora.comSigned-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
parent 40d59dc9
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 86 deletions
drivers/soc/mediatek/mtk-svs.c
View file @ 259919b3
...@@ -32,16 +32,6 @@ ...@@ -32,16 +32,6 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/thermal.h> #include <linux/thermal.h>
/* svs bank 1-line software id */
#define SVSB_CPU_LITTLE BIT(0)
#define SVSB_CPU_BIG BIT(1)
#define SVSB_CCI BIT(2)
#define SVSB_GPU BIT(3)
/* svs bank 2-line type */
#define SVSB_LOW BIT(8)
#define SVSB_HIGH BIT(9)
/* svs bank mode support */ /* svs bank mode support */
#define SVSB_MODE_ALL_DISABLE 0 #define SVSB_MODE_ALL_DISABLE 0
#define SVSB_MODE_INIT01 BIT(1) #define SVSB_MODE_INIT01 BIT(1)
...@@ -174,6 +164,36 @@ static DEFINE_SPINLOCK(svs_lock); ...@@ -174,6 +164,36 @@ static DEFINE_SPINLOCK(svs_lock);
#define svs_dentry_data(name) {__stringify(name), &svs_##name##_debug_fops} #define svs_dentry_data(name) {__stringify(name), &svs_##name##_debug_fops}
#endif #endif
/**
* enum svsb_sw_id - SVS Bank Software ID
* @SVSB_SWID_CPU_LITTLE: CPU little cluster Bank
* @SVSB_SWID_CPU_BIG: CPU big cluster Bank
* @SVSB_SWID_CCI: Cache Coherent Interconnect Bank
* @SVSB_SWID_GPU: GPU Bank
* @SVSB_SWID_MAX: Total number of Banks
*/
enum svsb_sw_id {
SVSB_SWID_CPU_LITTLE,
SVSB_SWID_CPU_BIG,
SVSB_SWID_CCI,
SVSB_SWID_GPU,
SVSB_SWID_MAX
};
/**
* enum svsb_type - SVS Bank 2-line: Type and Role
* @SVSB_TYPE_NONE: One-line type Bank - Global role
* @SVSB_TYPE_LOW: Two-line type Bank - Low bank role
* @SVSB_TYPE_HIGH: Two-line type Bank - High bank role
* @SVSB_TYPE_MAX: Total number of bank types
*/
enum svsb_type {
SVSB_TYPE_NONE,
SVSB_TYPE_LOW,
SVSB_TYPE_HIGH,
SVSB_TYPE_MAX
};
/** /**
* enum svsb_phase - svs bank phase enumeration * enum svsb_phase - svs bank phase enumeration
* @SVSB_PHASE_ERROR: svs bank encounters unexpected condition * @SVSB_PHASE_ERROR: svs bank encounters unexpected condition
...@@ -549,10 +569,10 @@ static int svs_adjust_pm_opp_volts(struct svs_bank *svsb) ...@@ -549,10 +569,10 @@ static int svs_adjust_pm_opp_volts(struct svs_bank *svsb)
* 2-line bank updates its corresponding opp volts. * 2-line bank updates its corresponding opp volts.
* 1-line bank updates all opp volts. * 1-line bank updates all opp volts.
*/ */
if (svsb->type == SVSB_HIGH) { if (svsb->type == SVSB_TYPE_HIGH) {
opp_start = 0; opp_start = 0;
opp_stop = svsb->turn_pt; opp_stop = svsb->turn_pt;
} else if (svsb->type == SVSB_LOW) { } else if (svsb->type == SVSB_TYPE_LOW) {
opp_start = svsb->turn_pt; opp_start = svsb->turn_pt;
opp_stop = svsb->opp_count; opp_stop = svsb->opp_count;
} else { } else {
...@@ -576,8 +596,8 @@ static int svs_adjust_pm_opp_volts(struct svs_bank *svsb) ...@@ -576,8 +596,8 @@ static int svs_adjust_pm_opp_volts(struct svs_bank *svsb)
temp_voffset += svsb->tzone_ltemp_voffset; temp_voffset += svsb->tzone_ltemp_voffset;
/* 2-line bank update all opp volts when running mon mode */ /* 2-line bank update all opp volts when running mon mode */
if (svsb->phase == SVSB_PHASE_MON && (svsb->type == SVSB_HIGH || if (svsb->phase == SVSB_PHASE_MON && (svsb->type == SVSB_TYPE_HIGH ||
svsb->type == SVSB_LOW)) { svsb->type == SVSB_TYPE_LOW)) {
opp_start = 0; opp_start = 0;
opp_stop = svsb->opp_count; opp_stop = svsb->opp_count;
} }
...@@ -881,7 +901,7 @@ static void svs_get_bank_volts_v3(struct svs_platform *svsp) ...@@ -881,7 +901,7 @@ static void svs_get_bank_volts_v3(struct svs_platform *svsp)
/* Target is to set svsb->volt[] by algorithm */ /* Target is to set svsb->volt[] by algorithm */
if (turn_pt < middle_index) { if (turn_pt < middle_index) {
if (svsb->type == SVSB_HIGH) { if (svsb->type == SVSB_TYPE_HIGH) {
/* volt[0] ~ volt[turn_pt - 1] */ /* volt[0] ~ volt[turn_pt - 1] */
for (i = 0; i < turn_pt; i++) { for (i = 0; i < turn_pt; i++) {
b_sft = BITS8 * (shift_byte % REG_BYTES); b_sft = BITS8 * (shift_byte % REG_BYTES);
...@@ -890,7 +910,7 @@ static void svs_get_bank_volts_v3(struct svs_platform *svsp) ...@@ -890,7 +910,7 @@ static void svs_get_bank_volts_v3(struct svs_platform *svsp)
svsb->volt[i] = (*vop >> b_sft) & GENMASK(7, 0); svsb->volt[i] = (*vop >> b_sft) & GENMASK(7, 0);
shift_byte++; shift_byte++;
} }
} else if (svsb->type == SVSB_LOW) { } else if (svsb->type == SVSB_TYPE_LOW) {
/* volt[turn_pt] + volt[j] ~ volt[opp_count - 1] */ /* volt[turn_pt] + volt[j] ~ volt[opp_count - 1] */
j = svsb->opp_count - 7; j = svsb->opp_count - 7;
svsb->volt[turn_pt] = FIELD_GET(SVSB_VOPS_FLD_VOP0_4, vop30); svsb->volt[turn_pt] = FIELD_GET(SVSB_VOPS_FLD_VOP0_4, vop30);
...@@ -912,7 +932,7 @@ static void svs_get_bank_volts_v3(struct svs_platform *svsp) ...@@ -912,7 +932,7 @@ static void svs_get_bank_volts_v3(struct svs_platform *svsp)
svsb->freq_pct[i]); svsb->freq_pct[i]);
} }
} else { } else {
if (svsb->type == SVSB_HIGH) { if (svsb->type == SVSB_TYPE_HIGH) {
/* volt[0] + volt[j] ~ volt[turn_pt - 1] */ /* volt[0] + volt[j] ~ volt[turn_pt - 1] */
j = turn_pt - 7; j = turn_pt - 7;
svsb->volt[0] = FIELD_GET(SVSB_VOPS_FLD_VOP0_4, vop30); svsb->volt[0] = FIELD_GET(SVSB_VOPS_FLD_VOP0_4, vop30);
...@@ -932,7 +952,7 @@ static void svs_get_bank_volts_v3(struct svs_platform *svsp) ...@@ -932,7 +952,7 @@ static void svs_get_bank_volts_v3(struct svs_platform *svsp)
svsb->volt[0], svsb->volt[0],
svsb->volt[j], svsb->volt[j],
svsb->freq_pct[i]); svsb->freq_pct[i]);
} else if (svsb->type == SVSB_LOW) { } else if (svsb->type == SVSB_TYPE_LOW) {
/* volt[turn_pt] ~ volt[opp_count - 1] */ /* volt[turn_pt] ~ volt[opp_count - 1] */
for (i = turn_pt; i < svsb->opp_count; i++) { for (i = turn_pt; i < svsb->opp_count; i++) {
b_sft = BITS8 * (shift_byte % REG_BYTES); b_sft = BITS8 * (shift_byte % REG_BYTES);
...@@ -944,10 +964,10 @@ static void svs_get_bank_volts_v3(struct svs_platform *svsp) ...@@ -944,10 +964,10 @@ static void svs_get_bank_volts_v3(struct svs_platform *svsp)
} }
} }
if (svsb->type == SVSB_HIGH) { if (svsb->type == SVSB_TYPE_HIGH) {
opp_start = 0; opp_start = 0;
opp_stop = svsb->turn_pt; opp_stop = svsb->turn_pt;
} else if (svsb->type == SVSB_LOW) { } else if (svsb->type == SVSB_TYPE_LOW) {
opp_start = svsb->turn_pt; opp_start = svsb->turn_pt;
opp_stop = svsb->opp_count; opp_stop = svsb->opp_count;
} }
...@@ -998,11 +1018,11 @@ static void svs_set_bank_freq_pct_v3(struct svs_platform *svsp) ...@@ -998,11 +1018,11 @@ static void svs_set_bank_freq_pct_v3(struct svs_platform *svsp)
/* Target is to fill out freq_pct74 / freq_pct30 by algorithm */ /* Target is to fill out freq_pct74 / freq_pct30 by algorithm */
if (turn_pt < middle_index) { if (turn_pt < middle_index) {
if (svsb->type == SVSB_HIGH) { if (svsb->type == SVSB_TYPE_HIGH) {
/* /*
* If we don't handle this situation, * If we don't handle this situation,
* SVSB_HIGH's FREQPCT74 / FREQPCT30 would keep "0" * SVSB_TYPE_HIGH's FREQPCT74 / FREQPCT30 would keep "0"
* and this leads SVSB_LOW to work abnormally. * and this leads SVSB_TYPE_LOW to work abnormally.
*/ */
if (turn_pt == 0) if (turn_pt == 0)
freq_pct30 = svsb->freq_pct[0]; freq_pct30 = svsb->freq_pct[0];
...@@ -1015,7 +1035,7 @@ static void svs_set_bank_freq_pct_v3(struct svs_platform *svsp) ...@@ -1015,7 +1035,7 @@ static void svs_set_bank_freq_pct_v3(struct svs_platform *svsp)
*freq_pct |= (svsb->freq_pct[i] << b_sft); *freq_pct |= (svsb->freq_pct[i] << b_sft);
shift_byte++; shift_byte++;
} }
} else if (svsb->type == SVSB_LOW) { } else if (svsb->type == SVSB_TYPE_LOW) {
/* /*
* freq_pct[turn_pt] + * freq_pct[turn_pt] +
* freq_pct[opp_count - 7] ~ freq_pct[opp_count -1] * freq_pct[opp_count - 7] ~ freq_pct[opp_count -1]
...@@ -1032,7 +1052,7 @@ static void svs_set_bank_freq_pct_v3(struct svs_platform *svsp) ...@@ -1032,7 +1052,7 @@ static void svs_set_bank_freq_pct_v3(struct svs_platform *svsp)
} }
} }
} else { } else {
if (svsb->type == SVSB_HIGH) { if (svsb->type == SVSB_TYPE_HIGH) {
/* /*
* freq_pct[0] + * freq_pct[0] +
* freq_pct[turn_pt - 7] ~ freq_pct[turn_pt - 1] * freq_pct[turn_pt - 7] ~ freq_pct[turn_pt - 1]
...@@ -1047,7 +1067,7 @@ static void svs_set_bank_freq_pct_v3(struct svs_platform *svsp) ...@@ -1047,7 +1067,7 @@ static void svs_set_bank_freq_pct_v3(struct svs_platform *svsp)
*freq_pct |= (svsb->freq_pct[i] << b_sft); *freq_pct |= (svsb->freq_pct[i] << b_sft);
shift_byte++; shift_byte++;
} }
} else if (svsb->type == SVSB_LOW) { } else if (svsb->type == SVSB_TYPE_LOW) {
/* freq_pct[turn_pt] ~ freq_pct[opp_count - 1] */ /* freq_pct[turn_pt] ~ freq_pct[opp_count - 1] */
for (i = turn_pt; i < svsb->opp_count; i++) { for (i = turn_pt; i < svsb->opp_count; i++) {
b_sft = BITS8 * (shift_byte % REG_BYTES); b_sft = BITS8 * (shift_byte % REG_BYTES);
...@@ -1550,7 +1570,7 @@ static int svs_init02(struct svs_platform *svsp) ...@@ -1550,7 +1570,7 @@ static int svs_init02(struct svs_platform *svsp)
if (!(svsb->mode_support & SVSB_MODE_INIT02)) if (!(svsb->mode_support & SVSB_MODE_INIT02))
continue; continue;
if (svsb->type == SVSB_HIGH || svsb->type == SVSB_LOW) { if (svsb->type == SVSB_TYPE_HIGH || svsb->type == SVSB_TYPE_LOW) {
if (svs_sync_bank_volts_from_opp(svsb)) { if (svs_sync_bank_volts_from_opp(svsb)) {
dev_err(svsb->dev, "sync volt fail\n"); dev_err(svsb->dev, "sync volt fail\n");
ret = -EPERM; ret = -EPERM;
...@@ -1677,19 +1697,19 @@ static int svs_bank_resource_setup(struct svs_platform *svsp) ...@@ -1677,19 +1697,19 @@ static int svs_bank_resource_setup(struct svs_platform *svsp)
svsb = &svsp->banks[idx]; svsb = &svsp->banks[idx];
switch (svsb->sw_id) { switch (svsb->sw_id) {
case SVSB_CPU_LITTLE: case SVSB_SWID_CPU_LITTLE:
svsb->name = "SVSB_CPU_LITTLE"; svsb->name = "SVSB_CPU_LITTLE";
break; break;
case SVSB_CPU_BIG: case SVSB_SWID_CPU_BIG:
svsb->name = "SVSB_CPU_BIG"; svsb->name = "SVSB_CPU_BIG";
break; break;
case SVSB_CCI: case SVSB_SWID_CCI:
svsb->name = "SVSB_CCI"; svsb->name = "SVSB_CCI";
break; break;
case SVSB_GPU: case SVSB_SWID_GPU:
if (svsb->type == SVSB_HIGH) if (svsb->type == SVSB_TYPE_HIGH)
svsb->name = "SVSB_GPU_HIGH"; svsb->name = "SVSB_GPU_HIGH";
else if (svsb->type == SVSB_LOW) else if (svsb->type == SVSB_TYPE_LOW)
svsb->name = "SVSB_GPU_LOW"; svsb->name = "SVSB_GPU_LOW";
else else
svsb->name = "SVSB_GPU"; svsb->name = "SVSB_GPU";
...@@ -1821,13 +1841,13 @@ static bool svs_mt8195_efuse_parsing(struct svs_platform *svsp) ...@@ -1821,13 +1841,13 @@ static bool svs_mt8195_efuse_parsing(struct svs_platform *svsp)
if (ft_pgm == 0) if (ft_pgm == 0)
svsb->volt_flags |= SVSB_INIT01_VOLT_IGNORE; svsb->volt_flags |= SVSB_INIT01_VOLT_IGNORE;
if (svsb->type == SVSB_LOW) { if (svsb->type == SVSB_TYPE_LOW) {
svsb->mtdes = svsp->efuse[10] & GENMASK(7, 0); svsb->mtdes = svsp->efuse[10] & GENMASK(7, 0);
svsb->bdes = (svsp->efuse[10] >> 16) & GENMASK(7, 0); svsb->bdes = (svsp->efuse[10] >> 16) & GENMASK(7, 0);
svsb->mdes = (svsp->efuse[10] >> 24) & GENMASK(7, 0); svsb->mdes = (svsp->efuse[10] >> 24) & GENMASK(7, 0);
svsb->dcbdet = (svsp->efuse[8]) & GENMASK(7, 0); svsb->dcbdet = (svsp->efuse[8]) & GENMASK(7, 0);
svsb->dcmdet = (svsp->efuse[8] >> 8) & GENMASK(7, 0); svsb->dcmdet = (svsp->efuse[8] >> 8) & GENMASK(7, 0);
} else if (svsb->type == SVSB_HIGH) { } else if (svsb->type == SVSB_TYPE_HIGH) {
svsb->mtdes = svsp->efuse[9] & GENMASK(7, 0); svsb->mtdes = svsp->efuse[9] & GENMASK(7, 0);
svsb->bdes = (svsp->efuse[9] >> 16) & GENMASK(7, 0); svsb->bdes = (svsp->efuse[9] >> 16) & GENMASK(7, 0);
svsb->mdes = (svsp->efuse[9] >> 24) & GENMASK(7, 0); svsb->mdes = (svsp->efuse[9] >> 24) & GENMASK(7, 0);
...@@ -1886,13 +1906,13 @@ static bool svs_mt8192_efuse_parsing(struct svs_platform *svsp) ...@@ -1886,13 +1906,13 @@ static bool svs_mt8192_efuse_parsing(struct svs_platform *svsp)
if (vmin == 0x1) if (vmin == 0x1)
svsb->vmin = 0x1e; svsb->vmin = 0x1e;
if (svsb->type == SVSB_LOW) { if (svsb->type == SVSB_TYPE_LOW) {
svsb->mtdes = svsp->efuse[10] & GENMASK(7, 0); svsb->mtdes = svsp->efuse[10] & GENMASK(7, 0);
svsb->bdes = (svsp->efuse[10] >> 16) & GENMASK(7, 0); svsb->bdes = (svsp->efuse[10] >> 16) & GENMASK(7, 0);
svsb->mdes = (svsp->efuse[10] >> 24) & GENMASK(7, 0); svsb->mdes = (svsp->efuse[10] >> 24) & GENMASK(7, 0);
svsb->dcbdet = (svsp->efuse[17]) & GENMASK(7, 0); svsb->dcbdet = (svsp->efuse[17]) & GENMASK(7, 0);
svsb->dcmdet = (svsp->efuse[17] >> 8) & GENMASK(7, 0); svsb->dcmdet = (svsp->efuse[17] >> 8) & GENMASK(7, 0);
} else if (svsb->type == SVSB_HIGH) { } else if (svsb->type == SVSB_TYPE_HIGH) {
svsb->mtdes = svsp->efuse[9] & GENMASK(7, 0); svsb->mtdes = svsp->efuse[9] & GENMASK(7, 0);
svsb->bdes = (svsp->efuse[9] >> 16) & GENMASK(7, 0); svsb->bdes = (svsp->efuse[9] >> 16) & GENMASK(7, 0);
svsb->mdes = (svsp->efuse[9] >> 24) & GENMASK(7, 0); svsb->mdes = (svsp->efuse[9] >> 24) & GENMASK(7, 0);
...@@ -1946,13 +1966,13 @@ static bool svs_mt8188_efuse_parsing(struct svs_platform *svsp) ...@@ -1946,13 +1966,13 @@ static bool svs_mt8188_efuse_parsing(struct svs_platform *svsp)
for (idx = 0; idx < svsp->bank_max; idx++) { for (idx = 0; idx < svsp->bank_max; idx++) {
svsb = &svsp->banks[idx]; svsb = &svsp->banks[idx];
if (svsb->type == SVSB_LOW) { if (svsb->type == SVSB_TYPE_LOW) {
svsb->mtdes = svsp->efuse[5] & GENMASK(7, 0); svsb->mtdes = svsp->efuse[5] & GENMASK(7, 0);
svsb->bdes = (svsp->efuse[5] >> 16) & GENMASK(7, 0); svsb->bdes = (svsp->efuse[5] >> 16) & GENMASK(7, 0);
svsb->mdes = (svsp->efuse[5] >> 24) & GENMASK(7, 0); svsb->mdes = (svsp->efuse[5] >> 24) & GENMASK(7, 0);
svsb->dcbdet = (svsp->efuse[15] >> 16) & GENMASK(7, 0); svsb->dcbdet = (svsp->efuse[15] >> 16) & GENMASK(7, 0);
svsb->dcmdet = (svsp->efuse[15] >> 24) & GENMASK(7, 0); svsb->dcmdet = (svsp->efuse[15] >> 24) & GENMASK(7, 0);
} else if (svsb->type == SVSB_HIGH) { } else if (svsb->type == SVSB_TYPE_HIGH) {
svsb->mtdes = svsp->efuse[4] & GENMASK(7, 0); svsb->mtdes = svsp->efuse[4] & GENMASK(7, 0);
svsb->bdes = (svsp->efuse[4] >> 16) & GENMASK(7, 0); svsb->bdes = (svsp->efuse[4] >> 16) & GENMASK(7, 0);
svsb->mdes = (svsp->efuse[4] >> 24) & GENMASK(7, 0); svsb->mdes = (svsp->efuse[4] >> 24) & GENMASK(7, 0);
...@@ -2007,14 +2027,14 @@ static bool svs_mt8186_efuse_parsing(struct svs_platform *svsp) ...@@ -2007,14 +2027,14 @@ static bool svs_mt8186_efuse_parsing(struct svs_platform *svsp)
svsb = &svsp->banks[idx]; svsb = &svsp->banks[idx];
switch (svsb->sw_id) { switch (svsb->sw_id) {
case SVSB_CPU_BIG: case SVSB_SWID_CPU_BIG:
if (svsb->type == SVSB_HIGH) { if (svsb->type == SVSB_TYPE_HIGH) {
svsb->mdes = (svsp->efuse[2] >> 24) & GENMASK(7, 0); svsb->mdes = (svsp->efuse[2] >> 24) & GENMASK(7, 0);
svsb->bdes = (svsp->efuse[2] >> 16) & GENMASK(7, 0); svsb->bdes = (svsp->efuse[2] >> 16) & GENMASK(7, 0);
svsb->mtdes = svsp->efuse[2] & GENMASK(7, 0); svsb->mtdes = svsp->efuse[2] & GENMASK(7, 0);
svsb->dcmdet = (svsp->efuse[13] >> 8) & GENMASK(7, 0); svsb->dcmdet = (svsp->efuse[13] >> 8) & GENMASK(7, 0);
svsb->dcbdet = svsp->efuse[13] & GENMASK(7, 0); svsb->dcbdet = svsp->efuse[13] & GENMASK(7, 0);
} else if (svsb->type == SVSB_LOW) { } else if (svsb->type == SVSB_TYPE_LOW) {
svsb->mdes = (svsp->efuse[3] >> 24) & GENMASK(7, 0); svsb->mdes = (svsp->efuse[3] >> 24) & GENMASK(7, 0);
svsb->bdes = (svsp->efuse[3] >> 16) & GENMASK(7, 0); svsb->bdes = (svsp->efuse[3] >> 16) & GENMASK(7, 0);
svsb->mtdes = svsp->efuse[3] & GENMASK(7, 0); svsb->mtdes = svsp->efuse[3] & GENMASK(7, 0);
...@@ -2022,21 +2042,21 @@ static bool svs_mt8186_efuse_parsing(struct svs_platform *svsp) ...@@ -2022,21 +2042,21 @@ static bool svs_mt8186_efuse_parsing(struct svs_platform *svsp)
svsb->dcbdet = (svsp->efuse[14] >> 16) & GENMASK(7, 0); svsb->dcbdet = (svsp->efuse[14] >> 16) & GENMASK(7, 0);
} }
break; break;
case SVSB_CPU_LITTLE: case SVSB_SWID_CPU_LITTLE:
svsb->mdes = (svsp->efuse[4] >> 24) & GENMASK(7, 0); svsb->mdes = (svsp->efuse[4] >> 24) & GENMASK(7, 0);
svsb->bdes = (svsp->efuse[4] >> 16) & GENMASK(7, 0); svsb->bdes = (svsp->efuse[4] >> 16) & GENMASK(7, 0);
svsb->mtdes = svsp->efuse[4] & GENMASK(7, 0); svsb->mtdes = svsp->efuse[4] & GENMASK(7, 0);
svsb->dcmdet = (svsp->efuse[14] >> 8) & GENMASK(7, 0); svsb->dcmdet = (svsp->efuse[14] >> 8) & GENMASK(7, 0);
svsb->dcbdet = svsp->efuse[14] & GENMASK(7, 0); svsb->dcbdet = svsp->efuse[14] & GENMASK(7, 0);
break; break;
case SVSB_CCI: case SVSB_SWID_CCI:
svsb->mdes = (svsp->efuse[5] >> 24) & GENMASK(7, 0); svsb->mdes = (svsp->efuse[5] >> 24) & GENMASK(7, 0);
svsb->bdes = (svsp->efuse[5] >> 16) & GENMASK(7, 0); svsb->bdes = (svsp->efuse[5] >> 16) & GENMASK(7, 0);
svsb->mtdes = svsp->efuse[5] & GENMASK(7, 0); svsb->mtdes = svsp->efuse[5] & GENMASK(7, 0);
svsb->dcmdet = (svsp->efuse[15] >> 24) & GENMASK(7, 0); svsb->dcmdet = (svsp->efuse[15] >> 24) & GENMASK(7, 0);
svsb->dcbdet = (svsp->efuse[15] >> 16) & GENMASK(7, 0); svsb->dcbdet = (svsp->efuse[15] >> 16) & GENMASK(7, 0);
break; break;
case SVSB_GPU: case SVSB_SWID_GPU:
svsb->mdes = (svsp->efuse[6] >> 24) & GENMASK(7, 0); svsb->mdes = (svsp->efuse[6] >> 24) & GENMASK(7, 0);
svsb->bdes = (svsp->efuse[6] >> 16) & GENMASK(7, 0); svsb->bdes = (svsp->efuse[6] >> 16) & GENMASK(7, 0);
svsb->mtdes = svsp->efuse[6] & GENMASK(7, 0); svsb->mtdes = svsp->efuse[6] & GENMASK(7, 0);
...@@ -2098,7 +2118,7 @@ static bool svs_mt8183_efuse_parsing(struct svs_platform *svsp) ...@@ -2098,7 +2118,7 @@ static bool svs_mt8183_efuse_parsing(struct svs_platform *svsp)
svsb->volt_flags |= SVSB_INIT01_VOLT_IGNORE; svsb->volt_flags |= SVSB_INIT01_VOLT_IGNORE;
switch (svsb->sw_id) { switch (svsb->sw_id) {
case SVSB_CPU_LITTLE: case SVSB_SWID_CPU_LITTLE:
svsb->bdes = svsp->efuse[16] & GENMASK(7, 0); svsb->bdes = svsp->efuse[16] & GENMASK(7, 0);
svsb->mdes = (svsp->efuse[16] >> 8) & GENMASK(7, 0); svsb->mdes = (svsp->efuse[16] >> 8) & GENMASK(7, 0);
svsb->dcbdet = (svsp->efuse[16] >> 16) & GENMASK(7, 0); svsb->dcbdet = (svsp->efuse[16] >> 16) & GENMASK(7, 0);
...@@ -2110,7 +2130,7 @@ static bool svs_mt8183_efuse_parsing(struct svs_platform *svsp) ...@@ -2110,7 +2130,7 @@ static bool svs_mt8183_efuse_parsing(struct svs_platform *svsp)
else else
svsb->volt_od += 2; svsb->volt_od += 2;
break; break;
case SVSB_CPU_BIG: case SVSB_SWID_CPU_BIG:
svsb->bdes = svsp->efuse[18] & GENMASK(7, 0); svsb->bdes = svsp->efuse[18] & GENMASK(7, 0);
svsb->mdes = (svsp->efuse[18] >> 8) & GENMASK(7, 0); svsb->mdes = (svsp->efuse[18] >> 8) & GENMASK(7, 0);
svsb->dcbdet = (svsp->efuse[18] >> 16) & GENMASK(7, 0); svsb->dcbdet = (svsp->efuse[18] >> 16) & GENMASK(7, 0);
...@@ -2122,7 +2142,7 @@ static bool svs_mt8183_efuse_parsing(struct svs_platform *svsp) ...@@ -2122,7 +2142,7 @@ static bool svs_mt8183_efuse_parsing(struct svs_platform *svsp)
else else
svsb->volt_od += 12; svsb->volt_od += 12;
break; break;
case SVSB_CCI: case SVSB_SWID_CCI:
svsb->bdes = svsp->efuse[4] & GENMASK(7, 0); svsb->bdes = svsp->efuse[4] & GENMASK(7, 0);
svsb->mdes = (svsp->efuse[4] >> 8) & GENMASK(7, 0); svsb->mdes = (svsp->efuse[4] >> 8) & GENMASK(7, 0);
svsb->dcbdet = (svsp->efuse[4] >> 16) & GENMASK(7, 0); svsb->dcbdet = (svsp->efuse[4] >> 16) & GENMASK(7, 0);
...@@ -2134,7 +2154,7 @@ static bool svs_mt8183_efuse_parsing(struct svs_platform *svsp) ...@@ -2134,7 +2154,7 @@ static bool svs_mt8183_efuse_parsing(struct svs_platform *svsp)
else else
svsb->volt_od += 2; svsb->volt_od += 2;
break; break;
case SVSB_GPU: case SVSB_SWID_GPU:
svsb->bdes = svsp->efuse[6] & GENMASK(7, 0); svsb->bdes = svsp->efuse[6] & GENMASK(7, 0);
svsb->mdes = (svsp->efuse[6] >> 8) & GENMASK(7, 0); svsb->mdes = (svsp->efuse[6] >> 8) & GENMASK(7, 0);
svsb->dcbdet = (svsp->efuse[6] >> 16) & GENMASK(7, 0); svsb->dcbdet = (svsp->efuse[6] >> 16) & GENMASK(7, 0);
...@@ -2219,16 +2239,16 @@ static bool svs_mt8183_efuse_parsing(struct svs_platform *svsp) ...@@ -2219,16 +2239,16 @@ static bool svs_mt8183_efuse_parsing(struct svs_platform *svsp)
svsb->mts = mts; svsb->mts = mts;
switch (svsb->sw_id) { switch (svsb->sw_id) {
case SVSB_CPU_LITTLE: case SVSB_SWID_CPU_LITTLE:
tb_roomt = x_roomt[3]; tb_roomt = x_roomt[3];
break; break;
case SVSB_CPU_BIG: case SVSB_SWID_CPU_BIG:
tb_roomt = x_roomt[4]; tb_roomt = x_roomt[4];
break; break;
case SVSB_CCI: case SVSB_SWID_CCI:
tb_roomt = x_roomt[3]; tb_roomt = x_roomt[3];
break; break;
case SVSB_GPU: case SVSB_SWID_GPU:
tb_roomt = x_roomt[1]; tb_roomt = x_roomt[1];
break; break;
default: default:
...@@ -2321,9 +2341,9 @@ static int svs_mt8192_platform_probe(struct svs_platform *svsp) ...@@ -2321,9 +2341,9 @@ static int svs_mt8192_platform_probe(struct svs_platform *svsp)
for (idx = 0; idx < svsp->bank_max; idx++) { for (idx = 0; idx < svsp->bank_max; idx++) {
svsb = &svsp->banks[idx]; svsb = &svsp->banks[idx];
if (svsb->type == SVSB_HIGH) if (svsb->type == SVSB_TYPE_HIGH)
svsb->opp_dev = svs_add_device_link(svsp, "gpu"); svsb->opp_dev = svs_add_device_link(svsp, "gpu");
else if (svsb->type == SVSB_LOW) else if (svsb->type == SVSB_TYPE_LOW)
svsb->opp_dev = svs_get_subsys_device(svsp, "gpu"); svsb->opp_dev = svs_get_subsys_device(svsp, "gpu");
if (IS_ERR(svsb->opp_dev)) if (IS_ERR(svsb->opp_dev))
...@@ -2355,14 +2375,14 @@ static int svs_mt8186_platform_probe(struct svs_platform *svsp) ...@@ -2355,14 +2375,14 @@ static int svs_mt8186_platform_probe(struct svs_platform *svsp)
svsb = &svsp->banks[idx]; svsb = &svsp->banks[idx];
switch (svsb->sw_id) { switch (svsb->sw_id) {
case SVSB_CPU_LITTLE: case SVSB_SWID_CPU_LITTLE:
case SVSB_CPU_BIG: case SVSB_SWID_CPU_BIG:
svsb->opp_dev = get_cpu_device(svsb->cpu_id); svsb->opp_dev = get_cpu_device(svsb->cpu_id);
break; break;
case SVSB_CCI: case SVSB_SWID_CCI:
svsb->opp_dev = svs_add_device_link(svsp, "cci"); svsb->opp_dev = svs_add_device_link(svsp, "cci");
break; break;
case SVSB_GPU: case SVSB_SWID_GPU:
svsb->opp_dev = svs_add_device_link(svsp, "gpu"); svsb->opp_dev = svs_add_device_link(svsp, "gpu");
break; break;
default: default:
...@@ -2394,14 +2414,14 @@ static int svs_mt8183_platform_probe(struct svs_platform *svsp) ...@@ -2394,14 +2414,14 @@ static int svs_mt8183_platform_probe(struct svs_platform *svsp)
svsb = &svsp->banks[idx]; svsb = &svsp->banks[idx];
switch (svsb->sw_id) { switch (svsb->sw_id) {
case SVSB_CPU_LITTLE: case SVSB_SWID_CPU_LITTLE:
case SVSB_CPU_BIG: case SVSB_SWID_CPU_BIG:
svsb->opp_dev = get_cpu_device(svsb->cpu_id); svsb->opp_dev = get_cpu_device(svsb->cpu_id);
break; break;
case SVSB_CCI: case SVSB_SWID_CCI:
svsb->opp_dev = svs_add_device_link(svsp, "cci"); svsb->opp_dev = svs_add_device_link(svsp, "cci");
break; break;
case SVSB_GPU: case SVSB_SWID_GPU:
svsb->opp_dev = svs_add_device_link(svsp, "gpu"); svsb->opp_dev = svs_add_device_link(svsp, "gpu");
break; break;
default: default:
...@@ -2420,8 +2440,8 @@ static int svs_mt8183_platform_probe(struct svs_platform *svsp) ...@@ -2420,8 +2440,8 @@ static int svs_mt8183_platform_probe(struct svs_platform *svsp)
static struct svs_bank svs_mt8195_banks[] = { static struct svs_bank svs_mt8195_banks[] = {
{ {
.sw_id = SVSB_GPU, .sw_id = SVSB_SWID_GPU,
.type = SVSB_LOW, .type = SVSB_TYPE_LOW,
.set_freq_pct = svs_set_bank_freq_pct_v3, .set_freq_pct = svs_set_bank_freq_pct_v3,
.get_volts = svs_get_bank_volts_v3, .get_volts = svs_get_bank_volts_v3,
.volt_flags = SVSB_REMOVE_DVTFIXED_VOLT, .volt_flags = SVSB_REMOVE_DVTFIXED_VOLT,
...@@ -2443,8 +2463,8 @@ static struct svs_bank svs_mt8195_banks[] = { ...@@ -2443,8 +2463,8 @@ static struct svs_bank svs_mt8195_banks[] = {
.ctl0 = 0x00540003, .ctl0 = 0x00540003,
}, },
{ {
.sw_id = SVSB_GPU, .sw_id = SVSB_SWID_GPU,
.type = SVSB_HIGH, .type = SVSB_TYPE_HIGH,
.set_freq_pct = svs_set_bank_freq_pct_v3, .set_freq_pct = svs_set_bank_freq_pct_v3,
.get_volts = svs_get_bank_volts_v3, .get_volts = svs_get_bank_volts_v3,
.tzone_name = "gpu1", .tzone_name = "gpu1",
...@@ -2475,8 +2495,8 @@ static struct svs_bank svs_mt8195_banks[] = { ...@@ -2475,8 +2495,8 @@ static struct svs_bank svs_mt8195_banks[] = {
static struct svs_bank svs_mt8192_banks[] = { static struct svs_bank svs_mt8192_banks[] = {
{ {
.sw_id = SVSB_GPU, .sw_id = SVSB_SWID_GPU,
.type = SVSB_LOW, .type = SVSB_TYPE_LOW,
.set_freq_pct = svs_set_bank_freq_pct_v3, .set_freq_pct = svs_set_bank_freq_pct_v3,
.get_volts = svs_get_bank_volts_v3, .get_volts = svs_get_bank_volts_v3,
.tzone_name = "gpu1", .tzone_name = "gpu1",
...@@ -2503,8 +2523,8 @@ static struct svs_bank svs_mt8192_banks[] = { ...@@ -2503,8 +2523,8 @@ static struct svs_bank svs_mt8192_banks[] = {
.tzone_ltemp_voffset = 7, .tzone_ltemp_voffset = 7,
}, },
{ {
.sw_id = SVSB_GPU, .sw_id = SVSB_SWID_GPU,
.type = SVSB_HIGH, .type = SVSB_TYPE_HIGH,
.set_freq_pct = svs_set_bank_freq_pct_v3, .set_freq_pct = svs_set_bank_freq_pct_v3,
.get_volts = svs_get_bank_volts_v3, .get_volts = svs_get_bank_volts_v3,
.tzone_name = "gpu1", .tzone_name = "gpu1",
...@@ -2535,8 +2555,8 @@ static struct svs_bank svs_mt8192_banks[] = { ...@@ -2535,8 +2555,8 @@ static struct svs_bank svs_mt8192_banks[] = {
static struct svs_bank svs_mt8188_banks[] = { static struct svs_bank svs_mt8188_banks[] = {
{ {
.sw_id = SVSB_GPU, .sw_id = SVSB_SWID_GPU,
.type = SVSB_LOW, .type = SVSB_TYPE_LOW,
.set_freq_pct = svs_set_bank_freq_pct_v3, .set_freq_pct = svs_set_bank_freq_pct_v3,
.get_volts = svs_get_bank_volts_v3, .get_volts = svs_get_bank_volts_v3,
.volt_flags = SVSB_REMOVE_DVTFIXED_VOLT, .volt_flags = SVSB_REMOVE_DVTFIXED_VOLT,
...@@ -2558,8 +2578,8 @@ static struct svs_bank svs_mt8188_banks[] = { ...@@ -2558,8 +2578,8 @@ static struct svs_bank svs_mt8188_banks[] = {
.ctl0 = 0x00100003, .ctl0 = 0x00100003,
}, },
{ {
.sw_id = SVSB_GPU, .sw_id = SVSB_SWID_GPU,
.type = SVSB_HIGH, .type = SVSB_TYPE_HIGH,
.set_freq_pct = svs_set_bank_freq_pct_v3, .set_freq_pct = svs_set_bank_freq_pct_v3,
.get_volts = svs_get_bank_volts_v3, .get_volts = svs_get_bank_volts_v3,
.tzone_name = "gpu1", .tzone_name = "gpu1",
...@@ -2590,8 +2610,8 @@ static struct svs_bank svs_mt8188_banks[] = { ...@@ -2590,8 +2610,8 @@ static struct svs_bank svs_mt8188_banks[] = {
static struct svs_bank svs_mt8186_banks[] = { static struct svs_bank svs_mt8186_banks[] = {
{ {
.sw_id = SVSB_CPU_BIG, .sw_id = SVSB_SWID_CPU_BIG,
.type = SVSB_LOW, .type = SVSB_TYPE_LOW,
.set_freq_pct = svs_set_bank_freq_pct_v3, .set_freq_pct = svs_set_bank_freq_pct_v3,
.get_volts = svs_get_bank_volts_v3, .get_volts = svs_get_bank_volts_v3,
.cpu_id = 6, .cpu_id = 6,
...@@ -2615,8 +2635,8 @@ static struct svs_bank svs_mt8186_banks[] = { ...@@ -2615,8 +2635,8 @@ static struct svs_bank svs_mt8186_banks[] = {
.ctl0 = 0x00540003, .ctl0 = 0x00540003,
}, },
{ {
.sw_id = SVSB_CPU_BIG, .sw_id = SVSB_SWID_CPU_BIG,
.type = SVSB_HIGH, .type = SVSB_TYPE_HIGH,
.set_freq_pct = svs_set_bank_freq_pct_v3, .set_freq_pct = svs_set_bank_freq_pct_v3,
.get_volts = svs_get_bank_volts_v3, .get_volts = svs_get_bank_volts_v3,
.cpu_id = 6, .cpu_id = 6,
...@@ -2646,7 +2666,7 @@ static struct svs_bank svs_mt8186_banks[] = { ...@@ -2646,7 +2666,7 @@ static struct svs_bank svs_mt8186_banks[] = {
.tzone_ltemp_voffset = 8, .tzone_ltemp_voffset = 8,
}, },
{ {
.sw_id = SVSB_CPU_LITTLE, .sw_id = SVSB_SWID_CPU_LITTLE,
.set_freq_pct = svs_set_bank_freq_pct_v2, .set_freq_pct = svs_set_bank_freq_pct_v2,
.get_volts = svs_get_bank_volts_v2, .get_volts = svs_get_bank_volts_v2,
.cpu_id = 0, .cpu_id = 0,
...@@ -2675,7 +2695,7 @@ static struct svs_bank svs_mt8186_banks[] = { ...@@ -2675,7 +2695,7 @@ static struct svs_bank svs_mt8186_banks[] = {
.tzone_ltemp_voffset = 8, .tzone_ltemp_voffset = 8,
}, },
{ {
.sw_id = SVSB_CCI, .sw_id = SVSB_SWID_CCI,
.set_freq_pct = svs_set_bank_freq_pct_v2, .set_freq_pct = svs_set_bank_freq_pct_v2,
.get_volts = svs_get_bank_volts_v2, .get_volts = svs_get_bank_volts_v2,
.tzone_name = "cpu_zone0", .tzone_name = "cpu_zone0",
...@@ -2703,7 +2723,7 @@ static struct svs_bank svs_mt8186_banks[] = { ...@@ -2703,7 +2723,7 @@ static struct svs_bank svs_mt8186_banks[] = {
.tzone_ltemp_voffset = 8, .tzone_ltemp_voffset = 8,
}, },
{ {
.sw_id = SVSB_GPU, .sw_id = SVSB_SWID_GPU,
.set_freq_pct = svs_set_bank_freq_pct_v2, .set_freq_pct = svs_set_bank_freq_pct_v2,
.get_volts = svs_get_bank_volts_v2, .get_volts = svs_get_bank_volts_v2,
.tzone_name = "mfg", .tzone_name = "mfg",
...@@ -2733,7 +2753,7 @@ static struct svs_bank svs_mt8186_banks[] = { ...@@ -2733,7 +2753,7 @@ static struct svs_bank svs_mt8186_banks[] = {
static struct svs_bank svs_mt8183_banks[] = { static struct svs_bank svs_mt8183_banks[] = {
{ {
.sw_id = SVSB_CPU_LITTLE, .sw_id = SVSB_SWID_CPU_LITTLE,
.set_freq_pct = svs_set_bank_freq_pct_v2, .set_freq_pct = svs_set_bank_freq_pct_v2,
.get_volts = svs_get_bank_volts_v2, .get_volts = svs_get_bank_volts_v2,
.cpu_id = 0, .cpu_id = 0,
...@@ -2757,7 +2777,7 @@ static struct svs_bank svs_mt8183_banks[] = { ...@@ -2757,7 +2777,7 @@ static struct svs_bank svs_mt8183_banks[] = {
.ctl0 = 0x00010001, .ctl0 = 0x00010001,
}, },
{ {
.sw_id = SVSB_CPU_BIG, .sw_id = SVSB_SWID_CPU_BIG,
.set_freq_pct = svs_set_bank_freq_pct_v2, .set_freq_pct = svs_set_bank_freq_pct_v2,
.get_volts = svs_get_bank_volts_v2, .get_volts = svs_get_bank_volts_v2,
.cpu_id = 4, .cpu_id = 4,
...@@ -2781,7 +2801,7 @@ static struct svs_bank svs_mt8183_banks[] = { ...@@ -2781,7 +2801,7 @@ static struct svs_bank svs_mt8183_banks[] = {
.ctl0 = 0x00000001, .ctl0 = 0x00000001,
}, },
{ {
.sw_id = SVSB_CCI, .sw_id = SVSB_SWID_CCI,
.set_freq_pct = svs_set_bank_freq_pct_v2, .set_freq_pct = svs_set_bank_freq_pct_v2,
.get_volts = svs_get_bank_volts_v2, .get_volts = svs_get_bank_volts_v2,
.buck_name = "proc", .buck_name = "proc",
...@@ -2804,7 +2824,7 @@ static struct svs_bank svs_mt8183_banks[] = { ...@@ -2804,7 +2824,7 @@ static struct svs_bank svs_mt8183_banks[] = {
.ctl0 = 0x00100003, .ctl0 = 0x00100003,
}, },
{ {
.sw_id = SVSB_GPU, .sw_id = SVSB_SWID_GPU,
.set_freq_pct = svs_set_bank_freq_pct_v2, .set_freq_pct = svs_set_bank_freq_pct_v2,
.get_volts = svs_get_bank_volts_v2, .get_volts = svs_get_bank_volts_v2,
.buck_name = "mali", .buck_name = "mali",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7