Merge tag 'nfc-next-3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next

Samuel Ortiz <sameo@linux.intel.com> says:

"NFC: 3.18 pull request

This is the NFC pull request for 3.18.

We've had major updates for TI and ST Microelectronics drivers:

For TI's trf7970a driver:

- Target mode support for trf7970a
- Suspend/resume support for trf7970a
- DT properties additions to handle different quirks
- A bunch of fixes for smartphone IOP related issues

For ST Microelectronics' ST21NFCA and ST21NFCB drivers:

- ISO15693 support for st21nfcb
- checkpatch and sparse related warning fixes
- Code cleanups and a few minor fixes

Finally, Marvell add ISO15693 support to the NCI stack, together with a
couple of NCI fixes."

Signed-off-by: John W. Linville <linville@tuxdriver.com>

4 files changed, 158 insertions, 11 deletions

diff --git a/net/nfc/digital_dep.c b/net/nfc/digital_dep.c
index e1638dab076d..b60aa35c074f 100644
--- a/net/nfc/digital_dep.c
+++ b/net/nfc/digital_dep.c
@@ -33,6 +33,8 @@
 #define DIGITAL_ATR_REQ_MAX_SIZE 64
 
 #define DIGITAL_LR_BITS_PAYLOAD_SIZE_254B 0x30
+#define DIGITAL_FSL_BITS_PAYLOAD_SIZE_254B \
+                                (DIGITAL_LR_BITS_PAYLOAD_SIZE_254B >> 4)
 #define DIGITAL_GB_BIT  0x02
 
 #define DIGITAL_NFC_DEP_PFB_TYPE(pfb) ((pfb) & 0xE0)
@@ -127,6 +129,98 @@ static int digital_skb_pull_dep_sod(struct nfc_digital_dev *ddev,
         return 0;
 }
 
+static void digital_in_recv_psl_res(struct nfc_digital_dev *ddev, void *arg,
+                                    struct sk_buff *resp)
+{
+        struct nfc_target *target = arg;
+        struct digital_psl_res *psl_res;
+        int rc;
+
+        if (IS_ERR(resp)) {
+                rc = PTR_ERR(resp);
+                resp = NULL;
+                goto exit;
+        }
+
+        rc = ddev->skb_check_crc(resp);
+        if (rc) {
+                PROTOCOL_ERR("14.4.1.6");
+                goto exit;
+        }
+
+        rc = digital_skb_pull_dep_sod(ddev, resp);
+        if (rc) {
+                PROTOCOL_ERR("14.4.1.2");
+                goto exit;
+        }
+
+        psl_res = (struct digital_psl_res *)resp->data;
+
+        if ((resp->len != sizeof(*psl_res)) ||
+            (psl_res->dir != DIGITAL_NFC_DEP_FRAME_DIR_IN) ||
+            (psl_res->cmd != DIGITAL_CMD_PSL_RES)) {
+                rc = -EIO;
+                goto exit;
+        }
+
+        rc = digital_in_configure_hw(ddev, NFC_DIGITAL_CONFIG_RF_TECH,
+                                     NFC_DIGITAL_RF_TECH_424F);
+        if (rc)
+                goto exit;
+
+        rc = digital_in_configure_hw(ddev, NFC_DIGITAL_CONFIG_FRAMING,
+                                     NFC_DIGITAL_FRAMING_NFCF_NFC_DEP);
+        if (rc)
+                goto exit;
+
+        if (!DIGITAL_DRV_CAPS_IN_CRC(ddev) &&
+            (ddev->curr_rf_tech == NFC_DIGITAL_RF_TECH_106A)) {
+                ddev->skb_add_crc = digital_skb_add_crc_f;
+                ddev->skb_check_crc = digital_skb_check_crc_f;
+        }
+
+        ddev->curr_rf_tech = NFC_DIGITAL_RF_TECH_424F;
+
+        nfc_dep_link_is_up(ddev->nfc_dev, target->idx, NFC_COMM_ACTIVE,
+                           NFC_RF_INITIATOR);
+
+        ddev->curr_nfc_dep_pni = 0;
+
+exit:
+        dev_kfree_skb(resp);
+
+        if (rc)
+                ddev->curr_protocol = 0;
+}
+
+static int digital_in_send_psl_req(struct nfc_digital_dev *ddev,
+                                   struct nfc_target *target)
+{
+        struct sk_buff *skb;
+        struct digital_psl_req *psl_req;
+
+        skb = digital_skb_alloc(ddev, sizeof(*psl_req));
+        if (!skb)
+                return -ENOMEM;
+
+        skb_put(skb, sizeof(*psl_req));
+
+        psl_req = (struct digital_psl_req *)skb->data;
+
+        psl_req->dir = DIGITAL_NFC_DEP_FRAME_DIR_OUT;
+        psl_req->cmd = DIGITAL_CMD_PSL_REQ;
+        psl_req->did = 0;
+        psl_req->brs = (0x2 << 3) | 0x2; /* 424F both directions */
+        psl_req->fsl = DIGITAL_FSL_BITS_PAYLOAD_SIZE_254B;
+
+        digital_skb_push_dep_sod(ddev, skb);
+
+        ddev->skb_add_crc(skb);
+
+        return digital_in_send_cmd(ddev, skb, 500, digital_in_recv_psl_res,
+                                   target);
+}
+
 static void digital_in_recv_atr_res(struct nfc_digital_dev *ddev, void *arg,
                                  struct sk_buff *resp)
 {
@@ -166,6 +260,13 @@ static void digital_in_recv_atr_res(struct nfc_digital_dev *ddev, void *arg,
         if (rc)
                 goto exit;
 
+        if ((ddev->protocols & NFC_PROTO_FELICA_MASK) &&
+            (ddev->curr_rf_tech != NFC_DIGITAL_RF_TECH_424F)) {
+                rc = digital_in_send_psl_req(ddev, target);
+                if (!rc)
+                        goto exit;
+        }
+
         rc = nfc_dep_link_is_up(ddev->nfc_dev, target->idx, NFC_COMM_ACTIVE,
                                 NFC_RF_INITIATOR);
 
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 2b400e1a8695..90b16cb40058 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -231,6 +231,14 @@ static void nci_rf_discover_req(struct nci_dev *ndev, unsigned long opt)
                 cmd.num_disc_configs++;
         }
 
+        if ((cmd.num_disc_configs < NCI_MAX_NUM_RF_CONFIGS) &&
+            (protocols & NFC_PROTO_ISO15693_MASK)) {
+                cmd.disc_configs[cmd.num_disc_configs].rf_tech_and_mode =
+                        NCI_NFC_V_PASSIVE_POLL_MODE;
+                cmd.disc_configs[cmd.num_disc_configs].frequency = 1;
+                cmd.num_disc_configs++;
+        }
+
         nci_send_cmd(ndev, NCI_OP_RF_DISCOVER_CMD,
                      (1 + (cmd.num_disc_configs * sizeof(struct disc_config))),
                      &cmd);
@@ -751,10 +759,6 @@ int nci_register_device(struct nci_dev *ndev)
         struct device *dev = &ndev->nfc_dev->dev;
         char name[32];
 
-        rc = nfc_register_device(ndev->nfc_dev);
-        if (rc)
-                goto exit;
-
         ndev->flags = 0;
 
         INIT_WORK(&ndev->cmd_work, nci_cmd_work);
@@ -762,7 +766,7 @@ int nci_register_device(struct nci_dev *ndev)
         ndev->cmd_wq = create_singlethread_workqueue(name);
         if (!ndev->cmd_wq) {
                 rc = -ENOMEM;
-                goto unreg_exit;
+                goto exit;
         }
 
         INIT_WORK(&ndev->rx_work, nci_rx_work);
@@ -792,6 +796,10 @@ int nci_register_device(struct nci_dev *ndev)
 
         mutex_init(&ndev->req_lock);
 
+        rc = nfc_register_device(ndev->nfc_dev);
+        if (rc)
+                goto destroy_rx_wq_exit;
+
         goto exit;
 
 destroy_rx_wq_exit:
@@ -800,9 +808,6 @@ destroy_rx_wq_exit:
 destroy_cmd_wq_exit:
         destroy_workqueue(ndev->cmd_wq);
 
-unreg_exit:
-        nfc_unregister_device(ndev->nfc_dev);
-
 exit:
         return rc;
 }
diff --git a/net/nfc/nci/data.c b/net/nfc/nci/data.c
index 6c3aef852876..427ef2c7ab68 100644
--- a/net/nfc/nci/data.c
+++ b/net/nfc/nci/data.c
@@ -241,9 +241,12 @@ void nci_rx_data_packet(struct nci_dev *ndev, struct sk_buff *skb)
         /* strip the nci data header */
         skb_pull(skb, NCI_DATA_HDR_SIZE);
 
-        if (ndev->target_active_prot == NFC_PROTO_MIFARE) {
+        if (ndev->target_active_prot == NFC_PROTO_MIFARE ||
+            ndev->target_active_prot == NFC_PROTO_JEWEL ||
+            ndev->target_active_prot == NFC_PROTO_FELICA ||
+            ndev->target_active_prot == NFC_PROTO_ISO15693) {
                 /* frame I/F => remove the status byte */
-                pr_debug("NFC_PROTO_MIFARE => remove the status byte\n");
+                pr_debug("frame I/F => remove the status byte\n");
                 skb_trim(skb, (skb->len - 1));
         }
 
diff --git a/net/nfc/nci/ntf.c b/net/nfc/nci/ntf.c
index df91bb95b12a..205b35f666db 100644
--- a/net/nfc/nci/ntf.c
+++ b/net/nfc/nci/ntf.c
@@ -2,6 +2,7 @@
  *  The NFC Controller Interface is the communication protocol between an
  *  NFC Controller (NFCC) and a Device Host (DH).
  *
+ *  Copyright (C) 2014 Marvell International Ltd.
  *  Copyright (C) 2011 Texas Instruments, Inc.
  *
  *  Written by Ilan Elias <ilane@ti.com>
@@ -155,6 +156,24 @@ static __u8 *nci_extract_rf_params_nfcf_passive_poll(struct nci_dev *ndev,
         return data;
 }
 
+static __u8 *nci_extract_rf_params_nfcv_passive_poll(struct nci_dev *ndev,
+                        struct rf_tech_specific_params_nfcv_poll *nfcv_poll,
+                                                     __u8 *data)
+{
+        ++data;
+        nfcv_poll->dsfid = *data++;
+        memcpy(nfcv_poll->uid, data, NFC_ISO15693_UID_MAXSIZE);
+        data += NFC_ISO15693_UID_MAXSIZE;
+        return data;
+}
+
+__u32 nci_get_prop_rf_protocol(struct nci_dev *ndev, __u8 rf_protocol)
+{
+        if (ndev->ops->get_rfprotocol)
+                return ndev->ops->get_rfprotocol(ndev, rf_protocol);
+        return 0;
+}
+
 static int nci_add_new_protocol(struct nci_dev *ndev,
                                 struct nfc_target *target,
                                 __u8 rf_protocol,
@@ -164,6 +183,7 @@ static int nci_add_new_protocol(struct nci_dev *ndev,
         struct rf_tech_specific_params_nfca_poll *nfca_poll;
         struct rf_tech_specific_params_nfcb_poll *nfcb_poll;
         struct rf_tech_specific_params_nfcf_poll *nfcf_poll;
+        struct rf_tech_specific_params_nfcv_poll *nfcv_poll;
         __u32 protocol;
 
         if (rf_protocol == NCI_RF_PROTOCOL_T1T)
@@ -179,8 +199,10 @@ static int nci_add_new_protocol(struct nci_dev *ndev,
                 protocol = NFC_PROTO_FELICA_MASK;
         else if (rf_protocol == NCI_RF_PROTOCOL_NFC_DEP)
                 protocol = NFC_PROTO_NFC_DEP_MASK;
+        else if (rf_protocol == NCI_RF_PROTOCOL_T5T)
+                protocol = NFC_PROTO_ISO15693_MASK;
         else
-                protocol = 0;
+                protocol = nci_get_prop_rf_protocol(ndev, rf_protocol);
 
         if (!(protocol & ndev->poll_prots)) {
                 pr_err("the target found does not have the desired protocol\n");
@@ -213,6 +235,12 @@ static int nci_add_new_protocol(struct nci_dev *ndev,
                         memcpy(target->sensf_res, nfcf_poll->sensf_res,
                                target->sensf_res_len);
                 }
+        } else if (rf_tech_and_mode == NCI_NFC_V_PASSIVE_POLL_MODE) {
+                nfcv_poll = (struct rf_tech_specific_params_nfcv_poll *)params;
+
+                target->is_iso15693 = 1;
+                target->iso15693_dsfid = nfcv_poll->dsfid;
+                memcpy(target->iso15693_uid, nfcv_poll->uid, NFC_ISO15693_UID_MAXSIZE);
         } else {
                 pr_err("unsupported rf_tech_and_mode 0x%x\n", rf_tech_and_mode);
                 return -EPROTO;
@@ -305,6 +333,11 @@ static void nci_rf_discover_ntf_packet(struct nci_dev *ndev,
                                 &(ntf.rf_tech_specific_params.nfcf_poll), data);
                         break;
 
+                case NCI_NFC_V_PASSIVE_POLL_MODE:
+                        data = nci_extract_rf_params_nfcv_passive_poll(ndev,
+                                &(ntf.rf_tech_specific_params.nfcv_poll), data);
+                        break;
+
                 default:
                         pr_err("unsupported rf_tech_and_mode 0x%x\n",
                                ntf.rf_tech_and_mode);
@@ -455,6 +488,11 @@ static void nci_rf_intf_activated_ntf_packet(struct nci_dev *ndev,
                                 &(ntf.rf_tech_specific_params.nfcf_poll), data);
                         break;
 
+                case NCI_NFC_V_PASSIVE_POLL_MODE:
+                        data = nci_extract_rf_params_nfcv_passive_poll(ndev,
+                                &(ntf.rf_tech_specific_params.nfcv_poll), data);
+                        break;
+
                 default:
                         pr_err("unsupported activation_rf_tech_and_mode 0x%x\n",
                                ntf.activation_rf_tech_and_mode);