From: Anshuman Gupta <anshuman.gupta@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: badal.nilawar@intel.com, rodrigo.vivi@intel.com
Subject: [igt-dev] [PATCH i-g-t 2/3] test/device_reset: Refactor initiate_device_reset
Date: Mon, 7 Nov 2022 18:48:41 +0530 [thread overview]
Message-ID: <20221107131842.31387-3-anshuman.gupta@intel.com> (raw)
In-Reply-To: <20221107131842.31387-1-anshuman.gupta@intel.com>
Added a reset type enum to support multiple types
of reset like WARM, COLD and FLR reset.
No functional change.
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
---
tests/device_reset.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/tests/device_reset.c b/tests/device_reset.c
index e60d4c7fd..88b786aae 100644
--- a/tests/device_reset.c
+++ b/tests/device_reset.c
@@ -19,6 +19,12 @@ IGT_TEST_DESCRIPTION("Examine behavior of a driver on device sysfs reset");
#define DEV_PATH_LEN 80
#define DEV_BUS_ADDR_LEN 13 /* addr has form 0000:00:00.0 */
+enum reset {
+ WARM_RESET,
+ COLD_RESET,
+ FLR_RESET
+};
+
/**
* Helper structure containing file descriptors
* and bus address related to tested device
@@ -222,10 +228,13 @@ static void driver_bind(struct device_fds *dev)
}
/* Initiate device reset */
-static void initiate_device_reset(struct device_fds *dev)
+static void initiate_device_reset(struct device_fds *dev, enum reset type)
{
igt_debug("reset device\n");
- igt_assert(igt_sysfs_set(dev->fds.dev_dir, "reset", "1"));
+
+ if (type == FLR_RESET)
+ igt_assert(igt_sysfs_set(dev->fds.dev_dir, "reset", "1"));
+
}
static bool is_i915_wedged(int i915)
@@ -274,14 +283,14 @@ static void set_device_filter(const char* dev_path)
igt_assert_eq(igt_device_filter_add(filter), 1);
}
-static void unbind_reset_rebind(struct device_fds *dev)
+static void unbind_reset_rebind(struct device_fds *dev, enum reset type)
{
igt_debug("close the device\n");
close_if_opened(&dev->fds.dev);
driver_unbind(dev);
- initiate_device_reset(dev);
+ initiate_device_reset(dev, type);
driver_bind(dev);
}
@@ -306,13 +315,13 @@ igt_main
igt_describe("Unbinds driver from device, initiates reset"
" then rebinds driver to device");
igt_subtest("unbind-reset-rebind") {
- unbind_reset_rebind(&dev);
+ unbind_reset_rebind(&dev, FLR_RESET);
healthcheck(&dev);
}
igt_describe("Resets device with bound driver");
igt_subtest("reset-bound") {
- initiate_device_reset(&dev);
+ initiate_device_reset(&dev, FLR_RESET);
healthcheck(&dev);
}
--
2.25.1
next prev parent reply other threads:[~2022-11-07 13:18 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-07 13:18 [igt-dev] [PATCH i-g-t 0/3] Cold Reset IGT Test Anshuman Gupta
2022-11-07 13:18 ` [igt-dev] [PATCH i-g-t 1/3] lib/igt_pm: Refactor get firmware_node fd Anshuman Gupta
2022-11-07 17:02 ` Kamil Konieczny
2022-11-08 11:48 ` Gupta, Anshuman
2022-11-07 13:18 ` Anshuman Gupta [this message]
2022-11-07 21:32 ` [igt-dev] [PATCH i-g-t 2/3] test/device_reset: Refactor initiate_device_reset Rodrigo Vivi
2022-11-14 7:54 ` Nilawar, Badal
2022-11-07 13:18 ` [igt-dev] [PATCH i-g-t 3/3] tests/device_reset: Add cold reset IGT test Anshuman Gupta
2022-11-14 11:59 ` Nilawar, Badal
2022-11-07 15:16 ` [igt-dev] ✓ Fi.CI.BAT: success for Cold Reset IGT Test Patchwork
2022-11-07 18:58 ` [igt-dev] ✓ Fi.CI.IGT: " 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=20221107131842.31387-3-anshuman.gupta@intel.com \
--to=anshuman.gupta@intel.com \
--cc=badal.nilawar@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=rodrigo.vivi@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox