Received: by 2002:a05:7412:2a8c:b0:e2:908c:2ebd with SMTP id u12csp2042212rdh; Tue, 26 Sep 2023 10:30:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHJKdNukWdkJMSDjoIKwVXQRm5Sdj1UGulbrwPxQ7YOyr3oZExOzni6AmMclfMDvmo9rNos X-Received: by 2002:a05:6a00:b8d:b0:68f:ea5d:1f70 with SMTP id g13-20020a056a000b8d00b0068fea5d1f70mr10150647pfj.14.1695749421031; Tue, 26 Sep 2023 10:30:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695749421; cv=none; d=google.com; s=arc-20160816; b=nkb1VXKb/FfdiYj29bi3+bTxrEju/VGirJ+e+kASCj8JtiLzv4/CtutxUKcsDUOCMz CyOCJ3D802AftlR2PwcJJyOtmm8f8L8/AYcXHbS/wIkgrKo8faat1Gq10U77Gj7LxBQ6 YaW1rB42JsEldm4ZQGiyljvPpzqX7pH4lBSPQtnJNEQ4uqxDwLkgGFUFyChGvjcu4Lc9 EFvVSFDvz5nqj2mcHAzSI/x/PTre9PEty7gi1bhawf1rvimLX34dVdTS0/xyt4vhkW4i FufejtVJu0HLtPfTyIEU4NIX5lPdxPyjuW3CWeLv8UnOeW7ZTdq4QoZDspX9DLuGfWBv WbYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=rLQLSF0Qm7SCF3Wv/+iaX8+DRSMUlYM0kE4zxWUa6B4=; fh=Y2IfAqdjkYQAx7XZcGq/8JceY1atOOwfX771vvMvH7o=; b=DtuPqHwM0yf4FoqUuf7m8R5Sr7dv0DmBLOdzn2321ybfw6BVpz6Yhl0pUjZc/5ZOvQ AUodthNdgemhGlsemHyIhyRqYB7uARVa6hSxsYGLAv0q2w1RpbcXqEESt/KMpOgHx9Zr DrRsG1I1NbxxIYTityXxGmoEnsSa6T+OpWMDIGQZBozzb6Tn4rZ7GhhZuYWvEP+wdiMT WGzwrl4CYKd5GdhwjlsldBbQewxzllQQVVDTW0JOKm5v7vhZtIYVl+iv3Wpw8mAlJXMn b6+i3i4px5w9XuIPZnXzrfKPUp+eC9NIYAwELBB6896cloR6KxWW7ixJ7vYgW29yQEiK G/2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="bqH/q6iM"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id a35-20020a631a63000000b00573feb1e7c6si12927665pgm.888.2023.09.26.10.30.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 10:30:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="bqH/q6iM"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id C1D8F807DE15; Tue, 26 Sep 2023 01:07:45 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233834AbjIZIHs (ORCPT + 56 others); Tue, 26 Sep 2023 04:07:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233714AbjIZIHq (ORCPT ); Tue, 26 Sep 2023 04:07:46 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9119116 for ; Tue, 26 Sep 2023 01:07:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695715658; x=1727251658; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zyI83O6v6u6POcXpZnpBLLMhA4sCX6RxrNuokLGcc/8=; b=bqH/q6iMmOsiOIBke9pcjkYSukHSlZQDoy+k7zL9WAKufCWAUIvX8c0Y qsNIVB3qNHbhtY4IV4jeynX7nVhPwoD+cRLHJU1eQc0BquHZvUX/TU+dN g3JbSym+wj5fKamvWpwUHHoLtgcquBYixRcS38CVc0RFX9zMtv5i+HZSd 9I8zESto4RAt/blqFPPakO3QZB2/34MsGpNmg2FcyiGFzU/CTVz1sFBbs cMy9vf2j9K7e74EAIICFyq6UpaHzSRrAO9LvCgbllRGKIZrm16xfa6k15 QTTqfcwDzWSPoX/oeQ574qw3zvBW00S6R5RKo29/1HQ/VRp4O+tOV1Xc3 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10843"; a="467797239" X-IronPort-AV: E=Sophos;i="6.03,177,1694761200"; d="scan'208";a="467797239" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2023 01:07:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10843"; a="698369266" X-IronPort-AV: E=Sophos;i="6.03,177,1694761200"; d="scan'208";a="698369266" Received: from nbenitzh-mobl2.ger.corp.intel.com (HELO ggreenma-mobl2.intel.com) ([10.251.178.250]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2023 01:07:37 -0700 From: gregory.greenman@intel.com To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Johannes Berg , Gregory Greenman Subject: [PATCH 2/9] wifi: iwlwifi: pcie: propagate iwl_pcie_gen2_apm_init() error Date: Tue, 26 Sep 2023 11:07:14 +0300 Message-Id: <20230926110319.883768afe77b.Ic47cb8ce0a0abba3b4745cc2a721217c33360d6c@changeid> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230926080721.876640-1-gregory.greenman@intel.com> References: <20230926080721.876640-1-gregory.greenman@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 26 Sep 2023 01:07:46 -0700 (PDT) From: Johannes Berg If iwl_pcie_gen2_apm_init() fails, we should propagate the error code up, rather than ignoring it. Signed-off-by: Johannes Berg Signed-off-by: Gregory Greenman --- drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c index fa46dad5fd68..085c4b49be87 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c @@ -230,11 +230,14 @@ static int iwl_pcie_gen2_nic_init(struct iwl_trans *trans) struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); int queue_size = max_t(u32, IWL_CMD_QUEUE_SIZE, trans->cfg->min_txq_size); + int ret; /* TODO: most of the logic can be removed in A0 - but not in Z0 */ spin_lock_bh(&trans_pcie->irq_lock); - iwl_pcie_gen2_apm_init(trans); + ret = iwl_pcie_gen2_apm_init(trans); spin_unlock_bh(&trans_pcie->irq_lock); + if (ret) + return ret; iwl_op_mode_nic_config(trans->op_mode); -- 2.38.1