lkml.org 
[lkml]   [2021]   [Jul]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.12 107/160] drm/amdgpu: fix bad address translation for sienna_cichlid
    Date
    From: "Stanley.Yang" <Stanley.Yang@amd.com>

    [ Upstream commit 6ec598cc9dfbf40433e94a2ed1a622e3ef80268b ]

    Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com>
    Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 5 +++++
    drivers/gpu/drm/amd/amdgpu/umc_v8_7.c | 2 +-
    2 files changed, 6 insertions(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h
    index 183814493658..bda4438c3925 100644
    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h
    @@ -21,6 +21,11 @@
    #ifndef __AMDGPU_UMC_H__
    #define __AMDGPU_UMC_H__

    +/*
    + * (addr / 256) * 4096, the higher 26 bits in ErrorAddr
    + * is the index of 4KB block
    + */
    +#define ADDR_OF_4KB_BLOCK(addr) (((addr) & ~0xffULL) << 4)
    /*
    * (addr / 256) * 8192, the higher 26 bits in ErrorAddr
    * is the index of 8KB block
    diff --git a/drivers/gpu/drm/amd/amdgpu/umc_v8_7.c b/drivers/gpu/drm/amd/amdgpu/umc_v8_7.c
    index a064c097690c..66fd797a6f0e 100644
    --- a/drivers/gpu/drm/amd/amdgpu/umc_v8_7.c
    +++ b/drivers/gpu/drm/amd/amdgpu/umc_v8_7.c
    @@ -233,7 +233,7 @@ static void umc_v8_7_query_error_address(struct amdgpu_device *adev,
    err_addr &= ~((0x1ULL << lsb) - 1);

    /* translate umc channel address to soc pa, 3 parts are included */
    - retired_page = ADDR_OF_8KB_BLOCK(err_addr) |
    + retired_page = ADDR_OF_4KB_BLOCK(err_addr) |
    ADDR_OF_256B_BLOCK(channel_index) |
    OFFSET_IN_256B_BLOCK(err_addr);

    --
    2.30.2
    \
     
     \ /
      Last update: 2021-07-06 14:11    [W:4.141 / U:0.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site