aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_acx.c53
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_acx.h21
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_conf.h39
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_init.c5
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_main.c24
5 files changed, 0 insertions, 142 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_acx.c b/drivers/net/wireless/wl12xx/wl1271_acx.c
index a38a967ba78a..ea6427ad1bcb 100644
--- a/drivers/net/wireless/wl12xx/wl1271_acx.c
+++ b/drivers/net/wireless/wl12xx/wl1271_acx.c
@@ -1041,59 +1041,6 @@ out:
1041 return ret; 1041 return ret;
1042} 1042}
1043 1043
1044int wl1271_acx_smart_reflex(struct wl1271 *wl)
1045{
1046 struct acx_smart_reflex_state *sr_state = NULL;
1047 struct acx_smart_reflex_config_params *sr_param = NULL;
1048 int i, ret;
1049
1050 wl1271_debug(DEBUG_ACX, "acx smart reflex");
1051
1052 sr_param = kzalloc(sizeof(*sr_param), GFP_KERNEL);
1053 if (!sr_param) {
1054 ret = -ENOMEM;
1055 goto out;
1056 }
1057
1058 for (i = 0; i < CONF_SR_ERR_TBL_COUNT; i++) {
1059 struct conf_mart_reflex_err_table *e =
1060 &(wl->conf.init.sr_err_tbl[i]);
1061
1062 sr_param->error_table[i].len = e->len;
1063 sr_param->error_table[i].upper_limit = e->upper_limit;
1064 memcpy(sr_param->error_table[i].values, e->values, e->len);
1065 }
1066
1067 ret = wl1271_cmd_configure(wl, ACX_SET_SMART_REFLEX_PARAMS,
1068 sr_param, sizeof(*sr_param));
1069 if (ret < 0) {
1070 wl1271_warning("failed to set smart reflex params: %d", ret);
1071 goto out;
1072 }
1073
1074 sr_state = kzalloc(sizeof(*sr_state), GFP_KERNEL);
1075 if (!sr_state) {
1076 ret = -ENOMEM;
1077 goto out;
1078 }
1079
1080 /* enable smart reflex */
1081 sr_state->enable = wl->conf.init.sr_enable;
1082
1083 ret = wl1271_cmd_configure(wl, ACX_SET_SMART_REFLEX_STATE,
1084 sr_state, sizeof(*sr_state));
1085 if (ret < 0) {
1086 wl1271_warning("failed to set smart reflex params: %d", ret);
1087 goto out;
1088 }
1089
1090out:
1091 kfree(sr_state);
1092 kfree(sr_param);
1093 return ret;
1094
1095}
1096
1097int wl1271_acx_bet_enable(struct wl1271 *wl, bool enable) 1044int wl1271_acx_bet_enable(struct wl1271 *wl, bool enable)
1098{ 1045{
1099 struct wl1271_acx_bet_enable *acx = NULL; 1046 struct wl1271_acx_bet_enable *acx = NULL;
diff --git a/drivers/net/wireless/wl12xx/wl1271_acx.h b/drivers/net/wireless/wl12xx/wl1271_acx.h
index dcd64b7919eb..6640ebfb6162 100644
--- a/drivers/net/wireless/wl12xx/wl1271_acx.h
+++ b/drivers/net/wireless/wl12xx/wl1271_acx.h
@@ -415,25 +415,6 @@ struct acx_bt_wlan_coex {
415 u8 pad[3]; 415 u8 pad[3];
416} __attribute__ ((packed)); 416} __attribute__ ((packed));
417 417
418struct acx_smart_reflex_state {
419 struct acx_header header;
420
421 u8 enable;
422 u8 padding[3];
423} __attribute__ ((packed));
424
425struct smart_reflex_err_table {
426 u8 len;
427 s8 upper_limit;
428 s8 values[14];
429} __attribute__ ((packed));
430
431struct acx_smart_reflex_config_params {
432 struct acx_header header;
433
434 struct smart_reflex_err_table error_table[3];
435} __attribute__ ((packed));
436
437struct acx_dco_itrim_params { 418struct acx_dco_itrim_params {
438 struct acx_header header; 419 struct acx_header header;
439 420
@@ -1035,8 +1016,6 @@ enum {
1035 ACX_HT_BSS_OPERATION = 0x0058, 1016 ACX_HT_BSS_OPERATION = 0x0058,
1036 ACX_COEX_ACTIVITY = 0x0059, 1017 ACX_COEX_ACTIVITY = 0x0059,
1037 ACX_SET_SMART_REFLEX_DEBUG = 0x005A, 1018 ACX_SET_SMART_REFLEX_DEBUG = 0x005A,
1038 ACX_SET_SMART_REFLEX_STATE = 0x005B,
1039 ACX_SET_SMART_REFLEX_PARAMS = 0x005F,
1040 ACX_SET_DCO_ITRIM_PARAMS = 0x0061, 1019 ACX_SET_DCO_ITRIM_PARAMS = 0x0061,
1041 DOT11_RX_MSDU_LIFE_TIME = 0x1004, 1020 DOT11_RX_MSDU_LIFE_TIME = 0x1004,
1042 DOT11_CUR_TX_PWR = 0x100D, 1021 DOT11_CUR_TX_PWR = 0x100D,
diff --git a/drivers/net/wireless/wl12xx/wl1271_conf.h b/drivers/net/wireless/wl12xx/wl1271_conf.h
index 905d4287915b..c87ae56ce42a 100644
--- a/drivers/net/wireless/wl12xx/wl1271_conf.h
+++ b/drivers/net/wireless/wl12xx/wl1271_conf.h
@@ -722,31 +722,6 @@ struct conf_conn_settings {
722 u8 psm_entry_retries; 722 u8 psm_entry_retries;
723}; 723};
724 724
725#define CONF_SR_ERR_TBL_MAX_VALUES 14
726
727struct conf_mart_reflex_err_table {
728 /*
729 * Length of the error table values table.
730 *
731 * Range: 0 - CONF_SR_ERR_TBL_MAX_VALUES
732 */
733 u8 len;
734
735 /*
736 * Smart Reflex error table upper limit.
737 *
738 * Range: s8
739 */
740 s8 upper_limit;
741
742 /*
743 * Smart Reflex error table values.
744 *
745 * Range: s8
746 */
747 s8 values[CONF_SR_ERR_TBL_MAX_VALUES];
748};
749
750enum { 725enum {
751 CONF_REF_CLK_19_2_E, 726 CONF_REF_CLK_19_2_E,
752 CONF_REF_CLK_26_E, 727 CONF_REF_CLK_26_E,
@@ -907,22 +882,8 @@ struct conf_radio_parms {
907 u8 degraded_normal_to_high_threshold_5; 882 u8 degraded_normal_to_high_threshold_5;
908}; 883};
909 884
910#define CONF_SR_ERR_TBL_COUNT 3
911
912struct conf_init_settings { 885struct conf_init_settings {
913 /* 886 /*
914 * Configure Smart Reflex error table values.
915 */
916 struct conf_mart_reflex_err_table sr_err_tbl[CONF_SR_ERR_TBL_COUNT];
917
918 /*
919 * Smart Reflex enable flag.
920 *
921 * Range: 1 - Smart Reflex enabled, 0 - Smart Reflex disabled
922 */
923 u8 sr_enable;
924
925 /*
926 * Configure general parameters. 887 * Configure general parameters.
927 */ 888 */
928 struct conf_general_parms genparam; 889 struct conf_general_parms genparam;
diff --git a/drivers/net/wireless/wl12xx/wl1271_init.c b/drivers/net/wireless/wl12xx/wl1271_init.c
index bdd4a968b37d..7bfd6c6a4c77 100644
--- a/drivers/net/wireless/wl12xx/wl1271_init.c
+++ b/drivers/net/wireless/wl12xx/wl1271_init.c
@@ -303,11 +303,6 @@ int wl1271_hw_init(struct wl1271 *wl)
303 if (ret < 0) 303 if (ret < 0)
304 goto out_free_memmap; 304 goto out_free_memmap;
305 305
306 /* Configure smart reflex */
307 ret = wl1271_acx_smart_reflex(wl);
308 if (ret < 0)
309 goto out_free_memmap;
310
311 return 0; 306 return 0;
312 307
313 out_free_memmap: 308 out_free_memmap:
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index b0f4c6efa415..5a6e4d446962 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -226,30 +226,6 @@ static struct conf_drv_settings default_conf = {
226 .psm_entry_retries = 3 226 .psm_entry_retries = 3
227 }, 227 },
228 .init = { 228 .init = {
229 .sr_err_tbl = {
230 [0] = {
231 .len = 7,
232 .upper_limit = 0x03,
233 .values = {
234 0x18, 0x10, 0x05, 0xfb, 0xf0, 0xe8,
235 0x00 }
236 },
237 [1] = {
238 .len = 7,
239 .upper_limit = 0x03,
240 .values = {
241 0x18, 0x10, 0x05, 0xf6, 0xf0, 0xe8,
242 0x00 }
243 },
244 [2] = {
245 .len = 7,
246 .upper_limit = 0x03,
247 .values = {
248 0x18, 0x10, 0x05, 0xfb, 0xf0, 0xe8,
249 0x00 }
250 }
251 },
252 .sr_enable = 1,
253 .genparam = { 229 .genparam = {
254 .ref_clk = CONF_REF_CLK_38_4_E, 230 .ref_clk = CONF_REF_CLK_38_4_E,
255 .settling_time = 5, 231 .settling_time = 5,