Skip to contentSkip to conversation

drm/amd/amdgpu/sriov skip RLCG s/r list for arcturus VF.

PATCH In review Jack Zhang 3 participants 6 messages Nov 21, 2019 5 messages not in the archive

Subsystems (2)
lore
Share & tools
lore

Jack Zhang

author
#0 lore raw

PATCH 2/2 drm/amd/amdgpu/sriov skip RLCG s/r list for arcturus VF.

After rlcg fw 2.1, kmd driver starts to load extra fw for LIST_CNTL,GPM_MEM,SRM_MEM. We needs to skip the three fw because all rlcg related fw have been loaded by host driver. Guest driver would load the three fw fail without this change.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +4 -1
index c3a42d3..eecde80 100644
@@ -1470,7 +1470,10 @@ static int psp_np_fw_load(struct psp_context *psp)
 		    || ucode->ucode_id == AMDGPU_UCODE_ID_SDMA5
 		    || ucode->ucode_id == AMDGPU_UCODE_ID_SDMA6
 		    || ucode->ucode_id == AMDGPU_UCODE_ID_SDMA7
-		    || ucode->ucode_id == AMDGPU_UCODE_ID_RLC_G))
+                    || ucode->ucode_id == AMDGPU_UCODE_ID_RLC_G
+	            || 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))
 			/*skip ucode loading in SRIOV VF */
 			continue;
 
Signature · 6 lines
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw

Won't this impact bare metal hw that needs this?

Alex

Quoted 30 lines · Jack Zhang

After rlcg fw 2.1, kmd driver starts to load extra fw for LIST_CNTL,GPM_MEM,SRM_MEM. We needs to skip the three fw because all rlcg related fw have been loaded by host driver. Guest driver would load the three fw fail without this change.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +4 -2
index c3a42d3..eecde80 100644
@@ -1470,7 +1470,10 @@ static int psp_np_fw_load(struct psp_context *psp)
                    || ucode->ucode_id == AMDGPU_UCODE_ID_SDMA5
                    || ucode->ucode_id == AMDGPU_UCODE_ID_SDMA6
                    || ucode->ucode_id == AMDGPU_UCODE_ID_SDMA7
-                   || ucode->ucode_id == AMDGPU_UCODE_ID_RLC_G))
+                    || ucode->ucode_id == AMDGPU_UCODE_ID_RLC_G
+                   || 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))
                        /*skip ucode loading in SRIOV VF */
                        continue;
 
--

2.7.4

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): CADnq5_MrfFWAjC__9ccB46CYzdcLWP=DPKD70aXAm862DJLu1g-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

Acked-by
#4 lore raw

Nevermind. I missed the sr-iov check. Patch is:

Quoted 33 lines · Alex Deucher

Won't this impact bare metal hw that needs this?

Alex

Quoted 27 lines · Jack Zhang

After rlcg fw 2.1, kmd driver starts to load extra fw for LIST_CNTL,GPM_MEM,SRM_MEM. We needs to skip the three fw because all rlcg related fw have been loaded by host driver. Guest driver would load the three fw fail without this change.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +4 -1
index c3a42d3..eecde80 100644
@@ -1470,7 +1470,10 @@ static int psp_np_fw_load(struct psp_context *psp)
                    || ucode->ucode_id == AMDGPU_UCODE_ID_SDMA5
                    || ucode->ucode_id == AMDGPU_UCODE_ID_SDMA6
                    || ucode->ucode_id == AMDGPU_UCODE_ID_SDMA7
-                   || ucode->ucode_id == AMDGPU_UCODE_ID_RLC_G))
+                    || ucode->ucode_id == AMDGPU_UCODE_ID_RLC_G
+                   || 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))
                        /*skip ucode loading in SRIOV VF */
                        continue;
 
Quoted 7 lines
Quoted 7 lines

--
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): CADnq5_OE8xi7TmgxWe2PiWVxM8pVhxAtYF=CTtT7AHOhrUhEyA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

author Acked-by Alex Deucher
#6 lore raw

Thanks Alex for this review.

Both of the two patches will not influence bare-metal code path.

B. R.
Jack

Outlook for Android<https://aka.ms/ghei36>
________________________________
From: Alex Deucher <[email protected]>
Sent: Thursday, November 21, 2019 11:26:37 PM
To: Zhang, Jack (Jian) <[email protected]>
Cc: amd-gfx list <[email protected]>
Subject: Re: [PATCH 2/2] drm/amd/amdgpu/sriov skip RLCG s/r list for arcturus VF.

Nevermind. I missed the sr-iov check. Patch is:

Quoted 33 lines · Alex Deucher

Won't this impact bare metal hw that needs this?

Alex

Quoted 27 lines · Jack Zhang

After rlcg fw 2.1, kmd driver starts to load extra fw for LIST_CNTL,GPM_MEM,SRM_MEM. We needs to skip the three fw because all rlcg related fw have been loaded by host driver. Guest driver would load the three fw fail without this change.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +4 -1
index c3a42d3..eecde80 100644
@@ -1470,7 +1470,10 @@ static int psp_np_fw_load(struct psp_context *psp)
                    || ucode->ucode_id == AMDGPU_UCODE_ID_SDMA5
                    || ucode->ucode_id == AMDGPU_UCODE_ID_SDMA6
                    || ucode->ucode_id == AMDGPU_UCODE_ID_SDMA7
-                   || ucode->ucode_id == AMDGPU_UCODE_ID_RLC_G))
+                    || ucode->ucode_id == AMDGPU_UCODE_ID_RLC_G
+                   || 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))
                        /*skip ucode loading in SRIOV VF */
                        continue;
 
Quoted 7 lines
Quoted 7 lines

--
2.7.4

_______________________________________________
amd-gfx mailing list [email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7CJack.Zhang1%40amd.com%7C62c30b71b3b8490862d808d76e973ae5%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637099468112639673&amp;sdata=iC932sWNGrLeexp7wIDdrZ7cjVBcFv5giOTC3uHdE%2Fk%3D&amp;reserved=0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): CH2PR12MB3672F73E41AF7AEBCAC81053BB4E0-rV3HgkLYx2W31Hpknp8SDAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org

#8 lore raw

You can have my RB on the first patch if you fix the compiler warnings.

Alex
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Zhang, Jack (Jian) <[email protected]>
Sent: Thursday, November 21, 2019 10:58 AM
To: Alex Deucher <[email protected]>
Cc: amd-gfx list <[email protected]>
Subject: Re: [PATCH 2/2] drm/amd/amdgpu/sriov skip RLCG s/r list for arcturus VF.

Thanks Alex for this review.

Both of the two patches will not influence bare-metal code path.

B. R.
Jack

Outlook for Android<https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Faka.ms%2Fghei36&data=02%7C01%7Calexander.deucher%40amd.com%7Cf350a586b8b840526a2c08d76e9bb538%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637099487450051533&sdata=ghsxwJqO5AO%2B2pBhPoQz70SkyYyeNCnA5FQMAHQVVpI%3D&reserved=0>
________________________________
From: Alex Deucher <[email protected]>
Sent: Thursday, November 21, 2019 11:26:37 PM
To: Zhang, Jack (Jian) <[email protected]>
Cc: amd-gfx list <[email protected]>
Subject: Re: [PATCH 2/2] drm/amd/amdgpu/sriov skip RLCG s/r list for arcturus VF.

Nevermind. I missed the sr-iov check. Patch is:

Quoted 33 lines · Alex Deucher

Won't this impact bare metal hw that needs this?

Alex

Quoted 27 lines · Jack Zhang

After rlcg fw 2.1, kmd driver starts to load extra fw for LIST_CNTL,GPM_MEM,SRM_MEM. We needs to skip the three fw because all rlcg related fw have been loaded by host driver. Guest driver would load the three fw fail without this change.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +4 -1
index c3a42d3..eecde80 100644
@@ -1470,7 +1470,10 @@ static int psp_np_fw_load(struct psp_context *psp)
                    || ucode->ucode_id == AMDGPU_UCODE_ID_SDMA5
                    || ucode->ucode_id == AMDGPU_UCODE_ID_SDMA6
                    || ucode->ucode_id == AMDGPU_UCODE_ID_SDMA7
-                   || ucode->ucode_id == AMDGPU_UCODE_ID_RLC_G))
+                    || ucode->ucode_id == AMDGPU_UCODE_ID_RLC_G
+                   || 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))
                        /*skip ucode loading in SRIOV VF */
                        continue;
 
Quoted 7 lines
Quoted 7 lines

--
2.7.4

_______________________________________________
amd-gfx mailing list [email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7CJack.Zhang1%40amd.com%7C62c30b71b3b8490862d808d76e973ae5%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637099468112639673&amp;sdata=iC932sWNGrLeexp7wIDdrZ7cjVBcFv5giOTC3uHdE%2Fk%3D&amp;reserved=0<https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Calexander.deucher%40amd.com%7Cf350a586b8b840526a2c08d76e9bb538%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637099487450061527&sdata=FofOoED2ixVkMukh%2FOXH8mdtu%2B%2BwilXYGxbQVNRflUY%3D&reserved=0>

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): CY4PR12MB181333EBFDD75B8664F319CAF74E0-rpdhrqHFk05Nhq0cRkx5WwdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org

author Acked-by Alex Deucher
#10 lore raw

Sure,will do that!

Thanks,
Jack

Outlook for Android<https://aka.ms/ghei36>
________________________________
From: Deucher, Alexander <[email protected]>
Sent: Friday, November 22, 2019 12:00:04 AM
To: Zhang, Jack (Jian) <[email protected]>; Alex Deucher <[email protected]>
Cc: amd-gfx list <[email protected]>
Subject: Re: [PATCH 2/2] drm/amd/amdgpu/sriov skip RLCG s/r list for arcturus VF.

You can have my RB on the first patch if you fix the compiler warnings.

Alex
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Zhang, Jack (Jian) <[email protected]>
Sent: Thursday, November 21, 2019 10:58 AM
To: Alex Deucher <[email protected]>
Cc: amd-gfx list <[email protected]>
Subject: Re: [PATCH 2/2] drm/amd/amdgpu/sriov skip RLCG s/r list for arcturus VF.

Thanks Alex for this review.

Both of the two patches will not influence bare-metal code path.

B. R.
Jack

Outlook for Android<https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Faka.ms%2Fghei36&data=02%7C01%7Calexander.deucher%40amd.com%7Cf350a586b8b840526a2c08d76e9bb538%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637099487450051533&sdata=ghsxwJqO5AO%2B2pBhPoQz70SkyYyeNCnA5FQMAHQVVpI%3D&reserved=0>
________________________________
From: Alex Deucher <[email protected]>
Sent: Thursday, November 21, 2019 11:26:37 PM
To: Zhang, Jack (Jian) <[email protected]>
Cc: amd-gfx list <[email protected]>
Subject: Re: [PATCH 2/2] drm/amd/amdgpu/sriov skip RLCG s/r list for arcturus VF.

Nevermind. I missed the sr-iov check. Patch is:

Quoted 33 lines · Alex Deucher

Won't this impact bare metal hw that needs this?

Alex

Quoted 27 lines · Jack Zhang

After rlcg fw 2.1, kmd driver starts to load extra fw for LIST_CNTL,GPM_MEM,SRM_MEM. We needs to skip the three fw because all rlcg related fw have been loaded by host driver. Guest driver would load the three fw fail without this change.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +4 -1
index c3a42d3..eecde80 100644
@@ -1470,7 +1470,10 @@ static int psp_np_fw_load(struct psp_context *psp)
                    || ucode->ucode_id == AMDGPU_UCODE_ID_SDMA5
                    || ucode->ucode_id == AMDGPU_UCODE_ID_SDMA6
                    || ucode->ucode_id == AMDGPU_UCODE_ID_SDMA7
-                   || ucode->ucode_id == AMDGPU_UCODE_ID_RLC_G))
+                    || ucode->ucode_id == AMDGPU_UCODE_ID_RLC_G
+                   || 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))
                        /*skip ucode loading in SRIOV VF */
                        continue;
 
Quoted 7 lines
Quoted 7 lines

--
2.7.4

_______________________________________________
amd-gfx mailing list [email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7CJack.Zhang1%40amd.com%7C62c30b71b3b8490862d808d76e973ae5%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637099468112639673&amp;sdata=iC932sWNGrLeexp7wIDdrZ7cjVBcFv5giOTC3uHdE%2Fk%3D&amp;reserved=0<https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Calexander.deucher%40amd.com%7Cf350a586b8b840526a2c08d76e9bb538%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637099487450061527&sdata=FofOoED2ixVkMukh%2FOXH8mdtu%2B%2BwilXYGxbQVNRflUY%3D&reserved=0>

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx