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 5D0DACD6E77 for ; Thu, 4 Jun 2026 20:10:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0CEF710E15D; Thu, 4 Jun 2026 20:10:11 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="k4a1Av8U"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) by gabe.freedesktop.org (Postfix) with ESMTPS id DEF8310E15D for ; Thu, 4 Jun 2026 20:10:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1780603811; x=1812139811; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=lTBOKL1OvOaib1nQgwS5aPYLnXCAdzMf6dXKuxs8StA=; b=k4a1Av8U5PyenAGA+tU/aMZT2rAKP32BWxsDcJ+Dz4wvce+FXc2eJ5UM +h4J38lJGTeajh5LGFJl2Mp/whLFaZqPRv0DOCSfXMGBX5bqRJVGxiM8K DABmjs/utludpQDWIn1FbJiuupS18mj/U+sVKY3IXVImyIEvWWSHYkNaR ZHEn70gJaiHw4wJrb1r0tQ/f6rZnnaEJkYqYJts+uDFn7IaDAc+qcEBJW HJ9CxbEdCOkIdN/iZnUIrv09BayJTRzEnQiESUP9L/uN7uRQP6HganRVM 9r3Q1LPWooXEajhU013fEyO6N9nYzO2hwVukxVfxbMgLrzAGJuYeahMux w==; X-CSE-ConnectionGUID: L8Yux7haRZOaNnqiJkXVZw== X-CSE-MsgGUID: qSDHku9fQ0+zbnzVLS5EbA== X-IronPort-AV: E=McAfee;i="6800,10657,11807"; a="81416988" X-IronPort-AV: E=Sophos;i="6.24,187,1774335600"; d="scan'208";a="81416988" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jun 2026 13:10:10 -0700 X-CSE-ConnectionGUID: +hx7uAMhRqWpeQjaRhp0+Q== X-CSE-MsgGUID: xhUXG7lwRr+RFhwrpTtkQg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,187,1774335600"; d="scan'208";a="248980969" Received: from osgc-sh-dragon.sh.intel.com ([10.239.81.44]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jun 2026 13:10:08 -0700 From: Jonathan Cavitt To: intel-xe@lists.freedesktop.org Cc: saurabhg.gupta@intel.com, alex.zuo@intel.com, jonathan.cavitt@intel.com, raag.jadav@intel.com Subject: [PATCH] drm/{i915, xe}: Refactor generic_handle_irq_safe() error messages Date: Fri, 5 Jun 2026 04:10:05 +0800 Message-ID: <20260604201005.3771198-1-jonathan.cavitt@intel.com> X-Mailer: git-send-email 2.53.0 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" Currently, all but one uses of generic_handle_irq_safe() report error messages using .*_err_ratelimited() error reporting helper functions. These helper functions declare their error messages in the following form: "error handling [COMPONENT NAME] irq: %d\n" .*_err_ratelimited() already logs "error" as a part of the error message, so declaring the error is redundant. Reword it. The last usage of generic_handle_irq_safe() is in xe_i2c_irq_handler(), and it currently lacks the same error reporting that the other cases have. This is not intentional, so add error reporting to this location. Suggested-by: Raag Jadav Signed-off-by: Jonathan Cavitt --- drivers/gpu/drm/i915/display/intel_lpe_audio.c | 2 +- drivers/gpu/drm/i915/gt/intel_gsc.c | 2 +- drivers/gpu/drm/xe/xe_heci_gsc.c | 4 ++-- drivers/gpu/drm/xe/xe_i2c.c | 5 ++++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_lpe_audio.c b/drivers/gpu/drm/i915/display/intel_lpe_audio.c index 022ad18044bf..e756ed1d1132 100644 --- a/drivers/gpu/drm/i915/display/intel_lpe_audio.c +++ b/drivers/gpu/drm/i915/display/intel_lpe_audio.c @@ -265,7 +265,7 @@ void intel_lpe_audio_irq_handler(struct intel_display *display) ret = generic_handle_irq_safe(display->audio.lpe.irq); if (ret) drm_err_ratelimited(display->drm, - "error handling LPE audio irq: %d\n", ret); + "failed to handle LPE audio irq: %d\n", ret); } /** diff --git a/drivers/gpu/drm/i915/gt/intel_gsc.c b/drivers/gpu/drm/i915/gt/intel_gsc.c index 050d909fb4f8..c2d76b0bc5fe 100644 --- a/drivers/gpu/drm/i915/gt/intel_gsc.c +++ b/drivers/gpu/drm/i915/gt/intel_gsc.c @@ -286,7 +286,7 @@ static void gsc_irq_handler(struct intel_gt *gt, unsigned int intf_id) ret = generic_handle_irq_safe(gt->gsc.intf[intf_id].irq); if (ret) - gt_err_ratelimited(gt, "error handling GSC irq: %d\n", ret); + gt_err_ratelimited(gt, "failed to handle GSC irq: %d\n", ret); } void intel_gsc_irq_handler(struct intel_gt *gt, u32 iir) diff --git a/drivers/gpu/drm/xe/xe_heci_gsc.c b/drivers/gpu/drm/xe/xe_heci_gsc.c index 5af8903e10af..640db27137de 100644 --- a/drivers/gpu/drm/xe/xe_heci_gsc.c +++ b/drivers/gpu/drm/xe/xe_heci_gsc.c @@ -224,7 +224,7 @@ void xe_heci_gsc_irq_handler(struct xe_device *xe, u32 iir) ret = generic_handle_irq_safe(xe->heci_gsc.irq); if (ret) - drm_err_ratelimited(&xe->drm, "error handling GSC irq: %d\n", ret); + drm_err_ratelimited(&xe->drm, "failed to handle GSC irq: %d\n", ret); } void xe_heci_csc_irq_handler(struct xe_device *xe, u32 iir) @@ -244,5 +244,5 @@ void xe_heci_csc_irq_handler(struct xe_device *xe, u32 iir) ret = generic_handle_irq_safe(xe->heci_gsc.irq); if (ret) - drm_err_ratelimited(&xe->drm, "error handling GSC irq: %d\n", ret); + drm_err_ratelimited(&xe->drm, "failed to handle GSC irq: %d\n", ret); } diff --git a/drivers/gpu/drm/xe/xe_i2c.c b/drivers/gpu/drm/xe/xe_i2c.c index 706783863d07..0f689e210e26 100644 --- a/drivers/gpu/drm/xe/xe_i2c.c +++ b/drivers/gpu/drm/xe/xe_i2c.c @@ -177,12 +177,15 @@ static bool xe_i2c_irq_present(struct xe_device *xe) void xe_i2c_irq_handler(struct xe_device *xe, u32 master_ctl) { struct xe_mmio *mmio = xe_root_tile_mmio(xe); + int ret; if (!(master_ctl & I2C_IRQ) || !xe_i2c_irq_present(xe)) return; /* Forward interrupt to I2C adapter */ - generic_handle_irq_safe(xe->i2c->adapter_irq); + ret = generic_handle_irq_safe(xe->i2c->adapter_irq); + if (ret) + drm_err_ratelimited("failed to handle i2c irq: %d\n", ret); /* Deassert after I2C adapter clears the interrupt */ xe_mmio_rmw32(mmio, I2C_CONFIG_CMD, 0, PCI_COMMAND_INTX_DISABLE); -- 2.53.0