Commit bff11766 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k: Add channel context worker thread 



The channel context worker is used to switch to next requested
channel context.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarRajkumar Manoharan <rmanohar@qti.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0453531e

drivers/net/wireless/ath/ath9k/ath9k.h

+11 −2
Original line number Diff line number Diff line
@@ -327,10 +327,13 @@ struct ath_chanctx { 


	u16 txpower;

	bool offchannel;

	bool stopped;

};



void ath_chanctx_init(struct ath_softc *sc);

int ath_chanctx_set_channel(struct ath_softc *sc, struct ath_chanctx *ctx,

void ath_chanctx_set_channel(struct ath_softc *sc, struct ath_chanctx *ctx,

			     struct cfg80211_chan_def *chandef);

void ath_chanctx_switch(struct ath_softc *sc, struct ath_chanctx *ctx,

			struct cfg80211_chan_def *chandef);

int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan);

int ath_startrecv(struct ath_softc *sc);
@@ -470,6 +473,7 @@ void ath9k_csa_update(struct ath_softc *sc); 
#define ATH_PAPRD_TIMEOUT         100 /* msecs */

#define ATH_PLL_WORK_INTERVAL     100



void ath_chanctx_work(struct work_struct *work);

void ath_tx_complete_poll_work(struct work_struct *work);

void ath_reset_work(struct work_struct *work);

bool ath_hw_check(struct ath_softc *sc);
@@ -485,6 +489,7 @@ void ath9k_queue_reset(struct ath_softc *sc, enum ath_reset_type type); 
void ath_ps_full_sleep(unsigned long data);

void ath9k_p2p_ps_timer(void *priv);

void ath9k_update_p2p_ps(struct ath_softc *sc, struct ieee80211_vif *vif);

void __ath9k_flush(struct ieee80211_hw *hw, u32 queues, bool drop);



/**********/

/* BTCOEX */
@@ -734,6 +739,7 @@ struct ath_softc { 
	struct mutex mutex;

	struct work_struct paprd_work;

	struct work_struct hw_reset_work;

	struct work_struct chanctx_work;

	struct completion paprd_complete;

	wait_queue_head_t tx_wait;
@@ -756,8 +762,11 @@ struct ath_softc { 
	struct ath_tx tx;

	struct ath_beacon beacon;



	struct cfg80211_chan_def cur_chandef;

	struct ath_chanctx chanctx[ATH9K_NUM_CHANCTX];

	struct ath_chanctx *cur_chan;

	struct ath_chanctx *next_chan;

	spinlock_t chan_lock;



#ifdef CONFIG_MAC80211_LEDS

	bool led_registered;

drivers/net/wireless/ath/ath9k/beacon.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static void ath9k_beacon_setup(struct ath_softc *sc, struct ieee80211_vif *vif, 
	u8 chainmask = ah->txchainmask;

	u8 rate = 0;



	sband = &common->sbands[common->hw->conf.chandef.chan->band];

	sband = &common->sbands[sc->cur_chandef.chan->band];

	rate = sband->bitrates[rateidx].hw_value;

	if (vif->bss_conf.use_short_preamble)

		rate |= sband->bitrates[rateidx].hw_value_short;

drivers/net/wireless/ath/ath9k/channel.c

+58 −6
Original line number Diff line number Diff line
@@ -101,6 +101,39 @@ static int ath_set_channel(struct ath_softc *sc) 
	return 0;

}



void ath_chanctx_work(struct work_struct *work)

{

	struct ath_softc *sc = container_of(work, struct ath_softc,

					    chanctx_work);



	mutex_lock(&sc->mutex);

	spin_lock_bh(&sc->chan_lock);

	if (!sc->next_chan) {

		spin_unlock_bh(&sc->chan_lock);

		mutex_unlock(&sc->mutex);

		return;

	}



	if (sc->cur_chan != sc->next_chan) {

		sc->cur_chan->stopped = true;

		spin_unlock_bh(&sc->chan_lock);



		__ath9k_flush(sc->hw, ~0, true);



		spin_lock_bh(&sc->chan_lock);

	}

	sc->cur_chan = sc->next_chan;

	sc->cur_chan->stopped = false;

	sc->next_chan = NULL;

	spin_unlock_bh(&sc->chan_lock);



	if (sc->sc_ah->chip_fullsleep ||

	    memcmp(&sc->cur_chandef, &sc->cur_chan->chandef,

		   sizeof(sc->cur_chandef)))

		ath_set_channel(sc);

	mutex_unlock(&sc->mutex);

}



void ath_chanctx_init(struct ath_softc *sc)

{

	struct ath_chanctx *ctx;
@@ -125,12 +158,31 @@ void ath_chanctx_init(struct ath_softc *sc) 
	sc->cur_chan = &sc->chanctx[0];

}



int ath_chanctx_set_channel(struct ath_softc *sc, struct ath_chanctx *ctx,

void ath_chanctx_switch(struct ath_softc *sc, struct ath_chanctx *ctx,

			struct cfg80211_chan_def *chandef)

{

	memcpy(&ctx->chandef, chandef, sizeof(ctx->chandef));

	if (ctx != sc->cur_chan)

		return 0;



	return ath_set_channel(sc);

	spin_lock_bh(&sc->chan_lock);

	sc->next_chan = ctx;

	if (chandef)

		ctx->chandef = *chandef;

	spin_unlock_bh(&sc->chan_lock);

	ieee80211_queue_work(sc->hw, &sc->chanctx_work);

}



void ath_chanctx_set_channel(struct ath_softc *sc, struct ath_chanctx *ctx,

			     struct cfg80211_chan_def *chandef)

{

	bool cur_chan;



	spin_lock_bh(&sc->chan_lock);

	if (chandef)

		memcpy(&ctx->chandef, chandef, sizeof(*chandef));

	cur_chan = sc->cur_chan == ctx;

	spin_unlock_bh(&sc->chan_lock);



	if (!cur_chan)

		return;



	ath_set_channel(sc);

}

drivers/net/wireless/ath/ath9k/init.c

+2 −0
Original line number Diff line number Diff line
@@ -555,6 +555,7 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, 
	spin_lock_init(&common->cc_lock);

	spin_lock_init(&sc->sc_serial_rw);

	spin_lock_init(&sc->sc_pm_lock);

	spin_lock_init(&sc->chan_lock);

	mutex_init(&sc->mutex);

	tasklet_init(&sc->intr_tq, ath9k_tasklet, (unsigned long)sc);

	tasklet_init(&sc->bcon_tasklet, ath9k_beacon_tasklet,
@@ -563,6 +564,7 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, 
	setup_timer(&sc->sleep_timer, ath_ps_full_sleep, (unsigned long)sc);

	INIT_WORK(&sc->hw_reset_work, ath_reset_work);

	INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);

	INIT_WORK(&sc->chanctx_work, ath_chanctx_work);

	INIT_DELAYED_WORK(&sc->hw_pll_work, ath_hw_pll_work);



	/*

drivers/net/wireless/ath/ath9k/link.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static bool ath_paprd_send_frame(struct ath_softc *sc, struct sk_buff *skb, int 
	txctl.txq = sc->tx.txq_map[IEEE80211_AC_BE];



	memset(tx_info, 0, sizeof(*tx_info));

	tx_info->band = hw->conf.chandef.chan->band;

	tx_info->band = sc->cur_chandef.chan->band;

	tx_info->flags |= IEEE80211_TX_CTL_NO_ACK;

	tx_info->control.rates[0].idx = 0;

	tx_info->control.rates[0].count = 1;