drm/amdgpu: Load ipkeymgr drv for psp v14

while DBG_DRV is renamed to HAD_DRV for psp v14,
part of its APIs/functionality is moved to a new
component named Ipkeymgr_Drv.

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Likun Gao <Likun.Gao@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 edae581059af083feda6d5dfe0210d4467487f47..4bd4602d11b1e46a4663b03b10017c14096d820a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -2265,6 +2265,15 @@ static int psp_hw_start(struct psp_context *psp)
                        }
                }
 
+               if ((is_psp_fw_valid(psp->ipkeymgr_drv)) &&
+                   (psp->funcs->bootloader_load_ipkeymgr_drv != NULL)) {
+                       ret = psp_bootloader_load_ipkeymgr_drv(psp);
+                       if (ret) {
+                               dev_err(adev->dev, "PSP load ipkeymgr_drv failed!\n");
+                               return ret;
+                       }
+               }
+
                if ((is_psp_fw_valid(psp->sos)) &&
                    (psp->funcs->bootloader_load_sos != NULL)) {
                        ret = psp_bootloader_load_sos(psp);
@@ -3280,6 +3289,12 @@ static int parse_sos_bin_descriptor(struct psp_context *psp,
                psp->ras_drv.size_bytes         = le32_to_cpu(desc->size_bytes);
                psp->ras_drv.start_addr         = ucode_start_addr;
                break;
+       case PSP_FW_TYPE_PSP_IPKEYMGR_DRV:
+               psp->ipkeymgr_drv.fw_version         = le32_to_cpu(desc->fw_version);
+               psp->ipkeymgr_drv.feature_version    = le32_to_cpu(desc->fw_version);
+               psp->ipkeymgr_drv.size_bytes         = le32_to_cpu(desc->size_bytes);
+               psp->ipkeymgr_drv.start_addr         = ucode_start_addr;
+               break;
        default:
                dev_warn(psp->adev->dev, "Unsupported PSP FW type: %d\n", desc->fw_type);
                break;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
index ee16f134ae92037d6125cd78c4191d541e48d387..66b3f88fbecdd3351335a602f77917bc758e63d5 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
@@ -74,7 +74,8 @@ enum psp_bootloader_cmd {
        PSP_BL__LOAD_SOCDRV             = 0xB0000,
        PSP_BL__LOAD_DBGDRV             = 0xC0000,
        PSP_BL__LOAD_INTFDRV            = 0xD0000,
-       PSP_BL__LOAD_RASDRV                 = 0xE0000,
+       PSP_BL__LOAD_RASDRV             = 0xE0000,
+       PSP_BL__LOAD_IPKEYMGRDRV        = 0xF0000,
        PSP_BL__DRAM_LONG_TRAIN         = 0x100000,
        PSP_BL__DRAM_SHORT_TRAIN        = 0x200000,
        PSP_BL__LOAD_TOS_SPL_TABLE      = 0x10000000,
@@ -117,6 +118,7 @@ struct psp_funcs {
        int (*bootloader_load_intf_drv)(struct psp_context *psp);
        int (*bootloader_load_dbg_drv)(struct psp_context *psp);
        int (*bootloader_load_ras_drv)(struct psp_context *psp);
+       int (*bootloader_load_ipkeymgr_drv)(struct psp_context *psp);
        int (*bootloader_load_sos)(struct psp_context *psp);
        int (*ring_create)(struct psp_context *psp,
                           enum psp_ring_type ring_type);
@@ -336,6 +338,7 @@ struct psp_context {
        struct psp_bin_desc             intf_drv;
        struct psp_bin_desc             dbg_drv;
        struct psp_bin_desc             ras_drv;
+       struct psp_bin_desc             ipkeymgr_drv;
 
        /* tmr buffer */
        struct amdgpu_bo                *tmr_bo;
@@ -424,6 +427,9 @@ struct amdgpu_psp_funcs {
 #define psp_bootloader_load_ras_drv(psp) \
                ((psp)->funcs->bootloader_load_ras_drv ? \
                (psp)->funcs->bootloader_load_ras_drv((psp)) : 0)
+#define psp_bootloader_load_ipkeymgr_drv(psp) \
+               ((psp)->funcs->bootloader_load_ipkeymgr_drv ? \
+                (psp)->funcs->bootloader_load_ipkeymgr_drv((psp)) : 0)
 #define psp_bootloader_load_sos(psp) \
                ((psp)->funcs->bootloader_load_sos ? (psp)->funcs->bootloader_load_sos((psp)) : 0)
 #define psp_smu_reload_quirk(psp) \

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
index 6194457600372ba41a57fa96f613c91d473e132d..105d4de0613af6af59a63738977a4cd7d7afe8e0 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
@@ -125,6 +125,7 @@ enum psp_fw_type {
        PSP_FW_TYPE_PSP_INTF_DRV,
        PSP_FW_TYPE_PSP_DBG_DRV,
        PSP_FW_TYPE_PSP_RAS_DRV,
+       PSP_FW_TYPE_PSP_IPKEYMGR_DRV,
        PSP_FW_TYPE_MAX_INDEX,
 };
 

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v14_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v14_0.c
index 78a95f8f370bee256023db13c7e177122579f7fb..241d5ff2ef3cdbf7e1db634863fb8e71f40a7035 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/psp_v14_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v14_0.c
@@ -177,6 +177,10 @@ static int psp_v14_0_bootloader_load_ras_drv(struct psp_context *psp)
        return psp_v14_0_bootloader_load_component(psp, &psp->ras_drv, PSP_BL__LOAD_RASDRV);
 }
 
+static int psp_v14_0_bootloader_load_ipkeymgr_drv(struct psp_context *psp)
+{
+       return psp_v14_0_bootloader_load_component(psp, &psp->ipkeymgr_drv, PSP_BL__LOAD_IPKEYMGRDRV);
+}
 
 static int psp_v14_0_bootloader_load_sos(struct psp_context *psp)
 {
@@ -653,6 +657,7 @@ static const struct psp_funcs psp_v14_0_funcs = {
        .bootloader_load_intf_drv = psp_v14_0_bootloader_load_intf_drv,
        .bootloader_load_dbg_drv = psp_v14_0_bootloader_load_dbg_drv,
        .bootloader_load_ras_drv = psp_v14_0_bootloader_load_ras_drv,
+       .bootloader_load_ipkeymgr_drv = psp_v14_0_bootloader_load_ipkeymgr_drv,
        .bootloader_load_sos = psp_v14_0_bootloader_load_sos,
        .ring_create = psp_v14_0_ring_create,
        .ring_stop = psp_v14_0_ring_stop,