[igt-dev] [PATCH i-g-t 1/3] lib/igt_device: add igt_device_get_pci_addr by fd
Katarzyna Dec
katarzyna.dec at intel.com
Thu Apr 4 14:17:51 UTC 2019
On Thu, Apr 04, 2019 at 03:18:03PM +0200, Daniel Mrzyglod wrote:
> From: Michał Winiarski <michal.winiarski at intel.com>
>
> This function get us in easy way pci adress.
s/adress/address/
> It allows us to make things a little bit more generic.
> Also, we now require fd rather than doing guesswork when it comes to pci address.
>
> Signed-off-by: Michał Winiarski <michal.winiarski at intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Signed-off-by: Daniel Mrzyglod <daniel.t.mrzyglod at intel.com>
> ---
> lib/igt_device.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++
> lib/igt_device.h | 2 +
> 2 files changed, 119 insertions(+)
>
> diff --git a/lib/igt_device.c b/lib/igt_device.c
> index 08f39c8b..d3934efb 100644
> --- a/lib/igt_device.c
> +++ b/lib/igt_device.c
> @@ -21,11 +21,14 @@
> * IN THE SOFTWARE.
> *
> */
> +#include <sys/types.h>
> +#include <fcntl.h>
>
> #include <sys/stat.h>
> #include <sys/sysmacros.h>
> #include "igt.h"
> #include "igt_device.h"
> +#include "igt_sysfs.h"
>
> int __igt_device_set_master(int fd)
> {
> @@ -103,3 +106,117 @@ int igt_device_get_card_index(int fd)
>
> return minor(st.st_rdev);
> }
> +
> +#define IGT_DEV_PATH_LEN 80
> +
> +static bool igt_device_is_pci(int fd)
> +{
> + char path[IGT_DEV_PATH_LEN];
> + char *subsystem;
> + int sysfs;
> + int len;
> +
> + if ((sysfs = igt_sysfs_open(fd)) == -1)
> + return false;
Even checkpatch is returning error here - 'do not use assignment in if
condition'
> +
> + len = readlinkat(sysfs, "device/subsystem", path, sizeof(path) - 1);
> + if (len == -1)
> + return false;
> + path[len] = '\0';
> +
> + subsystem = strrchr(path, '/');
> + if (!subsystem)
> + return false;
> +
> + return strcmp(subsystem, "/pci") == 0;
> +}
> +
> +struct igt_pci_addr {
> + unsigned int domain;
> + unsigned int bus;
> + unsigned int device;
> + unsigned int function;
> +};
> +
> +static int igt_device_get_pci_addr(int fd, struct igt_pci_addr *pci)
> +{
> + char path[IGT_DEV_PATH_LEN];
> + char *buf;
> + int sysfs;
> + int len;
> +
> + if (!igt_device_is_pci(fd))
> + return -ENODEV;
> +
> + if ((sysfs = igt_sysfs_open(fd)) == -1)
> + return -ENOENT;
Same error from checkpatch as above.
Kasia
More information about the igt-dev
mailing list