From patchwork Wed Oct 17 10:20:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars Poeschel X-Patchwork-Id: 10645283 X-Patchwork-Delegate: sameo@linux.intel.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DE1F91057 for ; Wed, 17 Oct 2018 10:26:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D00AC2AC74 for ; Wed, 17 Oct 2018 10:26:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C17EF2ACD5; Wed, 17 Oct 2018 10:26:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CFA402ACA0 for ; Wed, 17 Oct 2018 10:26:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727128AbeJQSVo (ORCPT ); Wed, 17 Oct 2018 14:21:44 -0400 Received: from smtp2.goneo.de ([85.220.129.33]:59090 "EHLO smtp2.goneo.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726922AbeJQSVn (ORCPT ); Wed, 17 Oct 2018 14:21:43 -0400 X-Greylist: delayed 335 seconds by postgrey-1.27 at vger.kernel.org; Wed, 17 Oct 2018 14:21:41 EDT Received: from localhost (localhost [127.0.0.1]) by smtp2.goneo.de (Postfix) with ESMTP id 2B5B323F4E5; Wed, 17 Oct 2018 12:21:04 +0200 (CEST) X-Virus-Scanned: by goneo Received: from smtp2.goneo.de ([127.0.0.1]) by localhost (smtp2.goneo.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NQdFzqJjHCqv; Wed, 17 Oct 2018 12:21:02 +0200 (CEST) Received: from lem-wkst-02.lemonage.de. (hq.lemonage.de [87.138.178.34]) by smtp2.goneo.de (Postfix) with ESMTPSA id EFE58242AAD; Wed, 17 Oct 2018 12:21:01 +0200 (CEST) From: Lars Poeschel To: Samuel Ortiz , Greg Kroah-Hartman , Jiri Slaby , Kees Cook , linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org Cc: Lars Poeschel Subject: [PATCH 1/3] nfc: pn533: add UART phy driver Date: Wed, 17 Oct 2018 12:20:35 +0200 Message-Id: <20181017102037.28537-1-poeschel@lemonage.de> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This adds the UART phy interface for the pn533 driver. The pn533 driver can be used through UART interface this way. It is implemented as a tty line discipline. Signed-off-by: Lars Poeschel --- drivers/nfc/pn533/Kconfig | 10 + drivers/nfc/pn533/Makefile | 2 + drivers/nfc/pn533/pn533.h | 8 + drivers/nfc/pn533/uart.c | 399 +++++++++++++++++++++++++++++++++++++ include/uapi/linux/tty.h | 1 + 5 files changed, 420 insertions(+) create mode 100644 drivers/nfc/pn533/uart.c diff --git a/drivers/nfc/pn533/Kconfig b/drivers/nfc/pn533/Kconfig index d94122dd30e4..da3ea2dbaa8a 100644 --- a/drivers/nfc/pn533/Kconfig +++ b/drivers/nfc/pn533/Kconfig @@ -25,3 +25,13 @@ config NFC_PN533_I2C If you choose to build a module, it'll be called pn533_i2c. Say N if unsure. + +config NFC_PN532_UART + tristate "NFC PN532 device support (UART)" + select NFC_PN533 + ---help--- + This module adds support for the NXP pn532 UART interface. + Select this if your platform is using the UART bus. + + If you choose to build a module, it'll be called pn532_uart. + Say N if unsure. diff --git a/drivers/nfc/pn533/Makefile b/drivers/nfc/pn533/Makefile index 51d24c622fcb..bdfd6860d5e4 100644 --- a/drivers/nfc/pn533/Makefile +++ b/drivers/nfc/pn533/Makefile @@ -3,7 +3,9 @@ # pn533_usb-objs = usb.o pn533_i2c-objs = i2c.o +pn532_uart-objs = uart.o obj-$(CONFIG_NFC_PN533) += pn533.o obj-$(CONFIG_NFC_PN533_USB) += pn533_usb.o obj-$(CONFIG_NFC_PN533_I2C) += pn533_i2c.o +obj-$(CONFIG_NFC_PN532_UART) += pn532_uart.o diff --git a/drivers/nfc/pn533/pn533.h b/drivers/nfc/pn533/pn533.h index 88d569666c51..ca00508eefff 100644 --- a/drivers/nfc/pn533/pn533.h +++ b/drivers/nfc/pn533/pn533.h @@ -55,6 +55,11 @@ /* Preamble (1), SoPC (2), ACK Code (2), Postamble (1) */ #define PN533_STD_FRAME_ACK_SIZE 6 +/* + * Preamble (1), SoPC (2), Packet Length (1), Packet Length Checksum (1), + * Specific Application Level Error Code (1) , Postamble (1) + */ +#define PN533_STD_ERROR_FRAME_SIZE 8 #define PN533_STD_FRAME_CHECKSUM(f) (f->data[f->datalen]) #define PN533_STD_FRAME_POSTAMBLE(f) (f->data[f->datalen + 1]) /* Half start code (3), LEN (4) should be 0xffff for extended frame */ @@ -96,6 +101,9 @@ #define PN533_CMD_MI_MASK 0x40 #define PN533_CMD_RET_SUCCESS 0x00 +#define PN533_FRAME_DATALEN_ACK 0x00 +#define PN533_FRAME_DATALEN_ERROR 0x01 +#define PN533_FRAME_DATALEN_EXTENDED 0xFF enum pn533_protocol_type { PN533_PROTO_REQ_ACK_RESP = 0, diff --git a/drivers/nfc/pn533/uart.c b/drivers/nfc/pn533/uart.c new file mode 100644 index 000000000000..b5f995988cae --- /dev/null +++ b/drivers/nfc/pn533/uart.c @@ -0,0 +1,399 @@ +/* + * Driver for NXP PN532 NFC Chip - UART transport layer + * + * Copyright (C) 2018 Lemonage Software GmbH + * Author: Lars Poeschel + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include "pn533.h" + +#define VERSION "0.1" + +#define PN532_I2C_DRIVER_NAME "pn532_uart" + +#define PN532_MAGIC 0x162f +#define PN532_UART_SKB_BUFF_LEN (PN533_CMD_DATAEXCH_DATA_MAXLEN * 2) + +struct pn532_uart_phy { + int magic; + struct tty_struct *tty; + struct sk_buff *recv_skb; + struct pn533 *priv; + int send_wakeup; + struct timer_list cmd_timeout; + struct sk_buff *cur_out_buf; + struct workqueue_struct *wq_open_tty; + struct work_struct open_tty_work; + struct completion init_done; +}; + +static int pn532_uart_send_frame(struct pn533 *dev, + struct sk_buff *out) +{ + static const u8 wakeup[] = { + 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + /* wakeup sequence and dummy bytes for waiting time */ + struct pn532_uart_phy *pn532 = dev->phy; + struct tty_struct *tty = pn532->tty; + int count; + + if (pn532->priv == NULL) + pn532->priv = dev; + + print_hex_dump_debug("PN532_uart TX: ", DUMP_PREFIX_NONE, 16, 1, + out->data, out->len, false); + + pn532->cur_out_buf = out; + set_bit(TTY_DO_WRITE_WAKEUP, &tty->flags); + if (pn532->send_wakeup) + count = tty->ops->write(tty, wakeup, sizeof(wakeup)); + + count = tty->ops->write(tty, out->data, out->len); + if (PN533_FRAME_CMD(((struct pn533_std_frame *)out->data)) == + PN533_CMD_SAM_CONFIGURATION) + pn532->send_wakeup = 0; + + mod_timer(&pn532->cmd_timeout, HZ / 40 + jiffies); + return 0; +} + +static int pn532_uart_send_ack(struct pn533 *dev, gfp_t flags) +{ + struct pn532_uart_phy *phy = dev->phy; + static const u8 ack[PN533_STD_FRAME_ACK_SIZE] = { + 0x00, 0x00, 0xff, 0x00, 0xff, 0x00}; + /* spec 7.1.1.3: Preamble, SoPC (2), ACK Code (2), Postamble */ + int rc; + + set_bit(TTY_DO_WRITE_WAKEUP, &phy->tty->flags); + rc = phy->tty->ops->write(phy->tty, ack, sizeof(ack)); + + return 0; +} + +static void pn532_uart_abort_cmd(struct pn533 *dev, gfp_t flags) +{ + /* An ack will cancel the last issued command */ + pn532_uart_send_ack(dev, flags); + + /* schedule cmd_complete_work to finish current command execution */ + pn533_recv_frame(dev, NULL, -ENOENT); +} + +static struct pn533_phy_ops uart_phy_ops = { + .send_frame = pn532_uart_send_frame, + .send_ack = pn532_uart_send_ack, + .abort_cmd = pn532_uart_abort_cmd, +}; + +static void pn532_cmd_timeout(struct timer_list *t) +{ + struct pn532_uart_phy *dev = from_timer(dev, t, cmd_timeout); + + pn532_uart_send_frame(dev->priv, dev->cur_out_buf); +} + +static void pn532_finalize_setup(struct work_struct *work) +{ + struct pn532_uart_phy *pn532 = + container_of(work, struct pn532_uart_phy, open_tty_work); + int err; + + err = pn533_finalize_setup(pn532->priv); + if (err) { + complete_all(&pn532->init_done); + return; + } + + pn532->magic = PN532_MAGIC; + complete_all(&pn532->init_done); +} + +static int pn532_open(struct tty_struct *tty) +{ + struct pn532_uart_phy *pn532; + struct pn533 *priv; + int err; + + if (tty->ops->write == NULL) + return -EOPNOTSUPP; + + pn532 = tty->disc_data; + err = -EEXIST; + /* First make sure we're not already connected. */ + if (pn532 && pn532->magic == PN532_MAGIC) + goto err_exit; + + err = -ENOMEM; + pn532 = kzalloc(sizeof(*pn532), GFP_KERNEL); + if (pn532 == NULL) + goto err_exit; + + pn532->recv_skb = alloc_skb(PN532_UART_SKB_BUFF_LEN, GFP_KERNEL); + if (pn532->recv_skb == NULL) + goto err_free; + + pn532->tty = tty; + INIT_WORK(&pn532->open_tty_work, pn532_finalize_setup); + pn532->wq_open_tty = alloc_workqueue("pn532_uart_finalize_setup", 0, 0); + if (pn532->wq_open_tty == NULL) + goto err_skb; + + priv = pn533_register_device(PN533_DEVICE_PN532, + PN533_NO_TYPE_B_PROTOCOLS, + PN533_PROTO_REQ_ACK_RESP, + pn532, &uart_phy_ops, NULL, + pn532->tty->dev, + tty->dev); + + if (IS_ERR(priv)) { + err = PTR_ERR(priv); + goto err_wq; + } + + pn532->priv = priv; + tty->disc_data = pn532; + init_completion(&pn532->init_done); + + /* Done. We have linked the TTY line to a channel. */ + pn532->tty->receive_room = 262 * 2; + pn532->send_wakeup = 1; + timer_setup(&pn532->cmd_timeout, pn532_cmd_timeout, 0); + queue_work(pn532->wq_open_tty, &pn532->open_tty_work); + /* TTY layer expects 0 on success */ + return 0; + +err_wq: + destroy_workqueue(pn532->wq_open_tty); +err_skb: + kfree_skb(pn532->recv_skb); +err_free: + kfree(pn532); +err_exit: + /* Count references from TTY module */ + return err; +} + +static void pn532_close(struct tty_struct *tty) +{ + struct pn532_uart_phy *pn532 = (struct pn532_uart_phy *) tty->disc_data; + + /* First make sure we're connected. */ + if (!pn532 || pn532->magic != PN532_MAGIC || pn532->tty != tty) + return; + + flush_workqueue(pn532->wq_open_tty); + destroy_workqueue(pn532->wq_open_tty); + pn533_unregister_device(pn532->priv); + + kfree_skb(pn532->recv_skb); + kfree(pn532); +} + +static int pn532_hangup(struct tty_struct *tty) +{ + pn532_close(tty); + return 0; +} + +/* Perform I/O control on an active PN532 line discipline channel. */ +static int pn532_ioctl(struct tty_struct *tty, struct file *file, + unsigned int cmd, unsigned long arg) +{ + struct pn532_uart_phy *pn532 = (struct pn532_uart_phy *) tty->disc_data; + unsigned int tmp; + + wait_for_completion(&pn532->init_done); + flush_workqueue(pn532->wq_open_tty); + /* First make sure we're connected. */ + if (!pn532 || pn532->magic != PN532_MAGIC) + return -EINVAL; + + switch (cmd) { + case SIOCGIFNAME: + if (!pn532->priv->nfc_dev) { + dev_err(tty->dev, "The device was not (successfully) connected before.\n"); + return -EINVAL; + } + tmp = strlen(nfc_device_name(pn532->priv->nfc_dev)) + 1; + if (copy_to_user((void __user *)arg, + nfc_device_name(pn532->priv->nfc_dev), tmp)) + return -EFAULT; + + return 0; + + case SIOCSIFHWADDR: + return -EINVAL; + + default: + return tty_mode_ioctl(tty, file, cmd, arg); + } +} + +/* + * scans the buffer if it contains a pn532 frame. It is not checked if the + * frame is really valid. This is later done with pn533_rx_frame_is_valid. + * This is useful for malformed or errornous transmitted frames. Adjusts the + * bufferposition where the frame starts, since pn533_recv_frame expects a + * well formed frame. + */ +static int pn532_uart_rx_is_frame(struct sk_buff *skb, struct tty_struct *tty) +{ + int i; + u16 frame_len; + struct pn533_std_frame *std; + struct pn533_ext_frame *ext; + + for (i = 0; i + PN533_STD_FRAME_ACK_SIZE <= skb->len; i++) { + std = (struct pn533_std_frame *)&skb->data[i]; + /* search start code */ + if (std->start_frame != cpu_to_be16(PN533_STD_FRAME_SOF)) + continue; + + /* frame type */ + switch (std->datalen) { + case PN533_FRAME_DATALEN_ACK: + dev_dbg(tty->dev, "ack frame"); + if (std->datalen_checksum == 0xff) { + skb_pull(skb, i); + return 1; + } + + break; + case PN533_FRAME_DATALEN_ERROR: + dev_dbg(tty->dev, "error frame"); + if ((std->datalen_checksum == 0xff) && + (skb->len >= + PN533_STD_ERROR_FRAME_SIZE)) { + skb_pull(skb, i); + return 1; + } + + break; + case PN533_FRAME_DATALEN_EXTENDED: + dev_dbg(tty->dev, "extended frame"); + ext = (struct pn533_ext_frame *)&skb->data[i]; + frame_len = ext->datalen; + if (skb->len >= frame_len + + sizeof(struct pn533_ext_frame) + + 2 /* CKS + Postamble */) { + skb_pull(skb, i); + return 1; + } + + break; + default: /* normal information frame */ + frame_len = std->datalen; + if (skb->len >= frame_len + + sizeof(struct pn533_std_frame) + + 2 /* CKS + Postamble */) { + skb_pull(skb, i); + return 1; + } + + break; + } + } + + return 0; +} + +static void pn532_receive_buf(struct tty_struct *tty, + const unsigned char *cp, char *fp, int count) +{ + struct pn532_uart_phy *dev = (struct pn532_uart_phy *)tty->disc_data; + + if (!dev) + return; + + del_timer(&dev->cmd_timeout); + while (count-- && (skb_end_offset(dev->recv_skb) > 1)) { + if (fp && *fp++) { + cp++; + continue; + } + + skb_put_u8(dev->recv_skb, *cp++); + if (!pn532_uart_rx_is_frame(dev->recv_skb, tty)) + continue; + + pn533_recv_frame(dev->priv, dev->recv_skb, 0); + dev->recv_skb = alloc_skb(PN532_UART_SKB_BUFF_LEN, GFP_KERNEL); + if (dev->recv_skb == NULL) + return; + } +} + +static void pn532_write_wakeup(struct tty_struct *tty) +{ + struct pn532_uart_phy *pn532 = (struct pn532_uart_phy *)tty->disc_data; + + if (!pn532 || pn532->magic != PN532_MAGIC) + return; + + clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags); +} + +static struct tty_ldisc_ops pn532_ldisc = { + .owner = THIS_MODULE, + .magic = TTY_LDISC_MAGIC, + .name = "pn532", + .open = pn532_open, + .close = pn532_close, + .hangup = pn532_hangup, + .ioctl = pn532_ioctl, + .receive_buf = pn532_receive_buf, + .write_wakeup = pn532_write_wakeup, +}; + +static int __init pn532_init(void) +{ + int ret; + + ret = tty_register_ldisc(N_PN532, &pn532_ldisc); + if (ret) + pr_err("pn532: can not register line discipline\n"); + + return ret; +} + +static void __exit pn532_exit(void) +{ + int ret; + + ret = tty_unregister_ldisc(N_PN532); + if (ret) + pr_err("pn532: can not unregister ldisc (err %d)\n", ret); +} + +module_init(pn532_init); +module_exit(pn532_exit); + +MODULE_ALIAS_LDISC(N_PN532); +MODULE_AUTHOR("Lars Poeschel "); +MODULE_DESCRIPTION("PN532 UART driver ver " VERSION); +MODULE_VERSION(VERSION); +MODULE_LICENSE("GPL"); diff --git a/include/uapi/linux/tty.h b/include/uapi/linux/tty.h index 376cccf397be..0517b5354488 100644 --- a/include/uapi/linux/tty.h +++ b/include/uapi/linux/tty.h @@ -38,5 +38,6 @@ #define N_NCI 25 /* NFC NCI UART */ #define N_SPEAKUP 26 /* Speakup communication with synths */ #define N_NULL 27 /* Null ldisc used for error handling */ +#define N_PN532 28 /* NXP PN532 NFC chip */ #endif /* _UAPI_LINUX_TTY_H */ From patchwork Wed Oct 17 10:20:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars Poeschel X-Patchwork-Id: 10645281 X-Patchwork-Delegate: sameo@linux.intel.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D87DB1057 for ; Wed, 17 Oct 2018 10:26:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C969E2ACD5 for ; Wed, 17 Oct 2018 10:26:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BD4D02ACDB; Wed, 17 Oct 2018 10:26:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 032D92ACD5 for ; Wed, 17 Oct 2018 10:26:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727086AbeJQSVo (ORCPT ); Wed, 17 Oct 2018 14:21:44 -0400 Received: from smtp2.goneo.de ([85.220.129.33]:59082 "EHLO smtp2.goneo.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726904AbeJQSVn (ORCPT ); Wed, 17 Oct 2018 14:21:43 -0400 Received: from localhost (localhost [127.0.0.1]) by smtp2.goneo.de (Postfix) with ESMTP id 5C54E24013D; Wed, 17 Oct 2018 12:21:10 +0200 (CEST) X-Virus-Scanned: by goneo Received: from smtp2.goneo.de ([127.0.0.1]) by localhost (smtp2.goneo.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Qb_JILme02Rf; Wed, 17 Oct 2018 12:21:08 +0200 (CEST) Received: from lem-wkst-02.lemonage.de. (hq.lemonage.de [87.138.178.34]) by smtp2.goneo.de (Postfix) with ESMTPSA id 75D7A23F65C; Wed, 17 Oct 2018 12:21:08 +0200 (CEST) From: Lars Poeschel To: Samuel Ortiz , Greg Kroah-Hartman , Jiri Slaby , Kees Cook , linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org Cc: Lars Poeschel Subject: [PATCH 2/3] nfc: pn533: Add autopoll capability Date: Wed, 17 Oct 2018 12:20:36 +0200 Message-Id: <20181017102037.28537-2-poeschel@lemonage.de> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181017102037.28537-1-poeschel@lemonage.de> References: <20181017102037.28537-1-poeschel@lemonage.de> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP pn532 devices support an autopoll command, that lets the chip automatically poll for selected nfc technologies instead of manually looping through every single nfc technology the user is interested in. This is faster and less cpu and bus intensive than manually polling. This adds this autopoll capability to the pn533 driver. Signed-off-by: Lars Poeschel --- drivers/nfc/pn533/pn533.c | 193 +++++++++++++++++++++++++++++++++++++- drivers/nfc/pn533/pn533.h | 10 +- 2 files changed, 197 insertions(+), 6 deletions(-) diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c index a0cc1cc45292..c80ee79af86e 100644 --- a/drivers/nfc/pn533/pn533.c +++ b/drivers/nfc/pn533/pn533.c @@ -197,6 +197,32 @@ struct pn533_cmd_jump_dep_response { u8 gt[]; } __packed; +struct pn532_autopoll_resp { + u8 type; + u8 ln; + u8 tg; + u8 tgdata[]; +} __packed; + +/* PN532_CMD_IN_AUTOPOLL */ +#define PN532_AUTOPOLL_POLLNR_INFINITE 0xff +#define PN532_AUTOPOLL_PERIOD 0x03 /* in units of 150 ms */ + +#define PN532_AUTOPOLL_TYPE_GENERIC_106 0x00 +#define PN532_AUTOPOLL_TYPE_GENERIC_212 0x01 +#define PN532_AUTOPOLL_TYPE_GENERIC_424 0x02 +#define PN532_AUTOPOLL_TYPE_JEWEL 0x04 +#define PN532_AUTOPOLL_TYPE_MIFARE 0x10 +#define PN532_AUTOPOLL_TYPE_FELICA212 0x11 +#define PN532_AUTOPOLL_TYPE_FELICA424 0x12 +#define PN532_AUTOPOLL_TYPE_ISOA 0x20 +#define PN532_AUTOPOLL_TYPE_ISOB 0x23 +#define PN532_AUTOPOLL_TYPE_DEP_PASSIVE_106 0x40 +#define PN532_AUTOPOLL_TYPE_DEP_PASSIVE_212 0x41 +#define PN532_AUTOPOLL_TYPE_DEP_PASSIVE_424 0x42 +#define PN532_AUTOPOLL_TYPE_DEP_ACTIVE_106 0x80 +#define PN532_AUTOPOLL_TYPE_DEP_ACTIVE_212 0x81 +#define PN532_AUTOPOLL_TYPE_DEP_ACTIVE_424 0x82 /* PN533_TG_INIT_AS_TARGET */ #define PN533_INIT_TARGET_PASSIVE 0x1 @@ -1401,6 +1427,101 @@ static int pn533_poll_dep(struct nfc_dev *nfc_dev) return rc; } +static int pn533_autopoll_complete(struct pn533 *dev, void *arg, + struct sk_buff *resp) +{ + u8 nbtg; + int rc; + struct pn532_autopoll_resp *apr; + struct nfc_target nfc_tgt; + + if (IS_ERR(resp)) { + rc = PTR_ERR(resp); + + nfc_err(dev->dev, "%s autopoll complete error %d\n", + __func__, rc); + + if (rc == -ENOENT) { + if (dev->poll_mod_count != 0) + return rc; + goto stop_poll; + } else if (rc < 0) { + nfc_err(dev->dev, + "Error %d when running autopoll\n", rc); + goto stop_poll; + } + } + + nbtg = resp->data[0]; + if ((nbtg > 2) || (nbtg <= 0)) + return -EAGAIN; + + apr = (struct pn532_autopoll_resp *)&resp->data[1]; + while (nbtg--) { + memset(&nfc_tgt, 0, sizeof(struct nfc_target)); + switch (apr->type) { + case PN532_AUTOPOLL_TYPE_ISOA: + dev_dbg(dev->dev, "ISOA"); + rc = pn533_target_found_type_a(&nfc_tgt, apr->tgdata, + apr->ln - 1); + break; + case PN532_AUTOPOLL_TYPE_FELICA212: + case PN532_AUTOPOLL_TYPE_FELICA424: + dev_dbg(dev->dev, "FELICA"); + rc = pn533_target_found_felica(&nfc_tgt, apr->tgdata, + apr->ln - 1); + break; + case PN532_AUTOPOLL_TYPE_JEWEL: + dev_dbg(dev->dev, "JEWEL"); + rc = pn533_target_found_jewel(&nfc_tgt, apr->tgdata, + apr->ln - 1); + break; + case PN532_AUTOPOLL_TYPE_ISOB: + dev_dbg(dev->dev, "ISOB"); + rc = pn533_target_found_type_b(&nfc_tgt, apr->tgdata, + apr->ln - 1); + break; + case PN532_AUTOPOLL_TYPE_MIFARE: + dev_dbg(dev->dev, "Mifare"); + rc = pn533_target_found_type_a(&nfc_tgt, apr->tgdata, + apr->ln - 1); + break; + default: + nfc_err(dev->dev, + "Unknown current poll modulation"); + rc = -EPROTO; + } + + if (rc) + goto done; + + if (!(nfc_tgt.supported_protocols & dev->poll_protocols)) { + nfc_err(dev->dev, + "The Tg found doesn't have the desired protocol"); + rc = -EAGAIN; + goto done; + } + + dev->tgt_available_prots = nfc_tgt.supported_protocols; + apr = (struct pn532_autopoll_resp *) + (apr->tgdata + (apr->ln - 1)); + } + + pn533_poll_reset_mod_list(dev); + nfc_targets_found(dev->nfc_dev, &nfc_tgt, 1); + +done: + dev_kfree_skb(resp); + return rc; + +stop_poll: + nfc_err(dev->dev, "autopoll operation has been stopped\n"); + + pn533_poll_reset_mod_list(dev); + dev->poll_protocols = 0; + return rc; +} + static int pn533_poll_complete(struct pn533 *dev, void *arg, struct sk_buff *resp) { @@ -1546,6 +1667,7 @@ static int pn533_start_poll(struct nfc_dev *nfc_dev, struct pn533_poll_modulations *cur_mod; u8 rand_mod; int rc; + struct sk_buff *skb; dev_dbg(dev->dev, "%s: im protocols 0x%x tm protocols 0x%x\n", @@ -1569,9 +1691,73 @@ static int pn533_start_poll(struct nfc_dev *nfc_dev, tm_protocols = 0; } - pn533_poll_create_mod_list(dev, im_protocols, tm_protocols); dev->poll_protocols = im_protocols; dev->listen_protocols = tm_protocols; + if (dev->device_type == PN533_DEVICE_PN532_AUTOPOLL) { + skb = pn533_alloc_skb(dev, 4 + 6); + if (!skb) + return -ENOMEM; + + *((u8 *)skb_put(skb, sizeof(u8))) = + PN532_AUTOPOLL_POLLNR_INFINITE; + *((u8 *)skb_put(skb, sizeof(u8))) = PN532_AUTOPOLL_PERIOD; + + if ((im_protocols & NFC_PROTO_MIFARE_MASK) && + (im_protocols & NFC_PROTO_ISO14443_MASK) && + (im_protocols & NFC_PROTO_NFC_DEP_MASK)) + *((u8 *)skb_put(skb, sizeof(u8))) = + PN532_AUTOPOLL_TYPE_GENERIC_106; + else { + if (im_protocols & NFC_PROTO_MIFARE_MASK) + *((u8 *)skb_put(skb, sizeof(u8))) = + PN532_AUTOPOLL_TYPE_MIFARE; + + if (im_protocols & NFC_PROTO_ISO14443_MASK) + *((u8 *)skb_put(skb, sizeof(u8))) = + PN532_AUTOPOLL_TYPE_ISOA; + + if (im_protocols & NFC_PROTO_NFC_DEP_MASK) { + *((u8 *)skb_put(skb, sizeof(u8))) = + PN532_AUTOPOLL_TYPE_DEP_PASSIVE_106; + *((u8 *)skb_put(skb, sizeof(u8))) = + PN532_AUTOPOLL_TYPE_DEP_PASSIVE_212; + *((u8 *)skb_put(skb, sizeof(u8))) = + PN532_AUTOPOLL_TYPE_DEP_PASSIVE_424; + } + } + + if (im_protocols & NFC_PROTO_FELICA_MASK || + im_protocols & NFC_PROTO_NFC_DEP_MASK) { + *((u8 *)skb_put(skb, sizeof(u8))) = + PN532_AUTOPOLL_TYPE_FELICA212; + *((u8 *)skb_put(skb, sizeof(u8))) = + PN532_AUTOPOLL_TYPE_FELICA424; + } + + if (im_protocols & NFC_PROTO_JEWEL_MASK) + *((u8 *)skb_put(skb, sizeof(u8))) = + PN532_AUTOPOLL_TYPE_JEWEL; + + if (im_protocols & NFC_PROTO_ISO14443_B_MASK) + *((u8 *)skb_put(skb, sizeof(u8))) = + PN532_AUTOPOLL_TYPE_ISOB; + + if (tm_protocols) + *((u8 *)skb_put(skb, sizeof(u8))) = + PN532_AUTOPOLL_TYPE_DEP_ACTIVE_106; + + rc = pn533_send_cmd_async(dev, PN533_CMD_IN_AUTOPOLL, skb, + pn533_autopoll_complete, NULL); + + if (rc < 0) + dev_kfree_skb(skb); + else + dev->poll_mod_count++; + + return rc; + } + + pn533_poll_create_mod_list(dev, im_protocols, tm_protocols); /* Do not always start polling from the same modulation */ get_random_bytes(&rand_mod, sizeof(rand_mod)); @@ -2468,7 +2654,8 @@ static int pn533_dev_up(struct nfc_dev *nfc_dev) { struct pn533 *dev = nfc_get_drvdata(nfc_dev); - if (dev->device_type == PN533_DEVICE_PN532) { + if ((dev->device_type == PN533_DEVICE_PN532) || + (dev->device_type == PN533_DEVICE_PN532_AUTOPOLL)) { int rc = pn532_sam_configuration(nfc_dev); if (rc) @@ -2508,6 +2695,7 @@ static int pn533_setup(struct pn533 *dev) case PN533_DEVICE_PASORI: case PN533_DEVICE_ACR122U: case PN533_DEVICE_PN532: + case PN533_DEVICE_PN532_AUTOPOLL: max_retries.mx_rty_atr = 0x2; max_retries.mx_rty_psl = 0x1; max_retries.mx_rty_passive_act = @@ -2544,6 +2732,7 @@ static int pn533_setup(struct pn533 *dev) switch (dev->device_type) { case PN533_DEVICE_STD: case PN533_DEVICE_PN532: + case PN533_DEVICE_PN532_AUTOPOLL: break; case PN533_DEVICE_PASORI: diff --git a/drivers/nfc/pn533/pn533.h b/drivers/nfc/pn533/pn533.h index ca00508eefff..14a97b7d5ba7 100644 --- a/drivers/nfc/pn533/pn533.h +++ b/drivers/nfc/pn533/pn533.h @@ -18,10 +18,11 @@ * along with this program; if not, see . */ -#define PN533_DEVICE_STD 0x1 -#define PN533_DEVICE_PASORI 0x2 -#define PN533_DEVICE_ACR122U 0x3 -#define PN533_DEVICE_PN532 0x4 +#define PN533_DEVICE_STD 0x1 +#define PN533_DEVICE_PASORI 0x2 +#define PN533_DEVICE_ACR122U 0x3 +#define PN533_DEVICE_PN532 0x4 +#define PN533_DEVICE_PN532_AUTOPOLL 0x5 #define PN533_ALL_PROTOCOLS (NFC_PROTO_JEWEL_MASK | NFC_PROTO_MIFARE_MASK |\ NFC_PROTO_FELICA_MASK | NFC_PROTO_ISO14443_MASK |\ @@ -87,6 +88,7 @@ #define PN533_CMD_IN_ATR 0x50 #define PN533_CMD_IN_RELEASE 0x52 #define PN533_CMD_IN_JUMP_FOR_DEP 0x56 +#define PN533_CMD_IN_AUTOPOLL 0x60 #define PN533_CMD_TG_INIT_AS_TARGET 0x8c #define PN533_CMD_TG_GET_DATA 0x86 From patchwork Wed Oct 17 10:20:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars Poeschel X-Patchwork-Id: 10645285 X-Patchwork-Delegate: sameo@linux.intel.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 476AD109C for ; Wed, 17 Oct 2018 10:26:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3A2582AC74 for ; Wed, 17 Oct 2018 10:26:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2E0032ACD5; Wed, 17 Oct 2018 10:26:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CFE852AC74 for ; Wed, 17 Oct 2018 10:26:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727005AbeJQSVm (ORCPT ); Wed, 17 Oct 2018 14:21:42 -0400 Received: from smtp2.goneo.de ([85.220.129.33]:59086 "EHLO smtp2.goneo.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726961AbeJQSVm (ORCPT ); Wed, 17 Oct 2018 14:21:42 -0400 Received: from localhost (localhost [127.0.0.1]) by smtp2.goneo.de (Postfix) with ESMTP id 267A1242620; Wed, 17 Oct 2018 12:21:12 +0200 (CEST) X-Virus-Scanned: by goneo Received: from smtp2.goneo.de ([127.0.0.1]) by localhost (smtp2.goneo.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id D3dHdPAr8dOB; Wed, 17 Oct 2018 12:21:11 +0200 (CEST) Received: from lem-wkst-02.lemonage.de. (hq.lemonage.de [87.138.178.34]) by smtp2.goneo.de (Postfix) with ESMTPSA id 1AB4223F65C; Wed, 17 Oct 2018 12:21:11 +0200 (CEST) From: Lars Poeschel To: Samuel Ortiz , Greg Kroah-Hartman , Jiri Slaby , Kees Cook , linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org Cc: Lars Poeschel Subject: [PATCH 3/3] nfc: pn532_uart: Make use of pn532 autopoll Date: Wed, 17 Oct 2018 12:20:37 +0200 Message-Id: <20181017102037.28537-3-poeschel@lemonage.de> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181017102037.28537-1-poeschel@lemonage.de> References: <20181017102037.28537-1-poeschel@lemonage.de> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This switches the pn532 UART phy driver from manually polling to the new autopoll mechanism. Signed-off-by: Lars Poeschel --- drivers/nfc/pn533/uart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nfc/pn533/uart.c b/drivers/nfc/pn533/uart.c index b5f995988cae..3316298e31a7 100644 --- a/drivers/nfc/pn533/uart.c +++ b/drivers/nfc/pn533/uart.c @@ -162,7 +162,7 @@ static int pn532_open(struct tty_struct *tty) if (pn532->wq_open_tty == NULL) goto err_skb; - priv = pn533_register_device(PN533_DEVICE_PN532, + priv = pn533_register_device(PN533_DEVICE_PN532_AUTOPOLL, PN533_NO_TYPE_B_PROTOCOLS, PN533_PROTO_REQ_ACK_RESP, pn532, &uart_phy_ops, NULL,