From patchwork Wed Mar 6 00:30:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sundaresan, Sujaritha" X-Patchwork-Id: 10840255 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 044331575 for ; Wed, 6 Mar 2019 00:49:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E63C72C5F3 for ; Wed, 6 Mar 2019 00:49:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA8602C658; Wed, 6 Mar 2019 00:49:18 +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 853D92C5F3 for ; Wed, 6 Mar 2019 00:49:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 05C296E037; Wed, 6 Mar 2019 00:49:17 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3BB876E037 for ; Wed, 6 Mar 2019 00:49:15 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Mar 2019 16:49:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,445,1544515200"; d="scan'208";a="122957476" Received: from sujaritha-z170x-ud5.fm.intel.com ([10.1.27.147]) by orsmga008.jf.intel.com with ESMTP; 05 Mar 2019 16:49:14 -0800 From: Sujaritha Sundaresan To: intel-gfx@lists.freedesktop.org Date: Tue, 5 Mar 2019 16:30:11 -0800 Message-Id: <20190306003011.12724-1-sujaritha.sundaresan@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190305005556.25073-1-sujaritha.sundaresan@intel.com> References: <20190305005556.25073-1-sujaritha.sundaresan@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v2] drm/i915/guc: Fixing error code for WOPCM initialization 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: , Cc: Sujaritha Sundaresan Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Replacing the -E2BIG error code return for WOPCM initialization with -ENODEV. This will prevent the pci from picking this up as a warning during fault injection testing. v2: change the final return code in i915_pci_probe() to ENODEV instead of the specific wopcm change. - Daniele Cc: Daniele Ceraolo Spurio Cc: Michal Wajdeczko Signed-off-by: Sujaritha Sundaresan Reviewed-by: Michal Wajdeczko --- drivers/gpu/drm/i915/i915_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index c42c5ccf38fe..f962b5c0b3c1 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -778,7 +778,7 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) err = i915_driver_load(pdev, ent); if (err) - return err; + return i915_error_injected() ? -ENODEV : err; if (i915_inject_load_failure()) { i915_pci_remove(pdev);