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 72774CD4F3C for ; Wed, 20 May 2026 11:39:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3367710F037; Wed, 20 May 2026 11:39:41 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="MJD9WPU6"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7A2B510F02C for ; Wed, 20 May 2026 11:39:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1779277179; x=1810813179; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cNVP56BtocDKRxbvz9LHX+h+DMnqyDW8IF9yNnv8SZ4=; b=MJD9WPU6FD20TcWrvc4+4DefMG8Tk0MAAmNLLD2TAC5e6kKV3xDF/lfj c283mRgrw5ea/Pr40NV45n3ttR+FwtklSiXJEKJ7kGMoDNHewlTba3aQe 8WFSAeUJbtZhc2NfE+gvyaMYqHH9UkewJCKzNZhWVbsr7Mt+sCT8c531w WBvdfbCNPUmsev0vxvdLHKewuvmcOBKUjrQ6EYQ36cP5keuJN6kdOus4z zAhhvrKbL3HqHeyFRdVJpT4GUsg7v8dpZKvm3VKvnhyDLEloHG2KS64SB dFn2Mv3xJRjW7tgHSqlUN3Jt3xKsbXHmFVFEqud8xW3O+LdTQ0kxj4XJV A==; X-CSE-ConnectionGUID: e+RbVQJhRAeUvBR84l2zUw== X-CSE-MsgGUID: 3E6m1E9RTvqQzd0kU2GU3g== X-IronPort-AV: E=McAfee;i="6800,10657,11791"; a="80023167" X-IronPort-AV: E=Sophos;i="6.23,244,1770624000"; d="scan'208";a="80023167" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2026 04:39:39 -0700 X-CSE-ConnectionGUID: F47pkOUDRSmq8Bu9Q2/Y8g== X-CSE-MsgGUID: vEJFVGjWTgCa9P1MvilaZg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,244,1770624000"; d="scan'208";a="233792242" Received: from jraag-z790m-itx-wifi.iind.intel.com ([10.190.239.23]) by fmviesa009.fm.intel.com with ESMTP; 20 May 2026 04:39:36 -0700 From: Raag Jadav To: intel-xe@lists.freedesktop.org Cc: matthew.brost@intel.com, rodrigo.vivi@intel.com, riana.tauro@intel.com, michal.wajdeczko@intel.com, matthew.d.roper@intel.com, umesh.nerlige.ramappa@intel.com, mallesh.koujalagi@intel.com, Raag Jadav Subject: [PATCH v3 1/5] drm/xe/hw_error: Reuse CSC worker for generic error handling Date: Wed, 20 May 2026 17:04:06 +0530 Message-ID: <20260520113622.171462-2-raag.jadav@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260520113622.171462-1-raag.jadav@intel.com> References: <20260520113622.171462-1-raag.jadav@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" We have upcoming usecases which require defering work during error handling. Since we already have CSC worker in place, prepare it to be reused generically. Signed-off-by: Raag Jadav Reviewed-by: Riana Tauro --- drivers/gpu/drm/xe/xe_hw_error.c | 10 +++++----- drivers/gpu/drm/xe/xe_tile_types.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_hw_error.c b/drivers/gpu/drm/xe/xe_hw_error.c index 5135e8e4093f..016e15d2723c 100644 --- a/drivers/gpu/drm/xe/xe_hw_error.c +++ b/drivers/gpu/drm/xe/xe_hw_error.c @@ -172,9 +172,9 @@ static bool fault_inject_csc_hw_error(void) return IS_ENABLED(CONFIG_DEBUG_FS) && should_fail(&inject_csc_hw_error, 1); } -static void csc_hw_error_work(struct work_struct *work) +static void hw_error_work(struct work_struct *work) { - struct xe_tile *tile = container_of(work, typeof(*tile), csc_hw_error_work); + struct xe_tile *tile = container_of(work, typeof(*tile), hw_error_work); struct xe_device *xe = tile_to_xe(tile); xe_survivability_mode_runtime_enable(xe); @@ -209,7 +209,7 @@ static void csc_hw_error_handler(struct xe_tile *tile, const enum hardware_error hec_uncorrected_fw_errors[err_bit], severity_str, err_bit); - schedule_work(&tile->csc_hw_error_work); + schedule_work(&tile->hw_error_work); } } @@ -508,7 +508,7 @@ void xe_hw_error_irq_handler(struct xe_tile *tile, const u32 master_ctl) enum hardware_error hw_err; if (fault_inject_csc_hw_error()) - schedule_work(&tile->csc_hw_error_work); + schedule_work(&tile->hw_error_work); for (hw_err = 0; hw_err < HARDWARE_ERROR_MAX; hw_err++) { if (master_ctl & ERROR_IRQ(hw_err)) @@ -555,7 +555,7 @@ void xe_hw_error_init(struct xe_device *xe) if (!IS_DGFX(xe) || IS_SRIOV_VF(xe)) return; - INIT_WORK(&tile->csc_hw_error_work, csc_hw_error_work); + INIT_WORK(&tile->hw_error_work, hw_error_work); ret = hw_error_info_init(xe); if (ret) diff --git a/drivers/gpu/drm/xe/xe_tile_types.h b/drivers/gpu/drm/xe/xe_tile_types.h index 0048100ccb72..bc6940b08841 100644 --- a/drivers/gpu/drm/xe/xe_tile_types.h +++ b/drivers/gpu/drm/xe/xe_tile_types.h @@ -114,8 +114,8 @@ struct xe_tile { /** @memirq: Memory Based Interrupts. */ struct xe_memirq memirq; - /** @csc_hw_error_work: worker to report CSC HW errors */ - struct work_struct csc_hw_error_work; + /** @hw_error_work: worker to handle HW errors */ + struct work_struct hw_error_work; /** @pcode: tile's PCODE */ struct { -- 2.43.0