Re: [PATCH v4 7/8] drm/xe: Add support for wa_14028434957

[Raag Jadav <raag.jadav@intel.com>]

On Wed, Nov 11, 2026 at 10:20:38AM +0530, Tauro, Riana wrote:
> On 10-11-2026 18:48, Raag Jadav wrote:
> > On Fri, Nov 06, 2026 at 12:49:52PM +0530, Riana Tauro wrote:
> > > Add support for wa_14028434957 on platform CRI.
> > > 
> > > Non-fatal device errors are reported via a direct IRQ, while fatal
> > > device errors are downgraded to non-fatal uncorrectable internal
> > > errors and reported via AER.
> > > 
> > > Add support to process and log non-fatal errors routed via the direct
> > > IRQ path. Most non-fatal errors require no reset, except double-bit
> > > ECC errors affecting a critical BO, for which the device is wedged
> > > with a bus reset as the recovery action.
> > > 
> > > For uncorrectable internal errors reported via AER, request a
> > > secondary bus reset to recover. To avoid a race between the two
> > > paths, if non-fatal error processing is in progress when an
> > > uncorrectable internal error occurs, flush and disable the worker
> > > to prevent further processing, since a reset is
> > > imminent.
> > > 
> > > Cc: Andi Shyti <andi.shyti@linux.intel.com>
> > > Signed-off-by: Riana Tauro <riana.tauro@intel.com>
> > > ---
> > > v2: use platform instead of graphics version (Gustavo)
> > >      combine patches (Tejas, Mallesh)
> > >      remove 1sec delayed worker (Andi)
> > > 
> > > v3: re-order disable hw error worker before wedged check (Sashiko)
> > > ---
> > >   drivers/gpu/drm/xe/xe_device_wa_oob.rules |  1 +
> > >   drivers/gpu/drm/xe/xe_hw_error.c          | 41 +++++++++++++++++++----
> > >   drivers/gpu/drm/xe/xe_hw_error.h          |  1 +
> > >   drivers/gpu/drm/xe/xe_pci_error.c         | 19 +++++++++--
> > >   drivers/gpu/drm/xe/xe_ras.c               | 21 ++++++++++--
> > >   5 files changed, 72 insertions(+), 11 deletions(-)
> > > 
> > > diff --git a/drivers/gpu/drm/xe/xe_device_wa_oob.rules b/drivers/gpu/drm/xe/xe_device_wa_oob.rules
> > > index 753b2a4a1006..300207596893 100644
> > > --- a/drivers/gpu/drm/xe/xe_device_wa_oob.rules
> > > +++ b/drivers/gpu/drm/xe/xe_device_wa_oob.rules
> > > @@ -7,3 +7,4 @@
> > >   14026746987	PLATFORM(CRESCENTISLAND)
> > >   14026779378	PLATFORM(CRESCENTISLAND)
> > >   14028586678	PLATFORM(CRESCENTISLAND)
> > > +14028434957	PLATFORM(CRESCENTISLAND)
> > > diff --git a/drivers/gpu/drm/xe/xe_hw_error.c b/drivers/gpu/drm/xe/xe_hw_error.c
> > > index f7031b341ce0..86b29f282837 100644
> > > --- a/drivers/gpu/drm/xe/xe_hw_error.c
> > > +++ b/drivers/gpu/drm/xe/xe_hw_error.c
> > > @@ -5,6 +5,8 @@
> > >   #include <linux/bitmap.h>
> > > +#include <generated/xe_device_wa_oob.h>
> > > +
> > >   #include "regs/xe_gsc_regs.h"
> > >   #include "regs/xe_hw_error_regs.h"
> > >   #include "regs/xe_irq_regs.h"
> > > @@ -15,7 +17,11 @@
> > >   #include "xe_hw_error.h"
> > >   #include "xe_mmio.h"
> > >   #include "xe_pm.h"
> > > +#include "xe_ras.h"
> > >   #include "xe_survivability_mode.h"
> > > +#include "xe_wa.h"
> > > +#include "xe_wedge.h"
> > > +
> > >   #define GT_HW_ERROR_MAX_ERR_BITS		16
> > >   #define HEC_UNCORR_FW_ERR_BITS			4
> > > @@ -171,7 +177,24 @@ static void hw_error_work(struct work_struct *work)
> > >   	struct xe_tile *tile = container_of(work, typeof(*tile), hw_error_work);
> > >   	struct xe_device *xe = tile_to_xe(tile);
> > > +	/* Skip hw error processing if device is already wedged */
> > > +	if (xe_wedged(xe))
> > This is a weak check and actually doesn't achieve anything, i.e. the state
> > can change immediate after this check :)
> 
> Helps if it is already wedged.

Which is a problem for basically every single function in the driver ;)

I understand it's not the scope of this series but I hope it gets fixed
at some point.

> > > +		return;
> > > +
> > >   	guard(xe_pm_runtime)(xe);
> > > +
> > > +	if (xe->info.has_sysctrl && XE_DEVICE_WA(xe, 14028434957)) {
> > > +		/*
> > > +		 * Skip handling if an uncorrectable internal error is reported as
> > > +		 * reset is imminent
> > > +		 */
> > > +		if (xe_ras_is_aer_internal_error(xe))
> > > +			return;
> > > +
> > > +		xe_ras_process_errors(xe);
> > > +		return;
> > > +	}
> > > +
> > >   	xe_survivability_mode_runtime_enable(xe);
> > >   }
> > > @@ -433,12 +456,12 @@ static void hw_error_source_handler(struct xe_tile *tile, const enum hardware_er
> > >   		return;
> > >   	/*
> > > -	 * Hardware errors are reported through System Controller on the platforms that
> > > -	 * support it, and never routed as direct IRQ to SGUnit. So we should never be
> > > -	 * here for those platforms.
> > > +	 * Non-fatal errors are routed as a direct IRQ on platforms that support
> > > +	 * system controller.
> > How the turntables :D
> > 
> > I really hope (and I mean _really_) the required due diligence has been
> > done here before opening this can of worms.
> 
> This is a hardware decision not from driver

Documentation/process/submitting-patches.rst +458

"The Signed-off-by: tag indicates that the signer was involved in the
development of the patch, ..."

So you don't get a discount here ;)

Raag

> > >   	 */
> > >   	if (xe->info.has_sysctrl) {
> > > -		drm_err_ratelimited(&xe->drm, HW_ERR "Invalid error routing\n");
> > > +		drm_err_ratelimited(&xe->drm, HW_ERR "Non-fatal %s reported\n", severity_str);
> > > +		schedule_work(&tile->hw_error_work);
> > >   		return;
> > >   	}
> > > @@ -537,7 +560,13 @@ static void process_hw_errors(struct xe_device *xe)
> > >   	}
> > >   }
> > > -static void hw_error_fini(void *arg)
> > > +/**
> > > + * xe_hw_error_work_disable - Disable hw error work
> > > + * @arg: xe device instance
> > > + *
> > > + * This function disables work for hardware error handling for all tiles.
> > > + */
> > > +void xe_hw_error_work_disable(void *arg)
> > >   {
> > >   	struct xe_device *xe = arg;
> > >   	struct xe_tile *tile;
> > > @@ -569,5 +598,5 @@ void xe_hw_error_init(struct xe_device *xe)
> > >   		INIT_WORK(&tile->hw_error_work, hw_error_work);
> > >   	process_hw_errors(xe);
> > > -	devm_add_action_or_reset(xe->drm.dev, hw_error_fini, xe);
> > > +	devm_add_action_or_reset(xe->drm.dev, xe_hw_error_work_disable, xe);
> > >   }
> > > diff --git a/drivers/gpu/drm/xe/xe_hw_error.h b/drivers/gpu/drm/xe/xe_hw_error.h
> > > index 5e3a11424108..c2c0bfa6d9f9 100644
> > > --- a/drivers/gpu/drm/xe/xe_hw_error.h
> > > +++ b/drivers/gpu/drm/xe/xe_hw_error.h
> > > @@ -12,4 +12,5 @@ struct xe_device;
> > >   void xe_hw_error_irq_handler(struct xe_tile *tile, const u32 master_ctl);
> > >   void xe_hw_error_init(struct xe_device *xe);
> > > +void xe_hw_error_work_disable(void *arg);
> > >   #endif
> > > diff --git a/drivers/gpu/drm/xe/xe_pci_error.c b/drivers/gpu/drm/xe/xe_pci_error.c
> > > index 472b85d0ccc3..67920751ecf1 100644
> > > --- a/drivers/gpu/drm/xe/xe_pci_error.c
> > > +++ b/drivers/gpu/drm/xe/xe_pci_error.c
> > > @@ -5,8 +5,11 @@
> > >   #include <linux/pci.h>
> > > +#include <generated/xe_device_wa_oob.h>
> > > +
> > >   #include "xe_device.h"
> > >   #include "xe_gt.h"
> > > +#include "xe_hw_error.h"
> > >   #include "xe_log.h"
> > >   #include "xe_pci.h"
> > >   #include "xe_pcode.h"
> > > @@ -14,6 +17,7 @@
> > >   #include "xe_printk.h"
> > >   #include "xe_ras.h"
> > >   #include "xe_survivability_mode.h"
> > > +#include "xe_wa.h"
> > >   #include "xe_wedge.h"
> > >   static void prepare_device_for_reset(struct pci_dev *pdev)
> > > @@ -87,12 +91,21 @@ static pci_ers_result_t xe_pci_error_detected(struct pci_dev *pdev, pci_channel_
> > >   	if (state == pci_channel_io_perm_failure)
> > >   		return PCI_ERS_RESULT_DISCONNECT;
> > > -	/* If the device is already wedged or in survivability mode, do not attempt recovery */
> > > -	if (xe_survivability_mode_is_boot_enabled(xe) || xe_wedged(xe))
> > > +	/* If the device is already in survivability mode, do not attempt recovery */
> > > +	if (xe_survivability_mode_is_boot_enabled(xe))
> > >   		return PCI_ERS_RESULT_DISCONNECT;
> > > -	if (is_aer_internal_error(pdev))
> > > +	/*
> > > +	 * If non-fatal error processing is in progress when uncorrectable internal error occurs,
> > > +	 * flush and disable the worker to prevent further processing, as a reset is imminent.
> > > +	 */
> > > +	if (XE_DEVICE_WA(xe, 14028434957) && is_aer_internal_error(pdev)) {
> > >   		xe_ras_set_aer_internal_error(xe);
> > > +		xe_hw_error_work_disable(xe);
> > > +	}
> > > +
> > > +	if (xe_wedged(xe))
> > > +		return PCI_ERS_RESULT_DISCONNECT;
> > >   	switch (state) {
> > >   	case pci_channel_io_normal:
> > > diff --git a/drivers/gpu/drm/xe/xe_ras.c b/drivers/gpu/drm/xe/xe_ras.c
> > > index 58a0b5fa676d..1809c3c893de 100644
> > > --- a/drivers/gpu/drm/xe/xe_ras.c
> > > +++ b/drivers/gpu/drm/xe/xe_ras.c
> > > @@ -5,6 +5,8 @@
> > >   #include <linux/bitfield.h>
> > > +#include <generated/xe_device_wa_oob.h>
> > > +
> > >   #include "xe_assert.h"
> > >   #include "xe_bo.h"
> > >   #include "xe_configfs.h"
> > > @@ -23,6 +25,7 @@
> > >   #include "xe_sysctrl_mailbox.h"
> > >   #include "xe_sysctrl_mailbox_types.h"
> > >   #include "xe_ttm_vram_mgr.h"
> > > +#include "xe_wa.h"
> > >   #include "xe_wedge.h"
> > >   /* Any non-null entry marks the page as offlined by firmware */
> > > @@ -671,8 +674,15 @@ static u8 handle_device_memory_errors(struct xe_device *xe, struct xe_ras_error_
> > >   			    DEVICE_MEMORY, &arr->counter, sizeof(arr->counter),
> > >   			    "Double-bit ECC error detected at sw address 0x%llx\n",
> > >   			    info->sw_address);
> > > -		if (ret)
> > > +		/*
> > > +		 * Double-bit ECC errors are non-fatal errors and are reported via IRQ.
> > > +		 * Wedge the device with a bus reset for errors that require SBR to recover.
> > > +		 * TODO: Trigger SBR using pci_reset_bus
> > > +		 */
> > > +		if (ret) {
> > > +			xe_wedge_declare(xe, DRM_WEDGE_RECOVERY_BUS_RESET);
> > >   			return XE_RAS_RECOVERY_ACTION_RESET;
> > > +		}
> > >   		break;
> > >   	default:
> > >   		xe_log_comp(xe, cper_sev, DEVICE_MEMORY, &arr->counter, sizeof(arr->counter),
> > > @@ -818,9 +828,16 @@ enum xe_ras_recovery_action xe_ras_process_errors(struct xe_device *xe)
> > >   		return XE_RAS_RECOVERY_ACTION_RECOVERED;
> > >   	BUILD_BUG_ON(BITS_PER_TYPE(sent) < XE_RAS_COMP_MAX);
> > > -	/* Default action */
> > > +	/* Default action for PCIe bus errors */
> > >   	final_action = XE_RAS_RECOVERY_ACTION_RECOVERED;
> > > +	/*
> > > +	 * Device fatal errors are downgraded to non-fatal and reported as an uncorrectable
> > > +	 * internal error. Set the default action to reset.
> > > +	 */
> > > +	if (XE_DEVICE_WA(xe, 14028434957) && xe_ras_is_aer_internal_error(xe))
> > > +		final_action = XE_RAS_RECOVERY_ACTION_RESET;
> > > +
> > >   	xe_sysctrl_create_command(&command, XE_SYSCTRL_GROUP_GFSP, XE_SYSCTRL_CMD_GET_SOC_ERROR,
> > >   				  NULL, 0, &response, sizeof(response));
> > > -- 
> > > 2.47.1
> > >