Commit c0838d3a authored by Luben Tuikov's avatar Luben Tuikov Committed by Alex Deucher
Browse files

drm/amdgpu: The I2C IP doesn't support 0 writes/reads 



The I2C IP doesn't support writes or reads of 0 bytes.

In order for a START/STOP transaction to take
place on the bus, the data written/read has to be
at least one byte.

That is, you cannot generate a write with 0 bytes,
just to get the ACK from a device, just so you can
probe that device if it is on the bus and so to
discover all devices on the bus--you'll have to
read at least one byte. Writes of 0 bytes generate
no START/STOP on this I2C IP--the bus is not
engaged at all.

Set the I2C_AQ_NO_ZERO_LEN to the existing I2C
quirk tables for Aldebaran, Arcturus, Navi10 and
Sienna Cichlid, and add a quirk table to the I2C
driver which drives the bus when the SMU
doesn't--for instance on Vega20.

Cc: Alexander Deucher <Alexander.Deucher@amd.com>
Cc: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Cc: Lijo Lazar <Lijo.Lazar@amd.com>
Cc: John Clements <john.clements@amd.com>
Cc: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarLuben Tuikov <luben.tuikov@amd.com>
Reviewed-by: default avatarLijo Lazar <Lijo.Lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ae87df07

drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c

+5 −0
Original line number Diff line number Diff line
@@ -702,6 +702,10 @@ static const struct i2c_algorithm smu_v11_0_i2c_algo = { 
	.functionality = smu_v11_0_i2c_func,

};



static const struct i2c_adapter_quirks smu_v11_0_i2c_control_quirks = {

	.flags = I2C_AQ_NO_ZERO_LEN,

};



int smu_v11_0_i2c_control_init(struct i2c_adapter *control)

{

	struct amdgpu_device *adev = to_amdgpu_device(control);
@@ -714,6 +718,7 @@ int smu_v11_0_i2c_control_init(struct i2c_adapter *control) 
	control->algo = &smu_v11_0_i2c_algo;

	snprintf(control->name, sizeof(control->name), "AMDGPU SMU");

	control->lock_ops = &smu_v11_0_i2c_i2c_lock_ops;

	control->quirks = &smu_v11_0_i2c_control_quirks;



	res = i2c_add_adapter(control);

	if (res)

drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c

+1 −1
Original line number Diff line number Diff line
@@ -2022,7 +2022,7 @@ static const struct i2c_algorithm arcturus_i2c_algo = { 




static const struct i2c_adapter_quirks arcturus_i2c_control_quirks = {

	.flags = I2C_AQ_COMB | I2C_AQ_COMB_SAME_ADDR,

	.flags = I2C_AQ_COMB | I2C_AQ_COMB_SAME_ADDR | I2C_AQ_NO_ZERO_LEN,

	.max_read_len  = MAX_SW_I2C_COMMANDS,

	.max_write_len = MAX_SW_I2C_COMMANDS,

	.max_comb_1st_msg_len = 2,

drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c

+1 −1
Original line number Diff line number Diff line
@@ -2820,7 +2820,7 @@ static const struct i2c_algorithm navi10_i2c_algo = { 
};



static const struct i2c_adapter_quirks navi10_i2c_control_quirks = {

	.flags = I2C_AQ_COMB | I2C_AQ_COMB_SAME_ADDR,

	.flags = I2C_AQ_COMB | I2C_AQ_COMB_SAME_ADDR | I2C_AQ_NO_ZERO_LEN,

	.max_read_len  = MAX_SW_I2C_COMMANDS,

	.max_write_len = MAX_SW_I2C_COMMANDS,

	.max_comb_1st_msg_len = 2,

drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c

+1 −1
Original line number Diff line number Diff line
@@ -3527,7 +3527,7 @@ static const struct i2c_algorithm sienna_cichlid_i2c_algo = { 
};



static const struct i2c_adapter_quirks sienna_cichlid_i2c_control_quirks = {

	.flags = I2C_AQ_COMB | I2C_AQ_COMB_SAME_ADDR,

	.flags = I2C_AQ_COMB | I2C_AQ_COMB_SAME_ADDR | I2C_AQ_NO_ZERO_LEN,

	.max_read_len  = MAX_SW_I2C_COMMANDS,

	.max_write_len = MAX_SW_I2C_COMMANDS,

	.max_comb_1st_msg_len = 2,

drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c

+1 −1
Original line number Diff line number Diff line
@@ -1510,7 +1510,7 @@ static const struct i2c_algorithm aldebaran_i2c_algo = { 
};



static const struct i2c_adapter_quirks aldebaran_i2c_control_quirks = {

	.flags = I2C_AQ_COMB | I2C_AQ_COMB_SAME_ADDR,

	.flags = I2C_AQ_COMB | I2C_AQ_COMB_SAME_ADDR | I2C_AQ_NO_ZERO_LEN,

	.max_read_len  = MAX_SW_I2C_COMMANDS,

	.max_write_len = MAX_SW_I2C_COMMANDS,

	.max_comb_1st_msg_len = 2,