From: Lucas De Marchi <lucas.demarchi@intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [CI i-g-t 3/5] lib/igt_gt: Add igt_open_forcewake_handle_for_pcidev()
Date: Wed, 25 Sep 2024 23:16:49 -0500 [thread overview]
Message-ID: <20240926041651.412396-3-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20240926041651.412396-1-lucas.demarchi@intel.com>
In several places we are getting the pci_dev for an fd and then passing
both the pci_dev and the fd to intel_register_access_init(). Add a
helper so intel_register_access_init() can operate on pci_dev only.
v2:
- Use hexa for BDF
- Consistently return -errno on error
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
lib/igt_gt.c | 40 ++++++++++++++++++++++++++++++++++++++++
lib/igt_gt.h | 3 +++
2 files changed, 43 insertions(+)
diff --git a/lib/igt_gt.c b/lib/igt_gt.c
index 0cc3ee131..95df4acb9 100644
--- a/lib/igt_gt.c
+++ b/lib/igt_gt.c
@@ -30,6 +30,7 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <fcntl.h>
+#include <pciaccess.h>
#include "drmtest.h"
#include "i915/gem.h"
@@ -514,6 +515,45 @@ int igt_open_forcewake_handle(int fd)
return igt_debugfs_open(fd, fn, O_RDONLY);
}
+int igt_open_forcewake_handle_for_pcidev(const struct pci_device *pci_dev)
+{
+ static const char *FORCEWAKE_FILES[] = {
+ "forcewake_all", "i915_forcewake_user",
+ NULL
+ };
+ const char *debugfs_root = igt_debugfs_mount(), **fn;
+ char path[PATH_MAX];
+ int dirlen, ret;
+
+ if (!debugfs_root)
+ return -ENOENT;
+
+ ret = snprintf(path, sizeof(path), "%s/dri/%04x:%02x:%02x.%x",
+ debugfs_root,
+ pci_dev->domain, pci_dev->bus, pci_dev->dev,
+ pci_dev->func);
+ if (ret < 0 || ret >= sizeof(path))
+ return -EINVAL;
+
+ dirlen = ret;
+ for (fn = FORCEWAKE_FILES; *fn; fn++) {
+ ret = snprintf(path + dirlen, sizeof(path) - dirlen,
+ "/%s", *fn);
+ if (ret < 0 || ret >= sizeof(path) - dirlen)
+ return -EINVAL;
+
+ ret = open(path, O_RDONLY);
+ if (ret >= 0)
+ return ret;
+
+ if (errno != ENOENT)
+ return -errno;
+ }
+
+ return -ENOENT;
+
+}
+
#if defined(__x86_64__) || defined(__i386__)
static unsigned int clflush_size;
diff --git a/lib/igt_gt.h b/lib/igt_gt.h
index d0c5510b1..4a67cd9f0 100644
--- a/lib/igt_gt.h
+++ b/lib/igt_gt.h
@@ -31,6 +31,8 @@
#include "i915/i915_drm_local.h"
#include "i915_drm.h"
+struct pci_device;
+
void igt_require_hang_ring(int fd, uint32_t ctx, int ring);
typedef struct igt_hang {
@@ -63,6 +65,7 @@ void igt_fork_hang_helper(void);
void igt_stop_hang_helper(void);
int igt_open_forcewake_handle(int fd);
+int igt_open_forcewake_handle_for_pcidev(const struct pci_device *pci_dev);
int igt_setup_clflush(void);
void igt_clflush_range(void *addr, int size);
--
2.46.1
next prev parent reply other threads:[~2024-09-26 4:17 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-26 4:16 [CI i-g-t 1/5] lib/igt_gt: Fix forcewake open Lucas De Marchi
2024-09-26 4:16 ` [CI i-g-t 2/5] lib/igt_gt: Make igt_open_forcewake_handle() xe-compatible Lucas De Marchi
2024-09-26 4:16 ` Lucas De Marchi [this message]
2024-09-26 4:16 ` [CI i-g-t 4/5] treewide: Fix intel_register_access_init() Lucas De Marchi
2024-09-26 4:16 ` [CI i-g-t 5/5] lib/igt_gt: Stop passing fd == -1 in igt_open_forcewake_handle() Lucas De Marchi
2024-09-26 10:24 ` ✗ Fi.CI.BAT: failure for series starting with [CI,i-g-t,1/5] lib/igt_gt: Fix forcewake open Patchwork
2024-09-26 10:36 ` ✓ CI.xeBAT: success " Patchwork
2024-09-27 2:59 ` ✗ CI.xeFULL: failure " Patchwork
2024-09-30 19:47 ` ✓ CI.xeBAT: success for series starting with [CI,i-g-t,1/5] lib/igt_gt: Fix forcewake open (rev2) Patchwork
2024-09-30 19:54 ` ✓ Fi.CI.BAT: " Patchwork
2024-10-01 2:36 ` ✗ CI.xeFULL: failure " Patchwork
2024-10-01 6:29 ` Lucas De Marchi
2024-10-01 6:20 ` ✗ 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=20240926041651.412396-3-lucas.demarchi@intel.com \
--to=lucas.demarchi@intel.com \
--cc=igt-dev@lists.freedesktop.org \
/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