nfc: Add support RC-S380P to port100
Subsystems (2)
PATCH RESEND 1/4 nfc: Add support RC-S380P to port100
---
drivers/nfc/port100.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/nfc/port100.c renamed from drivers/nfc/port100.c~nfc-add-rcs380p +5 -3
@@ -21,8 +21,9 @@#define VERSION "0.1" -#define SONY_VENDOR_ID 0x054c -#define RCS380_PRODUCT_ID 0x06c1 +#define SONY_VENDOR_ID 0x054c +#define RCS380S_PRODUCT_ID 0x06c1 +#define RCS380P_PRODUCT_ID 0x06c3#define PORT100_PROTOCOLS (NFC_PROTO_JEWEL_MASK | \ NFC_PROTO_MIFARE_MASK | \
@@ -1477,7 +1478,8 @@ static struct nfc_digital_ops port100_di };static const struct usb_device_id port100_table[] = { - {USB_DEVICE (SONY_VENDOR_ID ,RCS380_PRODUCT_ID ), }, + {USB_DEVICE (SONY_VENDOR_ID ,RCS380S_PRODUCT_ID ), }, + {USB_DEVICE (SONY_VENDOR_ID ,RCS380P_PRODUCT_ID ), }, { } };MODULE_DEVICE_TABLE (usb, port100_table);
_
Signature · 1 line
OGAWA Hirofumi <[email protected]>
PATCH RESEND 2/4 nfc: Send same info for both of NFC_CMD_GET_DEVICE and NFC_EVENT_DEVICE_ADDED
Now, NFC_EVENT_DEVICE_ADDED doesn't send NFC_ATTR_RF_MODE. But NFC_CMD_GET_DEVICE send.
To get NFC_ATTR_RF_MODE, we have to call NFC_CMD_GET_DEVICE just for NFC_ATTR_RF_MODE when get NFC_EVENT_DEVICE_ADDED.
This fixes those inconsistent.
---
net/nfc/netlink.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
net/nfc/netlink.c renamed from net/nfc/netlink.c~nfc-send-same-info +13 -9
@@ -311,6 +311,17 @@ free_msg:return -EMSGSIZE ; } +static int nfc_genl_setup_device_added (struct nfc_dev *dev,struct sk_buff *msg) +{ +if (nla_put_string (msg,NFC_ATTR_DEVICE_NAME ,nfc_device_name (dev)) || +nla_put_u32 (msg,NFC_ATTR_DEVICE_INDEX , dev->idx) || +nla_put_u32 (msg,NFC_ATTR_PROTOCOLS , dev->supported_protocols) || +nla_put_u8 (msg,NFC_ATTR_DEVICE_POWERED , dev->dev_up) || +nla_put_u8 (msg,NFC_ATTR_RF_MODE , dev->rf_mode)) +return -1 ; +return 0 ; +} +int nfc_genl_device_added (struct nfc_dev *dev) {struct sk_buff *msg;
@@ -325,10 +336,7 @@ int nfc_genl_device_added(struct nfc_devif (!hdr) goto free_msg; -if (nla_put_string (msg,NFC_ATTR_DEVICE_NAME ,nfc_device_name (dev)) || -nla_put_u32 (msg,NFC_ATTR_DEVICE_INDEX , dev->idx) || -nla_put_u32 (msg,NFC_ATTR_PROTOCOLS , dev->supported_protocols) || -nla_put_u8 (msg,NFC_ATTR_DEVICE_POWERED , dev->dev_up)) +if (nfc_genl_setup_device_added (dev, msg)) goto nla_put_failure;genlmsg_end (msg, hdr);
@@ -604,11 +612,7 @@ static int nfc_genl_send_device(struct sif (cb)genl_dump_check_consistent (cb, hdr, &nfc_genl_family); -if (nla_put_string (msg,NFC_ATTR_DEVICE_NAME ,nfc_device_name (dev)) || -nla_put_u32 (msg,NFC_ATTR_DEVICE_INDEX , dev->idx) || -nla_put_u32 (msg,NFC_ATTR_PROTOCOLS , dev->supported_protocols) || -nla_put_u8 (msg,NFC_ATTR_DEVICE_POWERED , dev->dev_up) || -nla_put_u8 (msg,NFC_ATTR_RF_MODE , dev->rf_mode)) +if (nfc_genl_setup_device_added (dev, msg)) goto nla_put_failure;genlmsg_end (msg, hdr);
_
Signature · 1 line
OGAWA Hirofumi <[email protected]>
PATCH RESEND 3/4 nfc: Fix RC-S380* needs zero-length packet
If sent packet size is wMaxPacketSize boundary, this device doesn't answer. To fix this, we have to send zero-length packet in usb spec.
---
drivers/nfc/port100.c | 1 + 1 file changed, 1 insertion(+)
drivers/nfc/port100.c renamed from drivers/nfc/port100.c~nfc-need-zero-packet +1 -0
@@ -1540,6 +1540,7 @@ static int port100_probe(struct usb_inteusb_fill_bulk_urb (dev->out_urb, dev->udev,usb_sndbulkpipe (dev->udev, out_endpoint),NULL ,0 , port100_send_complete, dev); + dev->out_urb->transfer_flags =URB_ZERO_PACKET ; dev->skb_headroom =PORT100_FRAME_HEADER_LEN +PORT100_COMM_RF_HEAD_MAX_LEN ;
_
Signature · 1 line
OGAWA Hirofumi <[email protected]>
PATCH RESEND 4/4 nfc: Fix hangup of RC-S380* in port100_send_ack()
If port100_send_ack() was called twice or more, it has race to hangup.
port100_send_ack() port100_send_ack()
init_completion()
[...]
dev->cmd_cancel = true
/* this removes previous from completion */
init_completion()
[...]
dev->cmd_cancel = true
wait_for_completion()
/* never be waked up */
wait_for_completion()Like above race, this code is not assuming port100_send_ack() is called twice or more.
To fix, this checks dev->cmd_cancel to know if prior cancel is in-flight or not. And never be remove prior task from completion by using reinit_completion(), so this guarantees to be waked up properly soon or later.
---
drivers/nfc/port100.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-)
drivers/nfc/port100.c renamed from drivers/nfc/port100.c~nfc-port100-hang-fix +24 -13
@@ -726,23 +726,33 @@ static int port100_submit_urb_for_ack(ststatic int port100_send_ack (struct port100 *dev) { -int rc; +int rc =0 ;mutex_lock (&dev->out_urb_lock); -init_completion (&dev->cmd_cancel_done); - -usb_kill_urb (dev->out_urb); +/* +* If prior cancel is in-flight (dev->cmd_cancel == true), we +* can skip to send cancel. Then this will wait the prior +* cancel, or merged into the next cancel rarely if next +* cancel was started before waiting done. In any case, this +* will be waked up soon or later. +*/ +if (!dev->cmd_cancel) { +reinit_completion (&dev->cmd_cancel_done); - dev->out_urb->transfer_buffer = ack_frame; - dev->out_urb->transfer_buffer_length =sizeof (ack_frame); - rc =usb_submit_urb (dev->out_urb,GFP_KERNEL ); +usb_kill_urb (dev->out_urb); -/* Set the cmd_cancel flag only if the URB has been successfully -* submitted. It will be reset by the out URB completion callback -* port100_send_complete(). -*/ - dev->cmd_cancel = !rc; + dev->out_urb->transfer_buffer = ack_frame; + dev->out_urb->transfer_buffer_length =sizeof (ack_frame); + rc =usb_submit_urb (dev->out_urb,GFP_KERNEL ); + +/* +* Set the cmd_cancel flag only if the URB has been +* successfully submitted. It will be reset by the out +* URB completion callback port100_send_complete(). +*/ + dev->cmd_cancel = !rc; + }mutex_unlock (&dev->out_urb_lock);
@@ -929,8 +939,8 @@ static void port100_send_complete(structstruct port100 *dev = urb->context;if (dev->cmd_cancel) { +complete_all (&dev->cmd_cancel_done); dev->cmd_cancel = false; -complete (&dev->cmd_cancel_done); }switch (urb->status) {
@@ -1546,6 +1556,7 @@ static int port100_probe(struct usb_intePORT100_COMM_RF_HEAD_MAX_LEN ; dev->skb_tailroom =PORT100_FRAME_TAIL_LEN ; +init_completion (&dev->cmd_cancel_done);INIT_WORK (&dev->cmd_complete_work, port100_wq_cmd_complete);/* The first thing to do with the Port-100 is to set the command type
_
Signature · 1 line
OGAWA Hirofumi <[email protected]>
OGAWA Hirofumi <[email protected]> writes:
Ping?
Quoted 32 lines
Signed-off-by OGAWA Hirofumi <[email protected]>---
drivers/nfc/port100.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)diff -puN
drivers/nfc/port100.c~nfc-add-rcs380pdrivers/nfc/port100.cdrivers/nfc/port100.c renamed from drivers/nfc/port100.c~nfc-add-rcs380p +5
-3@@ -21,8 +21,9 @@#define VERSION "0.1" -#define SONY_VENDOR_ID 0x054c -#define RCS380_PRODUCT_ID 0x06c1 +#define SONY_VENDOR_ID 0x054c +#define RCS380S_PRODUCT_ID 0x06c1 +#define RCS380P_PRODUCT_ID 0x06c3#define PORT100_PROTOCOLS (NFC_PROTO_JEWEL_MASK | \ NFC_PROTO_MIFARE_MASK | \@@ -1477,7 +1478,8 @@ static struct nfc_digital_ops port100_di };static const struct usb_device_id port100_table[] = { - {USB_DEVICE (SONY_VENDOR_ID ,RCS380_PRODUCT_ID ), }, + {USB_DEVICE (SONY_VENDOR_ID ,RCS380S_PRODUCT_ID ), }, + {USB_DEVICE (SONY_VENDOR_ID ,RCS380P_PRODUCT_ID ), }, { } };MODULE_DEVICE_TABLE (usb, port100_table);_
Signature · 1 line
OGAWA Hirofumi <[email protected]>
Hi Hirofumi,
Quoted 7 lines · OGAWA Hirofumi
Signed-off-by OGAWA Hirofumi <[email protected]>---
drivers/nfc/port100.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
All 4 patches applied, thanks.
Cheers,
Samuel.