From patchwork Wed Apr 27 00:26:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniele Ceraolo Spurio X-Patchwork-Id: 12828096 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 0BF68C433FE for ; Wed, 27 Apr 2022 00:26:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 11FED10EC45; Wed, 27 Apr 2022 00:26:36 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4A3CE10EA0F; Wed, 27 Apr 2022 00:26:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651019192; x=1682555192; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fDX3Wv1OPXgMC0aohqmdIA1KeuTtrc+9mfcl7MY8LBg=; b=nMTER7I3AK7Kumb0LNCX6Df5/Zy4YiFuA2MoFsshmn5Tim9PogAITkim gJ9rRe9ar2uRHlyq9FlMnJP3Rho6rtiQrjn6QC69HlMGFCB5GEaN6tmf2 HsTro0y4BrOGp6jE1gnLumivhAqvMN16izcYImroVojQGtfQPHD9Ywium snrDHFhwn460M59Cc3m0l1t3K58kvystL/Z/AiqW1Qdo27j6ZsrraFMBL FKFjr/Ai3qXfk4/1eajiAYLTf3cmXyfbGfOhl675YGSA0zcGZTJN6/c8m sL2swQocY9h71lUFNUpuc/CaIg6AXoBSfk5L4ZAmNBhS6CX/55CX5xXXb g==; X-IronPort-AV: E=McAfee;i="6400,9594,10329"; a="247695768" X-IronPort-AV: E=Sophos;i="5.90,292,1643702400"; d="scan'208";a="247695768" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2022 17:26:32 -0700 X-IronPort-AV: E=Sophos;i="5.90,292,1643702400"; d="scan'208";a="730524663" Received: from valcore-skull-1.fm.intel.com ([10.1.27.19]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2022 17:26:31 -0700 From: Daniele Ceraolo Spurio To: intel-gfx@lists.freedesktop.org Date: Tue, 26 Apr 2022 17:26:14 -0700 Message-Id: <20220427002617.1767295-2-daniele.ceraolospurio@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220427002617.1767295-1-daniele.ceraolospurio@intel.com> References: <20220427002617.1767295-1-daniele.ceraolospurio@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 1/4] drm/i915/huc: check HW directly for HuC auth status 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: , Cc: dri-devel@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" The huc_is_authenticated function return is based on our SW tracking of the HuC auth status. However, around suspend/resume and reset this can go out of sync with the actual HW state, which is why we use huc_check_state() to look at the actual HW state. Instead of having this duality, just make huc_is_authenticated() return the HW state and use it everywhere we need to know if HuC is running. Signed-off-by: Daniele Ceraolo Spurio Reviewed-by: Rodrigo Vivi --- drivers/gpu/drm/i915/gt/uc/intel_huc.c | 23 ++++++++++++++--------- drivers/gpu/drm/i915/gt/uc/intel_huc.h | 5 ----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c index 556829de9c172..773020e69589a 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c @@ -80,6 +80,18 @@ void intel_huc_fini(struct intel_huc *huc) intel_uc_fw_fini(&huc->fw); } +static bool huc_is_authenticated(struct intel_huc *huc) +{ + struct intel_gt *gt = huc_to_gt(huc); + intel_wakeref_t wakeref; + u32 status = 0; + + with_intel_runtime_pm(gt->uncore->rpm, wakeref) + status = intel_uncore_read(gt->uncore, huc->status.reg); + + return (status & huc->status.mask) == huc->status.value; +} + /** * intel_huc_auth() - Authenticate HuC uCode * @huc: intel_huc structure @@ -96,7 +108,7 @@ int intel_huc_auth(struct intel_huc *huc) struct intel_guc *guc = >->uc.guc; int ret; - GEM_BUG_ON(intel_huc_is_authenticated(huc)); + GEM_BUG_ON(huc_is_authenticated(huc)); if (!intel_uc_fw_is_loaded(&huc->fw)) return -ENOEXEC; @@ -150,10 +162,6 @@ int intel_huc_auth(struct intel_huc *huc) */ int intel_huc_check_status(struct intel_huc *huc) { - struct intel_gt *gt = huc_to_gt(huc); - intel_wakeref_t wakeref; - u32 status = 0; - switch (__intel_uc_fw_status(&huc->fw)) { case INTEL_UC_FIRMWARE_NOT_SUPPORTED: return -ENODEV; @@ -167,10 +175,7 @@ int intel_huc_check_status(struct intel_huc *huc) break; } - with_intel_runtime_pm(gt->uncore->rpm, wakeref) - status = intel_uncore_read(gt->uncore, huc->status.reg); - - return (status & huc->status.mask) == huc->status.value; + return huc_is_authenticated(huc); } /** diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h b/drivers/gpu/drm/i915/gt/uc/intel_huc.h index 73ec670800f2b..77d813840d76c 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h @@ -50,11 +50,6 @@ static inline bool intel_huc_is_used(struct intel_huc *huc) return intel_uc_fw_is_available(&huc->fw); } -static inline bool intel_huc_is_authenticated(struct intel_huc *huc) -{ - return intel_uc_fw_is_running(&huc->fw); -} - void intel_huc_load_status(struct intel_huc *huc, struct drm_printer *p); #endif