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: Luben Tuikov <luben.tuikov@amd.com>
Acked-by: Alexander Deucher <Alexander.Deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.h
index 417472be2712e6f6fc64a4f5554386633e88ef39..966b434f0de2b7eecc29c0433c99f0976fbf99d5 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.h
@@ -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

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c
index 69b9559f840ac3122db00d659a4eb934832e0360..7709caeb233d678dcd376140537745d6ee381103 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c
@@ -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;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
index 550a31953d2da17ed681bf45f0ce590c51b3f71f..17cea35275e46c32b99a9aedb1ab4674f6040ba8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
@@ -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,
-                                control->i2c_address + RAS_HDR_START,
-                                buff, RAS_TABLE_HEADER_SIZE, false);
+       ret = amdgpu_eeprom_write(&adev->pm.smu_i2c,
+                                 control->i2c_address + RAS_HDR_START,
+                                 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;