Re: [opensuse-kernel] [PATCH] rt2x00 : fix rt3290 resuming failed.

24 Jul 2012

...
At Tue, 24 Jul 2012 10:44:25 +0800,
Matt Chen wrote:
...
Hi Takashi,
2012/7/23 Takashi Iwai :
...
At Mon, 23 Jul 2012 18:26:01 +0800,
Chen, Chien-Chia wrote:
...
This patch is going to fix the resuming failed from S3/S4
for rt3290 chip.
Signed-off-by: Chen, Chien-Chia 
CC-by: Kevin Chou 
Isn't it better to call rt2800_enable_wlan_rt3290() in the resume
callback instead?
yep, I thought that before. But this is just the original patch from
Ralink, I think we can modify it much proper and test it.
Oh, then a proper "From:" tag is missing.  Otherwise this looks like
your own patch.
Oops...this patch is not from me. From Ralink RD, but not yet known
Hi Takashi,

2012/7/24 Takashi Iwai :
the name, I'm still asking it.
...
And, if this is going to be merged to upstream tree as is, I'm not too
much against it although it looks a bit ugly.
Indeed, it is ugly, I have not time to clear up all the strucutre of rt2x00. :(
That would be a long-term effort.
If it's not merged, it should be discussed there right now, instead.
Nope, it is still discussed in rt2x00 mail list. Still some questions
from there for the patch.
thanks,
Takashi
...
...
Takashi
...

diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index e76f03c..1d535a0 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -400,6 +400,13 @@ int rt2800_load_firmware(struct rt2x00_dev *rt2x00dev,
 {
      unsigned int i;
      u32 reg;
+     int retval;
+
+     if (rt2x00_rt(rt2x00dev, RT3290)) {
+             retval = rt2800_enable_wlan_rt3290(rt2x00dev);
+             if (retval)
+                     return -EBUSY;
+     }
/*
       * If driver doesn't wake up firmware here,
@@ -5152,6 +5159,65 @@ int rt2800_get_survey(struct ieee80211_hw *hw, int idx,
 }
 EXPORT_SYMBOL_GPL(rt2800_get_survey);
+int rt2800_enable_wlan_rt3290(struct rt2x00_dev *rt2x00dev)
+{
+     u32 reg;
+     int i, count;
+
+     rt2800_register_read(rt2x00dev, WLAN_FUN_CTRL, ®);
+     if (rt2x00_get_field32(reg, WLAN_EN))
+             return 0;
+
+     rt2x00_set_field32(®, WLAN_GPIO_OUT_OE_BIT_ALL, 0xff);
+     rt2x00_set_field32(®, FRC_WL_ANT_SET, 1);
+     rt2x00_set_field32(®, WLAN_CLK_EN, 0);
+     rt2x00_set_field32(®, WLAN_EN, 1);
+     rt2800_register_write(rt2x00dev, WLAN_FUN_CTRL, reg);
+
+     udelay(REGISTER_BUSY_DELAY);
+     count = 0;
+     do {
+             /*
+              * Check PLL_LD & XTAL_RDY.
+              */
+             for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
+                     rt2800_register_read(rt2x00dev, CMB_CTRL, ®);
+                     if (rt2x00_get_field32(reg, PLL_LD) &&
+                             rt2x00_get_field32(reg, XTAL_RDY))
+                                     break;
+                     udelay(REGISTER_BUSY_DELAY);
+             }
+             if (i >= REGISTER_BUSY_COUNT) {
+                     if (count >= 10)
+                             return -EIO;
+
+                     rt2800_register_write(rt2x00dev, 0x58, 0x018);
+                     udelay(REGISTER_BUSY_DELAY);
+                     rt2800_register_write(rt2x00dev, 0x58, 0x418);
+                     udelay(REGISTER_BUSY_DELAY);
+                     rt2800_register_write(rt2x00dev, 0x58, 0x618);
+                     udelay(REGISTER_BUSY_DELAY);
+                     count++;
+             } else {
+                     count = 0;
+             }
+
+             rt2800_register_read(rt2x00dev, WLAN_FUN_CTRL, ®);
+             rt2x00_set_field32(®, PCIE_APP0_CLK_REQ, 0);
+             rt2x00_set_field32(®, WLAN_CLK_EN, 1);
+             rt2x00_set_field32(®, WLAN_RESET, 1);
+             rt2800_register_write(rt2x00dev, WLAN_FUN_CTRL, reg);
+             udelay(10);
+             rt2x00_set_field32(®, WLAN_RESET, 0);
+             rt2800_register_write(rt2x00dev, WLAN_FUN_CTRL, reg);
+             udelay(10);
+             rt2800_register_write(rt2x00dev, INT_SOURCE_CSR, 0x7fffffff);
+     } while (count != 0);
+
+     return 0;
+}
+EXPORT_SYMBOL_GPL(rt2800_enable_wlan_rt3290);
+
 MODULE_AUTHOR(DRV_PROJECT ", Bartlomiej Zolnierkiewicz");
 MODULE_VERSION(DRV_VERSION);
 MODULE_DESCRIPTION("Ralink RT2800 library");
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.h b/drivers/net/wireless/rt2x00/rt2800lib.h
index 18a0b67..12d6eeb 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.h
+++ b/drivers/net/wireless/rt2x00/rt2800lib.h
@@ -209,5 +209,5 @@ int rt2800_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 int rt2800_get_survey(struct ieee80211_hw *hw, int idx,
                    struct survey_info *survey);
 void rt2800_disable_wpdma(struct rt2x00_dev *rt2x00dev);
-
+int rt2800_enable_wlan_rt3290(struct rt2x00_dev *rt2x00dev);
 #endif /* RT2800LIB_H */
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index 235376e..b7a02bf 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -980,66 +980,6 @@ static int rt2800pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
      return rt2800_validate_eeprom(rt2x00dev);
 }
-static int rt2800_enable_wlan_rt3290(struct rt2x00_dev *rt2x00dev)
-{
-     u32 reg;
-     int i, count;
-
-     rt2800_register_read(rt2x00dev, WLAN_FUN_CTRL, ®);
-     if (rt2x00_get_field32(reg, WLAN_EN))
-             return 0;
-
-     rt2x00_set_field32(®, WLAN_GPIO_OUT_OE_BIT_ALL, 0xff);
-     rt2x00_set_field32(®, FRC_WL_ANT_SET, 1);
-     rt2x00_set_field32(®, WLAN_CLK_EN, 0);
-     rt2x00_set_field32(®, WLAN_EN, 1);
-     rt2800_register_write(rt2x00dev, WLAN_FUN_CTRL, reg);
-
-     udelay(REGISTER_BUSY_DELAY);
-
-     count = 0;
-     do {
-             /*
-              * Check PLL_LD & XTAL_RDY.
-              */
-             for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
-                     rt2800_register_read(rt2x00dev, CMB_CTRL, ®);
-                     if (rt2x00_get_field32(reg, PLL_LD) &&
-                         rt2x00_get_field32(reg, XTAL_RDY))
-                             break;
-                     udelay(REGISTER_BUSY_DELAY);
-             }
-
-             if (i >= REGISTER_BUSY_COUNT) {
-
-                     if (count >= 10)
-                             return -EIO;
-
-                     rt2800_register_write(rt2x00dev, 0x58, 0x018);
-                     udelay(REGISTER_BUSY_DELAY);
-                     rt2800_register_write(rt2x00dev, 0x58, 0x418);
-                     udelay(REGISTER_BUSY_DELAY);
-                     rt2800_register_write(rt2x00dev, 0x58, 0x618);
-                     udelay(REGISTER_BUSY_DELAY);
-                     count++;
-             } else {
-                     count = 0;
-             }
-
-             rt2800_register_read(rt2x00dev, WLAN_FUN_CTRL, ®);
-             rt2x00_set_field32(®, PCIE_APP0_CLK_REQ, 0);
-             rt2x00_set_field32(®, WLAN_CLK_EN, 1);
-             rt2x00_set_field32(®, WLAN_RESET, 1);
-             rt2800_register_write(rt2x00dev, WLAN_FUN_CTRL, reg);
-             udelay(10);
-             rt2x00_set_field32(®, WLAN_RESET, 0);
-             rt2800_register_write(rt2x00dev, WLAN_FUN_CTRL, reg);
-             udelay(10);
-             rt2800_register_write(rt2x00dev, INT_SOURCE_CSR, 0x7fffffff);
-     } while (count != 0);
-
-     return 0;
-}
 static int rt2800pci_probe_hw(struct rt2x00_dev *rt2x00dev)
 {
      int retval;
--
To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org
To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
--
To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org
To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
--
Thank you.
--
To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org
To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
-- 
Thank you.
-- 
To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org
To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org

    