wil6210: platform specific module
authorVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Wed, 10 Sep 2014 13:34:35 +0000 (16:34 +0300)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 11 Sep 2014 19:27:37 +0000 (15:27 -0400)
New module (wil_platform) for handling platform specific tasks

Signed-off-by: Dedy Lansky <qca_dlansky@qca.qualcomm.com>
Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/wil6210/Kconfig
drivers/net/wireless/ath/wil6210/Makefile
drivers/net/wireless/ath/wil6210/main.c
drivers/net/wireless/ath/wil6210/pcie_bus.c
drivers/net/wireless/ath/wil6210/wil6210.h
drivers/net/wireless/ath/wil6210/wil_platform.c [new file with mode: 0644]
drivers/net/wireless/ath/wil6210/wil_platform.h [new file with mode: 0644]
drivers/net/wireless/ath/wil6210/wil_platform_msm.c [new file with mode: 0644]
drivers/net/wireless/ath/wil6210/wil_platform_msm.h [new file with mode: 0644]

index ce8c0381825e674c2eca80510761ae186283073f..481680a3aa5513564686bbf14c9c06a495e00e2c 100644 (file)
@@ -39,3 +39,12 @@ config WIL6210_TRACING
          option if you are interested in debugging the driver.
 
          If unsure, say Y to make it easier to debug problems.
+
+config WIL6210_PLATFORM_MSM
+       bool "wil6210 MSM platform specific support"
+       depends on WIL6210
+       depends on ARCH_MSM
+       default y
+       ---help---
+         Say Y here to enable wil6210 driver support for MSM
+         platform specific features
index dc788a1f261fc805330d510ab3e6a02426a3848c..a471d74ae409102a86e027b6bf4b41b402eb96e1 100644 (file)
@@ -12,6 +12,8 @@ wil6210-y += debug.o
 wil6210-y += rx_reorder.o
 wil6210-y += fw.o
 wil6210-$(CONFIG_WIL6210_TRACING) += trace.o
+wil6210-y += wil_platform.o
+wil6210-$(CONFIG_WIL6210_PLATFORM_MSM) += wil_platform_msm.o
 
 # for tracing framework to find trace.h
 CFLAGS_trace.o := -I$(src)
index 4a884b415dc00fc99ed5dfcefa1a2e56bdc2e1c0..8afd8a2b9d6e23462c81e7fa45392d26f8583ced 100644 (file)
@@ -603,6 +603,10 @@ static int __wil_up(struct wil6210_priv *wil)
        napi_enable(&wil->napi_tx);
        set_bit(wil_status_napi_en, &wil->status);
 
+       if (wil->platform_ops.bus_request)
+               wil->platform_ops.bus_request(wil->platform_handle,
+                                             WIL_MAX_BUS_REQUEST_KBPS);
+
        return 0;
 }
 
@@ -621,6 +625,9 @@ static int __wil_down(struct wil6210_priv *wil)
 {
        WARN_ON(!mutex_is_locked(&wil->mutex));
 
+       if (wil->platform_ops.bus_request)
+               wil->platform_ops.bus_request(wil->platform_handle, 0);
+
        clear_bit(wil_status_napi_en, &wil->status);
        napi_disable(&wil->napi_rx);
        napi_disable(&wil->napi_tx);
index 38dcbea49d449a650ad79c810608bcc8785d1dbd..968f0d6d42e16b8432a5abaec8650146e92737b0 100644 (file)
@@ -180,6 +180,10 @@ static int wil_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        wil->board = board;
 
        wil6210_clear_irq(wil);
+
+       wil->platform_handle =
+                       wil_platform_init(&pdev->dev, &wil->platform_ops);
+
        /* FW should raise IRQ when ready */
        rc = wil_if_pcie_enable(wil);
        if (rc) {
@@ -204,6 +208,8 @@ static int wil_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)
  bus_disable:
        wil_if_pcie_disable(wil);
  if_free:
+       if (wil->platform_ops.uninit)
+               wil->platform_ops.uninit(wil->platform_handle);
        wil_if_free(wil);
  err_iounmap:
        pci_iounmap(pdev, csr);
@@ -223,6 +229,8 @@ static void wil_pcie_remove(struct pci_dev *pdev)
        wil6210_debugfs_remove(wil);
        wil_if_pcie_disable(wil);
        wil_if_remove(wil);
+       if (wil->platform_ops.uninit)
+               wil->platform_ops.uninit(wil->platform_handle);
        wil_if_free(wil);
        pci_iounmap(pdev, csr);
        pci_release_region(pdev, 0);
index 5f20fabf55bf98a65f4d513725f5b60ad88aae52..d2e710e3ade53b95f76de289e34d002bcc2aaf7d 100644 (file)
 #include <linux/wireless.h>
 #include <net/cfg80211.h>
 #include <linux/timex.h>
+#include "wil_platform.h"
+
 
 #define WIL_NAME "wil6210"
 #define WIL_FW_NAME "wil6210.fw"
 
+#define WIL_MAX_BUS_REQUEST_KBPS 800000 /* ~6.1Gbps */
+
 struct wil_board {
        int board;
 #define WIL_BOARD_MARLON       (1)
@@ -437,6 +441,9 @@ struct wil6210_priv {
        /* debugfs */
        struct dentry *debug;
        struct debugfs_blob_wrapper blobs[ARRAY_SIZE(fw_mapping)];
+
+       void *platform_handle;
+       struct wil_platform_ops platform_ops;
 };
 
 #define wil_to_wiphy(i) (i->wdev->wiphy)
diff --git a/drivers/net/wireless/ath/wil6210/wil_platform.c b/drivers/net/wireless/ath/wil6210/wil_platform.c
new file mode 100644 (file)
index 0000000..8f1d78f
--- /dev/null
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2014 Qualcomm Atheros, Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "linux/device.h"
+#include "wil_platform.h"
+
+#ifdef CONFIG_WIL6210_PLATFORM_MSM
+#include "wil_platform_msm.h"
+#endif
+
+/**
+ * wil_platform_init() - wil6210 platform module init
+ *
+ * The function must be called before all other functions in this module.
+ * It returns a handle which is used with the rest of the API
+ *
+ */
+void *wil_platform_init(struct device *dev, struct wil_platform_ops *ops)
+{
+       void *handle = NULL;
+
+       if (!ops) {
+               dev_err(dev, "Invalid parameter. Cannot init platform module\n");
+               return NULL;
+       }
+
+#ifdef CONFIG_WIL6210_PLATFORM_MSM
+       handle = wil_platform_msm_init(dev, ops);
+       if (handle)
+               return handle;
+#endif
+
+       /* other platform specific init functions should be called here */
+
+       return handle;
+}
diff --git a/drivers/net/wireless/ath/wil6210/wil_platform.h b/drivers/net/wireless/ath/wil6210/wil_platform.h
new file mode 100644 (file)
index 0000000..158c73b
--- /dev/null
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2014 Qualcomm Atheros, Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __WIL_PLATFORM_H__
+#define __WIL_PLATFORM_H__
+
+struct device;
+
+/**
+ * struct wil_platform_ops - wil platform module callbacks
+ */
+struct wil_platform_ops {
+       int (*bus_request)(void *handle, uint32_t kbps /* KBytes/Sec */);
+       int (*suspend)(void *handle);
+       int (*resume)(void *handle);
+       void (*uninit)(void *handle);
+};
+
+void *wil_platform_init(struct device *dev, struct wil_platform_ops *ops);
+
+#endif /* __WIL_PLATFORM_H__ */
diff --git a/drivers/net/wireless/ath/wil6210/wil_platform_msm.c b/drivers/net/wireless/ath/wil6210/wil_platform_msm.c
new file mode 100644 (file)
index 0000000..b354a74
--- /dev/null
@@ -0,0 +1,257 @@
+/*
+ * Copyright (c) 2014 Qualcomm Atheros, Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <linux/of.h>
+#include <linux/slab.h>
+#include <linux/msm-bus.h>
+
+#include "wil_platform.h"
+#include "wil_platform_msm.h"
+
+/**
+ * struct wil_platform_msm - wil6210 msm platform module info
+ *
+ * @dev: device object
+ * @msm_bus_handle: handle for using msm_bus API
+ * @pdata: bus scale info retrieved from DT
+ */
+struct wil_platform_msm {
+       struct device *dev;
+       uint32_t msm_bus_handle;
+       struct msm_bus_scale_pdata *pdata;
+};
+
+#define KBTOB(a) (a * 1000ULL)
+
+/**
+ * wil_platform_get_pdata() - Generate bus client data from device tree
+ * provided by clients.
+ *
+ * dev: device object
+ * of_node: Device tree node to extract information from
+ *
+ * The function returns a valid pointer to the allocated bus-scale-pdata
+ * if the vectors were correctly read from the client's device node.
+ * Any error in reading or parsing the device node will return NULL
+ * to the caller.
+ */
+static struct msm_bus_scale_pdata *wil_platform_get_pdata(
+               struct device *dev,
+               struct device_node *of_node)
+{
+       struct msm_bus_scale_pdata *pdata;
+       struct msm_bus_paths *usecase;
+       int i, j, ret, len;
+       unsigned int num_usecases, num_paths, mem_size;
+       const uint32_t *vec_arr;
+       struct msm_bus_vectors *vectors;
+
+       /* first read num_usecases and num_paths so we can calculate
+        * amount of memory to allocate
+        */
+       ret = of_property_read_u32(of_node, "qcom,msm-bus,num-cases",
+                                  &num_usecases);
+       if (ret) {
+               dev_err(dev, "Error: num-usecases not found\n");
+               return NULL;
+       }
+
+       ret = of_property_read_u32(of_node, "qcom,msm-bus,num-paths",
+                                  &num_paths);
+       if (ret) {
+               dev_err(dev, "Error: num_paths not found\n");
+               return NULL;
+       }
+
+       /* pdata memory layout:
+        *   msm_bus_scale_pdata
+        *   msm_bus_paths[num_usecases]
+        *   msm_bus_vectors[num_usecases][num_paths]
+        */
+       mem_size = sizeof(struct msm_bus_scale_pdata) +
+                  sizeof(struct msm_bus_paths) * num_usecases +
+                  sizeof(struct msm_bus_vectors) * num_usecases * num_paths;
+
+       pdata = kzalloc(mem_size, GFP_KERNEL);
+       if (!pdata)
+               return NULL;
+
+       ret = of_property_read_string(of_node, "qcom,msm-bus,name",
+                                     &pdata->name);
+       if (ret) {
+               dev_err(dev, "Error: Client name not found\n");
+               goto err;
+       }
+
+       if (of_property_read_bool(of_node, "qcom,msm-bus,active-only")) {
+               pdata->active_only = 1;
+       } else {
+               dev_info(dev, "active_only flag absent.\n");
+               dev_info(dev, "Using dual context by default\n");
+       }
+
+       pdata->num_usecases = num_usecases;
+       pdata->usecase = (struct msm_bus_paths *)(pdata + 1);
+
+       vec_arr = of_get_property(of_node, "qcom,msm-bus,vectors-KBps", &len);
+       if (vec_arr == NULL) {
+               dev_err(dev, "Error: Vector array not found\n");
+               goto err;
+       }
+
+       if (len != num_usecases * num_paths * sizeof(uint32_t) * 4) {
+               dev_err(dev, "Error: Length-error on getting vectors\n");
+               goto err;
+       }
+
+       vectors = (struct msm_bus_vectors *)(pdata->usecase + num_usecases);
+       for (i = 0; i < num_usecases; i++) {
+               usecase = &pdata->usecase[i];
+               usecase->num_paths = num_paths;
+               usecase->vectors = &vectors[i];
+
+               for (j = 0; j < num_paths; j++) {
+                       int index = ((i * num_paths) + j) * 4;
+
+                       usecase->vectors[j].src = be32_to_cpu(vec_arr[index]);
+                       usecase->vectors[j].dst =
+                               be32_to_cpu(vec_arr[index + 1]);
+                       usecase->vectors[j].ab = (uint64_t)
+                               KBTOB(be32_to_cpu(vec_arr[index + 2]));
+                       usecase->vectors[j].ib = (uint64_t)
+                               KBTOB(be32_to_cpu(vec_arr[index + 3]));
+               }
+       }
+
+       return pdata;
+
+err:
+       kfree(pdata);
+
+       return NULL;
+}
+
+/* wil_platform API (callbacks) */
+
+static int wil_platform_bus_request(void *handle,
+                                   uint32_t kbps /* KBytes/Sec */)
+{
+       int rc, i;
+       struct wil_platform_msm *msm = (struct wil_platform_msm *)handle;
+       int vote = 0; /* vote 0 in case requested kbps cannot be satisfied */
+       struct msm_bus_paths *usecase;
+       uint32_t usecase_kbps;
+       uint32_t min_kbps = ~0;
+
+       /* find the lowest usecase that is bigger than requested kbps */
+       for (i = 0; i < msm->pdata->num_usecases; i++) {
+               usecase = &msm->pdata->usecase[i];
+               /* assume we have single path (vectors[0]). If we ever
+                * have multiple paths, need to define the behavior */
+               usecase_kbps = div64_u64(usecase->vectors[0].ib, 1000);
+               if (usecase_kbps >= kbps && usecase_kbps < min_kbps) {
+                       min_kbps = usecase_kbps;
+                       vote = i;
+               }
+       }
+
+       rc = msm_bus_scale_client_update_request(msm->msm_bus_handle, vote);
+       if (rc)
+               dev_err(msm->dev, "Failed msm_bus voting. kbps=%d vote=%d, rc=%d\n",
+                       kbps, vote, rc);
+       else
+               /* TOOD: remove */
+               dev_info(msm->dev, "msm_bus_scale_client_update_request succeeded. kbps=%d vote=%d\n",
+                        kbps, vote);
+
+       return rc;
+}
+
+static void wil_platform_uninit(void *handle)
+{
+       struct wil_platform_msm *msm = (struct wil_platform_msm *)handle;
+
+       dev_info(msm->dev, "wil_platform_uninit\n");
+
+       if (msm->msm_bus_handle)
+               msm_bus_scale_unregister_client(msm->msm_bus_handle);
+
+       kfree(msm->pdata);
+       kfree(msm);
+}
+
+static int wil_platform_msm_bus_register(struct wil_platform_msm *msm,
+                                        struct device_node *node)
+{
+       msm->pdata = wil_platform_get_pdata(msm->dev, node);
+       if (!msm->pdata) {
+               dev_err(msm->dev, "Failed getting DT info\n");
+               return -EINVAL;
+       }
+
+       msm->msm_bus_handle = msm_bus_scale_register_client(msm->pdata);
+       if (!msm->msm_bus_handle) {
+               dev_err(msm->dev, "Failed msm_bus registration\n");
+               return -EINVAL;
+       }
+
+       dev_info(msm->dev, "msm_bus registration succeeded! handle 0x%x\n",
+                msm->msm_bus_handle);
+
+       return 0;
+}
+
+/**
+ * wil_platform_msm_init() - wil6210 msm platform module init
+ *
+ * The function must be called before all other functions in this module.
+ * It returns a handle which is used with the rest of the API
+ *
+ */
+void *wil_platform_msm_init(struct device *dev, struct wil_platform_ops *ops)
+{
+       struct device_node *of_node;
+       struct wil_platform_msm *msm;
+       int rc;
+
+       of_node = of_find_compatible_node(NULL, NULL, "qcom,wil6210");
+       if (!of_node) {
+               /* this could mean non-msm platform */
+               dev_err(dev, "DT node not found\n");
+               return NULL;
+       }
+
+       msm = kzalloc(sizeof(*msm), GFP_KERNEL);
+       if (!msm)
+               return NULL;
+
+       msm->dev = dev;
+
+       /* register with msm_bus module for scaling requests */
+       rc = wil_platform_msm_bus_register(msm, of_node);
+       if (rc)
+               goto cleanup;
+
+       memset(ops, 0, sizeof(*ops));
+       ops->bus_request = wil_platform_bus_request;
+       ops->uninit = wil_platform_uninit;
+
+       return (void *)msm;
+
+cleanup:
+       kfree(msm);
+       return NULL;
+}
diff --git a/drivers/net/wireless/ath/wil6210/wil_platform_msm.h b/drivers/net/wireless/ath/wil6210/wil_platform_msm.h
new file mode 100644 (file)
index 0000000..2f2229e
--- /dev/null
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2014 Qualcomm Atheros, Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __WIL_PLATFORM__MSM_H__
+#define __WIL_PLATFORM_MSM_H__
+
+#include "wil_platform.h"
+
+void *wil_platform_msm_init(struct device *dev, struct wil_platform_ops *ops);
+
+#endif /* __WIL_PLATFORM__MSM_H__ */