| Message ID | 20220913144832.2784012-4-alexander.deucher@amd.com |
|---|---|
| State | New |
| Headers | show |
| Series | fix PCI AER issues | expand |
Am 13.09.22 um 16:48 schrieb Alex Deucher: > Move common IP init before GMC init so that HDP gets > remapped before GMC init which uses it. At some point we should improve this so that we have the common and GMC stuff in the hardware init as first thing without those hacks. But anyway Acked-by for now since this is higher level design work. Regards, Christian. > > This fixes the Unsupported Request error reported through > AER during driver load. The error happens as a write happens > to the remap offset before real remapping is done. > > Link: https://bugzilla.kernel.org/show_bug.cgi?id=216373 > > The error was unnoticed before and got visible because of the commit > referenced below. This doesn't fix anything in the commit below, rather > fixes the issue in amdgpu exposed by the commit. The reference is only > to associate this commit with below one so that both go together. > > Fixes: 8795e182b02d ("PCI/portdrv: Don't disable AER reporting in get_port_device_capability()") > > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 14 +++++++++++--- > 1 file changed, 11 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index 899564ea8b4b..4da85ce9e3b1 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -2375,8 +2375,16 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) > } > adev->ip_blocks[i].status.sw = true; > > - /* need to do gmc hw init early so we can allocate gpu mem */ > - if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GMC) { > + if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_COMMON) { > + /* need to do common hw init early so everything is set up for gmc */ > + r = adev->ip_blocks[i].version->funcs->hw_init((void *)adev); > + if (r) { > + DRM_ERROR("hw_init %d failed %d\n", i, r); > + goto init_failed; > + } > + adev->ip_blocks[i].status.hw = true; > + } else if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GMC) { > + /* need to do gmc hw init early so we can allocate gpu mem */ > /* Try to reserve bad pages early */ > if (amdgpu_sriov_vf(adev)) > amdgpu_virt_exchange_data(adev); > @@ -3062,8 +3070,8 @@ static int amdgpu_device_ip_reinit_early_sriov(struct amdgpu_device *adev) > int i, r; > > static enum amd_ip_block_type ip_order[] = { > - AMD_IP_BLOCK_TYPE_GMC, > AMD_IP_BLOCK_TYPE_COMMON, > + AMD_IP_BLOCK_TYPE_GMC, > AMD_IP_BLOCK_TYPE_PSP, > AMD_IP_BLOCK_TYPE_IH, > };
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 899564ea8b4b..4da85ce9e3b1 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -2375,8 +2375,16 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) } adev->ip_blocks[i].status.sw = true; - /* need to do gmc hw init early so we can allocate gpu mem */ - if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GMC) { + if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_COMMON) { + /* need to do common hw init early so everything is set up for gmc */ + r = adev->ip_blocks[i].version->funcs->hw_init((void *)adev); + if (r) { + DRM_ERROR("hw_init %d failed %d\n", i, r); + goto init_failed; + } + adev->ip_blocks[i].status.hw = true; + } else if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GMC) { + /* need to do gmc hw init early so we can allocate gpu mem */ /* Try to reserve bad pages early */ if (amdgpu_sriov_vf(adev)) amdgpu_virt_exchange_data(adev); @@ -3062,8 +3070,8 @@ static int amdgpu_device_ip_reinit_early_sriov(struct amdgpu_device *adev) int i, r; static enum amd_ip_block_type ip_order[] = { - AMD_IP_BLOCK_TYPE_GMC, AMD_IP_BLOCK_TYPE_COMMON, + AMD_IP_BLOCK_TYPE_GMC, AMD_IP_BLOCK_TYPE_PSP, AMD_IP_BLOCK_TYPE_IH, };
Move common IP init before GMC init so that HDP gets remapped before GMC init which uses it. This fixes the Unsupported Request error reported through AER during driver load. The error happens as a write happens to the remap offset before real remapping is done. Link: https://bugzilla.kernel.org/show_bug.cgi?id=216373 The error was unnoticed before and got visible because of the commit referenced below. This doesn't fix anything in the commit below, rather fixes the issue in amdgpu exposed by the commit. The reference is only to associate this commit with below one so that both go together. Fixes: 8795e182b02d ("PCI/portdrv: Don't disable AER reporting in get_port_device_capability()") Signed-off-by: Alex Deucher <alexander.deucher@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)