kernel.git/drivers/nfc/st21nfcb, branch linux-4.0.y

NFC: st21nfcb: Retry i2c_master_send if it returns a negative value

2015-05-06T20:03:50Z

commit d4a41d10b2cb5890aeda6b2912973b2a754b05b1 upstream. i2c_master_send may return many negative values different than -EREMOTEIO. In case an i2c transaction is NACK'ed, on raspberry pi B+ kernel 3.18, -EIO is generated instead. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz Signed-off-by: Greg Kroah-Hartman

NFC: nci: Move NFCEE discovery logic

2015-02-04T08:15:18Z

NFCEE_DISCOVER_CMD is a specified NCI command used to discover NFCEE IDs. Move nci_nfcee_discover() call to nci_discover_se() in order to guarantee: - NFCEE_DISCOVER_CMD run when the NCI state machine is initialized - NFCEE_DISCOVER_CMD is not run in case there is not discover_se hook defined by a NFC device driver. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz

NFC: nci: Move logical connection structure allocation

2015-02-04T08:14:09Z

conn_info is currently allocated only after nfcee_discovery_ntf which is not generic enough for logical connection other than NFCEE. The corresponding conn_info is now created in nci_core_conn_create_rsp(). Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz

NFC: nci: Support all destinations type when creating a connection

2015-02-04T08:10:50Z

The current implementation limits nci_core_conn_create_req() to only manage NCI_DESTINATION_NFCEE. Add new parameters to nci_core_conn_create() to support all destination types described in the NCI specification. Because there are some parameters with variable size dynamic buffer allocation is needed. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz

NFC: st21nfcb: Add HCI transaction event support

2015-02-02T20:50:42Z

The transaction notifies the host (DH) that an action is required to manage a specific Secure Element application. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz

NFC: st21nfcb: Add support for secure element

2015-02-02T20:50:40Z

The st21nfcb chipset has 3 SWP (Single Wire Protocol) lines and supports up to 3 secure elements (UICC/eSE and µSD in the future). Some st21nfcb firmware does not support the nci command nci_nfcee_mode_set(NCI_NFCEE_DISABLE). For this reason, we assume 2 secures elements are always present (UICC and eSE). They will be added to the SE list once successfully activated and they will be available only after running through enable_se handler or when the poll in listen mode is started. During initialization, the white_list will be always set assuming both UICC & eSE are present. On eSE activation, the ATR bytes are fetched to build the command exchange timeout. The se_io hook will allow to transfer data over SWP. 2 kind of events may appear data is sent over: - ST21NFCB_EVT_TRANSMIT_DATA when receiving an apdu answer - ST21NFCB_EVT_WTX_REQUEST when the secure element needs more time than expected to process a command. If this timeout expires, we send a software reset, and then a hardware one if it still fails. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz

NFC: st21nfcb: Fix "NULL pointer dereference" possible error

2015-01-26T22:14:34Z

When the platform with CONFIG_ST21NFCB_I2C=y without any st21nfcb component physically connected a: "Unable to handle kernel NULL pointer dereference at virtual address" may show up at driver initialization phase. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz

NFC: st21nfcb: Avoid use of skb after free

2015-01-26T22:14:33Z

Do not insert in send queue the skb that contains unknown Packet Control Byte Acked-by: Christophe Ricard Signed-off-by: Anda-Maria Nicolae Signed-off-by: Samuel Ortiz

NFC: st21nfcb: Fix "WARNING: invalid free of devm_ allocated data"

2015-01-25T23:09:22Z

ndlc pointer got allocated with devm_kzalloc in ndlc_probe function. This gives this error message: drivers/nfc/st21nfcb/ndlc.c:296:1-6: WARNING: invalid free of devm_ allocated data. Reported-by: Dan Carpenter Reported-by: Julia Lawall Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz

NFC: dts: st21nfcb: Fix compatible string spelling to follow other drivers

2015-01-25T23:09:22Z

Other drivers are following the following compatible string format for dts: s/_/-/ Because some devices may still use the previous string, the new corrected string is added to the of_device_id table. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz