diff options
author | Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> | 2020-05-07 22:09:43 +0300 |
---|---|---|
committer | Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> | 2020-05-08 15:21:50 +0300 |
commit | 2f5cee33ce550c828810fd1d37797dd1b468326a (patch) | |
tree | da26435aba30d3f02ba9b9de2982f386846a6781 /lib | |
parent | 75d260956011f397e7595393ac053712f09a8019 (diff) |
igt/params: use igt_params_set_save for igt_set_module_param*
Unify parameter access. Here switch to use debugfs/dri/N
as default for module parameters with fallback to
/sys/module/<device>/parameters.
Here is also decided 'default' device if -1 is specified as device.
Default being that device which is first to match requirements.
Default device is used only for sysfs, not for debugfs.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/igt_params.c | 156 |
1 files changed, 122 insertions, 34 deletions
diff --git a/lib/igt_params.c b/lib/igt_params.c index bc1f6af75..d8649dfd9 100644 --- a/lib/igt_params.c +++ b/lib/igt_params.c @@ -27,12 +27,14 @@ #include <stdbool.h> #include <stdio.h> #include <sys/ioctl.h> +#include <sys/stat.h> #include <i915_drm.h> #include "igt_core.h" #include "igt_params.h" #include "igt_sysfs.h" +#include "igt_debugfs.h" struct module_param_data { char *path; @@ -107,15 +109,81 @@ static void igt_params_save(int dir, const char *path, const char *name) module_params = data; } -static int __igt_params_open(int device, char **outpath) +/** + * __igt_params_open: + * @device: fd of the device or -1 for default + * @outpath: full path to the sysfs directory if not NULL + * @param: name of parameter of interest + * + * Find parameter of interest and return parameter directory fd, parameter + * is first searched at debugfs/dri/N/<device>_params and if not found will + * look for parameter at /sys/module/<device>/parameters. + * + * Giving -1 here for default device will search for matching device from + * debugfs/dri/N where N go from 0 to 63. First device found from debugfs + * which exist also at /sys/module/<device> will be 'default'. + * Default device will only be used for sysfs, not for debugfs. + * + * If outpath is not NULL caller is responsible to free given pointer. + * + * Returns: + * Directory fd, or -1 on failure. + */ +static int __igt_params_open(int device, char **outpath, const char *param) { int dir, params = -1; + struct stat buffer; + char searchname[64]; + char searchpath[PATH_MAX]; + char *foundname, *ctx; - dir = igt_sysfs_open(device); + dir = igt_debugfs_dir(device); if (dir >= 0) { - params = openat(dir, - "device/driver/module/parameters", - O_RDONLY); + int devname; + + devname = openat(dir, "name", O_RDONLY); + igt_require_f(devname >= 0, + "Driver need to name itself in debugfs!"); + + read(devname, searchname, sizeof(searchname)); + close(devname); + + foundname = strtok_r(searchname, " ", &ctx); + igt_require_f(foundname, + "Driver need to name itself in debugfs!"); + + snprintf(searchpath, PATH_MAX, "%s_params", foundname); + params = openat(dir, searchpath, O_RDONLY); + + if (params >= 0) { + char *debugfspath = malloc(PATH_MAX); + + igt_debugfs_path(device, debugfspath, PATH_MAX); + if (param != NULL) { + char filepath[PATH_MAX]; + + snprintf(filepath, PATH_MAX, "%s/%s", + debugfspath, param); + + if (stat(filepath, &buffer) == 0) { + if (outpath != NULL) + *outpath = debugfspath; + else + free(debugfspath); + } else { + free(debugfspath); + close(params); + params = -1; + } + } else if (outpath != NULL) { + /* + * Caller is responsible to free this. + */ + *outpath = debugfspath; + } else { + free(debugfspath); + } + } close(dir); } @@ -124,12 +192,51 @@ static int __igt_params_open(int device, char **outpath) char name[32] = ""; char path[PATH_MAX]; - memset(&version, 0, sizeof(version)); - version.name_len = sizeof(name); - version.name = name; - ioctl(device, DRM_IOCTL_VERSION, &version); - - sprintf(path, "/sys/module/%s/parameters", name); + if (device == -1) { + /* + * find default device + */ + int file, i; + const char *debugfs_root = igt_debugfs_mount(); + + igt_assert(debugfs_root); + + for (i = 0; i < 63; i++) { + char testpath[PATH_MAX]; + + snprintf(searchpath, PATH_MAX, + "%s/dri/%d/name", debugfs_root, i); + + file = open(searchpath, O_RDONLY); + + if (file < 0) + continue; + + read(file, searchname, sizeof(searchname)); + close(file); + + foundname = strtok_r(searchname, " ", &ctx); + if (!foundname) + continue; + + snprintf(testpath, PATH_MAX, + "/sys/module/%s/parameters", + foundname); + + if (stat(testpath, &buffer) == 0 && + S_ISDIR(buffer.st_mode)) { + snprintf(name, sizeof(name), "%s", + foundname); + break; + } + } + } else { + memset(&version, 0, sizeof(version)); + version.name_len = sizeof(name); + version.name = name; + ioctl(device, DRM_IOCTL_VERSION, &version); + } + snprintf(path, sizeof(path), "/sys/module/%s/parameters", name); params = open(path, O_RDONLY); if (params >= 0 && outpath) *outpath = strdup(path); @@ -150,7 +257,7 @@ static int __igt_params_open(int device, char **outpath) */ int igt_params_open(int device) { - return __igt_params_open(device, NULL); + return __igt_params_open(device, NULL, NULL); } __attribute__((format(printf, 3, 0))) @@ -161,7 +268,7 @@ static bool __igt_params_set(int device, const char *parameter, int dir; int ret; - dir = __igt_params_open(device, save ? &path : NULL); + dir = __igt_params_open(device, save ? &path : NULL, parameter); if (dir < 0) return false; @@ -238,21 +345,9 @@ bool igt_params_save_and_set(int device, const char *parameter, const char *fmt, */ void igt_set_module_param(const char *name, const char *val) { - const char *path = "/sys/module/i915/parameters"; - int dir; - - dir = open(path, O_RDONLY); - igt_assert(dir >= 0); - - igt_params_save(dir, path, name); - - igt_assert(igt_sysfs_set(dir, name, val)); - - igt_assert(close(dir) == 0); + igt_assert(igt_params_save_and_set(-1, name, "%s", val)); } -#define PARAM_VALUE_MAX_SZ 16 - /** * igt_set_module_param_int: * @name: i915.ko parameter name @@ -263,12 +358,5 @@ void igt_set_module_param(const char *name, const char *val) */ void igt_set_module_param_int(const char *name, int val) { - char str[PARAM_VALUE_MAX_SZ]; - int n; - - n = snprintf(str, PARAM_VALUE_MAX_SZ, "%d\n", val); - igt_assert_f(n < PARAM_VALUE_MAX_SZ, - "Need to increase PARAM_VALUE_MAX_SZ\n"); - - igt_set_module_param(name, str); + igt_assert(igt_params_save_and_set(-1, name, "%d", val)); } |