From mboxrd@z Thu Jan 1 00:00:00 1970 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 B2332C3ABD9 for ; Wed, 14 May 2025 10:11:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7900B10E610; Wed, 14 May 2025 10:11:51 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="DG+ySjwU"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id E6DF210E610 for ; Wed, 14 May 2025 10:11:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1747217510; x=1778753510; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TfNkSzB5lDKdoYJ8IXK/f/zXU4oTXrDLhYfb9rgXfV4=; b=DG+ySjwU7yslAZMFzowsaCDkf6GWraJNyTBJA+QtF2AQQ3K7KzNzO6nj kRkQ7zlkvr/26jCBTwmKbJ14qnA07r89jDwRKdP/L3wiguhWADJt55YkI mI1ggZCPVBbrOS720zgpkmqkFIdfZqv7JiXf7n2sxpWgVKqhm7vusGzKo 0P/bfhNpLC/Ledp/8BTVQmm9j8rP80t4g6br9vbAIUvFWYYC/aqajvcJm IRC6c/fpPbOyFTeGRh8VFpy29YWCGfWYqNQPdXGXzPwFir/D6iK0mEViX kdgjaJinMjqjNYH5mNH4BbI0YORFTMLKzl4mNeQWP/eEnk2CKAv+6I04p g==; X-CSE-ConnectionGUID: M/MgSHI5SRyOwu47lSIUGA== X-CSE-MsgGUID: KCB/dKq6SwiXQT8QdrGO1Q== X-IronPort-AV: E=McAfee;i="6700,10204,11432"; a="60506001" X-IronPort-AV: E=Sophos;i="6.15,287,1739865600"; d="scan'208";a="60506001" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 May 2025 03:11:49 -0700 X-CSE-ConnectionGUID: afqApfLGQgeiEaWitPuBPw== X-CSE-MsgGUID: Kwfw9iDESSi0gAGGFr1CDw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,287,1739865600"; d="scan'208";a="161285776" Received: from llaguna-dev.igk.intel.com (HELO localhost) ([10.91.214.40]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 May 2025 03:11:48 -0700 From: Lukasz Laguna To: intel-xe@lists.freedesktop.org Cc: michal.wajdeczko@intel.com, rodrigo.vivi@intel.com, matthew.brost@intel.com, lukasz.laguna@intel.com Subject: [PATCH v5 4/4] drm/xe/pf: Allow wedged_mode=2 only in debug config Date: Wed, 14 May 2025 12:11:24 +0200 Message-Id: <20250514101124.12437-5-lukasz.laguna@intel.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20250514101124.12437-1-lukasz.laguna@intel.com> References: <20250514101124.12437-1-lukasz.laguna@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" The GuC reset policy is global, so changing it on PF can impact running VFs. To avoid unintended side effects, setting wedged_mode=2 on the PF is restricted to debug builds only. Signed-off-by: Lukasz Laguna --- drivers/gpu/drm/xe/xe_device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index 7dfc39dd4c9c..f23d8236bddc 100644 --- a/drivers/gpu/drm/xe/xe_device.c +++ b/drivers/gpu/drm/xe/xe_device.c @@ -1189,7 +1189,8 @@ int xe_device_validate_wedged_mode(struct xe_device *xe, unsigned int mode) if (mode > XE_WEDGED_MODE_UPON_ANY_HANG) { drm_dbg(&xe->drm, "wedged_mode: invalid value (%u)\n", mode); return -EINVAL; - } else if (mode == XE_WEDGED_MODE_UPON_ANY_HANG && IS_SRIOV_VF(xe)) { + } else if (mode == XE_WEDGED_MODE_UPON_ANY_HANG && (IS_SRIOV_VF(xe) || + (IS_SRIOV_PF(xe) && !IS_ENABLED(CONFIG_DRM_XE_DEBUG)))) { drm_dbg(&xe->drm, "wedged_mode: unsupported mode (%u) for %s\n", mode, xe_sriov_mode_to_string(xe_device_sriov_mode(xe))); return -EPERM; -- 2.40.0