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 DDC72CD4F39 for ; Thu, 14 May 2026 06:48:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 95E0810E366; Thu, 14 May 2026 06:48:29 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="XDrU1CXD"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id A3B8810E366 for ; Thu, 14 May 2026 06:48:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1778741290; x=1810277290; h=date:message-id:from:to:cc:subject:in-reply-to: references:mime-version; bh=me6TPAoVEP2LzXVqVLTqfSYXGv8km9c5QKudQUyODME=; b=XDrU1CXDB34998IYLJFCaOB2mlc97J2TL+QOTZEbq23ay7M975cHN9fg W+gaZXZRBmjJY3phMeEVRfArJAvhdvidmd8jRSMO9LAEboowy3ohl+l5i 7HYose9sSg+Zr+1sUdtOpX7IVokhjUY/QMeEtNVds3KKdsZKN0eYupLSL 0SqVvlNBykirRwy8ctbkm9PoRnK4bekZzm8oAzLPUuHiMfaKMArigE/tw pX3iKHdHA/2O3vn+UYj8KiJw5XrBmulR1Kk/p3PRWLc91FSUOuiXijwat X+AixQz4WiCQFCXNCLPbxDVnM0IZ0bS6YK7NIoODUHWZCVzeW8cGIOpHC g==; X-CSE-ConnectionGUID: j9JI4ldDRZutsaz6HiwWKg== X-CSE-MsgGUID: ehlLCCGASdaFxVmNrdvzPA== X-IronPort-AV: E=McAfee;i="6800,10657,11785"; a="90371617" X-IronPort-AV: E=Sophos;i="6.23,234,1770624000"; d="scan'208";a="90371617" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2026 23:48:10 -0700 X-CSE-ConnectionGUID: 12EIcg0AQ/GIrhh00dtJeQ== X-CSE-MsgGUID: itYweAn8RQiPn9C6zrGhhQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,234,1770624000"; d="scan'208";a="262050832" Received: from aagwai-mobl2.amr.corp.intel.com (HELO adixit-MOBL3.intel.com) ([10.124.141.85]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2026 23:48:10 -0700 Date: Wed, 13 May 2026 23:48:09 -0700 Message-ID: <87o6iitrkm.wl-ashutosh.dixit@intel.com> From: "Dixit, Ashutosh" To: Shekhar Chauhan Cc: Subject: Re: [PATCH v2] lib/intel_wa: Assert on error instead of returning -1 In-Reply-To: <20260514063655.1683322-1-shekhar.chauhan@intel.com> References: <20260514063655.1683322-1-shekhar.chauhan@intel.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/30.2 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII 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" On Wed, 13 May 2026 23:36:55 -0700, Shekhar Chauhan wrote: > > igt_has_intel_wa() returns 0, 1, or -1, but there is no point > distinguishing the error and no-workaround cases for callers. Replace > the error return with igt_assert() and simplify debugfs_file_has_wa() by > dropping the igt_debugfs_exists() check, since igt_sysfs_get() returns > NULL for missing files anyway. > > v2: Make the func as bool instead of int. LGTM now: Reviewed-by: Ashutosh Dixit > > Signed-off-by: Shekhar Chauhan > --- > lib/intel_wa.c | 19 +++++++++---------- > lib/intel_wa.h | 2 +- > 2 files changed, 10 insertions(+), 11 deletions(-) > > diff --git a/lib/intel_wa.c b/lib/intel_wa.c > index 727dd6c98..e4fe7b0ee 100644 > --- a/lib/intel_wa.c > +++ b/lib/intel_wa.c > @@ -7,18 +7,18 @@ > #include > #include > > +#include "igt_core.h" > #include "igt_debugfs.h" > #include "igt_sysfs.h" > #include "intel_wa.h" > #include "xe/xe_query.h" > > -static int debugfs_file_has_wa(int drm_fd, int debugfs_fd, > +static bool debugfs_file_has_wa(int drm_fd, int debugfs_fd, > const char *debugfs_name, const char *wa) > { > char *debugfs_dump; > > - if (!igt_debugfs_exists(drm_fd, debugfs_name, O_RDONLY)) > - return -1; > + igt_assert(igt_debugfs_exists(drm_fd, debugfs_name, O_RDONLY)); > > debugfs_dump = igt_sysfs_get(debugfs_fd, debugfs_name); > if (debugfs_dump) { > @@ -27,10 +27,10 @@ static int debugfs_file_has_wa(int drm_fd, int debugfs_fd, > free(debugfs_dump); > > if (has_wa) > - return 1; > + return true; > } > > - return 0; > + return false; > } > > /** > @@ -38,18 +38,17 @@ static int debugfs_file_has_wa(int drm_fd, int debugfs_fd, > * @drm_fd: A drm file descriptor > * @check_wa: Workaround to be checked > * > - * Returns: 0 if no WA, 1 if WA present, -1 on error > + * Returns: true if WA present, false otherwise > */ > -int igt_has_intel_wa(int drm_fd, const char *check_wa) > +bool igt_has_intel_wa(int drm_fd, const char *check_wa) > { > - int ret = 0; > + bool ret = 0; > int debugfs_fd; > unsigned int xe; > char name[256]; > > debugfs_fd = igt_debugfs_dir(drm_fd); > - if (debugfs_fd == -1) > - return -1; > + igt_assert(debugfs_fd >= 0); > > xe_for_each_gt(drm_fd, xe) { > sprintf(name, "gt%d/workarounds", xe); > diff --git a/lib/intel_wa.h b/lib/intel_wa.h > index 765a5948e..34cafecc4 100644 > --- a/lib/intel_wa.h > +++ b/lib/intel_wa.h > @@ -6,6 +6,6 @@ > #ifndef __INTEL_WA_H__ > #define __INTEL_WA_H__ > > -int igt_has_intel_wa(int drm_fd, const char *check_wa); > +bool igt_has_intel_wa(int drm_fd, const char *check_wa); > > #endif /* __INTEL_WA_H__ */ > -- > 2.53.0 >