From patchwork Wed May 22 19:00:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Wajdeczko X-Patchwork-Id: 10956513 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 88E24933 for ; Wed, 22 May 2019 19:01:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A54E72000A for ; Wed, 22 May 2019 19:01:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A1812018F; Wed, 22 May 2019 19:01:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4A1BA200DF for ; Wed, 22 May 2019 19:01:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AD2368999C; Wed, 22 May 2019 19:01:26 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id AE98C8999C for ; Wed, 22 May 2019 19:01:21 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 May 2019 12:01:14 -0700 X-ExtLoop1: 1 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga005.jf.intel.com with ESMTP; 22 May 2019 12:01:12 -0700 Received: from mwajdecz-MOBL1.ger.corp.intel.com (mwajdecz-mobl1.ger.corp.intel.com [172.28.174.50]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id x4MJ18WG012878; Wed, 22 May 2019 20:01:11 +0100 From: Michal Wajdeczko To: intel-gfx@lists.freedesktop.org Date: Wed, 22 May 2019 19:00:57 +0000 Message-Id: <20190522190057.848-4-michal.wajdeczko@intel.com> X-Mailer: git-send-email 2.10.1.windows.1 In-Reply-To: <20190522190057.848-1-michal.wajdeczko@intel.com> References: <20190522190057.848-1-michal.wajdeczko@intel.com> Subject: [Intel-gfx] [PATCH 3/3] drm/i915/huc: Update HuC status codes X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Without breaking existing usage, slightly update HuC status codes to provide more info to the clients: 1 if HuC firmware is loaded and verified, 0 if HuC firmware is not enabled, -ENOPKG if HuC firmware is not loaded, -ENODEV if HuC is not present on this platform. Signed-off-by: Michal Wajdeczko Cc: Chris Wilson Cc: Tony Ye --- drivers/gpu/drm/i915/intel_huc.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c index aac17916e130..98deb4ee60a7 100644 --- a/drivers/gpu/drm/i915/intel_huc.c +++ b/drivers/gpu/drm/i915/intel_huc.c @@ -150,9 +150,11 @@ int intel_huc_auth(struct intel_huc *huc) * intel_huc_check_status() - check HuC status * @huc: intel_huc structure * - * Returns: 1 if HuC firmware is loaded and verified, - * 0 if HuC firmware is not loaded and -ENODEV if HuC - * is not present on this platform. + * Return: + * * 1 if HuC firmware is loaded and verified, + * * 0 if HuC firmware is not enabled, + * * -ENOPKG if HuC firmware is not loaded, + * * -ENODEV if HuC is not present on this platform. */ int intel_huc_check_status(struct intel_huc *huc) { @@ -161,5 +163,8 @@ int intel_huc_check_status(struct intel_huc *huc) if (!HAS_HUC(i915)) return -ENODEV; - return huc->verified; + if (!USES_HUC(i915)) + return 0; + + return huc->verified ? 1 : -ENOPKG; }