Merge tag 'hwlock-v4.8' of git://github.com/andersson/remoteproc

[cascardo/linux.git] / net / nfc / digital_dep.c

diff --git a/net/nfc/digital_dep.c b/net/nfc/digital_dep.c
index 03bfc74..f864ce1 100644 (file)
--- a/net/nfc/digital_dep.c
+++ b/net/nfc/digital_dep.c
@@ -35,6 +35,8 @@
 #define DIGITAL_ATR_REQ_MIN_SIZE 16
 #define DIGITAL_ATR_REQ_MAX_SIZE 64
 
+#define DIGITAL_ATR_RES_TO_WT(s)       ((s) & 0xF)
+
 #define DIGITAL_DID_MAX        14
 
 #define DIGITAL_PAYLOAD_SIZE_MAX       254
@@ -63,6 +65,9 @@
 #define DIGITAL_NFC_DEP_DID_BIT_SET(pfb) ((pfb) & DIGITAL_NFC_DEP_PFB_DID_BIT)
 #define DIGITAL_NFC_DEP_PFB_PNI(pfb)     ((pfb) & 0x03)
 
+#define DIGITAL_NFC_DEP_RTOX_VALUE(data) ((data) & 0x3F)
+#define DIGITAL_NFC_DEP_RTOX_MAX        59
+
 #define DIGITAL_NFC_DEP_PFB_I_PDU          0x00
 #define DIGITAL_NFC_DEP_PFB_ACK_NACK_PDU   0x40
 #define DIGITAL_NFC_DEP_PFB_SUPERVISOR_PDU 0x80
@@ -122,6 +127,37 @@ static const u8 digital_payload_bits_map[4] = {
        [3] = 254
 };
 
+/* Response Waiting Time for ATR_RES PDU in ms
+ *
+ * RWT(ATR_RES) = RWT(nfcdep,activation) + dRWT(nfcdep) + dT(nfcdep,initiator)
+ *
+ * with:
+ *  RWT(nfcdep,activation) = 4096 * 2^12 / f(c) s
+ *  dRWT(nfcdep) = 16 / f(c) s
+ *  dT(nfcdep,initiator) = 100 ms
+ *  f(c) = 13560000 Hz
+ */
+#define DIGITAL_ATR_RES_RWT 1337
+
+/* Response Waiting Time for other DEP PDUs in ms
+ *
+ * max_rwt = rwt + dRWT(nfcdep) + dT(nfcdep,initiator)
+ *
+ * with:
+ *  rwt = (256 * 16 / f(c)) * 2^wt s
+ *  dRWT(nfcdep) = 16 / f(c) s
+ *  dT(nfcdep,initiator) = 100 ms
+ *  f(c) = 13560000 Hz
+ *  0 <= wt <= 14 (given by the target by the TO field of ATR_RES response)
+ */
+#define DIGITAL_NFC_DEP_IN_MAX_WT 14
+#define DIGITAL_NFC_DEP_TG_MAX_WT 8
+static const u16 digital_rwt_map[DIGITAL_NFC_DEP_IN_MAX_WT + 1] = {
+       100,  101,  101,  102,  105,
+       110,  119,  139,  177,  255,
+       409,  719, 1337, 2575, 5049,
+};
+
 static u8 digital_payload_bits_to_size(u8 payload_bits)
 {
        if (payload_bits >= ARRAY_SIZE(digital_payload_bits_map))
@@ -366,8 +402,8 @@ static int digital_in_send_psl_req(struct nfc_digital_dev *ddev,
 
        ddev->skb_add_crc(skb);
 
-       rc = digital_in_send_cmd(ddev, skb, 500, digital_in_recv_psl_res,
-                                target);
+       rc = digital_in_send_cmd(ddev, skb, ddev->dep_rwt,
+                                digital_in_recv_psl_res, target);
        if (rc)
                kfree_skb(skb);
 
@@ -380,6 +416,7 @@ static void digital_in_recv_atr_res(struct nfc_digital_dev *ddev, void *arg,
        struct nfc_target *target = arg;
        struct digital_atr_res *atr_res;
        u8 gb_len, payload_bits;
+       u8 wt;
        int rc;
 
        if (IS_ERR(resp)) {
@@ -409,6 +446,11 @@ static void digital_in_recv_atr_res(struct nfc_digital_dev *ddev, void *arg,
 
        atr_res = (struct digital_atr_res *)resp->data;
 
+       wt = DIGITAL_ATR_RES_TO_WT(atr_res->to);
+       if (wt > DIGITAL_NFC_DEP_IN_MAX_WT)
+               wt = DIGITAL_NFC_DEP_IN_MAX_WT;
+       ddev->dep_rwt = digital_rwt_map[wt];
+
        payload_bits = DIGITAL_PAYLOAD_PP_TO_BITS(atr_res->pp);
        ddev->remote_payload_max = digital_payload_bits_to_size(payload_bits);
 
@@ -490,8 +532,8 @@ int digital_in_send_atr_req(struct nfc_digital_dev *ddev,
 
        ddev->skb_add_crc(skb);
 
-       rc = digital_in_send_cmd(ddev, skb, 500, digital_in_recv_atr_res,
-                                target);
+       rc = digital_in_send_cmd(ddev, skb, DIGITAL_ATR_RES_RWT,
+                                digital_in_recv_atr_res, target);
        if (rc)
                kfree_skb(skb);
 
@@ -524,8 +566,8 @@ static int digital_in_send_ack(struct nfc_digital_dev *ddev,
 
        ddev->saved_skb = pskb_copy(skb, GFP_KERNEL);
 
-       rc = digital_in_send_cmd(ddev, skb, 1500, digital_in_recv_dep_res,
-                                data_exch);
+       rc = digital_in_send_cmd(ddev, skb, ddev->dep_rwt,
+                                digital_in_recv_dep_res, data_exch);
        if (rc) {
                kfree_skb(skb);
                kfree_skb(ddev->saved_skb);
@@ -559,8 +601,8 @@ static int digital_in_send_nack(struct nfc_digital_dev *ddev,
 
        ddev->skb_add_crc(skb);
 
-       rc = digital_in_send_cmd(ddev, skb, 1500, digital_in_recv_dep_res,
-                                data_exch);
+       rc = digital_in_send_cmd(ddev, skb, ddev->dep_rwt,
+                                digital_in_recv_dep_res, data_exch);
        if (rc)
                kfree_skb(skb);
 
@@ -590,8 +632,8 @@ static int digital_in_send_atn(struct nfc_digital_dev *ddev,
 
        ddev->skb_add_crc(skb);
 
-       rc = digital_in_send_cmd(ddev, skb, 1500, digital_in_recv_dep_res,
-                                data_exch);
+       rc = digital_in_send_cmd(ddev, skb, ddev->dep_rwt,
+                                digital_in_recv_dep_res, data_exch);
        if (rc)
                kfree_skb(skb);
 
@@ -604,6 +646,11 @@ static int digital_in_send_rtox(struct nfc_digital_dev *ddev,
        struct digital_dep_req_res *dep_req;
        struct sk_buff *skb;
        int rc;
+       u16 rwt_int;
+
+       rwt_int = ddev->dep_rwt * rtox;
+       if (rwt_int > digital_rwt_map[DIGITAL_NFC_DEP_IN_MAX_WT])
+               rwt_int = digital_rwt_map[DIGITAL_NFC_DEP_IN_MAX_WT];
 
        skb = digital_skb_alloc(ddev, 1);
        if (!skb)
@@ -624,8 +671,8 @@ static int digital_in_send_rtox(struct nfc_digital_dev *ddev,
 
        ddev->skb_add_crc(skb);
 
-       rc = digital_in_send_cmd(ddev, skb, 1500, digital_in_recv_dep_res,
-                                data_exch);
+       rc = digital_in_send_cmd(ddev, skb, rwt_int,
+                                digital_in_recv_dep_res, data_exch);
        if (rc)
                kfree_skb(skb);
 
@@ -642,7 +689,7 @@ static int digital_in_send_saved_skb(struct nfc_digital_dev *ddev,
 
        skb_get(ddev->saved_skb);
 
-       rc = digital_in_send_cmd(ddev, ddev->saved_skb, 1500,
+       rc = digital_in_send_cmd(ddev, ddev->saved_skb, ddev->dep_rwt,
                                 digital_in_recv_dep_res, data_exch);
        if (rc)
                kfree_skb(ddev->saved_skb);
@@ -658,6 +705,7 @@ static void digital_in_recv_dep_res(struct nfc_digital_dev *ddev, void *arg,
        u8 pfb;
        uint size;
        int rc;
+       u8 rtox;
 
        if (IS_ERR(resp)) {
                rc = PTR_ERR(resp);
@@ -823,15 +871,27 @@ static void digital_in_recv_dep_res(struct nfc_digital_dev *ddev, void *arg,
                        if (rc)
                                goto error;
 
-                       return;
+                       goto free_resp;
+               }
+
+               if (ddev->atn_count || ddev->nack_count) {
+                       PROTOCOL_ERR("14.12.4.4");
+                       rc = -EIO;
+                       goto error;
                }
 
-               rc = digital_in_send_rtox(ddev, data_exch, resp->data[0]);
+               rtox = DIGITAL_NFC_DEP_RTOX_VALUE(resp->data[0]);
+               if (!rtox || rtox > DIGITAL_NFC_DEP_RTOX_MAX) {
+                       PROTOCOL_ERR("14.8.4.1");
+                       rc = -EIO;
+                       goto error;
+               }
+
+               rc = digital_in_send_rtox(ddev, data_exch, rtox);
                if (rc)
                        goto error;
 
-               kfree_skb(resp);
-               return;
+               goto free_resp;
        }
 
 exit:
@@ -886,8 +946,8 @@ int digital_in_send_dep_req(struct nfc_digital_dev *ddev,
 
        ddev->saved_skb = pskb_copy(tmp_skb, GFP_KERNEL);
 
-       rc = digital_in_send_cmd(ddev, tmp_skb, 1500, digital_in_recv_dep_res,
-                                data_exch);
+       rc = digital_in_send_cmd(ddev, tmp_skb, ddev->dep_rwt,
+                                digital_in_recv_dep_res, data_exch);
        if (rc) {
                if (tmp_skb != skb)
                        kfree_skb(tmp_skb);
@@ -1225,8 +1285,7 @@ static void digital_tg_recv_dep_req(struct nfc_digital_dev *ddev, void *arg,
 
                ddev->atn_count++;
 
-               kfree_skb(resp);
-               return;
+               goto free_resp;
        }
 
        rc = nfc_tm_data_received(ddev->nfc_dev, resp);
@@ -1467,7 +1526,7 @@ static int digital_tg_send_atr_res(struct nfc_digital_dev *ddev,
        atr_res->dir = DIGITAL_NFC_DEP_FRAME_DIR_IN;
        atr_res->cmd = DIGITAL_CMD_ATR_RES;
        memcpy(atr_res->nfcid3, atr_req->nfcid3, sizeof(atr_req->nfcid3));
-       atr_res->to = 8;
+       atr_res->to = DIGITAL_NFC_DEP_TG_MAX_WT;
 
        ddev->local_payload_max = DIGITAL_PAYLOAD_SIZE_MAX;
        payload_bits = digital_payload_size_to_bits(ddev->local_payload_max);