3 files changed, 65 insertions, 33 deletions

diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index 717c4f5a02c2..49aca2cf7605 100644
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -24,6 +24,7 @@
 #include <linux/ip.h>
 #include <linux/firmware.h>
 #include <linux/etherdevice.h>
+#include <linux/irq.h>
 
 #include "../wlcore/wlcore.h"
 #include "../wlcore/debug.h"
@@ -578,7 +579,7 @@ static struct wl18xx_priv_conf wl18xx_default_priv_conf = {
 
 static const struct wlcore_partition_set wl18xx_ptable[PART_TABLE_LEN] = {
         [PART_TOP_PRCM_ELP_SOC] = {
-                .mem  = { .start = 0x00A02000, .size  = 0x00010000 },
+                .mem  = { .start = 0x00A00000, .size  = 0x00012000 },
                 .reg  = { .start = 0x00807000, .size  = 0x00005000 },
                 .mem2 = { .start = 0x00800000, .size  = 0x0000B000 },
                 .mem3 = { .start = 0x00000000, .size  = 0x00000000 },
@@ -862,6 +863,7 @@ static int wl18xx_pre_upload(struct wl1271 *wl)
 {
         u32 tmp;
         int ret;
+        u16 irq_invert;
 
         BUILD_BUG_ON(sizeof(struct wl18xx_mac_and_phy_params) >
                 WL18XX_PHY_INIT_MEM_SIZE);
@@ -911,6 +913,28 @@ static int wl18xx_pre_upload(struct wl1271 *wl)
         /* re-enable FDSP clock */
         ret = wlcore_write32(wl, WL18XX_PHY_FPGA_SPARE_1,
                              MEM_FDSP_CLK_120_ENABLE);
+        if (ret < 0)
+                goto out;
+
+        ret = irq_get_trigger_type(wl->irq);
+        if ((ret == IRQ_TYPE_LEVEL_LOW) || (ret == IRQ_TYPE_EDGE_FALLING)) {
+                wl1271_info("using inverted interrupt logic: %d", ret);
+                ret = wlcore_set_partition(wl,
+                                           &wl->ptable[PART_TOP_PRCM_ELP_SOC]);
+                if (ret < 0)
+                        goto out;
+
+                ret = wl18xx_top_reg_read(wl, TOP_FN0_CCCR_REG_32, &irq_invert);
+                if (ret < 0)
+                        goto out;
+
+                irq_invert |= BIT(1);
+                ret = wl18xx_top_reg_write(wl, TOP_FN0_CCCR_REG_32, irq_invert);
+                if (ret < 0)
+                        goto out;
+
+                ret = wlcore_set_partition(wl, &wl->ptable[PART_PHY_INIT]);
+        }
 
 out:
         return ret;
@@ -1351,9 +1375,10 @@ out:
 }
 
 #define WL18XX_CONF_FILE_NAME "ti-connectivity/wl18xx-conf.bin"
-static int wl18xx_conf_init(struct wl1271 *wl, struct device *dev)
+
+static int wl18xx_load_conf_file(struct device *dev, struct wlcore_conf *conf,
+                                 struct wl18xx_priv_conf *priv_conf)
 {
-        struct wl18xx_priv *priv = wl->priv;
         struct wlcore_conf_file *conf_file;
         const struct firmware *fw;
         int ret;
@@ -1362,14 +1387,14 @@ static int wl18xx_conf_init(struct wl1271 *wl, struct device *dev)
         if (ret < 0) {
                 wl1271_error("could not get configuration binary %s: %d",
                              WL18XX_CONF_FILE_NAME, ret);
-                goto out_fallback;
+                return ret;
         }
 
         if (fw->size != WL18XX_CONF_SIZE) {
                 wl1271_error("configuration binary file size is wrong, expected %zu got %zu",
                              WL18XX_CONF_SIZE, fw->size);
                 ret = -EINVAL;
-                goto out;
+                goto out_release;
         }
 
         conf_file = (struct wlcore_conf_file *) fw->data;
@@ -1379,7 +1404,7 @@ static int wl18xx_conf_init(struct wl1271 *wl, struct device *dev)
                              "expected 0x%0x got 0x%0x", WL18XX_CONF_MAGIC,
                              conf_file->header.magic);
                 ret = -EINVAL;
-                goto out;
+                goto out_release;
         }
 
         if (conf_file->header.version != cpu_to_le32(WL18XX_CONF_VERSION)) {
@@ -1387,28 +1412,32 @@ static int wl18xx_conf_init(struct wl1271 *wl, struct device *dev)
                              "expected 0x%08x got 0x%08x",
                              WL18XX_CONF_VERSION, conf_file->header.version);
                 ret = -EINVAL;
-                goto out;
+                goto out_release;
         }
 
-        memcpy(&wl->conf, &conf_file->core, sizeof(wl18xx_conf));
-        memcpy(&priv->conf, &conf_file->priv, sizeof(priv->conf));
+        memcpy(conf, &conf_file->core, sizeof(*conf));
+        memcpy(priv_conf, &conf_file->priv, sizeof(*priv_conf));
+
+out_release:
+        release_firmware(fw);
+        return ret;
+}
 
-        goto out;
+static int wl18xx_conf_init(struct wl1271 *wl, struct device *dev)
+{
+        struct wl18xx_priv *priv = wl->priv;
 
-out_fallback:
-        wl1271_warning("falling back to default config");
+        if (wl18xx_load_conf_file(dev, &wl->conf, &priv->conf) < 0) {
+                wl1271_warning("falling back to default config");
 
-        /* apply driver default configuration */
-        memcpy(&wl->conf, &wl18xx_conf, sizeof(wl18xx_conf));
-        /* apply default private configuration */
-        memcpy(&priv->conf, &wl18xx_default_priv_conf, sizeof(priv->conf));
+                /* apply driver default configuration */
+                memcpy(&wl->conf, &wl18xx_conf, sizeof(wl->conf));
+                /* apply default private configuration */
+                memcpy(&priv->conf, &wl18xx_default_priv_conf,
+                       sizeof(priv->conf));
+        }
 
-        /* For now we just fallback */
         return 0;
-
-out:
-        release_firmware(fw);
-        return ret;
 }
 
 static int wl18xx_plt_init(struct wl1271 *wl)
diff --git a/drivers/net/wireless/ti/wl18xx/reg.h b/drivers/net/wireless/ti/wl18xx/reg.h
index a433a75f3cd7..bac2364c8e72 100644
--- a/drivers/net/wireless/ti/wl18xx/reg.h
+++ b/drivers/net/wireless/ti/wl18xx/reg.h
@@ -109,6 +109,7 @@
 
 #define WL18XX_WELP_ARM_COMMAND         (WL18XX_REGISTERS_BASE + 0x7100)
 #define WL18XX_ENABLE                   (WL18XX_REGISTERS_BASE + 0x01543C)
+#define TOP_FN0_CCCR_REG_32             (WL18XX_TOP_OCP_BASE + 0x64)
 
 /* PRCM registers */
 #define PLATFORM_DETECTION              0xA0E3E0
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 7fe50f8182f3..ef3fe0fff588 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -5965,10 +5965,6 @@ static int wl12xx_get_hw_info(struct wl1271 *wl)
 {
         int ret;
 
-        ret = wl12xx_set_power_on(wl);
-        if (ret < 0)
-                return ret;
-
         ret = wlcore_read_reg(wl, REG_CHIP_ID_B, &wl->chip.id);
         if (ret < 0)
                 goto out;
@@ -5984,7 +5980,6 @@ static int wl12xx_get_hw_info(struct wl1271 *wl)
                 ret = wl->ops->get_mac(wl);
 
 out:
-        wl1271_power_off(wl);
         return ret;
 }
 
@@ -6432,10 +6427,22 @@ static void wlcore_nvs_cb(const struct firmware *fw, void *context)
         else
                 wl->irq_flags |= IRQF_ONESHOT;
 
+        ret = wl12xx_set_power_on(wl);
+        if (ret < 0)
+                goto out_free_nvs;
+
+        ret = wl12xx_get_hw_info(wl);
+        if (ret < 0) {
+                wl1271_error("couldn't get hw info");
+                wl1271_power_off(wl);
+                goto out_free_nvs;
+        }
+
         ret = request_threaded_irq(wl->irq, hardirq_fn, wlcore_irq,
                                    wl->irq_flags, pdev->name, wl);
         if (ret < 0) {
-                wl1271_error("request_irq() failed: %d", ret);
+                wl1271_error("interrupt configuration failed");
+                wl1271_power_off(wl);
                 goto out_free_nvs;
         }
 
@@ -6449,12 +6456,7 @@ static void wlcore_nvs_cb(const struct firmware *fw, void *context)
         }
 #endif
         disable_irq(wl->irq);
-
-        ret = wl12xx_get_hw_info(wl);
-        if (ret < 0) {
-                wl1271_error("couldn't get hw info");
-                goto out_irq;
-        }
+        wl1271_power_off(wl);
 
         ret = wl->ops->identify_chip(wl);
         if (ret < 0)