7 files changed, 140 insertions, 53 deletions

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_hw.c b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
index b07f164d65cf..20e49095db2a 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
@@ -187,17 +187,17 @@ static void ar9003_hw_init_mode_regs(struct ath_hw *ah)
                 INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
                                ar9485_1_1_baseband_core_txfir_coeff_japan_2484);
 
-                /* Load PCIE SERDES settings from INI */
-
-                /* Awake Setting */
-
-                INIT_INI_ARRAY(&ah->iniPcieSerdes,
-                                ar9485_1_1_pcie_phy_clkreq_disable_L1);
-
-                /* Sleep Setting */
-
-                INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
-                                ar9485_1_1_pcie_phy_clkreq_disable_L1);
+                if (ah->config.no_pll_pwrsave) {
+                        INIT_INI_ARRAY(&ah->iniPcieSerdes,
+                                       ar9485_1_1_pcie_phy_clkreq_disable_L1);
+                        INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
+                                       ar9485_1_1_pcie_phy_clkreq_disable_L1);
+                } else {
+                        INIT_INI_ARRAY(&ah->iniPcieSerdes,
+                                       ar9485_1_1_pll_on_cdr_on_clkreq_disable_L1);
+                        INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
+                                       ar9485_1_1_pll_on_cdr_on_clkreq_disable_L1);
+                }
         } else if (AR_SREV_9462_21(ah)) {
                 INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
                                ar9462_2p1_mac_core);
diff --git a/drivers/net/wireless/ath/ath9k/ar9485_initvals.h b/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
index 6f899c692647..7c1845221e1c 100644
--- a/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
@@ -32,13 +32,6 @@ static const u32 ar9485_1_1_mac_postamble[][5] = {
         {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
 };
 
-static const u32 ar9485_1_1_pcie_phy_pll_on_clkreq_disable_L1[][2] = {
-        /* Addr      allmodes  */
-        {0x00018c00, 0x18012e5e},
-        {0x00018c04, 0x000801d8},
-        {0x00018c08, 0x0000080c},
-};
-
 static const u32 ar9485Common_wo_xlna_rx_gain_1_1[][2] = {
         /* Addr      allmodes  */
         {0x00009e00, 0x037216a0},
@@ -1101,20 +1094,6 @@ static const u32 ar9485_common_rx_gain_1_1[][2] = {
         {0x0000a1fc, 0x00000296},
 };
 
-static const u32 ar9485_1_1_pcie_phy_pll_on_clkreq_enable_L1[][2] = {
-        /* Addr      allmodes  */
-        {0x00018c00, 0x18052e5e},
-        {0x00018c04, 0x000801d8},
-        {0x00018c08, 0x0000080c},
-};
-
-static const u32 ar9485_1_1_pcie_phy_clkreq_enable_L1[][2] = {
-        /* Addr      allmodes  */
-        {0x00018c00, 0x18053e5e},
-        {0x00018c04, 0x000801d8},
-        {0x00018c08, 0x0000080c},
-};
-
 static const u32 ar9485_1_1_soc_preamble[][2] = {
         /* Addr      allmodes  */
         {0x00004014, 0xba280400},
@@ -1173,13 +1152,6 @@ static const u32 ar9485_1_1_baseband_postamble[][5] = {
         {0x0000be18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 };
 
-static const u32 ar9485_1_1_pcie_phy_clkreq_disable_L1[][2] = {
-        /* Addr      allmodes  */
-        {0x00018c00, 0x18013e5e},
-        {0x00018c04, 0x000801d8},
-        {0x00018c08, 0x0000080c},
-};
-
 static const u32 ar9485_1_1_radio_postamble[][2] = {
         /* Addr      allmodes  */
         {0x0001609c, 0x0b283f31},
@@ -1358,4 +1330,18 @@ static const u32 ar9485_1_1_baseband_core_txfir_coeff_japan_2484[][2] = {
         {0x0000a3a0, 0xca9228ee},
 };
 
+static const u32 ar9485_1_1_pcie_phy_clkreq_disable_L1[][2] = {
+        /* Addr      allmodes  */
+        {0x00018c00, 0x18013e5e},
+        {0x00018c04, 0x000801d8},
+        {0x00018c08, 0x0000080c},
+};
+
+static const u32 ar9485_1_1_pll_on_cdr_on_clkreq_disable_L1[][2] = {
+        /* Addr      allmodes  */
+        {0x00018c00, 0x1801265e},
+        {0x00018c04, 0x000801d8},
+        {0x00018c08, 0x0000080c},
+};
+
 #endif /* INITVALS_9485_H */
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index e7a38d844a6a..60a5da53668f 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -632,15 +632,16 @@ void ath_ant_comb_scan(struct ath_softc *sc, struct ath_rx_status *rs);
 /* Main driver core */
 /********************/
 
-#define ATH9K_PCI_CUS198      0x0001
-#define ATH9K_PCI_CUS230      0x0002
-#define ATH9K_PCI_CUS217      0x0004
-#define ATH9K_PCI_CUS252      0x0008
-#define ATH9K_PCI_WOW         0x0010
-#define ATH9K_PCI_BT_ANT_DIV  0x0020
-#define ATH9K_PCI_D3_L1_WAR   0x0040
-#define ATH9K_PCI_AR9565_1ANT 0x0080
-#define ATH9K_PCI_AR9565_2ANT 0x0100
+#define ATH9K_PCI_CUS198          0x0001
+#define ATH9K_PCI_CUS230          0x0002
+#define ATH9K_PCI_CUS217          0x0004
+#define ATH9K_PCI_CUS252          0x0008
+#define ATH9K_PCI_WOW             0x0010
+#define ATH9K_PCI_BT_ANT_DIV      0x0020
+#define ATH9K_PCI_D3_L1_WAR       0x0040
+#define ATH9K_PCI_AR9565_1ANT     0x0080
+#define ATH9K_PCI_AR9565_2ANT     0x0100
+#define ATH9K_PCI_NO_PLL_PWRSAVE  0x0200
 
 /*
  * Default cache line size, in bytes.
diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.c b/drivers/net/wireless/ath/ath9k/dfs_debug.c
index 90b8342d1ed4..8824610c21fb 100644
--- a/drivers/net/wireless/ath/ath9k/dfs_debug.c
+++ b/drivers/net/wireless/ath/ath9k/dfs_debug.c
@@ -44,14 +44,20 @@ static ssize_t read_file_dfs(struct file *file, char __user *user_buf,
         if (buf == NULL)
                 return -ENOMEM;
 
-        if (sc->dfs_detector)
-                dfs_pool_stats = sc->dfs_detector->get_stats(sc->dfs_detector);
-
         len += scnprintf(buf + len, size - len, "DFS support for "
                          "macVersion = 0x%x, macRev = 0x%x: %s\n",
                          hw_ver->macVersion, hw_ver->macRev,
                          (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_DFS) ?
                                         "enabled" : "disabled");
+
+        if (!sc->dfs_detector) {
+                len += scnprintf(buf + len, size - len,
+                                 "DFS detector not enabled\n");
+                goto exit;
+        }
+
+        dfs_pool_stats = sc->dfs_detector->get_stats(sc->dfs_detector);
+
         len += scnprintf(buf + len, size - len, "Pulse detector statistics:\n");
         ATH9K_DFS_STAT("pulse events reported   ", pulses_total);
         ATH9K_DFS_STAT("invalid pulse events    ", pulses_no_dfs);
@@ -76,6 +82,7 @@ static ssize_t read_file_dfs(struct file *file, char __user *user_buf,
         ATH9K_DFS_POOL_STAT("Seqs. alloc error       ", pseq_alloc_error);
         ATH9K_DFS_POOL_STAT("Seqs. in use            ", pseq_used);
 
+exit:
         if (len > size)
                 len = size;
 
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 9ea24f1cba73..a2c9a5dbac6b 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -316,6 +316,7 @@ struct ath9k_ops_config {
         u32 ant_ctrl_comm2g_switch_enable;
         bool xatten_margin_cfg;
         bool alt_mingainidx;
+        bool no_pll_pwrsave;
 };
 
 enum ath9k_int {
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index d8643ebabd30..710192ed27ed 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -609,6 +609,11 @@ static void ath9k_init_platform(struct ath_softc *sc)
                 ah->config.pcie_waen = 0x0040473b;
                 ath_info(common, "Enable WAR for ASPM D3/L1\n");
         }
+
+        if (sc->driver_data & ATH9K_PCI_NO_PLL_PWRSAVE) {
+                ah->config.no_pll_pwrsave = true;
+                ath_info(common, "Disable PLL PowerSave\n");
+        }
 }
 
 static void ath9k_eeprom_request_cb(const struct firmware *eeprom_blob,
@@ -863,8 +868,8 @@ static const struct ieee80211_iface_combination if_comb[] = {
                 .max_interfaces = 1,
                 .num_different_channels = 1,
                 .beacon_int_infra_match = true,
-                .radar_detect_widths =  BIT(NL80211_CHAN_NO_HT) |
-                                        BIT(NL80211_CHAN_HT20),
+                .radar_detect_widths =  BIT(NL80211_CHAN_WIDTH_20_NOHT) |
+                                        BIT(NL80211_CHAN_WIDTH_20),
         }
 };
 
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c
index 7e4c2524b630..b5656fce4ff5 100644
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -195,6 +195,93 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
                          0x3219),
           .driver_data = ATH9K_PCI_BT_ANT_DIV },
 
+        /* AR9485 cards with PLL power-save disabled by default. */
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         PCI_VENDOR_ID_AZWAVE,
+                         0x2C97),
+          .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         PCI_VENDOR_ID_AZWAVE,
+                         0x2100),
+          .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         0x1C56, /* ASKEY */
+                         0x4001),
+          .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         0x11AD, /* LITEON */
+                         0x6627),
+          .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         0x11AD, /* LITEON */
+                         0x6628),
+          .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         PCI_VENDOR_ID_FOXCONN,
+                         0xE04E),
+          .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         PCI_VENDOR_ID_FOXCONN,
+                         0xE04F),
+          .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         0x144F, /* ASKEY */
+                         0x7197),
+          .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         0x1B9A, /* XAVI */
+                         0x2000),
+          .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         0x1B9A, /* XAVI */
+                         0x2001),
+          .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         PCI_VENDOR_ID_AZWAVE,
+                         0x1186),
+          .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         PCI_VENDOR_ID_AZWAVE,
+                         0x1F86),
+          .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         PCI_VENDOR_ID_AZWAVE,
+                         0x1195),
+          .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         PCI_VENDOR_ID_AZWAVE,
+                         0x1F95),
+          .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         0x1B9A, /* XAVI */
+                         0x1C00),
+          .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         0x1B9A, /* XAVI */
+                         0x1C01),
+          .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         PCI_VENDOR_ID_ASUSTEK,
+                         0x850D),
+          .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
+
         { PCI_VDEVICE(ATHEROS, 0x0032) }, /* PCI-E  AR9485 */
         { PCI_VDEVICE(ATHEROS, 0x0033) }, /* PCI-E  AR9580 */