Merge tag 'amd-drm-next-6.5-2023-06-09' of https://gitlab.freedesktop.org/agd5f/linux...

[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 eafcddce58d315aa4b22c1abcde57c14ac231c55..16807ff96dc9b4b195c3d3b194bcbeb7599db2f3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
@@ -126,19 +126,6 @@ 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);
@@ -472,6 +459,12 @@ void amdgpu_ucode_print_psp_hdr(const struct common_firmware_header *hdr)
                                DRM_DEBUG("psp_dbg_drv_size_bytes: %u\n",
                                          le32_to_cpu(desc->size_bytes));
                                break;
+                       case PSP_FW_TYPE_PSP_RAS_DRV:
+                               DRM_DEBUG("psp_ras_drv_version: %u\n",
+                                         le32_to_cpu(desc->fw_version));
+                               DRM_DEBUG("psp_ras_drv_size_bytes: %u\n",
+                                         le32_to_cpu(desc->size_bytes));
+                               break;
                        default:
                                DRM_DEBUG("Unsupported PSP fw type: %d\n", desc->fw_type);
                                break;
@@ -504,7 +497,7 @@ void amdgpu_ucode_print_gpu_info_hdr(const struct common_firmware_header *hdr)
        }
 }
 
-int amdgpu_ucode_validate(const struct firmware *fw)
+static int amdgpu_ucode_validate(const struct firmware *fw)
 {
        const struct common_firmware_header *hdr =
                (const struct common_firmware_header *)fw->data;
@@ -669,6 +662,8 @@ const char *amdgpu_ucode_name(enum AMDGPU_UCODE_ID ucode_id)
                return "VCN1_RAM";
        case AMDGPU_UCODE_ID_DMCUB:
                return "DMCUB";
+       case AMDGPU_UCODE_ID_CAP:
+               return "CAP";
        default:
                return "UNKNOWN UCODE";
        }
@@ -753,7 +748,7 @@ static int amdgpu_ucode_init_single_fw(struct amdgpu_device *adev,
        const struct imu_firmware_header_v1_0 *imu_hdr = NULL;
        u8 *ucode_addr;
 
-       if (NULL == ucode->fw)
+       if (!ucode->fw)
                return 0;
 
        ucode->mc_addr = mc_addr;
@@ -977,7 +972,7 @@ static int amdgpu_ucode_patch_jt(struct amdgpu_firmware_info *ucode,
        uint8_t *src_addr = NULL;
        uint8_t *dst_addr = NULL;
 
-       if (NULL == ucode->fw)
+       if (!ucode->fw)
                return 0;
 
        comm_hdr = (const struct common_firmware_header *)ucode->fw->data;
@@ -1048,6 +1043,7 @@ int amdgpu_ucode_init_bo(struct amdgpu_device *adev)
                        if (i == AMDGPU_UCODE_ID_CP_MEC1 &&
                            adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) {
                                const struct gfx_firmware_header_v1_0 *cp_hdr;
+
                                cp_hdr = (const struct gfx_firmware_header_v1_0 *)ucode->fw->data;
                                amdgpu_ucode_patch_jt(ucode,  adev->firmware.fw_buf_mc + fw_offset,
                                                    adev->firmware.fw_buf_ptr + fw_offset);
@@ -1072,7 +1068,6 @@ static const char *amdgpu_ucode_legacy_naming(struct amdgpu_device *adev, int bl
                        default:
                                return NULL;
                        }
-                       break;
                case IP_VERSION(10, 0, 0):
                case IP_VERSION(10, 0, 1):
                        if (adev->asic_type == CHIP_RAVEN) {
@@ -1087,6 +1082,8 @@ static const char *amdgpu_ucode_legacy_naming(struct amdgpu_device *adev, int bl
                        return "navi10";
                case IP_VERSION(11, 0, 2):
                        return "vega20";
+               case IP_VERSION(11, 0, 3):
+                       return "renoir";
                case IP_VERSION(11, 0, 4):
                        return "arcturus";
                case IP_VERSION(11, 0, 5):
@@ -1104,12 +1101,7 @@ static const char *amdgpu_ucode_legacy_naming(struct amdgpu_device *adev, int bl
                case IP_VERSION(11, 5, 0):
                        return "vangogh";
                case IP_VERSION(12, 0, 1):
-                       if (adev->asic_type == CHIP_RENOIR) {
-                               if (adev->apu_flags & AMD_APU_IS_RENOIR)
-                                       return "renoir";
-                               return "green_sardine";
-                       }
-                       break;
+                       return "green_sardine";
                case IP_VERSION(13, 0, 2):
                        return "aldebaran";
                case IP_VERSION(13, 0, 1):
@@ -1312,3 +1304,39 @@ void amdgpu_ucode_ip_version_decode(struct amdgpu_device *adev, int block_type,
 
        snprintf(ucode_prefix, len, "%s_%d_%d_%d", ip_name, maj, min, rev);
 }
+
+/*
+ * amdgpu_ucode_request - Fetch and validate amdgpu microcode
+ *
+ * @adev: amdgpu device
+ * @fw: pointer to load firmware to
+ * @fw_name: firmware to load
+ *
+ * This is a helper that will use request_firmware and amdgpu_ucode_validate
+ * to load and run basic validation on firmware. If the load fails, remap
+ * the error code to -ENODEV, so that early_init functions will fail to load.
+ */
+int amdgpu_ucode_request(struct amdgpu_device *adev, const struct firmware **fw,
+                        const char *fw_name)
+{
+       int err = request_firmware(fw, fw_name, adev->dev);
+
+       if (err)
+               return -ENODEV;
+       err = amdgpu_ucode_validate(*fw);
+       if (err)
+               dev_dbg(adev->dev, "\"%s\" failed to validate\n", fw_name);
+
+       return err;
+}
+
+/*
+ * amdgpu_ucode_release - Release firmware microcode
+ *
+ * @fw: pointer to firmware to release
+ */
+void amdgpu_ucode_release(const struct firmware **fw)
+{
+       release_firmware(*fw);
+       *fw = NULL;
+}