drm/amdgpu: Add interface for TOS reload cases

Add interface to check if a different TOS needs to be loaded than the
one which is which is already active on the SOC. Presently the interface
is restricted to specific variants of PSPv13.0.

Signed-off-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Feifei Xu <Feifei.Xu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
Tested-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 7452b2dd775b3f065752eee26efbbfeec0b5bdf2..944dad9ad29f864ee2f595fc8f50ab7e22dcd7ff 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -2266,6 +2266,19 @@ bool amdgpu_psp_get_ras_capability(struct psp_context *psp)
        }
 }
 
+bool amdgpu_psp_tos_reload_needed(struct amdgpu_device *adev)
+{
+       struct psp_context *psp = &adev->psp;
+
+       if (amdgpu_sriov_vf(adev))
+               return false;
+
+       if (psp->funcs && psp->funcs->is_reload_needed)
+               return psp->funcs->is_reload_needed(psp);
+
+       return false;
+}
+
 static int psp_hw_start(struct psp_context *psp)
 {
        struct amdgpu_device *adev = psp->adev;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
index f61ba076573c37c0db5b330dc5366ba522e2f498..76fa18ffc04520a86ddfeed5be42444f20a1781e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
@@ -139,6 +139,7 @@ struct psp_funcs {
        int (*fatal_error_recovery_quirk)(struct psp_context *psp);
        bool (*get_ras_capability)(struct psp_context *psp);
        bool (*is_aux_sos_load_required)(struct psp_context *psp);
+       bool (*is_reload_needed)(struct psp_context *psp);
 };
 
 struct ta_funcs {
@@ -560,5 +561,6 @@ bool amdgpu_psp_get_ras_capability(struct psp_context *psp);
 
 int psp_config_sq_perfmon(struct psp_context *psp, uint32_t xcp_id,
        bool core_override_enable, bool reg_override_enable, bool perfmon_override_enable);
+bool amdgpu_psp_tos_reload_needed(struct amdgpu_device *adev);
 
 #endif

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
index 51e470e8d67d9e06648a17c289b5093e6bc2cb72..c4b775aaee9fe77d57333df97b7c0d224aeb9cf8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
@@ -823,6 +823,30 @@ static bool psp_v13_0_is_aux_sos_load_required(struct psp_context *psp)
        return (pmfw_ver < 0x557300);
 }
 
+static bool psp_v13_0_is_reload_needed(struct psp_context *psp)
+{
+       uint32_t ucode_ver;
+
+       if (!psp_v13_0_is_sos_alive(psp))
+               return false;
+
+       /* Restrict reload support only to specific IP versions */
+       switch (amdgpu_ip_version(psp->adev, MP0_HWIP, 0)) {
+       case IP_VERSION(13, 0, 2):
+       case IP_VERSION(13, 0, 6):
+       case IP_VERSION(13, 0, 14):
+               /* TOS version read from microcode header */
+               ucode_ver = psp->sos.fw_version;
+               /* Read TOS version from hardware */
+               psp_v13_0_init_sos_version(psp);
+               return (ucode_ver != psp->sos.fw_version);
+       default:
+               return false;
+       }
+
+       return false;
+}
+
 static const struct psp_funcs psp_v13_0_funcs = {
        .init_microcode = psp_v13_0_init_microcode,
        .wait_for_bootloader = psp_v13_0_wait_for_bootloader_steady_state,
@@ -847,6 +871,7 @@ static const struct psp_funcs psp_v13_0_funcs = {
        .fatal_error_recovery_quirk = psp_v13_0_fatal_error_recovery_quirk,
        .get_ras_capability = psp_v13_0_get_ras_capability,
        .is_aux_sos_load_required = psp_v13_0_is_aux_sos_load_required,
+       .is_reload_needed = psp_v13_0_is_reload_needed,
 };
 
 void psp_v13_0_set_psp_funcs(struct psp_context *psp)