From patchwork Tue May 30 17:01:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Previn X-Patchwork-Id: 13260785 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 222E8C77B7A for ; Tue, 30 May 2023 17:01:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3721A10E230; Tue, 30 May 2023 17:01:08 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id A9E8310E230; Tue, 30 May 2023 17:01:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685466066; x=1717002066; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=pIpLnI9VbPSNOfatE8Itf/eiQi3DfssCFMCPwBQsPrU=; b=npkjURUacFAhTpOwpzg0q12sV8XnjddXrdOAmh9MJzdn68LnhFbf2BkE D1su+n4KlS7+dmPN14dLBAKz6vI/y70y7FQqTt0JSaqMA8qIP57/jNvnO HyXvZ/bUogClTpKtxviG+3TQj+SuBjKlItXfHuqIONMOap6JwWzW5PaQv QmgC149AY4lBxrnzZd8i18/4wQ0mlAVvNgixkkhK7zRn3VBBwgNwHiyua 5MXDhg5TlBf70fhNtZsOk9MK7D4ucee+/F0Soq3Xzh4wylheDCujLma6t EdxGKnldYdLFWzbFbkN0BhSZvdRXwIrNWJ1rsuzCrqUdE540OLcYwm/TM g==; X-IronPort-AV: E=McAfee;i="6600,9927,10726"; a="420749334" X-IronPort-AV: E=Sophos;i="6.00,204,1681196400"; d="scan'208";a="420749334" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2023 10:01:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10726"; a="818893540" X-IronPort-AV: E=Sophos;i="6.00,204,1681196400"; d="scan'208";a="818893540" Received: from aalteres-desk.fm.intel.com ([10.80.57.53]) by fmsmga002.fm.intel.com with ESMTP; 30 May 2023 10:01:04 -0700 From: Alan Previn To: intel-gfx@lists.freedesktop.org Subject: [PATCH v2] drm/i915/selftest/gsc: Ensure GSC Proxy init completes before selftests Date: Tue, 30 May 2023 10:01:04 -0700 Message-Id: <20230530170104.2192126-1-alan.previn.teres.alexis@intel.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniele Ceraolo Spurio , dri-devel@lists.freedesktop.org, Alan Previn Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On MTL, if the GSC Proxy init flows haven't completed, submissions to the GSC engine will fail. Those init flows are dependent on the mei's gsc_proxy component that is loaded in parallel with i915 and a worker that could potentially start after i915 driver init is done. That said, all subsytems that access the GSC engine today does check for such init flow completion before using the GSC engine. However, selftests currently don't wait on anything before starting. To fix this, add a waiter function at the start of __run_selftests that waits for gsc-proxy init flows to complete. While implementing this, use an table of function pointers so its scalable to add additional waiter functions for future such "wait on dependency" cases that. Difference from prior versions: v1: Based on internal testing, increase the timeout for gsc-proxy specific case to 8 seconds. Signed-off-by: Alan Previn Reviewed-by: Zhanjun Dong --- .../gpu/drm/i915/selftests/i915_selftest.c | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) base-commit: 0ae4ee2c735979030a0219218081eee661606921 diff --git a/drivers/gpu/drm/i915/selftests/i915_selftest.c b/drivers/gpu/drm/i915/selftests/i915_selftest.c index 39da0fb0d6d2..77168a7a7e3f 100644 --- a/drivers/gpu/drm/i915/selftests/i915_selftest.c +++ b/drivers/gpu/drm/i915/selftests/i915_selftest.c @@ -24,6 +24,8 @@ #include #include "gt/intel_gt_pm.h" +#include "gt/uc/intel_gsc_fw.h" + #include "i915_driver.h" #include "i915_drv.h" #include "i915_selftest.h" @@ -127,6 +129,63 @@ static void set_default_test_all(struct selftest *st, unsigned int count) st[i].enabled = true; } +static int +__wait_gsc_proxy_completed(struct drm_i915_private *i915, + unsigned long timeout_ms) +{ + bool need_to_wait = (IS_ENABLED(CONFIG_INTEL_MEI_GSC_PROXY) && + i915->media_gt && + HAS_ENGINE(i915->media_gt, GSC0) && + intel_uc_fw_is_loadable(&i915->media_gt->uc.gsc.fw)); + + /* + * For gsc proxy component loading + init, we need a much longer timeout + * than what CI selftest infrastrucutre currently uses. This longer wait + * period depends on the kernel config and component driver load ordering + */ + if (timeout_ms < 8000) + timeout_ms = 8000; + + if (need_to_wait && + (wait_for(intel_gsc_uc_fw_proxy_init_done(&i915->media_gt->uc.gsc), + timeout_ms))) + return -ETIME; + + return 0; +} + +struct __startup_waiter { + const char *name; + int (*wait_to_completed)(struct drm_i915_private *i915, unsigned long timeout_ms); +}; + +static struct __startup_waiter all_startup_waiters[] = { \ + {"gsc_proxy", __wait_gsc_proxy_completed} \ + }; + +static int __wait_on_all_system_dependencies(struct drm_i915_private *i915) +{ + struct __startup_waiter *waiter = all_startup_waiters; + int count = ARRAY_SIZE(all_startup_waiters); + int ret; + + if (!waiter || !count || !i915) + return 0; + + for (; count--; waiter++) { + if (!waiter->wait_to_completed) + continue; + ret = waiter->wait_to_completed(i915, i915_selftest.timeout_ms); + if (ret) { + pr_info(DRIVER_NAME ": Pre-selftest waiter %s failed with %d\n", + waiter->name, ret); + return ret; + } + } + + return 0; +} + static int __run_selftests(const char *name, struct selftest *st, unsigned int count, @@ -134,6 +193,8 @@ static int __run_selftests(const char *name, { int err = 0; + __wait_on_all_system_dependencies(data); + while (!i915_selftest.random_seed) i915_selftest.random_seed = get_random_u32();