wl12xx: fixes for hw_pg_ver and chip id reporting

Fix the value of PG version for 128x at sysfs, remove write permissions
from PG version (hw_pg_ver) in sysfs and add remove files
(hw_pg_ver,bt_coex_state) from sysfs while freeing hardware.
New macro names for register Fuse_data_2_1 depend on architecture.
Propagate chip id through wiphy in PLT mode which still not work of
a bug in ethtool.

Signed-off-by: Gery Kahn <geryk@ti.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>

diff --git a/drivers/net/wireless/wl12xx/boot.c b/drivers/net/wireless/wl12xx/boot.c
index 5ebc64d89407233ae7b92f305f3f65416b6c7a81..a816f2ffa6a9de712f933766d99c39efc024d229 100644 (file)
--- a/drivers/net/wireless/wl12xx/boot.c
+++ b/drivers/net/wireless/wl12xx/boot.c
@@ -549,13 +549,13 @@ static void wl1271_boot_hw_version(struct wl1271 *wl)
 {
        u32 fuse;
 
-       fuse = wl1271_top_reg_read(wl, REG_FUSE_DATA_2_1);
+       if (wl->chip.id == CHIP_ID_1283_PG20)
+               fuse = wl1271_top_reg_read(wl, WL128X_REG_FUSE_DATA_2_1);
+       else
+               fuse = wl1271_top_reg_read(wl, WL127X_REG_FUSE_DATA_2_1);
        fuse = (fuse & PG_VER_MASK) >> PG_VER_OFFSET;
 
        wl->hw_pg_ver = (s8)fuse;
-
-       if (((wl->hw_pg_ver & PG_MAJOR_VER_MASK) >> PG_MAJOR_VER_OFFSET) < 3)
-               wl->quirks |= WL12XX_QUIRK_END_OF_TRANSACTION;
 }
 
 static int wl128x_switch_tcxo_to_fref(struct wl1271 *wl)
@@ -696,7 +696,8 @@ static int wl127x_boot_clk(struct wl1271 *wl)
        u32 pause;
        u32 clk;
 
-       wl1271_boot_hw_version(wl);
+       if (((wl->hw_pg_ver & PG_MAJOR_VER_MASK) >> PG_MAJOR_VER_OFFSET) < 3)
+               wl->quirks |= WL12XX_QUIRK_END_OF_TRANSACTION;
 
        if (wl->ref_clock == CONF_REF_CLK_19_2_E ||
            wl->ref_clock == CONF_REF_CLK_38_4_E ||
@@ -750,6 +751,8 @@ int wl1271_load_firmware(struct wl1271 *wl)
        u32 tmp, clk;
        int selected_clock = -1;
 
+       wl1271_boot_hw_version(wl);
+
        if (wl->chip.id == CHIP_ID_1283_PG20) {
                ret = wl128x_boot_clk(wl, &selected_clock);
                if (ret < 0)

diff --git a/drivers/net/wireless/wl12xx/boot.h b/drivers/net/wireless/wl12xx/boot.h
index e8f8255bbabeb45641a465d8602b6e4fb1871a7d..06dad9380fa7f427e5318d5f5e0e191a5c00f1cb 100644 (file)
--- a/drivers/net/wireless/wl12xx/boot.h
+++ b/drivers/net/wireless/wl12xx/boot.h
@@ -55,7 +55,8 @@ struct wl1271_static_data {
 #define OCP_REG_CLK_POLARITY 0x0cb2
 #define OCP_REG_CLK_PULL     0x0cb4
 
-#define REG_FUSE_DATA_2_1    0x050a
+#define WL127X_REG_FUSE_DATA_2_1    0x050a
+#define WL128X_REG_FUSE_DATA_2_1    0x2152
 #define PG_VER_MASK          0x3c
 #define PG_VER_OFFSET        2
 

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 3418299e17c853d5e291f5a419aeb9951e592dd5..98258fe0e29d2a85e265c756221c70a2e01acbd9 100644 (file)
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -1395,6 +1395,7 @@ out:
 int wl1271_plt_start(struct wl1271 *wl)
 {
        int retries = WL1271_BOOT_RETRIES;
+       struct wiphy *wiphy = wl->hw->wiphy;
        int ret;
 
        mutex_lock(&wl->mutex);
@@ -1428,6 +1429,11 @@ int wl1271_plt_start(struct wl1271 *wl)
                wl1271_notice("firmware booted in PLT mode (%s)",
                              wl->chip.fw_ver_str);
 
+               /* update hw/fw version info in wiphy struct */
+               wiphy->hw_version = wl->chip.id;
+               strncpy(wiphy->fw_version, wl->chip.fw_ver_str,
+                       sizeof(wiphy->fw_version));
+
                goto out;
 
 irq_disable:
@@ -4126,7 +4132,7 @@ static ssize_t wl1271_sysfs_show_hw_pg_ver(struct device *dev,
        return len;
 }
 
-static DEVICE_ATTR(hw_pg_ver, S_IRUGO | S_IWUSR,
+static DEVICE_ATTR(hw_pg_ver, S_IRUGO,
                   wl1271_sysfs_show_hw_pg_ver, NULL);
 
 static ssize_t wl1271_sysfs_read_fwlog(struct file *filp, struct kobject *kobj,
@@ -4522,6 +4528,10 @@ int wl1271_free_hw(struct wl1271 *wl)
        mutex_unlock(&wl->mutex);
 
        device_remove_bin_file(&wl->plat_dev->dev, &fwlog_attr);
+
+       device_remove_file(&wl->plat_dev->dev, &dev_attr_hw_pg_ver);
+
+       device_remove_file(&wl->plat_dev->dev, &dev_attr_bt_coex_state);
        platform_device_unregister(wl->plat_dev);
        free_page((unsigned long)wl->fwlog);
        dev_kfree_skb(wl->dummy_packet);