Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm: Add a vendor-specific recovery method to drm device wedged uevent

Address the need for a recovery method (firmware flash on Firmware errors)
introduced in the later patches of Xe KMD.
Whenever XE KMD detects a firmware error, a firmware flash is required to
recover the device to normal operation.

The initial proposal to use 'firmware-flash' as a recovery method was
not applicable to other drivers and could cause multiple recovery
methods specific to vendors to be added.
To address this a more generic 'vendor-specific' method is introduced,
guiding users to refer to vendor specific documentation and system logs
for detailed vendor specific recovery procedure.

Add a recovery method 'WEDGED=vendor-specific' for such errors.
Vendors must provide additional recovery documentation if this method
is used.

It is the responsibility of the consumer to refer to the correct vendor
specific documentation and usecase before attempting a recovery.

For example: If driver is XE KMD, the consumer must refer
to the documentation of 'Device Wedging' under 'Documentation/gpu/xe/'.

v2: fix documentation (Raag)
v3: add more details to commit message (Sima, Rodrigo, Raag)
add an example script to the documentation (Raag)
v4: use consistent naming (Raag)
v5: fix commit message
v6: add more documentation

Cc: André Almeida <andrealmeid@igalia.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: David Airlie <airlied@gmail.com>
Cc: Simona Vetter <simona.vetter@ffwll.ch>
Cc: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Riana Tauro <riana.tauro@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Maxime Ripard <mripard@kernel.org>
Link: https://lore.kernel.org/r/20250826063419.3022216-3-riana.tauro@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

authored by

Riana Tauro and committed by
Rodrigo Vivi
9c857a9d 38fc73b8

+46 -7
+40 -7
Documentation/gpu/drm-uapi.rst
··· 418 418 Recovery 419 419 -------- 420 420 421 - Current implementation defines three recovery methods, out of which, drivers 421 + Current implementation defines four recovery methods, out of which, drivers 422 422 can use any one, multiple or none. Method(s) of choice will be sent in the 423 423 uevent environment as ``WEDGED=<method1>[,..,<methodN>]`` in order of less to 424 - more side-effects. If driver is unsure about recovery or method is unknown 425 - (like soft/hard system reboot, firmware flashing, physical device replacement 426 - or any other procedure which can't be attempted on the fly), ``WEDGED=unknown`` 427 - will be sent instead. 424 + more side-effects. See the section `Vendor Specific Recovery`_ 425 + for ``WEDGED=vendor-specific``. If driver is unsure about recovery or 426 + method is unknown, ``WEDGED=unknown`` will be sent instead. 428 427 429 428 Userspace consumers can parse this event and attempt recovery as per the 430 429 following expectations. ··· 434 435 none optional telemetry collection 435 436 rebind unbind + bind driver 436 437 bus-reset unbind + bus reset/re-enumeration + bind 438 + vendor-specific vendor specific recovery method 437 439 unknown consumer policy 438 440 =============== ======================================== 439 441 ··· 445 445 telemetry information (devcoredump, syslog). This is useful because the first 446 446 hang is usually the most critical one which can result in consequential hangs or 447 447 complete wedging. 448 + 449 + 450 + Vendor Specific Recovery 451 + ------------------------ 452 + 453 + When ``WEDGED=vendor-specific`` is sent, it indicates that the device requires 454 + a recovery procedure specific to the hardware vendor and is not one of the 455 + standardized approaches. 456 + 457 + ``WEDGED=vendor-specific`` may be used to indicate different cases within a 458 + single vendor driver, each requiring a distinct recovery procedure. 459 + In such scenarios, the vendor driver must provide comprehensive documentation 460 + that describes each case, include additional hints to identify specific case and 461 + outline the corresponding recovery procedure. The documentation includes: 462 + 463 + Case - A list of all cases that sends the ``WEDGED=vendor-specific`` recovery method. 464 + 465 + Hints - Additional Information to assist the userspace consumer in identifying and 466 + differentiating between different cases. This can be exposed through sysfs, debugfs, 467 + traces, dmesg etc. 468 + 469 + Recovery Procedure - Clear instructions and guidance for recovering each case. 470 + This may include userspace scripts, tools needed for the recovery procedure. 471 + 472 + It is the responsibility of the admin/userspace consumer to identify the case and 473 + verify additional identification hints before attempting a recovery procedure. 474 + 475 + Example: If the device uses the Xe driver, then userspace consumer should refer to 476 + :ref:`Xe Device Wedging <xe-device-wedging>` for the detailed documentation. 448 477 449 478 Task information 450 479 ---------------- ··· 501 472 be closed to prevent leaks or undefined behaviour. The idea here is to clear the 502 473 device of all user context beforehand and set the stage for a clean recovery. 503 474 504 - Example 505 - ------- 475 + For ``WEDGED=vendor-specific`` recovery method, it is the responsibility of the 476 + consumer to check the driver documentation and the usecase before attempting 477 + a recovery. 478 + 479 + Example - rebind 480 + ---------------- 506 481 507 482 Udev rule:: 508 483
+2
drivers/gpu/drm/drm_drv.c
··· 532 532 return "rebind"; 533 533 case DRM_WEDGE_RECOVERY_BUS_RESET: 534 534 return "bus-reset"; 535 + case DRM_WEDGE_RECOVERY_VENDOR: 536 + return "vendor-specific"; 535 537 default: 536 538 return NULL; 537 539 }
+4
include/drm/drm_device.h
··· 26 26 * Recovery methods for wedged device in order of less to more side-effects. 27 27 * To be used with drm_dev_wedged_event() as recovery @method. Callers can 28 28 * use any one, multiple (or'd) or none depending on their needs. 29 + * 30 + * Refer to "Device Wedging" chapter in Documentation/gpu/drm-uapi.rst for more 31 + * details. 29 32 */ 30 33 #define DRM_WEDGE_RECOVERY_NONE BIT(0) /* optional telemetry collection */ 31 34 #define DRM_WEDGE_RECOVERY_REBIND BIT(1) /* unbind + bind driver */ 32 35 #define DRM_WEDGE_RECOVERY_BUS_RESET BIT(2) /* unbind + reset bus device + bind */ 36 + #define DRM_WEDGE_RECOVERY_VENDOR BIT(3) /* vendor specific recovery method */ 33 37 34 38 /** 35 39 * struct drm_wedge_task_info - information about the guilty task of a wedge dev