@@ -43,6 +43,7 @@
#include "igt.h"
#include "igt_core.h"
#include "igt_device.h"
+#include "igt_device_scan.h"
#include "igt_kmod.h"
#include "igt_perf.h"
#include "igt_sysfs.h"
@@ -2011,6 +2012,75 @@ static void test_unload(unsigned int num_engines)
igt_assert_eq(unload_i915(), 0);
}
+static void set_filter_from_device(int fd)
+{
+ const char *filter_type = "sys:";
+ char filter[strlen(filter_type) + PATH_MAX + 1];
+ char *dst = stpcpy(filter, filter_type);
+ char path[PATH_MAX + 1];
+
+ igt_assert(igt_sysfs_path(fd, path, PATH_MAX));
+ igt_ignore_warn(strncat(path, "/device", PATH_MAX - strlen(path)));
+ igt_assert(realpath(path, dst));
+
+ igt_device_filter_free_all();
+ igt_assert_eq(igt_device_filter_add(filter), 1);
+}
+
+struct rebind_data
+{
+ int sysfs;
+ uint64_t perf_type;
+ char *bus_addr;
+};
+
+static void test_rebind(struct rebind_data *data)
+{
+ struct igt_helper_process pmu_client = { };
+ const unsigned int timeout = 5;
+ int pmu;
+
+ /* Start rapid PMU traffic from a background process. */
+ igt_fork_helper(&pmu_client) {
+ pmu = igt_perf_open(data->perf_type, I915_PMU_INTERRUPTS);
+ igt_assert(pmu >= 0);
+
+ for (;;) {
+ pmu_read_single(pmu);
+ usleep(500);
+ }
+ }
+
+ /* Let the child run for a bit. */
+ usleep(1e6);
+
+ /* Unbind the device. */
+ igt_set_timeout(timeout, "Driver unbind timeout!");
+ igt_assert_f(igt_sysfs_set(data->sysfs, "unbind", data->bus_addr),
+ "Driver unbind failure!\n");
+ igt_reset_timeout();
+
+ /* Check new PMUs cannot be opened. */
+ pmu = igt_perf_open(data->perf_type, I915_PMU_INTERRUPTS);
+ igt_assert(pmu < 0);
+ usleep(1e6);
+ pmu = igt_perf_open(data->perf_type, I915_PMU_INTERRUPTS);
+ igt_assert(pmu < 0);
+
+ /* Stop background PMU traffic. */
+ usleep(1e6);
+ igt_stop_helper(&pmu_client);
+
+ /* Bind the device back. */
+ igt_set_timeout(timeout, "Driver bind timeout!");
+ igt_assert_f(igt_sysfs_set(data->sysfs, "bind", data->bus_addr),
+ "Driver bind failure\n!");
+ igt_reset_timeout();
+
+ igt_fail_on_f(faccessat(data->sysfs, data->bus_addr, F_OK, 0),
+ "Device not present!\n");
+}
+
#define test_each_engine(T, i915, e) \
igt_subtest_with_dynamic(T) __for_each_physical_engine(i915, e) \
igt_dynamic_f("%s", e->name)
@@ -2026,6 +2096,7 @@ igt_main
const unsigned int num_other_metrics =
I915_PMU_LAST - __I915_PMU_OTHER(0) + 1;
unsigned int num_engines = 0;
+ struct rebind_data rebind;
int fd = -1;
igt_fixture {
@@ -2269,9 +2340,46 @@ igt_main
}
igt_fixture {
+ const char *filter;
+ char *sysfs_path;
+ int sysfs_dev;
+
+ /* Prepare for the rebind test before closing the device. */
+ set_filter_from_device(fd);
+
+ filter = igt_device_filter_get(0);
+ igt_assert(filter);
+
+ rebind.bus_addr = strrchr(filter, '/');
+ igt_assert(rebind.bus_addr++);
+
+ sysfs_path = strchr(filter, ':');
+ igt_assert(sysfs_path++);
+ igt_debug("sysfs path = %s\n", sysfs_path);
+
+ sysfs_dev = open(sysfs_path, O_DIRECTORY);
+ igt_assert_fd(sysfs_dev);
+
+ rebind.sysfs = openat(sysfs_dev, "driver", O_DIRECTORY);
+ igt_assert_fd(rebind.sysfs);
+
+ close(sysfs_dev);
+
+ rebind.perf_type = i915_perf_type_id(fd);
+ igt_debug("type id = %"PRIu64"\n", rebind.perf_type);
+
+ /* Close the device - REQUIRED step for following tests! */
close(fd);
}
+ igt_subtest("rebind")
+ test_rebind(&rebind);
+
+ igt_fixture {
+ close(rebind.sysfs);
+ igt_device_filter_free_all();
+ }
+
igt_subtest("module-unload") {
igt_require(unload_i915() == 0);
for (int pass = 0; pass < 3; pass++)