From patchwork Thu Dec 7 02:50:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit miriam.rachel.korenblit@intel.com X-Patchwork-Id: 13481292 X-Patchwork-Delegate: johannes@sipsolutions.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="W+QpcYMH" Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B3473AA2 for ; Wed, 6 Dec 2023 00:50:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701852642; x=1733388642; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2ohnNJb6NcomLOZwXtQS5woiYzuNN+oGTyJiwDfGwtc=; b=W+QpcYMHRH/3vvm1DtFRni8yQV/al8IPPKM2uvYPgOVhMrapL8zVfteY qyq4TixeoCmY2Ci6jxphqBYhKo62G3WfBcKx9AA4WvQvi6XUnK/ukI0E5 m58rgWGOIRwJTbx7dcASPTMwVXUQ1z/IYct4iFZpK5+hFGxHhirCcSsPn Vt04mn3hP4kOukp/QXgUM/VfteJ6+CYlsuZqjy9J+9AZV8dpJodpGSCJ5 mR++8MLHAkEBWL7uQW6TC+2WPZuFn+P6Q2LO0BTKXImIG+7aSL6Jzg80H OCRL6E8y/1WiYJxLErGu74G9R9q/wHhmXeMzd/qq79OM2mBnKoT6FJxZK A==; X-IronPort-AV: E=McAfee;i="6600,9927,10915"; a="397916629" X-IronPort-AV: E=Sophos;i="6.04,254,1695711600"; d="scan'208";a="397916629" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Dec 2023 00:50:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10915"; a="805575432" X-IronPort-AV: E=Sophos;i="6.04,254,1695711600"; d="scan'208";a="805575432" Received: from unknown (HELO WEIS0040.iil.intel.com) ([10.12.217.108]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Dec 2023 00:50:11 -0800 From: Miri Korenblit miriam.rachel.korenblit@intel.com To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Johannes Berg , Brian Norris , Miri Korenblit Subject: [PATCH 13/13] iwlwifi: pcie: add another missing bh-disable for rxq->lock Date: Thu, 7 Dec 2023 04:50:18 +0200 Message-Id: <20231207044813.acb50fabb4cc.I8f19713c4383707f8be7fc20ff5cc1ecf12429bb@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231207025018.1022929-1-miriam.rachel.korenblit@intel.com> References: <20231207025018.1022929-1-miriam.rachel.korenblit@intel.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited X-Spam-Level: **** From: Johannes Berg Evidently I had only looked at all the ones in rx.c, and missed this. Add bh-disable to this use of the rxq->lock as well. Fixes: 25edc8f259c7 ("iwlwifi: pcie: properly implement NAPI") Reported-by: Brian Norris Signed-off-by: Johannes Berg Signed-off-by: Miri Korenblit --- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c index f39c436f0b6d..fc64e1e7f5ee 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c @@ -3092,7 +3092,7 @@ static u32 iwl_trans_pcie_dump_rbs(struct iwl_trans *trans, struct iwl_rxq *rxq = &trans_pcie->rxq[0]; u32 i, r, j, rb_len = 0; - spin_lock(&rxq->lock); + spin_lock_bh(&rxq->lock); r = iwl_get_closed_rb_stts(trans, rxq); @@ -3116,7 +3116,7 @@ static u32 iwl_trans_pcie_dump_rbs(struct iwl_trans *trans, *data = iwl_fw_error_next_data(*data); } - spin_unlock(&rxq->lock); + spin_unlock_bh(&rxq->lock); return rb_len; }