NFC: pn544: Identify Type F NFC-DEP through NFCID2 (9c598440) · Commits · 戴 / test

NFCID2 is defined as the first 2 manufacturer ID (IDm) bytes. NFC DEP (NFC peer to peer) devices Type-F NFCID2 must start with 0x01fe according to the NFC Digital Specification. By checking those first 2 bytes we send the right command either to the reader gate when NFCID2 != 0x1fe (The NFC tag case) or to the NFCIP1 gate when seeing an NFC DEP device (The NFC peer to peer case). Without this fix, Felica (Type F) tags are not properly detected with this driver. Signed-off-by:

Arron Wang <arron.wang@intel.com> Signed-off-by:

Samuel Ortiz <sameo@linux.intel.com>

drivers/nfc/pn544/pn544.c

+15 −10

Original line number	Diff line number	Diff line
		@@ -551,11 +551,9 @@ static int pn544_hci_complete_target_discovered(struct nfc_hci_dev *hdev,
		return -EPROTO;
		}

		r = nfc_hci_send_cmd(hdev, PN544_RF_READER_F_GATE,
		PN544_RF_READER_CMD_ACTIVATE_NEXT,
		uid_skb->data, uid_skb->len, NULL);
		/* Type F NFC-DEP IDm has prefix 0x01FE */
		if ((uid_skb->data[0] == 0x01) && (uid_skb->data[1] == 0xfe)) {
		kfree_skb(uid_skb);

		r = nfc_hci_send_cmd(hdev,
		PN544_RF_READER_NFCIP1_INITIATOR_GATE,
		PN544_HCI_CMD_CONTINUE_ACTIVATION,
		@@ -563,8 +561,15 @@ static int pn544_hci_complete_target_discovered(struct nfc_hci_dev *hdev,
		if (r < 0)
		return r;

		target->hci_reader_gate = PN544_RF_READER_NFCIP1_INITIATOR_GATE;
		target->supported_protocols = NFC_PROTO_NFC_DEP_MASK;
		target->hci_reader_gate =
		PN544_RF_READER_NFCIP1_INITIATOR_GATE;
		} else {
		r = nfc_hci_send_cmd(hdev, PN544_RF_READER_F_GATE,
		PN544_RF_READER_CMD_ACTIVATE_NEXT,
		uid_skb->data, uid_skb->len, NULL);
		kfree_skb(uid_skb);
		}
		} else if (target->supported_protocols & NFC_PROTO_ISO14443_MASK) {
		/*
		* TODO: maybe other ISO 14443 require some kind of continue

Admin message