leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This is the 2nd NFC pull request for 3.8.

Browse Source 
With this one we have:
 
 - A few HCI improvements in preparation for an upcoming HCI chipset support.
 - A pn544 code cleanup after the old driver was removed.
 - An LLCP improvement for notifying user space when one peer stops ACKing I
   frames.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJQqsqwAAoJEIqAPN1PVmxKgd0P/3IOXPTXaO23fh6fgOhq1coz
 QLC1FpUnOn3oai5RdYfeJ72OKQTv9avH4cbMLlWKHrHgZKCLaL5sOaqTMmB1/Vrz
 BEliKhF2tVrv5H5/UHJPNooMGNMC4YNvnWDlQqtK08eClUVovbwDnF4zpsEkoaFI
 l0BgNxF7lhjdotQngbyETq6V6oszYwCi7JzLj+OfiPD6W7a27rQgJT88FQrh+LI8
 iuRuuszlqXxqnmtxE5SY2fePv6HThtN386X7WNilK7lvc7zo6mLpdWnVMmnJtV+F
 xIpmdCLH+++ALnBsuIC00ErwpojwdI3h40T7JORhQYFqWR1r13AoHJChFKGv2Rty
 4CgcL/HCuYfPPqEVW/F7bY24CirNqzc6+rjsmC0v1B5LhRrleo1EG4BhSUKURy9x
 MRR79IidXKd8dClLgCylriIDw6pg3nJXbCnvFBkL7pgmrT5xhgTxRcqGL1Gg8TkE
 VWEz7+1y7sLXzrQhw9HhoULnSXT0mzuwDUWXhgUp3FA3reflHFgUkVbfArHdVjYV
 5W00lrAIKD/BT0krpGUCcRAJyvBRFLLrmN/tJkyDvRaZf2huolHf5lh0KT8lW2zk
 xmw9+FJhUh69RR11x+cx4XtTbqgHSs/cN/fuemYk7jqIUaA6DTwcQdXD+Kpo143v
 kBNeSbsQu1aO7nOQJVVH
 =gNEq
 -----END PGP SIGNATURE-----

Merge tag 'nfc-next-3.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-3.0

Samuel says:

"This is the 2nd NFC pull request for 3.8.

With this one we have:

- A few HCI improvements in preparation for an upcoming HCI chipset support.
- A pn544 code cleanup after the old driver was removed.
- An LLCP improvement for notifying user space when one peer stops ACKing I
  frames."

Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
John W. Linville 2012-11-20 13:22:03 -05:00
commit cb675f5ff3
9 changed files with 112 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -5067,6 +5067,7 @@ F: net/nfc/
F: include/linux/nfc.h
F: include/net/nfc/
F: drivers/nfc/
F: include/linux/platform_data/pn544.h
NFS, SUNRPC, AND LOCKD CLIENTS
M: Trond Myklebust <Trond.Myklebust@netapp.com>

2
drivers/nfc/pn544/i2c.c
View File

@ -26,7 +26,7 @@
#include <linux/interrupt.h>
#include <linux/delay.h>
#include <linux/nfc/pn544.h>
#include <linux/platform_data/pn544.h>
#include <net/nfc/hci.h>
#include <net/nfc/llc.h>

104
include/linux/nfc/pn544.h
View File

@ -1,104 +0,0 @@
/*
* Driver include for the PN544 NFC chip.
*
* Copyright (C) Nokia Corporation
*
* Author: Jari Vanhala <ext-jari.vanhala@nokia.com>
* Contact: Matti Aaltoenn <matti.j.aaltonen@nokia.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* version 2 as published by the Free Software Foundation.
*
* 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, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef _PN544_H_
#define _PN544_H_
#include <linux/i2c.h>
#define PN544_DRIVER_NAME "pn544"
#define PN544_MAXWINDOW_SIZE 7
#define PN544_WINDOW_SIZE 4
#define PN544_RETRIES 10
#define PN544_MAX_I2C_TRANSFER 0x0400
#define PN544_MSG_MAX_SIZE 0x21 /* at normal HCI mode */
/* ioctl */
#define PN544_CHAR_BASE 'P'
#define PN544_IOR(num, dtype) _IOR(PN544_CHAR_BASE, num, dtype)
#define PN544_IOW(num, dtype) _IOW(PN544_CHAR_BASE, num, dtype)
#define PN544_GET_FW_MODE PN544_IOW(1, unsigned int)
#define PN544_SET_FW_MODE PN544_IOW(2, unsigned int)
#define PN544_GET_DEBUG PN544_IOW(3, unsigned int)
#define PN544_SET_DEBUG PN544_IOW(4, unsigned int)
/* Timing restrictions (ms) */
#define PN544_RESETVEN_TIME 30 /* 7 */
#define PN544_PVDDVEN_TIME 0
#define PN544_VBATVEN_TIME 0
#define PN544_GPIO4VEN_TIME 0
#define PN544_WAKEUP_ACK 5
#define PN544_WAKEUP_GUARD (PN544_WAKEUP_ACK + 1)
#define PN544_INACTIVITY_TIME 1000
#define PN544_INTERFRAME_DELAY 200 /* us */
#define PN544_BAUDRATE_CHANGE 150 /* us */
/* Debug bits */
#define PN544_DEBUG_BUF 0x01
#define PN544_DEBUG_READ 0x02
#define PN544_DEBUG_WRITE 0x04
#define PN544_DEBUG_IRQ 0x08
#define PN544_DEBUG_CALLS 0x10
#define PN544_DEBUG_MODE 0x20
/* Normal (HCI) mode */
#define PN544_LLC_HCI_OVERHEAD 3 /* header + crc (to length) */
#define PN544_LLC_MIN_SIZE (1 + PN544_LLC_HCI_OVERHEAD) /* length + */
#define PN544_LLC_MAX_DATA (PN544_MSG_MAX_SIZE - 2)
#define PN544_LLC_MAX_HCI_SIZE (PN544_LLC_MAX_DATA - 2)
struct pn544_llc_packet {
unsigned char length; /* of rest of packet */
unsigned char header;
unsigned char data[PN544_LLC_MAX_DATA]; /* includes crc-ccitt */
};
/* Firmware upgrade mode */
#define PN544_FW_HEADER_SIZE 3
/* max fw transfer is 1024bytes, but I2C limits it to 0xC0 */
#define PN544_MAX_FW_DATA (PN544_MAX_I2C_TRANSFER - PN544_FW_HEADER_SIZE)
struct pn544_fw_packet {
unsigned char command; /* status in answer */
unsigned char length[2]; /* big-endian order (msf) */
unsigned char data[PN544_MAX_FW_DATA];
};
#ifdef __KERNEL__
enum {
NFC_GPIO_ENABLE,
NFC_GPIO_FW_RESET,
NFC_GPIO_IRQ
};
/* board config */
struct pn544_nfc_platform_data {
int (*request_resources) (struct i2c_client *client);
void (*free_resources) (void);
void (*enable) (int fw);
int (*test) (void);
void (*disable) (void);
int (*get_gpio)(int type);
};
#endif /* __KERNEL__ */
#endif /* _PN544_H_ */

44
include/linux/platform_data/pn544.h Normal file
View File

@ -0,0 +1,44 @@
/*
* Driver include for the PN544 NFC chip.
*
* Copyright (C) Nokia Corporation
*
* Author: Jari Vanhala <ext-jari.vanhala@nokia.com>
* Contact: Matti Aaltoenn <matti.j.aaltonen@nokia.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* version 2 as published by the Free Software Foundation.
*
* 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, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef _PN544_H_
#define _PN544_H_
#include <linux/i2c.h>
enum {
NFC_GPIO_ENABLE,
NFC_GPIO_FW_RESET,
NFC_GPIO_IRQ
};
/* board config */
struct pn544_nfc_platform_data {
int (*request_resources) (struct i2c_client *client);
void (*free_resources) (void);
void (*enable) (int fw);
int (*test) (void);
void (*disable) (void);
int (*get_gpio)(int type);
};
#endif /* _PN544_H_ */

3
include/net/nfc/hci.h
View File

@ -149,6 +149,8 @@ void *nfc_hci_get_clientdata(struct nfc_hci_dev *hdev);
void nfc_hci_driver_failure(struct nfc_hci_dev *hdev, int err);
int nfc_hci_result_to_errno(u8 result);
/* Host IDs */
#define NFC_HCI_HOST_CONTROLLER_ID 0x00
#define NFC_HCI_TERMINAL_HOST_ID 0x01
@ -235,5 +237,6 @@ int nfc_hci_send_response(struct nfc_hci_dev *hdev, u8 gate, u8 response,
int nfc_hci_send_event(struct nfc_hci_dev *hdev, u8 gate, u8 event,
const u8 *param, size_t param_len);
int nfc_hci_target_discovered(struct nfc_hci_dev *hdev, u8 gate);
u32 nfc_hci_sak_to_protocol(u8 sak);
#endif /* __NET_HCI_H */

4
net/nfc/hci/command.c
View File

@ -344,7 +344,7 @@ int nfc_hci_connect_gate(struct nfc_hci_dev *hdev, u8 dest_host, u8 dest_gate,
return -EADDRINUSE;
if (pipe != NFC_HCI_INVALID_PIPE)
goto pipe_is_open;
goto open_pipe;
switch (dest_gate) {
case NFC_HCI_LINK_MGMT_GATE:
@ -361,6 +361,7 @@ int nfc_hci_connect_gate(struct nfc_hci_dev *hdev, u8 dest_host, u8 dest_gate,
break;
}
open_pipe:
r = nfc_hci_open_pipe(hdev, pipe);
if (r < 0) {
if (pipe_created)
@ -371,7 +372,6 @@ int nfc_hci_connect_gate(struct nfc_hci_dev *hdev, u8 dest_host, u8 dest_gate,
return r;
}
pipe_is_open:
hdev->gate2pipe[dest_gate] = pipe;
return 0;

25
net/nfc/hci/core.c
View File

@ -33,17 +33,20 @@
/* Largest headroom needed for outgoing HCI commands */
#define HCI_CMDS_HEADROOM 1
static int nfc_hci_result_to_errno(u8 result)
int nfc_hci_result_to_errno(u8 result)
{
switch (result) {
case NFC_HCI_ANY_OK:
return 0;
case NFC_HCI_ANY_E_REG_PAR_UNKNOWN:
return -EOPNOTSUPP;
case NFC_HCI_ANY_E_TIMEOUT:
return -ETIME;
default:
return -1;
}
}
EXPORT_SYMBOL(nfc_hci_result_to_errno);
static void nfc_hci_msg_tx_work(struct work_struct *work)
{
@ -167,7 +170,7 @@ void nfc_hci_cmd_received(struct nfc_hci_dev *hdev, u8 pipe, u8 cmd,
kfree_skb(skb);
}
static u32 nfc_hci_sak_to_protocol(u8 sak)
u32 nfc_hci_sak_to_protocol(u8 sak)
{
switch (NFC_HCI_TYPE_A_SEL_PROT(sak)) {
case NFC_HCI_TYPE_A_SEL_PROT_MIFARE:
@ -182,6 +185,7 @@ static u32 nfc_hci_sak_to_protocol(u8 sak)
return 0xffffffff;
}
}
EXPORT_SYMBOL(nfc_hci_sak_to_protocol);
int nfc_hci_target_discovered(struct nfc_hci_dev *hdev, u8 gate)
{
@ -284,6 +288,12 @@ void nfc_hci_event_received(struct nfc_hci_dev *hdev, u8 pipe, u8 event,
struct sk_buff *skb)
{
int r = 0;
u8 gate = nfc_hci_pipe2gate(hdev, pipe);
if (gate == 0xff) {
pr_err("Discarded event %x to unopened pipe %x\n", event, pipe);
goto exit;
}
switch (event) {
case NFC_HCI_EVT_TARGET_DISCOVERED:
@ -307,14 +317,11 @@ void nfc_hci_event_received(struct nfc_hci_dev *hdev, u8 pipe, u8 event,
goto exit;
}
r = nfc_hci_target_discovered(hdev,
nfc_hci_pipe2gate(hdev, pipe));
r = nfc_hci_target_discovered(hdev, gate);
break;
default:
if (hdev->ops->event_received) {
hdev->ops->event_received(hdev,
nfc_hci_pipe2gate(hdev, pipe),
event, skb);
hdev->ops->event_received(hdev, gate, event, skb);
return;
}
@ -419,6 +426,10 @@ static int hci_dev_version(struct nfc_hci_dev *hdev)
r = nfc_hci_get_param(hdev, NFC_HCI_ID_MGMT_GATE,
NFC_HCI_ID_MGMT_VERSION_SW, &skb);
if (r == -EOPNOTSUPP) {
pr_info("Software/Hardware info not available\n");
return 0;
}
if (r < 0)
return r;

32
net/nfc/llcp/commands.c
View File

@ -528,6 +528,23 @@ int nfc_llcp_send_i_frame(struct nfc_llcp_sock *sock,
if (local == NULL)
return -ENODEV;
/* Remote is ready but has not acknowledged our frames */
if((sock->remote_ready &&
skb_queue_len(&sock->tx_pending_queue) >= sock->rw &&
skb_queue_len(&sock->tx_queue) >= 2 * sock->rw)) {
pr_err("Pending queue is full %d frames\n",
skb_queue_len(&sock->tx_pending_queue));
return -ENOBUFS;
}
/* Remote is not ready and we've been queueing enough frames */
if ((!sock->remote_ready &&
skb_queue_len(&sock->tx_queue) >= 2 * sock->rw)) {
pr_err("Tx queue is full %d frames\n",
skb_queue_len(&sock->tx_queue));
return -ENOBUFS;
}
msg_data = kzalloc(len, GFP_KERNEL);
if (msg_data == NULL)
return -ENOMEM;
@ -579,7 +596,7 @@ int nfc_llcp_send_ui_frame(struct nfc_llcp_sock *sock, u8 ssap, u8 dsap,
struct sk_buff *pdu;
struct nfc_llcp_local *local;
size_t frag_len = 0, remaining_len;
u8 *msg_ptr;
u8 *msg_ptr, *msg_data;
int err;
pr_debug("Send UI frame len %zd\n", len);
@ -588,8 +605,17 @@ int nfc_llcp_send_ui_frame(struct nfc_llcp_sock *sock, u8 ssap, u8 dsap,
if (local == NULL)
return -ENODEV;
msg_data = kzalloc(len, GFP_KERNEL);
if (msg_data == NULL)
return -ENOMEM;
if (memcpy_fromiovec(msg_data, msg->msg_iov, len)) {
kfree(msg_data);
return -EFAULT;
}
remaining_len = len;
msg_ptr = (u8 *) msg->msg_iov;
msg_ptr = msg_data;
while (remaining_len > 0) {
@ -616,6 +642,8 @@ int nfc_llcp_send_ui_frame(struct nfc_llcp_sock *sock, u8 ssap, u8 dsap,
msg_ptr += frag_len;
}
kfree(msg_data);
return len;
}

17
net/nfc/llcp/llcp.c
View File

@ -656,6 +656,8 @@ static void nfc_llcp_tx_work(struct work_struct *work)
if (llcp_sock == NULL && nfc_llcp_ptype(skb) == LLCP_PDU_I) {
nfc_llcp_send_symm(local->dev);
} else {
struct sk_buff *copy_skb = NULL;
u8 ptype = nfc_llcp_ptype(skb);
int ret;
pr_debug("Sending pending skb\n");
@ -663,22 +665,29 @@ static void nfc_llcp_tx_work(struct work_struct *work)
DUMP_PREFIX_OFFSET, 16, 1,
skb->data, skb->len, true);
if (ptype == LLCP_PDU_I)
copy_skb = skb_copy(skb, GFP_ATOMIC);
nfc_llcp_send_to_raw_sock(local, skb,
NFC_LLCP_DIRECTION_TX);
ret = nfc_data_exchange(local->dev, local->target_idx,
skb, nfc_llcp_recv, local);
if (!ret && nfc_llcp_ptype(skb) == LLCP_PDU_I) {
skb = skb_get(skb);
skb_queue_tail(&llcp_sock->tx_pending_queue,
skb);
if (ret) {
kfree_skb(copy_skb);
goto out;
}
if (ptype == LLCP_PDU_I && copy_skb)
skb_queue_tail(&llcp_sock->tx_pending_queue,
copy_skb);
}
} else {
nfc_llcp_send_symm(local->dev);
}
out:
mod_timer(&local->link_timer,
jiffies + msecs_to_jiffies(2 * local->remote_lto));
}