* [PATCH 1/2] drm/amdgpu: Revert "SWDEV-238407 drm/amdgpu/sriov: Need to clear kiq position" @ 2021-03-31 6:34 Emily Deng 2021-03-31 6:34 ` [PATCH 2/2] drm/amdgpu: Revert "SWDEV-238407 Add clear vf fw support" Emily Deng 0 siblings, 1 reply; 3+ messages in thread From: Emily Deng @ 2021-03-31 6:34 UTC (permalink / raw) To: amd-gfx; +Cc: Emily Deng As already moved the implementation to host driver, so remove this from guest driver. This reverts commit 96f7d59858ada4a6372fcb249b04805d14482c49. Signed-off-by: Emily Deng <Emily.Deng@amd.com> --- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c index b4fd0394cd08..7e012fa1a3f3 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c @@ -7237,7 +7237,6 @@ static int gfx_v10_0_hw_fini(void *handle) { struct amdgpu_device *adev = (struct amdgpu_device *)handle; int r; - uint32_t tmp; amdgpu_irq_put(adev, &adev->gfx.priv_reg_irq, 0); amdgpu_irq_put(adev, &adev->gfx.priv_inst_irq, 0); @@ -7256,11 +7255,6 @@ static int gfx_v10_0_hw_fini(void *handle) if (amdgpu_sriov_vf(adev)) { gfx_v10_0_cp_gfx_enable(adev, false); - /* Program KIQ position of RLC_CP_SCHEDULERS during destroy */ - tmp = RREG32_SOC15(GC, 0, mmRLC_CP_SCHEDULERS); - tmp &= 0xffffff00; - WREG32_SOC15(GC, 0, mmRLC_CP_SCHEDULERS, tmp); - return 0; } gfx_v10_0_cp_enable(adev, false); -- 2.25.1 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] drm/amdgpu: Revert "SWDEV-238407 Add clear vf fw support" 2021-03-31 6:34 [PATCH 1/2] drm/amdgpu: Revert "SWDEV-238407 drm/amdgpu/sriov: Need to clear kiq position" Emily Deng @ 2021-03-31 6:34 ` Emily Deng 2021-03-31 9:02 ` Deng, Emily 0 siblings, 1 reply; 3+ messages in thread From: Emily Deng @ 2021-03-31 6:34 UTC (permalink / raw) To: amd-gfx; +Cc: Emily Deng As already moved the support to host driver, so revert this in guest driver. This reverts commit 8d5e6f45df5f9073760dea0ab94321615cea16ec. Signed-off-by: Emily Deng <Emily.Deng@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 36 ++----------------------- drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 8 ------ 2 files changed, 2 insertions(+), 42 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index c36c8fca1f64..aa2f8fc4aac8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -291,9 +291,8 @@ psp_cmd_submit_buf(struct psp_context *psp, amdgpu_asic_invalidate_hdp(psp->adev, NULL); } - /* We allow TEE_ERROR_NOT_SUPPORTED for VMR command and PSP_ERR_UNKNOWN_COMMAND in SRIOV */ - skip_unsupport = (psp->cmd_buf_mem->resp.status == TEE_ERROR_NOT_SUPPORTED || - psp->cmd_buf_mem->resp.status == PSP_ERR_UNKNOWN_COMMAND) && amdgpu_sriov_vf(psp->adev); + /* We allow TEE_ERROR_NOT_SUPPORTED for VMR command in SRIOV */ + skip_unsupport = (psp->cmd_buf_mem->resp.status == 0xffff000a) && amdgpu_sriov_vf(psp->adev); memcpy((void*)&cmd->resp, (void*)&psp->cmd_buf_mem->resp, sizeof(struct psp_gfx_resp)); @@ -420,26 +419,6 @@ static int psp_tmr_init(struct psp_context *psp) return ret; } -static int psp_clear_vf_fw(struct psp_context *psp) -{ - int ret; - struct psp_gfx_cmd_resp *cmd; - - if (!amdgpu_sriov_vf(psp->adev) || psp->adev->asic_type != CHIP_NAVI12) - return 0; - - cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL); - if (!cmd) - return -ENOMEM; - - cmd->cmd_id = GFX_CMD_ID_CLEAR_VF_FW; - - ret = psp_cmd_submit_buf(psp, NULL, cmd, psp->fence_buf_mc_addr); - kfree(cmd); - - return ret; -} - static bool psp_skip_tmr(struct psp_context *psp) { switch (psp->adev->asic_type) { @@ -1924,12 +1903,6 @@ static int psp_hw_start(struct psp_context *psp) return ret; } - ret = psp_clear_vf_fw(psp); - if (ret) { - DRM_ERROR("PSP clear vf fw!\n"); - return ret; - } - ret = psp_boot_config_set(adev); if (ret) { DRM_WARN("PSP set boot config@\n"); @@ -2448,11 +2421,6 @@ static int psp_hw_fini(void *handle) } psp_asd_unload(psp); - ret = psp_clear_vf_fw(psp); - if (ret) { - DRM_ERROR("PSP clear vf fw!\n"); - return ret; - } psp_tmr_terminate(psp); psp_ring_destroy(psp, PSP_RING_TYPE__KM); diff --git a/drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h b/drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h index dd4d65f7e0f0..b5b1feaa259e 100644 --- a/drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h +++ b/drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h @@ -97,7 +97,6 @@ enum psp_gfx_cmd_id GFX_CMD_ID_SETUP_VMR = 0x00000009, /* setup VMR region */ GFX_CMD_ID_DESTROY_VMR = 0x0000000A, /* destroy VMR region */ GFX_CMD_ID_PROG_REG = 0x0000000B, /* program regs */ - GFX_CMD_ID_CLEAR_VF_FW = 0x0000000D, /* Clear VF FW, to be used on VF shutdown. */ GFX_CMD_ID_GET_FW_ATTESTATION = 0x0000000F, /* Query GPUVA of the Fw Attestation DB */ /* IDs upto 0x1F are reserved for older programs (Raven, Vega 10/12/20) */ GFX_CMD_ID_LOAD_TOC = 0x00000020, /* Load TOC and obtain TMR size */ @@ -401,11 +400,4 @@ struct psp_gfx_rb_frame /* total 64 bytes */ }; -#define PSP_ERR_UNKNOWN_COMMAND 0x00000100 - -enum tee_error_code { - TEE_SUCCESS = 0x00000000, - TEE_ERROR_NOT_SUPPORTED = 0xFFFF000A, -}; - #endif /* _PSP_TEE_GFX_IF_H_ */ -- 2.25.1 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [PATCH 2/2] drm/amdgpu: Revert "SWDEV-238407 Add clear vf fw support" 2021-03-31 6:34 ` [PATCH 2/2] drm/amdgpu: Revert "SWDEV-238407 Add clear vf fw support" Emily Deng @ 2021-03-31 9:02 ` Deng, Emily 0 siblings, 0 replies; 3+ messages in thread From: Deng, Emily @ 2021-03-31 9:02 UTC (permalink / raw) To: Deng, Emily, amd-gfx@lists.freedesktop.org [AMD Official Use Only - Internal Distribution Only] Ping ...... >-----Original Message----- >From: Emily Deng <Emily.Deng@amd.com> >Sent: Wednesday, March 31, 2021 2:34 PM >To: amd-gfx@lists.freedesktop.org >Cc: Deng, Emily <Emily.Deng@amd.com> >Subject: [PATCH 2/2] drm/amdgpu: Revert "SWDEV-238407 Add clear vf fw >support" > >As already moved the support to host driver, so revert this in guest driver. >This reverts commit 8d5e6f45df5f9073760dea0ab94321615cea16ec. > >Signed-off-by: Emily Deng <Emily.Deng@amd.com> >--- > drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 36 ++----------------------- >drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 8 ------ > 2 files changed, 2 insertions(+), 42 deletions(-) > >diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c >b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c >index c36c8fca1f64..aa2f8fc4aac8 100644 >--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c >+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c >@@ -291,9 +291,8 @@ psp_cmd_submit_buf(struct psp_context *psp, > amdgpu_asic_invalidate_hdp(psp->adev, NULL); > } > >-/* We allow TEE_ERROR_NOT_SUPPORTED for VMR command and >PSP_ERR_UNKNOWN_COMMAND in SRIOV */ >-skip_unsupport = (psp->cmd_buf_mem->resp.status == >TEE_ERROR_NOT_SUPPORTED || >-psp->cmd_buf_mem->resp.status == >PSP_ERR_UNKNOWN_COMMAND) && amdgpu_sriov_vf(psp->adev); >+/* We allow TEE_ERROR_NOT_SUPPORTED for VMR command in >SRIOV */ >+skip_unsupport = (psp->cmd_buf_mem->resp.status == 0xffff000a) >&& >+amdgpu_sriov_vf(psp->adev); > > memcpy((void*)&cmd->resp, (void*)&psp->cmd_buf_mem->resp, >sizeof(struct psp_gfx_resp)); > >@@ -420,26 +419,6 @@ static int psp_tmr_init(struct psp_context *psp) > return ret; > } > >-static int psp_clear_vf_fw(struct psp_context *psp) -{ >-int ret; >-struct psp_gfx_cmd_resp *cmd; >- >-if (!amdgpu_sriov_vf(psp->adev) || psp->adev->asic_type != >CHIP_NAVI12) >-return 0; >- >-cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL); >-if (!cmd) >-return -ENOMEM; >- >-cmd->cmd_id = GFX_CMD_ID_CLEAR_VF_FW; >- >-ret = psp_cmd_submit_buf(psp, NULL, cmd, psp- >>fence_buf_mc_addr); >-kfree(cmd); >- >-return ret; >-} >- > static bool psp_skip_tmr(struct psp_context *psp) { > switch (psp->adev->asic_type) { >@@ -1924,12 +1903,6 @@ static int psp_hw_start(struct psp_context *psp) > return ret; > } > >-ret = psp_clear_vf_fw(psp); >-if (ret) { >-DRM_ERROR("PSP clear vf fw!\n"); >-return ret; >-} >- > ret = psp_boot_config_set(adev); > if (ret) { > DRM_WARN("PSP set boot config@\n"); >@@ -2448,11 +2421,6 @@ static int psp_hw_fini(void *handle) > } > > psp_asd_unload(psp); >-ret = psp_clear_vf_fw(psp); >-if (ret) { >-DRM_ERROR("PSP clear vf fw!\n"); >-return ret; >-} > > psp_tmr_terminate(psp); > psp_ring_destroy(psp, PSP_RING_TYPE__KM); diff --git >a/drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h >b/drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h >index dd4d65f7e0f0..b5b1feaa259e 100644 >--- a/drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h >+++ b/drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h >@@ -97,7 +97,6 @@ enum psp_gfx_cmd_id > GFX_CMD_ID_SETUP_VMR = 0x00000009, /* setup VMR region */ > GFX_CMD_ID_DESTROY_VMR = 0x0000000A, /* destroy VMR region >*/ > GFX_CMD_ID_PROG_REG = 0x0000000B, /* program regs */ >- GFX_CMD_ID_CLEAR_VF_FW = 0x0000000D, /* Clear VF FW, to be >used on VF shutdown. */ > GFX_CMD_ID_GET_FW_ATTESTATION = 0x0000000F, /* Query GPUVA of >the Fw Attestation DB */ > /* IDs upto 0x1F are reserved for older programs (Raven, Vega 10/12/20) >*/ > GFX_CMD_ID_LOAD_TOC = 0x00000020, /* Load TOC and obtain >TMR size */ >@@ -401,11 +400,4 @@ struct psp_gfx_rb_frame > /* total 64 bytes */ > }; > >-#define PSP_ERR_UNKNOWN_COMMAND 0x00000100 >- >-enum tee_error_code { >- TEE_SUCCESS = 0x00000000, >- TEE_ERROR_NOT_SUPPORTED = 0xFFFF000A, >-}; >- > #endif /* _PSP_TEE_GFX_IF_H_ */ >-- >2.25.1 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-31 9:02 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-03-31 6:34 [PATCH 1/2] drm/amdgpu: Revert "SWDEV-238407 drm/amdgpu/sriov: Need to clear kiq position" Emily Deng 2021-03-31 6:34 ` [PATCH 2/2] drm/amdgpu: Revert "SWDEV-238407 Add clear vf fw support" Emily Deng 2021-03-31 9:02 ` Deng, Emily
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.