Merge tag '5.16-rc-part1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6

[J-linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_mca.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c
index a2d3dbbf7d2574ce31dc21a835607ea0302370f3..ce538f4819f925c1b9c5afffc591c21c6c14e0bd 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c
@@ -31,7 +31,7 @@ void amdgpu_mca_query_correctable_error_count(struct amdgpu_device *adev,
                                              uint64_t mc_status_addr,
                                              unsigned long *error_count)
 {
-       uint64_t mc_status = RREG64_PCIE(mc_status_addr * 4);
+       uint64_t mc_status = RREG64_PCIE(mc_status_addr);
 
        if (REG_GET_FIELD(mc_status, MCA_UMC_UMC0_MCUMC_STATUST0, Val) == 1 &&
            REG_GET_FIELD(mc_status, MCA_UMC_UMC0_MCUMC_STATUST0, CECC) == 1)
@@ -42,7 +42,7 @@ void amdgpu_mca_query_uncorrectable_error_count(struct amdgpu_device *adev,
                                                uint64_t mc_status_addr,
                                                unsigned long *error_count)
 {
-       uint64_t mc_status = RREG64_PCIE(mc_status_addr * 4);
+       uint64_t mc_status = RREG64_PCIE(mc_status_addr);
 
        if ((REG_GET_FIELD(mc_status, MCA_UMC_UMC0_MCUMC_STATUST0, Val) == 1) &&
            (REG_GET_FIELD(mc_status, MCA_UMC_UMC0_MCUMC_STATUST0, Deferred) == 1 ||
@@ -56,7 +56,7 @@ void amdgpu_mca_query_uncorrectable_error_count(struct amdgpu_device *adev,
 void amdgpu_mca_reset_error_count(struct amdgpu_device *adev,
                                  uint64_t mc_status_addr)
 {
-       WREG64_PCIE(mc_status_addr * 4, 0x0ULL);
+       WREG64_PCIE(mc_status_addr, 0x0ULL);
 }
 
 void amdgpu_mca_query_ras_error_count(struct amdgpu_device *adev,
@@ -87,8 +87,8 @@ int amdgpu_mca_ras_late_init(struct amdgpu_device *adev,
                if (!mca_dev->ras_if)
                        return -ENOMEM;
                mca_dev->ras_if->block = mca_dev->ras_funcs->ras_block;
+               mca_dev->ras_if->sub_block_index = mca_dev->ras_funcs->ras_sub_block;
                mca_dev->ras_if->type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE;
-               mca_dev->ras_if->sub_block_index = 0;
        }
        ih_info.head = fs_info.head = *mca_dev->ras_if;
        r = amdgpu_ras_late_init(adev, mca_dev->ras_if,