These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git] / kernel / drivers / nfc / nfcmrvl / main.c
index ad4933c..51c8240 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Marvell NFC driver: major functions
  *
- * Copyright (C) 2014, Marvell International Ltd.
+ * Copyright (C) 2014-2015 Marvell International Ltd.
  *
  * This software file (the "File") is distributed by Marvell International
  * Ltd. under the terms of the GNU General Public License Version 2, June 1991
  */
 
 #include <linux/module.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/of_gpio.h>
 #include <linux/nfc.h>
 #include <net/nfc/nci.h>
 #include <net/nfc/nci_core.h>
 #include "nfcmrvl.h"
 
-#define VERSION "1.0"
-
 static int nfcmrvl_nci_open(struct nci_dev *ndev)
 {
        struct nfcmrvl_private *priv = nci_get_drvdata(ndev);
@@ -32,6 +33,9 @@ static int nfcmrvl_nci_open(struct nci_dev *ndev)
        if (test_and_set_bit(NFCMRVL_NCI_RUNNING, &priv->flags))
                return 0;
 
+       /* Reset possible fault of previous session */
+       clear_bit(NFCMRVL_PHY_ERROR, &priv->flags);
+
        err = priv->if_ops->nci_open(priv);
 
        if (err)
@@ -60,39 +64,52 @@ static int nfcmrvl_nci_send(struct nci_dev *ndev, struct sk_buff *skb)
 
        skb->dev = (void *)ndev;
 
-       if (!test_bit(NFCMRVL_NCI_RUNNING, &priv->flags))
-               return -EBUSY;
+       if (priv->config.hci_muxed) {
+               unsigned char *hdr;
+               unsigned char len = skb->len;
+
+               hdr = (char *) skb_push(skb, NFCMRVL_HCI_EVENT_HEADER_SIZE);
+               hdr[0] = NFCMRVL_HCI_COMMAND_CODE;
+               hdr[1] = NFCMRVL_HCI_OGF;
+               hdr[2] = NFCMRVL_HCI_OCF;
+               hdr[3] = len;
+       }
 
        return priv->if_ops->nci_send(priv, skb);
 }
 
 static int nfcmrvl_nci_setup(struct nci_dev *ndev)
 {
-       __u8 val;
-
-       val = NFCMRVL_GPIO_PIN_NFC_NOT_ALLOWED;
-       nci_set_config(ndev, NFCMRVL_NOT_ALLOWED_ID, 1, &val);
-       val = NFCMRVL_GPIO_PIN_NFC_ACTIVE;
-       nci_set_config(ndev, NFCMRVL_ACTIVE_ID, 1, &val);
-       val = NFCMRVL_EXT_COEX_ENABLE;
-       nci_set_config(ndev, NFCMRVL_EXT_COEX_ID, 1, &val);
+       __u8 val = 1;
 
+       nci_set_config(ndev, NFCMRVL_PB_BAIL_OUT, 1, &val);
        return 0;
 }
 
+static int nfcmrvl_nci_fw_download(struct nci_dev *ndev,
+                                  const char *firmware_name)
+{
+       return nfcmrvl_fw_dnld_start(ndev, firmware_name);
+}
+
 static struct nci_ops nfcmrvl_nci_ops = {
        .open = nfcmrvl_nci_open,
        .close = nfcmrvl_nci_close,
        .send = nfcmrvl_nci_send,
        .setup = nfcmrvl_nci_setup,
+       .fw_download = nfcmrvl_nci_fw_download,
 };
 
-struct nfcmrvl_private *nfcmrvl_nci_register_dev(void *drv_data,
-                                                struct nfcmrvl_if_ops *ops,
-                                                struct device *dev)
+struct nfcmrvl_private *nfcmrvl_nci_register_dev(enum nfcmrvl_phy phy,
+                               void *drv_data,
+                               struct nfcmrvl_if_ops *ops,
+                               struct device *dev,
+                               struct nfcmrvl_platform_data *pdata)
 {
        struct nfcmrvl_private *priv;
        int rc;
+       int headroom;
+       int tailroom;
        u32 protocols;
 
        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
@@ -102,14 +119,38 @@ struct nfcmrvl_private *nfcmrvl_nci_register_dev(void *drv_data,
        priv->drv_data = drv_data;
        priv->if_ops = ops;
        priv->dev = dev;
+       priv->phy = phy;
+
+       memcpy(&priv->config, pdata, sizeof(*pdata));
+
+       if (priv->config.reset_n_io) {
+               rc = devm_gpio_request_one(dev,
+                                          priv->config.reset_n_io,
+                                          GPIOF_OUT_INIT_LOW,
+                                          "nfcmrvl_reset_n");
+               if (rc < 0)
+                       nfc_err(dev, "failed to request reset_n io\n");
+       }
+
+       if (phy == NFCMRVL_PHY_SPI) {
+               headroom = NCI_SPI_HDR_LEN;
+               tailroom = 1;
+       } else
+               headroom = tailroom = 0;
+
+       if (priv->config.hci_muxed)
+               headroom += NFCMRVL_HCI_EVENT_HEADER_SIZE;
 
        protocols = NFC_PROTO_JEWEL_MASK
-               | NFC_PROTO_MIFARE_MASK | NFC_PROTO_FELICA_MASK
+               | NFC_PROTO_MIFARE_MASK
+               | NFC_PROTO_FELICA_MASK
                | NFC_PROTO_ISO14443_MASK
                | NFC_PROTO_ISO14443_B_MASK
+               | NFC_PROTO_ISO15693_MASK
                | NFC_PROTO_NFC_DEP_MASK;
 
-       priv->ndev = nci_allocate_device(&nfcmrvl_nci_ops, protocols, 0, 0);
+       priv->ndev = nci_allocate_device(&nfcmrvl_nci_ops, protocols,
+                                        headroom, tailroom);
        if (!priv->ndev) {
                nfc_err(dev, "nci_allocate_device failed\n");
                rc = -ENOMEM;
@@ -121,13 +162,23 @@ struct nfcmrvl_private *nfcmrvl_nci_register_dev(void *drv_data,
        rc = nci_register_device(priv->ndev);
        if (rc) {
                nfc_err(dev, "nci_register_device failed %d\n", rc);
-               nci_free_device(priv->ndev);
-               goto error;
+               goto error_free_dev;
+       }
+
+       /* Ensure that controller is powered off */
+       nfcmrvl_chip_halt(priv);
+
+       rc = nfcmrvl_fw_dnld_init(priv);
+       if (rc) {
+               nfc_err(dev, "failed to initialize FW download %d\n", rc);
+               goto error_free_dev;
        }
 
        nfc_info(dev, "registered with nci successfully\n");
        return priv;
 
+error_free_dev:
+       nci_free_device(priv->ndev);
 error:
        kfree(priv);
        return ERR_PTR(rc);
@@ -138,28 +189,95 @@ void nfcmrvl_nci_unregister_dev(struct nfcmrvl_private *priv)
 {
        struct nci_dev *ndev = priv->ndev;
 
+       if (priv->ndev->nfc_dev->fw_download_in_progress)
+               nfcmrvl_fw_dnld_abort(priv);
+
+       nfcmrvl_fw_dnld_deinit(priv);
+
+       if (priv->config.reset_n_io)
+               devm_gpio_free(priv->dev, priv->config.reset_n_io);
+
        nci_unregister_device(ndev);
        nci_free_device(ndev);
        kfree(priv);
 }
 EXPORT_SYMBOL_GPL(nfcmrvl_nci_unregister_dev);
 
-int nfcmrvl_nci_recv_frame(struct nfcmrvl_private *priv, void *data, int count)
+int nfcmrvl_nci_recv_frame(struct nfcmrvl_private *priv, struct sk_buff *skb)
 {
-       struct sk_buff *skb;
+       if (priv->config.hci_muxed) {
+               if (skb->data[0] == NFCMRVL_HCI_EVENT_CODE &&
+                   skb->data[1] == NFCMRVL_HCI_NFC_EVENT_CODE) {
+                       /* Data packet, let's extract NCI payload */
+                       skb_pull(skb, NFCMRVL_HCI_EVENT_HEADER_SIZE);
+               } else {
+                       /* Skip this packet */
+                       kfree_skb(skb);
+                       return 0;
+               }
+       }
 
-       skb = nci_skb_alloc(priv->ndev, count, GFP_ATOMIC);
-       if (!skb)
-               return -ENOMEM;
+       if (priv->ndev->nfc_dev->fw_download_in_progress) {
+               nfcmrvl_fw_dnld_recv_frame(priv, skb);
+               return 0;
+       }
 
-       memcpy(skb_put(skb, count), data, count);
-       nci_recv_frame(priv->ndev, skb);
+       if (test_bit(NFCMRVL_NCI_RUNNING, &priv->flags))
+               nci_recv_frame(priv->ndev, skb);
+       else {
+               /* Drop this packet since nobody wants it */
+               kfree_skb(skb);
+               return 0;
+       }
 
-       return count;
+       return 0;
 }
 EXPORT_SYMBOL_GPL(nfcmrvl_nci_recv_frame);
 
+void nfcmrvl_chip_reset(struct nfcmrvl_private *priv)
+{
+       /* Reset possible fault of previous session */
+       clear_bit(NFCMRVL_PHY_ERROR, &priv->flags);
+
+       if (priv->config.reset_n_io) {
+               nfc_info(priv->dev, "reset the chip\n");
+               gpio_set_value(priv->config.reset_n_io, 0);
+               usleep_range(5000, 10000);
+               gpio_set_value(priv->config.reset_n_io, 1);
+       } else
+               nfc_info(priv->dev, "no reset available on this interface\n");
+}
+
+void nfcmrvl_chip_halt(struct nfcmrvl_private *priv)
+{
+       if (priv->config.reset_n_io)
+               gpio_set_value(priv->config.reset_n_io, 0);
+}
+
+int nfcmrvl_parse_dt(struct device_node *node,
+                    struct nfcmrvl_platform_data *pdata)
+{
+       int reset_n_io;
+
+       reset_n_io = of_get_named_gpio(node, "reset-n-io", 0);
+       if (reset_n_io < 0) {
+               pr_info("no reset-n-io config\n");
+               reset_n_io = 0;
+       } else if (!gpio_is_valid(reset_n_io)) {
+               pr_err("invalid reset-n-io GPIO\n");
+               return reset_n_io;
+       }
+       pdata->reset_n_io = reset_n_io;
+
+       if (of_find_property(node, "hci-muxed", NULL))
+               pdata->hci_muxed = 1;
+       else
+               pdata->hci_muxed = 0;
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(nfcmrvl_parse_dt);
+
 MODULE_AUTHOR("Marvell International Ltd.");
-MODULE_DESCRIPTION("Marvell NFC driver ver " VERSION);
-MODULE_VERSION(VERSION);
+MODULE_DESCRIPTION("Marvell NFC driver");
 MODULE_LICENSE("GPL v2");