NFC: nci: Add NFCEE enabling and disabling support

NFCEEs can be enabled or disabled by sending the
NCI_OP_NFCEE_MODE_SET_CMD command to the NFCC. This patch
provides an API for drivers to enable and disable e.g. their
NCI discoveredd secure elements.

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

2 files changed, 34 insertions, 0 deletions

diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index a25857548524..e5fb8c8eed94 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -486,6 +486,27 @@ int nci_nfcee_discover(struct nci_dev *ndev, u8 action)
 }
 EXPORT_SYMBOL(nci_nfcee_discover);
 
+static void nci_nfcee_mode_set_req(struct nci_dev *ndev, unsigned long opt)
+{
+        struct nci_nfcee_mode_set_cmd *cmd =
+                                        (struct nci_nfcee_mode_set_cmd *)opt;
+
+        nci_send_cmd(ndev, NCI_OP_NFCEE_MODE_SET_CMD,
+                     sizeof(struct nci_nfcee_mode_set_cmd), cmd);
+}
+
+int nci_nfcee_mode_set(struct nci_dev *ndev, u8 nfcee_id, u8 nfcee_mode)
+{
+        struct nci_nfcee_mode_set_cmd cmd;
+
+        cmd.nfcee_id = nfcee_id;
+        cmd.nfcee_mode = nfcee_mode;
+
+        return nci_request(ndev, nci_nfcee_mode_set_req, (unsigned long)&cmd,
+                           msecs_to_jiffies(NCI_CMD_TIMEOUT));
+}
+EXPORT_SYMBOL(nci_nfcee_mode_set);
+
 static int nci_set_local_general_bytes(struct nfc_dev *nfc_dev)
 {
         struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
diff --git a/net/nfc/nci/rsp.c b/net/nfc/nci/rsp.c
index ee094dfab2ed..0a3e98240dd6 100644
--- a/net/nfc/nci/rsp.c
+++ b/net/nfc/nci/rsp.c
@@ -213,6 +213,15 @@ static void nci_nfcee_discover_rsp_packet(struct nci_dev *ndev,
                 nci_req_complete(ndev, discover_rsp->status);
 }
 
+static void nci_nfcee_mode_set_rsp_packet(struct nci_dev *ndev,
+                                          struct sk_buff *skb)
+{
+        __u8 status = skb->data[0];
+
+        pr_debug("status 0x%x\n", status);
+        nci_req_complete(ndev, status);
+}
+
 void nci_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)
 {
         __u16 rsp_opcode = nci_opcode(skb->data);
@@ -262,6 +271,10 @@ void nci_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)
                 nci_nfcee_discover_rsp_packet(ndev, skb);
                 break;
 
+        case NCI_OP_NFCEE_MODE_SET_RSP:
+                nci_nfcee_mode_set_rsp_packet(ndev, skb);
+                break;
+
         default:
                 pr_err("unknown rsp opcode 0x%x\n", rsp_opcode);
                 break;