<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style> </head> <body dir="ltr"> [AMD Official Use Only - Internal Distribution Only] <div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> I'm working on the mmhub clients list. Will send out patches for them soon.</div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> </div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> Alex</div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> </div> <div id="appendonsend"></div> <hr style="display:inline-block;width:98%" tabindex="-1"> <div id="divRplyFwdMsg" dir="ltr">From: Christian König <ckoenig.leichtzumerken@gmail.com> Sent: Wednesday, September 2, 2020 3:17 AM To: Kuehling, Felix <Felix.Kuehling@amd.com>; Alex Deucher <alexdeucher@gmail.com>; amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org> Cc: Deucher, Alexander <Alexander.Deucher@amd.com> Subject: Re: [PATCH 2/2] drm/amdgpu/gmc10: print client id string for gfxhub <div> </div> </div> <div class="BodyFragment"> <div class="PlainText">Am 02.09.20 um 04:32 schrieb Felix Kuehling: > Should there a corresponding change in mmhub_v2_0.c? It would be at least nice to have. Maybe we should put a pointer to the array and its size into the hub structure instead? Anyway Reviewed-by: Christian König <christian.koenig@amd.com> for now. Christian. > > Other than that, the series is > > Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> > > On 2020-09-01 5:51 p.m., Alex Deucher wrote: >> Print the name of the client rather than the number. This >> makes it easier to debug what block is causing the fault. >> >> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> >> --- >> drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 30 +++++++++++++++++++++--- >> drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 30 +++++++++++++++++++++--- >> 2 files changed, 54 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c >> b/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c >> index 76acd7f7723e..b882ac59879a 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c >> +++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c >> @@ -31,6 +31,27 @@ >> #include "soc15_common.h" >> +static const char *gfxhub_client_ids[] = { >> + "CB/DB", >> + "Reserved", >> + "GE1", >> + "GE2", >> + "CPF", >> + "CPC", >> + "CPG", >> + "RLC", >> + "TCP", >> + "SQC (inst)", >> + "SQC (data)", >> + "SQG", >> + "Reserved", >> + "SDMA0", >> + "SDMA1", >> + "GCR", >> + "SDMA2", >> + "SDMA3", >> +}; >> + >> static uint32_t gfxhub_v2_0_get_invalidate_req(unsigned int vmid, >> uint32_t flush_type) >> { >> @@ -55,12 +76,15 @@ static void >> gfxhub_v2_0_print_l2_protection_fault_status(struct amdgpu_device >> *adev, >> uint32_t status) >> { >> + u32 cid = REG_GET_FIELD(status, >> + GCVM_L2_PROTECTION_FAULT_STATUS, CID); >> + >> dev_err(adev->dev, >> "GCVM_L2_PROTECTION_FAULT_STATUS:0x%08X\n", >> status); >> - dev_err(adev->dev, "\t Faulty UTCL2 client ID: 0x%lx\n", >> - REG_GET_FIELD(status, >> - GCVM_L2_PROTECTION_FAULT_STATUS, CID)); >> + dev_err(adev->dev, "\t Faulty UTCL2 client ID: %s (0x%x)\n", >> + cid >= ARRAY_SIZE(gfxhub_client_ids) ? "unknown" : >> gfxhub_client_ids[cid], >> + cid); >> dev_err(adev->dev, "\t MORE_FAULTS: 0x%lx\n", >> REG_GET_FIELD(status, >> GCVM_L2_PROTECTION_FAULT_STATUS, MORE_FAULTS)); >> diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c >> b/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c >> index 80c906a0383f..237a9ff5afa0 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c >> +++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c >> @@ -31,6 +31,27 @@ >> #include "soc15_common.h" >> +static const char *gfxhub_client_ids[] = { >> + "CB/DB", >> + "Reserved", >> + "GE1", >> + "GE2", >> + "CPF", >> + "CPC", >> + "CPG", >> + "RLC", >> + "TCP", >> + "SQC (inst)", >> + "SQC (data)", >> + "SQG", >> + "Reserved", >> + "SDMA0", >> + "SDMA1", >> + "GCR", >> + "SDMA2", >> + "SDMA3", >> +}; >> + >> static uint32_t gfxhub_v2_1_get_invalidate_req(unsigned int vmid, >> uint32_t flush_type) >> { >> @@ -55,12 +76,15 @@ static void >> gfxhub_v2_1_print_l2_protection_fault_status(struct amdgpu_device >> *adev, >> uint32_t status) >> { >> + u32 cid = REG_GET_FIELD(status, >> + GCVM_L2_PROTECTION_FAULT_STATUS, CID); >> + >> dev_err(adev->dev, >> "GCVM_L2_PROTECTION_FAULT_STATUS:0x%08X\n", >> status); >> - dev_err(adev->dev, "\t Faulty UTCL2 client ID: 0x%lx\n", >> - REG_GET_FIELD(status, >> - GCVM_L2_PROTECTION_FAULT_STATUS, CID)); >> + dev_err(adev->dev, "\t Faulty UTCL2 client ID: %s (0x%x)\n", >> + cid >= ARRAY_SIZE(gfxhub_client_ids) ? "unknown" : >> gfxhub_client_ids[cid], >> + cid); >> dev_err(adev->dev, "\t MORE_FAULTS: 0x%lx\n", >> REG_GET_FIELD(status, >> GCVM_L2_PROTECTION_FAULT_STATUS, MORE_FAULTS)); > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > <a href="https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Calexander.deucher%40amd.com%7C0d36fe896c0d4f7605d908d84f104fa2%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637346278764796534&sdata=gE2GPBkm3S4KDP9hg9itNXEs%2F4E1QnkPYmELRWsRdKE%3D&reserved=0"> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Calexander.deucher%40amd.com%7C0d36fe896c0d4f7605d908d84f104fa2%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637346278764796534&sdata=gE2GPBkm3S4KDP9hg9itNXEs%2F4E1QnkPYmELRWsRdKE%3D&reserved=0</a> </div> </div> </div> </body> </html>