Skip to contentSkip to conversation

drm/amdgpu: Ta fw needs to be loaded for SRIOV aldebaran

PATCH In review David Yu 2 participants 2 messages Apr 22, 2022

Subsystems (2)
lore
Share & tools
lore

David Yu

author
#0 lore raw

PATCH 1/1 drm/amdgpu: Ta fw needs to be loaded for SRIOV aldebaran

Load ta fw during psp_init_sriov_microcode to enable XGMI. It is required to be loaded by both guest and host starting from Arcturus. Cap fw needs to be loaded first. Fix previously patch that was pushed by mistake.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +2 -2
index 895251f42853..0bd22ebcc3d1 100644
@@ -275,8 +275,8 @@ static int psp_init_sriov_microcode(struct psp_context *psp)
 		ret = psp_init_cap_microcode(psp, "sienna_cichlid");
 		break;
 	case IP_VERSION(13, 0, 2):
-		ret = psp_init_ta_microcode(psp, "aldebaran");
-		ret &= psp_init_cap_microcode(psp, "aldebaran");
+		ret = psp_init_cap_microcode(psp, "aldebaran");
+		ret &= psp_init_ta_microcode(psp, "aldebaran");
 		break;
 	default:
 		BUG();
Signature · 1 line
2.25.1
#1 lore raw

[AMD Official Use Only]

Looks ok to me .
You can add reviewed-by: Shaoyun.liu <[email protected]>

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of David Yu
Sent: Friday, April 22, 2022 12:09 PM
To: [email protected]
Cc: Yu, David <[email protected]>
Subject: [PATCH] drm/amdgpu: Ta fw needs to be loaded for SRIOV aldebaran

Load ta fw during psp_init_sriov_microcode to enable XGMI. It is required to be loaded by both guest and host starting from Arcturus. Cap fw needs to be loaded first. Fix previously patch that was pushed by mistake.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +2 -2
index 895251f42853..0bd22ebcc3d1 100644
@@ -275,8 +275,8 @@ static int psp_init_sriov_microcode(struct psp_context *psp)
 		ret = psp_init_cap_microcode(psp, "sienna_cichlid");
 		break;
 	case IP_VERSION(13, 0, 2):
-		ret = psp_init_ta_microcode(psp, "aldebaran");
-		ret &= psp_init_cap_microcode(psp, "aldebaran");
+		ret = psp_init_cap_microcode(psp, "aldebaran");
+		ret &= psp_init_ta_microcode(psp, "aldebaran");
 		break;
 	default:
 		BUG();
Signature · 1 line
2.25.1