Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54eaa8c6 authored by Maya Erez's avatar Maya Erez Committed by Kalle Valo
Browse files

wil6210: unmask RX_HTRSH interrupt only when connected 



RX_HTRSH interrupt sometimes triggered during device reset
procedure.
To prevent handling this interrupt when not required, unmask
this interrupt only if we are connected and mask it when
disconnected.

Signed-off-by: default avatarMaya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent d8ed043a

drivers/net/wireless/ath/wil6210/interrupt.c

+5 −1
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ 
#define WIL6210_IRQ_DISABLE	(0xFFFFFFFFUL)

#define WIL6210_IMC_RX		(BIT_DMA_EP_RX_ICR_RX_DONE | \

				 BIT_DMA_EP_RX_ICR_RX_HTRSH)

#define WIL6210_IMC_RX_NO_RX_HTRSH (WIL6210_IMC_RX & \

				    (~(BIT_DMA_EP_RX_ICR_RX_HTRSH)))

#define WIL6210_IMC_TX		(BIT_DMA_EP_TX_ICR_TX_DONE | \

				BIT_DMA_EP_TX_ICR_TX_DONE_N(0))

#define WIL6210_IMC_MISC	(ISR_MISC_FW_READY | \
@@ -109,8 +111,10 @@ void wil6210_unmask_irq_tx(struct wil6210_priv *wil) 


void wil6210_unmask_irq_rx(struct wil6210_priv *wil)

{

	bool unmask_rx_htrsh = test_bit(wil_status_fwconnected, wil->status);



	wil_w(wil, RGF_DMA_EP_RX_ICR + offsetof(struct RGF_ICR, IMC),

	      WIL6210_IMC_RX);

	      unmask_rx_htrsh ? WIL6210_IMC_RX : WIL6210_IMC_RX_NO_RX_HTRSH);

}



static void wil6210_unmask_irq_misc(struct wil6210_priv *wil)

drivers/net/wireless/ath/wil6210/main.c

+17 −0
Original line number Diff line number Diff line
@@ -194,6 +194,18 @@ __acquires(&sta->tid_rx_lock) __releases(&sta->tid_rx_lock) 
	memset(&sta->stats, 0, sizeof(sta->stats));

}



static bool wil_ap_is_connected(struct wil6210_priv *wil)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(wil->sta); i++) {

		if (wil->sta[i].status == wil_sta_connected)

			return true;

	}



	return false;

}



static void _wil6210_disconnect(struct wil6210_priv *wil, const u8 *bssid,

				u16 reason_code, bool from_event)

{
@@ -247,6 +259,11 @@ static void _wil6210_disconnect(struct wil6210_priv *wil, const u8 *bssid, 
		}

		clear_bit(wil_status_fwconnecting, wil->status);

		break;

	case NL80211_IFTYPE_AP:

	case NL80211_IFTYPE_P2P_GO:

		if (!wil_ap_is_connected(wil))

			clear_bit(wil_status_fwconnected, wil->status);

		break;

	default:

		break;

	}