Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d5a2ca60e41fec4ede7b82d3608278523cffe77b

Authored by Ilan Elias
Committed by John W. Linville
1 parent bfeb4dbc5c
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

NFC: Export new attributes sensb_res and sensf_res 

Export new attributes sensb_res for tech B and sensf_res
for tech F in the target info (returned as a response to
NFC_CMD_GET_TARGET).
The max size of the attributes nfcid1, sensb_res and sensf_res
is exported to user space though include/linux/nfc.

Signed-off-by: Ilan Elias <ilane@ti.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

Showing 5 changed files with 136 additions and 15 deletions Side-by-side Diff

... ... @@ -89,6 +89,8 @@
89 89 * @NFC_ATTR_TARGET_SEL_RES: NFC-A targets extra information (useful if the
90 90 * target is not NFC-Forum compliant)
91 91 * @NFC_ATTR_TARGET_NFCID1: NFC-A targets identifier, max 10 bytes
  92 + * @NFC_ATTR_TARGET_SENSB_RES: NFC-B targets extra information, max 12 bytes
  93 + * @NFC_ATTR_TARGET_SENSF_RES: NFC-F targets extra information, max 18 bytes
92 94 * @NFC_ATTR_COMM_MODE: Passive or active mode
93 95 * @NFC_ATTR_RF_MODE: Initiator or target
94 96 */
... ... @@ -101,6 +103,8 @@
101 103 NFC_ATTR_TARGET_SENS_RES,
102 104 NFC_ATTR_TARGET_SEL_RES,
103 105 NFC_ATTR_TARGET_NFCID1,
  106 + NFC_ATTR_TARGET_SENSB_RES,
  107 + NFC_ATTR_TARGET_SENSF_RES,
104 108 NFC_ATTR_COMM_MODE,
105 109 NFC_ATTR_RF_MODE,
106 110 /* private: internal use only */
... ... @@ -109,6 +113,9 @@
109 113 #define NFC_ATTR_MAX (__NFC_ATTR_AFTER_LAST - 1)
110 114  
111 115 #define NFC_DEVICE_NAME_MAXSIZE 8
  116 +#define NFC_NFCID1_MAXSIZE 10
  117 +#define NFC_SENSB_RES_MAXSIZE 12
  118 +#define NFC_SENSF_RES_MAXSIZE 18
112 119  
113 120 /* NFC protocols */
114 121 #define NFC_PROTO_JEWEL 1
include/net/nfc/nci.h
Diff comments   View file @ d5a2ca6
... ... @@ -275,11 +275,27 @@
275 275 __u8 sel_res;
276 276 } __packed;
277 277  
  278 +struct rf_tech_specific_params_nfcb_poll {
  279 + __u8 sensb_res_len;
  280 + __u8 sensb_res[12]; /* 11 or 12 Bytes */
  281 +} __packed;
  282 +
  283 +struct rf_tech_specific_params_nfcf_poll {
  284 + __u8 bit_rate;
  285 + __u8 sensf_res_len;
  286 + __u8 sensf_res[18]; /* 16 or 18 Bytes */
  287 +} __packed;
  288 +
278 289 struct activation_params_nfca_poll_iso_dep {
279 290 __u8 rats_res_len;
280 291 __u8 rats_res[20];
281 292 };
282 293  
  294 +struct activation_params_nfcb_poll_iso_dep {
  295 + __u8 attrib_res_len;
  296 + __u8 attrib_res[50];
  297 +};
  298 +
283 299 struct nci_rf_intf_activated_ntf {
284 300 __u8 rf_discovery_id;
285 301 __u8 rf_interface;
... ... @@ -291,6 +307,8 @@
291 307  
292 308 union {
293 309 struct rf_tech_specific_params_nfca_poll nfca_poll;
  310 + struct rf_tech_specific_params_nfcb_poll nfcb_poll;
  311 + struct rf_tech_specific_params_nfcf_poll nfcf_poll;
294 312 } rf_tech_specific_params;
295 313  
296 314 __u8 data_exch_rf_tech_and_mode;
... ... @@ -300,6 +318,7 @@
300 318  
301 319 union {
302 320 struct activation_params_nfca_poll_iso_dep nfca_poll_iso_dep;
  321 + struct activation_params_nfcb_poll_iso_dep nfcb_poll_iso_dep;
303 322 } activation_params;
304 323  
305 324 } __packed;
include/net/nfc/nfc.h
Diff comments   View file @ d5a2ca6
... ... @@ -24,6 +24,7 @@
24 24 #ifndef __NET_NFC_H
25 25 #define __NET_NFC_H
26 26  
  27 +#include <linux/nfc.h>
27 28 #include <linux/device.h>
28 29 #include <linux/skbuff.h>
29 30  
... ... @@ -65,7 +66,6 @@
65 66  
66 67 #define NFC_TARGET_IDX_ANY -1
67 68 #define NFC_MAX_GT_LEN 48
68   -#define NFC_MAX_NFCID1_LEN 10
69 69  
70 70 struct nfc_target {
71 71 u32 idx;
... ... @@ -73,7 +73,11 @@
73 73 u16 sens_res;
74 74 u8 sel_res;
75 75 u8 nfcid1_len;
76   - u8 nfcid1[NFC_MAX_NFCID1_LEN];
  76 + u8 nfcid1[NFC_NFCID1_MAXSIZE];
  77 + u8 sensb_res_len;
  78 + u8 sensb_res[NFC_SENSB_RES_MAXSIZE];
  79 + u8 sensf_res_len;
  80 + u8 sensf_res[NFC_SENSF_RES_MAXSIZE];
77 81 };
78 82  
79 83 struct nfc_genl_data {
... ... @@ -115,15 +115,53 @@
115 115 return data;
116 116 }
117 117  
  118 +static __u8 *nci_extract_rf_params_nfcb_passive_poll(struct nci_dev *ndev,
  119 + struct nci_rf_intf_activated_ntf *ntf, __u8 *data)
  120 +{
  121 + struct rf_tech_specific_params_nfcb_poll *nfcb_poll;
  122 +
  123 + nfcb_poll = &ntf->rf_tech_specific_params.nfcb_poll;
  124 +
  125 + nfcb_poll->sensb_res_len = *data++;
  126 +
  127 + pr_debug("sensb_res_len %d\n", nfcb_poll->sensb_res_len);
  128 +
  129 + memcpy(nfcb_poll->sensb_res, data, nfcb_poll->sensb_res_len);
  130 + data += nfcb_poll->sensb_res_len;
  131 +
  132 + return data;
  133 +}
  134 +
  135 +static __u8 *nci_extract_rf_params_nfcf_passive_poll(struct nci_dev *ndev,
  136 + struct nci_rf_intf_activated_ntf *ntf, __u8 *data)
  137 +{
  138 + struct rf_tech_specific_params_nfcf_poll *nfcf_poll;
  139 +
  140 + nfcf_poll = &ntf->rf_tech_specific_params.nfcf_poll;
  141 +
  142 + nfcf_poll->bit_rate = *data++;
  143 + nfcf_poll->sensf_res_len = *data++;
  144 +
  145 + pr_debug("bit_rate %d, sensf_res_len %d\n",
  146 + nfcf_poll->bit_rate, nfcf_poll->sensf_res_len);
  147 +
  148 + memcpy(nfcf_poll->sensf_res, data, nfcf_poll->sensf_res_len);
  149 + data += nfcf_poll->sensf_res_len;
  150 +
  151 + return data;
  152 +}
  153 +
118 154 static int nci_extract_activation_params_iso_dep(struct nci_dev *ndev,
119 155 struct nci_rf_intf_activated_ntf *ntf, __u8 *data)
120 156 {
121 157 struct activation_params_nfca_poll_iso_dep *nfca_poll;
  158 + struct activation_params_nfcb_poll_iso_dep *nfcb_poll;
122 159  
123 160 switch (ntf->activation_rf_tech_and_mode) {
124 161 case NCI_NFC_A_PASSIVE_POLL_MODE:
125 162 nfca_poll = &ntf->activation_params.nfca_poll_iso_dep;
126 163 nfca_poll->rats_res_len = *data++;
  164 + pr_debug("rats_res_len %d\n", nfca_poll->rats_res_len);
127 165 if (nfca_poll->rats_res_len > 0) {
128 166 memcpy(nfca_poll->rats_res,
129 167 data,
... ... @@ -131,6 +169,18 @@
131 169 }
132 170 break;
133 171  
  172 + case NCI_NFC_B_PASSIVE_POLL_MODE:
  173 + nfcb_poll = &ntf->activation_params.nfcb_poll_iso_dep;
  174 + nfcb_poll->attrib_res_len = *data++;
  175 + pr_debug("attrib_res_len %d\n",
  176 + nfcb_poll->attrib_res_len);
  177 + if (nfcb_poll->attrib_res_len > 0) {
  178 + memcpy(nfcb_poll->attrib_res,
  179 + data,
  180 + nfcb_poll->attrib_res_len);
  181 + }
  182 + break;
  183 +
134 184 default:
135 185 pr_err("unsupported activation_rf_tech_and_mode 0x%x\n",
136 186 ntf->activation_rf_tech_and_mode);
137 187  
138 188  
139 189  
... ... @@ -145,22 +195,15 @@
145 195 {
146 196 struct nfc_target nfc_tgt;
147 197  
148   - if (ntf->rf_protocol == NCI_RF_PROTOCOL_T2T) /* T2T MifareUL */
  198 + memset(&nfc_tgt, 0, sizeof(nfc_tgt));
  199 +
  200 + if (ntf->rf_protocol == NCI_RF_PROTOCOL_T2T)
149 201 nfc_tgt.supported_protocols = NFC_PROTO_MIFARE_MASK;
150   - else if (ntf->rf_protocol == NCI_RF_PROTOCOL_ISO_DEP) /* 4A */
  202 + else if (ntf->rf_protocol == NCI_RF_PROTOCOL_ISO_DEP)
151 203 nfc_tgt.supported_protocols = NFC_PROTO_ISO14443_MASK;
152   - else
153   - nfc_tgt.supported_protocols = 0;
  204 + else if (ntf->rf_protocol == NCI_RF_PROTOCOL_T3T)
  205 + nfc_tgt.supported_protocols = NFC_PROTO_FELICA_MASK;
154 206  
155   - nfc_tgt.sens_res = ntf->rf_tech_specific_params.nfca_poll.sens_res;
156   - nfc_tgt.sel_res = ntf->rf_tech_specific_params.nfca_poll.sel_res;
157   - nfc_tgt.nfcid1_len = ntf->rf_tech_specific_params.nfca_poll.nfcid1_len;
158   - if (nfc_tgt.nfcid1_len > 0) {
159   - memcpy(nfc_tgt.nfcid1,
160   - ntf->rf_tech_specific_params.nfca_poll.nfcid1,
161   - nfc_tgt.nfcid1_len);
162   - }
163   -
164 207 if (!(nfc_tgt.supported_protocols & ndev->poll_prots)) {
165 208 pr_debug("the target found does not have the desired protocol\n");
166 209 return;
... ... @@ -169,6 +212,38 @@
169 212 pr_debug("new target found, supported_protocols 0x%x\n",
170 213 nfc_tgt.supported_protocols);
171 214  
  215 + if (ntf->activation_rf_tech_and_mode == NCI_NFC_A_PASSIVE_POLL_MODE) {
  216 + nfc_tgt.sens_res =
  217 + ntf->rf_tech_specific_params.nfca_poll.sens_res;
  218 + nfc_tgt.sel_res =
  219 + ntf->rf_tech_specific_params.nfca_poll.sel_res;
  220 + nfc_tgt.nfcid1_len =
  221 + ntf->rf_tech_specific_params.nfca_poll.nfcid1_len;
  222 + if (nfc_tgt.nfcid1_len > 0) {
  223 + memcpy(nfc_tgt.nfcid1,
  224 + ntf->rf_tech_specific_params.nfca_poll.nfcid1,
  225 + nfc_tgt.nfcid1_len);
  226 + }
  227 + } else if (ntf->activation_rf_tech_and_mode ==
  228 + NCI_NFC_B_PASSIVE_POLL_MODE) {
  229 + nfc_tgt.sensb_res_len =
  230 + ntf->rf_tech_specific_params.nfcb_poll.sensb_res_len;
  231 + if (nfc_tgt.sensb_res_len > 0) {
  232 + memcpy(nfc_tgt.sensb_res,
  233 + ntf->rf_tech_specific_params.nfcb_poll.sensb_res,
  234 + nfc_tgt.sensb_res_len);
  235 + }
  236 + } else if (ntf->activation_rf_tech_and_mode ==
  237 + NCI_NFC_F_PASSIVE_POLL_MODE) {
  238 + nfc_tgt.sensf_res_len =
  239 + ntf->rf_tech_specific_params.nfcf_poll.sensf_res_len;
  240 + if (nfc_tgt.sensf_res_len > 0) {
  241 + memcpy(nfc_tgt.sensf_res,
  242 + ntf->rf_tech_specific_params.nfcf_poll.sensf_res,
  243 + nfc_tgt.sensf_res_len);
  244 + }
  245 + }
  246 +
172 247 ndev->target_available_prots = nfc_tgt.supported_protocols;
173 248 ndev->max_data_pkt_payload_size = ntf->max_data_pkt_payload_size;
174 249 ndev->initial_num_credits = ntf->initial_num_credits;
... ... @@ -212,6 +287,16 @@
212 287 switch (ntf.activation_rf_tech_and_mode) {
213 288 case NCI_NFC_A_PASSIVE_POLL_MODE:
214 289 data = nci_extract_rf_params_nfca_passive_poll(ndev,
  290 + &ntf, data);
  291 + break;
  292 +
  293 + case NCI_NFC_B_PASSIVE_POLL_MODE:
  294 + data = nci_extract_rf_params_nfcb_passive_poll(ndev,
  295 + &ntf, data);
  296 + break;
  297 +
  298 + case NCI_NFC_F_PASSIVE_POLL_MODE:
  299 + data = nci_extract_rf_params_nfcf_passive_poll(ndev,
215 300 &ntf, data);
216 301 break;
217 302  
... ... @@ -70,6 +70,12 @@
70 70 if (target->nfcid1_len > 0)
71 71 NLA_PUT(msg, NFC_ATTR_TARGET_NFCID1, target->nfcid1_len,
72 72 target->nfcid1);
  73 + if (target->sensb_res_len > 0)
  74 + NLA_PUT(msg, NFC_ATTR_TARGET_SENSB_RES, target->sensb_res_len,
  75 + target->sensb_res);
  76 + if (target->sensf_res_len > 0)
  77 + NLA_PUT(msg, NFC_ATTR_TARGET_SENSF_RES, target->sensf_res_len,
  78 + target->sensf_res);
73 79  
74 80 return genlmsg_end(msg, hdr);
75 81