drm/amdgpu: Don't offset by 2 in FRU EEPROM

[ Upstream commit 3f3a24a0a3a58677d2b4f3c442d7a1be05afb123 ]

Read buffers no longer expose the I2C address, and so we don't need to
offset by two when we get the read data.

Cc: Alex Deucher <Alexander.Deucher@amd.com>
Cc: Kent Russell <kent.russell@amd.com>
Cc: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Fixes: bd607166af7fe3 ("drm/amdgpu: Enable reading FRU chip via I2C v3")
Signed-off-by: Luben Tuikov <luben.tuikov@amd.com>
Acked-by: Harish Kasiviswanathan <Harish.Kasiviswanathan@amd.com>
Reviewed-by: Kent Russell <kent.russell@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c
index 2a786e78862777e41399cd5d6dc9a08fc7583081..978c46395ced062dd0e6f34f4e6d6c439bd97472 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c
@@ -91,17 +91,13 @@ static int amdgpu_fru_read_eeprom(struct amdgpu_device *adev, uint32_t addrptr,
 
 int amdgpu_fru_get_product_info(struct amdgpu_device *adev)
 {
-       unsigned char buff[AMDGPU_PRODUCT_NAME_LEN+2];
+       unsigned char buff[AMDGPU_PRODUCT_NAME_LEN];
        u32 addrptr;
        int size, len;
-       int offset = 2;
 
        if (!is_fru_eeprom_supported(adev))
                return 0;
 
-       if (adev->asic_type == CHIP_ALDEBARAN)
-               offset = 0;
-
        /* If algo exists, it means that the i2c_adapter's initialized */
        if (!adev->pm.smu_i2c.algo) {
                DRM_WARN("Cannot access FRU, EEPROM accessor not initialized");
@@ -143,8 +139,7 @@ int amdgpu_fru_get_product_info(struct amdgpu_device *adev)
                                AMDGPU_PRODUCT_NAME_LEN);
                len = AMDGPU_PRODUCT_NAME_LEN - 1;
        }
-       /* Start at 2 due to buff using fields 0 and 1 for the address */
-       memcpy(adev->product_name, &buff[offset], len);
+       memcpy(adev->product_name, buff, len);
        adev->product_name[len] = '\0';
 
        addrptr += size + 1;
@@ -162,7 +157,7 @@ int amdgpu_fru_get_product_info(struct amdgpu_device *adev)
                DRM_WARN("FRU Product Number is larger than 16 characters. This is likely a mistake");
                len = sizeof(adev->product_number) - 1;
        }
-       memcpy(adev->product_number, &buff[offset], len);
+       memcpy(adev->product_number, buff, len);
        adev->product_number[len] = '\0';
 
        addrptr += size + 1;
@@ -189,7 +184,7 @@ int amdgpu_fru_get_product_info(struct amdgpu_device *adev)
                DRM_WARN("FRU Serial Number is larger than 16 characters. This is likely a mistake");
                len = sizeof(adev->serial) - 1;
        }
-       memcpy(adev->serial, &buff[offset], len);
+       memcpy(adev->serial, buff, len);
        adev->serial[len] = '\0';
 
        return 0;