From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5978A1BF53 for ; Tue, 13 Aug 2024 18:52:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723575156; cv=none; b=oXWO1dZj/vc/0KylIWyuGWOpfT56XKD/sZVH9E4BLlpCxB24M0MW2Let+15IRj3YDTv/L0/CFUXh3d4Ily5H2l7DnOOFPoHq630sZfuY9uPDdGrNTFmi0Q333aVcA6DoVewGbZsXWNFMBIzwULrgtyOlzG/dgGH/HEkrNnftKfc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723575156; c=relaxed/simple; bh=+WrmL3DIMN8wEDUBgga4y8/Z+FdZmpp/q3DTZcgXLi4=; h=Date:To:From:Subject:Message-Id; b=m/11jSfkNLAPhj2aUgZgo9VWrldeBL9pAKhb/Jw/PI+oKTdnmh2kAppGrgq68/YixRxbcCKW5IIBq/UkOUOn+JvJ9kTnQKjOwpXKvCgD5lsS7VaqDHjoynosc1zcgDGFJeGFneBOyM7qPsam+HO4HJJ9XXdYL+vigll9TJyaX/Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=C325WJsL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="C325WJsL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2BC70C32782; Tue, 13 Aug 2024 18:52:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1723575156; bh=+WrmL3DIMN8wEDUBgga4y8/Z+FdZmpp/q3DTZcgXLi4=; h=Date:To:From:Subject:From; b=C325WJsLsUNB8nLV71UyrlidR/ZLlJ6eHVosHseg7RfkZQeNMH/6kTdkzOZHDsxM5 FCs2KPc3K5jDiQ4UdcMTNttO8lR+fsh5Tyip3fBC5dcqPnpagD0Tu23nxwOVyUPKEC J9AYQcQp+WGTIc63QsWDRrB7WNxXJpCSjAKnxXNw= Date: Tue, 13 Aug 2024 11:52:35 -0700 To: mm-commits@vger.kernel.org,thomas.hellstrom@linux.intel.com,rodrigo.vivi@intel.com,robdclark@gmail.com,quic_abhinavk@quicinc.com,lucas.demarchi@intel.com,himal.prasad.ghimiray@intel.com,dmitry.baryshkov@linaro.org,akinobu.mita@gmail.com,jani.nikula@intel.com,akpm@linux-foundation.org From: Andrew Morton Subject: + drm-xe-clean-up-fault-injection-usage.patch added to mm-nonmm-unstable branch Message-Id: <20240813185236.2BC70C32782@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The patch titled Subject: drm/xe: clean up fault injection usage has been added to the -mm mm-nonmm-unstable branch. Its filename is drm-xe-clean-up-fault-injection-usage.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/drm-xe-clean-up-fault-injection-usage.patch This patch will later appear in the mm-nonmm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Jani Nikula Subject: drm/xe: clean up fault injection usage Date: Tue, 13 Aug 2024 15:12:37 +0300 With the proper stubs in place in linux/fault-inject.h, we can remove a bunch of conditional compilation for CONFIG_FAULT_INJECTION=n. Link: https://lkml.kernel.org/r/20240813121237.2382534-3-jani.nikula@intel.com Signed-off-by: Jani Nikula Reviewed-by: Thomas Hellström Reviewed-by: Himal Prasad Ghimiray Cc: Akinobu Mita Cc: Lucas De Marchi Cc: Rodrigo Vivi Cc: Abhinav Kumar Cc: Dmitry Baryshkov Cc: Rob Clark Signed-off-by: Andrew Morton --- drivers/gpu/drm/xe/xe_debugfs.c | 7 +------ drivers/gpu/drm/xe/xe_gt.h | 10 ++-------- 2 files changed, 3 insertions(+), 14 deletions(-) --- a/drivers/gpu/drm/xe/xe_debugfs.c~drm-xe-clean-up-fault-injection-usage +++ a/drivers/gpu/drm/xe/xe_debugfs.c @@ -6,6 +6,7 @@ #include "xe_debugfs.h" #include +#include #include #include @@ -26,10 +27,7 @@ #include "xe_vm.h" #endif -#ifdef CONFIG_FAULT_INJECTION -#include /* XXX: fault-inject.h is broken */ DECLARE_FAULT_ATTR(gt_reset_failure); -#endif static struct xe_device *node_to_xe(struct drm_info_node *node) { @@ -214,8 +212,5 @@ void xe_debugfs_register(struct xe_devic for_each_gt(gt, xe, id) xe_gt_debugfs_register(gt); -#ifdef CONFIG_FAULT_INJECTION fault_create_debugfs_attr("fail_gt_reset", root, >_reset_failure); -#endif - } --- a/drivers/gpu/drm/xe/xe_gt.h~drm-xe-clean-up-fault-injection-usage +++ a/drivers/gpu/drm/xe/xe_gt.h @@ -6,6 +6,8 @@ #ifndef _XE_GT_H_ #define _XE_GT_H_ +#include + #include #include "xe_device.h" @@ -19,19 +21,11 @@ #define CCS_MASK(gt) (((gt)->info.engine_mask & XE_HW_ENGINE_CCS_MASK) >> XE_HW_ENGINE_CCS0) -#ifdef CONFIG_FAULT_INJECTION -#include /* XXX: fault-inject.h is broken */ extern struct fault_attr gt_reset_failure; static inline bool xe_fault_inject_gt_reset(void) { return should_fail(>_reset_failure, 1); } -#else -static inline bool xe_fault_inject_gt_reset(void) -{ - return false; -} -#endif struct xe_gt *xe_gt_alloc(struct xe_tile *tile); int xe_gt_init_hwconfig(struct xe_gt *gt); _ Patches currently in -mm which might be from jani.nikula@intel.com are fault-inject-improve-build-for-config_fault_injection=n.patch drm-msm-clean-up-fault-injection-usage.patch drm-xe-clean-up-fault-injection-usage.patch