From patchwork Mon Oct 11 15:21:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thanneeru Srinivasulu X-Patchwork-Id: 12550383 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26B13C433EF for ; Mon, 11 Oct 2021 15:42:47 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id E1A7560E94 for ; Mon, 11 Oct 2021 15:42:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E1A7560E94 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0354389F6E; Mon, 11 Oct 2021 15:42:46 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9C8AA89F6E; Mon, 11 Oct 2021 15:42:44 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10134"; a="313097996" X-IronPort-AV: E=Sophos;i="5.85,364,1624345200"; d="scan'208";a="313097996" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2021 08:19:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,364,1624345200"; d="scan'208";a="490518775" Received: from irvmail001.ir.intel.com ([10.43.11.63]) by orsmga008.jf.intel.com with ESMTP; 11 Oct 2021 08:19:42 -0700 Received: from intel.com (srinivasulu-X299-AORUS-Gaming-7.iind.intel.com [10.145.162.218]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id 19BFJcaH019164; Mon, 11 Oct 2021 16:19:40 +0100 From: Thanneeru Srinivasulu To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: michal.wajdeczko@intel.com, thanneeru.srinivasulu@intel.com Subject: [PATCH 1/4] drm/i915/huc: Use i915_probe_error to report early CTB failures Date: Mon, 11 Oct 2021 20:51:03 +0530 Message-Id: <20211011152106.3424810-2-thanneeru.srinivasulu@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211011152106.3424810-1-thanneeru.srinivasulu@intel.com> References: <20211011152106.3424810-1-thanneeru.srinivasulu@intel.com> 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Replace DRM_ERROR with CT_PROBE_ERROR to report early CTB failures. Signed-off-by: Thanneeru Srinivasulu Reviewed-by: Matthew Brost --- drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c index 0a3504bc0b61..83764db0fd6d 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c @@ -191,8 +191,8 @@ static int ct_register_buffer(struct intel_guc_ct *ct, u32 type, err = guc_action_register_ct_buffer(ct_to_guc(ct), type, desc_addr, buff_addr, size); if (unlikely(err)) - CT_ERROR(ct, "Failed to register %s buffer (%pe)\n", - guc_ct_buffer_type_to_str(type), ERR_PTR(err)); + CT_PROBE_ERROR(ct, "Failed to register %s buffer (%pe)\n", + guc_ct_buffer_type_to_str(type), ERR_PTR(err)); return err; } From patchwork Mon Oct 11 15:21:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thanneeru Srinivasulu X-Patchwork-Id: 12550293 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D8C5C433EF for ; Mon, 11 Oct 2021 15:19:48 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 28FDC60E05 for ; Mon, 11 Oct 2021 15:19:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 28FDC60E05 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 532216E51B; Mon, 11 Oct 2021 15:19:47 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id C8F056E51B; Mon, 11 Oct 2021 15:19:45 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10134"; a="214044428" X-IronPort-AV: E=Sophos;i="5.85,364,1624345200"; d="scan'208";a="214044428" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2021 08:19:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,364,1624345200"; d="scan'208";a="716427179" Received: from irvmail001.ir.intel.com ([10.43.11.63]) by fmsmga005.fm.intel.com with ESMTP; 11 Oct 2021 08:19:43 -0700 Received: from intel.com (srinivasulu-X299-AORUS-Gaming-7.iind.intel.com [10.145.162.218]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id 19BFJcaI019164; Mon, 11 Oct 2021 16:19:42 +0100 From: Thanneeru Srinivasulu To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: michal.wajdeczko@intel.com, thanneeru.srinivasulu@intel.com Subject: [PATCH 2/4] drm/i915/huc: Use i915_probe_error to report early HuC failures Date: Mon, 11 Oct 2021 20:51:04 +0530 Message-Id: <20211011152106.3424810-3-thanneeru.srinivasulu@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211011152106.3424810-1-thanneeru.srinivasulu@intel.com> References: <20211011152106.3424810-1-thanneeru.srinivasulu@intel.com> 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Replace DRM_ERROR with i915_probe_error to report early HuC failures. Signed-off-by: Thanneeru Srinivasulu Reviewed-by: Matthew Brost --- drivers/gpu/drm/i915/gt/uc/intel_huc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c index ff4b6869b80b..ff0f5b9130c9 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c @@ -179,7 +179,7 @@ int intel_huc_auth(struct intel_huc *huc) ret = intel_guc_auth_huc(guc, intel_guc_ggtt_offset(guc, huc->rsa_data)); if (ret) { - DRM_ERROR("HuC: GuC did not ack Auth request %d\n", ret); + i915_probe_error(gt->i915, "HuC: GuC did not ack Auth request %d\n", ret); goto fail; } @@ -190,7 +190,7 @@ int intel_huc_auth(struct intel_huc *huc) huc->status.value, 2, 50, NULL); if (ret) { - DRM_ERROR("HuC: Firmware not verified %d\n", ret); + i915_probe_error(gt->i915, "HuC: Firmware not verified %d\n", ret); goto fail; } From patchwork Mon Oct 11 15:21:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thanneeru Srinivasulu X-Patchwork-Id: 12550297 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4358DC433EF for ; Mon, 11 Oct 2021 15:20:00 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 09DC160E98 for ; Mon, 11 Oct 2021 15:20:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 09DC160E98 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A3E816E544; Mon, 11 Oct 2021 15:19:49 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id E42C06E51B; Mon, 11 Oct 2021 15:19:46 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10134"; a="290391429" X-IronPort-AV: E=Sophos;i="5.85,364,1624345200"; d="scan'208";a="290391429" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2021 08:19:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,364,1624345200"; d="scan'208";a="547062983" Received: from irvmail001.ir.intel.com ([10.43.11.63]) by fmsmga004.fm.intel.com with ESMTP; 11 Oct 2021 08:19:45 -0700 Received: from intel.com (srinivasulu-X299-AORUS-Gaming-7.iind.intel.com [10.145.162.218]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id 19BFJcaJ019164; Mon, 11 Oct 2021 16:19:43 +0100 From: Thanneeru Srinivasulu To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: michal.wajdeczko@intel.com, thanneeru.srinivasulu@intel.com Subject: [PATCH 3/4] drm/i915/guc: Inject probe errors for MMIO send Date: Mon, 11 Oct 2021 20:51:05 +0530 Message-Id: <20211011152106.3424810-4-thanneeru.srinivasulu@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211011152106.3424810-1-thanneeru.srinivasulu@intel.com> References: <20211011152106.3424810-1-thanneeru.srinivasulu@intel.com> 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Injecting probe errors -ENXIO for MMIO send. Signed-off-by: Thanneeru Srinivasulu Reviewed-by: Matthew Brost --- drivers/gpu/drm/i915/gt/uc/intel_guc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c index 8f8182bf7c11..490d66712afc 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c @@ -403,6 +403,10 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *request, u32 len, int i; int ret; + ret = i915_inject_probe_error(i915, -ENXIO); + if (ret) + return ret; + GEM_BUG_ON(!len); GEM_BUG_ON(len > guc->send_regs.count); From patchwork Mon Oct 11 15:21:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thanneeru Srinivasulu X-Patchwork-Id: 12550295 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9003CC433F5 for ; Mon, 11 Oct 2021 15:19:57 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 5550960E98 for ; Mon, 11 Oct 2021 15:19:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5550960E98 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 02E856E52E; Mon, 11 Oct 2021 15:19:49 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id D77306E525; Mon, 11 Oct 2021 15:19:47 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10134"; a="214044434" X-IronPort-AV: E=Sophos;i="5.85,364,1624345200"; d="scan'208";a="214044434" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2021 08:19:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,364,1624345200"; d="scan'208";a="716427192" Received: from irvmail001.ir.intel.com ([10.43.11.63]) by fmsmga005.fm.intel.com with ESMTP; 11 Oct 2021 08:19:46 -0700 Received: from intel.com (srinivasulu-X299-AORUS-Gaming-7.iind.intel.com [10.145.162.218]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id 19BFJcaK019164; Mon, 11 Oct 2021 16:19:44 +0100 From: Thanneeru Srinivasulu To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: michal.wajdeczko@intel.com, thanneeru.srinivasulu@intel.com Subject: [PATCH 4/4] drm/i915/guc: Inject probe errors for CT send Date: Mon, 11 Oct 2021 20:51:06 +0530 Message-Id: <20211011152106.3424810-5-thanneeru.srinivasulu@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211011152106.3424810-1-thanneeru.srinivasulu@intel.com> References: <20211011152106.3424810-1-thanneeru.srinivasulu@intel.com> 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Inject probe errors -ENXIO, -EBUSY for CT send. Signed-off-by: Thanneeru Srinivasulu Reviewed-by: Michal Wajdeczko --- drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c index 83764db0fd6d..8ffef3abd3da 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c @@ -765,6 +765,14 @@ int intel_guc_ct_send(struct intel_guc_ct *ct, const u32 *action, u32 len, u32 status = ~0; /* undefined */ int ret; + ret = i915_inject_probe_error(ct_to_i915(ct), -ENXIO); + if (ret) + return ret; + + ret = i915_inject_probe_error(ct_to_i915(ct), -EBUSY); + if (ret) + return ret; + if (unlikely(!ct->enabled)) { struct intel_guc *guc = ct_to_guc(ct); struct intel_uc *uc = container_of(guc, struct intel_uc, guc);