drm/amdgpu: retire legacy get_retire_flip_bits interface for UMC

Remove the legacy general get_retire_flip_bits interface for UMC

Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Ce Sun <cesun102@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 82175a84875f32e8bc9fb43dd1f117c8e1ffd663..ff1524fdb35f9284ac5a1007aced466af366a411 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -3209,10 +3209,6 @@ int amdgpu_ras_init_badpage_info(struct amdgpu_device *adev)
        ret = amdgpu_ras_eeprom_init(control);
        control->is_eeprom_valid = !ret;
 
-       if (adev->umc.ras &&
-           adev->umc.ras->get_retire_flip_bits)
-               adev->umc.ras->get_retire_flip_bits(adev);
-
        if (control->ras_num_recs && control->is_eeprom_valid) {
                ret = amdgpu_ras_load_bad_pages(adev);
                if (ret) {

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h
index 46c42997d3144327401374456fc2d64cfa5efcca..b2a3db60d231ede00aeeea47a2be89f6bb0fe9f8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h
@@ -77,18 +77,6 @@
 #define UMC_NPS_SHIFT 40
 #define UMC_NPS_MASK 0xffULL
 
-/* three column bits and one row bit in MCA address flip
- * in bad page retirement
- */
-#define RETIRE_FLIP_BITS_NUM 4
-
-struct amdgpu_umc_flip_bits {
-       uint32_t flip_bits_in_pa[RETIRE_FLIP_BITS_NUM];
-       uint32_t flip_row_bit;
-       uint32_t r13_in_pa;
-       uint32_t bit_num;
-};
-
 typedef int (*umc_func)(struct amdgpu_device *adev, uint32_t node_inst,
                        uint32_t umc_inst, uint32_t ch_inst, void *data);
 
@@ -100,7 +88,6 @@ struct amdgpu_umc_ras {
                                      void *ras_error_status);
        void (*ecc_info_query_ras_error_address)(struct amdgpu_device *adev,
                                        void *ras_error_status);
-       void (*get_retire_flip_bits)(struct amdgpu_device *adev);
 };
 
 struct amdgpu_umc_funcs {
@@ -132,8 +119,6 @@ struct amdgpu_umc {
        /* active mask for umc node instance */
        unsigned long active_mask;
 
-       struct amdgpu_umc_flip_bits flip_bits;
-
        unsigned long err_addr_cnt;
 };