[PATCH] drm/amdgpu: add rlc iram and dram firmware support - Linux-stable-mirror

30 Nov 2020

From: Likun Gao Likun.Gao@amd.com
Support to load RLC iram and dram ucode when RLC firmware struct use v2.2
Cherry pick the fix from 5.10 (commit 843c7eb2f7571aa092a8ea010c80e8d94c197f67).
This fixes GPU hangs with sienna cichlid boards on 5.9.x.
Signed-off-by: Likun Gao Likun.Gao@amd.com
Reviewed-by: Hawking Zhang Hawking.Zhang@amd.com
Signed-off-by: Alex Deucher alexander.deucher@amd.com
(cherry picked from commit 843c7eb2f7571aa092a8ea010c80e8d94c197f67)
Cc: stable@vger.kernel.org # 5.9.x
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c   |  6 ++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h   |  4 +++
 drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 10 ++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 11 +++++++
 drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c    | 39 +++++++++++++++++++----
 drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h   |  4 +--
 6 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 7c787ec598f1..d5e95e4ea5bd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -1571,6 +1571,12 @@ static int psp_get_fw_type(struct amdgpu_firmware_info *ucode,
    case AMDGPU_UCODE_ID_RLC_RESTORE_LIST_SRM_MEM:
    	*type = GFX_FW_TYPE_RLC_RESTORE_LIST_SRM_MEM;
    	break;
+	case AMDGPU_UCODE_ID_RLC_IRAM:
+		*type = GFX_FW_TYPE_RLC_IRAM;
+		break;
+	case AMDGPU_UCODE_ID_RLC_DRAM:
+		*type = GFX_FW_TYPE_RLC_DRAM_BOOT;
+		break;
    case AMDGPU_UCODE_ID_SMC:
    	*type = GFX_FW_TYPE_SMU;
    	break;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h
index 60bb3e8b3118..aeaaae713c59 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h
@@ -168,12 +168,16 @@ struct amdgpu_rlc {
    u32 save_restore_list_cntl_size_bytes;
    u32 save_restore_list_gpm_size_bytes;
    u32 save_restore_list_srm_size_bytes;
+	u32 rlc_iram_ucode_size_bytes;
+	u32 rlc_dram_ucode_size_bytes;
u32 *register_list_format;
    u32 *register_restore;
    u8 *save_restore_list_cntl;
    u8 *save_restore_list_gpm;
    u8 *save_restore_list_srm;
+	u8 *rlc_iram_ucode;
+	u8 *rlc_dram_ucode;
bool is_rlc_v2_1;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
index 183743c5fb7b..c3cc2e8b2406 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
@@ -500,6 +500,8 @@ static int amdgpu_ucode_init_single_fw(struct amdgpu_device *adev,
         ucode->ucode_id != AMDGPU_UCODE_ID_RLC_RESTORE_LIST_CNTL &&
         ucode->ucode_id != AMDGPU_UCODE_ID_RLC_RESTORE_LIST_GPM_MEM &&
         ucode->ucode_id != AMDGPU_UCODE_ID_RLC_RESTORE_LIST_SRM_MEM &&
+	     ucode->ucode_id != AMDGPU_UCODE_ID_RLC_IRAM &&
+	     ucode->ucode_id != AMDGPU_UCODE_ID_RLC_DRAM &&
    	 ucode->ucode_id != AMDGPU_UCODE_ID_DMCU_ERAM &&
    	 ucode->ucode_id != AMDGPU_UCODE_ID_DMCU_INTV &&
    	 ucode->ucode_id != AMDGPU_UCODE_ID_DMCUB)) {
@@ -556,6 +558,14 @@ static int amdgpu_ucode_init_single_fw(struct amdgpu_device *adev,
    	ucode->ucode_size = adev->gfx.rlc.save_restore_list_srm_size_bytes;
    	memcpy(ucode->kaddr, adev->gfx.rlc.save_restore_list_srm,
    	       ucode->ucode_size);
+	} else if (ucode->ucode_id == AMDGPU_UCODE_ID_RLC_IRAM) {
+		ucode->ucode_size = adev->gfx.rlc.rlc_iram_ucode_size_bytes;
+		memcpy(ucode->kaddr, adev->gfx.rlc.rlc_iram_ucode,
+		       ucode->ucode_size);
+	} else if (ucode->ucode_id == AMDGPU_UCODE_ID_RLC_DRAM) {
+		ucode->ucode_size = adev->gfx.rlc.rlc_dram_ucode_size_bytes;
+		memcpy(ucode->kaddr, adev->gfx.rlc.rlc_dram_ucode,
+		       ucode->ucode_size);
    } else if (ucode->ucode_id == AMDGPU_UCODE_ID_CP_MES) {
    	ucode->ucode_size = le32_to_cpu(mes_hdr->mes_ucode_size_bytes);
    	memcpy(ucode->kaddr, (void *)((uint8_t *)adev->mes.fw->data +
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
index 12a8bc8fca0b..97c78d91fc2f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
@@ -221,6 +221,15 @@ struct rlc_firmware_header_v2_1 {
    uint32_t save_restore_list_srm_offset_bytes;
 };
+/* version_major=2, version_minor=1 */
+struct rlc_firmware_header_v2_2 {
+	struct rlc_firmware_header_v2_1 v2_1;
+	uint32_t rlc_iram_ucode_size_bytes;
+	uint32_t rlc_iram_ucode_offset_bytes;
+	uint32_t rlc_dram_ucode_size_bytes;
+	uint32_t rlc_dram_ucode_offset_bytes;
+};
+
 /* version_major=1, version_minor=0 */
 struct sdma_firmware_header_v1_0 {
    struct common_firmware_header header;
@@ -338,6 +347,8 @@ enum AMDGPU_UCODE_ID {
    AMDGPU_UCODE_ID_RLC_RESTORE_LIST_CNTL,
    AMDGPU_UCODE_ID_RLC_RESTORE_LIST_GPM_MEM,
    AMDGPU_UCODE_ID_RLC_RESTORE_LIST_SRM_MEM,
+	AMDGPU_UCODE_ID_RLC_IRAM,
+	AMDGPU_UCODE_ID_RLC_DRAM,
    AMDGPU_UCODE_ID_RLC_G,
    AMDGPU_UCODE_ID_STORAGE,
    AMDGPU_UCODE_ID_SMC,
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
index 3a2af95f2bf0..ed9842960008 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
@@ -3594,6 +3594,17 @@ static void gfx_v10_0_init_rlc_ext_microcode(struct amdgpu_device *adev)
    		le32_to_cpu(rlc_hdr->reg_list_format_direct_reg_list_length);
 }
+static void gfx_v10_0_init_rlc_iram_dram_microcode(struct amdgpu_device *adev)
+{
+	const struct rlc_firmware_header_v2_2 *rlc_hdr;
+
+	rlc_hdr = (const struct rlc_firmware_header_v2_2 *)adev->gfx.rlc_fw->data;
+	adev->gfx.rlc.rlc_iram_ucode_size_bytes = le32_to_cpu(rlc_hdr->rlc_iram_ucode_size_bytes);
+	adev->gfx.rlc.rlc_iram_ucode = (u8 *)rlc_hdr + le32_to_cpu(rlc_hdr->rlc_iram_ucode_offset_bytes);
+	adev->gfx.rlc.rlc_dram_ucode_size_bytes = le32_to_cpu(rlc_hdr->rlc_dram_ucode_size_bytes);
+	adev->gfx.rlc.rlc_dram_ucode = (u8 *)rlc_hdr + le32_to_cpu(rlc_hdr->rlc_dram_ucode_offset_bytes);
+}
+
 static bool gfx_v10_0_navi10_gfxoff_should_enable(struct amdgpu_device *adev)
 {
    bool ret = false;
@@ -3709,8 +3720,6 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
    	rlc_hdr = (const struct rlc_firmware_header_v2_0 *)adev->gfx.rlc_fw->data;
    	version_major = le16_to_cpu(rlc_hdr->header.header_version_major);
    	version_minor = le16_to_cpu(rlc_hdr->header.header_version_minor);
-		if (version_major == 2 && version_minor == 1)
-			adev->gfx.rlc.is_rlc_v2_1 = true;
adev->gfx.rlc_fw_version = le32_to_cpu(rlc_hdr->header.ucode_version);
    	adev->gfx.rlc_feature_version = le32_to_cpu(rlc_hdr->ucode_feature_version);
@@ -3752,8 +3761,12 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
    	for (i = 0 ; i < (rlc_hdr->reg_list_size_bytes >> 2); i++)
    		adev->gfx.rlc.register_restore[i] = le32_to_cpu(tmp[i]);
-		if (adev->gfx.rlc.is_rlc_v2_1)
-			gfx_v10_0_init_rlc_ext_microcode(adev);
+		if (version_major == 2) {
+			if (version_minor >= 1)
+				gfx_v10_0_init_rlc_ext_microcode(adev);
+			if (version_minor == 2)
+				gfx_v10_0_init_rlc_iram_dram_microcode(adev);
+		}
    }
snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec%s.bin", chip_name, wks);
@@ -3814,8 +3827,7 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
    		adev->firmware.fw_size +=
    			ALIGN(le32_to_cpu(header->ucode_size_bytes), PAGE_SIZE);
    	}
-		if (adev->gfx.rlc.is_rlc_v2_1 &&
-		    adev->gfx.rlc.save_restore_list_cntl_size_bytes &&
+		if (adev->gfx.rlc.save_restore_list_cntl_size_bytes &&
    	    adev->gfx.rlc.save_restore_list_gpm_size_bytes &&
    	    adev->gfx.rlc.save_restore_list_srm_size_bytes) {
    		info = &adev->firmware.ucode[AMDGPU_UCODE_ID_RLC_RESTORE_LIST_CNTL];
@@ -3835,6 +3847,21 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
    		info->fw = adev->gfx.rlc_fw;
    		adev->firmware.fw_size +=
    			ALIGN(adev->gfx.rlc.save_restore_list_srm_size_bytes, PAGE_SIZE);
+
+			if (adev->gfx.rlc.rlc_iram_ucode_size_bytes &&
+			    adev->gfx.rlc.rlc_dram_ucode_size_bytes) {
+				info = &adev->firmware.ucode[AMDGPU_UCODE_ID_RLC_IRAM];
+				info->ucode_id = AMDGPU_UCODE_ID_RLC_IRAM;
+				info->fw = adev->gfx.rlc_fw;
+				adev->firmware.fw_size +=
+					ALIGN(adev->gfx.rlc.rlc_iram_ucode_size_bytes, PAGE_SIZE);
+
+				info = &adev->firmware.ucode[AMDGPU_UCODE_ID_RLC_DRAM];
+				info->ucode_id = AMDGPU_UCODE_ID_RLC_DRAM;
+				info->fw = adev->gfx.rlc_fw;
+				adev->firmware.fw_size +=
+					ALIGN(adev->gfx.rlc.rlc_dram_ucode_size_bytes, PAGE_SIZE);
+			}
    	}
info = &adev->fir diff --git a/drivers/gpu index cbc04a5c0fe1..baf994627b0d 100644 --- a/drivers/gpu/drm/am +++ b/drivers/gpu/drm/am @@ -214,7 +214,7 GFX_FW_TYPE_UVD1 GFX_FW_TYPE_TOC GFX_FW_TYPE_RLC_P -	GFX_FW_TYPE_RLX6 +	GFX_FW_TYPE_RLC_IRAM GFX_FW_TYPE_GLOBAL_TAP_DELAYS GFX_FW_TYPE_SE0_TAP_DELAYS GFX_FW_TYPE_SE1_TAP_DELAYS @@ -236,7 +236,7 GFX_FW_TYPE_ACCUM_CTRL_RAM GFX_FW_TYPE_RLCP_CAM GFX_FW_TYPE_RLC_SPP_CAM_EXT -	GFX_FW_TYPE_RLX6_DRAM_BOOT +	GFX_FW_TYPE_RLC_DRAM_BOOT GFX_FW_TYPE_VCN0_RAM GFX_FW_TYPE_VCN1_RAM GFX_FW_TYPE_DMUB

mware.ucode[AMDGPU_UCODE_ID_CP_MEC1]; /drm/amd/amdgpu/psp_gfx_if.h b/drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h d/amdgpu/psp_gfx_if.h d/amdgpu/psp_gfx_if.h @@ enum psp_gfx_fw_type { = 23,   /* UVD1                     VG-20   */ = 24,   /* TOC                      NV-10   */ = 25,   /* RLC P                    NV      */ = 26,   /* RLX6                     NV      */ = 26,   /* RLC_IRAM                 NV      */ = 27,   /* GLOBAL TAP DELAYS        NV      */ = 28,   /* SE0 TAP DELAYS           NV      */ = 29,   /* SE1 TAP DELAYS           NV      */ @@ enum psp_gfx_fw_type { = 45,   /* ACCUM CTRL RAM           NV      */ = 46,   /* RLCP CAM                 NV      */ = 47,   /* RLC SPP CAM EXT          NV      */ = 48,   /* RLX6 DRAM BOOT           NV      */ = 48,   /* RLC DRAM BOOT            NV      */ = 49,   /* VCN_RAM                  NV + RN */ = 50,   /* VCN_RAM                  NV + RN */ = 51,   /* DMUB                          RN */
-- 
2.25.4


    