Skip to content

Commit 0e0e11e

Browse files
alexdeucheralexdeucher
committed
drm/amdgpu/swSMU: remove eeprom from the smu i2c handlers (v2)
The driver uses it for EEPROM access, but it's just an i2c bus. v2: change the callback name as well. Reviewed-by: Andrey Grodzovsky <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent cd65c33 commit 0e0e11e

File tree

4 files changed

+36
-36
lines changed

4 files changed

+36
-36
lines changed

‎drivers/gpu/drm/amd/powerplay/amdgpu_smu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ static int smu_smc_hw_setup(struct smu_context *smu)
844844
return ret;
845845
}
846846

847-
ret = smu_i2c_eeprom_init(smu, &adev->pm.smu_i2c);
847+
ret = smu_i2c_init(smu, &adev->pm.smu_i2c);
848848
if (ret)
849849
return ret;
850850

@@ -1046,7 +1046,7 @@ static int smu_smc_hw_cleanup(struct smu_context *smu)
10461046
struct amdgpu_device *adev = smu->adev;
10471047
int ret = 0;
10481048

1049-
smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c);
1049+
smu_i2c_fini(smu, &adev->pm.smu_i2c);
10501050

10511051
cancel_work_sync(&smu->throttling_logging_work);
10521052

‎drivers/gpu/drm/amd/powerplay/arcturus_ppt.c

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1876,7 +1876,7 @@ static int arcturus_dpm_set_vcn_enable(struct smu_context *smu, bool enable)
18761876
return ret;
18771877
}
18781878

1879-
static void arcturus_fill_eeprom_i2c_req(SwI2cRequest_t *req, bool write,
1879+
static void arcturus_fill_i2c_req(SwI2cRequest_t *req, bool write,
18801880
uint8_t address, uint32_t numbytes,
18811881
uint8_t *data)
18821882
{
@@ -1908,7 +1908,7 @@ static void arcturus_fill_eeprom_i2c_req(SwI2cRequest_t *req, bool write,
19081908
}
19091909
}
19101910

1911-
static int arcturus_i2c_eeprom_read_data(struct i2c_adapter *control,
1911+
static int arcturus_i2c_read_data(struct i2c_adapter *control,
19121912
uint8_t address,
19131913
uint8_t *data,
19141914
uint32_t numbytes)
@@ -1926,7 +1926,7 @@ static int arcturus_i2c_eeprom_read_data(struct i2c_adapter *control,
19261926
}
19271927

19281928
memset(&req, 0, sizeof(req));
1929-
arcturus_fill_eeprom_i2c_req(&req, false, address, numbytes, data);
1929+
arcturus_fill_i2c_req(&req, false, address, numbytes, data);
19301930

19311931
mutex_lock(&adev->smu.mutex);
19321932
/* Now read data starting with that address */
@@ -1941,18 +1941,18 @@ static int arcturus_i2c_eeprom_read_data(struct i2c_adapter *control,
19411941
for (i = 0; i < numbytes; i++)
19421942
data[i] = res->SwI2cCmds[i].Data;
19431943

1944-
dev_dbg(adev->dev, "arcturus_i2c_eeprom_read_data, address = %x, bytes = %d, data :",
1944+
dev_dbg(adev->dev, "arcturus_i2c_read_data, address = %x, bytes = %d, data :",
19451945
(uint16_t)address, numbytes);
19461946

19471947
print_hex_dump(KERN_DEBUG, "data: ", DUMP_PREFIX_NONE,
19481948
8, 1, data, numbytes, false);
19491949
} else
1950-
dev_err(adev->dev, "arcturus_i2c_eeprom_read_data - error occurred :%x", ret);
1950+
dev_err(adev->dev, "arcturus_i2c_read_data - error occurred :%x", ret);
19511951

19521952
return ret;
19531953
}
19541954

1955-
static int arcturus_i2c_eeprom_write_data(struct i2c_adapter *control,
1955+
static int arcturus_i2c_write_data(struct i2c_adapter *control,
19561956
uint8_t address,
19571957
uint8_t *data,
19581958
uint32_t numbytes)
@@ -1968,7 +1968,7 @@ static int arcturus_i2c_eeprom_write_data(struct i2c_adapter *control,
19681968
}
19691969

19701970
memset(&req, 0, sizeof(req));
1971-
arcturus_fill_eeprom_i2c_req(&req, true, address, numbytes, data);
1971+
arcturus_fill_i2c_req(&req, true, address, numbytes, data);
19721972

19731973
mutex_lock(&adev->smu.mutex);
19741974
ret = smu_cmn_update_table(&adev->smu, SMU_TABLE_I2C_COMMANDS, 0, &req, true);
@@ -1994,7 +1994,7 @@ static int arcturus_i2c_eeprom_write_data(struct i2c_adapter *control,
19941994
return ret;
19951995
}
19961996

1997-
static int arcturus_i2c_eeprom_i2c_xfer(struct i2c_adapter *i2c_adap,
1997+
static int arcturus_i2c_xfer(struct i2c_adapter *i2c_adap,
19981998
struct i2c_msg *msgs, int num)
19991999
{
20002000
uint32_t i, j, ret, data_size, data_chunk_size, next_eeprom_addr = 0;
@@ -2017,18 +2017,18 @@ static int arcturus_i2c_eeprom_i2c_xfer(struct i2c_adapter *i2c_adap,
20172017
data_chunk[1] = (next_eeprom_addr & 0xff);
20182018

20192019
if (msgs[i].flags & I2C_M_RD) {
2020-
ret = arcturus_i2c_eeprom_read_data(i2c_adap,
2021-
(uint8_t)msgs[i].addr,
2022-
data_chunk, MAX_SW_I2C_COMMANDS);
2020+
ret = arcturus_i2c_read_data(i2c_adap,
2021+
(uint8_t)msgs[i].addr,
2022+
data_chunk, MAX_SW_I2C_COMMANDS);
20232023

20242024
memcpy(data_ptr, data_chunk + 2, data_chunk_size);
20252025
} else {
20262026

20272027
memcpy(data_chunk + 2, data_ptr, data_chunk_size);
20282028

2029-
ret = arcturus_i2c_eeprom_write_data(i2c_adap,
2030-
(uint8_t)msgs[i].addr,
2031-
data_chunk, MAX_SW_I2C_COMMANDS);
2029+
ret = arcturus_i2c_write_data(i2c_adap,
2030+
(uint8_t)msgs[i].addr,
2031+
data_chunk, MAX_SW_I2C_COMMANDS);
20322032
}
20332033

20342034
if (ret) {
@@ -2045,17 +2045,17 @@ static int arcturus_i2c_eeprom_i2c_xfer(struct i2c_adapter *i2c_adap,
20452045
data_chunk[1] = (next_eeprom_addr & 0xff);
20462046

20472047
if (msgs[i].flags & I2C_M_RD) {
2048-
ret = arcturus_i2c_eeprom_read_data(i2c_adap,
2049-
(uint8_t)msgs[i].addr,
2050-
data_chunk, (data_size % data_chunk_size) + 2);
2048+
ret = arcturus_i2c_read_data(i2c_adap,
2049+
(uint8_t)msgs[i].addr,
2050+
data_chunk, (data_size % data_chunk_size) + 2);
20512051

20522052
memcpy(data_ptr, data_chunk + 2, data_size % data_chunk_size);
20532053
} else {
20542054
memcpy(data_chunk + 2, data_ptr, data_size % data_chunk_size);
20552055

2056-
ret = arcturus_i2c_eeprom_write_data(i2c_adap,
2057-
(uint8_t)msgs[i].addr,
2058-
data_chunk, (data_size % data_chunk_size) + 2);
2056+
ret = arcturus_i2c_write_data(i2c_adap,
2057+
(uint8_t)msgs[i].addr,
2058+
data_chunk, (data_size % data_chunk_size) + 2);
20592059
}
20602060

20612061
if (ret) {
@@ -2069,15 +2069,15 @@ static int arcturus_i2c_eeprom_i2c_xfer(struct i2c_adapter *i2c_adap,
20692069
return num;
20702070
}
20712071

2072-
static u32 arcturus_i2c_eeprom_i2c_func(struct i2c_adapter *adap)
2072+
static u32 arcturus_i2c_func(struct i2c_adapter *adap)
20732073
{
20742074
return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
20752075
}
20762076

20772077

2078-
static const struct i2c_algorithm arcturus_i2c_eeprom_i2c_algo = {
2079-
.master_xfer = arcturus_i2c_eeprom_i2c_xfer,
2080-
.functionality = arcturus_i2c_eeprom_i2c_func,
2078+
static const struct i2c_algorithm arcturus_i2c_algo = {
2079+
.master_xfer = arcturus_i2c_xfer,
2080+
.functionality = arcturus_i2c_func,
20812081
};
20822082

20832083
static bool arcturus_i2c_adapter_is_added(struct i2c_adapter *control)
@@ -2087,7 +2087,7 @@ static bool arcturus_i2c_adapter_is_added(struct i2c_adapter *control)
20872087
return control->dev.parent == &adev->pdev->dev;
20882088
}
20892089

2090-
static int arcturus_i2c_eeprom_control_init(struct smu_context *smu, struct i2c_adapter *control)
2090+
static int arcturus_i2c_control_init(struct smu_context *smu, struct i2c_adapter *control)
20912091
{
20922092
struct amdgpu_device *adev = to_amdgpu_device(control);
20932093
int res;
@@ -2099,8 +2099,8 @@ static int arcturus_i2c_eeprom_control_init(struct smu_context *smu, struct i2c_
20992099
control->owner = THIS_MODULE;
21002100
control->class = I2C_CLASS_SPD;
21012101
control->dev.parent = &adev->pdev->dev;
2102-
control->algo = &arcturus_i2c_eeprom_i2c_algo;
2103-
snprintf(control->name, sizeof(control->name), "AMDGPU EEPROM");
2102+
control->algo = &arcturus_i2c_algo;
2103+
snprintf(control->name, sizeof(control->name), "AMDGPU SMU");
21042104

21052105
res = i2c_add_adapter(control);
21062106
if (res)
@@ -2109,7 +2109,7 @@ static int arcturus_i2c_eeprom_control_init(struct smu_context *smu, struct i2c_
21092109
return res;
21102110
}
21112111

2112-
static void arcturus_i2c_eeprom_control_fini(struct smu_context *smu, struct i2c_adapter *control)
2112+
static void arcturus_i2c_control_fini(struct smu_context *smu, struct i2c_adapter *control)
21132113
{
21142114
if (!arcturus_i2c_adapter_is_added(control))
21152115
return;
@@ -2275,8 +2275,8 @@ static const struct pptable_funcs arcturus_ppt_funcs = {
22752275
.get_power_limit = arcturus_get_power_limit,
22762276
.is_dpm_running = arcturus_is_dpm_running,
22772277
.dpm_set_vcn_enable = arcturus_dpm_set_vcn_enable,
2278-
.i2c_eeprom_init = arcturus_i2c_eeprom_control_init,
2279-
.i2c_eeprom_fini = arcturus_i2c_eeprom_control_fini,
2278+
.i2c_init = arcturus_i2c_control_init,
2279+
.i2c_fini = arcturus_i2c_control_fini,
22802280
.get_unique_id = arcturus_get_unique_id,
22812281
.init_microcode = smu_v11_0_init_microcode,
22822282
.load_microcode = smu_v11_0_load_microcode,

‎drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -503,8 +503,8 @@ struct pptable_funcs {
503503
int (*set_df_cstate)(struct smu_context *smu, enum pp_df_cstate state);
504504
int (*allow_xgmi_power_down)(struct smu_context *smu, bool en);
505505
int (*update_pcie_parameters)(struct smu_context *smu, uint32_t pcie_gen_cap, uint32_t pcie_width_cap);
506-
int (*i2c_eeprom_init)(struct smu_context *smu, struct i2c_adapter *control);
507-
void (*i2c_eeprom_fini)(struct smu_context *smu, struct i2c_adapter *control);
506+
int (*i2c_init)(struct smu_context *smu, struct i2c_adapter *control);
507+
void (*i2c_fini)(struct smu_context *smu, struct i2c_adapter *control);
508508
void (*get_unique_id)(struct smu_context *smu);
509509
int (*get_dpm_clock_table)(struct smu_context *smu, struct dpm_clocks *clock_table);
510510
int (*init_microcode)(struct smu_context *smu);

‎drivers/gpu/drm/amd/powerplay/smu_internal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@
8888
#define smu_update_pcie_parameters(smu, pcie_gen_cap, pcie_width_cap) smu_ppt_funcs(update_pcie_parameters, 0, smu, pcie_gen_cap, pcie_width_cap)
8989
#define smu_disable_umc_cdr_12gbps_workaround(smu) smu_ppt_funcs(disable_umc_cdr_12gbps_workaround, 0, smu)
9090
#define smu_set_power_source(smu, power_src) smu_ppt_funcs(set_power_source, 0, smu, power_src)
91-
#define smu_i2c_eeprom_init(smu, control) smu_ppt_funcs(i2c_eeprom_init, 0, smu, control)
92-
#define smu_i2c_eeprom_fini(smu, control) smu_ppt_funcs(i2c_eeprom_fini, 0, smu, control)
91+
#define smu_i2c_init(smu, control) smu_ppt_funcs(i2c_init, 0, smu, control)
92+
#define smu_i2c_fini(smu, control) smu_ppt_funcs(i2c_fini, 0, smu, control)
9393
#define smu_get_unique_id(smu) smu_ppt_funcs(get_unique_id, 0, smu)
9494
#define smu_log_thermal_throttling(smu) smu_ppt_funcs(log_thermal_throttling_event, 0, smu)
9595
#define smu_get_asic_power_limits(smu) smu_ppt_funcs(get_power_limit, 0, smu)

0 commit comments

Comments
 (0)