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

drm/amdgpu: EEPROM: add explicit read and write 



Add explicit amdgpu_eeprom_read() and
amdgpu_eeprom_write() for clarity.

Cc: Jean Delvare <jdelvare@suse.de>
Cc: Alexander Deucher <Alexander.Deucher@amd.com>
Cc: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Cc: Lijo Lazar <Lijo.Lazar@amd.com>
Cc: Stanley Yang <Stanley.Yang@amd.com>
Cc: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarLuben Tuikov <luben.tuikov@amd.com>
Acked-by: default avatarAlexander Deucher <Alexander.Deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1fab841f

drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.h

+16 −0
Original line number Diff line number Diff line
@@ -29,4 +29,20 @@ 
int amdgpu_eeprom_xfer(struct i2c_adapter *i2c_adap, u32 eeprom_addr,

		       u8 *eeprom_buf, u16 bytes, bool read);



static inline int amdgpu_eeprom_read(struct i2c_adapter *i2c_adap,

				     u32 eeprom_addr, u8 *eeprom_buf,

				     u16 bytes)

{

	return amdgpu_eeprom_xfer(i2c_adap, eeprom_addr, eeprom_buf, bytes,

				  true);

}



static inline int amdgpu_eeprom_write(struct i2c_adapter *i2c_adap,

				      u32 eeprom_addr, u8 *eeprom_buf,

				      u16 bytes)

{

	return amdgpu_eeprom_xfer(i2c_adap, eeprom_addr, eeprom_buf, bytes,

				  false);

}



#endif

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

+2 −3
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static int amdgpu_fru_read_eeprom(struct amdgpu_device *adev, uint32_t addrptr, 
{

	int ret, size;



	ret = amdgpu_eeprom_xfer(&adev->pm.smu_i2c, addrptr, buff, 1, true);

	ret = amdgpu_eeprom_read(&adev->pm.smu_i2c, addrptr, buff, 1);

	if (ret < 1) {

		DRM_WARN("FRU: Failed to get size field");

		return ret;
@@ -77,8 +77,7 @@ static int amdgpu_fru_read_eeprom(struct amdgpu_device *adev, uint32_t addrptr, 
	 */

	size = buff[0] - I2C_PRODUCT_INFO_OFFSET;



	ret = amdgpu_eeprom_xfer(&adev->pm.smu_i2c, addrptr + 1, buff, size,

				 true);

	ret = amdgpu_eeprom_read(&adev->pm.smu_i2c, addrptr + 1, buff, size);

	if (ret < 1) {

		DRM_WARN("FRU: Failed to get data field");

		return ret;

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

+5 −5
Original line number Diff line number Diff line
@@ -151,9 +151,9 @@ static int __update_table_header(struct amdgpu_ras_eeprom_control *control, 


	/* i2c may be unstable in gpu reset */

	down_read(&adev->reset_sem);

	ret = amdgpu_eeprom_xfer(&adev->pm.smu_i2c,

	ret = amdgpu_eeprom_write(&adev->pm.smu_i2c,

				  control->i2c_address + RAS_HDR_START,

				 buff, RAS_TABLE_HEADER_SIZE, false);

				  buff, RAS_TABLE_HEADER_SIZE);

	up_read(&adev->reset_sem);



	if (ret < 1)
@@ -298,9 +298,9 @@ int amdgpu_ras_eeprom_init(struct amdgpu_ras_eeprom_control *control, 
	mutex_init(&control->tbl_mutex);



	/* Read/Create table header from EEPROM address 0 */

	ret = amdgpu_eeprom_xfer(&adev->pm.smu_i2c,

	ret = amdgpu_eeprom_read(&adev->pm.smu_i2c,

				 control->i2c_address + RAS_HDR_START,

				 buff, RAS_TABLE_HEADER_SIZE, true);

				 buff, RAS_TABLE_HEADER_SIZE);

	if (ret < 1) {

		DRM_ERROR("Failed to read EEPROM table header, ret:%d", ret);

		return ret;