From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 06D9BCCFA17 for ; Thu, 26 Sep 2024 04:17:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EDAE710E124; Thu, 26 Sep 2024 04:17:01 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="QU34/sdN"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id F0EC310E035 for ; Thu, 26 Sep 2024 04:17:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727324221; x=1758860221; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=WKMu+O1hFaq6SKVviFYLbwal0YP1QKUnO9UBVB0iT8U=; b=QU34/sdN4yTlODvzTm6Jzqc7wcBtOvxJevN90us76BJVPkz1kofjoFnU SAgndFBOPC7PneMYWaBIKZFKYNJ5OkTOk0nP3KYUgUPAlBkX/be7ie31b xL0Xj4Be1kuYc2A/6/42YPwgtOMnS3l39+e2/S70C8Ci+0ob6GAa5zH16 dFoSa2MdoADbXNPrW7AJ4bjLqslqgKkypy7CKLoPIQzVn9MVM85xVdD7o gAOuTmw/UIcMwqA1FAkg2C+aK2Cd6pYHv9X/et5QzbjXrk6OdZYMDCnFY mLGVW9s0J6msTMfAsGgxU8yhKQDKRCf0MAGB99bq6IV6fjq+EyKxlERVg A==; X-CSE-ConnectionGUID: wVcAmmQASSudErIhsjSkNA== X-CSE-MsgGUID: BhVbsVncRj6ojGHj0Xv+Yg== X-IronPort-AV: E=McAfee;i="6700,10204,11206"; a="26554158" X-IronPort-AV: E=Sophos;i="6.10,259,1719903600"; d="scan'208";a="26554158" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2024 21:17:01 -0700 X-CSE-ConnectionGUID: pWwhdzheR+qNG9DhPNUCWA== X-CSE-MsgGUID: MwLCrmj9R2S+ic/2M5Hoyw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,259,1719903600"; d="scan'208";a="76773013" Received: from ldmartin-desk2.corp.intel.com (HELO ldmartin-desk2.lan) ([10.125.111.164]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2024 21:17:01 -0700 From: Lucas De Marchi 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 Message-ID: <20240926041651.412396-3-lucas.demarchi@intel.com> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240926041651.412396-1-lucas.demarchi@intel.com> References: <20240926041651.412396-1-lucas.demarchi@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" 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ä Signed-off-by: Lucas De Marchi --- 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 #include #include +#include #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