diff mbox series

[13/13,v2] wifi: iwlwifi: pcie: add another missing bh-disable for rxq->lock

Message ID 20231208183100.e79ad3dae649.I8f19713c4383707f8be7fc20ff5cc1ecf12429bb@changeid (mailing list archive)
State Accepted
Delegated to: Johannes Berg
Headers show
Series None | expand

Commit Message

Korenblit, Miriam Rachel Dec. 8, 2023, 4:32 p.m. UTC
From: Johannes Berg <johannes.berg@intel.com>

Hi,
I Added the 'wifi' prefix

Thanks,
Miri

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 <briannorris@chromium.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Jeff Johnson Dec. 8, 2023, 12:53 a.m. UTC | #1
On 12/8/2023 8:32 AM, Miri Korenblit wrote:
> From: Johannes Berg <johannes.berg@intel.com>
> 
> Hi,
> I Added the 'wifi' prefix
> 
> Thanks,
> Miri

you don't want the above to be part of the git history

> 
> 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 <briannorris@chromium.org>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
> ---

instead you should have added the v2 change log here, "after the cut"

>  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;
>  }
diff mbox series

Patch

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;
 }