NFC: nci: Update nci_enable_se to run proprietary commands to enable a secure element

Some NFC controller using NCI protocols may need a proprietary commands
flow to enable a secure element

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

diff --git a/include/net/nfc/nci_core.h b/include/net/nfc/nci_core.h
index 8399a7964de43ff87238e753c3160fda7ef55903..db2d12790112d6ea43c013c805b2d5aa8def287d 100644 (file)
--- a/include/net/nfc/nci_core.h
+++ b/include/net/nfc/nci_core.h
@@ -73,6 +73,7 @@ struct nci_ops {
        int   (*setup)(struct nci_dev *ndev);
        __u32 (*get_rfprotocol)(struct nci_dev *ndev, __u8 rf_protocol);
        int   (*discover_se)(struct nci_dev *ndev);
+       int   (*enable_se)(struct nci_dev *ndev, u32 se_idx);
 };
 
 #define NCI_MAX_SUPPORTED_RF_INTERFACES                4

diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 4044973084a7a43797dbc3f5c7f0a5b8ffd54598..6c36ec6e477cd9e8bfe94c5253d611c9941c67f4 100644 (file)
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -746,6 +746,11 @@ static int nci_tm_send(struct nfc_dev *nfc_dev, struct sk_buff *skb)
 
 static int nci_enable_se(struct nfc_dev *nfc_dev, u32 se_idx)
 {
+       struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
+
+       if (ndev->ops->enable_se)
+               return ndev->ops->enable_se(ndev, se_idx);
+
        return 0;
 }