NFC: nci: Add support for proprietary RF Protocols

In NFC Forum NCI specification, some RF Protocol values are
reserved for proprietary use (from 0x80 to 0xfe).
Some CLF vendor may need to use one value within this range
for specific technology.
Furthermore, some CLF may not becompliant with NFC Froum NCI
specification 2.0 and therefore will not support RF Protocol
value 0x06 for PROTOCOL_T5T as mention in a draft specification
and in a recent push.

Adding get_rf_protocol handle to the nci_ops structure will
help to set the correct technology to target.

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

1 files changed, 8 insertions, 1 deletions

diff --git a/net/nfc/nci/ntf.c b/net/nfc/nci/ntf.c
index 25e44cebd60a..205b35f666db 100644
--- a/net/nfc/nci/ntf.c
+++ b/net/nfc/nci/ntf.c
@@ -167,6 +167,13 @@ static __u8 *nci_extract_rf_params_nfcv_passive_poll(struct nci_dev *ndev,
         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,
@@ -195,7 +202,7 @@ static int nci_add_new_protocol(struct nci_dev *ndev,
         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");