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 C6C20CD6E75 for ; Fri, 5 Jun 2026 02:53:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E5459112A4E; Fri, 5 Jun 2026 02:53:14 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="PRPGPqUD"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4B82A112A4D; Fri, 5 Jun 2026 02:53:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1780627993; x=1812163993; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=mv+Wkg6P1d3LNNOFeM6yECs+scKRP33uwLdCybXgPno=; b=PRPGPqUDc31QPRgBozpyVcgg1KBMl6xvSzQQLrcYerKXdD3P8jW0zOgs 93LSirmAMzjVM5DMCXbTIfyK2aImoY5DleMtOgpb1gah/40495GajLsuy DQVe7JorZP+oV7LXK4gDE2sX7rPXnMCTjgur13IBYMuUzxaBbA7y3tYRK J9KqAKivUhOQGBz5ExQPmk+LN5qk0GNZ4XJtSONLOmEIeEBz7wWwJdqlX JdC9kHwtbMlU0hemq/oGiLvK1kdX0XOyFXSh606TbYpPYFVZw0C/ozwDl DKmk6Eq+VK42tOCDcTx0d/HR6VV8LYs/I8DCEGIwp3KqFOA4TwSGuP0Wa Q==; X-CSE-ConnectionGUID: Vk6xQfVjTgmnKMOSCwKxQw== X-CSE-MsgGUID: b9DXnx0oTQeYrD/vMbUH0w== X-IronPort-AV: E=McAfee;i="6800,10657,11807"; a="81494069" X-IronPort-AV: E=Sophos;i="6.24,188,1774335600"; d="scan'208";a="81494069" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jun 2026 19:53:13 -0700 X-CSE-ConnectionGUID: 65DNAF0+RwCL89pNK806xw== X-CSE-MsgGUID: ih5UIh4ARSqD1WK1pSQCCQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,188,1774335600"; d="scan'208";a="238366937" Received: from black.igk.intel.com ([10.91.253.5]) by fmviesa009.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jun 2026 19:53:11 -0700 Date: Fri, 5 Jun 2026 04:53:08 +0200 From: Raag Jadav To: Jonathan Cavitt Cc: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, saurabhg.gupta@intel.com, alex.zuo@intel.com Subject: Re: [PATCH v2] drm/{i915, xe}: Refactor generic_handle_irq_safe() error messages Message-ID: References: <20260604202548.3817343-1-jonathan.cavitt@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260604202548.3817343-1-jonathan.cavitt@intel.com> X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, Jun 05, 2026 at 04:25:48AM +0800, Jonathan Cavitt wrote: > 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_present(), > and it currently lacks the same error reporting as in the other cases. > This is not intentional, so put some logging here. Since you're here, also update these to xe_err_ratelimited() and xe_gt_err_ratelimited(). Raag > v2: > - Use drm_err_ratelimited() correctly (jcavitt) > > 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..fa5fdf3a1024 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(&xe->drm, "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 >