All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] drm/amdgpu: avoid using invalidate semaphore for SRIOV
@ 2019-12-02  6:10 Changfeng.Zhu
  0 siblings, 0 replies; 4+ messages in thread
From: Changfeng.Zhu @ 2019-12-02  6:10 UTC (permalink / raw)
  To: amd-gfx, Christian.Koenig, Ray.Huang, Xinmei.Huang; +Cc: changzhu

From: changzhu <Changfeng.Zhu@amd.com>

It may fail to load guest driver in round 2 when using invalidate
semaphore for SRIOV. So it needs to avoid using invalidate semaphore for
SRIOV.

Fix for:http://ontrack-internal.amd.com/browse/SWDEV-214157

Change-Id: I1e498d33df2f8a53dbbec7a28672085cea68acb8
Signed-off-by: changzhu <Changfeng.Zhu@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 21 +++++++++++++--------
 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c  | 20 ++++++++++++--------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
index 9effec6a7a67..49b2ce30d629 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
@@ -243,8 +243,9 @@ static void gmc_v10_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid,
 	 */
 
 	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
-	if (vmhub == AMDGPU_MMHUB_0 ||
-	    vmhub == AMDGPU_MMHUB_1) {
+	if ((vmhub == AMDGPU_MMHUB_0 ||
+	     vmhub == AMDGPU_MMHUB_1) &&
+	    (!amdgpu_sriov_vf(adev))) {
 		for (i = 0; i < adev->usec_timeout; i++) {
 			/* a read return value of 1 means semaphore acuqire */
 			tmp = RREG32_NO_KIQ(hub->vm_inv_eng0_sem + eng);
@@ -277,8 +278,9 @@ static void gmc_v10_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid,
 	}
 
 	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
-	if (vmhub == AMDGPU_MMHUB_0 ||
-	    vmhub == AMDGPU_MMHUB_1)
+	if ((vmhub == AMDGPU_MMHUB_0 ||
+	     vmhub == AMDGPU_MMHUB_1) &&
+	    (!amdgpu_sriov_vf(adev)))
 		/*
 		 * add semaphore release after invalidation,
 		 * write with 0 means semaphore release
@@ -368,6 +370,7 @@ static void gmc_v10_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,
 static uint64_t gmc_v10_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,
 					     unsigned vmid, uint64_t pd_addr)
 {
+	struct amdgpu_device *adev = ring->adev;
 	struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub];
 	uint32_t req = gmc_v10_0_get_invalidate_req(vmid, 0);
 	unsigned eng = ring->vm_inv_eng;
@@ -380,8 +383,9 @@ static uint64_t gmc_v10_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,
 	 */
 
 	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
-	if (ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
-	    ring->funcs->vmhub == AMDGPU_MMHUB_1)
+	if ((ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
+	     ring->funcs->vmhub == AMDGPU_MMHUB_1) &&
+	    (!amdgpu_sriov_vf(adev)))
 		/* a read return value of 1 means semaphore acuqire */
 		amdgpu_ring_emit_reg_wait(ring,
 					  hub->vm_inv_eng0_sem + eng, 0x1, 0x1);
@@ -397,8 +401,9 @@ static uint64_t gmc_v10_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,
 					    req, 1 << vmid);
 
 	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
-	if (ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
-	    ring->funcs->vmhub == AMDGPU_MMHUB_1)
+	if ((ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
+	     ring->funcs->vmhub == AMDGPU_MMHUB_1) &&
+	    (!amdgpu_sriov_vf(adev)))
 		/*
 		 * add semaphore release after invalidation,
 		 * write with 0 means semaphore release
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 231ea9762cb5..6c9a9c09cdb1 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -464,8 +464,9 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,
 	 */
 
 	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
-	if (vmhub == AMDGPU_MMHUB_0 ||
-	    vmhub == AMDGPU_MMHUB_1) {
+	if ((vmhub == AMDGPU_MMHUB_0 ||
+	     vmhub == AMDGPU_MMHUB_1) &&
+	    (!amdgpu_sriov_vf(adev))) {
 		for (j = 0; j < adev->usec_timeout; j++) {
 			/* a read return value of 1 means semaphore acuqire */
 			tmp = RREG32_NO_KIQ(hub->vm_inv_eng0_sem + eng);
@@ -495,8 +496,9 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,
 	}
 
 	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
-	if (vmhub == AMDGPU_MMHUB_0 ||
-	    vmhub == AMDGPU_MMHUB_1)
+	if ((vmhub == AMDGPU_MMHUB_0 ||
+	     vmhub == AMDGPU_MMHUB_1) &&
+	    (!amdgpu_sriov_vf(adev)))
 		/*
 		 * add semaphore release after invalidation,
 		 * write with 0 means semaphore release
@@ -527,8 +529,9 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,
 	 */
 
 	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
-	if (ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
-	    ring->funcs->vmhub == AMDGPU_MMHUB_1)
+	if ((ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
+	     ring->funcs->vmhub == AMDGPU_MMHUB_1) &&
+	    (!amdgpu_sriov_vf(adev)))
 		/* a read return value of 1 means semaphore acuqire */
 		amdgpu_ring_emit_reg_wait(ring,
 					  hub->vm_inv_eng0_sem + eng, 0x1, 0x1);
@@ -544,8 +547,9 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,
 					    req, 1 << vmid);
 
 	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
-	if (ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
-	    ring->funcs->vmhub == AMDGPU_MMHUB_1)
+	if ((ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
+	     ring->funcs->vmhub == AMDGPU_MMHUB_1) &&
+	    (!amdgpu_sriov_vf(adev)))
 		/*
 		 * add semaphore release after invalidation,
 		 * write with 0 means semaphore release
-- 
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] 4+ messages in thread
* RE: [PATCH 1/2] drm/amdgpu: avoid using invalidate semaphore for SRIOV
  2019-12-03 12:17 ` Christian König
@ 2019-12-03 12:59   ` Zhu, Changfeng
  0 siblings, 0 replies; 4+ messages in thread
From: Zhu, Changfeng @ 2019-12-03 12:59 UTC (permalink / raw)
  To: Koenig, Christian, amd-gfx, Huang, Ray, Huang, Shimmer, Deucher,
	Alexander

[AMD Official Use Only - Internal Distribution Only]

OK Chris.

I'll try and test it.

BR,
Changfeng.

-----Original Message-----
From: Christian König <ckoenig.leichtzumerken@gmail.com> 
Sent: Tuesday, December 3, 2019 8:18 PM
To: Zhu, Changfeng <Changfeng.Zhu@amd.com>; amd-gfx@lists.freedesktop.org; Koenig, Christian <Christian.Koenig@amd.com>; Huang, Ray <Ray.Huang@amd.com>; Huang, Shimmer <Xinmei.Huang@amd.com>; Deucher, Alexander <Alexander.Deucher@amd.com>
Subject: Re: [PATCH 1/2] drm/amdgpu: avoid using invalidate semaphore for SRIOV

Am 03.12.19 um 09:50 schrieb Changfeng.Zhu:
> From: changzhu <Changfeng.Zhu@amd.com>
>
> It may fail to load guest driver in round 2 when using invalidate 
> semaphore for SRIOV. So it needs to avoid using invalidate semaphore 
> for SRIOV.

That sounds like the registers are just not correctly initialized when the driver is reloaded.

I would just add that to mmhub_*_program_invalidation(). Something like this should already do it:
>         for (i = 0; i < 18; ++i) {
>                 WREG32_SOC15_OFFSET(MMHUB, 0, 
> mmVM_INVALIDATE_ENG0_ADDR_RANGE_LO32,
>                                     2 * i, 0xffffffff);
>                 WREG32_SOC15_OFFSET(MMHUB, 0, 
> mmVM_INVALIDATE_ENG0_ADDR_RANGE_HI32,
>                                     2 * i, 0x1f);

WREG32_SOC15_OFFSET(MMHUB, 0, mmVM_INVALIDATE_ENG0_SEM, i, 0x0);

>         }

Regards,
Christian.

>
> Change-Id: I8db1dc6f990fd0c458953571936467551cd4102d
> Signed-off-by: changzhu <Changfeng.Zhu@amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 21 +++++++++++++--------
>   drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c  | 20 ++++++++++++--------
>   2 files changed, 25 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c 
> b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> index 381bb709f021..d4c7d0319650 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> @@ -243,8 +243,9 @@ static void gmc_v10_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid,
>   	 */
>   
>   	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
> -	if (vmhub == AMDGPU_MMHUB_0 ||
> -	    vmhub == AMDGPU_MMHUB_1) {
> +	if ((vmhub == AMDGPU_MMHUB_0 ||
> +	     vmhub == AMDGPU_MMHUB_1) &&
> +	    (!amdgpu_sriov_vf(adev))) {
>   		for (i = 0; i < adev->usec_timeout; i++) {
>   			/* a read return value of 1 means semaphore acuqire */
>   			tmp = RREG32_NO_KIQ(hub->vm_inv_eng0_sem + eng); @@ -277,8 +278,9 
> @@ static void gmc_v10_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid,
>   	}
>   
>   	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
> -	if (vmhub == AMDGPU_MMHUB_0 ||
> -	    vmhub == AMDGPU_MMHUB_1)
> +	if ((vmhub == AMDGPU_MMHUB_0 ||
> +	     vmhub == AMDGPU_MMHUB_1) &&
> +	    (!amdgpu_sriov_vf(adev)))
>   		/*
>   		 * add semaphore release after invalidation,
>   		 * write with 0 means semaphore release @@ -369,6 +371,7 @@ static 
> void gmc_v10_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,
>   static uint64_t gmc_v10_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,
>   					     unsigned vmid, uint64_t pd_addr)
>   {
> +	struct amdgpu_device *adev = ring->adev;
>   	struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub];
>   	uint32_t req = gmc_v10_0_get_invalidate_req(vmid, 0);
>   	unsigned eng = ring->vm_inv_eng;
> @@ -381,8 +384,9 @@ static uint64_t gmc_v10_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,
>   	 */
>   
>   	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
> -	if (ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
> -	    ring->funcs->vmhub == AMDGPU_MMHUB_1)
> +	if ((ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
> +	     ring->funcs->vmhub == AMDGPU_MMHUB_1) &&
> +	    (!amdgpu_sriov_vf(adev)))
>   		/* a read return value of 1 means semaphore acuqire */
>   		amdgpu_ring_emit_reg_wait(ring,
>   					  hub->vm_inv_eng0_sem + eng, 0x1, 0x1); @@ -398,8 +402,9 @@ 
> static uint64_t gmc_v10_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,
>   					    req, 1 << vmid);
>   
>   	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
> -	if (ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
> -	    ring->funcs->vmhub == AMDGPU_MMHUB_1)
> +	if ((ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
> +	     ring->funcs->vmhub == AMDGPU_MMHUB_1) &&
> +	    (!amdgpu_sriov_vf(adev)))
>   		/*
>   		 * add semaphore release after invalidation,
>   		 * write with 0 means semaphore release diff --git 
> a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c 
> b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> index 231ea9762cb5..6c9a9c09cdb1 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> @@ -464,8 +464,9 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,
>   	 */
>   
>   	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
> -	if (vmhub == AMDGPU_MMHUB_0 ||
> -	    vmhub == AMDGPU_MMHUB_1) {
> +	if ((vmhub == AMDGPU_MMHUB_0 ||
> +	     vmhub == AMDGPU_MMHUB_1) &&
> +	    (!amdgpu_sriov_vf(adev))) {
>   		for (j = 0; j < adev->usec_timeout; j++) {
>   			/* a read return value of 1 means semaphore acuqire */
>   			tmp = RREG32_NO_KIQ(hub->vm_inv_eng0_sem + eng); @@ -495,8 +496,9 
> @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,
>   	}
>   
>   	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
> -	if (vmhub == AMDGPU_MMHUB_0 ||
> -	    vmhub == AMDGPU_MMHUB_1)
> +	if ((vmhub == AMDGPU_MMHUB_0 ||
> +	     vmhub == AMDGPU_MMHUB_1) &&
> +	    (!amdgpu_sriov_vf(adev)))
>   		/*
>   		 * add semaphore release after invalidation,
>   		 * write with 0 means semaphore release @@ -527,8 +529,9 @@ static 
> uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,
>   	 */
>   
>   	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
> -	if (ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
> -	    ring->funcs->vmhub == AMDGPU_MMHUB_1)
> +	if ((ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
> +	     ring->funcs->vmhub == AMDGPU_MMHUB_1) &&
> +	    (!amdgpu_sriov_vf(adev)))
>   		/* a read return value of 1 means semaphore acuqire */
>   		amdgpu_ring_emit_reg_wait(ring,
>   					  hub->vm_inv_eng0_sem + eng, 0x1, 0x1); @@ -544,8 +547,9 @@ 
> static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,
>   					    req, 1 << vmid);
>   
>   	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
> -	if (ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
> -	    ring->funcs->vmhub == AMDGPU_MMHUB_1)
> +	if ((ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
> +	     ring->funcs->vmhub == AMDGPU_MMHUB_1) &&
> +	    (!amdgpu_sriov_vf(adev)))
>   		/*
>   		 * add semaphore release after invalidation,
>   		 * write with 0 means semaphore release
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] drm/amdgpu: avoid using invalidate semaphore for SRIOV
  2019-12-03  8:50 Changfeng.Zhu
@ 2019-12-03 12:17 ` Christian König
  2019-12-03 12:59   ` Zhu, Changfeng
  0 siblings, 1 reply; 4+ messages in thread
From: Christian König @ 2019-12-03 12:17 UTC (permalink / raw)
  To: Changfeng.Zhu, amd-gfx, Christian.Koenig, Ray.Huang,
	Xinmei.Huang, Alexander.Deucher

Am 03.12.19 um 09:50 schrieb Changfeng.Zhu:
> From: changzhu <Changfeng.Zhu@amd.com>
>
> It may fail to load guest driver in round 2 when using invalidate
> semaphore for SRIOV. So it needs to avoid using invalidate semaphore for
> SRIOV.

That sounds like the registers are just not correctly initialized when 
the driver is reloaded.

I would just add that to mmhub_*_program_invalidation(). Something like 
this should already do it:
>         for (i = 0; i < 18; ++i) {
>                 WREG32_SOC15_OFFSET(MMHUB, 0, 
> mmVM_INVALIDATE_ENG0_ADDR_RANGE_LO32,
>                                     2 * i, 0xffffffff);
>                 WREG32_SOC15_OFFSET(MMHUB, 0, 
> mmVM_INVALIDATE_ENG0_ADDR_RANGE_HI32,
>                                     2 * i, 0x1f);

WREG32_SOC15_OFFSET(MMHUB, 0, mmVM_INVALIDATE_ENG0_SEM, i, 0x0);

>         }

Regards,
Christian.

>
> Change-Id: I8db1dc6f990fd0c458953571936467551cd4102d
> Signed-off-by: changzhu <Changfeng.Zhu@amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 21 +++++++++++++--------
>   drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c  | 20 ++++++++++++--------
>   2 files changed, 25 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> index 381bb709f021..d4c7d0319650 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> @@ -243,8 +243,9 @@ static void gmc_v10_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid,
>   	 */
>   
>   	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
> -	if (vmhub == AMDGPU_MMHUB_0 ||
> -	    vmhub == AMDGPU_MMHUB_1) {
> +	if ((vmhub == AMDGPU_MMHUB_0 ||
> +	     vmhub == AMDGPU_MMHUB_1) &&
> +	    (!amdgpu_sriov_vf(adev))) {
>   		for (i = 0; i < adev->usec_timeout; i++) {
>   			/* a read return value of 1 means semaphore acuqire */
>   			tmp = RREG32_NO_KIQ(hub->vm_inv_eng0_sem + eng);
> @@ -277,8 +278,9 @@ static void gmc_v10_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid,
>   	}
>   
>   	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
> -	if (vmhub == AMDGPU_MMHUB_0 ||
> -	    vmhub == AMDGPU_MMHUB_1)
> +	if ((vmhub == AMDGPU_MMHUB_0 ||
> +	     vmhub == AMDGPU_MMHUB_1) &&
> +	    (!amdgpu_sriov_vf(adev)))
>   		/*
>   		 * add semaphore release after invalidation,
>   		 * write with 0 means semaphore release
> @@ -369,6 +371,7 @@ static void gmc_v10_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,
>   static uint64_t gmc_v10_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,
>   					     unsigned vmid, uint64_t pd_addr)
>   {
> +	struct amdgpu_device *adev = ring->adev;
>   	struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub];
>   	uint32_t req = gmc_v10_0_get_invalidate_req(vmid, 0);
>   	unsigned eng = ring->vm_inv_eng;
> @@ -381,8 +384,9 @@ static uint64_t gmc_v10_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,
>   	 */
>   
>   	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
> -	if (ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
> -	    ring->funcs->vmhub == AMDGPU_MMHUB_1)
> +	if ((ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
> +	     ring->funcs->vmhub == AMDGPU_MMHUB_1) &&
> +	    (!amdgpu_sriov_vf(adev)))
>   		/* a read return value of 1 means semaphore acuqire */
>   		amdgpu_ring_emit_reg_wait(ring,
>   					  hub->vm_inv_eng0_sem + eng, 0x1, 0x1);
> @@ -398,8 +402,9 @@ static uint64_t gmc_v10_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,
>   					    req, 1 << vmid);
>   
>   	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
> -	if (ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
> -	    ring->funcs->vmhub == AMDGPU_MMHUB_1)
> +	if ((ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
> +	     ring->funcs->vmhub == AMDGPU_MMHUB_1) &&
> +	    (!amdgpu_sriov_vf(adev)))
>   		/*
>   		 * add semaphore release after invalidation,
>   		 * write with 0 means semaphore release
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> index 231ea9762cb5..6c9a9c09cdb1 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> @@ -464,8 +464,9 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,
>   	 */
>   
>   	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
> -	if (vmhub == AMDGPU_MMHUB_0 ||
> -	    vmhub == AMDGPU_MMHUB_1) {
> +	if ((vmhub == AMDGPU_MMHUB_0 ||
> +	     vmhub == AMDGPU_MMHUB_1) &&
> +	    (!amdgpu_sriov_vf(adev))) {
>   		for (j = 0; j < adev->usec_timeout; j++) {
>   			/* a read return value of 1 means semaphore acuqire */
>   			tmp = RREG32_NO_KIQ(hub->vm_inv_eng0_sem + eng);
> @@ -495,8 +496,9 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,
>   	}
>   
>   	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
> -	if (vmhub == AMDGPU_MMHUB_0 ||
> -	    vmhub == AMDGPU_MMHUB_1)
> +	if ((vmhub == AMDGPU_MMHUB_0 ||
> +	     vmhub == AMDGPU_MMHUB_1) &&
> +	    (!amdgpu_sriov_vf(adev)))
>   		/*
>   		 * add semaphore release after invalidation,
>   		 * write with 0 means semaphore release
> @@ -527,8 +529,9 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,
>   	 */
>   
>   	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
> -	if (ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
> -	    ring->funcs->vmhub == AMDGPU_MMHUB_1)
> +	if ((ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
> +	     ring->funcs->vmhub == AMDGPU_MMHUB_1) &&
> +	    (!amdgpu_sriov_vf(adev)))
>   		/* a read return value of 1 means semaphore acuqire */
>   		amdgpu_ring_emit_reg_wait(ring,
>   					  hub->vm_inv_eng0_sem + eng, 0x1, 0x1);
> @@ -544,8 +547,9 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,
>   					    req, 1 << vmid);
>   
>   	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
> -	if (ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
> -	    ring->funcs->vmhub == AMDGPU_MMHUB_1)
> +	if ((ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
> +	     ring->funcs->vmhub == AMDGPU_MMHUB_1) &&
> +	    (!amdgpu_sriov_vf(adev)))
>   		/*
>   		 * add semaphore release after invalidation,
>   		 * write with 0 means semaphore release

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH 1/2] drm/amdgpu: avoid using invalidate semaphore for SRIOV
@ 2019-12-03  8:50 Changfeng.Zhu
  2019-12-03 12:17 ` Christian König
  0 siblings, 1 reply; 4+ messages in thread
From: Changfeng.Zhu @ 2019-12-03  8:50 UTC (permalink / raw)
  To: amd-gfx, Christian.Koenig, Ray.Huang, Xinmei.Huang, Alexander.Deucher
  Cc: changzhu

From: changzhu <Changfeng.Zhu@amd.com>

It may fail to load guest driver in round 2 when using invalidate
semaphore for SRIOV. So it needs to avoid using invalidate semaphore for
SRIOV.

Change-Id: I8db1dc6f990fd0c458953571936467551cd4102d
Signed-off-by: changzhu <Changfeng.Zhu@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 21 +++++++++++++--------
 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c  | 20 ++++++++++++--------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
index 381bb709f021..d4c7d0319650 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
@@ -243,8 +243,9 @@ static void gmc_v10_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid,
 	 */
 
 	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
-	if (vmhub == AMDGPU_MMHUB_0 ||
-	    vmhub == AMDGPU_MMHUB_1) {
+	if ((vmhub == AMDGPU_MMHUB_0 ||
+	     vmhub == AMDGPU_MMHUB_1) &&
+	    (!amdgpu_sriov_vf(adev))) {
 		for (i = 0; i < adev->usec_timeout; i++) {
 			/* a read return value of 1 means semaphore acuqire */
 			tmp = RREG32_NO_KIQ(hub->vm_inv_eng0_sem + eng);
@@ -277,8 +278,9 @@ static void gmc_v10_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid,
 	}
 
 	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
-	if (vmhub == AMDGPU_MMHUB_0 ||
-	    vmhub == AMDGPU_MMHUB_1)
+	if ((vmhub == AMDGPU_MMHUB_0 ||
+	     vmhub == AMDGPU_MMHUB_1) &&
+	    (!amdgpu_sriov_vf(adev)))
 		/*
 		 * add semaphore release after invalidation,
 		 * write with 0 means semaphore release
@@ -369,6 +371,7 @@ static void gmc_v10_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,
 static uint64_t gmc_v10_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,
 					     unsigned vmid, uint64_t pd_addr)
 {
+	struct amdgpu_device *adev = ring->adev;
 	struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub];
 	uint32_t req = gmc_v10_0_get_invalidate_req(vmid, 0);
 	unsigned eng = ring->vm_inv_eng;
@@ -381,8 +384,9 @@ static uint64_t gmc_v10_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,
 	 */
 
 	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
-	if (ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
-	    ring->funcs->vmhub == AMDGPU_MMHUB_1)
+	if ((ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
+	     ring->funcs->vmhub == AMDGPU_MMHUB_1) &&
+	    (!amdgpu_sriov_vf(adev)))
 		/* a read return value of 1 means semaphore acuqire */
 		amdgpu_ring_emit_reg_wait(ring,
 					  hub->vm_inv_eng0_sem + eng, 0x1, 0x1);
@@ -398,8 +402,9 @@ static uint64_t gmc_v10_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,
 					    req, 1 << vmid);
 
 	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
-	if (ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
-	    ring->funcs->vmhub == AMDGPU_MMHUB_1)
+	if ((ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
+	     ring->funcs->vmhub == AMDGPU_MMHUB_1) &&
+	    (!amdgpu_sriov_vf(adev)))
 		/*
 		 * add semaphore release after invalidation,
 		 * write with 0 means semaphore release
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 231ea9762cb5..6c9a9c09cdb1 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -464,8 +464,9 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,
 	 */
 
 	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
-	if (vmhub == AMDGPU_MMHUB_0 ||
-	    vmhub == AMDGPU_MMHUB_1) {
+	if ((vmhub == AMDGPU_MMHUB_0 ||
+	     vmhub == AMDGPU_MMHUB_1) &&
+	    (!amdgpu_sriov_vf(adev))) {
 		for (j = 0; j < adev->usec_timeout; j++) {
 			/* a read return value of 1 means semaphore acuqire */
 			tmp = RREG32_NO_KIQ(hub->vm_inv_eng0_sem + eng);
@@ -495,8 +496,9 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,
 	}
 
 	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
-	if (vmhub == AMDGPU_MMHUB_0 ||
-	    vmhub == AMDGPU_MMHUB_1)
+	if ((vmhub == AMDGPU_MMHUB_0 ||
+	     vmhub == AMDGPU_MMHUB_1) &&
+	    (!amdgpu_sriov_vf(adev)))
 		/*
 		 * add semaphore release after invalidation,
 		 * write with 0 means semaphore release
@@ -527,8 +529,9 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,
 	 */
 
 	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
-	if (ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
-	    ring->funcs->vmhub == AMDGPU_MMHUB_1)
+	if ((ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
+	     ring->funcs->vmhub == AMDGPU_MMHUB_1) &&
+	    (!amdgpu_sriov_vf(adev)))
 		/* a read return value of 1 means semaphore acuqire */
 		amdgpu_ring_emit_reg_wait(ring,
 					  hub->vm_inv_eng0_sem + eng, 0x1, 0x1);
@@ -544,8 +547,9 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,
 					    req, 1 << vmid);
 
 	/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */
-	if (ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
-	    ring->funcs->vmhub == AMDGPU_MMHUB_1)
+	if ((ring->funcs->vmhub == AMDGPU_MMHUB_0 ||
+	     ring->funcs->vmhub == AMDGPU_MMHUB_1) &&
+	    (!amdgpu_sriov_vf(adev)))
 		/*
 		 * add semaphore release after invalidation,
 		 * write with 0 means semaphore release
-- 
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] 4+ messages in thread
end of thread, other threads:[~2019-12-03 12:59 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-02  6:10 [PATCH 1/2] drm/amdgpu: avoid using invalidate semaphore for SRIOV Changfeng.Zhu
2019-12-03  8:50 Changfeng.Zhu
2019-12-03 12:17 ` Christian König
2019-12-03 12:59   ` Zhu, Changfeng

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.