From 066d27b3dfcc75b38de35aaf5d899924767655a3 Mon Sep 17 00:00:00 2001 From: John Clements Date: Mon, 3 Aug 2020 14:45:58 +0800 Subject: [PATCH] drm/amdgpu: added RAS EEPROM device support check updated RAS EEPROM init/threshold sequences to check for device support Signed-off-by: John Clements Change-Id: Ib88f2ba7f716a007123f7fb474b98cad4166f6e2 --- drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c index e5e3ed113d63..961c8cdc75bf 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c @@ -59,6 +59,15 @@ #define to_amdgpu_device(x) (container_of(x, struct amdgpu_ras, eeprom_control))->adev +static bool __is_ras_eeprom_supported(struct amdgpu_device *adev) +{ + if ((adev->asic_type == CHIP_VEGA20) || + (adev->asic_type == CHIP_ARCTURUS)) + return true; + + return false; +} + static bool __get_eeprom_i2c_addr_arct(struct amdgpu_device *adev, uint16_t *i2c_addr) { @@ -274,6 +283,9 @@ int amdgpu_ras_eeprom_init(struct amdgpu_ras_eeprom_control *control, .buf = buff, }; + if (!__is_ras_eeprom_supported(adev)) + return 0; + *exceed_err_limit = false; /* Verify i2c adapter is initialized */ @@ -428,6 +440,9 @@ int amdgpu_ras_eeprom_check_err_threshold( }; int ret; + if (!__is_ras_eeprom_supported(adev)) + return 0; + *exceed_err_limit = false; /* read EEPROM table header */ @@ -465,7 +480,7 @@ int amdgpu_ras_eeprom_process_recods(struct amdgpu_ras_eeprom_control *control, struct amdgpu_device *adev = to_amdgpu_device(control); struct amdgpu_ras *ras = amdgpu_ras_get_context(adev); - if (adev->asic_type != CHIP_VEGA20 && adev->asic_type != CHIP_ARCTURUS) + if (!__is_ras_eeprom_supported(adev)) return 0; buffs = kcalloc(num, EEPROM_ADDRESS_SIZE + EEPROM_TABLE_RECORD_SIZE, -- 2.17.1