* [PATCH] drm/amdgpu: Workaround RCC_DEV0_EPF0_STRAP0 access issue for SRIOV
@ 2020-09-21 20:54 Rohit Khaire
2020-09-22 2:11 ` Zhang, Hawking
0 siblings, 1 reply; 6+ messages in thread
From: Rohit Khaire @ 2020-09-21 20:54 UTC (permalink / raw)
To: amd-gfx
Cc: Jack Xiao, Feifei Xu, Kevin Wang, Tuikov Luben, Rohit Khaire,
Rong Li, Deucher Alexander, Xiaojie Yuan, Frank Min,
Christian König, Hawking Zhang
Signed-off-by: Rohit Khaire <rohit.khaire@amd.com>
---
drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
index 7429f30398b9..4f611cd68940 100644
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
@@ -51,8 +51,19 @@ static void nbio_v2_3_remap_hdp_registers(struct amdgpu_device *adev)
static u32 nbio_v2_3_get_rev_id(struct amdgpu_device *adev)
{
- u32 tmp = RREG32_SOC15(NBIO, 0, mmRCC_DEV0_EPF0_STRAP0);
+ u32 tmp;
+
+ if (amdgpu_sriov_vf(adev)) {
+ /* workaround on rev_id for sriov
+ * guest vm gets 0xffffffff when reading RCC_DEV0_EPF0_STRAP0,
+ * as a consequence, the rev_id and external_rev_id are wrong.
+ *
+ * workaround it by using PCI revision id.
+ */
+ return adev->pdev->revision;
+ }
+ tmp = RREG32_SOC15(NBIO, 0, mmRCC_DEV0_EPF0_STRAP0);
tmp &= RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0_MASK;
tmp >>= RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0__SHIFT;
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* RE: [PATCH] drm/amdgpu: Workaround RCC_DEV0_EPF0_STRAP0 access issue for SRIOV
2020-09-21 20:54 [PATCH] drm/amdgpu: Workaround RCC_DEV0_EPF0_STRAP0 access issue for SRIOV Rohit Khaire
@ 2020-09-22 2:11 ` Zhang, Hawking
0 siblings, 0 replies; 6+ messages in thread
From: Zhang, Hawking @ 2020-09-22 2:11 UTC (permalink / raw)
To: Khaire, Rohit, amd-gfx, Liu, Monk
Cc: Xiao, Jack, Xu, Feifei, Wang, Kevin(Yang),
Tuikov, Luben, Li, Rong (Zero),
Deucher, Alexander, Min, Frank, Koenig, Christian, Yuan, Xiaojie
[AMD Public Use]
You shall by pass get_rev_id function call, instead of adding the check in the callback function.
For each hw generation, there could be several callback function implementation depending on whether the mmRCC_DEV0_EPF0_STRAP0 can be re-used.
It's error prone if we just take the change in specific callback. There is no guarantee people remember to add this check next time when working on the implementation.
Regards,
Hawking
-----Original Message-----
From: Khaire, Rohit <Rohit.Khaire@amd.com>
Sent: Tuesday, September 22, 2020 04:55
To: amd-gfx@lists.freedesktop.org
Cc: Tuikov, Luben <Luben.Tuikov@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>; Deucher, Alexander <Alexander.Deucher@amd.com>; Xiao, Jack <Jack.Xiao@amd.com>; Zhang, Hawking <Hawking.Zhang@amd.com>; Xu, Feifei <Feifei.Xu@amd.com>; Wang, Kevin(Yang) <Kevin1.Wang@amd.com>; Yuan, Xiaojie <Xiaojie.Yuan@amd.com>; Li, Rong (Zero) <Rong.Li@amd.com>; Min, Frank <Frank.Min@amd.com>; Khaire, Rohit <Rohit.Khaire@amd.com>
Subject: [PATCH] drm/amdgpu: Workaround RCC_DEV0_EPF0_STRAP0 access issue for SRIOV
Signed-off-by: Rohit Khaire <rohit.khaire@amd.com>
---
drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
index 7429f30398b9..4f611cd68940 100644
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
@@ -51,8 +51,19 @@ static void nbio_v2_3_remap_hdp_registers(struct amdgpu_device *adev)
static u32 nbio_v2_3_get_rev_id(struct amdgpu_device *adev) {
- u32 tmp = RREG32_SOC15(NBIO, 0, mmRCC_DEV0_EPF0_STRAP0);
+ u32 tmp;
+
+ if (amdgpu_sriov_vf(adev)) {
+ /* workaround on rev_id for sriov
+ * guest vm gets 0xffffffff when reading RCC_DEV0_EPF0_STRAP0,
+ * as a consequence, the rev_id and external_rev_id are wrong.
+ *
+ * workaround it by using PCI revision id.
+ */
+ return adev->pdev->revision;
+ }
+ tmp = RREG32_SOC15(NBIO, 0, mmRCC_DEV0_EPF0_STRAP0);
tmp &= RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0_MASK;
tmp >>= RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0__SHIFT;
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] drm/amdgpu: Workaround RCC_DEV0_EPF0_STRAP0 access issue for SRIOV
@ 2020-09-21 20:50 Rohit Khaire
0 siblings, 0 replies; 6+ messages in thread
From: Rohit Khaire @ 2020-09-21 20:50 UTC (permalink / raw)
To: amd-gfx
Cc: Jack Xiao, Feifei Xu, Kevin Wang, Tuikov Luben, Rohit Khaire,
Rong Li, Deucher Alexander, Xiaojie Yuan, Frank Min,
Christian König, Hawking Zhang
Signed-off-by: Rohit Khaire <rohit.khaire@amd.com>
---
drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
index 7429f30398b9..78cb48bafa4c 100644
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
@@ -51,8 +51,20 @@ static void nbio_v2_3_remap_hdp_registers(struct amdgpu_device *adev)
static u32 nbio_v2_3_get_rev_id(struct amdgpu_device *adev)
{
- u32 tmp = RREG32_SOC15(NBIO, 0, mmRCC_DEV0_EPF0_STRAP0);
+ u32 tmp;
+
+ if (amdgpu_sriov_vf(adev)) {
+ /* workaround on rev_id for sriov
+ * guest vm gets 0xffffffff when reading RCC_DEV0_EPF0_STRAP0,
+ * as a consequence, the rev_id and external_rev_id are wrong.
+ *
+ * workaround it by hardcoding the rev_id to 0,
+ * (which is the default value)
+ */
+ return adev->pdev->revision;
+ }
+ tmp = RREG32_SOC15(NBIO, 0, mmRCC_DEV0_EPF0_STRAP0);
tmp &= RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0_MASK;
tmp >>= RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0__SHIFT;
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* RE: [PATCH] drm/amdgpu: Workaround RCC_DEV0_EPF0_STRAP0 access issue for SRIOV
2020-09-14 5:15 ` Alex Deucher
@ 2020-09-21 20:47 ` Khaire, Rohit
0 siblings, 0 replies; 6+ messages in thread
From: Khaire, Rohit @ 2020-09-21 20:47 UTC (permalink / raw)
To: Alex Deucher; +Cc: amd-gfx list
[AMD Public Use]
Hi Alex,
I discussed this with my team, we are fine with PCI_REVISION_ID for SRIOV.
I am resending my patch with the change you suggested.
Thanks
Rohit
-----Original Message-----
From: Alex Deucher <alexdeucher@gmail.com>
Sent: September 14, 2020 1:16 AM
To: Khaire, Rohit <Rohit.Khaire@amd.com>
Cc: amd-gfx list <amd-gfx@lists.freedesktop.org>
Subject: Re: [PATCH] drm/amdgpu: Workaround RCC_DEV0_EPF0_STRAP0 access issue for SRIOV
On Fri, Sep 11, 2020 at 6:03 PM Rohit Khaire <rohit.khaire@amd.com> wrote:
>
> Signed-off-by: Rohit Khaire <rohit.khaire@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 14 +++++++++++++-
> 1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
> b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
> index 7429f30398b9..fdfa075e6d5a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
> +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
> @@ -51,8 +51,20 @@ static void nbio_v2_3_remap_hdp_registers(struct
> amdgpu_device *adev)
>
> static u32 nbio_v2_3_get_rev_id(struct amdgpu_device *adev) {
> - u32 tmp = RREG32_SOC15(NBIO, 0, mmRCC_DEV0_EPF0_STRAP0);
> + u32 tmp;
>
> + /*
> + * On SRIOV VF RCC_DEV0_EPF0_STRAP is blocked.
> + * So we read rev_id from PCI config space.
> + */
> + if (amdgpu_sriov_vf(adev)) {
> + pci_read_config_dword(adev->pdev, PCI_REVISION_ID, &tmp);
This is not going to do what you want. The pci revision id is not the
same as the ati rev id. If you actually want the pci revision id, we
already have it in adev->pdev->revision, no need to fetch it directly.
Alex
> + /* Revision ID is the least significant 8 bits */
> + tmp &= 0xFF;
> + return tmp;
> + }
> +
> + tmp = RREG32_SOC15(NBIO, 0, mmRCC_DEV0_EPF0_STRAP0);
> tmp &= RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0_MASK;
> tmp >>= RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0__SHIFT;
>
> --
> 2.17.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Crohit.khaire%40amd.com%7C3f71c48028984d067a0208d8586d4528%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637356573621338868&sdata=4Z0WFnTuSqp4NaCtUc%2B0iJcH5y%2FbRT9yTz6sP8vm8Vg%3D&reserved=0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/amdgpu: Workaround RCC_DEV0_EPF0_STRAP0 access issue for SRIOV
2020-09-11 22:02 Rohit Khaire
@ 2020-09-14 5:15 ` Alex Deucher
2020-09-21 20:47 ` Khaire, Rohit
0 siblings, 1 reply; 6+ messages in thread
From: Alex Deucher @ 2020-09-14 5:15 UTC (permalink / raw)
To: Rohit Khaire; +Cc: amd-gfx list
On Fri, Sep 11, 2020 at 6:03 PM Rohit Khaire <rohit.khaire@amd.com> wrote:
>
> Signed-off-by: Rohit Khaire <rohit.khaire@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 14 +++++++++++++-
> 1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
> index 7429f30398b9..fdfa075e6d5a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
> +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
> @@ -51,8 +51,20 @@ static void nbio_v2_3_remap_hdp_registers(struct amdgpu_device *adev)
>
> static u32 nbio_v2_3_get_rev_id(struct amdgpu_device *adev)
> {
> - u32 tmp = RREG32_SOC15(NBIO, 0, mmRCC_DEV0_EPF0_STRAP0);
> + u32 tmp;
>
> + /*
> + * On SRIOV VF RCC_DEV0_EPF0_STRAP is blocked.
> + * So we read rev_id from PCI config space.
> + */
> + if (amdgpu_sriov_vf(adev)) {
> + pci_read_config_dword(adev->pdev, PCI_REVISION_ID, &tmp);
This is not going to do what you want. The pci revision id is not the
same as the ati rev id. If you actually want the pci revision id, we
already have it in adev->pdev->revision, no need to fetch it directly.
Alex
> + /* Revision ID is the least significant 8 bits */
> + tmp &= 0xFF;
> + return tmp;
> + }
> +
> + tmp = RREG32_SOC15(NBIO, 0, mmRCC_DEV0_EPF0_STRAP0);
> tmp &= RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0_MASK;
> tmp >>= RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0__SHIFT;
>
> --
> 2.17.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] drm/amdgpu: Workaround RCC_DEV0_EPF0_STRAP0 access issue for SRIOV
@ 2020-09-11 22:02 Rohit Khaire
2020-09-14 5:15 ` Alex Deucher
0 siblings, 1 reply; 6+ messages in thread
From: Rohit Khaire @ 2020-09-11 22:02 UTC (permalink / raw)
To: amd-gfx; +Cc: Rohit Khaire
Signed-off-by: Rohit Khaire <rohit.khaire@amd.com>
---
drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
index 7429f30398b9..fdfa075e6d5a 100644
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
@@ -51,8 +51,20 @@ static void nbio_v2_3_remap_hdp_registers(struct amdgpu_device *adev)
static u32 nbio_v2_3_get_rev_id(struct amdgpu_device *adev)
{
- u32 tmp = RREG32_SOC15(NBIO, 0, mmRCC_DEV0_EPF0_STRAP0);
+ u32 tmp;
+ /*
+ * On SRIOV VF RCC_DEV0_EPF0_STRAP is blocked.
+ * So we read rev_id from PCI config space.
+ */
+ if (amdgpu_sriov_vf(adev)) {
+ pci_read_config_dword(adev->pdev, PCI_REVISION_ID, &tmp);
+ /* Revision ID is the least significant 8 bits */
+ tmp &= 0xFF;
+ return tmp;
+ }
+
+ tmp = RREG32_SOC15(NBIO, 0, mmRCC_DEV0_EPF0_STRAP0);
tmp &= RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0_MASK;
tmp >>= RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0__SHIFT;
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-09-22 2:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-21 20:54 [PATCH] drm/amdgpu: Workaround RCC_DEV0_EPF0_STRAP0 access issue for SRIOV Rohit Khaire
2020-09-22 2:11 ` Zhang, Hawking
-- strict thread matches above, loose matches on Subject: below --
2020-09-21 20:50 Rohit Khaire
2020-09-11 22:02 Rohit Khaire
2020-09-14 5:15 ` Alex Deucher
2020-09-21 20:47 ` Khaire, Rohit
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).