drm/amdgpu: Load spdm_drv for psp v13_0_12

spdm_drv is a firmware that needs to be loaded
in driver initialization phase.

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@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 bad669eff444b22a2dcc809749401192319baa73..3c1b08441a6f503d007644289ff8325357a2788b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -2389,6 +2389,15 @@ static int psp_hw_start(struct psp_context *psp)
                        }
                }
 
+               if ((is_psp_fw_valid(psp->spdm_drv)) &&
+                   (psp->funcs->bootloader_load_spdm_drv != NULL)) {
+                       ret = psp_bootloader_load_spdm_drv(psp);
+                       if (ret) {
+                               dev_err(adev->dev, "PSP load spdm_drv failed!\n");
+                               return ret;
+                       }
+               }
+
                if ((is_psp_fw_valid(psp->sos)) &&
                    (psp->funcs->bootloader_load_sos != NULL)) {
                        ret = psp_bootloader_load_sos(psp);
@@ -3413,6 +3422,12 @@ static int parse_sos_bin_descriptor(struct psp_context *psp,
                psp->ipkeymgr_drv.size_bytes         = le32_to_cpu(desc->size_bytes);
                psp->ipkeymgr_drv.start_addr         = ucode_start_addr;
                break;
+       case PSP_FW_TYPE_PSP_SPDM_DRV:
+               psp->spdm_drv.fw_version        = le32_to_cpu(desc->fw_version);
+               psp->spdm_drv.feature_version   = le32_to_cpu(desc->fw_version);
+               psp->spdm_drv.size_bytes        = le32_to_cpu(desc->size_bytes);
+               psp->spdm_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 567cb1f924ca8992cc2630efea3a818abf418b25..8d5acc415d386b48e485dbb5463ad733ea1583c1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
@@ -80,6 +80,7 @@ enum psp_bootloader_cmd {
        PSP_BL__DRAM_LONG_TRAIN         = 0x100000,
        PSP_BL__DRAM_SHORT_TRAIN        = 0x200000,
        PSP_BL__LOAD_TOS_SPL_TABLE      = 0x10000000,
+       PSP_BL__LOAD_SPDMDRV            = 0x20000000,
 };
 
 enum psp_ring_type {
@@ -120,6 +121,7 @@ struct psp_funcs {
        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_spdm_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);
@@ -343,6 +345,7 @@ struct psp_context {
        struct psp_bin_desc             dbg_drv;
        struct psp_bin_desc             ras_drv;
        struct psp_bin_desc             ipkeymgr_drv;
+       struct psp_bin_desc             spdm_drv;
 
        /* tmr buffer */
        struct amdgpu_bo                *tmr_bo;
@@ -434,6 +437,9 @@ struct amdgpu_psp_funcs {
 #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_spdm_drv(psp) \
+               ((psp)->funcs->bootloader_load_spdm_drv ? \
+                (psp)->funcs->bootloader_load_spdm_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 9d0393f88bc2ae1cb7c9003a7d54f48cacb00510..4eedd92f000be9b1b9da5cf4f209fc6d89303e11 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
@@ -126,6 +126,7 @@ enum psp_fw_type {
        PSP_FW_TYPE_PSP_DBG_DRV,
        PSP_FW_TYPE_PSP_RAS_DRV,
        PSP_FW_TYPE_PSP_IPKEYMGR_DRV,
+       PSP_FW_TYPE_PSP_SPDM_DRV,
        PSP_FW_TYPE_MAX_INDEX,
 };
 

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
index 337b9d204aa86e41afc3c651805d60e964d33415..49f5d57b3bbff7badf33b7283d0d80bf95375850 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
@@ -293,6 +293,11 @@ static int psp_v13_0_bootloader_load_ras_drv(struct psp_context *psp)
        return psp_v13_0_bootloader_load_component(psp, &psp->ras_drv, PSP_BL__LOAD_RASDRV);
 }
 
+static int psp_v13_0_bootloader_load_spdm_drv(struct psp_context *psp)
+{
+       return psp_v13_0_bootloader_load_component(psp, &psp->spdm_drv, PSP_BL__LOAD_SPDMDRV);
+}
+
 static inline void psp_v13_0_init_sos_version(struct psp_context *psp)
 {
        struct amdgpu_device *adev = psp->adev;
@@ -862,6 +867,7 @@ static const struct psp_funcs psp_v13_0_funcs = {
        .bootloader_load_intf_drv = psp_v13_0_bootloader_load_intf_drv,
        .bootloader_load_dbg_drv = psp_v13_0_bootloader_load_dbg_drv,
        .bootloader_load_ras_drv = psp_v13_0_bootloader_load_ras_drv,
+       .bootloader_load_spdm_drv = psp_v13_0_bootloader_load_spdm_drv,
        .bootloader_load_sos = psp_v13_0_bootloader_load_sos,
        .ring_create = psp_v13_0_ring_create,
        .ring_stop = psp_v13_0_ring_stop,