2017-11-03 18:28:30 +08:00
|
|
|
// SPDX-License-Identifier: GPL-2.0+
|
2005-06-28 04:44:22 +08:00
|
|
|
/**
|
|
|
|
* Generic USB driver for report based interrupt in/out devices
|
|
|
|
* like LD Didactic's USB devices. LD Didactic's USB devices are
|
|
|
|
* HID devices which do not use HID report definitons (they use
|
|
|
|
* raw interrupt in and our reports only for communication).
|
|
|
|
*
|
|
|
|
* This driver uses a ring buffer for time critical reading of
|
|
|
|
* interrupt in reports and provides read and write methods for
|
|
|
|
* raw interrupt reports (similar to the Windows HID driver).
|
|
|
|
* Devices based on the book USB COMPLETE by Jan Axelson may need
|
|
|
|
* such a compatibility to the Windows HID driver.
|
|
|
|
*
|
|
|
|
* Copyright (C) 2005 Michael Hund <mhund@ld-didactic.de>
|
|
|
|
*
|
|
|
|
* Derived from Lego USB Tower driver
|
|
|
|
* Copyright (C) 2003 David Glance <advidgsf@sourceforge.net>
|
|
|
|
* 2001-2004 Juergen Stuber <starblue@users.sourceforge.net>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/module.h>
|
2006-01-11 22:55:29 +08:00
|
|
|
#include <linux/mutex.h>
|
2005-06-28 04:44:22 +08:00
|
|
|
|
2016-12-25 03:46:01 +08:00
|
|
|
#include <linux/uaccess.h>
|
2005-06-28 04:44:22 +08:00
|
|
|
#include <linux/input.h>
|
|
|
|
#include <linux/usb.h>
|
|
|
|
#include <linux/poll.h>
|
|
|
|
|
|
|
|
/* Define these values to match your devices */
|
|
|
|
#define USB_VENDOR_ID_LD 0x0f11 /* USB Vendor ID of LD Didactic GmbH */
|
2011-05-04 01:12:00 +08:00
|
|
|
#define USB_DEVICE_ID_LD_CASSY 0x1000 /* USB Product ID of CASSY-S modules with 8 bytes endpoint size */
|
|
|
|
#define USB_DEVICE_ID_LD_CASSY2 0x1001 /* USB Product ID of CASSY-S modules with 64 bytes endpoint size */
|
2006-02-02 16:36:43 +08:00
|
|
|
#define USB_DEVICE_ID_LD_POCKETCASSY 0x1010 /* USB Product ID of Pocket-CASSY */
|
2011-05-04 01:12:00 +08:00
|
|
|
#define USB_DEVICE_ID_LD_POCKETCASSY2 0x1011 /* USB Product ID of Pocket-CASSY 2 (reserved) */
|
2006-02-02 16:36:43 +08:00
|
|
|
#define USB_DEVICE_ID_LD_MOBILECASSY 0x1020 /* USB Product ID of Mobile-CASSY */
|
2011-05-04 01:12:00 +08:00
|
|
|
#define USB_DEVICE_ID_LD_MOBILECASSY2 0x1021 /* USB Product ID of Mobile-CASSY 2 (reserved) */
|
|
|
|
#define USB_DEVICE_ID_LD_MICROCASSYVOLTAGE 0x1031 /* USB Product ID of Micro-CASSY Voltage */
|
|
|
|
#define USB_DEVICE_ID_LD_MICROCASSYCURRENT 0x1032 /* USB Product ID of Micro-CASSY Current */
|
|
|
|
#define USB_DEVICE_ID_LD_MICROCASSYTIME 0x1033 /* USB Product ID of Micro-CASSY Time (reserved) */
|
|
|
|
#define USB_DEVICE_ID_LD_MICROCASSYTEMPERATURE 0x1035 /* USB Product ID of Micro-CASSY Temperature */
|
|
|
|
#define USB_DEVICE_ID_LD_MICROCASSYPH 0x1038 /* USB Product ID of Micro-CASSY pH */
|
2018-02-09 17:12:06 +08:00
|
|
|
#define USB_DEVICE_ID_LD_POWERANALYSERCASSY 0x1040 /* USB Product ID of Power Analyser CASSY */
|
|
|
|
#define USB_DEVICE_ID_LD_CONVERTERCONTROLLERCASSY 0x1042 /* USB Product ID of Converter Controller CASSY */
|
|
|
|
#define USB_DEVICE_ID_LD_MACHINETESTCASSY 0x1043 /* USB Product ID of Machine Test CASSY */
|
2006-02-02 16:36:43 +08:00
|
|
|
#define USB_DEVICE_ID_LD_JWM 0x1080 /* USB Product ID of Joule and Wattmeter */
|
|
|
|
#define USB_DEVICE_ID_LD_DMMP 0x1081 /* USB Product ID of Digital Multimeter P (reserved) */
|
|
|
|
#define USB_DEVICE_ID_LD_UMIP 0x1090 /* USB Product ID of UMI P */
|
2011-05-04 01:12:00 +08:00
|
|
|
#define USB_DEVICE_ID_LD_UMIC 0x10A0 /* USB Product ID of UMI C */
|
|
|
|
#define USB_DEVICE_ID_LD_UMIB 0x10B0 /* USB Product ID of UMI B */
|
|
|
|
#define USB_DEVICE_ID_LD_XRAY 0x1100 /* USB Product ID of X-Ray Apparatus 55481 */
|
|
|
|
#define USB_DEVICE_ID_LD_XRAY2 0x1101 /* USB Product ID of X-Ray Apparatus 554800 */
|
|
|
|
#define USB_DEVICE_ID_LD_XRAYCT 0x1110 /* USB Product ID of X-Ray Apparatus CT 554821*/
|
2006-02-02 16:36:43 +08:00
|
|
|
#define USB_DEVICE_ID_LD_VIDEOCOM 0x1200 /* USB Product ID of VideoCom */
|
2011-05-04 01:12:00 +08:00
|
|
|
#define USB_DEVICE_ID_LD_MOTOR 0x1210 /* USB Product ID of Motor (reserved) */
|
2006-02-02 16:36:43 +08:00
|
|
|
#define USB_DEVICE_ID_LD_COM3LAB 0x2000 /* USB Product ID of COM3LAB */
|
|
|
|
#define USB_DEVICE_ID_LD_TELEPORT 0x2010 /* USB Product ID of Terminal Adapter */
|
|
|
|
#define USB_DEVICE_ID_LD_NETWORKANALYSER 0x2020 /* USB Product ID of Network Analyser */
|
|
|
|
#define USB_DEVICE_ID_LD_POWERCONTROL 0x2030 /* USB Product ID of Converter Control Unit */
|
|
|
|
#define USB_DEVICE_ID_LD_MACHINETEST 0x2040 /* USB Product ID of Machine Test System */
|
2011-05-04 01:12:00 +08:00
|
|
|
#define USB_DEVICE_ID_LD_MOSTANALYSER 0x2050 /* USB Product ID of MOST Protocol Analyser */
|
|
|
|
#define USB_DEVICE_ID_LD_MOSTANALYSER2 0x2051 /* USB Product ID of MOST Protocol Analyser 2 */
|
|
|
|
#define USB_DEVICE_ID_LD_ABSESP 0x2060 /* USB Product ID of ABS ESP */
|
|
|
|
#define USB_DEVICE_ID_LD_AUTODATABUS 0x2070 /* USB Product ID of Automotive Data Buses */
|
|
|
|
#define USB_DEVICE_ID_LD_MCT 0x2080 /* USB Product ID of Microcontroller technique */
|
|
|
|
#define USB_DEVICE_ID_LD_HYBRID 0x2090 /* USB Product ID of Automotive Hybrid */
|
|
|
|
#define USB_DEVICE_ID_LD_HEATCONTROL 0x20A0 /* USB Product ID of Heat control */
|
2005-06-28 04:44:22 +08:00
|
|
|
|
|
|
|
#ifdef CONFIG_USB_DYNAMIC_MINORS
|
|
|
|
#define USB_LD_MINOR_BASE 0
|
|
|
|
#else
|
|
|
|
#define USB_LD_MINOR_BASE 176
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* table of devices that work with this driver */
|
2010-01-10 22:34:45 +08:00
|
|
|
static const struct usb_device_id ld_usb_table[] = {
|
2006-02-02 16:36:43 +08:00
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY) },
|
2011-05-04 01:12:00 +08:00
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY2) },
|
2006-02-02 16:36:43 +08:00
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY) },
|
2011-05-04 01:12:00 +08:00
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY2) },
|
2006-02-02 16:36:43 +08:00
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOBILECASSY) },
|
2011-05-04 01:12:00 +08:00
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOBILECASSY2) },
|
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MICROCASSYVOLTAGE) },
|
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MICROCASSYCURRENT) },
|
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MICROCASSYTIME) },
|
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MICROCASSYTEMPERATURE) },
|
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MICROCASSYPH) },
|
2018-02-09 17:12:06 +08:00
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POWERANALYSERCASSY) },
|
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CONVERTERCONTROLLERCASSY) },
|
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MACHINETESTCASSY) },
|
2006-02-02 16:36:43 +08:00
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_JWM) },
|
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_DMMP) },
|
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_UMIP) },
|
2011-05-04 01:12:00 +08:00
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_UMIC) },
|
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_UMIB) },
|
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY) },
|
2006-02-02 16:36:43 +08:00
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY2) },
|
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_VIDEOCOM) },
|
2011-05-04 01:12:00 +08:00
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOTOR) },
|
2006-02-02 16:36:43 +08:00
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_COM3LAB) },
|
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_TELEPORT) },
|
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_NETWORKANALYSER) },
|
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POWERCONTROL) },
|
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MACHINETEST) },
|
2011-05-04 01:12:00 +08:00
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOSTANALYSER) },
|
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOSTANALYSER2) },
|
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_ABSESP) },
|
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_AUTODATABUS) },
|
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MCT) },
|
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) },
|
|
|
|
{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HEATCONTROL) },
|
2005-06-28 04:44:22 +08:00
|
|
|
{ } /* Terminating entry */
|
|
|
|
};
|
|
|
|
MODULE_DEVICE_TABLE(usb, ld_usb_table);
|
|
|
|
MODULE_AUTHOR("Michael Hund <mhund@ld-didactic.de>");
|
|
|
|
MODULE_DESCRIPTION("LD USB Driver");
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
MODULE_SUPPORTED_DEVICE("LD USB Devices");
|
|
|
|
|
|
|
|
/* All interrupt in transfers are collected in a ring buffer to
|
|
|
|
* avoid racing conditions and get better performance of the driver.
|
|
|
|
*/
|
|
|
|
static int ring_buffer_size = 128;
|
2017-03-04 10:42:32 +08:00
|
|
|
module_param(ring_buffer_size, int, 0000);
|
2005-06-28 04:44:22 +08:00
|
|
|
MODULE_PARM_DESC(ring_buffer_size, "Read ring buffer size in reports");
|
|
|
|
|
|
|
|
/* The write_buffer can contain more than one interrupt out transfer.
|
|
|
|
*/
|
|
|
|
static int write_buffer_size = 10;
|
2017-03-04 10:42:32 +08:00
|
|
|
module_param(write_buffer_size, int, 0000);
|
2005-06-28 04:44:22 +08:00
|
|
|
MODULE_PARM_DESC(write_buffer_size, "Write buffer size in reports");
|
|
|
|
|
|
|
|
/* As of kernel version 2.6.4 ehci-hcd uses an
|
|
|
|
* "only one interrupt transfer per frame" shortcut
|
|
|
|
* to simplify the scheduling of periodic transfers.
|
|
|
|
* This conflicts with our standard 1ms intervals for in and out URBs.
|
|
|
|
* We use default intervals of 2ms for in and 2ms for out transfers,
|
|
|
|
* which should be fast enough.
|
|
|
|
* Increase the interval to allow more devices that do interrupt transfers,
|
|
|
|
* or set to 1 to use the standard interval from the endpoint descriptors.
|
|
|
|
*/
|
|
|
|
static int min_interrupt_in_interval = 2;
|
2017-03-04 10:42:32 +08:00
|
|
|
module_param(min_interrupt_in_interval, int, 0000);
|
2005-06-28 04:44:22 +08:00
|
|
|
MODULE_PARM_DESC(min_interrupt_in_interval, "Minimum interrupt in interval in ms");
|
|
|
|
|
|
|
|
static int min_interrupt_out_interval = 2;
|
2017-03-04 10:42:32 +08:00
|
|
|
module_param(min_interrupt_out_interval, int, 0000);
|
2005-06-28 04:44:22 +08:00
|
|
|
MODULE_PARM_DESC(min_interrupt_out_interval, "Minimum interrupt out interval in ms");
|
|
|
|
|
|
|
|
/* Structure to hold all of our device specific stuff */
|
|
|
|
struct ld_usb {
|
2008-04-29 01:34:56 +08:00
|
|
|
struct mutex mutex; /* locks this structure */
|
2017-03-04 10:42:33 +08:00
|
|
|
struct usb_interface *intf; /* save off the usb interface pointer */
|
2005-06-28 04:44:22 +08:00
|
|
|
|
|
|
|
int open_count; /* number of times this port has been opened */
|
|
|
|
|
2017-03-04 10:42:33 +08:00
|
|
|
char *ring_buffer;
|
2005-06-28 04:44:22 +08:00
|
|
|
unsigned int ring_head;
|
|
|
|
unsigned int ring_tail;
|
|
|
|
|
|
|
|
wait_queue_head_t read_wait;
|
|
|
|
wait_queue_head_t write_wait;
|
|
|
|
|
2017-03-04 10:42:33 +08:00
|
|
|
char *interrupt_in_buffer;
|
|
|
|
struct usb_endpoint_descriptor *interrupt_in_endpoint;
|
|
|
|
struct urb *interrupt_in_urb;
|
2005-06-28 04:44:22 +08:00
|
|
|
int interrupt_in_interval;
|
|
|
|
size_t interrupt_in_endpoint_size;
|
|
|
|
int interrupt_in_running;
|
|
|
|
int interrupt_in_done;
|
2007-05-04 15:23:40 +08:00
|
|
|
int buffer_overflow;
|
|
|
|
spinlock_t rbsl;
|
2005-06-28 04:44:22 +08:00
|
|
|
|
2017-03-04 10:42:33 +08:00
|
|
|
char *interrupt_out_buffer;
|
|
|
|
struct usb_endpoint_descriptor *interrupt_out_endpoint;
|
|
|
|
struct urb *interrupt_out_urb;
|
2005-06-28 04:44:22 +08:00
|
|
|
int interrupt_out_interval;
|
|
|
|
size_t interrupt_out_endpoint_size;
|
|
|
|
int interrupt_out_busy;
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct usb_driver ld_usb_driver;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ld_usb_abort_transfers
|
|
|
|
* aborts transfers and frees associated data structures
|
|
|
|
*/
|
|
|
|
static void ld_usb_abort_transfers(struct ld_usb *dev)
|
|
|
|
{
|
|
|
|
/* shutdown transfer */
|
|
|
|
if (dev->interrupt_in_running) {
|
|
|
|
dev->interrupt_in_running = 0;
|
|
|
|
if (dev->intf)
|
|
|
|
usb_kill_urb(dev->interrupt_in_urb);
|
|
|
|
}
|
|
|
|
if (dev->interrupt_out_busy)
|
|
|
|
if (dev->intf)
|
|
|
|
usb_kill_urb(dev->interrupt_out_urb);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ld_usb_delete
|
|
|
|
*/
|
|
|
|
static void ld_usb_delete(struct ld_usb *dev)
|
|
|
|
{
|
|
|
|
ld_usb_abort_transfers(dev);
|
|
|
|
|
|
|
|
/* free data structures */
|
|
|
|
usb_free_urb(dev->interrupt_in_urb);
|
|
|
|
usb_free_urb(dev->interrupt_out_urb);
|
|
|
|
kfree(dev->ring_buffer);
|
|
|
|
kfree(dev->interrupt_in_buffer);
|
|
|
|
kfree(dev->interrupt_out_buffer);
|
|
|
|
kfree(dev);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ld_usb_interrupt_in_callback
|
|
|
|
*/
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 21:55:46 +08:00
|
|
|
static void ld_usb_interrupt_in_callback(struct urb *urb)
|
2005-06-28 04:44:22 +08:00
|
|
|
{
|
|
|
|
struct ld_usb *dev = urb->context;
|
|
|
|
size_t *actual_buffer;
|
|
|
|
unsigned int next_ring_head;
|
2007-07-19 01:58:02 +08:00
|
|
|
int status = urb->status;
|
2018-06-25 06:08:44 +08:00
|
|
|
unsigned long flags;
|
2005-06-28 04:44:22 +08:00
|
|
|
int retval;
|
|
|
|
|
2007-07-19 01:58:02 +08:00
|
|
|
if (status) {
|
|
|
|
if (status == -ENOENT ||
|
|
|
|
status == -ECONNRESET ||
|
|
|
|
status == -ESHUTDOWN) {
|
2005-06-28 04:44:22 +08:00
|
|
|
goto exit;
|
|
|
|
} else {
|
2013-06-27 07:30:38 +08:00
|
|
|
dev_dbg(&dev->intf->dev,
|
|
|
|
"%s: nonzero status received: %d\n", __func__,
|
|
|
|
status);
|
2018-06-25 06:08:44 +08:00
|
|
|
spin_lock_irqsave(&dev->rbsl, flags);
|
2005-06-28 04:44:22 +08:00
|
|
|
goto resubmit; /* maybe we can recover */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-06-25 06:08:44 +08:00
|
|
|
spin_lock_irqsave(&dev->rbsl, flags);
|
2005-06-28 04:44:22 +08:00
|
|
|
if (urb->actual_length > 0) {
|
|
|
|
next_ring_head = (dev->ring_head+1) % ring_buffer_size;
|
|
|
|
if (next_ring_head != dev->ring_tail) {
|
2017-03-04 10:42:33 +08:00
|
|
|
actual_buffer = (size_t *)(dev->ring_buffer + dev->ring_head * (sizeof(size_t)+dev->interrupt_in_endpoint_size));
|
2005-06-28 04:44:22 +08:00
|
|
|
/* actual_buffer gets urb->actual_length + interrupt_in_buffer */
|
|
|
|
*actual_buffer = urb->actual_length;
|
|
|
|
memcpy(actual_buffer+1, dev->interrupt_in_buffer, urb->actual_length);
|
|
|
|
dev->ring_head = next_ring_head;
|
2013-06-27 07:30:38 +08:00
|
|
|
dev_dbg(&dev->intf->dev, "%s: received %d bytes\n",
|
|
|
|
__func__, urb->actual_length);
|
2007-05-04 15:23:40 +08:00
|
|
|
} else {
|
2005-06-28 04:44:22 +08:00
|
|
|
dev_warn(&dev->intf->dev,
|
|
|
|
"Ring buffer overflow, %d bytes dropped\n",
|
|
|
|
urb->actual_length);
|
2007-05-04 15:23:40 +08:00
|
|
|
dev->buffer_overflow = 1;
|
|
|
|
}
|
2005-06-28 04:44:22 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
resubmit:
|
|
|
|
/* resubmit if we're still running */
|
2007-05-04 15:23:40 +08:00
|
|
|
if (dev->interrupt_in_running && !dev->buffer_overflow && dev->intf) {
|
2005-06-28 04:44:22 +08:00
|
|
|
retval = usb_submit_urb(dev->interrupt_in_urb, GFP_ATOMIC);
|
2007-05-04 15:23:40 +08:00
|
|
|
if (retval) {
|
2005-06-28 04:44:22 +08:00
|
|
|
dev_err(&dev->intf->dev,
|
|
|
|
"usb_submit_urb failed (%d)\n", retval);
|
2007-05-04 15:23:40 +08:00
|
|
|
dev->buffer_overflow = 1;
|
|
|
|
}
|
2005-06-28 04:44:22 +08:00
|
|
|
}
|
2018-06-25 06:08:44 +08:00
|
|
|
spin_unlock_irqrestore(&dev->rbsl, flags);
|
2005-06-28 04:44:22 +08:00
|
|
|
exit:
|
|
|
|
dev->interrupt_in_done = 1;
|
|
|
|
wake_up_interruptible(&dev->read_wait);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ld_usb_interrupt_out_callback
|
|
|
|
*/
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 21:55:46 +08:00
|
|
|
static void ld_usb_interrupt_out_callback(struct urb *urb)
|
2005-06-28 04:44:22 +08:00
|
|
|
{
|
|
|
|
struct ld_usb *dev = urb->context;
|
2007-07-19 01:58:02 +08:00
|
|
|
int status = urb->status;
|
2005-06-28 04:44:22 +08:00
|
|
|
|
|
|
|
/* sync/async unlink faults aren't errors */
|
2007-07-19 01:58:02 +08:00
|
|
|
if (status && !(status == -ENOENT ||
|
|
|
|
status == -ECONNRESET ||
|
|
|
|
status == -ESHUTDOWN))
|
2013-06-27 07:30:38 +08:00
|
|
|
dev_dbg(&dev->intf->dev,
|
|
|
|
"%s - nonzero write interrupt status received: %d\n",
|
|
|
|
__func__, status);
|
2005-06-28 04:44:22 +08:00
|
|
|
|
|
|
|
dev->interrupt_out_busy = 0;
|
|
|
|
wake_up_interruptible(&dev->write_wait);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ld_usb_open
|
|
|
|
*/
|
|
|
|
static int ld_usb_open(struct inode *inode, struct file *file)
|
|
|
|
{
|
|
|
|
struct ld_usb *dev;
|
|
|
|
int subminor;
|
USB: prevent char device open/deregister race
This patch (as908) adds central protection in usbcore for the
prototypical race between opening and unregistering a char device.
The spinlock used to protect the minor-numbers array is replaced with
an rwsem, which can remain locked across a call to a driver's open()
method. This guarantees that open() and deregister() will be mutually
exclusive.
The private locks currently used in several individual drivers for
this purpose are no longer necessary, and the patch removes them. The
following USB drivers are affected: usblcd, idmouse, auerswald,
legousbtower, sisusbvga/sisusb, ldusb, adutux, iowarrior, and
usb-skeleton.
As a side effect of this change, usb_deregister_dev() must not be
called while holding a lock that is acquired by open(). Unfortunately
a number of drivers do this, but luckily the solution is simple: call
usb_deregister_dev() before acquiring the lock.
In addition to these changes (and their consequent code
simplifications), the patch fixes a use-after-free bug in adutux and a
race between open() and release() in iowarrior.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-05-22 23:46:41 +08:00
|
|
|
int retval;
|
2005-06-28 04:44:22 +08:00
|
|
|
struct usb_interface *interface;
|
|
|
|
|
|
|
|
nonseekable_open(inode, file);
|
|
|
|
subminor = iminor(inode);
|
|
|
|
|
|
|
|
interface = usb_find_interface(&ld_usb_driver, subminor);
|
|
|
|
|
|
|
|
if (!interface) {
|
2012-04-21 07:53:47 +08:00
|
|
|
printk(KERN_ERR "%s - error, can't find device for minor %d\n",
|
|
|
|
__func__, subminor);
|
USB: prevent char device open/deregister race
This patch (as908) adds central protection in usbcore for the
prototypical race between opening and unregistering a char device.
The spinlock used to protect the minor-numbers array is replaced with
an rwsem, which can remain locked across a call to a driver's open()
method. This guarantees that open() and deregister() will be mutually
exclusive.
The private locks currently used in several individual drivers for
this purpose are no longer necessary, and the patch removes them. The
following USB drivers are affected: usblcd, idmouse, auerswald,
legousbtower, sisusbvga/sisusb, ldusb, adutux, iowarrior, and
usb-skeleton.
As a side effect of this change, usb_deregister_dev() must not be
called while holding a lock that is acquired by open(). Unfortunately
a number of drivers do this, but luckily the solution is simple: call
usb_deregister_dev() before acquiring the lock.
In addition to these changes (and their consequent code
simplifications), the patch fixes a use-after-free bug in adutux and a
race between open() and release() in iowarrior.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-05-22 23:46:41 +08:00
|
|
|
return -ENODEV;
|
2005-06-28 04:44:22 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
dev = usb_get_intfdata(interface);
|
|
|
|
|
2010-01-14 23:12:27 +08:00
|
|
|
if (!dev)
|
USB: prevent char device open/deregister race
This patch (as908) adds central protection in usbcore for the
prototypical race between opening and unregistering a char device.
The spinlock used to protect the minor-numbers array is replaced with
an rwsem, which can remain locked across a call to a driver's open()
method. This guarantees that open() and deregister() will be mutually
exclusive.
The private locks currently used in several individual drivers for
this purpose are no longer necessary, and the patch removes them. The
following USB drivers are affected: usblcd, idmouse, auerswald,
legousbtower, sisusbvga/sisusb, ldusb, adutux, iowarrior, and
usb-skeleton.
As a side effect of this change, usb_deregister_dev() must not be
called while holding a lock that is acquired by open(). Unfortunately
a number of drivers do this, but luckily the solution is simple: call
usb_deregister_dev() before acquiring the lock.
In addition to these changes (and their consequent code
simplifications), the patch fixes a use-after-free bug in adutux and a
race between open() and release() in iowarrior.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-05-22 23:46:41 +08:00
|
|
|
return -ENODEV;
|
2005-06-28 04:44:22 +08:00
|
|
|
|
|
|
|
/* lock this device */
|
2010-01-14 23:12:27 +08:00
|
|
|
if (mutex_lock_interruptible(&dev->mutex))
|
USB: prevent char device open/deregister race
This patch (as908) adds central protection in usbcore for the
prototypical race between opening and unregistering a char device.
The spinlock used to protect the minor-numbers array is replaced with
an rwsem, which can remain locked across a call to a driver's open()
method. This guarantees that open() and deregister() will be mutually
exclusive.
The private locks currently used in several individual drivers for
this purpose are no longer necessary, and the patch removes them. The
following USB drivers are affected: usblcd, idmouse, auerswald,
legousbtower, sisusbvga/sisusb, ldusb, adutux, iowarrior, and
usb-skeleton.
As a side effect of this change, usb_deregister_dev() must not be
called while holding a lock that is acquired by open(). Unfortunately
a number of drivers do this, but luckily the solution is simple: call
usb_deregister_dev() before acquiring the lock.
In addition to these changes (and their consequent code
simplifications), the patch fixes a use-after-free bug in adutux and a
race between open() and release() in iowarrior.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-05-22 23:46:41 +08:00
|
|
|
return -ERESTARTSYS;
|
2005-06-28 04:44:22 +08:00
|
|
|
|
|
|
|
/* allow opening only once */
|
|
|
|
if (dev->open_count) {
|
|
|
|
retval = -EBUSY;
|
|
|
|
goto unlock_exit;
|
|
|
|
}
|
|
|
|
dev->open_count = 1;
|
|
|
|
|
|
|
|
/* initialize in direction */
|
|
|
|
dev->ring_head = 0;
|
|
|
|
dev->ring_tail = 0;
|
2007-05-04 15:23:40 +08:00
|
|
|
dev->buffer_overflow = 0;
|
2005-06-28 04:44:22 +08:00
|
|
|
usb_fill_int_urb(dev->interrupt_in_urb,
|
|
|
|
interface_to_usbdev(interface),
|
|
|
|
usb_rcvintpipe(interface_to_usbdev(interface),
|
|
|
|
dev->interrupt_in_endpoint->bEndpointAddress),
|
|
|
|
dev->interrupt_in_buffer,
|
|
|
|
dev->interrupt_in_endpoint_size,
|
|
|
|
ld_usb_interrupt_in_callback,
|
|
|
|
dev,
|
|
|
|
dev->interrupt_in_interval);
|
|
|
|
|
|
|
|
dev->interrupt_in_running = 1;
|
|
|
|
dev->interrupt_in_done = 0;
|
|
|
|
|
|
|
|
retval = usb_submit_urb(dev->interrupt_in_urb, GFP_KERNEL);
|
|
|
|
if (retval) {
|
|
|
|
dev_err(&interface->dev, "Couldn't submit interrupt_in_urb %d\n", retval);
|
|
|
|
dev->interrupt_in_running = 0;
|
|
|
|
dev->open_count = 0;
|
|
|
|
goto unlock_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* save device in the file's private structure */
|
|
|
|
file->private_data = dev;
|
|
|
|
|
|
|
|
unlock_exit:
|
2008-04-29 01:34:56 +08:00
|
|
|
mutex_unlock(&dev->mutex);
|
2005-06-28 04:44:22 +08:00
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ld_usb_release
|
|
|
|
*/
|
|
|
|
static int ld_usb_release(struct inode *inode, struct file *file)
|
|
|
|
{
|
|
|
|
struct ld_usb *dev;
|
|
|
|
int retval = 0;
|
|
|
|
|
|
|
|
dev = file->private_data;
|
|
|
|
|
|
|
|
if (dev == NULL) {
|
|
|
|
retval = -ENODEV;
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
2008-04-29 01:34:56 +08:00
|
|
|
if (mutex_lock_interruptible(&dev->mutex)) {
|
2005-06-28 04:44:22 +08:00
|
|
|
retval = -ERESTARTSYS;
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dev->open_count != 1) {
|
|
|
|
retval = -ENODEV;
|
|
|
|
goto unlock_exit;
|
|
|
|
}
|
|
|
|
if (dev->intf == NULL) {
|
|
|
|
/* the device was unplugged before the file was released */
|
2008-04-29 01:34:56 +08:00
|
|
|
mutex_unlock(&dev->mutex);
|
2005-06-28 04:44:22 +08:00
|
|
|
/* unlock here as ld_usb_delete frees dev */
|
|
|
|
ld_usb_delete(dev);
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* wait until write transfer is finished */
|
|
|
|
if (dev->interrupt_out_busy)
|
|
|
|
wait_event_interruptible_timeout(dev->write_wait, !dev->interrupt_out_busy, 2 * HZ);
|
|
|
|
ld_usb_abort_transfers(dev);
|
|
|
|
dev->open_count = 0;
|
|
|
|
|
|
|
|
unlock_exit:
|
2008-04-29 01:34:56 +08:00
|
|
|
mutex_unlock(&dev->mutex);
|
2005-06-28 04:44:22 +08:00
|
|
|
|
|
|
|
exit:
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ld_usb_poll
|
|
|
|
*/
|
2017-07-03 18:39:46 +08:00
|
|
|
static __poll_t ld_usb_poll(struct file *file, poll_table *wait)
|
2005-06-28 04:44:22 +08:00
|
|
|
{
|
|
|
|
struct ld_usb *dev;
|
2017-07-03 18:39:46 +08:00
|
|
|
__poll_t mask = 0;
|
2005-06-28 04:44:22 +08:00
|
|
|
|
|
|
|
dev = file->private_data;
|
|
|
|
|
2009-07-02 23:01:06 +08:00
|
|
|
if (!dev->intf)
|
2018-02-12 06:34:03 +08:00
|
|
|
return EPOLLERR | EPOLLHUP;
|
2009-07-02 23:01:06 +08:00
|
|
|
|
2005-06-28 04:44:22 +08:00
|
|
|
poll_wait(file, &dev->read_wait, wait);
|
|
|
|
poll_wait(file, &dev->write_wait, wait);
|
|
|
|
|
|
|
|
if (dev->ring_head != dev->ring_tail)
|
2018-02-12 06:34:03 +08:00
|
|
|
mask |= EPOLLIN | EPOLLRDNORM;
|
2005-06-28 04:44:22 +08:00
|
|
|
if (!dev->interrupt_out_busy)
|
2018-02-12 06:34:03 +08:00
|
|
|
mask |= EPOLLOUT | EPOLLWRNORM;
|
2005-06-28 04:44:22 +08:00
|
|
|
|
|
|
|
return mask;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ld_usb_read
|
|
|
|
*/
|
|
|
|
static ssize_t ld_usb_read(struct file *file, char __user *buffer, size_t count,
|
|
|
|
loff_t *ppos)
|
|
|
|
{
|
|
|
|
struct ld_usb *dev;
|
|
|
|
size_t *actual_buffer;
|
|
|
|
size_t bytes_to_read;
|
|
|
|
int retval = 0;
|
2007-05-04 15:23:40 +08:00
|
|
|
int rv;
|
2005-06-28 04:44:22 +08:00
|
|
|
|
|
|
|
dev = file->private_data;
|
|
|
|
|
|
|
|
/* verify that we actually have some data to read */
|
|
|
|
if (count == 0)
|
|
|
|
goto exit;
|
|
|
|
|
|
|
|
/* lock this object */
|
2008-04-29 01:34:56 +08:00
|
|
|
if (mutex_lock_interruptible(&dev->mutex)) {
|
2005-06-28 04:44:22 +08:00
|
|
|
retval = -ERESTARTSYS;
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* verify that the device wasn't unplugged */
|
|
|
|
if (dev->intf == NULL) {
|
|
|
|
retval = -ENODEV;
|
2012-04-21 07:53:47 +08:00
|
|
|
printk(KERN_ERR "ldusb: No device or device unplugged %d\n", retval);
|
2005-06-28 04:44:22 +08:00
|
|
|
goto unlock_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* wait for data */
|
2007-05-04 15:23:40 +08:00
|
|
|
spin_lock_irq(&dev->rbsl);
|
2005-06-28 04:44:22 +08:00
|
|
|
if (dev->ring_head == dev->ring_tail) {
|
2007-05-04 15:23:40 +08:00
|
|
|
dev->interrupt_in_done = 0;
|
|
|
|
spin_unlock_irq(&dev->rbsl);
|
2005-06-28 04:44:22 +08:00
|
|
|
if (file->f_flags & O_NONBLOCK) {
|
|
|
|
retval = -EAGAIN;
|
|
|
|
goto unlock_exit;
|
|
|
|
}
|
|
|
|
retval = wait_event_interruptible(dev->read_wait, dev->interrupt_in_done);
|
|
|
|
if (retval < 0)
|
|
|
|
goto unlock_exit;
|
2007-05-04 15:23:40 +08:00
|
|
|
} else {
|
|
|
|
spin_unlock_irq(&dev->rbsl);
|
2005-06-28 04:44:22 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* actual_buffer contains actual_length + interrupt_in_buffer */
|
2017-03-04 10:42:33 +08:00
|
|
|
actual_buffer = (size_t *)(dev->ring_buffer + dev->ring_tail * (sizeof(size_t)+dev->interrupt_in_endpoint_size));
|
2005-06-28 04:44:22 +08:00
|
|
|
bytes_to_read = min(count, *actual_buffer);
|
|
|
|
if (bytes_to_read < *actual_buffer)
|
2005-08-14 21:24:26 +08:00
|
|
|
dev_warn(&dev->intf->dev, "Read buffer overflow, %zd bytes dropped\n",
|
2005-06-28 04:44:22 +08:00
|
|
|
*actual_buffer-bytes_to_read);
|
|
|
|
|
|
|
|
/* copy one interrupt_in_buffer from ring_buffer into userspace */
|
|
|
|
if (copy_to_user(buffer, actual_buffer+1, bytes_to_read)) {
|
|
|
|
retval = -EFAULT;
|
|
|
|
goto unlock_exit;
|
|
|
|
}
|
|
|
|
dev->ring_tail = (dev->ring_tail+1) % ring_buffer_size;
|
|
|
|
|
|
|
|
retval = bytes_to_read;
|
|
|
|
|
2007-05-04 15:23:40 +08:00
|
|
|
spin_lock_irq(&dev->rbsl);
|
|
|
|
if (dev->buffer_overflow) {
|
|
|
|
dev->buffer_overflow = 0;
|
|
|
|
spin_unlock_irq(&dev->rbsl);
|
|
|
|
rv = usb_submit_urb(dev->interrupt_in_urb, GFP_KERNEL);
|
|
|
|
if (rv < 0)
|
|
|
|
dev->buffer_overflow = 1;
|
|
|
|
} else {
|
|
|
|
spin_unlock_irq(&dev->rbsl);
|
|
|
|
}
|
|
|
|
|
2005-06-28 04:44:22 +08:00
|
|
|
unlock_exit:
|
|
|
|
/* unlock the device */
|
2008-04-29 01:34:56 +08:00
|
|
|
mutex_unlock(&dev->mutex);
|
2005-06-28 04:44:22 +08:00
|
|
|
|
|
|
|
exit:
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ld_usb_write
|
|
|
|
*/
|
|
|
|
static ssize_t ld_usb_write(struct file *file, const char __user *buffer,
|
|
|
|
size_t count, loff_t *ppos)
|
|
|
|
{
|
|
|
|
struct ld_usb *dev;
|
|
|
|
size_t bytes_to_write;
|
|
|
|
int retval = 0;
|
|
|
|
|
|
|
|
dev = file->private_data;
|
|
|
|
|
|
|
|
/* verify that we actually have some data to write */
|
|
|
|
if (count == 0)
|
|
|
|
goto exit;
|
|
|
|
|
|
|
|
/* lock this object */
|
2008-04-29 01:34:56 +08:00
|
|
|
if (mutex_lock_interruptible(&dev->mutex)) {
|
2005-06-28 04:44:22 +08:00
|
|
|
retval = -ERESTARTSYS;
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* verify that the device wasn't unplugged */
|
|
|
|
if (dev->intf == NULL) {
|
|
|
|
retval = -ENODEV;
|
2012-04-21 07:53:47 +08:00
|
|
|
printk(KERN_ERR "ldusb: No device or device unplugged %d\n", retval);
|
2005-06-28 04:44:22 +08:00
|
|
|
goto unlock_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* wait until previous transfer is finished */
|
|
|
|
if (dev->interrupt_out_busy) {
|
|
|
|
if (file->f_flags & O_NONBLOCK) {
|
|
|
|
retval = -EAGAIN;
|
|
|
|
goto unlock_exit;
|
|
|
|
}
|
|
|
|
retval = wait_event_interruptible(dev->write_wait, !dev->interrupt_out_busy);
|
|
|
|
if (retval < 0) {
|
|
|
|
goto unlock_exit;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* write the data into interrupt_out_buffer from userspace */
|
|
|
|
bytes_to_write = min(count, write_buffer_size*dev->interrupt_out_endpoint_size);
|
|
|
|
if (bytes_to_write < count)
|
2017-03-04 10:42:34 +08:00
|
|
|
dev_warn(&dev->intf->dev, "Write buffer overflow, %zd bytes dropped\n", count-bytes_to_write);
|
2013-06-27 07:30:38 +08:00
|
|
|
dev_dbg(&dev->intf->dev, "%s: count = %zd, bytes_to_write = %zd\n",
|
|
|
|
__func__, count, bytes_to_write);
|
2005-06-28 04:44:22 +08:00
|
|
|
|
|
|
|
if (copy_from_user(dev->interrupt_out_buffer, buffer, bytes_to_write)) {
|
|
|
|
retval = -EFAULT;
|
|
|
|
goto unlock_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dev->interrupt_out_endpoint == NULL) {
|
|
|
|
/* try HID_REQ_SET_REPORT=9 on control_endpoint instead of interrupt_out_endpoint */
|
|
|
|
retval = usb_control_msg(interface_to_usbdev(dev->intf),
|
|
|
|
usb_sndctrlpipe(interface_to_usbdev(dev->intf), 0),
|
|
|
|
9,
|
|
|
|
USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_OUT,
|
|
|
|
1 << 8, 0,
|
|
|
|
dev->interrupt_out_buffer,
|
|
|
|
bytes_to_write,
|
|
|
|
USB_CTRL_SET_TIMEOUT * HZ);
|
|
|
|
if (retval < 0)
|
2012-04-21 07:53:47 +08:00
|
|
|
dev_err(&dev->intf->dev,
|
|
|
|
"Couldn't submit HID_REQ_SET_REPORT %d\n",
|
|
|
|
retval);
|
2005-06-28 04:44:22 +08:00
|
|
|
goto unlock_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* send off the urb */
|
|
|
|
usb_fill_int_urb(dev->interrupt_out_urb,
|
|
|
|
interface_to_usbdev(dev->intf),
|
|
|
|
usb_sndintpipe(interface_to_usbdev(dev->intf),
|
|
|
|
dev->interrupt_out_endpoint->bEndpointAddress),
|
|
|
|
dev->interrupt_out_buffer,
|
|
|
|
bytes_to_write,
|
|
|
|
ld_usb_interrupt_out_callback,
|
|
|
|
dev,
|
|
|
|
dev->interrupt_out_interval);
|
|
|
|
|
|
|
|
dev->interrupt_out_busy = 1;
|
|
|
|
wmb();
|
|
|
|
|
|
|
|
retval = usb_submit_urb(dev->interrupt_out_urb, GFP_KERNEL);
|
|
|
|
if (retval) {
|
|
|
|
dev->interrupt_out_busy = 0;
|
2012-04-21 07:53:47 +08:00
|
|
|
dev_err(&dev->intf->dev,
|
|
|
|
"Couldn't submit interrupt_out_urb %d\n", retval);
|
2005-06-28 04:44:22 +08:00
|
|
|
goto unlock_exit;
|
|
|
|
}
|
|
|
|
retval = bytes_to_write;
|
|
|
|
|
|
|
|
unlock_exit:
|
|
|
|
/* unlock the device */
|
2008-04-29 01:34:56 +08:00
|
|
|
mutex_unlock(&dev->mutex);
|
2005-06-28 04:44:22 +08:00
|
|
|
|
|
|
|
exit:
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* file operations needed when we register this driver */
|
2006-08-06 07:37:11 +08:00
|
|
|
static const struct file_operations ld_usb_fops = {
|
2005-06-28 04:44:22 +08:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.read = ld_usb_read,
|
|
|
|
.write = ld_usb_write,
|
|
|
|
.open = ld_usb_open,
|
|
|
|
.release = ld_usb_release,
|
|
|
|
.poll = ld_usb_poll,
|
llseek: automatically add .llseek fop
All file_operations should get a .llseek operation so we can make
nonseekable_open the default for future file operations without a
.llseek pointer.
The three cases that we can automatically detect are no_llseek, seq_lseek
and default_llseek. For cases where we can we can automatically prove that
the file offset is always ignored, we use noop_llseek, which maintains
the current behavior of not returning an error from a seek.
New drivers should normally not use noop_llseek but instead use no_llseek
and call nonseekable_open at open time. Existing drivers can be converted
to do the same when the maintainer knows for certain that no user code
relies on calling seek on the device file.
The generated code is often incorrectly indented and right now contains
comments that clarify for each added line why a specific variant was
chosen. In the version that gets submitted upstream, the comments will
be gone and I will manually fix the indentation, because there does not
seem to be a way to do that using coccinelle.
Some amount of new code is currently sitting in linux-next that should get
the same modifications, which I will do at the end of the merge window.
Many thanks to Julia Lawall for helping me learn to write a semantic
patch that does all this.
===== begin semantic patch =====
// This adds an llseek= method to all file operations,
// as a preparation for making no_llseek the default.
//
// The rules are
// - use no_llseek explicitly if we do nonseekable_open
// - use seq_lseek for sequential files
// - use default_llseek if we know we access f_pos
// - use noop_llseek if we know we don't access f_pos,
// but we still want to allow users to call lseek
//
@ open1 exists @
identifier nested_open;
@@
nested_open(...)
{
<+...
nonseekable_open(...)
...+>
}
@ open exists@
identifier open_f;
identifier i, f;
identifier open1.nested_open;
@@
int open_f(struct inode *i, struct file *f)
{
<+...
(
nonseekable_open(...)
|
nested_open(...)
)
...+>
}
@ read disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ read_no_fpos disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
... when != off
}
@ write @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ write_no_fpos @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
... when != off
}
@ fops0 @
identifier fops;
@@
struct file_operations fops = {
...
};
@ has_llseek depends on fops0 @
identifier fops0.fops;
identifier llseek_f;
@@
struct file_operations fops = {
...
.llseek = llseek_f,
...
};
@ has_read depends on fops0 @
identifier fops0.fops;
identifier read_f;
@@
struct file_operations fops = {
...
.read = read_f,
...
};
@ has_write depends on fops0 @
identifier fops0.fops;
identifier write_f;
@@
struct file_operations fops = {
...
.write = write_f,
...
};
@ has_open depends on fops0 @
identifier fops0.fops;
identifier open_f;
@@
struct file_operations fops = {
...
.open = open_f,
...
};
// use no_llseek if we call nonseekable_open
////////////////////////////////////////////
@ nonseekable1 depends on !has_llseek && has_open @
identifier fops0.fops;
identifier nso ~= "nonseekable_open";
@@
struct file_operations fops = {
... .open = nso, ...
+.llseek = no_llseek, /* nonseekable */
};
@ nonseekable2 depends on !has_llseek @
identifier fops0.fops;
identifier open.open_f;
@@
struct file_operations fops = {
... .open = open_f, ...
+.llseek = no_llseek, /* open uses nonseekable */
};
// use seq_lseek for sequential files
/////////////////////////////////////
@ seq depends on !has_llseek @
identifier fops0.fops;
identifier sr ~= "seq_read";
@@
struct file_operations fops = {
... .read = sr, ...
+.llseek = seq_lseek, /* we have seq_read */
};
// use default_llseek if there is a readdir
///////////////////////////////////////////
@ fops1 depends on !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier readdir_e;
@@
// any other fop is used that changes pos
struct file_operations fops = {
... .readdir = readdir_e, ...
+.llseek = default_llseek, /* readdir is present */
};
// use default_llseek if at least one of read/write touches f_pos
/////////////////////////////////////////////////////////////////
@ fops2 depends on !fops1 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read.read_f;
@@
// read fops use offset
struct file_operations fops = {
... .read = read_f, ...
+.llseek = default_llseek, /* read accesses f_pos */
};
@ fops3 depends on !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write.write_f;
@@
// write fops use offset
struct file_operations fops = {
... .write = write_f, ...
+ .llseek = default_llseek, /* write accesses f_pos */
};
// Use noop_llseek if neither read nor write accesses f_pos
///////////////////////////////////////////////////////////
@ fops4 depends on !fops1 && !fops2 && !fops3 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
identifier write_no_fpos.write_f;
@@
// write fops use offset
struct file_operations fops = {
...
.write = write_f,
.read = read_f,
...
+.llseek = noop_llseek, /* read and write both use no f_pos */
};
@ depends on has_write && !has_read && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write_no_fpos.write_f;
@@
struct file_operations fops = {
... .write = write_f, ...
+.llseek = noop_llseek, /* write uses no f_pos */
};
@ depends on has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
@@
struct file_operations fops = {
... .read = read_f, ...
+.llseek = noop_llseek, /* read uses no f_pos */
};
@ depends on !has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
@@
struct file_operations fops = {
...
+.llseek = noop_llseek, /* no read or write fn */
};
===== End semantic patch =====
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Julia Lawall <julia@diku.dk>
Cc: Christoph Hellwig <hch@infradead.org>
2010-08-16 00:52:59 +08:00
|
|
|
.llseek = no_llseek,
|
2005-06-28 04:44:22 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* usb class driver info in order to get a minor number from the usb core,
|
2006-01-19 06:36:58 +08:00
|
|
|
* and to have the device registered with the driver core
|
2005-06-28 04:44:22 +08:00
|
|
|
*/
|
|
|
|
static struct usb_class_driver ld_usb_class = {
|
|
|
|
.name = "ldusb%d",
|
|
|
|
.fops = &ld_usb_fops,
|
|
|
|
.minor_base = USB_LD_MINOR_BASE,
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ld_usb_probe
|
|
|
|
*
|
|
|
|
* Called by the usb core when a new device is connected that it thinks
|
|
|
|
* this driver might be interested in.
|
|
|
|
*/
|
|
|
|
static int ld_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
|
|
|
|
{
|
|
|
|
struct usb_device *udev = interface_to_usbdev(intf);
|
|
|
|
struct ld_usb *dev = NULL;
|
|
|
|
struct usb_host_interface *iface_desc;
|
|
|
|
char *buffer;
|
|
|
|
int retval = -ENOMEM;
|
2017-03-17 18:35:40 +08:00
|
|
|
int res;
|
2005-06-28 04:44:22 +08:00
|
|
|
|
tree-wide: fix comment/printk typos
"gadget", "through", "command", "maintain", "maintain", "controller", "address",
"between", "initiali[zs]e", "instead", "function", "select", "already",
"equal", "access", "management", "hierarchy", "registration", "interest",
"relative", "memory", "offset", "already",
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2010-11-02 03:38:34 +08:00
|
|
|
/* allocate memory for our device state and initialize it */
|
2005-06-28 04:44:22 +08:00
|
|
|
|
2006-01-07 05:40:02 +08:00
|
|
|
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
|
2016-08-26 01:39:18 +08:00
|
|
|
if (!dev)
|
2005-06-28 04:44:22 +08:00
|
|
|
goto exit;
|
2008-04-29 01:34:56 +08:00
|
|
|
mutex_init(&dev->mutex);
|
2007-05-04 15:23:40 +08:00
|
|
|
spin_lock_init(&dev->rbsl);
|
2005-06-28 04:44:22 +08:00
|
|
|
dev->intf = intf;
|
|
|
|
init_waitqueue_head(&dev->read_wait);
|
|
|
|
init_waitqueue_head(&dev->write_wait);
|
|
|
|
|
|
|
|
/* workaround for early firmware versions on fast computers */
|
|
|
|
if ((le16_to_cpu(udev->descriptor.idVendor) == USB_VENDOR_ID_LD) &&
|
2006-02-02 16:36:43 +08:00
|
|
|
((le16_to_cpu(udev->descriptor.idProduct) == USB_DEVICE_ID_LD_CASSY) ||
|
|
|
|
(le16_to_cpu(udev->descriptor.idProduct) == USB_DEVICE_ID_LD_COM3LAB)) &&
|
2005-06-28 04:44:22 +08:00
|
|
|
(le16_to_cpu(udev->descriptor.bcdDevice) <= 0x103)) {
|
|
|
|
buffer = kmalloc(256, GFP_KERNEL);
|
2016-08-26 01:39:18 +08:00
|
|
|
if (!buffer)
|
2005-07-30 03:17:20 +08:00
|
|
|
goto error;
|
2005-06-28 04:44:22 +08:00
|
|
|
/* usb_string makes SETUP+STALL to leave always ControlReadLoop */
|
|
|
|
usb_string(udev, 255, buffer, 256);
|
|
|
|
kfree(buffer);
|
|
|
|
}
|
|
|
|
|
|
|
|
iface_desc = intf->cur_altsetting;
|
|
|
|
|
2017-03-17 18:35:40 +08:00
|
|
|
res = usb_find_last_int_in_endpoint(iface_desc,
|
|
|
|
&dev->interrupt_in_endpoint);
|
|
|
|
if (res) {
|
2005-06-28 04:44:22 +08:00
|
|
|
dev_err(&intf->dev, "Interrupt in endpoint not found\n");
|
2017-03-17 18:35:40 +08:00
|
|
|
retval = res;
|
2005-06-28 04:44:22 +08:00
|
|
|
goto error;
|
|
|
|
}
|
2017-03-17 18:35:40 +08:00
|
|
|
|
|
|
|
res = usb_find_last_int_out_endpoint(iface_desc,
|
|
|
|
&dev->interrupt_out_endpoint);
|
|
|
|
if (res)
|
2005-06-28 04:44:22 +08:00
|
|
|
dev_warn(&intf->dev, "Interrupt out endpoint not found (using control endpoint instead)\n");
|
|
|
|
|
2011-08-23 18:12:03 +08:00
|
|
|
dev->interrupt_in_endpoint_size = usb_endpoint_maxp(dev->interrupt_in_endpoint);
|
treewide: kmalloc() -> kmalloc_array()
The kmalloc() function has a 2-factor argument form, kmalloc_array(). This
patch replaces cases of:
kmalloc(a * b, gfp)
with:
kmalloc_array(a * b, gfp)
as well as handling cases of:
kmalloc(a * b * c, gfp)
with:
kmalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kmalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kmalloc(4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
The tools/ directory was manually excluded, since it has its own
implementation of kmalloc().
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kmalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kmalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kmalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kmalloc
+ kmalloc_array
(
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
kmalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
kmalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@
(
kmalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
kmalloc(sizeof(THING) * C2, ...)
|
kmalloc(sizeof(TYPE) * C2, ...)
|
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(C1 * C2, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * E2
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-13 04:55:00 +08:00
|
|
|
dev->ring_buffer =
|
|
|
|
kmalloc_array(ring_buffer_size,
|
|
|
|
sizeof(size_t) + dev->interrupt_in_endpoint_size,
|
|
|
|
GFP_KERNEL);
|
2016-08-26 01:39:18 +08:00
|
|
|
if (!dev->ring_buffer)
|
2005-06-28 04:44:22 +08:00
|
|
|
goto error;
|
|
|
|
dev->interrupt_in_buffer = kmalloc(dev->interrupt_in_endpoint_size, GFP_KERNEL);
|
2016-08-26 01:39:18 +08:00
|
|
|
if (!dev->interrupt_in_buffer)
|
2005-06-28 04:44:22 +08:00
|
|
|
goto error;
|
|
|
|
dev->interrupt_in_urb = usb_alloc_urb(0, GFP_KERNEL);
|
2016-08-12 05:14:40 +08:00
|
|
|
if (!dev->interrupt_in_urb)
|
2005-06-28 04:44:22 +08:00
|
|
|
goto error;
|
2011-08-23 18:12:03 +08:00
|
|
|
dev->interrupt_out_endpoint_size = dev->interrupt_out_endpoint ? usb_endpoint_maxp(dev->interrupt_out_endpoint) :
|
2005-06-28 04:44:22 +08:00
|
|
|
udev->descriptor.bMaxPacketSize0;
|
treewide: kmalloc() -> kmalloc_array()
The kmalloc() function has a 2-factor argument form, kmalloc_array(). This
patch replaces cases of:
kmalloc(a * b, gfp)
with:
kmalloc_array(a * b, gfp)
as well as handling cases of:
kmalloc(a * b * c, gfp)
with:
kmalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kmalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kmalloc(4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
The tools/ directory was manually excluded, since it has its own
implementation of kmalloc().
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kmalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kmalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kmalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kmalloc
+ kmalloc_array
(
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
kmalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
kmalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@
(
kmalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
kmalloc(sizeof(THING) * C2, ...)
|
kmalloc(sizeof(TYPE) * C2, ...)
|
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(C1 * C2, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * E2
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-13 04:55:00 +08:00
|
|
|
dev->interrupt_out_buffer =
|
|
|
|
kmalloc_array(write_buffer_size,
|
|
|
|
dev->interrupt_out_endpoint_size, GFP_KERNEL);
|
2016-08-26 01:39:18 +08:00
|
|
|
if (!dev->interrupt_out_buffer)
|
2005-06-28 04:44:22 +08:00
|
|
|
goto error;
|
|
|
|
dev->interrupt_out_urb = usb_alloc_urb(0, GFP_KERNEL);
|
2016-08-12 05:14:40 +08:00
|
|
|
if (!dev->interrupt_out_urb)
|
2005-06-28 04:44:22 +08:00
|
|
|
goto error;
|
|
|
|
dev->interrupt_in_interval = min_interrupt_in_interval > dev->interrupt_in_endpoint->bInterval ? min_interrupt_in_interval : dev->interrupt_in_endpoint->bInterval;
|
|
|
|
if (dev->interrupt_out_endpoint)
|
|
|
|
dev->interrupt_out_interval = min_interrupt_out_interval > dev->interrupt_out_endpoint->bInterval ? min_interrupt_out_interval : dev->interrupt_out_endpoint->bInterval;
|
|
|
|
|
|
|
|
/* we can register the device now, as it is ready */
|
|
|
|
usb_set_intfdata(intf, dev);
|
|
|
|
|
|
|
|
retval = usb_register_dev(intf, &ld_usb_class);
|
|
|
|
if (retval) {
|
|
|
|
/* something prevented us from registering this driver */
|
|
|
|
dev_err(&intf->dev, "Not able to get a minor for this device.\n");
|
|
|
|
usb_set_intfdata(intf, NULL);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* let the user know what node this device is now attached to */
|
|
|
|
dev_info(&intf->dev, "LD USB Device #%d now attached to major %d minor %d\n",
|
|
|
|
(intf->minor - USB_LD_MINOR_BASE), USB_MAJOR, intf->minor);
|
|
|
|
|
|
|
|
exit:
|
|
|
|
return retval;
|
|
|
|
|
|
|
|
error:
|
|
|
|
ld_usb_delete(dev);
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ld_usb_disconnect
|
|
|
|
*
|
|
|
|
* Called by the usb core when the device is removed from the system.
|
|
|
|
*/
|
|
|
|
static void ld_usb_disconnect(struct usb_interface *intf)
|
|
|
|
{
|
|
|
|
struct ld_usb *dev;
|
|
|
|
int minor;
|
|
|
|
|
|
|
|
dev = usb_get_intfdata(intf);
|
|
|
|
usb_set_intfdata(intf, NULL);
|
|
|
|
|
|
|
|
minor = intf->minor;
|
|
|
|
|
|
|
|
/* give back our minor */
|
|
|
|
usb_deregister_dev(intf, &ld_usb_class);
|
|
|
|
|
2008-04-29 01:34:56 +08:00
|
|
|
mutex_lock(&dev->mutex);
|
USB: prevent char device open/deregister race
This patch (as908) adds central protection in usbcore for the
prototypical race between opening and unregistering a char device.
The spinlock used to protect the minor-numbers array is replaced with
an rwsem, which can remain locked across a call to a driver's open()
method. This guarantees that open() and deregister() will be mutually
exclusive.
The private locks currently used in several individual drivers for
this purpose are no longer necessary, and the patch removes them. The
following USB drivers are affected: usblcd, idmouse, auerswald,
legousbtower, sisusbvga/sisusb, ldusb, adutux, iowarrior, and
usb-skeleton.
As a side effect of this change, usb_deregister_dev() must not be
called while holding a lock that is acquired by open(). Unfortunately
a number of drivers do this, but luckily the solution is simple: call
usb_deregister_dev() before acquiring the lock.
In addition to these changes (and their consequent code
simplifications), the patch fixes a use-after-free bug in adutux and a
race between open() and release() in iowarrior.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-05-22 23:46:41 +08:00
|
|
|
|
2005-06-28 04:44:22 +08:00
|
|
|
/* if the device is not opened, then we clean up right now */
|
|
|
|
if (!dev->open_count) {
|
2008-04-29 01:34:56 +08:00
|
|
|
mutex_unlock(&dev->mutex);
|
2005-06-28 04:44:22 +08:00
|
|
|
ld_usb_delete(dev);
|
|
|
|
} else {
|
|
|
|
dev->intf = NULL;
|
2009-07-02 23:01:06 +08:00
|
|
|
/* wake up pollers */
|
|
|
|
wake_up_interruptible_all(&dev->read_wait);
|
|
|
|
wake_up_interruptible_all(&dev->write_wait);
|
2008-04-29 01:34:56 +08:00
|
|
|
mutex_unlock(&dev->mutex);
|
2005-06-28 04:44:22 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
dev_info(&intf->dev, "LD USB Device #%d now disconnected\n",
|
|
|
|
(minor - USB_LD_MINOR_BASE));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* usb specific object needed to register this driver with the usb subsystem */
|
|
|
|
static struct usb_driver ld_usb_driver = {
|
|
|
|
.name = "ldusb",
|
|
|
|
.probe = ld_usb_probe,
|
|
|
|
.disconnect = ld_usb_disconnect,
|
|
|
|
.id_table = ld_usb_table,
|
|
|
|
};
|
|
|
|
|
2011-11-19 01:34:02 +08:00
|
|
|
module_usb_driver(ld_usb_driver);
|
2005-06-28 04:44:22 +08:00
|
|
|
|