Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t] tests/amd_security: fix secure bounce test issue
@ 2023-12-04  3:00 Jesse Zhang
  2023-12-04  3:51 ` [igt-dev] ✓ CI.xeBAT: success for " Patchwork
                   ` (4 more replies)
  0 siblings, 5 replies; 8+ messages in thread
From: Jesse Zhang @ 2023-12-04  3:00 UTC (permalink / raw)
  To: igt-dev; +Cc: Luben Tuikov, Alex Deucher, Christian Koenig

When it copy from scr (bo) to destination (bo2),
and move bo2 from vram to gtt.
Then it need to copy from bo2(src)
to bo (destination) for verification.

Cc: Vitaly Prosyak <vitaly.prosyak@amd.com>
Cc: Luben Tuikov <luben.tuikov@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian Koenig <christian.koenig@amd.com>
Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com>

Signed-off-by: Jesse Zhang <Jesse.Zhang@amd.com>
---
 tests/amdgpu/amd_security.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/tests/amdgpu/amd_security.c b/tests/amdgpu/amd_security.c
index d1146a7ce..7fb6df3b6 100644
--- a/tests/amdgpu/amd_security.c
+++ b/tests/amdgpu/amd_security.c
@@ -99,7 +99,7 @@ static void
 amdgpu_bo_lcopy(amdgpu_device_handle device,
 		struct amdgpu_ring_context *ring_context,
 		const struct amdgpu_ip_block_version *ip_block, uint32_t size,
-		uint32_t secure)
+		uint32_t secure, int direction)
 {
 	ring_context->pm4 = calloc(PACKET_LCOPY_SIZE, sizeof(*ring_context->pm4));
 	ring_context->secure = secure;
@@ -108,8 +108,15 @@ amdgpu_bo_lcopy(amdgpu_device_handle device,
 	ring_context->res_cnt = 2;
 	igt_assert(ring_context->pm4);
 
-	amdgpu_sdma_lcopy(ring_context->pm4, ring_context->bo_mc2,
-			ring_context->bo_mc, size, secure);
+	if (direction) {
+		/* copy from bo2 to bo */
+		amdgpu_sdma_lcopy(ring_context->pm4, ring_context->bo_mc,
+				ring_context->bo_mc2, size, secure);
+	} else {
+		/* copy from bo to bo bo2 */
+		amdgpu_sdma_lcopy(ring_context->pm4, ring_context->bo_mc2,
+				ring_context->bo_mc, size, secure);
+	}
 	amdgpu_test_exec_cs_helper(device, ip_block->type, ring_context, 0);
 	free(ring_context->pm4);
 }
@@ -222,7 +229,7 @@ amdgpu_secure_bounce(amdgpu_device_handle device_handle, int fd,
 	ring_context->resources[1] = ring_context->bo;	// Alice
 
 	amdgpu_bo_lcopy(device_handle, ring_context, ip_block, SECURE_BUFFER_SIZE,
-			secure == true ? 1 : 0);
+			secure == true ? 1 : 0, 0);
 
 	/* Verify the contents of Bob. */
 	for (pp = (__typeof__(pp))ring_context->bo2_cpu;
@@ -249,7 +256,7 @@ amdgpu_secure_bounce(amdgpu_device_handle device_handle, int fd,
 
 	/* sDMA TMZ copy from Bob to Alice. */
 	amdgpu_bo_lcopy(device_handle, ring_context, ip_block, SECURE_BUFFER_SIZE,
-			secure == true ? 1 : 0);
+			secure == true ? 1 : 0, 1);
 
 	/* Verify the contents of Alice */
 	for (pp = (__typeof__(pp))ring_context->bo_cpu;
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-01-11  0:39 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-04  3:00 [igt-dev] [PATCH i-g-t] tests/amd_security: fix secure bounce test issue Jesse Zhang
2023-12-04  3:51 ` [igt-dev] ✓ CI.xeBAT: success for " Patchwork
2023-12-04  3:53 ` [igt-dev] ✓ Fi.CI.BAT: " Patchwork
2023-12-04  5:09 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2024-01-10  9:13 ` [PATCH i-g-t] " Zhang, Jesse(Jie)
2024-01-10 10:15   ` Christian König
2024-01-11  0:39     ` vitaly prosyak
2024-01-10 12:57 ` ✗ Fi.CI.BUILD: failure for tests/amd_security: fix secure bounce test issue (rev2) Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox