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

Commit 05c0be2f authored by Mohammed Shafi Shajakhan's avatar Mohammed Shafi Shajakhan Committed by John W. Linville
Browse files

ath9k: Add a debug entry to start/stop ANI 



this helps the user to start/stop ANI dynamically.

Signed-off-by: default avatarMohammed Shafi Shajakhan <mshajakhan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 81168e50

drivers/net/wireless/ath/ath.h

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ struct ath_common { 
	const struct ath_bus_ops *bus_ops;



	bool btcoex_enabled;

	bool disable_ani;

};



struct sk_buff *ath_rxbuf_alloc(struct ath_common *common,

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

+1 −0
Original line number Diff line number Diff line
@@ -427,6 +427,7 @@ 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);

void ath_start_ani(struct ath_common *common);



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

/* BTCOEX */

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

+52 −0
Original line number Diff line number Diff line
@@ -176,6 +176,56 @@ static const struct file_operations fops_rx_chainmask = { 
	.llseek = default_llseek,

};



static ssize_t read_file_disable_ani(struct file *file, char __user *user_buf,

			     size_t count, loff_t *ppos)

{

	struct ath_softc *sc = file->private_data;

	struct ath_common *common = ath9k_hw_common(sc->sc_ah);

	char buf[32];

	unsigned int len;



	len = sprintf(buf, "%d\n", common->disable_ani);

	return simple_read_from_buffer(user_buf, count, ppos, buf, len);

}



static ssize_t write_file_disable_ani(struct file *file,

				      const char __user *user_buf,

				      size_t count, loff_t *ppos)

{

	struct ath_softc *sc = file->private_data;

	struct ath_common *common = ath9k_hw_common(sc->sc_ah);

	unsigned long disable_ani;

	char buf[32];

	ssize_t len;



	len = min(count, sizeof(buf) - 1);

	if (copy_from_user(buf, user_buf, len))

		return -EFAULT;



	buf[len] = '\0';

	if (strict_strtoul(buf, 0, &disable_ani))

		return -EINVAL;



	common->disable_ani = !!disable_ani;



	if (disable_ani) {

		sc->sc_flags &= ~SC_OP_ANI_RUN;

		del_timer_sync(&common->ani.timer);

	} else {

		sc->sc_flags |= SC_OP_ANI_RUN;

		ath_start_ani(common);

	}



	return count;

}



static const struct file_operations fops_disable_ani = {

	.read = read_file_disable_ani,

	.write = write_file_disable_ani,

	.open = ath9k_debugfs_open,

	.owner = THIS_MODULE,

	.llseek = default_llseek,

};



static ssize_t read_file_dma(struct file *file, char __user *user_buf,

			     size_t count, loff_t *ppos)
@@ -1159,6 +1209,8 @@ int ath9k_init_debug(struct ath_hw *ah) 
			    sc->debug.debugfs_phy, sc, &fops_rx_chainmask);

	debugfs_create_file("tx_chainmask", S_IRUSR | S_IWUSR,

			    sc->debug.debugfs_phy, sc, &fops_tx_chainmask);

	debugfs_create_file("disable_ani", S_IRUSR | S_IWUSR,

			    sc->debug.debugfs_phy, sc, &fops_disable_ani);

	debugfs_create_file("regidx", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,

			    sc, &fops_regidx);

	debugfs_create_file("regval", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,

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

+1 −1
Original line number Diff line number Diff line
@@ -519,7 +519,6 @@ static void ath9k_init_misc(struct ath_softc *sc) 
{

	struct ath_common *common = ath9k_hw_common(sc->sc_ah);

	int i = 0;



	setup_timer(&common->ani.timer, ath_ani_calibrate, (unsigned long)sc);



	sc->config.txpowlimit = ATH_TXPOWER_MAX;
@@ -585,6 +584,7 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid, 
	common->priv = sc;

	common->debug_mask = ath9k_debug;

	common->btcoex_enabled = ath9k_btcoex_enable == 1;

	common->disable_ani = false;

	spin_lock_init(&common->cc_lock);



	spin_lock_init(&sc->sc_serial_rw);

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

+24 −9
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ void ath9k_ps_restore(struct ath_softc *sc) 
	spin_unlock_irqrestore(&sc->sc_pm_lock, flags);

}



static void ath_start_ani(struct ath_common *common)

void ath_start_ani(struct ath_common *common)

{

	struct ath_hw *ah = common->ah;

	unsigned long timestamp = jiffies_to_msecs(jiffies);
@@ -300,6 +300,7 @@ static int ath_set_channel(struct ath_softc *sc, struct ieee80211_hw *hw, 
			ath_set_beacon(sc);

		ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);

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

		if (!common->disable_ani)

			ath_start_ani(common);

	}
@@ -968,6 +969,7 @@ int ath_reset(struct ath_softc *sc, bool retry_tx) 
	sc->hw_busy_count = 0;



	/* Stop ANI */



	del_timer_sync(&common->ani.timer);



	ath9k_ps_wakeup(sc);
@@ -1017,7 +1019,9 @@ int ath_reset(struct ath_softc *sc, bool retry_tx) 
	spin_unlock_bh(&sc->sc_pcu_lock);



	/* Start ANI */

	if (!common->disable_ani)

		ath_start_ani(common);



	ath9k_ps_restore(sc);



	return r;
@@ -1408,8 +1412,12 @@ static void ath9k_calculate_summary_state(struct ieee80211_hw *hw, 
	/* Set up ANI */

	if (iter_data.naps > 0) {

		sc->sc_ah->stats.avgbrssi = ATH_RSSI_DUMMY_MARKER;



		if (!common->disable_ani) {

			sc->sc_flags |= SC_OP_ANI_RUN;

			ath_start_ani(common);

		}



	} else {

		sc->sc_flags &= ~SC_OP_ANI_RUN;

		del_timer_sync(&common->ani.timer);
@@ -1973,9 +1981,12 @@ static void ath9k_bss_iter(void *data, u8 *mac, struct ieee80211_vif *vif) 
		sc->last_rssi = ATH_RSSI_DUMMY_MARKER;

		sc->sc_ah->stats.avgbrssi = ATH_RSSI_DUMMY_MARKER;



		if (!common->disable_ani) {

			sc->sc_flags |= SC_OP_ANI_RUN;

			ath_start_ani(common);

		}



	}

}



static void ath9k_config_bss(struct ath_softc *sc, struct ieee80211_vif *vif)
@@ -2043,8 +2054,12 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw, 


		if (bss_conf->ibss_joined) {

			sc->sc_ah->stats.avgbrssi = ATH_RSSI_DUMMY_MARKER;



			if (!common->disable_ani) {

				sc->sc_flags |= SC_OP_ANI_RUN;

				ath_start_ani(common);

			}



		} else {

			sc->sc_flags &= ~SC_OP_ANI_RUN;

			del_timer_sync(&common->ani.timer);