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

Commit bf34e683 authored by Luciano Coelho's avatar Luciano Coelho
Browse files

Merge branch 'wl12xx-next' into for-linville

parents 2eb278e0 3e3947ff

drivers/net/wireless/ti/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ menuconfig WL_TI 
if WL_TI

source "drivers/net/wireless/ti/wl1251/Kconfig"

source "drivers/net/wireless/ti/wl12xx/Kconfig"

source "drivers/net/wireless/ti/wl18xx/Kconfig"



# keep last for automatic dependencies

source "drivers/net/wireless/ti/wlcore/Kconfig"

drivers/net/wireless/ti/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ obj-$(CONFIG_WLCORE) += wlcore/ 
obj-$(CONFIG_WL12XX)			+= wl12xx/

obj-$(CONFIG_WL12XX_PLATFORM_DATA)	+= wlcore/

obj-$(CONFIG_WL1251)			+= wl1251/

obj-$(CONFIG_WL18XX)			+= wl18xx/

drivers/net/wireless/ti/wl12xx/Makefile

+1 −1
Original line number Diff line number Diff line 
wl12xx-objs	= main.o cmd.o acx.o

wl12xx-objs	= main.o cmd.o acx.o debugfs.o



obj-$(CONFIG_WL12XX)		+= wl12xx.o

drivers/net/wireless/ti/wl12xx/acx.h

+237 −0
Original line number Diff line number Diff line
@@ -24,6 +24,21 @@ 
#define __WL12XX_ACX_H__



#include "../wlcore/wlcore.h"

#include "../wlcore/acx.h"



#define WL12XX_ACX_ALL_EVENTS_VECTOR	(WL1271_ACX_INTR_WATCHDOG      | \

					WL1271_ACX_INTR_INIT_COMPLETE | \

					WL1271_ACX_INTR_EVENT_A       | \

					WL1271_ACX_INTR_EVENT_B       | \

					WL1271_ACX_INTR_CMD_COMPLETE  | \

					WL1271_ACX_INTR_HW_AVAILABLE  | \

					WL1271_ACX_INTR_DATA)



#define WL12XX_INTR_MASK		(WL1271_ACX_INTR_WATCHDOG      | \

					WL1271_ACX_INTR_EVENT_A       | \

					WL1271_ACX_INTR_EVENT_B       | \

					WL1271_ACX_INTR_HW_AVAILABLE  | \

					WL1271_ACX_INTR_DATA)



struct wl1271_acx_host_config_bitmap {

	struct acx_header header;
@@ -31,6 +46,228 @@ struct wl1271_acx_host_config_bitmap { 
	__le32 host_cfg_bitmap;

} __packed;



struct wl12xx_acx_tx_statistics {

	__le32 internal_desc_overflow;

}  __packed;



struct wl12xx_acx_rx_statistics {

	__le32 out_of_mem;

	__le32 hdr_overflow;

	__le32 hw_stuck;

	__le32 dropped;

	__le32 fcs_err;

	__le32 xfr_hint_trig;

	__le32 path_reset;

	__le32 reset_counter;

} __packed;



struct wl12xx_acx_dma_statistics {

	__le32 rx_requested;

	__le32 rx_errors;

	__le32 tx_requested;

	__le32 tx_errors;

}  __packed;



struct wl12xx_acx_isr_statistics {

	/* host command complete */

	__le32 cmd_cmplt;



	/* fiqisr() */

	__le32 fiqs;



	/* (INT_STS_ND & INT_TRIG_RX_HEADER) */

	__le32 rx_headers;



	/* (INT_STS_ND & INT_TRIG_RX_CMPLT) */

	__le32 rx_completes;



	/* (INT_STS_ND & INT_TRIG_NO_RX_BUF) */

	__le32 rx_mem_overflow;



	/* (INT_STS_ND & INT_TRIG_S_RX_RDY) */

	__le32 rx_rdys;



	/* irqisr() */

	__le32 irqs;



	/* (INT_STS_ND & INT_TRIG_TX_PROC) */

	__le32 tx_procs;



	/* (INT_STS_ND & INT_TRIG_DECRYPT_DONE) */

	__le32 decrypt_done;



	/* (INT_STS_ND & INT_TRIG_DMA0) */

	__le32 dma0_done;



	/* (INT_STS_ND & INT_TRIG_DMA1) */

	__le32 dma1_done;



	/* (INT_STS_ND & INT_TRIG_TX_EXC_CMPLT) */

	__le32 tx_exch_complete;



	/* (INT_STS_ND & INT_TRIG_COMMAND) */

	__le32 commands;



	/* (INT_STS_ND & INT_TRIG_RX_PROC) */

	__le32 rx_procs;



	/* (INT_STS_ND & INT_TRIG_PM_802) */

	__le32 hw_pm_mode_changes;



	/* (INT_STS_ND & INT_TRIG_ACKNOWLEDGE) */

	__le32 host_acknowledges;



	/* (INT_STS_ND & INT_TRIG_PM_PCI) */

	__le32 pci_pm;



	/* (INT_STS_ND & INT_TRIG_ACM_WAKEUP) */

	__le32 wakeups;



	/* (INT_STS_ND & INT_TRIG_LOW_RSSI) */

	__le32 low_rssi;

} __packed;



struct wl12xx_acx_wep_statistics {

	/* WEP address keys configured */

	__le32 addr_key_count;



	/* default keys configured */

	__le32 default_key_count;



	__le32 reserved;



	/* number of times that WEP key not found on lookup */

	__le32 key_not_found;



	/* number of times that WEP key decryption failed */

	__le32 decrypt_fail;



	/* WEP packets decrypted */

	__le32 packets;



	/* WEP decrypt interrupts */

	__le32 interrupt;

} __packed;



#define ACX_MISSED_BEACONS_SPREAD 10



struct wl12xx_acx_pwr_statistics {

	/* the amount of enters into power save mode (both PD & ELP) */

	__le32 ps_enter;



	/* the amount of enters into ELP mode */

	__le32 elp_enter;



	/* the amount of missing beacon interrupts to the host */

	__le32 missing_bcns;



	/* the amount of wake on host-access times */

	__le32 wake_on_host;



	/* the amount of wake on timer-expire */

	__le32 wake_on_timer_exp;



	/* the number of packets that were transmitted with PS bit set */

	__le32 tx_with_ps;



	/* the number of packets that were transmitted with PS bit clear */

	__le32 tx_without_ps;



	/* the number of received beacons */

	__le32 rcvd_beacons;



	/* the number of entering into PowerOn (power save off) */

	__le32 power_save_off;



	/* the number of entries into power save mode */

	__le16 enable_ps;



	/*

	 * the number of exits from power save, not including failed PS

	 * transitions

	 */

	__le16 disable_ps;



	/*

	 * the number of times the TSF counter was adjusted because

	 * of drift

	 */

	__le32 fix_tsf_ps;



	/* Gives statistics about the spread continuous missed beacons.

	 * The 16 LSB are dedicated for the PS mode.

	 * The 16 MSB are dedicated for the PS mode.

	 * cont_miss_bcns_spread[0] - single missed beacon.

	 * cont_miss_bcns_spread[1] - two continuous missed beacons.

	 * cont_miss_bcns_spread[2] - three continuous missed beacons.

	 * ...

	 * cont_miss_bcns_spread[9] - ten and more continuous missed beacons.

	*/

	__le32 cont_miss_bcns_spread[ACX_MISSED_BEACONS_SPREAD];



	/* the number of beacons in awake mode */

	__le32 rcvd_awake_beacons;

} __packed;



struct wl12xx_acx_mic_statistics {

	__le32 rx_pkts;

	__le32 calc_failure;

} __packed;



struct wl12xx_acx_aes_statistics {

	__le32 encrypt_fail;

	__le32 decrypt_fail;

	__le32 encrypt_packets;

	__le32 decrypt_packets;

	__le32 encrypt_interrupt;

	__le32 decrypt_interrupt;

} __packed;



struct wl12xx_acx_event_statistics {

	__le32 heart_beat;

	__le32 calibration;

	__le32 rx_mismatch;

	__le32 rx_mem_empty;

	__le32 rx_pool;

	__le32 oom_late;

	__le32 phy_transmit_error;

	__le32 tx_stuck;

} __packed;



struct wl12xx_acx_ps_statistics {

	__le32 pspoll_timeouts;

	__le32 upsd_timeouts;

	__le32 upsd_max_sptime;

	__le32 upsd_max_apturn;

	__le32 pspoll_max_apturn;

	__le32 pspoll_utilization;

	__le32 upsd_utilization;

} __packed;



struct wl12xx_acx_rxpipe_statistics {

	__le32 rx_prep_beacon_drop;

	__le32 descr_host_int_trig_rx_data;

	__le32 beacon_buffer_thres_host_int_trig_rx_data;

	__le32 missed_beacon_host_int_trig_rx_data;

	__le32 tx_xfr_host_int_trig_rx_data;

} __packed;



struct wl12xx_acx_statistics {

	struct acx_header header;



	struct wl12xx_acx_tx_statistics tx;

	struct wl12xx_acx_rx_statistics rx;

	struct wl12xx_acx_dma_statistics dma;

	struct wl12xx_acx_isr_statistics isr;

	struct wl12xx_acx_wep_statistics wep;

	struct wl12xx_acx_pwr_statistics pwr;

	struct wl12xx_acx_aes_statistics aes;

	struct wl12xx_acx_mic_statistics mic;

	struct wl12xx_acx_event_statistics event;

	struct wl12xx_acx_ps_statistics ps;

	struct wl12xx_acx_rxpipe_statistics rxpipe;

} __packed;



int wl1271_acx_host_if_cfg_bitmap(struct wl1271 *wl, u32 host_cfg_bitmap);



#endif /* __WL12XX_ACX_H__ */

drivers/net/wireless/ti/wl12xx/cmd.c

+5 −3
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ int wl1271_cmd_general_parms(struct wl1271 *wl) 
	struct wl1271_general_parms_cmd *gen_parms;

	struct wl1271_ini_general_params *gp =

		&((struct wl1271_nvs_file *)wl->nvs)->general_params;

	struct wl12xx_priv *priv = wl->priv;

	bool answer = false;

	int ret;
@@ -88,7 +89,7 @@ int wl1271_cmd_general_parms(struct wl1271 *wl) 
		answer = true;



	/* Override the REF CLK from the NVS with the one from platform data */

	gen_parms->general_params.ref_clock = wl->ref_clock;

	gen_parms->general_params.ref_clock = priv->ref_clock;



	ret = wl1271_cmd_test(wl, gen_parms, sizeof(*gen_parms), answer);

	if (ret < 0) {
@@ -118,6 +119,7 @@ int wl128x_cmd_general_parms(struct wl1271 *wl) 
	struct wl128x_general_parms_cmd *gen_parms;

	struct wl128x_ini_general_params *gp =

		&((struct wl128x_nvs_file *)wl->nvs)->general_params;

	struct wl12xx_priv *priv = wl->priv;

	bool answer = false;

	int ret;
@@ -141,8 +143,8 @@ int wl128x_cmd_general_parms(struct wl1271 *wl) 
		answer = true;



	/* Replace REF and TCXO CLKs with the ones from platform data */

	gen_parms->general_params.ref_clock = wl->ref_clock;

	gen_parms->general_params.tcxo_ref_clock = wl->tcxo_clock;

	gen_parms->general_params.ref_clock = priv->ref_clock;

	gen_parms->general_params.tcxo_ref_clock = priv->tcxo_clock;



	ret = wl1271_cmd_test(wl, gen_parms, sizeof(*gen_parms), answer);

	if (ret < 0) {