All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marcin Bernatowicz <marcin.bernatowicz@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Cc: "Marcin Bernatowicz" <marcin.bernatowicz@linux.intel.com>,
	"Lukasz Laguna" <lukasz.laguna@intel.com>,
	"Michał Wajdeczko" <michal.wajdeczko@intel.com>,
	"Zhanjun Dong" <zhanjun.dong@intel.com>
Subject: [PATCH i-g-t 2/2] tests/xe_exec_capture: Skip checks on VF devices
Date: Wed, 19 Feb 2025 12:53:14 +0100	[thread overview]
Message-ID: <20250219115314.180382-3-marcin.bernatowicz@linux.intel.com> (raw)
In-Reply-To: <20250219115314.180382-1-marcin.bernatowicz@linux.intel.com>

If the device is a Virtual Function, skip certain devcoredump validation
steps that are not applicable in this context.

These changes align with kernel updates introduced in:

Link: https://patchwork.freedesktop.org/patch/msgid/20241022010116.342240-2-zhanjun.dong@intel.com

Signed-off-by: Marcin Bernatowicz <marcin.bernatowicz@linux.intel.com>
Cc: Lukasz Laguna <lukasz.laguna@intel.com>
Cc: Michał Wajdeczko <michal.wajdeczko@intel.com>
Cc: Zhanjun Dong <zhanjun.dong@intel.com>
---
 tests/intel/xe_exec_capture.c | 36 ++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/tests/intel/xe_exec_capture.c b/tests/intel/xe_exec_capture.c
index 2c79c1802..fe1ae677e 100644
--- a/tests/intel/xe_exec_capture.c
+++ b/tests/intel/xe_exec_capture.c
@@ -20,6 +20,7 @@
 
 #include "igt.h"
 #include "igt_device.h"
+#include "igt_sriov_device.h"
 #include "igt_sysfs.h"
 #include "lib/igt_syncobj.h"
 #include "lib/intel_reg.h"
@@ -434,6 +435,7 @@ static void test_card(int fd)
 	char *single_line_buf =  (char *)malloc(LINE_BUF_SIZE);
 	char temp[MAX_TEMP_LEN];
 	char path[MAX_SYSFS_PATH_LEN];
+	const bool is_vf_device = intel_is_vf_device(fd);
 
 	igt_assert_f(single_line_buf, "Out of memory.\n");
 
@@ -466,19 +468,27 @@ static void test_card(int fd)
 		igt_assert_f((start_line = access_devcoredump(path, lines, single_line_buf)) > 0,
 			     "Devcoredump not exist, errno=%d.\n", errno);
 
-		sprintf(temp, "instance=%d", hwe->engine_instance);
-		check_item_str(&regex, lines, "(physical),", INDEX_ENGINE_PHYSICAL,
-			       INDEX_ENGINE_INSTANCE, temp, false);
-		check_item_str(&regex, lines, "(physical),", INDEX_ENGINE_PHYSICAL,
-			       INDEX_ENGINE_NAME, xe_engine_class_name(hwe->engine_class), true);
-
-		check_item_str(&regex, lines, "Capture_source:", INDEX_KEY, INDEX_VALUE,
-			       "GuC", false);
-
-		check_item_u64(&regex, lines, "ACTHD:", addr,
-			       addr + BATCH_DW_COUNT * sizeof(u32), INDEX_KEY, INDEX_VALUE);
-		check_item_u64(&regex, lines, "RING_BBADDR:", addr,
-			       addr + BATCH_DW_COUNT * sizeof(u32), INDEX_KEY, INDEX_VALUE);
+		if (!is_vf_device) {
+			sprintf(temp, "instance=%d", hwe->engine_instance);
+			check_item_str(&regex, lines, "(physical),",
+				       INDEX_ENGINE_PHYSICAL,
+				       INDEX_ENGINE_INSTANCE, temp, false);
+			check_item_str(&regex, lines, "(physical),",
+				       INDEX_ENGINE_PHYSICAL, INDEX_ENGINE_NAME,
+				       xe_engine_class_name(hwe->engine_class),
+				       true);
+
+			check_item_str(&regex, lines,
+				       "Capture_source:", INDEX_KEY,
+				       INDEX_VALUE, "GuC", false);
+
+			check_item_u64(&regex, lines, "ACTHD:", addr,
+				       addr + BATCH_DW_COUNT * sizeof(u32),
+				       INDEX_KEY, INDEX_VALUE);
+			check_item_u64(&regex, lines, "RING_BBADDR:", addr,
+				       addr + BATCH_DW_COUNT * sizeof(u32),
+				       INDEX_KEY, INDEX_VALUE);
+		}
 		check_item_u64(&regex, lines, "length:", addr,
 			       addr + BATCH_DW_COUNT * sizeof(u32), INDEX_VALUE, INDEX_KEY);
 
-- 
2.31.1


  parent reply	other threads:[~2025-02-19 11:53 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-19 11:53 [PATCH i-g-t 0/2] Add VF detection and skip devcoredump checks on VFs Marcin Bernatowicz
2025-02-19 11:53 ` [PATCH i-g-t 1/2] lib/igt_sriov_device: Add intel_is_vf_device helper Marcin Bernatowicz
2025-03-03  8:20   ` Laguna, Lukasz
2025-03-03 15:44     ` Bernatowicz, Marcin
2025-03-04  7:24       ` Laguna, Lukasz
2025-02-19 11:53 ` Marcin Bernatowicz [this message]
2025-02-21 16:45   ` [PATCH i-g-t 2/2] tests/xe_exec_capture: Skip checks on VF devices Dong, Zhanjun
2025-02-19 23:33 ` ✓ i915.CI.BAT: success for Add VF detection and skip devcoredump checks on VFs Patchwork
2025-02-19 23:50 ` ✓ Xe.CI.BAT: " Patchwork
2025-02-20 11:30 ` ✗ i915.CI.Full: failure " Patchwork
2025-02-20 21:58 ` ✗ Xe.CI.Full: " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250219115314.180382-3-marcin.bernatowicz@linux.intel.com \
    --to=marcin.bernatowicz@linux.intel.com \
    --cc=igt-dev@lists.freedesktop.org \
    --cc=lukasz.laguna@intel.com \
    --cc=michal.wajdeczko@intel.com \
    --cc=zhanjun.dong@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.