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

Commit 9eab61c2 authored by Senthil Balasubramanian's avatar Senthil Balasubramanian Committed by John W. Linville
Browse files

ath9k: cleanup hw pll work handler 



There is no reason why pll work handler should be part of xmit
file. move it to main.c so that reading hw check routines are
all in the same place.

Signed-off-by: default avatarSenthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 51513906

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

+1 −0
Original line number Diff line number Diff line
@@ -423,6 +423,7 @@ void ath9k_set_beaconing_status(struct ath_softc *sc, bool status); 
#define ATH_PAPRD_TIMEOUT	100 /* msecs */



void ath_hw_check(struct work_struct *work);

void ath_hw_pll_work(struct work_struct *work);

void ath_paprd_calibrate(struct work_struct *work);

void ath_ani_calibrate(unsigned long data);

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

+1 −0
Original line number Diff line number Diff line
@@ -801,6 +801,7 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid, 


	INIT_WORK(&sc->hw_check_work, ath_hw_check);

	INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);

	INIT_DELAYED_WORK(&sc->hw_pll_work, ath_hw_pll_work);

	sc->last_rssi = ATH_RSSI_DUMMY_MARKER;



	ath_init_leds(sc);

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

+23 −0
Original line number Diff line number Diff line
@@ -624,6 +624,29 @@ void ath_hw_check(struct work_struct *work) 
	ath9k_ps_restore(sc);

}



void ath_hw_pll_work(struct work_struct *work)

{

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

					    hw_pll_work.work);

	static int count;



	if (AR_SREV_9485(sc->sc_ah)) {

		if (ar9003_get_pll_sqsum_dvc(sc->sc_ah) >= 0x40000) {

			count++;



			if (count == 3) {

				/* Rx is hung for more than 500ms. Reset it */

				ath_reset(sc, true);

				count = 0;

			}

		} else

			count = 0;



		ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work, HZ/5);

	}

}





void ath9k_tasklet(unsigned long data)

{

	struct ath_softc *sc = (struct ath_softc *)data;

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

+0 −23
Original line number Diff line number Diff line
@@ -2180,28 +2180,6 @@ static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq) 
	}

}



static void ath_hw_pll_work(struct work_struct *work)

{

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

					    hw_pll_work.work);

	static int count;



	if (AR_SREV_9485(sc->sc_ah)) {

		if (ar9003_get_pll_sqsum_dvc(sc->sc_ah) >= 0x40000) {

			count++;



			if (count == 3) {

				/* Rx is hung for more than 500ms. Reset it */

				ath_reset(sc, true);

				count = 0;

			}

		} else

			count = 0;



		ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work, HZ/5);

	}

}



static void ath_tx_complete_poll_work(struct work_struct *work)

{

	struct ath_softc *sc = container_of(work, struct ath_softc,
@@ -2396,7 +2374,6 @@ int ath_tx_init(struct ath_softc *sc, int nbufs) 
	}



	INIT_DELAYED_WORK(&sc->tx_complete_work, ath_tx_complete_poll_work);

	INIT_DELAYED_WORK(&sc->hw_pll_work, ath_hw_pll_work);



	if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {

		error = ath_tx_edma_init(sc);