diff options
author | Ben Cahill <ben.m.cahill@intel.com> | 2009-10-30 17:36:07 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-02 15:39:45 -0500 |
commit | a6c5c731c3f783f60ed79dcf41efa8b5b3af2f22 (patch) | |
tree | f4cad82ede0c2c66f13544e744e3936fed1d7fe4 /drivers/net/wireless/iwlwifi/iwl-6000.c | |
parent | 88521364cc04b67f36748983545b9fe1d4ba4a15 (diff) |
iwlagn: invoke L0S workaround for 6000/1000 series
Invoke workaround to avoid instability in L0->L0S->L1 transition on PCIe bus.
Workaround disables L0S state so device moves directly from L0->L1.
Workaround needed on all devices since and including 4965; add to 6000/1000.
Describe bug and workaround better in comments.
Signed-off-by: Ben Cahill <ben.m.cahill@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-6000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index 32466d38d1ae..2f841a8576e0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
@@ -299,7 +299,7 @@ struct iwl_cfg iwl6000h_2agn_cfg = { | |||
299 | .valid_tx_ant = ANT_AB, | 299 | .valid_tx_ant = ANT_AB, |
300 | .valid_rx_ant = ANT_AB, | 300 | .valid_rx_ant = ANT_AB, |
301 | .pll_cfg_val = 0, | 301 | .pll_cfg_val = 0, |
302 | .set_l0s = false, | 302 | .set_l0s = true, |
303 | .use_bsm = false, | 303 | .use_bsm = false, |
304 | .pa_type = IWL_PA_HYBRID, | 304 | .pa_type = IWL_PA_HYBRID, |
305 | .max_ll_items = OTP_MAX_LL_ITEMS_6x00, | 305 | .max_ll_items = OTP_MAX_LL_ITEMS_6x00, |
@@ -329,7 +329,7 @@ struct iwl_cfg iwl6000h_2abg_cfg = { | |||
329 | .valid_tx_ant = ANT_AB, | 329 | .valid_tx_ant = ANT_AB, |
330 | .valid_rx_ant = ANT_AB, | 330 | .valid_rx_ant = ANT_AB, |
331 | .pll_cfg_val = 0, | 331 | .pll_cfg_val = 0, |
332 | .set_l0s = false, | 332 | .set_l0s = true, |
333 | .use_bsm = false, | 333 | .use_bsm = false, |
334 | .pa_type = IWL_PA_HYBRID, | 334 | .pa_type = IWL_PA_HYBRID, |
335 | .max_ll_items = OTP_MAX_LL_ITEMS_6x00, | 335 | .max_ll_items = OTP_MAX_LL_ITEMS_6x00, |
@@ -358,7 +358,7 @@ struct iwl_cfg iwl6000h_2bg_cfg = { | |||
358 | .valid_tx_ant = ANT_AB, | 358 | .valid_tx_ant = ANT_AB, |
359 | .valid_rx_ant = ANT_AB, | 359 | .valid_rx_ant = ANT_AB, |
360 | .pll_cfg_val = 0, | 360 | .pll_cfg_val = 0, |
361 | .set_l0s = false, | 361 | .set_l0s = true, |
362 | .use_bsm = false, | 362 | .use_bsm = false, |
363 | .pa_type = IWL_PA_HYBRID, | 363 | .pa_type = IWL_PA_HYBRID, |
364 | .max_ll_items = OTP_MAX_LL_ITEMS_6x00, | 364 | .max_ll_items = OTP_MAX_LL_ITEMS_6x00, |
@@ -390,7 +390,7 @@ struct iwl_cfg iwl6000i_2agn_cfg = { | |||
390 | .valid_tx_ant = ANT_BC, | 390 | .valid_tx_ant = ANT_BC, |
391 | .valid_rx_ant = ANT_BC, | 391 | .valid_rx_ant = ANT_BC, |
392 | .pll_cfg_val = 0, | 392 | .pll_cfg_val = 0, |
393 | .set_l0s = false, | 393 | .set_l0s = true, |
394 | .use_bsm = false, | 394 | .use_bsm = false, |
395 | .pa_type = IWL_PA_INTERNAL, | 395 | .pa_type = IWL_PA_INTERNAL, |
396 | .max_ll_items = OTP_MAX_LL_ITEMS_6x00, | 396 | .max_ll_items = OTP_MAX_LL_ITEMS_6x00, |
@@ -420,7 +420,7 @@ struct iwl_cfg iwl6000i_2abg_cfg = { | |||
420 | .valid_tx_ant = ANT_BC, | 420 | .valid_tx_ant = ANT_BC, |
421 | .valid_rx_ant = ANT_BC, | 421 | .valid_rx_ant = ANT_BC, |
422 | .pll_cfg_val = 0, | 422 | .pll_cfg_val = 0, |
423 | .set_l0s = false, | 423 | .set_l0s = true, |
424 | .use_bsm = false, | 424 | .use_bsm = false, |
425 | .pa_type = IWL_PA_INTERNAL, | 425 | .pa_type = IWL_PA_INTERNAL, |
426 | .max_ll_items = OTP_MAX_LL_ITEMS_6x00, | 426 | .max_ll_items = OTP_MAX_LL_ITEMS_6x00, |
@@ -449,7 +449,7 @@ struct iwl_cfg iwl6000i_2bg_cfg = { | |||
449 | .valid_tx_ant = ANT_BC, | 449 | .valid_tx_ant = ANT_BC, |
450 | .valid_rx_ant = ANT_BC, | 450 | .valid_rx_ant = ANT_BC, |
451 | .pll_cfg_val = 0, | 451 | .pll_cfg_val = 0, |
452 | .set_l0s = false, | 452 | .set_l0s = true, |
453 | .use_bsm = false, | 453 | .use_bsm = false, |
454 | .pa_type = IWL_PA_INTERNAL, | 454 | .pa_type = IWL_PA_INTERNAL, |
455 | .max_ll_items = OTP_MAX_LL_ITEMS_6x00, | 455 | .max_ll_items = OTP_MAX_LL_ITEMS_6x00, |
@@ -478,7 +478,7 @@ struct iwl_cfg iwl6050_2agn_cfg = { | |||
478 | .valid_tx_ant = ANT_AB, | 478 | .valid_tx_ant = ANT_AB, |
479 | .valid_rx_ant = ANT_AB, | 479 | .valid_rx_ant = ANT_AB, |
480 | .pll_cfg_val = 0, | 480 | .pll_cfg_val = 0, |
481 | .set_l0s = false, | 481 | .set_l0s = true, |
482 | .use_bsm = false, | 482 | .use_bsm = false, |
483 | .pa_type = IWL_PA_SYSTEM, | 483 | .pa_type = IWL_PA_SYSTEM, |
484 | .max_ll_items = OTP_MAX_LL_ITEMS_6x50, | 484 | .max_ll_items = OTP_MAX_LL_ITEMS_6x50, |
@@ -508,7 +508,7 @@ struct iwl_cfg iwl6050_2abg_cfg = { | |||
508 | .valid_tx_ant = ANT_AB, | 508 | .valid_tx_ant = ANT_AB, |
509 | .valid_rx_ant = ANT_AB, | 509 | .valid_rx_ant = ANT_AB, |
510 | .pll_cfg_val = 0, | 510 | .pll_cfg_val = 0, |
511 | .set_l0s = false, | 511 | .set_l0s = true, |
512 | .use_bsm = false, | 512 | .use_bsm = false, |
513 | .pa_type = IWL_PA_SYSTEM, | 513 | .pa_type = IWL_PA_SYSTEM, |
514 | .max_ll_items = OTP_MAX_LL_ITEMS_6x50, | 514 | .max_ll_items = OTP_MAX_LL_ITEMS_6x50, |
@@ -537,7 +537,7 @@ struct iwl_cfg iwl6000_3agn_cfg = { | |||
537 | .valid_tx_ant = ANT_ABC, | 537 | .valid_tx_ant = ANT_ABC, |
538 | .valid_rx_ant = ANT_ABC, | 538 | .valid_rx_ant = ANT_ABC, |
539 | .pll_cfg_val = 0, | 539 | .pll_cfg_val = 0, |
540 | .set_l0s = false, | 540 | .set_l0s = true, |
541 | .use_bsm = false, | 541 | .use_bsm = false, |
542 | .pa_type = IWL_PA_SYSTEM, | 542 | .pa_type = IWL_PA_SYSTEM, |
543 | .max_ll_items = OTP_MAX_LL_ITEMS_6x00, | 543 | .max_ll_items = OTP_MAX_LL_ITEMS_6x00, |
@@ -567,7 +567,7 @@ struct iwl_cfg iwl6050_3agn_cfg = { | |||
567 | .valid_tx_ant = ANT_ABC, | 567 | .valid_tx_ant = ANT_ABC, |
568 | .valid_rx_ant = ANT_ABC, | 568 | .valid_rx_ant = ANT_ABC, |
569 | .pll_cfg_val = 0, | 569 | .pll_cfg_val = 0, |
570 | .set_l0s = false, | 570 | .set_l0s = true, |
571 | .use_bsm = false, | 571 | .use_bsm = false, |
572 | .pa_type = IWL_PA_SYSTEM, | 572 | .pa_type = IWL_PA_SYSTEM, |
573 | .max_ll_items = OTP_MAX_LL_ITEMS_6x50, | 573 | .max_ll_items = OTP_MAX_LL_ITEMS_6x50, |