wl12xx update for 2.6.32
cover wl12xx update for 2.6.32
Hi John,
here's a patchset for wl12xx. Sorry that it's so huge, 33 patches in total. In the future I will send you patches in smaller sets.
The biggest change is that we had to split wl1251 and wl1271 code. There are so many differences between the chipsets that having a one driver supporting both would be a maintenance nightmare. So we decided to split the drivers and in the future share the few parts which have common functionality.
Also some power save improvements. Power save is not enabled yet, though. I plan to do that soon.
Commit 'mac80211: fix managed mode BSSID handling' broke wl12xx and for now it has to be reverted to get wl12xx working. This is a problem with wl12xx filter handling and I'll fix it next week.
---
Ari Kauppi (2):
wl12xx: Fix CMD_TEST regression via netlink.
wl12xx: Fix incorrect warning message.
Juuso Oikarinen (4):
wl12xx: Use chipset specific join commands
wl12xx: Add support for block reading from a fixed register address
wl12xx: Moved wl1251 TX path implementation into chip specific files
wl12xx: removed chipset interrupt source configuration from fw wakeup
Kalle Valo (20):
wl1251: fix a checkpatch warning
wl1251: use wl1251 prefix everywhere
wl12xx: remove unused wl12xx_hw_init_mem_config()
wl1251: rename wl12xx.h to wl1251.h
wl1251: add wl1251 prefix to all 1251 files
wl1251: remove wl1271_setup()
wl12xx: rename driver to wl1251
wl12xx: rename wl1251.c wl1251_ops.c
wl12xx: enable ELP mode
wl12xx: check if elp wakeup failed
wl12xx: optimise elp wakeup and sleep calls
wl12xx: protect wl12xx_op_set_rts_threshold()
wl12xx: fix rx descriptor use
wl12xx: use wl12xx_mem_read32() to read the rx counter
wl12xx: allocate buffer the spi busy word from struct wl12xx
wl12xx: allocate buffer spi read/write command buffer kzalloc()
wl12xx: reserve buffer for partition command in struct wl12xx
wl12xx: fix error handling in wl12xx_probe()
wl12xx: reserver buffer for read32()/write32() in struct wl12xx
wl12xx: cmd and acx interface rework
Luciano Coelho (6):
wl1251: change psm enabled/disabled info to debug
wl12xx: pass the wake up condition when configuring the wake up event
wl12xx: add support for fixed address in wl12xx_spi_read
wl12xx: add support for new WL1271 chip revision
wl12xx: moved firmware version reading routine to chip-specific functions
wl12xx: add wl12xx_spi_reg_read() and wl12xx_spi_reg_write() functions
Vidhya Govindan (1):
wl12xx: Assign value to rx msdu lifetime variable
drivers/net/wireless/wl12xx/Kconfig | 17 drivers/net/wireless/wl12xx/Makefile | 9 drivers/net/wireless/wl12xx/acx.c | 689 ------------ drivers/net/wireless/wl12xx/acx.h | 1245 ---------------------- drivers/net/wireless/wl12xx/boot.c | 295 ----- drivers/net/wireless/wl12xx/boot.h | 40 - drivers/net/wireless/wl12xx/cmd.c | 353 ------ drivers/net/wireless/wl12xx/cmd.h | 265 ----- drivers/net/wireless/wl12xx/debugfs.c | 508 --------- drivers/net/wireless/wl12xx/debugfs.h | 33 - drivers/net/wireless/wl12xx/event.c | 127 -- drivers/net/wireless/wl12xx/event.h | 121 -- drivers/net/wireless/wl12xx/init.c | 200 ---- drivers/net/wireless/wl12xx/init.h | 40 - drivers/net/wireless/wl12xx/main.c | 1358 ------------------------ drivers/net/wireless/wl12xx/ps.c | 151 --- drivers/net/wireless/wl12xx/ps.h | 36 - drivers/net/wireless/wl12xx/reg.h | 1 drivers/net/wireless/wl12xx/rx.c | 208 ---- drivers/net/wireless/wl12xx/rx.h | 122 -- drivers/net/wireless/wl12xx/spi.c | 358 ------ drivers/net/wireless/wl12xx/spi.h | 109 -- drivers/net/wireless/wl12xx/tx.c | 557 ---------- drivers/net/wireless/wl12xx/tx.h | 215 ---- drivers/net/wireless/wl12xx/wl1251.c | 709 ------------- drivers/net/wireless/wl12xx/wl1251.h | 479 +++++++-- drivers/net/wireless/wl12xx/wl1251_acx.c | 840 +++++++++++++++ drivers/net/wireless/wl12xx/wl1251_acx.h | 1146 +++++++++++++++++++++ drivers/net/wireless/wl12xx/wl1251_boot.c | 297 +++++ drivers/net/wireless/wl12xx/wl1251_boot.h | 40 + drivers/net/wireless/wl12xx/wl1251_cmd.c | 428 ++++++++ drivers/net/wireless/wl12xx/wl1251_cmd.h | 407 +++++++ drivers/net/wireless/wl12xx/wl1251_debugfs.c | 518 +++++++++ drivers/net/wireless/wl12xx/wl1251_debugfs.h | 33 + drivers/net/wireless/wl12xx/wl1251_event.c | 127 ++ drivers/net/wireless/wl12xx/wl1251_event.h | 121 ++ drivers/net/wireless/wl12xx/wl1251_init.c | 200 ++++ drivers/net/wireless/wl12xx/wl1251_init.h | 39 + drivers/net/wireless/wl12xx/wl1251_main.c | 1448 ++++++++++++++++++++++++++ drivers/net/wireless/wl12xx/wl1251_netlink.c | 679 ++++++++++++ drivers/net/wireless/wl12xx/wl1251_netlink.h | 30 + drivers/net/wireless/wl12xx/wl1251_ops.c | 728 +++++++++++++ drivers/net/wireless/wl12xx/wl1251_ops.h | 165 +++ drivers/net/wireless/wl12xx/wl1251_ps.c | 147 +++ drivers/net/wireless/wl12xx/wl1251_ps.h | 36 + drivers/net/wireless/wl12xx/wl1251_rx.c | 195 ++++ drivers/net/wireless/wl12xx/wl1251_rx.h | 124 ++ drivers/net/wireless/wl12xx/wl1251_spi.c | 393 +++++++ drivers/net/wireless/wl12xx/wl1251_spi.h | 115 ++ drivers/net/wireless/wl12xx/wl1251_tx.c | 559 ++++++++++ drivers/net/wireless/wl12xx/wl1251_tx.h | 216 ++++ drivers/net/wireless/wl12xx/wl12xx.h | 409 ------- 52 files changed, 9415 insertions(+), 8270 deletions(-) delete mode 100644 drivers/net/wireless/wl12xx/acx.c delete mode 100644 drivers/net/wireless/wl12xx/acx.h delete mode 100644 drivers/net/wireless/wl12xx/boot.c delete mode 100644 drivers/net/wireless/wl12xx/boot.h delete mode 100644 drivers/net/wireless/wl12xx/cmd.c delete mode 100644 drivers/net/wireless/wl12xx/cmd.h delete mode 100644 drivers/net/wireless/wl12xx/debugfs.c delete mode 100644 drivers/net/wireless/wl12xx/debugfs.h delete mode 100644 drivers/net/wireless/wl12xx/event.c delete mode 100644 drivers/net/wireless/wl12xx/event.h delete mode 100644 drivers/net/wireless/wl12xx/init.c delete mode 100644 drivers/net/wireless/wl12xx/init.h delete mode 100644 drivers/net/wireless/wl12xx/main.c delete mode 100644 drivers/net/wireless/wl12xx/ps.c delete mode 100644 drivers/net/wireless/wl12xx/ps.h delete mode 100644 drivers/net/wireless/wl12xx/rx.c delete mode 100644 drivers/net/wireless/wl12xx/rx.h delete mode 100644 drivers/net/wireless/wl12xx/spi.c delete mode 100644 drivers/net/wireless/wl12xx/spi.h delete mode 100644 drivers/net/wireless/wl12xx/tx.c delete mode 100644 drivers/net/wireless/wl12xx/tx.h delete mode 100644 drivers/net/wireless/wl12xx/wl1251.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_acx.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_acx.h create mode 100644 drivers/net/wireless/wl12xx/wl1251_boot.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_boot.h create mode 100644 drivers/net/wireless/wl12xx/wl1251_cmd.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_cmd.h create mode 100644 drivers/net/wireless/wl12xx/wl1251_debugfs.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_debugfs.h create mode 100644 drivers/net/wireless/wl12xx/wl1251_event.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_event.h create mode 100644 drivers/net/wireless/wl12xx/wl1251_init.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_init.h create mode 100644 drivers/net/wireless/wl12xx/wl1251_main.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_netlink.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_netlink.h create mode 100644 drivers/net/wireless/wl12xx/wl1251_ops.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_ops.h create mode 100644 drivers/net/wireless/wl12xx/wl1251_ps.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_ps.h create mode 100644 drivers/net/wireless/wl12xx/wl1251_rx.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_rx.h create mode 100644 drivers/net/wireless/wl12xx/wl1251_spi.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_spi.h create mode 100644 drivers/net/wireless/wl12xx/wl1251_tx.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_tx.h delete mode 100644 drivers/net/wireless/wl12xx/wl12xx.h
Signature · 1 line
Kalle Valo
PATCH 1/33 wl12xx: cmd and acx interface rework
From: Kalle Valo <[email protected]>
Rework cmd and acx interfaces, it was just too confusing earlier. Now all commands need to contain all the needed headers, either just cmd headers or both cmd and acx headers. This accomplish to remove the extra copy done for each command. The interfaces are now properly documented as well.
Also try to make all commands safe for DMA transfers. I might have missed some, but most of them should be fixed now.
And this is not all! As a free bonus you will also get some cosmetic cleanups and code reorganisation. Order today!
---
drivers/net/wireless/wl12xx/acx.c | 690 +++++++++++++++++++++------------- drivers/net/wireless/wl12xx/acx.h | 126 +----- drivers/net/wireless/wl12xx/cmd.c | 311 ++++++++++----- drivers/net/wireless/wl12xx/cmd.h | 168 ++++++++ drivers/net/wireless/wl12xx/main.c | 87 +++- drivers/net/wireless/wl12xx/ps.c | 2 drivers/net/wireless/wl12xx/ps.h | 2 drivers/net/wireless/wl12xx/rx.c | 27 - drivers/net/wireless/wl12xx/wl1251.c | 74 ++-- 9 files changed, 896 insertions(+), 591 deletions(-)
drivers/net/wireless/wl12xx/acx.c +420 -270
@@ -13,126 +13,160 @@int wl12xx_acx_frame_rates (struct wl12xx *wl,u8 ctrl_rate,u8 ctrl_mod,u8 mgt_rate,u8 mgt_mod) { +struct acx_fw_gen_frame_rates *rates;int ret; -struct acx_fw_gen_frame_rates rates;wl12xx_debug (DEBUG_ACX ,"acx frame rates" ); - rates.header.id =ACX_FW_GEN_FRAME_RATES ; - rates.header.len =sizeof (struct acx_fw_gen_frame_rates ) - -sizeof (struct acx_header ); + rates =kzalloc (sizeof (*rates),GFP_KERNEL ); +if (!rates) { + ret = -ENOMEM ; + goto out; + } - rates.tx_ctrl_frame_rate = ctrl_rate; - rates.tx_ctrl_frame_mod = ctrl_mod; - rates.tx_mgt_frame_rate = mgt_rate; - rates.tx_mgt_frame_mod = mgt_mod; + rates->tx_ctrl_frame_rate = ctrl_rate; + rates->tx_ctrl_frame_mod = ctrl_mod; + rates->tx_mgt_frame_rate = mgt_rate; + rates->tx_mgt_frame_mod = mgt_mod; - ret =wl12xx_cmd_configure (wl, &rates,sizeof (rates)); + ret =wl12xx_cmd_configure (wl,ACX_FW_GEN_FRAME_RATES , + rates,sizeof (*rates));if (ret <0 ) {wl12xx_error ("Failed to set FW rates and modulation" ); -return ret; + goto out; } -return 0 ; +out: +kfree (rates); +return ret; }int wl12xx_acx_station_id (struct wl12xx *wl) { +struct acx_dot11_station_id *mac;int ret, i; -struct dot11_station_id mac;wl12xx_debug (DEBUG_ACX ,"acx dot11_station_id" ); - mac.header.id =DOT11_STATION_ID ; - mac.header.len =sizeof (mac) -sizeof (struct acx_header ); + mac =kzalloc (sizeof (*mac),GFP_KERNEL ); +if (!mac) { + ret = -ENOMEM ; + goto out; + }for (i =0 ; i <ETH_ALEN ; i++) - mac.mac[i] = wl->mac_addr[ETH_ALEN -1 - i]; + mac->mac[i] = wl->mac_addr[ETH_ALEN -1 - i]; - ret =wl12xx_cmd_configure (wl, &mac,sizeof (mac)); + ret =wl12xx_cmd_configure (wl,DOT11_STATION_ID , mac,sizeof (*mac));if (ret <0 ) -return ret; + goto out; -return 0 ; +out: +kfree (mac); +return ret; }int wl12xx_acx_default_key (struct wl12xx *wl,u8 key_id) { -struct acx_dot11_default_key default_key; +struct acx_dot11_default_key *default_key;int ret;wl12xx_debug (DEBUG_ACX ,"acx dot11_default_key (%d)" , key_id); - default_key.header.id =DOT11_DEFAULT_KEY ; - default_key.header.len =sizeof (default_key) - -sizeof (struct acx_header ); + default_key =kzalloc (sizeof (*default_key),GFP_KERNEL ); +if (!default_key) { + ret = -ENOMEM ; + goto out; + } - default_key.id = key_id; + default_key->id = key_id; - ret =wl12xx_cmd_configure (wl, &default_key,sizeof (default_key)); + ret =wl12xx_cmd_configure (wl,DOT11_DEFAULT_KEY , + default_key,sizeof (*default_key));if (ret <0 ) {wl12xx_error ("Couldnt set default key" ); -return ret; + goto out; } wl->default_key = key_id; -return 0 ; +out: +kfree (default_key); +return ret; }int wl12xx_acx_wake_up_conditions (struct wl12xx *wl,u8 listen_interval) { -struct acx_wake_up_condition wake_up; +struct acx_wake_up_condition *wake_up; +int ret;wl12xx_debug (DEBUG_ACX ,"acx wake up conditions" ); - wake_up.header.id =ACX_WAKE_UP_CONDITIONS ; - wake_up.header.len =sizeof (wake_up) -sizeof (struct acx_header ); + wake_up =kzalloc (sizeof (*wake_up),GFP_KERNEL ); +if (!wake_up) { + ret = -ENOMEM ; + goto out; + } - wake_up.wake_up_event =WAKE_UP_EVENT_DTIM_BITMAP ; - wake_up.listen_interval = listen_interval; + wake_up->wake_up_event =WAKE_UP_EVENT_DTIM_BITMAP ; + wake_up->listen_interval = listen_interval; -return wl12xx_cmd_configure (wl, &wake_up,sizeof (wake_up)); + ret =wl12xx_cmd_configure (wl,ACX_WAKE_UP_CONDITIONS , + wake_up,sizeof (*wake_up)); +if (ret <0 ) { +wl12xx_warning ("could not set wake up conditions: %d" , ret); + goto out; + } + +out: +kfree (wake_up); +return ret; }int wl12xx_acx_sleep_auth (struct wl12xx *wl,u8 sleep_auth) { +struct acx_sleep_auth *auth;int ret; -struct acx_sleep_auth auth;wl12xx_debug (DEBUG_ACX ,"acx sleep auth" ); - auth.header.id =ACX_SLEEP_AUTH ; - auth.header.len =sizeof (auth) -sizeof (struct acx_header ); + auth =kzalloc (sizeof (*auth),GFP_KERNEL ); +if (!auth) { + ret = -ENOMEM ; + goto out; + } - auth.sleep_auth = sleep_auth; + auth->sleep_auth = sleep_auth; - ret =wl12xx_cmd_configure (wl, &auth,sizeof (auth)); + ret =wl12xx_cmd_configure (wl,ACX_SLEEP_AUTH , auth,sizeof (*auth));if (ret <0 )return ret; -return 0 ; +out: +kfree (auth); +return ret; }int wl12xx_acx_fw_version (struct wl12xx *wl,char *buf,size_t len) { -struct wl12xx_command cmd;struct acx_revision *rev;int ret;wl12xx_debug (DEBUG_ACX ,"acx fw rev" ); -memset (&cmd,0 ,sizeof (cmd)); + rev =kzalloc (sizeof (*rev),GFP_KERNEL ); +if (!rev) { + ret = -ENOMEM ; + goto out; + } - ret =wl12xx_cmd_interrogate (wl,ACX_FW_REV ,sizeof (*rev), &cmd); + ret =wl12xx_cmd_interrogate (wl,ACX_FW_REV , rev,sizeof (*rev));if (ret <0 ) {wl12xx_warning ("ACX_FW_REV interrogate failed" ); -return ret; + goto out; } - rev = (struct acx_revision *) &cmd.parameters; -/* be careful with the buffer sizes */ strncpy (buf, rev->fw_version,min (len,sizeof (rev->fw_version)));
@@ -143,12 +177,14 @@ int wl12xx_acx_fw_version(struct wl12xx *wl, char *buf, size_t len)*/ buf[min (len,sizeof (rev->fw_version)) -1 ] ='\0' ; -return 0 ; +out: +kfree (rev); +return ret; }int wl12xx_acx_tx_power (struct wl12xx *wl,int power) { -struct acx_current_tx_power ie; +struct acx_current_tx_power *acx;int ret;wl12xx_debug (DEBUG_ACX ,"acx dot11_cur_tx_pwr" );
@@ -156,534 +192,648 @@ int wl12xx_acx_tx_power(struct wl12xx *wl, int power)if (power <0 || power >25 )return -EINVAL ; -memset (&ie,0 ,sizeof (ie)); + acx =kzalloc (sizeof (*acx),GFP_KERNEL ); +if (!acx) { + ret = -ENOMEM ; + goto out; + } - ie.header.id =DOT11_CUR_TX_PWR ; - ie.header.len =sizeof (ie) -sizeof (struct acx_header ); - ie.current_tx_power = power *10 ; + acx->current_tx_power = power *10 ; - ret =wl12xx_cmd_configure (wl, &ie,sizeof (ie)); + ret =wl12xx_cmd_configure (wl,DOT11_CUR_TX_PWR , acx,sizeof (*acx));if (ret <0 ) {wl12xx_warning ("configure of tx power failed: %d" , ret); -return ret; + goto out; } -return 0 ; +out: +kfree (acx); +return ret; }int wl12xx_acx_feature_cfg (struct wl12xx *wl) { -struct acx_feature_config feature; +struct acx_feature_config *feature;int ret;wl12xx_debug (DEBUG_ACX ,"acx feature cfg" ); -memset (&feature,0 ,sizeof (feature)); - - feature.header.id =ACX_FEATURE_CFG ; - feature.header.len =sizeof (feature) -sizeof (struct acx_header ); + feature =kzalloc (sizeof (*feature),GFP_KERNEL ); +if (!feature) { + ret = -ENOMEM ; + goto out; + }/* DF_ENCRYPTION_DISABLE and DF_SNIFF_MODE_ENABLE are disabled */ - feature.data_flow_options =0 ; - feature.options =0 ; + feature->data_flow_options =0 ; + feature->options =0 ; - ret =wl12xx_cmd_configure (wl, &feature,sizeof (feature)); -if (ret <0 ) + ret =wl12xx_cmd_configure (wl,ACX_FEATURE_CFG , + feature,sizeof (*feature)); +if (ret <0 ) {wl12xx_error ("Couldnt set HW encryption" ); + goto out; + } +out: +kfree (feature);return ret; } -int wl12xx_acx_mem_map (struct wl12xx *wl,void *mem_map,size_t len) +int wl12xx_acx_mem_map (struct wl12xx *wl,struct acx_header *mem_map, +size_t len) { -struct wl12xx_command cmd;int ret;wl12xx_debug (DEBUG_ACX ,"acx mem map" ); - ret =wl12xx_cmd_interrogate (wl,ACX_MEM_MAP , len, &cmd); + ret =wl12xx_cmd_interrogate (wl,ACX_MEM_MAP , mem_map, len);if (ret <0 )return ret; -else if (cmd.status !=CMD_STATUS_SUCCESS ) -return -EIO ; - -memcpy (mem_map, &cmd.parameters, len);return 0 ; }int wl12xx_acx_data_path_params (struct wl12xx *wl, -struct acx_data_path_params_resp *data_path) +struct acx_data_path_params_resp *resp) { -struct acx_data_path_params params; -struct wl12xx_command cmd; +struct acx_data_path_params *params;int ret;wl12xx_debug (DEBUG_ACX ,"acx data path params" ); - params.rx_packet_ring_chunk_size =DP_RX_PACKET_RING_CHUNK_SIZE ; - params.tx_packet_ring_chunk_size =DP_TX_PACKET_RING_CHUNK_SIZE ; + params =kzalloc (sizeof (*params),GFP_KERNEL ); +if (!params) { + ret = -ENOMEM ; + goto out; + } - params.rx_packet_ring_chunk_num =DP_RX_PACKET_RING_CHUNK_NUM ; - params.tx_packet_ring_chunk_num =DP_TX_PACKET_RING_CHUNK_NUM ; + params->rx_packet_ring_chunk_size =DP_RX_PACKET_RING_CHUNK_SIZE ; + params->tx_packet_ring_chunk_size =DP_TX_PACKET_RING_CHUNK_SIZE ; - params.tx_complete_threshold =1 ; + params->rx_packet_ring_chunk_num =DP_RX_PACKET_RING_CHUNK_NUM ; + params->tx_packet_ring_chunk_num =DP_TX_PACKET_RING_CHUNK_NUM ; - params.tx_complete_ring_depth =FW_TX_CMPLT_BLOCK_SIZE ; + params->tx_complete_threshold =1 ; - params.tx_complete_timeout =DP_TX_COMPLETE_TIME_OUT ; + params->tx_complete_ring_depth =FW_TX_CMPLT_BLOCK_SIZE ; - params.header.id =ACX_DATA_PATH_PARAMS ; - params.header.len =sizeof (params) -sizeof (struct acx_header ); + params->tx_complete_timeout =DP_TX_COMPLETE_TIME_OUT ; - ret =wl12xx_cmd_configure (wl, ¶ms,sizeof (params)); + ret =wl12xx_cmd_configure (wl,ACX_DATA_PATH_PARAMS , + params,sizeof (*params));if (ret <0 ) -return ret; - + goto out; +/* FIXME: shouldn't this be ACX_DATA_PATH_RESP_PARAMS? */ ret =wl12xx_cmd_interrogate (wl,ACX_DATA_PATH_PARAMS , -sizeof (struct acx_data_path_params_resp ), - &cmd); + resp,sizeof (*resp));if (ret <0 ) {wl12xx_warning ("failed to read data path parameters: %d" , ret); -return ret; - }else if (cmd.status !=CMD_STATUS_SUCCESS ) { + goto out; + }else if (resp->header.cmd.status !=CMD_STATUS_SUCCESS ) {wl12xx_warning ("data path parameter acx status failed" ); -return -EIO ; + ret = -EIO ; + goto out; } -memcpy (data_path, &cmd.parameters,sizeof (*data_path)); - -return 0 ; +out: +kfree (params); +return ret; }int wl12xx_acx_rx_msdu_life_time (struct wl12xx *wl,u32 life_time) { -struct rx_msdu_lifetime msdu_lifetime; +struct acx_rx_msdu_lifetime *acx;int ret;wl12xx_debug (DEBUG_ACX ,"acx rx msdu life time" ); - msdu_lifetime.header.id =DOT11_RX_MSDU_LIFE_TIME ; - msdu_lifetime.header.len =sizeof (msdu_lifetime) - -sizeof (struct acx_header ); - msdu_lifetime.lifetime = life_time; + acx =kzalloc (sizeof (*acx),GFP_KERNEL ); +if (!acx) { + ret = -ENOMEM ; + goto out; + } - ret =wl12xx_cmd_configure (wl, &msdu_lifetime,sizeof (msdu_lifetime)); + ret =wl12xx_cmd_configure (wl,DOT11_RX_MSDU_LIFE_TIME , + acx,sizeof (*acx));if (ret <0 ) {wl12xx_warning ("failed to set rx msdu life time: %d" , ret); -return ret; + goto out; } -return 0 ; +out: +kfree (acx); +return ret; }int wl12xx_acx_rx_config (struct wl12xx *wl,u32 config,u32 filter) { -struct acx_rx_config rx_config; +struct acx_rx_config *rx_config;int ret;wl12xx_debug (DEBUG_ACX ,"acx rx config" ); - rx_config.header.id =ACX_RX_CFG ; - rx_config.header.len =sizeof (rx_config) -sizeof (struct acx_header ); - rx_config.config_options = config; - rx_config.filter_options = filter; + rx_config =kzalloc (sizeof (*rx_config),GFP_KERNEL ); +if (!rx_config) { + ret = -ENOMEM ; + goto out; + } + + rx_config->config_options = config; + rx_config->filter_options = filter; - ret =wl12xx_cmd_configure (wl, &rx_config,sizeof (rx_config)); + ret =wl12xx_cmd_configure (wl,ACX_RX_CFG , + rx_config,sizeof (*rx_config));if (ret <0 ) {wl12xx_warning ("failed to set rx config: %d" , ret); -return ret; + goto out; } -return 0 ; +out: +kfree (rx_config); +return ret; }int wl12xx_acx_pd_threshold (struct wl12xx *wl) { -struct acx_packet_detection packet_detection; +struct acx_packet_detection *pd;int ret;wl12xx_debug (DEBUG_ACX ,"acx data pd threshold" ); + pd =kzalloc (sizeof (*pd),GFP_KERNEL ); +if (!pd) { + ret = -ENOMEM ; + goto out; + } +/* FIXME: threshold value not set */ - packet_detection.header.id =ACX_PD_THRESHOLD ; - packet_detection.header.len =sizeof (packet_detection) - -sizeof (struct acx_header ); - ret =wl12xx_cmd_configure (wl, &packet_detection, -sizeof (packet_detection)); + ret =wl12xx_cmd_configure (wl,ACX_PD_THRESHOLD , pd,sizeof (*pd));if (ret <0 ) {wl12xx_warning ("failed to set pd threshold: %d" , ret); -return ret; + goto out; } +out: +kfree (pd);return 0 ; }int wl12xx_acx_slot (struct wl12xx *wl,enum acx_slot_type slot_time) { -struct acx_slot slot; +struct acx_slot *slot;int ret;wl12xx_debug (DEBUG_ACX ,"acx slot" ); - slot.header.id =ACX_SLOT ; - slot.header.len =sizeof (slot) -sizeof (struct acx_header ); + slot =kzalloc (sizeof (*slot),GFP_KERNEL ); +if (!slot) { + ret = -ENOMEM ; + goto out; + } - slot.wone_index =STATION_WONE_INDEX ; - slot.slot_time = slot_time; + slot->wone_index =STATION_WONE_INDEX ; + slot->slot_time = slot_time; - ret =wl12xx_cmd_configure (wl, &slot,sizeof (slot)); + ret =wl12xx_cmd_configure (wl,ACX_SLOT , slot,sizeof (*slot));if (ret <0 ) {wl12xx_warning ("failed to set slot time: %d" , ret); -return ret; + goto out; } -return 0 ; +out: +kfree (slot); +return ret; }int wl12xx_acx_group_address_tbl (struct wl12xx *wl) { -struct multicast_grp_addr_start multicast; +struct acx_dot11_grp_addr_tbl *acx;int ret;wl12xx_debug (DEBUG_ACX ,"acx group address tbl" ); -/* MAC filtering */ - multicast.header.id =DOT11_GROUP_ADDRESS_TBL ; - multicast.header.len =sizeof (multicast) -sizeof (struct acx_header ); + acx =kzalloc (sizeof (*acx),GFP_KERNEL ); +if (!acx) { + ret = -ENOMEM ; + goto out; + } - multicast.enabled =0 ; - multicast.num_groups =0 ; -memset (multicast.mac_table,0 ,ADDRESS_GROUP_MAX_LEN ); +/* MAC filtering */ + acx->enabled =0 ; + acx->num_groups =0 ; +memset (acx->mac_table,0 ,ADDRESS_GROUP_MAX_LEN ); - ret =wl12xx_cmd_configure (wl, &multicast,sizeof (multicast)); + ret =wl12xx_cmd_configure (wl,DOT11_GROUP_ADDRESS_TBL , + acx,sizeof (*acx));if (ret <0 ) {wl12xx_warning ("failed to set group addr table: %d" , ret); -return ret; + goto out; } -return 0 ; +out: +kfree (acx); +return ret; }int wl12xx_acx_service_period_timeout (struct wl12xx *wl) { -struct acx_rx_timeout rx_timeout; +struct acx_rx_timeout *rx_timeout;int ret; -wl12xx_debug (DEBUG_ACX ,"acx service period timeout" ); + rx_timeout =kzalloc (sizeof (*rx_timeout),GFP_KERNEL ); +if (!rx_timeout) { + ret = -ENOMEM ; + goto out; + } -/* RX timeout */ - rx_timeout.header.id =ACX_SERVICE_PERIOD_TIMEOUT ; - rx_timeout.header.len =sizeof (rx_timeout) -sizeof (struct acx_header ); +wl12xx_debug (DEBUG_ACX ,"acx service period timeout" ); - rx_timeout.ps_poll_timeout =RX_TIMEOUT_PS_POLL_DEF ; - rx_timeout.upsd_timeout =RX_TIMEOUT_UPSD_DEF ; + rx_timeout->ps_poll_timeout =RX_TIMEOUT_PS_POLL_DEF ; + rx_timeout->upsd_timeout =RX_TIMEOUT_UPSD_DEF ; - ret =wl12xx_cmd_configure (wl, &rx_timeout,sizeof (rx_timeout)); + ret =wl12xx_cmd_configure (wl,ACX_SERVICE_PERIOD_TIMEOUT , + rx_timeout,sizeof (*rx_timeout));if (ret <0 ) {wl12xx_warning ("failed to set service period timeout: %d" , ret); -return ret; + goto out; } -return 0 ; +out: +kfree (rx_timeout); +return ret; }int wl12xx_acx_rts_threshold (struct wl12xx *wl,u16 rts_threshold) { -struct acx_rts_threshold rts; +struct acx_rts_threshold *rts;int ret;wl12xx_debug (DEBUG_ACX ,"acx rts threshold" ); - rts.header.id =DOT11_RTS_THRESHOLD ; - rts.header.len =sizeof (rts) -sizeof (struct acx_header ); + rts =kzalloc (sizeof (*rts),GFP_KERNEL ); +if (!rts) { + ret = -ENOMEM ; + goto out; + } - rts.threshold = rts_threshold; + rts->threshold = rts_threshold; - ret =wl12xx_cmd_configure (wl, &rts,sizeof (rts)); + ret =wl12xx_cmd_configure (wl,DOT11_RTS_THRESHOLD , rts,sizeof (*rts));if (ret <0 ) {wl12xx_warning ("failed to set rts threshold: %d" , ret); -return ret; + goto out; } -return 0 ; +out: +kfree (rts); +return ret; }int wl12xx_acx_beacon_filter_opt (struct wl12xx *wl) { -struct acx_beacon_filter_option beacon_filter; +struct acx_beacon_filter_option *beacon_filter;int ret;wl12xx_debug (DEBUG_ACX ,"acx beacon filter opt" ); - beacon_filter.header.id =ACX_BEACON_FILTER_OPT ; - beacon_filter.header.len =sizeof (beacon_filter) - -sizeof (struct acx_header ); + beacon_filter =kzalloc (sizeof (*beacon_filter),GFP_KERNEL ); +if (!beacon_filter) { + ret = -ENOMEM ; + goto out; + } - beacon_filter.enable =0 ; - beacon_filter.max_num_beacons =0 ; + beacon_filter->enable =0 ; + beacon_filter->max_num_beacons =0 ; - ret =wl12xx_cmd_configure (wl, &beacon_filter,sizeof (beacon_filter)); + ret =wl12xx_cmd_configure (wl,ACX_BEACON_FILTER_OPT , + beacon_filter,sizeof (*beacon_filter));if (ret <0 ) {wl12xx_warning ("failed to set beacon filter opt: %d" , ret); -return ret; + goto out; } -return 0 ; +out: +kfree (beacon_filter); +return ret; }int wl12xx_acx_beacon_filter_table (struct wl12xx *wl) { -struct acx_beacon_filter_ie_table ie_table; +struct acx_beacon_filter_ie_table *ie_table;int ret;wl12xx_debug (DEBUG_ACX ,"acx beacon filter table" ); - ie_table.header.id =ACX_BEACON_FILTER_TABLE ; - ie_table.header.len =sizeof (ie_table) -sizeof (struct acx_header ); + ie_table =kzalloc (sizeof (*ie_table),GFP_KERNEL ); +if (!ie_table) { + ret = -ENOMEM ; + goto out; + } - ie_table.num_ie =0 ; -memset (ie_table.table,0 ,BEACON_FILTER_TABLE_MAX_SIZE ); + ie_table->num_ie =0 ; +memset (ie_table->table,0 ,BEACON_FILTER_TABLE_MAX_SIZE ); - ret =wl12xx_cmd_configure (wl, &ie_table,sizeof (ie_table)); + ret =wl12xx_cmd_configure (wl,ACX_BEACON_FILTER_TABLE , + ie_table,sizeof (*ie_table));if (ret <0 ) {wl12xx_warning ("failed to set beacon filter table: %d" , ret); -return ret; + goto out; } -return 0 ; +out: +kfree (ie_table); +return ret; }int wl12xx_acx_sg_enable (struct wl12xx *wl) { -struct acx_bt_wlan_coex pta; +struct acx_bt_wlan_coex *pta;int ret;wl12xx_debug (DEBUG_ACX ,"acx sg enable" ); - pta.header.id =ACX_SG_ENABLE ; - pta.header.len =sizeof (pta) -sizeof (struct acx_header ); + pta =kzalloc (sizeof (*pta),GFP_KERNEL ); +if (!pta) { + ret = -ENOMEM ; + goto out; + } - pta.enable =SG_ENABLE ; + pta->enable =SG_ENABLE ; - ret =wl12xx_cmd_configure (wl, &pta,sizeof (pta)); + ret =wl12xx_cmd_configure (wl,ACX_SG_ENABLE , pta,sizeof (*pta));if (ret <0 ) {wl12xx_warning ("failed to set softgemini enable: %d" , ret); -return ret; + goto out; } -return 0 ; +out: +kfree (pta); +return ret; }int wl12xx_acx_sg_cfg (struct wl12xx *wl) { -struct acx_bt_wlan_coex_param param; +struct acx_bt_wlan_coex_param *param;int ret;wl12xx_debug (DEBUG_ACX ,"acx sg cfg" ); + param =kzalloc (sizeof (*param),GFP_KERNEL ); +if (!param) { + ret = -ENOMEM ; + goto out; + } +/* BT-WLAN coext parameters */ - param.header.id =ACX_SG_CFG ; - param.header.len =sizeof (param) -sizeof (struct acx_header ); - - param.min_rate =RATE_INDEX_24MBPS ; - param.bt_hp_max_time =PTA_BT_HP_MAXTIME_DEF ; - param.wlan_hp_max_time =PTA_WLAN_HP_MAX_TIME_DEF ; - param.sense_disable_timer =PTA_SENSE_DISABLE_TIMER_DEF ; - param.rx_time_bt_hp =PTA_PROTECTIVE_RX_TIME_DEF ; - param.tx_time_bt_hp =PTA_PROTECTIVE_TX_TIME_DEF ; - param.rx_time_bt_hp_fast =PTA_PROTECTIVE_RX_TIME_FAST_DEF ; - param.tx_time_bt_hp_fast =PTA_PROTECTIVE_TX_TIME_FAST_DEF ; - param.wlan_cycle_fast =PTA_CYCLE_TIME_FAST_DEF ; - param.bt_anti_starvation_period =PTA_ANTI_STARVE_PERIOD_DEF ; - param.next_bt_lp_packet =PTA_TIMEOUT_NEXT_BT_LP_PACKET_DEF ; - param.wake_up_beacon =PTA_TIME_BEFORE_BEACON_DEF ; - param.hp_dm_max_guard_time =PTA_HPDM_MAX_TIME_DEF ; - param.next_wlan_packet =PTA_TIME_OUT_NEXT_WLAN_DEF ; - param.antenna_type =PTA_ANTENNA_TYPE_DEF ; - param.signal_type =PTA_SIGNALING_TYPE_DEF ; - param.afh_leverage_on =PTA_AFH_LEVERAGE_ON_DEF ; - param.quiet_cycle_num =PTA_NUMBER_QUIET_CYCLE_DEF ; - param.max_cts =PTA_MAX_NUM_CTS_DEF ; - param.wlan_packets_num =PTA_NUMBER_OF_WLAN_PACKETS_DEF ; - param.bt_packets_num =PTA_NUMBER_OF_BT_PACKETS_DEF ; - param.missed_rx_avalanche =PTA_RX_FOR_AVALANCHE_DEF ; - param.wlan_elp_hp =PTA_ELP_HP_DEF ; - param.bt_anti_starvation_cycles =PTA_ANTI_STARVE_NUM_CYCLE_DEF ; - param.ack_mode_dual_ant =PTA_ACK_MODE_DEF ; - param.pa_sd_enable =PTA_ALLOW_PA_SD_DEF ; - param.pta_auto_mode_enable =PTA_AUTO_MODE_NO_CTS_DEF ; - param.bt_hp_respected_num =PTA_BT_HP_RESPECTED_DEF ; - - ret =wl12xx_cmd_configure (wl, ¶m,sizeof (param)); + param->min_rate =RATE_INDEX_24MBPS ; + param->bt_hp_max_time =PTA_BT_HP_MAXTIME_DEF ; + param->wlan_hp_max_time =PTA_WLAN_HP_MAX_TIME_DEF ; + param->sense_disable_timer =PTA_SENSE_DISABLE_TIMER_DEF ; + param->rx_time_bt_hp =PTA_PROTECTIVE_RX_TIME_DEF ; + param->tx_time_bt_hp =PTA_PROTECTIVE_TX_TIME_DEF ; + param->rx_time_bt_hp_fast =PTA_PROTECTIVE_RX_TIME_FAST_DEF ; + param->tx_time_bt_hp_fast =PTA_PROTECTIVE_TX_TIME_FAST_DEF ; + param->wlan_cycle_fast =PTA_CYCLE_TIME_FAST_DEF ; + param->bt_anti_starvation_period =PTA_ANTI_STARVE_PERIOD_DEF ; + param->next_bt_lp_packet =PTA_TIMEOUT_NEXT_BT_LP_PACKET_DEF ; + param->wake_up_beacon =PTA_TIME_BEFORE_BEACON_DEF ; + param->hp_dm_max_guard_time =PTA_HPDM_MAX_TIME_DEF ; + param->next_wlan_packet =PTA_TIME_OUT_NEXT_WLAN_DEF ; + param->antenna_type =PTA_ANTENNA_TYPE_DEF ; + param->signal_type =PTA_SIGNALING_TYPE_DEF ; + param->afh_leverage_on =PTA_AFH_LEVERAGE_ON_DEF ; + param->quiet_cycle_num =PTA_NUMBER_QUIET_CYCLE_DEF ; + param->max_cts =PTA_MAX_NUM_CTS_DEF ; + param->wlan_packets_num =PTA_NUMBER_OF_WLAN_PACKETS_DEF ; + param->bt_packets_num =PTA_NUMBER_OF_BT_PACKETS_DEF ; + param->missed_rx_avalanche =PTA_RX_FOR_AVALANCHE_DEF ; + param->wlan_elp_hp =PTA_ELP_HP_DEF ; + param->bt_anti_starvation_cycles =PTA_ANTI_STARVE_NUM_CYCLE_DEF ; + param->ack_mode_dual_ant =PTA_ACK_MODE_DEF ; + param->pa_sd_enable =PTA_ALLOW_PA_SD_DEF ; + param->pta_auto_mode_enable =PTA_AUTO_MODE_NO_CTS_DEF ; + param->bt_hp_respected_num =PTA_BT_HP_RESPECTED_DEF ; + + ret =wl12xx_cmd_configure (wl,ACX_SG_CFG , param,sizeof (*param));if (ret <0 ) {wl12xx_warning ("failed to set sg config: %d" , ret); -return ret; + goto out; } -return 0 ; +out: +kfree (param); +return ret; }int wl12xx_acx_cca_threshold (struct wl12xx *wl) { -struct acx_energy_detection detection; +struct acx_energy_detection *detection;int ret;wl12xx_debug (DEBUG_ACX ,"acx cca threshold" ); - detection.header.id =ACX_CCA_THRESHOLD ; - detection.header.len =sizeof (detection) -sizeof (struct acx_header ); + detection =kzalloc (sizeof (*detection),GFP_KERNEL ); +if (!detection) { + ret = -ENOMEM ; + goto out; + } - detection.rx_cca_threshold =CCA_THRSH_DISABLE_ENERGY_D ; - detection.tx_energy_detection =0 ; + detection->rx_cca_threshold =CCA_THRSH_DISABLE_ENERGY_D ; + detection->tx_energy_detection =0 ; - ret =wl12xx_cmd_configure (wl, &detection,sizeof (detection)); + ret =wl12xx_cmd_configure (wl,ACX_CCA_THRESHOLD , + detection,sizeof (*detection));if (ret <0 ) {wl12xx_warning ("failed to set cca threshold: %d" , ret);return ret; } -return 0 ; +out: +kfree (detection); +return ret; }int wl12xx_acx_bcn_dtim_options (struct wl12xx *wl) { -struct acx_beacon_broadcast bb; +struct acx_beacon_broadcast *bb;int ret;wl12xx_debug (DEBUG_ACX ,"acx bcn dtim options" ); - bb.header.id =ACX_BCN_DTIM_OPTIONS ; - bb.header.len =sizeof (bb) -sizeof (struct acx_header ); + bb =kzalloc (sizeof (*bb),GFP_KERNEL ); +if (!bb) { + ret = -ENOMEM ; + goto out; + } - bb.beacon_rx_timeout =BCN_RX_TIMEOUT_DEF_VALUE ; - bb.broadcast_timeout =BROADCAST_RX_TIMEOUT_DEF_VALUE ; - bb.rx_broadcast_in_ps =RX_BROADCAST_IN_PS_DEF_VALUE ; - bb.ps_poll_threshold =CONSECUTIVE_PS_POLL_FAILURE_DEF ; + bb->beacon_rx_timeout =BCN_RX_TIMEOUT_DEF_VALUE ; + bb->broadcast_timeout =BROADCAST_RX_TIMEOUT_DEF_VALUE ; + bb->rx_broadcast_in_ps =RX_BROADCAST_IN_PS_DEF_VALUE ; + bb->ps_poll_threshold =CONSECUTIVE_PS_POLL_FAILURE_DEF ; - ret =wl12xx_cmd_configure (wl, &bb,sizeof (bb)); + ret =wl12xx_cmd_configure (wl,ACX_BCN_DTIM_OPTIONS , bb,sizeof (*bb));if (ret <0 ) {wl12xx_warning ("failed to set rx config: %d" , ret); -return ret; + goto out; } -return 0 ; +out: +kfree (bb); +return ret; }int wl12xx_acx_aid (struct wl12xx *wl,u16 aid) { -struct acx_aid acx_aid; +struct acx_aid *acx_aid;int ret;wl12xx_debug (DEBUG_ACX ,"acx aid" ); - acx_aid.header.id =ACX_AID ; - acx_aid.header.len =sizeof (acx_aid) -sizeof (struct acx_header ); + acx_aid =kzalloc (sizeof (*acx_aid),GFP_KERNEL ); +if (!acx_aid) { + ret = -ENOMEM ; + goto out; + } - acx_aid.aid = aid; + acx_aid->aid = aid; - ret =wl12xx_cmd_configure (wl, &acx_aid,sizeof (acx_aid)); + ret =wl12xx_cmd_configure (wl,ACX_AID , acx_aid,sizeof (*acx_aid));if (ret <0 ) {wl12xx_warning ("failed to set aid: %d" , ret); -return ret; + goto out; } -return 0 ; +out: +kfree (acx_aid); +return ret; }int wl12xx_acx_event_mbox_mask (struct wl12xx *wl,u32 event_mask) { -struct acx_event_mask mask; +struct acx_event_mask *mask;int ret;wl12xx_debug (DEBUG_ACX ,"acx event mbox mask" ); - mask.header.id =ACX_EVENT_MBOX_MASK ; - mask.header.len =sizeof (mask) -sizeof (struct acx_header ); + mask =kzalloc (sizeof (*mask),GFP_KERNEL ); +if (!mask) { + ret = -ENOMEM ; + goto out; + }/* high event mask is unused */ - mask.high_event_mask =0xffffffff ; + mask->high_event_mask =0xffffffff ; - mask.event_mask = event_mask; + mask->event_mask = event_mask; - ret =wl12xx_cmd_configure (wl, &mask,sizeof (mask)); + ret =wl12xx_cmd_configure (wl,ACX_EVENT_MBOX_MASK , + mask,sizeof (*mask));if (ret <0 ) {wl12xx_warning ("failed to set aid: %d" , ret); -return ret; + goto out; } -return 0 ; +out: +kfree (mask); +return ret; }int wl12xx_acx_set_preamble (struct wl12xx *wl,enum acx_preamble_type preamble) { -struct acx_preamble ie; +struct acx_preamble *acx;int ret;wl12xx_debug (DEBUG_ACX ,"acx_set_preamble" ); -memset (&ie,0 ,sizeof (ie)); + acx =kzalloc (sizeof (*acx),GFP_KERNEL ); +if (!acx) { + ret = -ENOMEM ; + goto out; + } - ie.header.id =ACX_PREAMBLE_TYPE ; - ie.header.len =sizeof (ie) -sizeof (struct acx_header ); - ie.preamble = preamble; - ret =wl12xx_cmd_configure (wl, &ie,sizeof (ie)); + acx->preamble = preamble; + + ret =wl12xx_cmd_configure (wl,ACX_PREAMBLE_TYPE , acx,sizeof (*acx));if (ret <0 ) {wl12xx_warning ("Setting of preamble failed: %d" , ret); -return ret; + goto out; } -return 0 ; + +out: +kfree (acx); +return ret; }int wl12xx_acx_cts_protect (struct wl12xx *wl,enum acx_ctsprotect_type ctsprotect) { -struct acx_ctsprotect ie; +struct acx_ctsprotect *acx;int ret;wl12xx_debug (DEBUG_ACX ,"acx_set_ctsprotect" ); -memset (&ie,0 ,sizeof (ie)); + acx =kzalloc (sizeof (*acx),GFP_KERNEL ); +if (!acx) { + ret = -ENOMEM ; + goto out; + } + + acx->ctsprotect = ctsprotect; - ie.header.id =ACX_CTS_PROTECTION ; - ie.header.len =sizeof (ie) -sizeof (struct acx_header ); - ie.ctsprotect = ctsprotect; - ret =wl12xx_cmd_configure (wl, &ie,sizeof (ie)); + ret =wl12xx_cmd_configure (wl,ACX_CTS_PROTECTION , acx,sizeof (*acx));if (ret <0 ) {wl12xx_warning ("Setting of ctsprotect failed: %d" , ret); -return ret; + goto out; } -return 0 ; + +out: +kfree (acx); +return ret; } -int wl12xx_acx_statistics (struct wl12xx *wl,struct acx_statistics *stats) +int wl12xx_acx_tsf_info (struct wl12xx *wl,u64 *mactime) { -struct wl12xx_command *answer; +struct acx_tsf_info *tsf_info;int ret; -wl12xx_debug (DEBUG_ACX ,"acx statistics" ); - - answer =kmalloc (sizeof (*answer),GFP_KERNEL ); -if (!answer) { -wl12xx_warning ("could not allocate memory for acx statistics" ); + tsf_info =kzalloc (sizeof (*tsf_info),GFP_KERNEL ); +if (!tsf_info) { ret = -ENOMEM ; goto out; } - ret =wl12xx_cmd_interrogate (wl,ACX_STATISTICS ,sizeof (*answer), - answer); + ret =wl12xx_cmd_interrogate (wl,ACX_TSF_INFO , + tsf_info,sizeof (*tsf_info));if (ret <0 ) { -wl12xx_warning ("acx statistics failed: %d" , ret); +wl12xx_warning ("ACX_FW_REV interrogate failed" ); goto out; } -memcpy (stats, answer->parameters,sizeof (*stats)); + *mactime = tsf_info->current_tsf_lsb | + (tsf_info->current_tsf_msb <<31 ); out: -kfree (answer); +kfree (tsf_info);return ret; } + +int wl12xx_acx_statistics (struct wl12xx *wl,struct acx_statistics *stats) +{ +int ret; + +wl12xx_debug (DEBUG_ACX ,"acx statistics" ); + + ret =wl12xx_cmd_interrogate (wl,ACX_STATISTICS , stats, +sizeof (*stats)); +if (ret <0 ) { +wl12xx_warning ("acx statistics failed: %d" , ret); +return -ENOMEM ; + } + +return 0 ; +}
drivers/net/wireless/wl12xx/acx.h +13 -113
195 lines not on this page · raw message
drivers/net/wireless/wl12xx/cmd.c +206 -105
518 lines not on this page · raw message
drivers/net/wireless/wl12xx/cmd.h +155 -13
218 lines not on this page · raw message
drivers/net/wireless/wl12xx/main.c +53 -34
171 lines not on this page · raw message
drivers/net/wireless/wl12xx/ps.c +1 -1
@@ -114,7 +114,7 @@ static int wl12xx_ps_set_elp(struct wl12xx *wl, bool enable)return 0 ; } -int wl12xx_ps_set_mode (struct wl12xx *wl,enum acx_ps_mode mode) +int wl12xx_ps_set_mode (struct wl12xx *wl,enum wl12xx_cmd_ps_mode mode) {int ret;
drivers/net/wireless/wl12xx/ps.h +1 -1
@@ -28,7 +28,7 @@#include "wl12xx.h" #include "acx.h" -int wl12xx_ps_set_mode (struct wl12xx *wl,enum acx_ps_mode mode); +int wl12xx_ps_set_mode (struct wl12xx *wl,enum wl12xx_cmd_ps_mode mode);void wl12xx_ps_elp_sleep (struct wl12xx *wl);int wl12xx_ps_elp_wakeup (struct wl12xx *wl);
drivers/net/wireless/wl12xx/rx.c +6 -21
@@ -48,6 +48,9 @@ static void wl12xx_rx_status(struct wl12xx *wl, struct ieee80211_rx_status *status, u8 beacon) { +u64 mactime; +int ret; +memset (status,0 ,sizeof (struct ieee80211_rx_status )); status->band =IEEE80211_BAND_2GHZ ;
@@ -62,27 +65,9 @@ static void wl12xx_rx_status(struct wl12xx *wl,* this one must be atomic, while our SPI routines can sleep. */ if ((wl->bss_type ==BSS_TYPE_IBSS ) && beacon) { -u64 mactime; -int ret; -struct wl12xx_command cmd; -struct acx_tsf_info *tsf_info; - -memset (&cmd,0 ,sizeof (cmd)); - - ret =wl12xx_cmd_interrogate (wl,ACX_TSF_INFO , -sizeof (struct acx_tsf_info ), - &cmd); -if (ret <0 ) { -wl12xx_warning ("ACX_FW_REV interrogate failed" ); -return ; - } - - tsf_info = (struct acx_tsf_info *)&(cmd.parameters); - - mactime = tsf_info->current_tsf_lsb | - (tsf_info->current_tsf_msb <<31 ); - - status->mactime = mactime; + ret =wl12xx_acx_tsf_info (wl, &mactime); +if (ret ==0 ) + status->mactime = mactime; } status->signal = desc->rssi;
drivers/net/wireless/wl12xx/wl1251.c +41 -33
114 lines not on this page · raw message
PATCH 2/33 wl12xx: reserver buffer for read32()/write32() in struct wl12xx
In reply to Kalle ValoFrom: Kalle Valo <[email protected]>
The buffer is needed for DMA safe transfers.
---
drivers/net/wireless/wl12xx/spi.h | 9 ++++----- drivers/net/wireless/wl12xx/wl12xx.h | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/net/wireless/wl12xx/spi.h +4 -5
@@ -94,16 +94,15 @@ void wl12xx_set_partition(struct wl12xx *wl,static inline u32 wl12xx_read32 (struct wl12xx *wl,int addr) { -u32 response; +wl12xx_spi_read (wl, addr, &wl->buffer_32,sizeof (wl->buffer_32)); -wl12xx_spi_read (wl, addr, &response,sizeof (u32)); - -return response; +return wl->buffer_32; }static inline void wl12xx_write32 (struct wl12xx *wl,int addr,u32 val) { -wl12xx_spi_write (wl, addr, &val,sizeof (u32)); + wl->buffer_32 = val; +wl12xx_spi_write (wl, addr, &wl->buffer_32,sizeof (wl->buffer_32)); }#endif /* __WL12XX_SPI_H__ */
drivers/net/wireless/wl12xx/wl12xx.h +2 -0
@@ -382,6 +382,8 @@ struct wl12xx {struct wl12xx_stats stats;struct wl12xx_debugfs debugfs; + +u32 buffer_32; };int wl12xx_plt_start (struct wl12xx *wl);
PATCH 3/33 wl12xx: fix error handling in wl12xx_probe()
In reply to Kalle ValoFrom: Kalle Valo <[email protected]>
Resources were not freed properly in some cases.
---
drivers/net/wireless/wl12xx/main.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/wl12xx/main.c +4 -2
@@ -1274,13 +1274,15 @@ static int __devinit wl12xx_probe(struct spi_device *spi) wl->set_power = pdata->set_power;if (!wl->set_power) {wl12xx_error ("set power function missing in platform data" ); -return -ENODEV ; + ret = -ENODEV ; + goto out_free; } wl->irq = spi->irq;if (wl->irq <0 ) {wl12xx_error ("irq missing in platform data" ); -return -ENODEV ; + ret = -ENODEV ; + goto out_free; } ret =request_irq (wl->irq, wl12xx_irq,0 ,DRIVER_NAME , wl);
PATCH 4/33 wl12xx: reserve buffer for partition command in struct wl12xx
In reply to Kalle ValoFrom: Kalle Valo <[email protected]>
This is now DMA safe.
---
drivers/net/wireless/wl12xx/spi.c | 22 ++++++++++++++-------- drivers/net/wireless/wl12xx/spi.h | 6 +++--- 2 files changed, 17 insertions(+), 11 deletions(-)
drivers/net/wireless/wl12xx/spi.c +14 -8
@@ -167,24 +167,26 @@ void wl12xx_spi_init(struct wl12xx *wl)* | | * */ -void wl12xx_set_partition (struct wl12xx *wl, +int wl12xx_set_partition (struct wl12xx *wl,u32 mem_start,u32 mem_size,u32 reg_start,u32 reg_size) { -u8 tx_buf[sizeof (u32) +2 *sizeof (struct wl12xx_partition )];struct wl12xx_partition *partition;struct spi_transfer t;struct spi_message m; +size_t len, cmd_len;u32 *cmd; -size_t len;int addr; + cmd_len =sizeof (u32) +2 *sizeof (struct wl12xx_partition ); + cmd =kzalloc (cmd_len,GFP_KERNEL ); +if (!cmd) +return -ENOMEM ; +spi_message_init (&m);memset (&t,0 ,sizeof (t)); -memset (tx_buf,0 ,sizeof (tx_buf)); - cmd = (u32 *) tx_buf; - partition = (struct wl12xx_partition *) (tx_buf +sizeof (u32)); + partition = (struct wl12xx_partition *) (cmd +1 ); addr =HW_ACCESS_PART0_SIZE_ADDR ; len =2 *sizeof (struct wl12xx_partition );
@@ -244,11 +246,15 @@ void wl12xx_set_partition(struct wl12xx *wl, wl->virtual_mem_addr =0 ; wl->virtual_reg_addr = mem_size; - t.tx_buf = tx_buf; - t.len =sizeof (tx_buf); + t.tx_buf = cmd; + t.len = cmd_len;spi_message_add_tail (&t, &m);spi_sync (wl->spi, &m); + +kfree (cmd); + +return 0 ; } void wl12xx_spi_read(struct wl12xx *wl, int addr, void *buf,
drivers/net/wireless/wl12xx/spi.h +3 -3
@@ -88,9 +88,9 @@ void wl12xx_reg_write32(struct wl12xx *wl, int addr, u32 val);/* INIT and RESET words */ void wl12xx_spi_reset (struct wl12xx *wl);void wl12xx_spi_init (struct wl12xx *wl); -void wl12xx_set_partition (struct wl12xx *wl, -u32 part_start,u32 part_size, -u32 reg_start,u32 reg_size); +int wl12xx_set_partition (struct wl12xx *wl, +u32 part_start,u32 part_size, +u32 reg_start,u32 reg_size);static inline u32 wl12xx_read32 (struct wl12xx *wl,int addr) {
PATCH 5/33 wl12xx: allocate buffer spi read/write command buffer kzalloc()
In reply to Kalle ValoFrom: Kalle Valo <[email protected]>
Needed for DMA safe transfers.
---
drivers/net/wireless/wl12xx/spi.c | 34 +++++++++++++++++++--------------- drivers/net/wireless/wl12xx/wl12xx.h | 1 + 2 files changed, 20 insertions(+), 15 deletions(-)
drivers/net/wireless/wl12xx/spi.c +19 -15
@@ -263,17 +263,19 @@ void wl12xx_spi_read(struct wl12xx *wl, int addr, void *buf,struct spi_transfer t[3 ];struct spi_message m;char busy_buf[TNETWIF_READ_OFFSET_BYTES ]; -u32 cmd; +u32 *cmd; - cmd =0 ; - cmd |=WSPI_CMD_READ ; - cmd |= (len <<WSPI_CMD_BYTE_LENGTH_OFFSET ) &WSPI_CMD_BYTE_LENGTH ; - cmd |= addr &WSPI_CMD_BYTE_ADDR ; + cmd = &wl->buffer_cmd; + + *cmd =0 ; + *cmd |=WSPI_CMD_READ ; + *cmd |= (len <<WSPI_CMD_BYTE_LENGTH_OFFSET ) &WSPI_CMD_BYTE_LENGTH ; + *cmd |= addr &WSPI_CMD_BYTE_ADDR ;spi_message_init (&m);memset (t,0 ,sizeof (t)); - t[0 ].tx_buf = &cmd; + t[0 ].tx_buf = cmd; t[0 ].len =4 ;spi_message_add_tail (&t[0 ], &m);
@@ -290,7 +292,7 @@ void wl12xx_spi_read(struct wl12xx *wl, int addr, void *buf,/* FIXME: check busy words */ -wl12xx_dump (DEBUG_SPI ,"spi_read cmd -> " , &cmd,sizeof (cmd)); +wl12xx_dump (DEBUG_SPI ,"spi_read cmd -> " , cmd,sizeof (*cmd));wl12xx_dump (DEBUG_SPI ,"spi_read buf <- " , buf, len); }
@@ -299,18 +301,20 @@ void wl12xx_spi_write(struct wl12xx *wl, int addr, void *buf, {struct spi_transfer t[2 ];struct spi_message m; -u32 cmd; +u32 *cmd; - cmd =0 ; - cmd |=WSPI_CMD_WRITE ; - cmd |= (len <<WSPI_CMD_BYTE_LENGTH_OFFSET ) &WSPI_CMD_BYTE_LENGTH ; - cmd |= addr &WSPI_CMD_BYTE_ADDR ; + cmd = &wl->buffer_cmd; + + *cmd =0 ; + *cmd |=WSPI_CMD_WRITE ; + *cmd |= (len <<WSPI_CMD_BYTE_LENGTH_OFFSET ) &WSPI_CMD_BYTE_LENGTH ; + *cmd |= addr &WSPI_CMD_BYTE_ADDR ;spi_message_init (&m);memset (t,0 ,sizeof (t)); - t[0 ].tx_buf = &cmd; - t[0 ].len =sizeof (cmd); + t[0 ].tx_buf = cmd; + t[0 ].len =sizeof (*cmd);spi_message_add_tail (&t[0 ], &m); t[1 ].tx_buf = buf;
@@ -319,7 +323,7 @@ void wl12xx_spi_write(struct wl12xx *wl, int addr, void *buf,spi_sync (wl->spi, &m); -wl12xx_dump (DEBUG_SPI ,"spi_write cmd -> " , &cmd,sizeof (cmd)); +wl12xx_dump (DEBUG_SPI ,"spi_write cmd -> " , cmd,sizeof (*cmd));wl12xx_dump (DEBUG_SPI ,"spi_write buf -> " , buf, len); }
drivers/net/wireless/wl12xx/wl12xx.h +1 -0
@@ -384,6 +384,7 @@ struct wl12xx {struct wl12xx_debugfs debugfs;u32 buffer_32; +u32 buffer_cmd; };int wl12xx_plt_start (struct wl12xx *wl);
PATCH 6/33 wl12xx: allocate buffer the spi busy word from struct wl12xx
In reply to Kalle ValoFrom: Kalle Valo <[email protected]>
Needed for DMA transfers.
---
drivers/net/wireless/wl12xx/spi.c | 5 +++-- drivers/net/wireless/wl12xx/spi.h | 3 +-- drivers/net/wireless/wl12xx/wl12xx.h | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-)
drivers/net/wireless/wl12xx/spi.c +3 -2
@@ -262,10 +262,11 @@ void wl12xx_spi_read(struct wl12xx *wl, int addr, void *buf, {struct spi_transfer t[3 ];struct spi_message m; -char busy_buf[TNETWIF_READ_OFFSET_BYTES ]; +u8 *busy_buf;u32 *cmd; cmd = &wl->buffer_cmd; + busy_buf = wl->buffer_busyword; *cmd =0 ; *cmd |=WSPI_CMD_READ ;
@@ -281,7 +282,7 @@ void wl12xx_spi_read(struct wl12xx *wl, int addr, void *buf,/* Busy and non busy words read */ t[1 ].rx_buf = busy_buf; - t[1 ].len =TNETWIF_READ_OFFSET_BYTES ; + t[1 ].len =WL12XX_BUSY_WORD_LEN ;spi_message_add_tail (&t[1 ], &m); t[2 ].rx_buf = buf;
drivers/net/wireless/wl12xx/spi.h +1 -2
@@ -65,9 +65,8 @@#define WSPI_INIT_CMD_LEN 8 -#define TNETWIF_READ_OFFSET_BYTES 8#define HW_ACCESS_WSPI_FIXED_BUSY_LEN \ - ((TNETWIF_READ_OFFSET_BYTES - 4) / sizeof(u32)) + ((WL12XX_BUSY_WORD_LEN - 4) / sizeof(u32))#define HW_ACCESS_WSPI_INIT_CMD_MASK 0
drivers/net/wireless/wl12xx/wl12xx.h +2 -0
@@ -105,6 +105,7 @@ enum { CFG_RX_AUTH_EN | \ CFG_RX_ASSOC_EN) +#define WL12XX_BUSY_WORD_LEN 8struct boot_attr {u32 radio_type;
@@ -385,6 +386,7 @@ struct wl12xx {u32 buffer_32;u32 buffer_cmd; +u8 buffer_busyword[WL12XX_BUSY_WORD_LEN ]; };int wl12xx_plt_start (struct wl12xx *wl);
PATCH 7/33 wl12xx: use wl12xx_mem_read32() to read the rx counter
In reply to Kalle ValoFrom: Kalle Valo <[email protected]>
As a side effect the transfer is now DMA safe.
---
drivers/net/wireless/wl12xx/wl1251.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/wl12xx/wl1251.c +2 -2
@@ -415,8 +415,8 @@ static void wl1251_irq_work(struct work_struct *work)wl12xx_debug (DEBUG_IRQ ,"intr: 0x%x" , intr);if (wl->data_path) { -wl12xx_spi_mem_read (wl, wl->data_path->rx_control_addr, - &wl->rx_counter,sizeof (u32)); + wl->rx_counter = +wl12xx_mem_read32 (wl, wl->data_path->rx_control_addr);/* We handle a frmware bug here */ switch ((wl->rx_counter - wl->rx_handled) &0xf ) {
PATCH 8/33 wl12xx: fix rx descriptor use
In reply to Kalle ValoFrom: Kalle Valo <[email protected]>
Rx descriptor was incorrectly allocated from stack, use struct wl12xx instead. Needed for DMA transfers.
---
drivers/net/wireless/wl12xx/main.c | 14 ++++++++++++++ drivers/net/wireless/wl12xx/rx.c | 11 ++++++----- drivers/net/wireless/wl12xx/wl12xx.h | 1 + 3 files changed, 21 insertions(+), 5 deletions(-)
drivers/net/wireless/wl12xx/main.c +14 -0
@@ -1261,6 +1261,13 @@ static int __devinit wl12xx_probe(struct spi_device *spi) wl->tx_mgmt_frm_rate =DEFAULT_HW_GEN_TX_RATE ; wl->tx_mgmt_frm_mod =DEFAULT_HW_GEN_MODULATION_TYPE ; + wl->rx_descriptor =kmalloc (sizeof (*wl->rx_descriptor),GFP_KERNEL ); +if (!wl->rx_descriptor) { +wl12xx_error ("could not allocate memory for rx descriptor" ); + ret = -ENOMEM ; + goto out_free; + } +/* This is the only SPI value that we need to set here, the rest * comes from the board-peripherals file */ spi->bits_per_word =32 ;
@@ -1313,6 +1320,9 @@ static int __devinit wl12xx_probe(struct spi_device *spi)free_irq (wl->irq, wl); out_free: +kfree (wl->rx_descriptor); + wl->rx_descriptor =NULL ; +ieee80211_free_hw (hw);return ret;
@@ -1333,6 +1343,10 @@ static int __devexit wl12xx_remove(struct spi_device *spi) wl->fw =NULL ;kfree (wl->nvs); wl->nvs =NULL ; + +kfree (wl->rx_descriptor); + wl->rx_descriptor =NULL ; +ieee80211_free_hw (wl->hw);return 0 ;
drivers/net/wireless/wl12xx/rx.c +6 -5
@@ -39,8 +39,7 @@ static void wl12xx_rx_header(struct wl12xx *wl,if (wl->rx_current_buffer) rx_packet_ring_addr += wl->data_path->rx_packet_ring_chunk_size; -wl12xx_spi_mem_read (wl, rx_packet_ring_addr, desc, -sizeof (struct wl12xx_rx_descriptor )); +wl12xx_spi_mem_read (wl, rx_packet_ring_addr, desc,sizeof (*desc)); } static void wl12xx_rx_status(struct wl12xx *wl,
@@ -175,16 +174,18 @@ static void wl12xx_rx_ack(struct wl12xx *wl)void wl12xx_rx (struct wl12xx *wl) { -struct wl12xx_rx_descriptor rx_desc; +struct wl12xx_rx_descriptor *rx_desc;if (wl->state !=WL12XX_STATE_ON )return ; + rx_desc = wl->rx_descriptor; +/* We first read the frame's header */ -wl12xx_rx_header (wl, &rx_desc); +wl12xx_rx_header (wl, rx_desc);/* Now we can read the body */ -wl12xx_rx_body (wl, &rx_desc); +wl12xx_rx_body (wl, rx_desc);/* Finally, we need to ACK the RX */ wl12xx_rx_ack (wl);
drivers/net/wireless/wl12xx/wl12xx.h +1 -0
@@ -387,6 +387,7 @@ struct wl12xx {u32 buffer_32;u32 buffer_cmd;u8 buffer_busyword[WL12XX_BUSY_WORD_LEN ]; +struct wl12xx_rx_descriptor *rx_descriptor; };int wl12xx_plt_start (struct wl12xx *wl);
PATCH 9/33 wl12xx: removed chipset interrupt source configuration from fw wakeup
In reply to Kalle ValoFrom: Juuso Oikarinen <[email protected]>
The chipset source interrupt source configuration during fw wakeup was blocking interrupts on the wl1271. The configuration is effectively unused here as it is used to trigger an interrupt for the chipset wake-up event, which is not handled, or waited for, in the fw wakeup anyway on either wl1251 or wl1271.
---
drivers/net/wireless/wl12xx/main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/net/wireless/wl12xx/main.c +0 -2
@@ -157,8 +157,6 @@ static void wl12xx_fw_wakeup(struct wl12xx *wl)if (!(elp_reg &ELPCTRL_WLAN_READY )) {wl12xx_warning ("WLAN not ready" ); - elp_reg =ELPCTRL_WAKE_UP_WLAN_READY ; -wl12xx_write32 (wl,HW_ACCESS_ELP_CTRL_REG_ADDR , elp_reg); } }
PATCH 10/33 wl12xx: add wl12xx_spi_reg_read() and wl12xx_spi_reg_write() functions
In reply to Kalle ValoFrom: Luciano Coelho <[email protected]>
In some cases we need to read more than 32 bits from the register area. These functions were added to support that, like the existing wl12xx_spi_mem_read() and wl12xx_spi_mem_write() already do for large blocks in the memory area.
---
drivers/net/wireless/wl12xx/spi.c | 18 ++++++++++++++++++ drivers/net/wireless/wl12xx/spi.h | 2 ++ 2 files changed, 20 insertions(+), 0 deletions(-)
drivers/net/wireless/wl12xx/spi.c +18 -0
@@ -348,6 +348,24 @@ void wl12xx_spi_mem_write(struct wl12xx *wl, int addr, void *buf,wl12xx_spi_write (wl, physical, buf, len); } +void wl12xx_spi_reg_read (struct wl12xx *wl,int addr,void *buf,size_t len) +{ +int physical; + + physical =wl12xx_translate_reg_addr (wl, addr); + +wl12xx_spi_read (wl, physical, buf, len); +} + +void wl12xx_spi_reg_write (struct wl12xx *wl,int addr,void *buf,size_t len) +{ +int physical; + + physical =wl12xx_translate_reg_addr (wl, addr); + +wl12xx_spi_write (wl, physical, buf, len); +} +u32 wl12xx_mem_read32 (struct wl12xx *wl,int addr) {return wl12xx_read32 (wl,wl12xx_translate_mem_addr (wl, addr));
drivers/net/wireless/wl12xx/spi.h +2 -0
@@ -81,6 +81,8 @@ u32 wl12xx_mem_read32(struct wl12xx *wl, int addr);void wl12xx_mem_write32 (struct wl12xx *wl,int addr,u32 val);/* Registers IO */ +void wl12xx_spi_reg_read (struct wl12xx *wl,int addr,void *buf,size_t len); +void wl12xx_spi_reg_write (struct wl12xx *wl,int addr,void *buf,size_t len);u32 wl12xx_reg_read32 (struct wl12xx *wl,int addr);void wl12xx_reg_write32 (struct wl12xx *wl,int addr,u32 val);
PATCH 11/33 wl12xx: moved firmware version reading routine to chip-specific functions
In reply to Kalle ValoFrom: Luciano Coelho <[email protected]>
With WL1271, the firmware version can only be read right after booting the chip. To keep WL1251 aligned with this procedure, the code that reads the firmware version initially has been moved to a common place where it can be read from both chipsets.
---
drivers/net/wireless/wl12xx/boot.c | 2 ++ drivers/net/wireless/wl12xx/wl1251.c | 9 ++++++--- drivers/net/wireless/wl12xx/wl12xx.h | 1 + 3 files changed, 9 insertions(+), 3 deletions(-)
drivers/net/wireless/wl12xx/boot.c +2 -0
@@ -269,6 +269,8 @@ int wl12xx_boot_run_firmware(struct wl12xx *wl)wl12xx_debug (DEBUG_MAILBOX ,"cmd_box_addr 0x%x event_box_addr 0x%x" , wl->cmd_box_addr, wl->event_box_addr); + wl->chip.op_fw_version (wl); +/* * in case of full asynchronous mode the firmware event must be * ready to receive event from the command mailbox
drivers/net/wireless/wl12xx/wl1251.c +6 -3
@@ -288,9 +288,6 @@ static int wl1251_boot(struct wl12xx *wl)if (ret <0 ) goto out; -/* Get and save the firmware version */ -wl12xx_acx_fw_version (wl, wl->chip.fw_ver,sizeof (wl->chip.fw_ver)); - out:return ret; }
@@ -394,6 +391,11 @@ static void wl1251_target_enable_interrupts(struct wl12xx *wl)wl12xx_boot_target_enable_interrupts (wl); } +static void wl1251_fw_version (struct wl12xx *wl) +{ +wl12xx_acx_fw_version (wl, wl->chip.fw_ver,sizeof (wl->chip.fw_ver)); +} +static void wl1251_irq_work (struct work_struct *work) {u32 intr;
@@ -709,6 +711,7 @@ void wl1251_setup(struct wl12xx *wl) wl->chip.op_target_enable_interrupts = wl1251_target_enable_interrupts; wl->chip.op_hw_init = wl1251_hw_init; wl->chip.op_plt_init = wl1251_plt_init; + wl->chip.op_fw_version = wl1251_fw_version; wl->chip.p_table = wl1251_part_table; wl->chip.acx_reg_table = wl1251_acx_reg_table;
drivers/net/wireless/wl12xx/wl12xx.h +1 -0
@@ -163,6 +163,7 @@ struct wl12xx_chip {void (*op_target_enable_interrupts)(struct wl12xx *wl);int (*op_hw_init)(struct wl12xx *wl);int (*op_plt_init)(struct wl12xx *wl); +void (*op_fw_version)(struct wl12xx *wl);struct wl12xx_partition_set *p_table;enum wl12xx_acx_int_reg *acx_reg_table;
PATCH 12/33 wl12xx: add support for new WL1271 chip revision
In reply to Kalle ValoFrom: Luciano Coelho <[email protected]>
This patch adds the code that recognizes the new WL1271 chip revision (PG 2.0). Full support for this chip is not yet implemented and support for WL1271 PG 1.0 is not guaranteed anymore.
---
drivers/net/wireless/wl12xx/main.c | 7 +++++++ drivers/net/wireless/wl12xx/wl12xx.h | 1 + 2 files changed, 8 insertions(+), 0 deletions(-)
drivers/net/wireless/wl12xx/main.c +7 -0
@@ -196,6 +196,13 @@ static int wl12xx_chip_wakeup(struct wl12xx *wl)break ;case CHIP_ID_1271_PG10 : +wl12xx_warning ("chip id 0x%x (1271 PG10) support is obsolete" , + wl->chip.id); +break ; +case CHIP_ID_1271_PG20 : +wl12xx_debug (DEBUG_BOOT ,"chip id 0x%x (1271 PG20)" , + wl->chip.id); +break ;case CHIP_ID_1251_PG10 :case CHIP_ID_1251_PG11 :default :
drivers/net/wireless/wl12xx/wl12xx.h +1 -0
@@ -412,5 +412,6 @@ int wl12xx_plt_stop(struct wl12xx *wl);#define CHIP_ID_1251_PG11 (0x7020101)#define CHIP_ID_1251_PG12 (0x7030101)#define CHIP_ID_1271_PG10 (0x4030101) +#define CHIP_ID_1271_PG20 (0x4030111)#endif
PATCH 13/33 wl12xx: add support for fixed address in wl12xx_spi_read
In reply to Kalle ValoFrom: Luciano Coelho <[email protected]>
In the wl1271 implementation, we need to read memory from the register partition using fixed addresses. This change adds the possibility to request fixed address when calling wl12xx_spi_read() or wl12xx_spi_reg_read().
---
drivers/net/wireless/wl12xx/spi.c | 12 ++++++++---- drivers/net/wireless/wl12xx/spi.h | 9 ++++++--- 2 files changed, 14 insertions(+), 7 deletions(-)
drivers/net/wireless/wl12xx/spi.c +8 -4
@@ -258,7 +258,7 @@ int wl12xx_set_partition(struct wl12xx *wl, }void wl12xx_spi_read (struct wl12xx *wl,int addr,void *buf, -size_t len) +size_t len,bool fixed) {struct spi_transfer t[3 ];struct spi_message m;
@@ -273,6 +273,9 @@ void wl12xx_spi_read(struct wl12xx *wl, int addr, void *buf, *cmd |= (len <<WSPI_CMD_BYTE_LENGTH_OFFSET ) &WSPI_CMD_BYTE_LENGTH ; *cmd |= addr &WSPI_CMD_BYTE_ADDR ; +if (fixed) + *cmd |=WSPI_CMD_FIXED ; +spi_message_init (&m);memset (t,0 ,sizeof (t));
@@ -335,7 +338,7 @@ void wl12xx_spi_mem_read(struct wl12xx *wl, int addr, void *buf, physical =wl12xx_translate_mem_addr (wl, addr); -wl12xx_spi_read (wl, physical, buf, len); +wl12xx_spi_read (wl, physical, buf, len, false); } void wl12xx_spi_mem_write(struct wl12xx *wl, int addr, void *buf,
@@ -348,13 +351,14 @@ void wl12xx_spi_mem_write(struct wl12xx *wl, int addr, void *buf,wl12xx_spi_write (wl, physical, buf, len); } -void wl12xx_spi_reg_read (struct wl12xx *wl,int addr,void *buf,size_t len) +void wl12xx_spi_reg_read (struct wl12xx *wl,int addr,void *buf,size_t len, +bool fixed) {int physical; physical =wl12xx_translate_reg_addr (wl, addr); -wl12xx_spi_read (wl, physical, buf, len); +wl12xx_spi_read (wl, physical, buf, len, fixed); }void wl12xx_spi_reg_write (struct wl12xx *wl,int addr,void *buf,size_t len)
drivers/net/wireless/wl12xx/spi.h +6 -3
@@ -71,8 +71,9 @@/* Raw target IO, address is not translated */ -void wl12xx_spi_read (struct wl12xx *wl,int addr,void *buf,size_t len);void wl12xx_spi_write (struct wl12xx *wl,int addr,void *buf,size_t len); +void wl12xx_spi_read (struct wl12xx *wl,int addr,void *buf, +size_t len,bool fixed);/* Memory target IO, address is tranlated to partition 0 */ void wl12xx_spi_mem_read (struct wl12xx *wl,int addr,void *buf,size_t len);
@@ -81,7 +82,8 @@ u32 wl12xx_mem_read32(struct wl12xx *wl, int addr);void wl12xx_mem_write32 (struct wl12xx *wl,int addr,u32 val);/* Registers IO */ -void wl12xx_spi_reg_read (struct wl12xx *wl,int addr,void *buf,size_t len); +void wl12xx_spi_reg_read (struct wl12xx *wl,int addr,void *buf,size_t len, +bool fixed);void wl12xx_spi_reg_write (struct wl12xx *wl,int addr,void *buf,size_t len);u32 wl12xx_reg_read32 (struct wl12xx *wl,int addr);void wl12xx_reg_write32 (struct wl12xx *wl,int addr,u32 val);
@@ -95,7 +97,8 @@ int wl12xx_set_partition(struct wl12xx *wl,static inline u32 wl12xx_read32 (struct wl12xx *wl,int addr) { -wl12xx_spi_read (wl, addr, &wl->buffer_32,sizeof (wl->buffer_32)); +wl12xx_spi_read (wl, addr, &wl->buffer_32, +sizeof (wl->buffer_32), false);return wl->buffer_32; }
PATCH 14/33 wl12xx: pass the wake up condition when configuring the wake up event
In reply to Kalle ValoFrom: Luciano Coelho <[email protected]>
Changed the function wl12xx_acx_wake_up_conditions() so that it receives an argument with the actual wake up condition, instead of having WAKE_UP_EVENT_DTIM_BITMAP hardcoded. This is needed because we have to use different conditions in 1271.
---
drivers/net/wireless/wl12xx/acx.c | 5 +++-- drivers/net/wireless/wl12xx/acx.h | 3 ++- drivers/net/wireless/wl12xx/cmd.c | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-)
drivers/net/wireless/wl12xx/acx.c +3 -2
@@ -96,7 +96,8 @@ out:return ret; } -int wl12xx_acx_wake_up_conditions (struct wl12xx *wl,u8 listen_interval) +int wl12xx_acx_wake_up_conditions (struct wl12xx *wl,u8 wake_up_event, +u8 listen_interval) {struct acx_wake_up_condition *wake_up;int ret;
@@ -109,7 +110,7 @@ int wl12xx_acx_wake_up_conditions(struct wl12xx *wl, u8 listen_interval) goto out; } - wake_up->wake_up_event =WAKE_UP_EVENT_DTIM_BITMAP ; + wake_up->wake_up_event = wake_up_event; wake_up->listen_interval = listen_interval; ret = wl12xx_cmd_configure(wl, ACX_WAKE_UP_CONDITIONS,
drivers/net/wireless/wl12xx/acx.h +2 -1
@@ -1112,7 +1112,8 @@ int wl12xx_acx_frame_rates(struct wl12xx *wl, u8 ctrl_rate, u8 ctrl_mod, u8 mgt_rate, u8 mgt_mod);int wl12xx_acx_station_id (struct wl12xx *wl);int wl12xx_acx_default_key (struct wl12xx *wl,u8 key_id); -int wl12xx_acx_wake_up_conditions (struct wl12xx *wl,u8 listen_interval); +int wl12xx_acx_wake_up_conditions (struct wl12xx *wl,u8 wake_up_event, +u8 listen_interval);int wl12xx_acx_sleep_auth (struct wl12xx *wl,u8 sleep_auth);int wl12xx_acx_fw_version (struct wl12xx *wl,char *buf,size_t len);int wl12xx_acx_tx_power (struct wl12xx *wl,int power);
drivers/net/wireless/wl12xx/cmd.c +2 -1
@@ -346,7 +346,8 @@ int wl12xx_cmd_ps_mode(struct wl12xx *wl, u8 ps_mode)int ret =0 ;/* FIXME: this should be in ps.c */ - ret =wl12xx_acx_wake_up_conditions (wl, wl->listen_int); + ret =wl12xx_acx_wake_up_conditions (wl,WAKE_UP_EVENT_DTIM_BITMAP , + wl->listen_int);if (ret <0 ) {wl12xx_error ("couldn't set wake up conditions" ); goto out;
PATCH 15/33 wl12xx: Moved wl1251 TX path implementation into chip specific files
In reply to Kalle ValoFrom: Juuso Oikarinen <[email protected]>
Moved wl1251 TX path implementation into chip specific files to enable parallel implementation for the wl1271 TX path.
---
drivers/net/wireless/wl12xx/Makefile | 4 drivers/net/wireless/wl12xx/main.c | 13 - drivers/net/wireless/wl12xx/tx.c | 557 ------------------------------- drivers/net/wireless/wl12xx/tx.h | 215 ------------ drivers/net/wireless/wl12xx/wl1251.c | 7 drivers/net/wireless/wl12xx/wl1251_tx.c | 557 +++++++++++++++++++++++++++++++ drivers/net/wireless/wl12xx/wl1251_tx.h | 216 ++++++++++++ drivers/net/wireless/wl12xx/wl12xx.h | 1 8 files changed, 789 insertions(+), 781 deletions(-) delete mode 100644 drivers/net/wireless/wl12xx/tx.c delete mode 100644 drivers/net/wireless/wl12xx/tx.h create mode 100644 drivers/net/wireless/wl12xx/wl1251_tx.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_tx.h
drivers/net/wireless/wl12xx/Makefile +2 -2
@@ -1,4 +1,4 @@ -wl12xx-objs = main.o spi.o event.o tx.o rx.o \ - ps.o cmd.o acx.o boot.o init.o wl1251.o \ +wl12xx-objs = main.o spi.o event.o wl1251_tx.o rx.o \ + ps.o cmd.o acx.o boot.o init.o wl1251.o \ debugfs.o obj-$(CONFIG_WL12XX) += wl12xx.o
drivers/net/wireless/wl12xx/main.c +8 -5
@@ -37,7 +37,7 @@#include "wl1251.h" #include "spi.h" #include "event.h" -#include "tx.h" +#include "wl1251_tx.h" #include "rx.h" #include "ps.h" #include "init.h"
@@ -303,6 +303,11 @@ static int wl12xx_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)skb_queue_tail (&wl->tx_queue, skb); +/* +* The chip specific setup must run before the first TX packet - +* before that, the tx_work will not be initialized! +*/ +schedule_work (&wl->tx_work);/*
@@ -400,8 +405,7 @@ static void wl12xx_op_stop(struct ieee80211_hw *hw)mutex_lock (&wl->mutex);/* let's notify MAC80211 about the remaining pending TX frames */ -wl12xx_tx_flush (wl); - + wl->chip.op_tx_flush (wl);wl12xx_power_off (wl);memset (wl->bssid,0 ,ETH_ALEN );
@@ -1176,7 +1180,7 @@ static int wl12xx_init_ieee80211(struct wl12xx *wl) {/* The tx descriptor buffer and the TKIP space */ wl->hw->extra_tx_headroom =sizeof (struct tx_double_buffer_desc ) - +WL12XX_TKIP_IV_SPACE ; + +WL1251_TKIP_IV_SPACE ;/* unit us */ /* FIXME: find a proper value */
@@ -1226,7 +1230,6 @@ static int __devinit wl12xx_probe(struct spi_device *spi)skb_queue_head_init (&wl->tx_queue); -INIT_WORK (&wl->tx_work, wl12xx_tx_work);INIT_WORK (&wl->filter_work, wl12xx_filter_work); wl->channel =WL12XX_DEFAULT_CHANNEL ; wl->scanning = false;
drivers/net/wireless/wl12xx/tx.c deleted +0 -557
557 lines not on this page · raw message
drivers/net/wireless/wl12xx/tx.h deleted +0 -215
215 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251.c +5 -2
@@ -30,7 +30,7 @@#include "boot.h" #include "event.h" #include "acx.h" -#include "tx.h" +#include "wl1251_tx.h" #include "rx.h" #include "ps.h" #include "init.h"
@@ -471,7 +471,7 @@ static void wl1251_irq_work(struct work_struct *work)if (intr &WL1251_ACX_INTR_TX_RESULT ) {wl12xx_debug (DEBUG_IRQ ,"WL1251_ACX_INTR_TX_RESULT" ); -wl12xx_tx_complete (wl); +wl1251_tx_complete (wl); }if (intr & (WL1251_ACX_INTR_EVENT_A |WL1251_ACX_INTR_EVENT_B )) {
@@ -712,9 +712,12 @@ void wl1251_setup(struct wl12xx *wl) wl->chip.op_hw_init = wl1251_hw_init; wl->chip.op_plt_init = wl1251_plt_init; wl->chip.op_fw_version = wl1251_fw_version; + wl->chip.op_tx_flush = wl1251_tx_flush; wl->chip.p_table = wl1251_part_table; wl->chip.acx_reg_table = wl1251_acx_reg_table;INIT_WORK (&wl->irq_work, wl1251_irq_work); +INIT_WORK (&wl->tx_work, wl1251_tx_work); + }
drivers/net/wireless/wl12xx/wl1251_tx.c new file +557 -0
557 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_tx.h new file +216 -0
216 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl12xx.h +1 -0
@@ -163,6 +163,7 @@ struct wl12xx_chip {void (*op_target_enable_interrupts)(struct wl12xx *wl);int (*op_hw_init)(struct wl12xx *wl);int (*op_plt_init)(struct wl12xx *wl); +void (*op_tx_flush)(struct wl12xx *wl);void (*op_fw_version)(struct wl12xx *wl);struct wl12xx_partition_set *p_table;
PATCH 16/33 wl12xx: Add support for block reading from a fixed register address
In reply to Kalle ValoFrom: Juuso Oikarinen <[email protected]>
Add support for block reading (multiple bytes) from a fixed chipset register address. This is required for the wl1271 TX data path.
---
drivers/net/wireless/wl12xx/spi.c | 12 ++++++++---- drivers/net/wireless/wl12xx/spi.h | 9 ++++++--- 2 files changed, 14 insertions(+), 7 deletions(-)
drivers/net/wireless/wl12xx/spi.c +8 -4
@@ -301,7 +301,7 @@ void wl12xx_spi_read(struct wl12xx *wl, int addr, void *buf, }void wl12xx_spi_write (struct wl12xx *wl,int addr,void *buf, -size_t len) +size_t len,bool fixed) {struct spi_transfer t[2 ];struct spi_message m;
@@ -314,6 +314,9 @@ void wl12xx_spi_write(struct wl12xx *wl, int addr, void *buf, *cmd |= (len <<WSPI_CMD_BYTE_LENGTH_OFFSET ) &WSPI_CMD_BYTE_LENGTH ; *cmd |= addr &WSPI_CMD_BYTE_ADDR ; +if (fixed) + *cmd |=WSPI_CMD_FIXED ; +spi_message_init (&m);memset (t,0 ,sizeof (t));
@@ -348,7 +351,7 @@ void wl12xx_spi_mem_write(struct wl12xx *wl, int addr, void *buf, physical =wl12xx_translate_mem_addr (wl, addr); -wl12xx_spi_write (wl, physical, buf, len); +wl12xx_spi_write (wl, physical, buf, len, false); } void wl12xx_spi_reg_read(struct wl12xx *wl, int addr, void *buf, size_t len,
@@ -361,13 +364,14 @@ void wl12xx_spi_reg_read(struct wl12xx *wl, int addr, void *buf, size_t len,wl12xx_spi_read (wl, physical, buf, len, fixed); } -void wl12xx_spi_reg_write (struct wl12xx *wl,int addr,void *buf,size_t len) +void wl12xx_spi_reg_write (struct wl12xx *wl,int addr,void *buf,size_t len, +bool fixed) {int physical; physical =wl12xx_translate_reg_addr (wl, addr); -wl12xx_spi_write (wl, physical, buf, len); +wl12xx_spi_write (wl, physical, buf, len, fixed); }u32 wl12xx_mem_read32 (struct wl12xx *wl,int addr)
drivers/net/wireless/wl12xx/spi.h +6 -3
@@ -71,7 +71,8 @@/* Raw target IO, address is not translated */ -void wl12xx_spi_write (struct wl12xx *wl,int addr,void *buf,size_t len); +void wl12xx_spi_write (struct wl12xx *wl,int addr,void *buf, +size_t len,bool fixed);void wl12xx_spi_read (struct wl12xx *wl,int addr,void *buf,size_t len,bool fixed);
@@ -84,7 +85,8 @@ void wl12xx_mem_write32(struct wl12xx *wl, int addr, u32 val);/* Registers IO */ void wl12xx_spi_reg_read (struct wl12xx *wl,int addr,void *buf,size_t len,bool fixed); -void wl12xx_spi_reg_write (struct wl12xx *wl,int addr,void *buf,size_t len); +void wl12xx_spi_reg_write (struct wl12xx *wl,int addr,void *buf,size_t len, +bool fixed);u32 wl12xx_reg_read32 (struct wl12xx *wl,int addr);void wl12xx_reg_write32 (struct wl12xx *wl,int addr,u32 val);
@@ -106,7 +108,8 @@ static inline u32 wl12xx_read32(struct wl12xx *wl, int addr)static inline void wl12xx_write32 (struct wl12xx *wl,int addr,u32 val) { wl->buffer_32 = val; -wl12xx_spi_write (wl, addr, &wl->buffer_32,sizeof (wl->buffer_32)); +wl12xx_spi_write (wl, addr, &wl->buffer_32, +sizeof (wl->buffer_32), false); }#endif /* __WL12XX_SPI_H__ */
PATCH 17/33 wl12xx: Fix incorrect warning message.
In reply to Kalle ValoFrom: Ari Kauppi <[email protected]>
A warning message in wl12xx_acx_event_mbox_mask has a copy/paste error. Fix it to print the correct acx command.
---
drivers/net/wireless/wl12xx/acx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/wl12xx/acx.c +1 -1
@@ -735,7 +735,7 @@ int wl12xx_acx_event_mbox_mask(struct wl12xx *wl, u32 event_mask) ret =wl12xx_cmd_configure (wl,ACX_EVENT_MBOX_MASK , mask,sizeof (*mask));if (ret <0 ) { -wl12xx_warning ("failed to set aid: %d" , ret); +wl12xx_warning ("failed to set acx_event_mbox_mask: %d" , ret); goto out; }
PATCH 18/33 wl12xx: Fix CMD_TEST regression via netlink.
In reply to Kalle ValoFrom: Ari Kauppi <[email protected]>
CMD_TEST via netlink API has been broken since e29c3f59cfbc38c3b481a2694b08962da19c4664: cmd and acx interface rework.
The user of the interface sends the request in a buffer without the wl12xx_command header but expects the response to have the wl12xx_command header (with id and status).
This patch reverts the e29c3f5 commit for cmd.c:wl12xx_cmd_test and implements the needed wrapper functionality in netlink.c. Now the API of wl12xx_cmd_test and rest of wl12xx_cmd_* commands in cmd.c are similar.
---
drivers/net/wireless/wl12xx/cmd.c | 35 +++++++++++------------------------ 1 files changed, 11 insertions(+), 24 deletions(-)
drivers/net/wireless/wl12xx/cmd.c +11 -24
@@ -66,38 +66,26 @@ out:* send test command to firmware * * @wl: wl struct -* @buf: buffer containing the command, without headers, no dma requirements +* @buf: buffer containing the command, with all headers, must work with dma * @len: length of the buffer * @answer: is answer needed -* -* FIXME: cmd_test users need to be converted to the new interface */ int wl12xx_cmd_test (struct wl12xx *wl,void *buf,size_t buf_len,u8 answer) { -struct wl12xx_command *cmd; -size_t cmd_len;int ret;wl12xx_debug (DEBUG_CMD ,"cmd test" ); - cmd =kzalloc (sizeof (*cmd),GFP_KERNEL ); -if (!cmd) { - ret = -ENOMEM ; - goto out; - } - -memcpy (cmd->parameters, buf, buf_len); - -/* FIXME: ugly */ - cmd_len =sizeof (struct wl12xx_cmd_header ) + buf_len; + ret =wl12xx_cmd_send (wl,CMD_TEST , buf, buf_len); - ret =wl12xx_cmd_send (wl,CMD_TEST , cmd, cmd_len);if (ret <0 ) {wl12xx_warning ("TEST command failed" ); - goto out; +return ret; }if (answer) { +struct wl12xx_command *cmd_answer; +/* * The test command got in, we can read the answer. * The answer would be a wl12xx_command, where the
@@ -106,19 +94,18 @@ int wl12xx_cmd_test(struct wl12xx *wl, void *buf, size_t buf_len, u8 answer)wl12xx_ps_elp_wakeup (wl); -wl12xx_spi_mem_read (wl, wl->cmd_box_addr, cmd, cmd_len); +wl12xx_spi_mem_read (wl, wl->cmd_box_addr, buf, buf_len);wl12xx_ps_elp_sleep (wl); -if (cmd->header.status !=CMD_STATUS_SUCCESS ) + cmd_answer = buf; + +if (cmd_answer->header.status !=CMD_STATUS_SUCCESS )wl12xx_error ("TEST command answer error: %d" , - cmd->header.status); -memcpy (buf, cmd->parameters, buf_len); + cmd_answer->header.status); } -out: -kfree (cmd); -return ret; +return 0 ; }/**
PATCH 19/33 wl12xx: protect wl12xx_op_set_rts_threshold()
In reply to Kalle ValoFrom: Kalle Valo <[email protected]>
The function doesn't lock the mutex before sending the acx.
---
drivers/net/wireless/wl12xx/main.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
drivers/net/wireless/wl12xx/main.c +4 -0
@@ -957,11 +957,15 @@ static int wl12xx_op_set_rts_threshold(struct ieee80211_hw *hw, u32 value)struct wl12xx *wl = hw->priv;int ret; +mutex_lock (&wl->mutex); + ret =wl12xx_acx_rts_threshold (wl, (u16 ) value);if (ret <0 )wl12xx_warning ("wl12xx_op_set_rts_threshold failed: %d" , ret); +mutex_unlock (&wl->mutex); +return ret; }
PATCH 20/33 wl12xx: optimise elp wakeup and sleep calls
In reply to Kalle ValoFrom: Kalle Valo <[email protected]>
The wakeup call was done too deep in code path, it's better to wakeup chip from higher levels. This will also reduce wakeup calls significantly.
---
drivers/net/wireless/wl12xx/cmd.c | 13 ------------- drivers/net/wireless/wl12xx/debugfs.c | 5 +++++ drivers/net/wireless/wl12xx/main.c | 20 ++++++++++++++++++++ 3 files changed, 25 insertions(+), 13 deletions(-)
drivers/net/wireless/wl12xx/cmd.c +0 -13
@@ -32,8 +32,6 @@ int wl12xx_cmd_send(struct wl12xx *wl, u16 id, void *buf, size_t len)WARN_ON (len %4 !=0 ); -wl12xx_ps_elp_wakeup (wl); -wl12xx_spi_mem_write (wl, wl->cmd_box_addr, buf, len);wl12xx_reg_write32 (wl,ACX_REG_INTERRUPT_TRIG ,INTR_TRIG_CMD );
@@ -57,8 +55,6 @@ int wl12xx_cmd_send(struct wl12xx *wl, u16 id, void *buf, size_t len) wl->chip.intr_cmd_complete); out: -wl12xx_ps_elp_sleep (wl); -return ret; }
@@ -91,13 +87,8 @@ int wl12xx_cmd_test(struct wl12xx *wl, void *buf, size_t buf_len, u8 answer)* The answer would be a wl12xx_command, where the * parameter array contains the actual answer. */ - -wl12xx_ps_elp_wakeup (wl); -wl12xx_spi_mem_read (wl, wl->cmd_box_addr, buf, buf_len); -wl12xx_ps_elp_sleep (wl); - cmd_answer = buf;if (cmd_answer->header.status !=CMD_STATUS_SUCCESS )
@@ -134,13 +125,9 @@ int wl12xx_cmd_interrogate(struct wl12xx *wl, u16 id, void *buf, size_t len) goto out; } -wl12xx_ps_elp_wakeup (wl); -/* the interrogate command got in, we can read the answer */ wl12xx_spi_mem_read (wl, wl->cmd_box_addr, buf, len); -wl12xx_ps_elp_sleep (wl); - acx = buf;if (acx->cmd.status !=CMD_STATUS_SUCCESS ) wl12xx_error("INTERROGATE command error: %d",
drivers/net/wireless/wl12xx/debugfs.c +5 -0
@@ -27,6 +27,7 @@#include "wl12xx.h" #include "acx.h" +#include "ps.h" /* ms */ #define WL12XX_DEBUGFS_STATS_LIFETIME 1000
@@ -96,6 +97,8 @@ static void wl12xx_debugfs_update_stats(struct wl12xx *wl) {mutex_lock (&wl->mutex); +wl12xx_ps_elp_wakeup (wl); +if (wl->state ==WL12XX_STATE_ON &&time_after (jiffies, wl->stats.fw_stats_update +msecs_to_jiffies (WL12XX_DEBUGFS_STATS_LIFETIME ))) {
@@ -103,6 +106,8 @@ static void wl12xx_debugfs_update_stats(struct wl12xx *wl) wl->stats.fw_stats_update = jiffies; } +wl12xx_ps_elp_sleep (wl); +mutex_unlock (&wl->mutex); }
drivers/net/wireless/wl12xx/main.c +20 -0
@@ -239,11 +239,14 @@ static void wl12xx_filter_work(struct work_struct *work)if (wl->state ==WL12XX_STATE_OFF ) goto out; +wl12xx_ps_elp_wakeup (wl); + ret =wl12xx_cmd_join (wl, wl->bss_type,1 ,100 ,0 );if (ret <0 ) goto out; out: +wl12xx_ps_elp_sleep (wl);mutex_unlock (&wl->mutex); }
@@ -521,6 +524,8 @@ static int wl12xx_op_config(struct ieee80211_hw *hw, u32 changed)mutex_lock (&wl->mutex); +wl12xx_ps_elp_wakeup (wl); +if (channel != wl->channel) {/* FIXME: use beacon interval provided by mac80211 */ ret =wl12xx_cmd_join (wl, wl->bss_type,1 ,100 ,0 );
@@ -564,6 +569,7 @@ static int wl12xx_op_config(struct ieee80211_hw *hw, u32 changed) } out: +wl12xx_ps_elp_sleep (wl);mutex_unlock (&wl->mutex);return ret; }
@@ -702,6 +708,8 @@ static int wl12xx_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,mutex_lock (&wl->mutex); +wl12xx_ps_elp_wakeup (wl); +switch (cmd) {case SET_KEY : wl_cmd->key_action =KEY_ADD_OR_REPLACE ;
@@ -752,6 +760,7 @@ static int wl12xx_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, } out_unlock: +wl12xx_ps_elp_sleep (wl);mutex_unlock (&wl->mutex); out:
@@ -946,7 +955,11 @@ static int wl12xx_op_hw_scan(struct ieee80211_hw *hw, }mutex_lock (&wl->mutex); +wl12xx_ps_elp_wakeup (wl); + ret =wl12xx_hw_scan (hw->priv, ssid, ssid_len,1 ,0 ,13 ,3 ); + +wl12xx_ps_elp_sleep (wl);mutex_unlock (&wl->mutex);return ret;
@@ -959,11 +972,15 @@ static int wl12xx_op_set_rts_threshold(struct ieee80211_hw *hw, u32 value)mutex_lock (&wl->mutex); +wl12xx_ps_elp_wakeup (wl); + ret =wl12xx_acx_rts_threshold (wl, (u16 ) value);if (ret <0 )wl12xx_warning ("wl12xx_op_set_rts_threshold failed: %d" , ret); +wl12xx_ps_elp_sleep (wl); +mutex_unlock (&wl->mutex);return ret;
@@ -983,6 +1000,8 @@ static void wl12xx_op_bss_info_changed(struct ieee80211_hw *hw,mutex_lock (&wl->mutex); +wl12xx_ps_elp_wakeup (wl); +if (changed &BSS_CHANGED_ASSOC ) {if (bss_conf->assoc) { wl->aid = bss_conf->aid;
@@ -1072,6 +1091,7 @@ static void wl12xx_op_bss_info_changed(struct ieee80211_hw *hw, } out: +wl12xx_ps_elp_sleep (wl);mutex_unlock (&wl->mutex); }
PATCH 21/33 wl12xx: check if elp wakeup failed
In reply to Kalle ValoFrom: Kalle Valo <[email protected]>
Check the return call from wl12xx_ps_elp_wakeup() and bail out if it fails. This shouldn't happen, but if does there's a fundamental low level issue.
---
drivers/net/wireless/wl12xx/debugfs.c | 7 +++ drivers/net/wireless/wl12xx/main.c | 66 +++++++++++++++++++++---------- drivers/net/wireless/wl12xx/wl1251.c | 6 ++- drivers/net/wireless/wl12xx/wl1251_tx.c | 4 +- 4 files changed, 59 insertions(+), 24 deletions(-)
drivers/net/wireless/wl12xx/debugfs.c +6 -1
@@ -95,9 +95,13 @@ static const struct file_operations sub## _ ##name## _ops = { \ static void wl12xx_debugfs_update_stats(struct wl12xx *wl) { + int ret; + mutex_lock(&wl->mutex); - wl12xx_ps_elp_wakeup(wl); + ret = wl12xx_ps_elp_wakeup(wl); + if (ret < 0) + goto out; if (wl->state == WL12XX_STATE_ON && time_after(jiffies, wl->stats.fw_stats_update +
@@ -108,6 +112,7 @@ static void wl12xx_debugfs_update_stats(struct wl12xx *wl)wl12xx_ps_elp_sleep (wl); +out:mutex_unlock (&wl->mutex); }
drivers/net/wireless/wl12xx/main.c +45 -21
186 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251.c +5 -1
@@ -401,6 +401,7 @@ static void wl1251_irq_work(struct work_struct *work)u32 intr;struct wl12xx *wl = container_of(work, struct wl12xx, irq_work); +int ret;mutex_lock (&wl->mutex);
@@ -409,7 +410,9 @@ static void wl1251_irq_work(struct work_struct *work)if (wl->state ==WL12XX_STATE_OFF ) goto out; -wl12xx_ps_elp_wakeup (wl); + ret =wl12xx_ps_elp_wakeup (wl); +if (ret <0 ) + goto out;wl12xx_reg_write32 (wl,ACX_REG_INTERRUPT_MASK ,WL1251_ACX_INTR_ALL );
@@ -489,6 +492,7 @@ static void wl1251_irq_work(struct work_struct *work) out_sleep:wl12xx_ps_elp_sleep (wl); + out:mutex_unlock (&wl->mutex); }
drivers/net/wireless/wl12xx/wl1251_tx.c +3 -1
@@ -311,7 +311,9 @@ void wl1251_tx_work(struct work_struct *work)while ((skb =skb_dequeue (&wl->tx_queue))) {if (!woken_up) { -wl12xx_ps_elp_wakeup (wl); + ret =wl12xx_ps_elp_wakeup (wl); +if (ret <0 ) + goto out; woken_up = true; }
PATCH 22/33 wl12xx: enable ELP mode
In reply to Kalle ValoFrom: Kalle Valo <[email protected]>
ELP mode is working now, let's enable it so that the firmware can sleep and reduce power consumption.
---
drivers/net/wireless/wl12xx/ps.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-)
drivers/net/wireless/wl12xx/ps.c +1 -5
@@ -85,11 +85,7 @@ static int wl12xx_ps_set_elp(struct wl12xx *wl, bool enable)if (enable) {wl12xx_debug (DEBUG_PSM ,"sleep auth psm/elp" ); -/* -* FIXME: we should PSM_ELP, but because of firmware wakeup -* problems let's use only PSM_PS -*/ - ret =wl12xx_acx_sleep_auth (wl,WL12XX_PSM_PS ); + ret =wl12xx_acx_sleep_auth (wl,WL12XX_PSM_ELP );if (ret <0 )return ret;
PATCH 23/33 wl12xx: Assign value to rx msdu lifetime variable
In reply to Kalle ValoFrom: Vidhya Govindan <[email protected]>
The patch "wl12xx: cmd and acx interface rework" failed to assign MSDU lifetime value in wl12xx_acx_rx_msdu_life_time() and breaks the functionality. This patch fixes the regression by assigning the correct value.
---
drivers/net/wireless/wl12xx/acx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/net/wireless/wl12xx/acx.c +1 -0
@@ -317,6 +317,7 @@ int wl12xx_acx_rx_msdu_life_time(struct wl12xx *wl, u32 life_time) goto out; } + acx->lifetime = life_time; ret =wl12xx_cmd_configure (wl,DOT11_RX_MSDU_LIFE_TIME , acx,sizeof (*acx));if (ret <0 ) {
PATCH 24/33 wl12xx: Use chipset specific join commands
In reply to Kalle ValoFrom: Juuso Oikarinen <[email protected]>
Add implementation to use chipset specific join commands.
---
drivers/net/wireless/wl12xx/cmd.c | 2 +- drivers/net/wireless/wl12xx/cmd.h | 2 +- drivers/net/wireless/wl12xx/main.c | 9 +++++---- drivers/net/wireless/wl12xx/wl1251.c | 1 + drivers/net/wireless/wl12xx/wl12xx.h | 2 ++ 5 files changed, 10 insertions(+), 6 deletions(-)
drivers/net/wireless/wl12xx/cmd.c +1 -1
@@ -253,7 +253,7 @@ out:return ret; } -int wl12xx_cmd_join (struct wl12xx *wl,u8 bss_type,u8 dtim_interval, +int wl1251_cmd_join (struct wl12xx *wl,u8 bss_type,u8 dtim_interval,u16 beacon_interval,u8 wait) {unsigned long timeout;
drivers/net/wireless/wl12xx/cmd.h +1 -1
@@ -36,7 +36,7 @@ int wl12xx_cmd_configure(struct wl12xx *wl, u16 id, void *buf, size_t len);int wl12xx_cmd_vbm (struct wl12xx *wl,u8 identity,void *bitmap,u16 bitmap_len,u8 bitmap_control);int wl12xx_cmd_data_path (struct wl12xx *wl,u8 channel,bool enable); -int wl12xx_cmd_join (struct wl12xx *wl,u8 bss_type,u8 dtim_interval, +int wl1251_cmd_join (struct wl12xx *wl,u8 bss_type,u8 dtim_interval,u16 beacon_interval,u8 wait);int wl12xx_cmd_ps_mode (struct wl12xx *wl,u8 ps_mode); int wl12xx_cmd_read_memory(struct wl12xx *wl, u32 addr, void *answer,
drivers/net/wireless/wl12xx/main.c +5 -4
@@ -243,7 +243,8 @@ static void wl12xx_filter_work(struct work_struct *work)if (ret <0 ) goto out; - ret =wl12xx_cmd_join (wl, wl->bss_type,1 ,100 ,0 ); +/* FIXME: replace the magic numbers with proper definitions */ + ret = wl->chip.op_cmd_join (wl, wl->bss_type,1 ,100 ,0 );if (ret <0 ) goto out_sleep;
@@ -534,7 +535,7 @@ static int wl12xx_op_config(struct ieee80211_hw *hw, u32 changed)if (channel != wl->channel) {/* FIXME: use beacon interval provided by mac80211 */ - ret =wl12xx_cmd_join (wl, wl->bss_type,1 ,100 ,0 ); + ret = wl->chip.op_cmd_join (wl, wl->bss_type,1 ,100 ,0 );if (ret <0 ) goto out_sleep;
@@ -1082,7 +1083,7 @@ static void wl12xx_op_bss_info_changed(struct ieee80211_hw *hw, goto out;if (wl->bss_type !=BSS_TYPE_IBSS ) { - ret =wl12xx_cmd_join (wl, wl->bss_type,5 ,100 ,1 ); + ret = wl->chip.op_cmd_join (wl, wl->bss_type,5 ,100 ,1 );if (ret <0 ) goto out; }
@@ -1106,7 +1107,7 @@ static void wl12xx_op_bss_info_changed(struct ieee80211_hw *hw,if (ret <0 ) goto out; - ret =wl12xx_cmd_join (wl, wl->bss_type,1 ,100 ,0 ); + ret = wl->chip.op_cmd_join (wl, wl->bss_type,1 ,100 ,0 );if (ret <0 ) goto out;
drivers/net/wireless/wl12xx/wl1251.c +1 -0
@@ -717,6 +717,7 @@ void wl1251_setup(struct wl12xx *wl) wl->chip.op_plt_init = wl1251_plt_init; wl->chip.op_fw_version = wl1251_fw_version; wl->chip.op_tx_flush = wl1251_tx_flush; + wl->chip.op_cmd_join = wl1251_cmd_join; wl->chip.p_table = wl1251_part_table; wl->chip.acx_reg_table = wl1251_acx_reg_table;
drivers/net/wireless/wl12xx/wl12xx.h +2 -0
@@ -165,6 +165,8 @@ struct wl12xx_chip {int (*op_plt_init)(struct wl12xx *wl);void (*op_tx_flush)(struct wl12xx *wl);void (*op_fw_version)(struct wl12xx *wl); +int (*op_cmd_join)(struct wl12xx *wl,u8 bss_type,u8 dtim_interval, +u16 beacon_interval,u8 wait);struct wl12xx_partition_set *p_table;enum wl12xx_acx_int_reg *acx_reg_table;
PATCH 25/33 wl12xx: rename wl1251.c wl1251_ops.c
In reply to Kalle ValoFrom: Kalle Valo <[email protected]>
In preparation to split wl12xx to wl1251 and wl1271.
---
drivers/net/wireless/wl12xx/Makefile | 2 drivers/net/wireless/wl12xx/main.c | 2 drivers/net/wireless/wl12xx/wl1251.c | 728 ------------------------------ drivers/net/wireless/wl12xx/wl1251.h | 165 ------- drivers/net/wireless/wl12xx/wl1251_ops.c | 728 ++++++++++++++++++++++++++++++ drivers/net/wireless/wl12xx/wl1251_ops.h | 165 +++++++ 6 files changed, 895 insertions(+), 895 deletions(-) delete mode 100644 drivers/net/wireless/wl12xx/wl1251.c delete mode 100644 drivers/net/wireless/wl12xx/wl1251.h create mode 100644 drivers/net/wireless/wl12xx/wl1251_ops.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_ops.h
drivers/net/wireless/wl12xx/Makefile +1 -1
@@ -1,4 +1,4 @@ wl12xx-objs = main.o spi.o event.o wl1251_tx.o rx.o \ - ps.o cmd.o acx.o boot.o init.o wl1251.o \ + ps.o cmd.o acx.o boot.o init.o wl1251_ops.o \ debugfs.o obj-$(CONFIG_WL12XX) += wl12xx.o
drivers/net/wireless/wl12xx/main.c +1 -1
@@ -34,7 +34,7 @@#include "wl12xx.h" #include "wl12xx_80211.h" #include "reg.h" -#include "wl1251.h" +#include "wl1251_ops.h" #include "spi.h" #include "event.h" #include "wl1251_tx.h"
drivers/net/wireless/wl12xx/wl1251.c deleted +0 -728
728 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251.h deleted +0 -165
165 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_ops.c new file +728 -0
728 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_ops.h new file +165 -0
165 lines not on this page · raw message
PATCH 26/33 wl12xx: rename driver to wl1251
In reply to Kalle ValoFrom: Kalle Valo <[email protected]>
Rename driver to wl1251.ko in preparation for wl1271 driver.
---
drivers/net/wireless/wl12xx/Kconfig | 17 ++++++++++++----- drivers/net/wireless/wl12xx/Makefile | 4 ++-- 2 files changed, 14 insertions(+), 7 deletions(-)
drivers/net/wireless/wl12xx/Kconfig +12 -5
@@ -1,11 +1,18 @@ -config WL12XX - tristate "TI wl1251/wl1271 support" - depends on MAC80211 && WLAN_80211 && SPI_MASTER && GENERIC_HARDIRQS && EXPERIMENTAL +menuconfig WL12XX + boolean "TI wl12xx driver support" + depends on MAC80211 && WLAN_80211 && EXPERIMENTAL + ---help--- + This will enable TI wl12xx driver support. The drivers make + use of the mac80211 stack. + +config WL1251 + tristate "TI wl1251 support" + depends on WL12XX && SPI_MASTER && GENERIC_HARDIRQS select FW_LOADER select CRC7 ---help--- This module adds support for wireless adapters based on - TI wl1251/wl1271 chipsets. + TI wl1251 chipset. - If you choose to build a module, it'll be called wl12xx. Say N if + If you choose to build a module, it'll be called wl1251. Say N if unsure.
drivers/net/wireless/wl12xx/Makefile +2 -2
@@ -1,4 +1,4 @@ -wl12xx-objs = main.o spi.o event.o wl1251_tx.o rx.o \ +wl1251-objs = main.o spi.o event.o wl1251_tx.o rx.o \ ps.o cmd.o acx.o boot.o init.o wl1251_ops.o \ debugfs.o -obj-$(CONFIG_WL12XX) += wl12xx.o +obj-$(CONFIG_WL1251) += wl1251.o
PATCH 27/33 wl1251: remove wl1271_setup()
In reply to Kalle ValoFrom: Kalle Valo <[email protected]>
We don't want to have any 1271 code in wl1251.
---
drivers/net/wireless/wl12xx/main.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-)
drivers/net/wireless/wl12xx/main.c +0 -8
@@ -195,14 +195,6 @@ static int wl12xx_chip_wakeup(struct wl12xx *wl)wl1251_setup (wl);break ; -case CHIP_ID_1271_PG10 : -wl12xx_warning ("chip id 0x%x (1271 PG10) support is obsolete" , - wl->chip.id); -break ; -case CHIP_ID_1271_PG20 : -wl12xx_debug (DEBUG_BOOT ,"chip id 0x%x (1271 PG20)" , - wl->chip.id); -break ;case CHIP_ID_1251_PG10 :case CHIP_ID_1251_PG11 :default :
PATCH 28/33 wl1251: add wl1251 prefix to all 1251 files
In reply to Kalle ValoFrom: Kalle Valo <[email protected]>
Now that all 1271 files are split, we can add wl1251_ prefix to the files.
---
drivers/net/wireless/wl12xx/Makefile | 7 drivers/net/wireless/wl12xx/acx.c | 841 --------------- drivers/net/wireless/wl12xx/acx.h | 1146 --------------------- drivers/net/wireless/wl12xx/boot.c | 297 ----- drivers/net/wireless/wl12xx/boot.h | 40 - drivers/net/wireless/wl12xx/cmd.c | 429 -------- drivers/net/wireless/wl12xx/cmd.h | 407 ------- drivers/net/wireless/wl12xx/debugfs.c | 518 --------- drivers/net/wireless/wl12xx/debugfs.h | 33 - drivers/net/wireless/wl12xx/event.c | 127 -- drivers/net/wireless/wl12xx/event.h | 121 -- drivers/net/wireless/wl12xx/init.c | 200 ---- drivers/net/wireless/wl12xx/init.h | 40 - drivers/net/wireless/wl12xx/main.c | 1442 -------------------------- drivers/net/wireless/wl12xx/ps.c | 147 --- drivers/net/wireless/wl12xx/ps.h | 36 - drivers/net/wireless/wl12xx/rx.c | 194 --- drivers/net/wireless/wl12xx/rx.h | 122 -- drivers/net/wireless/wl12xx/spi.c | 395 ------- drivers/net/wireless/wl12xx/spi.h | 115 -- drivers/net/wireless/wl12xx/wl1251_acx.c | 841 +++++++++++++++ drivers/net/wireless/wl12xx/wl1251_acx.h | 1146 +++++++++++++++++++++ drivers/net/wireless/wl12xx/wl1251_boot.c | 297 +++++ drivers/net/wireless/wl12xx/wl1251_boot.h | 40 + drivers/net/wireless/wl12xx/wl1251_cmd.c | 429 ++++++++ drivers/net/wireless/wl12xx/wl1251_cmd.h | 407 +++++++ drivers/net/wireless/wl12xx/wl1251_debugfs.c | 518 +++++++++ drivers/net/wireless/wl12xx/wl1251_debugfs.h | 33 + drivers/net/wireless/wl12xx/wl1251_event.c | 127 ++ drivers/net/wireless/wl12xx/wl1251_event.h | 121 ++ drivers/net/wireless/wl12xx/wl1251_init.c | 200 ++++ drivers/net/wireless/wl12xx/wl1251_init.h | 40 + drivers/net/wireless/wl12xx/wl1251_main.c | 1442 ++++++++++++++++++++++++++ drivers/net/wireless/wl12xx/wl1251_netlink.c | 679 ++++++++++++ drivers/net/wireless/wl12xx/wl1251_netlink.h | 30 + drivers/net/wireless/wl12xx/wl1251_ops.c | 14 drivers/net/wireless/wl12xx/wl1251_ops.h | 2 drivers/net/wireless/wl12xx/wl1251_ps.c | 147 +++ drivers/net/wireless/wl12xx/wl1251_ps.h | 36 + drivers/net/wireless/wl12xx/wl1251_rx.c | 195 ++++ drivers/net/wireless/wl12xx/wl1251_rx.h | 122 ++ drivers/net/wireless/wl12xx/wl1251_spi.c | 394 +++++++ drivers/net/wireless/wl12xx/wl1251_spi.h | 115 ++ drivers/net/wireless/wl12xx/wl1251_tx.c | 4 44 files changed, 7373 insertions(+), 6663 deletions(-) delete mode 100644 drivers/net/wireless/wl12xx/acx.c delete mode 100644 drivers/net/wireless/wl12xx/acx.h delete mode 100644 drivers/net/wireless/wl12xx/boot.c delete mode 100644 drivers/net/wireless/wl12xx/boot.h delete mode 100644 drivers/net/wireless/wl12xx/cmd.c delete mode 100644 drivers/net/wireless/wl12xx/cmd.h delete mode 100644 drivers/net/wireless/wl12xx/debugfs.c delete mode 100644 drivers/net/wireless/wl12xx/debugfs.h delete mode 100644 drivers/net/wireless/wl12xx/event.c delete mode 100644 drivers/net/wireless/wl12xx/event.h delete mode 100644 drivers/net/wireless/wl12xx/init.c delete mode 100644 drivers/net/wireless/wl12xx/init.h delete mode 100644 drivers/net/wireless/wl12xx/main.c delete mode 100644 drivers/net/wireless/wl12xx/ps.c delete mode 100644 drivers/net/wireless/wl12xx/ps.h delete mode 100644 drivers/net/wireless/wl12xx/rx.c delete mode 100644 drivers/net/wireless/wl12xx/rx.h delete mode 100644 drivers/net/wireless/wl12xx/spi.c delete mode 100644 drivers/net/wireless/wl12xx/spi.h create mode 100644 drivers/net/wireless/wl12xx/wl1251_acx.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_acx.h create mode 100644 drivers/net/wireless/wl12xx/wl1251_boot.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_boot.h create mode 100644 drivers/net/wireless/wl12xx/wl1251_cmd.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_cmd.h create mode 100644 drivers/net/wireless/wl12xx/wl1251_debugfs.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_debugfs.h create mode 100644 drivers/net/wireless/wl12xx/wl1251_event.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_event.h create mode 100644 drivers/net/wireless/wl12xx/wl1251_init.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_init.h create mode 100644 drivers/net/wireless/wl12xx/wl1251_main.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_netlink.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_netlink.h create mode 100644 drivers/net/wireless/wl12xx/wl1251_ps.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_ps.h create mode 100644 drivers/net/wireless/wl12xx/wl1251_rx.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_rx.h create mode 100644 drivers/net/wireless/wl12xx/wl1251_spi.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_spi.h
drivers/net/wireless/wl12xx/Makefile +4 -3
@@ -1,4 +1,5 @@ -wl1251-objs = main.o spi.o event.o wl1251_tx.o rx.o \ - ps.o cmd.o acx.o boot.o init.o wl1251_ops.o \ - debugfs.o +wl1251-objs = wl1251_main.o wl1251_spi.o wl1251_event.o \ + wl1251_tx.o wl1251_rx.o wl1251_ps.o wl1251_cmd.o \ + wl1251_acx.o wl1251_boot.o wl1251_init.o \ + wl1251_ops.o wl1251_debugfs.o obj-$(CONFIG_WL1251) += wl1251.o
drivers/net/wireless/wl12xx/acx.c deleted +0 -841
841 lines not on this page · raw message
drivers/net/wireless/wl12xx/acx.h deleted +0 -1146
1,146 lines not on this page · raw message
drivers/net/wireless/wl12xx/boot.c deleted +0 -297
297 lines not on this page · raw message
drivers/net/wireless/wl12xx/boot.h deleted +0 -40
@@ -1,40 +0,0 @@ -/* -* This file is part of wl12xx -* -* Copyright (C) 2008 Nokia Corporation -* -* Contact: Kalle Valo <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* version 2 as published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA -* -*/ - -#ifndef __BOOT_H__ -#define __BOOT_H__ - -#include "wl12xx.h" - -int wl12xx_boot_soft_reset (struct wl12xx *wl); -int wl12xx_boot_init_seq (struct wl12xx *wl); -int wl12xx_boot_run_firmware (struct wl12xx *wl); -void wl12xx_boot_target_enable_interrupts (struct wl12xx *wl); - -/* number of times we try to read the INIT interrupt */ -#define INIT_LOOP 20000 - -/* delay between retries */ -#define INIT_LOOP_DELAY 50 - -#endif
drivers/net/wireless/wl12xx/cmd.c deleted +0 -429
429 lines not on this page · raw message
drivers/net/wireless/wl12xx/cmd.h deleted +0 -407
239 lines not on this page · raw message
drivers/net/wireless/wl12xx/debugfs.c deleted +0 -518
518 lines not on this page · raw message
drivers/net/wireless/wl12xx/debugfs.h deleted +0 -33
Lines of this file are not shown. View the raw message.
drivers/net/wireless/wl12xx/event.c deleted +0 -127
127 lines not on this page · raw message
drivers/net/wireless/wl12xx/event.h deleted +0 -121
121 lines not on this page · raw message
drivers/net/wireless/wl12xx/init.c deleted +0 -200
200 lines not on this page · raw message
drivers/net/wireless/wl12xx/init.h deleted +0 -40
Lines of this file are not shown. View the raw message.
drivers/net/wireless/wl12xx/main.c deleted +0 -1442
1,442 lines not on this page · raw message
drivers/net/wireless/wl12xx/ps.c deleted +0 -147
147 lines not on this page · raw message
drivers/net/wireless/wl12xx/ps.h deleted +0 -36
Lines of this file are not shown. View the raw message.
drivers/net/wireless/wl12xx/rx.c deleted +0 -194
194 lines not on this page · raw message
drivers/net/wireless/wl12xx/rx.h deleted +0 -122
122 lines not on this page · raw message
drivers/net/wireless/wl12xx/spi.c deleted +0 -395
395 lines not on this page · raw message
drivers/net/wireless/wl12xx/spi.h deleted +0 -115
115 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_acx.c new file +841 -0
841 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_acx.h new file +1146 -0
1,146 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_boot.c new file +297 -0
297 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_boot.h new file +40 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/wl12xx/wl1251_cmd.c new file +429 -0
429 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_cmd.h new file +407 -0
407 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_debugfs.c new file +518 -0
518 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_debugfs.h new file +33 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/wl12xx/wl1251_event.c new file +127 -0
127 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_event.h new file +121 -0
121 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_init.c new file +200 -0
200 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_init.h new file +40 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/wl12xx/wl1251_main.c new file +1442 -0
1,442 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_netlink.c new file +679 -0
679 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_netlink.h new file +30 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/wl12xx/wl1251_ops.c +7 -7
Lines of this file are not shown. View the raw message.
drivers/net/wireless/wl12xx/wl1251_ops.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/wl12xx/wl1251_ps.c new file +147 -0
147 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_ps.h new file +36 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/wl12xx/wl1251_rx.c new file +195 -0
195 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_rx.h new file +122 -0
122 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_spi.c new file +394 -0
394 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_spi.h new file +115 -0
115 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_tx.c +2 -2
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
PATCH 29/33 wl1251: rename wl12xx.h to wl1251.h
In reply to Kalle ValoFrom: Kalle Valo <[email protected]>
wl12xx.h is now only used by 1251 code, so we can rename it.
---
drivers/net/wireless/wl12xx/reg.h | 1 drivers/net/wireless/wl12xx/wl1251.h | 420 ++++++++++++++++++++++++++ drivers/net/wireless/wl12xx/wl1251_acx.c | 2 drivers/net/wireless/wl12xx/wl1251_acx.h | 2 drivers/net/wireless/wl12xx/wl1251_boot.h | 2 drivers/net/wireless/wl12xx/wl1251_cmd.c | 2 drivers/net/wireless/wl12xx/wl1251_cmd.h | 2 drivers/net/wireless/wl12xx/wl1251_debugfs.c | 2 drivers/net/wireless/wl12xx/wl1251_debugfs.h | 2 drivers/net/wireless/wl12xx/wl1251_event.c | 2 drivers/net/wireless/wl12xx/wl1251_init.h | 2 drivers/net/wireless/wl12xx/wl1251_main.c | 2 drivers/net/wireless/wl12xx/wl1251_netlink.c | 2 drivers/net/wireless/wl12xx/wl1251_ops.h | 2 drivers/net/wireless/wl12xx/wl1251_ps.h | 2 drivers/net/wireless/wl12xx/wl1251_rx.c | 2 drivers/net/wireless/wl12xx/wl1251_rx.h | 2 drivers/net/wireless/wl12xx/wl1251_spi.c | 2 drivers/net/wireless/wl12xx/wl1251_tx.c | 2 drivers/net/wireless/wl12xx/wl12xx.h | 420 -------------------------- 20 files changed, 438 insertions(+), 437 deletions(-) create mode 100644 drivers/net/wireless/wl12xx/wl1251.h delete mode 100644 drivers/net/wireless/wl12xx/wl12xx.h
drivers/net/wireless/wl12xx/reg.h +0 -1
@@ -26,7 +26,6 @@#define __REG_H__#include <linux/bitops.h> -#include "wl12xx.h" #define REGISTERS_BASE 0x00300000#define DRPW_BASE 0x00310000
drivers/net/wireless/wl12xx/wl1251.h new file +420 -0
420 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_acx.c +1 -1
@@ -4,7 +4,7 @@#include <linux/crc7.h> #include <linux/spi/spi.h> -#include "wl12xx.h" +#include "wl1251.h" #include "wl12xx_80211.h" #include "reg.h" #include "wl1251_spi.h"
drivers/net/wireless/wl12xx/wl1251_acx.h +1 -1
@@ -25,7 +25,7 @@#ifndef __WL12XX_ACX_H__#define __WL12XX_ACX_H__ -#include "wl12xx.h" +#include "wl1251.h" #include "wl1251_cmd.h" /* Target's information element */
drivers/net/wireless/wl12xx/wl1251_boot.h +1 -1
@@ -24,7 +24,7 @@#ifndef __BOOT_H__#define __BOOT_H__ -#include "wl12xx.h" +#include "wl1251.h" int wl12xx_boot_soft_reset (struct wl12xx *wl);int wl12xx_boot_init_seq (struct wl12xx *wl);
drivers/net/wireless/wl12xx/wl1251_cmd.c +1 -1
@@ -4,7 +4,7 @@#include <linux/crc7.h> #include <linux/spi/spi.h> -#include "wl12xx.h" +#include "wl1251.h" #include "wl12xx_80211.h" #include "reg.h" #include "wl1251_spi.h"
drivers/net/wireless/wl12xx/wl1251_cmd.h +1 -1
@@ -25,7 +25,7 @@#ifndef __WL12XX_CMD_H__#define __WL12XX_CMD_H__ -#include "wl12xx.h" +#include "wl1251.h" struct acx_header ;
drivers/net/wireless/wl12xx/wl1251_debugfs.c +1 -1
@@ -25,7 +25,7 @@#include <linux/skbuff.h> -#include "wl12xx.h" +#include "wl1251.h" #include "wl1251_acx.h" #include "wl1251_ps.h"
drivers/net/wireless/wl12xx/wl1251_debugfs.h +1 -1
@@ -24,7 +24,7 @@#ifndef WL12XX_DEBUGFS_H #define WL12XX_DEBUGFS_H -#include "wl12xx.h" +#include "wl1251.h" int wl12xx_debugfs_init (struct wl12xx *wl);void wl12xx_debugfs_exit (struct wl12xx *wl);
drivers/net/wireless/wl12xx/wl1251_event.c +1 -1
@@ -22,7 +22,7 @@* */ -#include "wl12xx.h" +#include "wl1251.h" #include "reg.h" #include "wl1251_spi.h" #include "wl1251_event.h"
drivers/net/wireless/wl12xx/wl1251_init.h +1 -1
@@ -24,7 +24,7 @@#ifndef __WL12XX_INIT_H__#define __WL12XX_INIT_H__ -#include "wl12xx.h" +#include "wl1251.h" int wl12xx_hw_init_hwenc_config (struct wl12xx *wl);int wl12xx_hw_init_templates_config (struct wl12xx *wl);
drivers/net/wireless/wl12xx/wl1251_main.c +1 -1
@@ -31,7 +31,7 @@#include <linux/etherdevice.h> #include <linux/spi/wl12xx.h> -#include "wl12xx.h" +#include "wl1251.h" #include "wl12xx_80211.h" #include "reg.h" #include "wl1251_ops.h"
drivers/net/wireless/wl12xx/wl1251_netlink.c +1 -1
@@ -30,7 +30,7 @@#include <net/wireless.h> #include <net/mac80211.h> -#include "wl12xx.h" +#include "wl1251.h" #include "wl1251_spi.h" #include "wl1251_acx.h"
drivers/net/wireless/wl12xx/wl1251_ops.h +1 -1
@@ -26,7 +26,7 @@#include <linux/bitops.h> -#include "wl12xx.h" +#include "wl1251.h" #include "wl1251_acx.h" #define WL1251_FW_NAME "wl1251-fw.bin"
drivers/net/wireless/wl12xx/wl1251_ps.h +1 -1
@@ -25,7 +25,7 @@* */ -#include "wl12xx.h" +#include "wl1251.h" #include "wl1251_acx.h" int wl12xx_ps_set_mode (struct wl12xx *wl,enum wl12xx_cmd_ps_mode mode);
drivers/net/wireless/wl12xx/wl1251_rx.c +1 -1
@@ -25,7 +25,7 @@#include <linux/skbuff.h> #include <net/mac80211.h> -#include "wl12xx.h" +#include "wl1251.h" #include "reg.h" #include "wl1251_spi.h" #include "wl1251_rx.h"
drivers/net/wireless/wl12xx/wl1251_rx.h +2 -0
@@ -27,6 +27,8 @@#include <linux/bitops.h> +#include "wl1251.h" +/* * RX PATH *
drivers/net/wireless/wl12xx/wl1251_spi.c +1 -1
@@ -25,7 +25,7 @@#include <linux/crc7.h> #include <linux/spi/spi.h> -#include "wl12xx.h" +#include "wl1251.h" #include "wl12xx_80211.h" #include "reg.h" #include "wl1251_spi.h"
drivers/net/wireless/wl12xx/wl1251_tx.c +1 -1
@@ -25,7 +25,7 @@#include <linux/kernel.h> #include <linux/module.h> -#include "wl12xx.h" +#include "wl1251.h" #include "reg.h" #include "wl1251_spi.h" #include "wl1251_tx.h"
drivers/net/wireless/wl12xx/wl12xx.h deleted +0 -420
420 lines not on this page · raw message
PATCH 30/33 wl12xx: remove unused wl12xx_hw_init_mem_config()
In reply to Kalle ValoFrom: Kalle Valo <[email protected]>
The function declaration is a leftover from some earlier, already removed, code.
---
drivers/net/wireless/wl12xx/wl1251_init.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/net/wireless/wl12xx/wl1251_init.h +0 -1
@@ -28,7 +28,6 @@int wl12xx_hw_init_hwenc_config (struct wl12xx *wl);int wl12xx_hw_init_templates_config (struct wl12xx *wl); -int wl12xx_hw_init_mem_config (struct wl12xx *wl);int wl12xx_hw_init_rx_config (struct wl12xx *wl,u32 config,u32 filter);int wl12xx_hw_init_phy_config (struct wl12xx *wl);int wl12xx_hw_init_beacon_filter (struct wl12xx *wl);
PATCH 31/33 wl1251: use wl1251 prefix everywhere
In reply to Kalle ValoFrom: Kalle Valo <[email protected]>
Last we can change all code prefixes from wl12xx/WL12XX to wl1251/WL1251.
---
drivers/net/wireless/wl12xx/wl1251.h | 102 +++--- drivers/net/wireless/wl12xx/wl1251_acx.c | 229 ++++++------ drivers/net/wireless/wl12xx/wl1251_acx.h | 76 ++-- drivers/net/wireless/wl12xx/wl1251_boot.c | 106 +++--- drivers/net/wireless/wl12xx/wl1251_boot.h | 10 - drivers/net/wireless/wl12xx/wl1251_cmd.c | 133 ++++--- drivers/net/wireless/wl12xx/wl1251_cmd.h | 78 ++-- drivers/net/wireless/wl12xx/wl1251_debugfs.c | 48 +-- drivers/net/wireless/wl12xx/wl1251_debugfs.h | 14 - drivers/net/wireless/wl12xx/wl1251_event.c | 46 +-- drivers/net/wireless/wl12xx/wl1251_event.h | 12 - drivers/net/wireless/wl12xx/wl1251_init.c | 72 ++-- drivers/net/wireless/wl12xx/wl1251_init.h | 24 + drivers/net/wireless/wl12xx/wl1251_main.c | 477 +++++++++++++------------- drivers/net/wireless/wl12xx/wl1251_netlink.c | 400 +++++++++++----------- drivers/net/wireless/wl12xx/wl1251_netlink.h | 12 - drivers/net/wireless/wl12xx/wl1251_ops.c | 190 +++++----- drivers/net/wireless/wl12xx/wl1251_ops.h | 4 drivers/net/wireless/wl12xx/wl1251_ps.c | 56 ++- drivers/net/wireless/wl12xx/wl1251_ps.h | 14 - drivers/net/wireless/wl12xx/wl1251_rx.c | 52 +-- drivers/net/wireless/wl12xx/wl1251_rx.h | 20 + drivers/net/wireless/wl12xx/wl1251_spi.c | 107 +++--- drivers/net/wireless/wl12xx/wl1251_spi.h | 44 +- drivers/net/wireless/wl12xx/wl1251_tx.c | 70 ++-- drivers/net/wireless/wl12xx/wl1251_tx.h | 6 26 files changed, 1203 insertions(+), 1199 deletions(-)
drivers/net/wireless/wl12xx/wl1251.h +51 -51
@@ -1,5 +1,5 @@/* -* This file is part of wl12xx +* This file is part of wl1251 * * Copyright (c) 1998-2007 Texas Instruments Incorporated * Copyright (C) 2008-2009 Nokia Corporation
@@ -22,15 +22,15 @@* */ -#ifndef __WL12XX_H__ -#define __WL12XX_H__ +#ifndef __WL1251_H__ +#define __WL1251_H__#include <linux/mutex.h> #include <linux/list.h> #include <linux/bitops.h> #include <net/mac80211.h> -#define DRIVER_NAME "wl12xx" +#define DRIVER_NAME "wl1251"#define DRIVER_PREFIX DRIVER_NAME ": " enum {
@@ -56,25 +56,25 @@ enum {#define DEBUG_DUMP_LIMIT 1024 -#define wl12xx_error(fmt, arg...) \ +#define wl1251_error(fmt, arg...) \ printk(KERN_ERR DRIVER_PREFIX "ERROR " fmt "\n", ##arg) -#define wl12xx_warning(fmt, arg...) \ +#define wl1251_warning(fmt, arg...) \ printk(KERN_WARNING DRIVER_PREFIX "WARNING " fmt "\n", ##arg) -#define wl12xx_notice(fmt, arg...) \ +#define wl1251_notice(fmt, arg...) \ printk(KERN_INFO DRIVER_PREFIX fmt "\n", ##arg) -#define wl12xx_info(fmt, arg...) \ +#define wl1251_info(fmt, arg...) \ printk(KERN_DEBUG DRIVER_PREFIX fmt "\n", ##arg) -#define wl12xx_debug(level, fmt, arg...) \ +#define wl1251_debug(level, fmt, arg...) \ do { \ if (level & DEBUG_LEVEL) \ printk(KERN_DEBUG DRIVER_PREFIX fmt "\n", ##arg); \ } while (0) -#define wl12xx_dump (level, prefix, buf, len) \ +#define wl1251_dump (level, prefix, buf, len) \ do { \ if (level & DEBUG_LEVEL) \ print_hex_dump(KERN_DEBUG, DRIVER_PREFIX prefix, \
@@ -84,7 +84,7 @@ enum { 0); \ } while (0) -#define wl12xx_dump_ascii (level, prefix, buf, len) \ +#define wl1251_dump_ascii (level, prefix, buf, len) \ do { \ if (level & DEBUG_LEVEL) \ print_hex_dump(KERN_DEBUG, DRIVER_PREFIX prefix, \
@@ -94,10 +94,10 @@ enum { true); \ } while (0) -#define WL12XX_DEFAULT_RX_CONFIG (CFG_UNI_FILTER_EN | \ +#define WL1251_DEFAULT_RX_CONFIG (CFG_UNI_FILTER_EN | \ CFG_BSSID_FILTER_EN) -#define WL12XX_DEFAULT_RX_FILTER (CFG_RX_PRSP_EN | \ +#define WL1251_DEFAULT_RX_FILTER (CFG_RX_PRSP_EN | \ CFG_RX_MGMT_EN | \ CFG_RX_DATA_EN | \ CFG_RX_CTL_EN | \
@@ -105,7 +105,7 @@ enum { CFG_RX_AUTH_EN | \ CFG_RX_ASSOC_EN) -#define WL12XX_BUSY_WORD_LEN 8 +#define WL1251_BUSY_WORD_LEN 8struct boot_attr {u32 radio_type;
@@ -117,13 +117,13 @@ struct boot_attr {u32 bugfix; }; -enum wl12xx_state { -WL12XX_STATE_OFF , -WL12XX_STATE_ON , -WL12XX_STATE_PLT , +enum wl1251_state { +WL1251_STATE_OFF , +WL1251_STATE_ON , +WL1251_STATE_PLT , }; -enum wl12xx_partition_type { +enum wl1251_partition_type {PART_DOWN ,PART_WORK ,PART_DRPW ,
@@ -131,20 +131,20 @@ enum wl12xx_partition_type {PART_TABLE_LEN }; -struct wl12xx_partition { +struct wl1251_partition {u32 size;u32 start; }; -struct wl12xx_partition_set { -struct wl12xx_partition mem; -struct wl12xx_partition reg; +struct wl1251_partition_set { +struct wl1251_partition mem; +struct wl1251_partition reg; }; -struct wl12xx ; +struct wl1251 ;/* FIXME: I'm not sure about this structure name */ -struct wl12xx_chip { +struct wl1251_chip {u32 id;const char *fw_filename;
@@ -156,23 +156,23 @@ struct wl12xx_chip {int intr_cmd_complete;int intr_init_complete; -int (*op_upload_fw)(struct wl12xx *wl); -int (*op_upload_nvs)(struct wl12xx *wl); -int (*op_boot)(struct wl12xx *wl); -void (*op_set_ecpu_ctrl)(struct wl12xx *wl,u32 flag); -void (*op_target_enable_interrupts)(struct wl12xx *wl); -int (*op_hw_init)(struct wl12xx *wl); -int (*op_plt_init)(struct wl12xx *wl); -void (*op_tx_flush)(struct wl12xx *wl); -void (*op_fw_version)(struct wl12xx *wl); -int (*op_cmd_join)(struct wl12xx *wl,u8 bss_type,u8 dtim_interval, +int (*op_upload_fw)(struct wl1251 *wl); +int (*op_upload_nvs)(struct wl1251 *wl); +int (*op_boot)(struct wl1251 *wl); +void (*op_set_ecpu_ctrl)(struct wl1251 *wl,u32 flag); +void (*op_target_enable_interrupts)(struct wl1251 *wl); +int (*op_hw_init)(struct wl1251 *wl); +int (*op_plt_init)(struct wl1251 *wl); +void (*op_tx_flush)(struct wl1251 *wl); +void (*op_fw_version)(struct wl1251 *wl); +int (*op_cmd_join)(struct wl1251 *wl,u8 bss_type,u8 dtim_interval,u16 beacon_interval,u8 wait); -struct wl12xx_partition_set *p_table; +struct wl1251_partition_set *p_table;enum wl12xx_acx_int_reg *acx_reg_table; }; -struct wl12xx_stats { +struct wl1251_stats {struct acx_statistics *fw_stats;unsigned long fw_stats_update;
@@ -180,7 +180,7 @@ struct wl12xx_stats {unsigned int excessive_retries; }; -struct wl12xx_debugfs { +struct wl1251_debugfs {struct dentry *rootdir;struct dentry *fw_statistics;
@@ -281,7 +281,7 @@ struct wl12xx_debugfs {struct dentry *excessive_retries; }; -struct wl12xx { +struct wl1251 {struct ieee80211_hw *hw;bool mac80211_registered;
@@ -290,7 +290,7 @@ struct wl12xx {void (*set_power)(bool enable);int irq; -enum wl12xx_state state; +enum wl1251_state state;struct mutex mutex;int physical_mem_addr;
@@ -298,7 +298,7 @@ struct wl12xx {int virtual_mem_addr;int virtual_reg_addr; -struct wl12xx_chip chip; +struct wl1251_chip chip;int cmd_box_addr;int event_box_addr;
@@ -385,31 +385,31 @@ struct wl12xx {/* in dBm */ int power_level; -struct wl12xx_stats stats; -struct wl12xx_debugfs debugfs; +struct wl1251_stats stats; +struct wl1251_debugfs debugfs;u32 buffer_32;u32 buffer_cmd; -u8 buffer_busyword[WL12XX_BUSY_WORD_LEN ]; -struct wl12xx_rx_descriptor *rx_descriptor; +u8 buffer_busyword[WL1251_BUSY_WORD_LEN ]; +struct wl1251_rx_descriptor *rx_descriptor; }; -int wl12xx_plt_start (struct wl12xx *wl); -int wl12xx_plt_stop (struct wl12xx *wl); +int wl1251_plt_start (struct wl1251 *wl); +int wl1251_plt_stop (struct wl1251 *wl);#define DEFAULT_HW_GEN_MODULATION_TYPE CCK_LONG/* Long Preamble */ #define DEFAULT_HW_GEN_TX_RATE RATE_2MBPS#define JOIN_TIMEOUT 5000/* 5000 milliseconds to join */ -#define WL12XX_DEFAULT_POWER_LEVEL 20 +#define WL1251_DEFAULT_POWER_LEVEL 20 -#define WL12XX_TX_QUEUE_MAX_LENGTH 20 +#define WL1251_TX_QUEUE_MAX_LENGTH 20/* Different chips need different sleep times after power on. WL1271 needs * 200ms, WL1251 needs only 10ms. By default we use 200ms, but as soon as we -* know the chip ID, we change the sleep value in the wl12xx chip structure, +* know the chip ID, we change the sleep value in the wl1251 chip structure, * so in subsequent power ons, we don't waste more time then needed. */ -#define WL12XX_DEFAULT_POWER_ON_SLEEP 200 +#define WL1251_DEFAULT_POWER_ON_SLEEP 200#define CHIP_ID_1251_PG10 (0x7010101)#define CHIP_ID_1251_PG11 (0x7020101)
drivers/net/wireless/wl12xx/wl1251_acx.c +114 -115
735 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_acx.h +38 -38
112 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_boot.c +53 -53
297 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_boot.h +5 -5
@@ -1,5 +1,5 @@/* -* This file is part of wl12xx +* This file is part of wl1251 * * Copyright (C) 2008 Nokia Corporation *
@@ -26,10 +26,10 @@#include "wl1251.h" -int wl12xx_boot_soft_reset (struct wl12xx *wl); -int wl12xx_boot_init_seq (struct wl12xx *wl); -int wl12xx_boot_run_firmware (struct wl12xx *wl); -void wl12xx_boot_target_enable_interrupts (struct wl12xx *wl); +int wl1251_boot_soft_reset (struct wl1251 *wl); +int wl1251_boot_init_seq (struct wl1251 *wl); +int wl1251_boot_run_firmware (struct wl1251 *wl); +void wl1251_boot_target_enable_interrupts (struct wl1251 *wl);/* number of times we try to read the INIT interrupt */ #define INIT_LOOP 20000
drivers/net/wireless/wl12xx/wl1251_cmd.c +66 -67
374 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_cmd.h +39 -39
189 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_debugfs.c +24 -24
157 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_debugfs.h +7 -7
@@ -1,5 +1,5 @@/* -* This file is part of wl12xx +* This file is part of wl1251 * * Copyright (C) 2009 Nokia Corporation *
@@ -21,13 +21,13 @@* */ -#ifndef WL12XX_DEBUGFS_H -#define WL12XX_DEBUGFS_H +#ifndef WL1251_DEBUGFS_H +#define WL1251_DEBUGFS_H #include "wl1251.h" -int wl12xx_debugfs_init (struct wl12xx *wl); -void wl12xx_debugfs_exit (struct wl12xx *wl); -void wl12xx_debugfs_reset (struct wl12xx *wl); +int wl1251_debugfs_init (struct wl1251 *wl); +void wl1251_debugfs_exit (struct wl1251 *wl); +void wl1251_debugfs_reset (struct wl1251 *wl); -#endif /* WL12XX_DEBUGFS_H */ +#endif /* WL1251_DEBUGFS_H */
drivers/net/wireless/wl12xx/wl1251_event.c +23 -23
119 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_event.h +6 -6
@@ -1,5 +1,5 @@/* -* This file is part of wl12xx +* This file is part of wl1251 * * Copyright (c) 1998-2007 Texas Instruments Incorporated * Copyright (C) 2008 Nokia Corporation
@@ -22,8 +22,8 @@* */ -#ifndef __WL12XX_EVENT_H__ -#define __WL12XX_EVENT_H__ +#ifndef __WL1251_EVENT_H__ +#define __WL1251_EVENT_H__/* * Mbox events
@@ -114,8 +114,8 @@ struct event_mailbox {u8 padding[19 ]; } __attribute__ ((packed)); -int wl12xx_event_unmask (struct wl12xx *wl); -void wl12xx_event_mbox_config (struct wl12xx *wl); -int wl12xx_event_handle (struct wl12xx *wl,u8 mbox); +int wl1251_event_unmask (struct wl1251 *wl); +void wl1251_event_mbox_config (struct wl1251 *wl); +int wl1251_event_handle (struct wl1251 *wl,u8 mbox);#endif
drivers/net/wireless/wl12xx/wl1251_init.c +36 -36
212 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_init.h +12 -12
@@ -1,5 +1,5 @@/* -* This file is part of wl12xx +* This file is part of wl1251 * * Copyright (C) 2009 Nokia Corporation *
@@ -21,19 +21,19 @@* */ -#ifndef __WL12XX_INIT_H__ -#define __WL12XX_INIT_H__ +#ifndef __WL1251_INIT_H__ +#define __WL1251_INIT_H__#include "wl1251.h" -int wl12xx_hw_init_hwenc_config (struct wl12xx *wl); -int wl12xx_hw_init_templates_config (struct wl12xx *wl); -int wl12xx_hw_init_rx_config (struct wl12xx *wl,u32 config,u32 filter); -int wl12xx_hw_init_phy_config (struct wl12xx *wl); -int wl12xx_hw_init_beacon_filter (struct wl12xx *wl); -int wl12xx_hw_init_pta (struct wl12xx *wl); -int wl12xx_hw_init_energy_detection (struct wl12xx *wl); -int wl12xx_hw_init_beacon_broadcast (struct wl12xx *wl); -int wl12xx_hw_init_power_auth (struct wl12xx *wl); +int wl1251_hw_init_hwenc_config (struct wl1251 *wl); +int wl1251_hw_init_templates_config (struct wl1251 *wl); +int wl1251_hw_init_rx_config (struct wl1251 *wl,u32 config,u32 filter); +int wl1251_hw_init_phy_config (struct wl1251 *wl); +int wl1251_hw_init_beacon_filter (struct wl1251 *wl); +int wl1251_hw_init_pta (struct wl1251 *wl); +int wl1251_hw_init_energy_detection (struct wl1251 *wl); +int wl1251_hw_init_beacon_broadcast (struct wl1251 *wl); +int wl1251_hw_init_power_auth (struct wl1251 *wl);#endif
drivers/net/wireless/wl12xx/wl1251_main.c +242 -235
462 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_netlink.c +200 -200
400 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_netlink.h +6 -6
Lines of this file are not shown. View the raw message.
drivers/net/wireless/wl12xx/wl1251_ops.c +95 -95
190 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_ops.h +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/wl12xx/wl1251_ps.c +28 -28
56 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_ps.h +7 -7
Lines of this file are not shown. View the raw message.
drivers/net/wireless/wl12xx/wl1251_rx.c +26 -26
52 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_rx.h +10 -10
Lines of this file are not shown. View the raw message.
drivers/net/wireless/wl12xx/wl1251_spi.c +53 -54
107 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_spi.h +22 -22
44 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_tx.c +35 -35
70 lines not on this page · raw message
drivers/net/wireless/wl12xx/wl1251_tx.h +3 -3
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
PATCH 32/33 wl1251: fix a checkpatch warning
In reply to Kalle ValoFrom: Kalle Valo <[email protected]>
drivers/net/wireless/wl12xx/wl1251_main.c:158: WARNING:
braces {} are not necessary for single statement blocks
---
drivers/net/wireless/wl12xx/wl1251_main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
drivers/net/wireless/wl12xx/wl1251_main.c +1 -2
@@ -155,9 +155,8 @@ static void wl1251_fw_wakeup(struct wl1251 *wl)wl1251_write32 (wl,HW_ACCESS_ELP_CTRL_REG_ADDR , elp_reg); elp_reg =wl1251_read32 (wl,HW_ACCESS_ELP_CTRL_REG_ADDR ); -if (!(elp_reg &ELPCTRL_WLAN_READY )) { +if (!(elp_reg &ELPCTRL_WLAN_READY ))wl1251_warning ("WLAN not ready" ); - } }static int wl1251_chip_wakeup (struct wl1251 *wl)
PATCH 33/33 wl1251: change psm enabled/disabled info to debug
In reply to Kalle ValoFrom: Luciano Coelho <[email protected]>
With shorter CAM timeouts, the logs get flooded with "psm enabled" and "psm disabled traces. This patch changes it from wl1251_info to wl1251_debug, so they are only shown if DEBUF_PSM is enabled.
---
drivers/net/wireless/wl12xx/wl1251_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/wl12xx/wl1251_main.c +2 -2
@@ -542,7 +542,7 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed) goto out_sleep;if (conf->flags &IEEE80211_CONF_PS && !wl->psm_requested) { -wl1251_info ("psm enabled" ); +wl1251_debug (DEBUG_PSM ,"psm enabled" ); wl->psm_requested = true;
@@ -554,7 +554,7 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed) ret =wl1251_ps_set_mode (wl,STATION_POWER_SAVE_MODE ); }else if (!(conf->flags &IEEE80211_CONF_PS ) && wl->psm_requested) { -wl1251_info ("psm disabled" ); +wl1251_debug (DEBUG_PSM ,"psm disabled" ); wl->psm_requested = false;