[PATCH] drm/amdgpu: unify Vega20 PSP SOS firmwares for A0 and A1

[Grodzovsky, Andrey]

With this change in latest drm-next and related commit in latest FW i get


[  148.887374] [drm:psp_hw_init [amdgpu]] *ERROR* PSP firmware loading failed
[  148.887535] [drm:amdgpu_device_fw_loading [amdgpu]] *ERROR* hw_init of IP block <psp> failed -22


Had to revert to be able to boot.


Andrey

On 12/13/2018 10:05 AM, Deucher, Alexander wrote:

Acked-by: Alex Deucher <alexander.deucher at amd.com><mailto:alexander.deucher at amd.com>

________________________________
From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org><mailto:amd-gfx-bounces at lists.freedesktop.org> on behalf of Evan Quan <evan.quan at amd.com><mailto:evan.quan at amd.com>
Sent: Thursday, December 13, 2018 1:14:51 AM
To: amd-gfx at lists.freedesktop.org<mailto:amd-gfx at lists.freedesktop.org>
Cc: Quan, Evan
Subject: [PATCH] drm/amdgpu: unify Vega20 PSP SOS firmwares for A0 and A1

The new PSP SOS firmware can support both A0 and A1.

Change-Id: I9bf85eb77b183a4403667c77e291e32689aed0af
---
 drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
index 61cf2f6954e7..f3f5d4dd4631 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
@@ -34,14 +34,11 @@
 #include "nbio/nbio_7_4_offset.h"

 MODULE_FIRMWARE("amdgpu/vega20_sos.bin");
-MODULE_FIRMWARE("amdgpu/vega20_sos_old.bin");
 MODULE_FIRMWARE("amdgpu/vega20_ta.bin");

 /* address block */
 #define smnMP1_FIRMWARE_FLAGS           0x3010024

-#define VEGA20_BL_VERSION_VAR_NEW 0xA1
-
 static int
 psp_v11_0_get_fw_type(struct amdgpu_firmware_info *ucode, enum psp_gfx_fw_type *type)
 {
@@ -104,7 +101,6 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
         int err = 0;
         const struct psp_firmware_header_v1_0 *sos_hdr;
         const struct ta_firmware_header_v1_0 *ta_hdr;
-       uint32_t bl_version;

         DRM_DEBUG("\n");

@@ -116,13 +112,7 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
                 BUG();
         }

-       bl_version = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_100);
-       bl_version = (bl_version & 0xFF0000) >> 16;
-
-       if (bl_version == VEGA20_BL_VERSION_VAR_NEW)
-               snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sos.bin", chip_name);
-       else
-               snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sos_old.bin", chip_name);
+       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sos.bin", chip_name);
         err = request_firmware(&adev->psp.sos_fw, fw_name, adev->dev);
         if (err)
                 goto out;
--
2.19.2

_______________________________________________
amd-gfx mailing list
amd-gfx at lists.freedesktop.org<mailto:amd-gfx at lists.freedesktop.org>
https://lists.freedesktop.org/mailman/listinfo/amd-gfx



_______________________________________________
amd-gfx mailing list
amd-gfx at lists.freedesktop.org<mailto:amd-gfx at lists.freedesktop.org>
https://lists.freedesktop.org/mailman/listinfo/amd-gfx


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20181214/d077a5d0/attachment.html>