NFC: nci: Handle proprietary response and notifications

Allow for drivers to explicitly define handlers for each
proprietary notifications and responses they expect to support.

Reviewed-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

3 files changed, 72 insertions, 0 deletions

diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 49ff32106080..56d57c93ea1a 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -28,6 +28,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__
 
 #include <linux/module.h>
+#include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/workqueue.h>
 #include <linux/completion.h>
@@ -961,6 +962,14 @@ struct nci_dev *nci_allocate_device(struct nci_ops *ops,
                 return NULL;
 
         ndev->ops = ops;
+
+        if (ops->n_prop_ops > NCI_MAX_PROPRIETARY_CMD) {
+                pr_err("Too many proprietary commands: %zd\n",
+                       ops->n_prop_ops);
+                ops->prop_ops = NULL;
+                ops->n_prop_ops = 0;
+        }
+
         ndev->tx_headroom = tx_headroom;
         ndev->tx_tailroom = tx_tailroom;
         init_completion(&ndev->req_completion);
@@ -1165,6 +1174,49 @@ int nci_send_cmd(struct nci_dev *ndev, __u16 opcode, __u8 plen, void *payload)
         return 0;
 }
 
+/* Proprietary commands API */
+static struct nci_prop_ops *prop_cmd_lookup(struct nci_dev *ndev,
+                                            __u16 opcode)
+{
+        size_t i;
+        struct nci_prop_ops *prop_op;
+
+        if (!ndev->ops->prop_ops || !ndev->ops->n_prop_ops)
+                return NULL;
+
+        for (i = 0; i < ndev->ops->n_prop_ops; i++) {
+                prop_op = &ndev->ops->prop_ops[i];
+                if (prop_op->opcode == opcode)
+                        return prop_op;
+        }
+
+        return NULL;
+}
+
+int nci_prop_rsp_packet(struct nci_dev *ndev, __u16 rsp_opcode,
+                        struct sk_buff *skb)
+{
+        struct nci_prop_ops *prop_op;
+
+        prop_op = prop_cmd_lookup(ndev, rsp_opcode);
+        if (!prop_op || !prop_op->rsp)
+                return -ENOTSUPP;
+
+        return prop_op->rsp(ndev, skb);
+}
+
+int nci_prop_ntf_packet(struct nci_dev *ndev, __u16 ntf_opcode,
+                        struct sk_buff *skb)
+{
+        struct nci_prop_ops *prop_op;
+
+        prop_op = prop_cmd_lookup(ndev, ntf_opcode);
+        if (!prop_op || !prop_op->ntf)
+                return -ENOTSUPP;
+
+        return prop_op->ntf(ndev, skb);
+}
+
 /* ---- NCI TX Data worker thread ---- */
 
 static void nci_tx_work(struct work_struct *work)
diff --git a/net/nfc/nci/ntf.c b/net/nfc/nci/ntf.c
index 3218071072ac..5d1c2e391c56 100644
--- a/net/nfc/nci/ntf.c
+++ b/net/nfc/nci/ntf.c
@@ -758,6 +758,15 @@ void nci_ntf_packet(struct nci_dev *ndev, struct sk_buff *skb)
         /* strip the nci control header */
         skb_pull(skb, NCI_CTRL_HDR_SIZE);
 
+        if (nci_opcode_gid(ntf_opcode) == NCI_GID_PROPRIETARY) {
+                if (nci_prop_ntf_packet(ndev, ntf_opcode, skb)) {
+                        pr_err("unsupported ntf opcode 0x%x\n",
+                               ntf_opcode);
+                }
+
+                goto end;
+        }
+
         switch (ntf_opcode) {
         case NCI_OP_CORE_CONN_CREDITS_NTF:
                 nci_core_conn_credits_ntf_packet(ndev, skb);
@@ -796,5 +805,6 @@ void nci_ntf_packet(struct nci_dev *ndev, struct sk_buff *skb)
                 break;
         }
 
+end:
         kfree_skb(skb);
 }
diff --git a/net/nfc/nci/rsp.c b/net/nfc/nci/rsp.c
index 02486bc2ceea..408bd8f857ab 100644
--- a/net/nfc/nci/rsp.c
+++ b/net/nfc/nci/rsp.c
@@ -296,6 +296,15 @@ void nci_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)
         /* strip the nci control header */
         skb_pull(skb, NCI_CTRL_HDR_SIZE);
 
+        if (nci_opcode_gid(rsp_opcode) == NCI_GID_PROPRIETARY) {
+                if (nci_prop_rsp_packet(ndev, rsp_opcode, skb) == -ENOTSUPP) {
+                        pr_err("unsupported rsp opcode 0x%x\n",
+                               rsp_opcode);
+                }
+
+                goto end;
+        }
+
         switch (rsp_opcode) {
         case NCI_OP_CORE_RESET_RSP:
                 nci_core_reset_rsp_packet(ndev, skb);
@@ -346,6 +355,7 @@ void nci_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)
                 break;
         }
 
+end:
         kfree_skb(skb);
 
         /* trigger the next cmd */