Merge tag 'trace-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[J-linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_ucode.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
index adf17bdddb65c0a5e8ccca27adf7da1ef2e2b5e3..ffa4c0d207db68ea7fef0d9c0ff0ec6c21a63a73 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
@@ -126,6 +126,19 @@ void amdgpu_ucode_print_gfx_hdr(const struct common_firmware_header *hdr)
        }
 }
 
        }
 }
 

+void amdgpu_ucode_print_imu_hdr(const struct common_firmware_header *hdr)
+{
+       uint16_t version_major = le16_to_cpu(hdr->header_version_major);
+       uint16_t version_minor = le16_to_cpu(hdr->header_version_minor);
+
+       DRM_DEBUG("IMU\n");
+       amdgpu_ucode_print_common_hdr(hdr);
+
+       if (version_major != 1) {
+               DRM_ERROR("Unknown GFX ucode version: %u.%u\n", version_major, version_minor);
+       }
+}
+

 void amdgpu_ucode_print_rlc_hdr(const struct common_firmware_header *hdr)
 {
        uint16_t version_major = le16_to_cpu(hdr->header_version_major);
 void amdgpu_ucode_print_rlc_hdr(const struct common_firmware_header *hdr)
 {
        uint16_t version_major = le16_to_cpu(hdr->header_version_major);


@@ -244,6 +257,17 @@ void amdgpu_ucode_print_sdma_hdr(const struct common_firmware_header *hdr)
                                container_of(sdma_hdr, struct sdma_firmware_header_v1_1, v1_0);
                        DRM_DEBUG("digest_size: %u\n", le32_to_cpu(sdma_v1_1_hdr->digest_size));
                }
                                container_of(sdma_hdr, struct sdma_firmware_header_v1_1, v1_0);
                        DRM_DEBUG("digest_size: %u\n", le32_to_cpu(sdma_v1_1_hdr->digest_size));
                }

+       } else if (version_major == 2) {
+               const struct sdma_firmware_header_v2_0 *sdma_hdr =
+                       container_of(hdr, struct sdma_firmware_header_v2_0, header);
+
+               DRM_DEBUG("ucode_feature_version: %u\n",
+                         le32_to_cpu(sdma_hdr->ucode_feature_version));
+               DRM_DEBUG("ctx_jt_offset: %u\n", le32_to_cpu(sdma_hdr->ctx_jt_offset));
+               DRM_DEBUG("ctx_jt_size: %u\n", le32_to_cpu(sdma_hdr->ctx_jt_size));
+               DRM_DEBUG("ctl_ucode_offset: %u\n", le32_to_cpu(sdma_hdr->ctl_ucode_offset));
+               DRM_DEBUG("ctl_jt_offset: %u\n", le32_to_cpu(sdma_hdr->ctl_jt_offset));
+               DRM_DEBUG("ctl_jt_size: %u\n", le32_to_cpu(sdma_hdr->ctl_jt_size));

        } else {
                DRM_ERROR("Unknown SDMA ucode version: %u.%u\n",
                          version_major, version_minor);
        } else {
                DRM_ERROR("Unknown SDMA ucode version: %u.%u\n",
                          version_major, version_minor);


@@ -428,8 +452,8 @@ bool amdgpu_ucode_hdr_version(union amdgpu_firmware_header *hdr,
 {
        if ((hdr->common.header_version_major == hdr_major) &&
                (hdr->common.header_version_minor == hdr_minor))
 {
        if ((hdr->common.header_version_major == hdr_major) &&
                (hdr->common.header_version_minor == hdr_minor))

-               return false;
-       return true;
+               return true;
+       return false;

 }
 
 enum amdgpu_firmware_load_type
 }
 
 enum amdgpu_firmware_load_type


@@ -515,6 +539,10 @@ const char *amdgpu_ucode_name(enum AMDGPU_UCODE_ID ucode_id)
                return "SDMA6";
        case AMDGPU_UCODE_ID_SDMA7:
                return "SDMA7";
                return "SDMA6";
        case AMDGPU_UCODE_ID_SDMA7:
                return "SDMA7";

+       case AMDGPU_UCODE_ID_SDMA_UCODE_TH0:
+               return "SDMA_CTX";
+       case AMDGPU_UCODE_ID_SDMA_UCODE_TH1:
+               return "SDMA_CTL";

        case AMDGPU_UCODE_ID_CP_CE:
                return "CP_CE";
        case AMDGPU_UCODE_ID_CP_PFP:
        case AMDGPU_UCODE_ID_CP_CE:
                return "CP_CE";
        case AMDGPU_UCODE_ID_CP_PFP:


@@ -533,6 +561,10 @@ const char *amdgpu_ucode_name(enum AMDGPU_UCODE_ID ucode_id)
                return "CP_MES";
        case AMDGPU_UCODE_ID_CP_MES_DATA:
                return "CP_MES_DATA";
                return "CP_MES";
        case AMDGPU_UCODE_ID_CP_MES_DATA:
                return "CP_MES_DATA";

+       case AMDGPU_UCODE_ID_CP_MES1:
+               return "CP_MES_KIQ";
+       case AMDGPU_UCODE_ID_CP_MES1_DATA:
+               return "CP_MES_KIQ_DATA";

        case AMDGPU_UCODE_ID_RLC_RESTORE_LIST_CNTL:
                return "RLC_RESTORE_LIST_CNTL";
        case AMDGPU_UCODE_ID_RLC_RESTORE_LIST_GPM_MEM:
        case AMDGPU_UCODE_ID_RLC_RESTORE_LIST_CNTL:
                return "RLC_RESTORE_LIST_CNTL";
        case AMDGPU_UCODE_ID_RLC_RESTORE_LIST_GPM_MEM:


@@ -545,6 +577,14 @@ const char *amdgpu_ucode_name(enum AMDGPU_UCODE_ID ucode_id)
                return "RLC_DRAM";
        case AMDGPU_UCODE_ID_RLC_G:
                return "RLC_G";
                return "RLC_DRAM";
        case AMDGPU_UCODE_ID_RLC_G:
                return "RLC_G";

+       case AMDGPU_UCODE_ID_RLC_P:
+               return "RLC_P";
+       case AMDGPU_UCODE_ID_RLC_V:
+               return "RLC_V";
+       case AMDGPU_UCODE_ID_IMU_I:
+               return "IMU_I";
+       case AMDGPU_UCODE_ID_IMU_D:
+               return "IMU_D";

        case AMDGPU_UCODE_ID_STORAGE:
                return "STORAGE";
        case AMDGPU_UCODE_ID_SMC:
        case AMDGPU_UCODE_ID_STORAGE:
                return "STORAGE";
        case AMDGPU_UCODE_ID_SMC:


@@ -645,10 +685,12 @@ static int amdgpu_ucode_init_single_fw(struct amdgpu_device *adev,
 {
        const struct common_firmware_header *header = NULL;
        const struct gfx_firmware_header_v1_0 *cp_hdr = NULL;
 {
        const struct common_firmware_header *header = NULL;
        const struct gfx_firmware_header_v1_0 *cp_hdr = NULL;

+       const struct gfx_firmware_header_v2_0 *cpv2_hdr = NULL;

        const struct dmcu_firmware_header_v1_0 *dmcu_hdr = NULL;
        const struct dmcub_firmware_header_v1_0 *dmcub_hdr = NULL;
        const struct mes_firmware_header_v1_0 *mes_hdr = NULL;
        const struct sdma_firmware_header_v2_0 *sdma_hdr = NULL;
        const struct dmcu_firmware_header_v1_0 *dmcu_hdr = NULL;
        const struct dmcub_firmware_header_v1_0 *dmcub_hdr = NULL;
        const struct mes_firmware_header_v1_0 *mes_hdr = NULL;
        const struct sdma_firmware_header_v2_0 *sdma_hdr = NULL;

+       const struct imu_firmware_header_v1_0 *imu_hdr = NULL;

        u8 *ucode_addr;
 
        if (NULL == ucode->fw)
        u8 *ucode_addr;
 
        if (NULL == ucode->fw)


@@ -662,20 +704,22 @@ static int amdgpu_ucode_init_single_fw(struct amdgpu_device *adev,
 
        header = (const struct common_firmware_header *)ucode->fw->data;
        cp_hdr = (const struct gfx_firmware_header_v1_0 *)ucode->fw->data;
 
        header = (const struct common_firmware_header *)ucode->fw->data;
        cp_hdr = (const struct gfx_firmware_header_v1_0 *)ucode->fw->data;

+       cpv2_hdr = (const struct gfx_firmware_header_v2_0 *)ucode->fw->data;

        dmcu_hdr = (const struct dmcu_firmware_header_v1_0 *)ucode->fw->data;
        dmcub_hdr = (const struct dmcub_firmware_header_v1_0 *)ucode->fw->data;
        mes_hdr = (const struct mes_firmware_header_v1_0 *)ucode->fw->data;
        sdma_hdr = (const struct sdma_firmware_header_v2_0 *)ucode->fw->data;
        dmcu_hdr = (const struct dmcu_firmware_header_v1_0 *)ucode->fw->data;
        dmcub_hdr = (const struct dmcub_firmware_header_v1_0 *)ucode->fw->data;
        mes_hdr = (const struct mes_firmware_header_v1_0 *)ucode->fw->data;
        sdma_hdr = (const struct sdma_firmware_header_v2_0 *)ucode->fw->data;

+       imu_hdr = (const struct imu_firmware_header_v1_0 *)ucode->fw->data;

 
        if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {
                switch (ucode->ucode_id) {
                case AMDGPU_UCODE_ID_SDMA_UCODE_TH0:
 
        if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {
                switch (ucode->ucode_id) {
                case AMDGPU_UCODE_ID_SDMA_UCODE_TH0:

-                       ucode->ucode_size = le32_to_cpu(sdma_hdr->ctx_jt_offset + sdma_hdr->ctx_jt_size);
+                       ucode->ucode_size = le32_to_cpu(sdma_hdr->ctx_ucode_size_bytes);

                        ucode_addr = (u8 *)ucode->fw->data +
                                le32_to_cpu(sdma_hdr->header.ucode_array_offset_bytes);
                        break;
                case AMDGPU_UCODE_ID_SDMA_UCODE_TH1:
                        ucode_addr = (u8 *)ucode->fw->data +
                                le32_to_cpu(sdma_hdr->header.ucode_array_offset_bytes);
                        break;
                case AMDGPU_UCODE_ID_SDMA_UCODE_TH1:

-                       ucode->ucode_size = le32_to_cpu(sdma_hdr->ctl_jt_offset + sdma_hdr->ctl_jt_size);
+                       ucode->ucode_size = le32_to_cpu(sdma_hdr->ctl_ucode_size_bytes);

                        ucode_addr = (u8 *)ucode->fw->data +
                                le32_to_cpu(sdma_hdr->ctl_ucode_offset);
                        break;
                        ucode_addr = (u8 *)ucode->fw->data +
                                le32_to_cpu(sdma_hdr->ctl_ucode_offset);
                        break;


@@ -762,6 +806,72 @@ static int amdgpu_ucode_init_single_fw(struct amdgpu_device *adev,
                        ucode->ucode_size = ucode->fw->size;
                        ucode_addr = (u8 *)ucode->fw->data;
                        break;
                        ucode->ucode_size = ucode->fw->size;
                        ucode_addr = (u8 *)ucode->fw->data;
                        break;

+               case AMDGPU_UCODE_ID_IMU_I:
+                       ucode->ucode_size = le32_to_cpu(imu_hdr->imu_iram_ucode_size_bytes);
+                       ucode_addr = (u8 *)ucode->fw->data +
+                               le32_to_cpu(imu_hdr->header.ucode_array_offset_bytes);
+                       break;
+               case AMDGPU_UCODE_ID_IMU_D:
+                       ucode->ucode_size = le32_to_cpu(imu_hdr->imu_dram_ucode_size_bytes);
+                       ucode_addr = (u8 *)ucode->fw->data +
+                               le32_to_cpu(imu_hdr->header.ucode_array_offset_bytes) +
+                               le32_to_cpu(imu_hdr->imu_iram_ucode_size_bytes);
+                       break;
+               case AMDGPU_UCODE_ID_CP_RS64_PFP:
+                       ucode->ucode_size = le32_to_cpu(cpv2_hdr->ucode_size_bytes);
+                       ucode_addr = (u8 *)ucode->fw->data +
+                               le32_to_cpu(header->ucode_array_offset_bytes);
+                       break;
+               case AMDGPU_UCODE_ID_CP_RS64_PFP_P0_STACK:
+                       ucode->ucode_size = le32_to_cpu(cpv2_hdr->data_size_bytes);
+                       ucode_addr = (u8 *)ucode->fw->data +
+                               le32_to_cpu(cpv2_hdr->data_offset_bytes);
+                       break;
+               case AMDGPU_UCODE_ID_CP_RS64_PFP_P1_STACK:
+                       ucode->ucode_size = le32_to_cpu(cpv2_hdr->data_size_bytes);
+                       ucode_addr = (u8 *)ucode->fw->data +
+                               le32_to_cpu(cpv2_hdr->data_offset_bytes);
+                       break;
+               case AMDGPU_UCODE_ID_CP_RS64_ME:
+                       ucode->ucode_size = le32_to_cpu(cpv2_hdr->ucode_size_bytes);
+                       ucode_addr = (u8 *)ucode->fw->data +
+                               le32_to_cpu(header->ucode_array_offset_bytes);
+                       break;
+               case AMDGPU_UCODE_ID_CP_RS64_ME_P0_STACK:
+                       ucode->ucode_size = le32_to_cpu(cpv2_hdr->data_size_bytes);
+                       ucode_addr = (u8 *)ucode->fw->data +
+                               le32_to_cpu(cpv2_hdr->data_offset_bytes);
+                       break;
+               case AMDGPU_UCODE_ID_CP_RS64_ME_P1_STACK:
+                       ucode->ucode_size = le32_to_cpu(cpv2_hdr->data_size_bytes);
+                       ucode_addr = (u8 *)ucode->fw->data +
+                               le32_to_cpu(cpv2_hdr->data_offset_bytes);
+                       break;
+               case AMDGPU_UCODE_ID_CP_RS64_MEC:
+                       ucode->ucode_size = le32_to_cpu(cpv2_hdr->ucode_size_bytes);
+                       ucode_addr = (u8 *)ucode->fw->data +
+                               le32_to_cpu(header->ucode_array_offset_bytes);
+                       break;
+               case AMDGPU_UCODE_ID_CP_RS64_MEC_P0_STACK:
+                       ucode->ucode_size = le32_to_cpu(cpv2_hdr->data_size_bytes);
+                       ucode_addr = (u8 *)ucode->fw->data +
+                               le32_to_cpu(cpv2_hdr->data_offset_bytes);
+                       break;
+               case AMDGPU_UCODE_ID_CP_RS64_MEC_P1_STACK:
+                       ucode->ucode_size = le32_to_cpu(cpv2_hdr->data_size_bytes);
+                       ucode_addr = (u8 *)ucode->fw->data +
+                               le32_to_cpu(cpv2_hdr->data_offset_bytes);
+                       break;
+               case AMDGPU_UCODE_ID_CP_RS64_MEC_P2_STACK:
+                       ucode->ucode_size = le32_to_cpu(cpv2_hdr->data_size_bytes);
+                       ucode_addr = (u8 *)ucode->fw->data +
+                               le32_to_cpu(cpv2_hdr->data_offset_bytes);
+                       break;
+               case AMDGPU_UCODE_ID_CP_RS64_MEC_P3_STACK:
+                       ucode->ucode_size = le32_to_cpu(cpv2_hdr->data_size_bytes);
+                       ucode_addr = (u8 *)ucode->fw->data +
+                               le32_to_cpu(cpv2_hdr->data_offset_bytes);
+                       break;

                default:
                        ucode->ucode_size = le32_to_cpu(header->ucode_size_bytes);
                        ucode_addr = (u8 *)ucode->fw->data +
                default:
                        ucode->ucode_size = le32_to_cpu(header->ucode_size_bytes);
                        ucode_addr = (u8 *)ucode->fw->data +