Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
de07c29a
Commit
de07c29a
authored
Sep 16, 2009
by
Stephen Rothwell
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'quilt/usb.current'
parents
3f06326e
b80dedba
Changes
19
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
693 additions
and
123 deletions
+693
-123
drivers/usb/class/cdc-acm.c
drivers/usb/class/cdc-acm.c
+2
-0
drivers/usb/class/cdc-wdm.c
drivers/usb/class/cdc-wdm.c
+24
-6
drivers/usb/core/config.c
drivers/usb/core/config.c
+1
-1
drivers/usb/host/sl811-hcd.c
drivers/usb/host/sl811-hcd.c
+6
-2
drivers/usb/host/xhci-dbg.c
drivers/usb/host/xhci-dbg.c
+3
-2
drivers/usb/host/xhci-hcd.c
drivers/usb/host/xhci-hcd.c
+301
-69
drivers/usb/host/xhci-mem.c
drivers/usb/host/xhci-mem.c
+59
-5
drivers/usb/host/xhci-pci.c
drivers/usb/host/xhci-pci.c
+13
-0
drivers/usb/host/xhci-ring.c
drivers/usb/host/xhci-ring.c
+208
-24
drivers/usb/host/xhci.h
drivers/usb/host/xhci.h
+35
-6
drivers/usb/serial/console.c
drivers/usb/serial/console.c
+1
-0
drivers/usb/serial/ftdi_sio.c
drivers/usb/serial/ftdi_sio.c
+7
-0
drivers/usb/serial/ftdi_sio.h
drivers/usb/serial/ftdi_sio.h
+10
-0
drivers/usb/serial/option.c
drivers/usb/serial/option.c
+4
-0
drivers/usb/serial/pl2303.c
drivers/usb/serial/pl2303.c
+1
-0
drivers/usb/serial/pl2303.h
drivers/usb/serial/pl2303.h
+4
-0
drivers/usb/serial/usb-serial.c
drivers/usb/serial/usb-serial.c
+12
-7
drivers/usb/storage/onetouch.c
drivers/usb/storage/onetouch.c
+1
-1
include/linux/usb/serial.h
include/linux/usb/serial.h
+1
-0
No files found.
drivers/usb/class/cdc-acm.c
View file @
de07c29a
...
...
@@ -59,6 +59,7 @@
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/tty.h>
#include <linux/serial.h>
#include <linux/tty_driver.h>
#include <linux/tty_flip.h>
#include <linux/module.h>
...
...
@@ -609,6 +610,7 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp)
acm
->
throttle
=
0
;
tasklet_schedule
(
&
acm
->
urb_task
);
set_bit
(
ASYNCB_INITIALIZED
,
&
acm
->
port
.
flags
);
rv
=
tty_port_block_til_ready
(
&
acm
->
port
,
tty
,
filp
);
done:
mutex_unlock
(
&
acm
->
mutex
);
...
...
drivers/usb/class/cdc-wdm.c
View file @
de07c29a
...
...
@@ -313,8 +313,13 @@ static ssize_t wdm_write
r
=
usb_autopm_get_interface
(
desc
->
intf
);
if
(
r
<
0
)
goto
outnp
;
if
(
!
file
->
f_flags
&&
O_NONBLOCK
)
r
=
wait_event_interruptible
(
desc
->
wait
,
!
test_bit
(
WDM_IN_USE
,
&
desc
->
flags
));
else
if
(
test_bit
(
WDM_IN_USE
,
&
desc
->
flags
))
r
=
-
EAGAIN
;
if
(
r
<
0
)
goto
out
;
...
...
@@ -377,7 +382,7 @@ outnl:
static
ssize_t
wdm_read
(
struct
file
*
file
,
char
__user
*
buffer
,
size_t
count
,
loff_t
*
ppos
)
{
int
rv
,
cntr
;
int
rv
,
cntr
=
0
;
int
i
=
0
;
struct
wdm_device
*
desc
=
file
->
private_data
;
...
...
@@ -389,10 +394,23 @@ static ssize_t wdm_read
if
(
desc
->
length
==
0
)
{
desc
->
read
=
0
;
retry:
if
(
test_bit
(
WDM_DISCONNECTING
,
&
desc
->
flags
))
{
rv
=
-
ENODEV
;
goto
err
;
}
i
++
;
if
(
file
->
f_flags
&
O_NONBLOCK
)
{
if
(
!
test_bit
(
WDM_READ
,
&
desc
->
flags
))
{
rv
=
cntr
?
cntr
:
-
EAGAIN
;
goto
err
;
}
rv
=
0
;
}
else
{
rv
=
wait_event_interruptible
(
desc
->
wait
,
test_bit
(
WDM_READ
,
&
desc
->
flags
));
}
/* may have happened while we slept */
if
(
test_bit
(
WDM_DISCONNECTING
,
&
desc
->
flags
))
{
rv
=
-
ENODEV
;
goto
err
;
...
...
@@ -448,7 +466,7 @@ retry:
err:
mutex_unlock
(
&
desc
->
rlock
);
if
(
rv
<
0
)
if
(
rv
<
0
&&
rv
!=
-
EAGAIN
)
dev_err
(
&
desc
->
intf
->
dev
,
"wdm_read: exit error
\n
"
);
return
rv
;
}
...
...
drivers/usb/core/config.c
View file @
de07c29a
...
...
@@ -105,7 +105,7 @@ static int usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno,
ep
->
ss_ep_comp
->
extralen
=
i
;
buffer
+=
i
;
size
-=
i
;
retval
=
buffer
-
buffer_start
+
i
;
retval
=
buffer
-
buffer_start
;
if
(
num_skipped
>
0
)
dev_dbg
(
ddev
,
"skipped %d descriptor%s after %s
\n
"
,
num_skipped
,
plural
(
num_skipped
),
...
...
drivers/usb/host/sl811-hcd.c
View file @
de07c29a
...
...
@@ -719,8 +719,12 @@ retry:
/* port status seems weird until after reset, so
* force the reset and make khubd clean up later.
*/
sl811
->
port1
|=
(
1
<<
USB_PORT_FEAT_C_CONNECTION
)
|
(
1
<<
USB_PORT_FEAT_CONNECTION
);
if
(
sl811
->
stat_insrmv
&
1
)
sl811
->
port1
|=
1
<<
USB_PORT_FEAT_CONNECTION
;
else
sl811
->
port1
&=
~
(
1
<<
USB_PORT_FEAT_CONNECTION
);
sl811
->
port1
|=
1
<<
USB_PORT_FEAT_C_CONNECTION
;
}
else
if
(
irqstat
&
SL11H_INTMASK_RD
)
{
if
(
sl811
->
port1
&
(
1
<<
USB_PORT_FEAT_SUSPEND
))
{
...
...
drivers/usb/host/xhci-dbg.c
View file @
de07c29a
...
...
@@ -413,7 +413,8 @@ void xhci_dbg_slot_ctx(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx)
int
i
;
struct
xhci_slot_ctx
*
slot_ctx
=
xhci_get_slot_ctx
(
xhci
,
ctx
);
dma_addr_t
dma
=
ctx
->
dma
+
((
unsigned
long
)
slot_ctx
-
(
unsigned
long
)
ctx
);
dma_addr_t
dma
=
ctx
->
dma
+
((
unsigned
long
)
slot_ctx
-
(
unsigned
long
)
ctx
->
bytes
);
int
csz
=
HCC_64BYTE_CONTEXT
(
xhci
->
hcc_params
);
xhci_dbg
(
xhci
,
"Slot Context:
\n
"
);
...
...
@@ -459,7 +460,7 @@ void xhci_dbg_ep_ctx(struct xhci_hcd *xhci,
for
(
i
=
0
;
i
<
last_ep_ctx
;
++
i
)
{
struct
xhci_ep_ctx
*
ep_ctx
=
xhci_get_ep_ctx
(
xhci
,
ctx
,
i
);
dma_addr_t
dma
=
ctx
->
dma
+
((
unsigned
long
)
ep_ctx
-
(
unsigned
long
)
ctx
);
((
unsigned
long
)
ep_ctx
-
(
unsigned
long
)
ctx
->
bytes
);
xhci_dbg
(
xhci
,
"Endpoint %02d Context:
\n
"
,
i
);
xhci_dbg
(
xhci
,
"@%p (virt) @%08llx (dma) %#08x - ep_info
\n
"
,
...
...
drivers/usb/host/xhci-hcd.c
View file @
de07c29a
This diff is collapsed.
Click to expand it.
drivers/usb/host/xhci-mem.c
View file @
de07c29a
...
...
@@ -94,6 +94,9 @@ static void xhci_link_segments(struct xhci_hcd *xhci, struct xhci_segment *prev,
val
=
prev
->
trbs
[
TRBS_PER_SEGMENT
-
1
].
link
.
control
;
val
&=
~
TRB_TYPE_BITMASK
;
val
|=
TRB_TYPE
(
TRB_LINK
);
/* Always set the chain bit with 0.95 hardware */
if
(
xhci_link_trb_quirk
(
xhci
))
val
|=
TRB_CHAIN
;
prev
->
trbs
[
TRBS_PER_SEGMENT
-
1
].
link
.
control
=
val
;
}
xhci_dbg
(
xhci
,
"Linking segment 0x%llx to segment 0x%llx (DMA)
\n
"
,
...
...
@@ -398,15 +401,28 @@ int xhci_setup_addressable_virt_dev(struct xhci_hcd *xhci, struct usb_device *ud
/* Step 5 */
ep0_ctx
->
ep_info2
=
EP_TYPE
(
CTRL_EP
);
/*
* See section 4.3 bullet 6:
* The default Max Packet size for ep0 is "8 bytes for a USB2
* LS/FS/HS device or 512 bytes for a USB3 SS device"
* XXX: Not sure about wireless USB devices.
*/
if
(
udev
->
speed
==
USB_SPEED_SUPER
)
switch
(
udev
->
speed
)
{
case
USB_SPEED_SUPER
:
ep0_ctx
->
ep_info2
|=
MAX_PACKET
(
512
);
else
break
;
case
USB_SPEED_HIGH
:
/* USB core guesses at a 64-byte max packet first for FS devices */
case
USB_SPEED_FULL
:
ep0_ctx
->
ep_info2
|=
MAX_PACKET
(
64
);
break
;
case
USB_SPEED_LOW
:
ep0_ctx
->
ep_info2
|=
MAX_PACKET
(
8
);
break
;
case
USB_SPEED_VARIABLE
:
xhci_dbg
(
xhci
,
"FIXME xHCI doesn't support wireless speeds
\n
"
);
return
-
EINVAL
;
break
;
default:
/* New speed? */
BUG
();
}
/* EP 0 can handle "burst" sizes of 1, so Max Burst Size field is 0 */
ep0_ctx
->
ep_info2
|=
MAX_BURST
(
0
);
ep0_ctx
->
ep_info2
|=
ERROR_COUNT
(
3
);
...
...
@@ -598,6 +614,44 @@ void xhci_endpoint_zero(struct xhci_hcd *xhci,
*/
}
/* Copy output xhci_ep_ctx to the input xhci_ep_ctx copy.
* Useful when you want to change one particular aspect of the endpoint and then
* issue a configure endpoint command.
*/
void
xhci_endpoint_copy
(
struct
xhci_hcd
*
xhci
,
struct
xhci_virt_device
*
vdev
,
unsigned
int
ep_index
)
{
struct
xhci_ep_ctx
*
out_ep_ctx
;
struct
xhci_ep_ctx
*
in_ep_ctx
;
out_ep_ctx
=
xhci_get_ep_ctx
(
xhci
,
vdev
->
out_ctx
,
ep_index
);
in_ep_ctx
=
xhci_get_ep_ctx
(
xhci
,
vdev
->
in_ctx
,
ep_index
);
in_ep_ctx
->
ep_info
=
out_ep_ctx
->
ep_info
;
in_ep_ctx
->
ep_info2
=
out_ep_ctx
->
ep_info2
;
in_ep_ctx
->
deq
=
out_ep_ctx
->
deq
;
in_ep_ctx
->
tx_info
=
out_ep_ctx
->
tx_info
;
}
/* Copy output xhci_slot_ctx to the input xhci_slot_ctx.
* Useful when you want to change one particular aspect of the endpoint and then
* issue a configure endpoint command. Only the context entries field matters,
* but we'll copy the whole thing anyway.
*/
void
xhci_slot_copy
(
struct
xhci_hcd
*
xhci
,
struct
xhci_virt_device
*
vdev
)
{
struct
xhci_slot_ctx
*
in_slot_ctx
;
struct
xhci_slot_ctx
*
out_slot_ctx
;
in_slot_ctx
=
xhci_get_slot_ctx
(
xhci
,
vdev
->
in_ctx
);
out_slot_ctx
=
xhci_get_slot_ctx
(
xhci
,
vdev
->
out_ctx
);
in_slot_ctx
->
dev_info
=
out_slot_ctx
->
dev_info
;
in_slot_ctx
->
dev_info2
=
out_slot_ctx
->
dev_info2
;
in_slot_ctx
->
tt_info
=
out_slot_ctx
->
tt_info
;
in_slot_ctx
->
dev_state
=
out_slot_ctx
->
dev_state
;
}
/* Set up the scratchpad buffer array and scratchpad buffers, if needed. */
static
int
scratchpad_alloc
(
struct
xhci_hcd
*
xhci
,
gfp_t
flags
)
{
...
...
drivers/usb/host/xhci-pci.c
View file @
de07c29a
...
...
@@ -24,6 +24,10 @@
#include "xhci.h"
/* Device for a quirk */
#define PCI_VENDOR_ID_FRESCO_LOGIC 0x1b73
#define PCI_DEVICE_ID_FRESCO_LOGIC_PDK 0x1000
static
const
char
hcd_name
[]
=
"xhci_hcd"
;
/* called after powerup, by probe or system-pm "wakeup" */
...
...
@@ -62,6 +66,15 @@ static int xhci_pci_setup(struct usb_hcd *hcd)
xhci
->
hcc_params
=
xhci_readl
(
xhci
,
&
xhci
->
cap_regs
->
hcc_params
);
xhci_print_registers
(
xhci
);
/* Look for vendor-specific quirks */
if
(
pdev
->
vendor
==
PCI_VENDOR_ID_FRESCO_LOGIC
&&
pdev
->
device
==
PCI_DEVICE_ID_FRESCO_LOGIC_PDK
&&
pdev
->
revision
==
0x0
)
{
xhci
->
quirks
|=
XHCI_RESET_EP_QUIRK
;
xhci_dbg
(
xhci
,
"QUIRK: Fresco Logic xHC needs configure"
" endpoint cmd after reset endpoint
\n
"
);
}
/* Make sure the HC is halted. */
retval
=
xhci_halt
(
xhci
);
if
(
retval
)
...
...
drivers/usb/host/xhci-ring.c
View file @
de07c29a
This diff is collapsed.
Click to expand it.
drivers/usb/host/xhci.h
View file @
de07c29a
...
...
@@ -581,6 +581,7 @@ struct xhci_ep_ctx {
/* bit 15 is Linear Stream Array */
/* Interval - period between requests to an endpoint - 125u increments. */
#define EP_INTERVAL(p) ((p & 0xff) << 16)
#define EP_INTERVAL_TO_UFRAMES(p) (1 << (((p) >> 16) & 0xff))
/* ep_info2 bitmasks */
/*
...
...
@@ -589,6 +590,7 @@ struct xhci_ep_ctx {
*/
#define FORCE_EVENT (0x1)
#define ERROR_COUNT(p) (((p) & 0x3) << 1)
#define CTX_TO_EP_TYPE(p) (((p) >> 3) & 0x7)
#define EP_TYPE(p) ((p) << 3)
#define ISOC_OUT_EP 1
#define BULK_OUT_EP 2
...
...
@@ -601,6 +603,8 @@ struct xhci_ep_ctx {
/* bit 7 is Host Initiate Disable - for disabling stream selection */
#define MAX_BURST(p) (((p)&0xff) << 8)
#define MAX_PACKET(p) (((p)&0xffff) << 16)
#define MAX_PACKET_MASK (0xffff << 16)
#define MAX_PACKET_DECODED(p) (((p) >> 16) & 0xffff)
/**
...
...
@@ -926,6 +930,12 @@ struct xhci_td {
union
xhci_trb
*
last_trb
;
};
struct
xhci_dequeue_state
{
struct
xhci_segment
*
new_deq_seg
;
union
xhci_trb
*
new_deq_ptr
;
int
new_cycle_state
;
};
struct
xhci_ring
{
struct
xhci_segment
*
first_seg
;
union
xhci_trb
*
enqueue
;
...
...
@@ -952,12 +962,6 @@ struct xhci_ring {
u32
cycle_state
;
};
struct
xhci_dequeue_state
{
struct
xhci_segment
*
new_deq_seg
;
union
xhci_trb
*
new_deq_ptr
;
int
new_cycle_state
;
};
struct
xhci_erst_entry
{
/* 64-bit event ring segment address */
u64
seg_addr
;
...
...
@@ -1058,6 +1062,9 @@ struct xhci_hcd {
int
noops_submitted
;
int
noops_handled
;
int
error_bitmask
;
unsigned
int
quirks
;
#define XHCI_LINK_TRB_QUIRK (1 << 0)
#define XHCI_RESET_EP_QUIRK (1 << 1)
};
/* For testing purposes */
...
...
@@ -1136,6 +1143,13 @@ static inline void xhci_write_64(struct xhci_hcd *xhci,
writel
(
val_hi
,
ptr
+
1
);
}
static
inline
int
xhci_link_trb_quirk
(
struct
xhci_hcd
*
xhci
)
{
u32
temp
=
xhci_readl
(
xhci
,
&
xhci
->
cap_regs
->
hc_capbase
);
return
((
HC_VERSION
(
temp
)
==
0x95
)
&&
(
xhci
->
quirks
&
XHCI_LINK_TRB_QUIRK
));
}
/* xHCI debugging */
void
xhci_print_ir_set
(
struct
xhci_hcd
*
xhci
,
struct
xhci_intr_reg
*
ir_set
,
int
set_num
);
void
xhci_print_registers
(
struct
xhci_hcd
*
xhci
);
...
...
@@ -1158,7 +1172,12 @@ int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id, struct usb_device
int
xhci_setup_addressable_virt_dev
(
struct
xhci_hcd
*
xhci
,
struct
usb_device
*
udev
);
unsigned
int
xhci_get_endpoint_index
(
struct
usb_endpoint_descriptor
*
desc
);
unsigned
int
xhci_get_endpoint_flag
(
struct
usb_endpoint_descriptor
*
desc
);
unsigned
int
xhci_get_endpoint_flag_from_index
(
unsigned
int
ep_index
);
unsigned
int
xhci_last_valid_endpoint
(
u32
added_ctxs
);
void
xhci_endpoint_zero
(
struct
xhci_hcd
*
xhci
,
struct
xhci_virt_device
*
virt_dev
,
struct
usb_host_endpoint
*
ep
);
void
xhci_endpoint_copy
(
struct
xhci_hcd
*
xhci
,
struct
xhci_virt_device
*
vdev
,
unsigned
int
ep_index
);
void
xhci_slot_copy
(
struct
xhci_hcd
*
xhci
,
struct
xhci_virt_device
*
vdev
);
int
xhci_endpoint_init
(
struct
xhci_hcd
*
xhci
,
struct
xhci_virt_device
*
virt_dev
,
struct
usb_device
*
udev
,
struct
usb_host_endpoint
*
ep
,
gfp_t
mem_flags
);
...
...
@@ -1205,8 +1224,12 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags, struct urb *urb,
int
slot_id
,
unsigned
int
ep_index
);
int
xhci_queue_bulk_tx
(
struct
xhci_hcd
*
xhci
,
gfp_t
mem_flags
,
struct
urb
*
urb
,
int
slot_id
,
unsigned
int
ep_index
);
int
xhci_queue_intr_tx
(
struct
xhci_hcd
*
xhci
,
gfp_t
mem_flags
,
struct
urb
*
urb
,
int
slot_id
,
unsigned
int
ep_index
);
int
xhci_queue_configure_endpoint
(
struct
xhci_hcd
*
xhci
,
dma_addr_t
in_ctx_ptr
,
u32
slot_id
);
int
xhci_queue_evaluate_context
(
struct
xhci_hcd
*
xhci
,
dma_addr_t
in_ctx_ptr
,
u32
slot_id
);
int
xhci_queue_reset_ep
(
struct
xhci_hcd
*
xhci
,
int
slot_id
,
unsigned
int
ep_index
);
void
xhci_find_new_dequeue_state
(
struct
xhci_hcd
*
xhci
,
...
...
@@ -1215,6 +1238,12 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci,
void
xhci_queue_new_dequeue_state
(
struct
xhci_hcd
*
xhci
,
struct
xhci_ring
*
ep_ring
,
unsigned
int
slot_id
,
unsigned
int
ep_index
,
struct
xhci_dequeue_state
*
deq_state
);
void
xhci_cleanup_stalled_ring
(
struct
xhci_hcd
*
xhci
,
struct
usb_device
*
udev
,
unsigned
int
ep_index
,
struct
xhci_ring
*
ep_ring
);
void
xhci_queue_config_ep_quirk
(
struct
xhci_hcd
*
xhci
,
unsigned
int
slot_id
,
unsigned
int
ep_index
,
struct
xhci_dequeue_state
*
deq_state
);
/* xHCI roothub code */
int
xhci_hub_control
(
struct
usb_hcd
*
hcd
,
u16
typeReq
,
u16
wValue
,
u16
wIndex
,
...
...
drivers/usb/serial/console.c
View file @
de07c29a
...
...
@@ -175,6 +175,7 @@ static int usb_console_setup(struct console *co, char *options)
/* The console is special in terms of closing the device so
* indicate this port is now acting as a system console. */
port
->
console
=
1
;
port
->
console_init_baud
=
baud
;
retval
=
0
;
out:
...
...
drivers/usb/serial/ftdi_sio.c
View file @
de07c29a
...
...
@@ -176,6 +176,9 @@ static struct usb_device_id id_table_combined [] = {
{
USB_DEVICE
(
FTDI_VID
,
FTDI_MICRO_CHAMELEON_PID
)
},
{
USB_DEVICE
(
FTDI_VID
,
FTDI_RELAIS_PID
)
},
{
USB_DEVICE
(
FTDI_VID
,
FTDI_OPENDCC_PID
)
},
{
USB_DEVICE
(
FTDI_VID
,
FTDI_OPENDCC_SNIFFER_PID
)
},
{
USB_DEVICE
(
FTDI_VID
,
FTDI_OPENDCC_THROTTLE_PID
)
},
{
USB_DEVICE
(
FTDI_VID
,
FTDI_OPENDCC_GATEWAY_PID
)
},
{
USB_DEVICE
(
INTERBIOMETRICS_VID
,
INTERBIOMETRICS_IOBOARD_PID
)
},
{
USB_DEVICE
(
INTERBIOMETRICS_VID
,
INTERBIOMETRICS_MINI_IOBOARD_PID
)
},
{
USB_DEVICE
(
FTDI_VID
,
FTDI_SPROG_II
)
},
...
...
@@ -694,6 +697,8 @@ static struct usb_device_id id_table_combined [] = {
{
USB_DEVICE
(
DE_VID
,
WHT_PID
)
},
{
USB_DEVICE
(
ADI_VID
,
ADI_GNICE_PID
),
.
driver_info
=
(
kernel_ulong_t
)
&
ftdi_jtag_quirk
},
{
USB_DEVICE
(
ADI_VID
,
ADI_GNICEPLUS_PID
),
.
driver_info
=
(
kernel_ulong_t
)
&
ftdi_jtag_quirk
},
{
USB_DEVICE
(
JETI_VID
,
JETI_SPC1201_PID
)
},
{
USB_DEVICE
(
MARVELL_VID
,
MARVELL_SHEEVAPLUG_PID
),
.
driver_info
=
(
kernel_ulong_t
)
&
ftdi_jtag_quirk
},
...
...
@@ -702,6 +707,8 @@ static struct usb_device_id id_table_combined [] = {
{
USB_DEVICE
(
BAYER_VID
,
BAYER_CONTOUR_CABLE_PID
)
},
{
USB_DEVICE
(
FTDI_VID
,
MARVELL_OPENRD_PID
),
.
driver_info
=
(
kernel_ulong_t
)
&
ftdi_jtag_quirk
},
{
USB_DEVICE
(
FTDI_VID
,
HAMEG_HO820_PID
)
},
{
USB_DEVICE
(
FTDI_VID
,
HAMEG_HO870_PID
)
},
{
},
/* Optional parameter entry */
{
}
/* Terminating entry */
};
...
...
drivers/usb/serial/ftdi_sio.h
View file @
de07c29a
...
...
@@ -81,6 +81,9 @@
/* OpenDCC (www.opendcc.de) product id */
#define FTDI_OPENDCC_PID 0xBFD8
#define FTDI_OPENDCC_SNIFFER_PID 0xBFD9
#define FTDI_OPENDCC_THROTTLE_PID 0xBFDA
#define FTDI_OPENDCC_GATEWAY_PID 0xBFDB
/* Sprog II (Andrew Crosland's SprogII DCC interface) */
#define FTDI_SPROG_II 0xF0C8
...
...
@@ -930,6 +933,7 @@
*/
#define ADI_VID 0x0456
#define ADI_GNICE_PID 0xF000
#define ADI_GNICEPLUS_PID 0xF001
/*
* JETI SPECTROMETER SPECBOS 1201
...
...
@@ -967,6 +971,12 @@
*/
#define MARVELL_OPENRD_PID 0x9e90
/*
* Hameg HO820 and HO870 interface (using VID 0x0403)
*/
#define HAMEG_HO820_PID 0xed74
#define HAMEG_HO870_PID 0xed71
/*
* BmRequestType: 1100 0000b
* bRequest: FTDI_E2_READ
...
...
drivers/usb/serial/option.c
View file @
de07c29a
...
...
@@ -292,6 +292,7 @@ static int option_resume(struct usb_serial *serial);
#define TELIT_VENDOR_ID 0x1bc7
#define TELIT_PRODUCT_UC864E 0x1003
#define TELIT_PRODUCT_UC864G 0x1004
/* ZTE PRODUCTS */
#define ZTE_VENDOR_ID 0x19d2
...
...
@@ -300,6 +301,7 @@ static int option_resume(struct usb_serial *serial);
#define ZTE_PRODUCT_MF626 0x0031
#define ZTE_PRODUCT_CDMA_TECH 0xfffe
#define ZTE_PRODUCT_AC8710 0xfff1
#define ZTE_PRODUCT_AC2726 0xfff5
#define BENQ_VENDOR_ID 0x04a5
#define BENQ_PRODUCT_H10 0x4068
...
...
@@ -503,6 +505,7 @@ static struct usb_device_id option_ids[] = {
{
USB_DEVICE
(
QUALCOMM_VENDOR_ID
,
0x6613
)},
/* Onda H600/ZTE MF330 */
{
USB_DEVICE
(
MAXON_VENDOR_ID
,
0x6280
)
},
/* BP3-USB & BP3-EXT HSDPA */
{
USB_DEVICE
(
TELIT_VENDOR_ID
,
TELIT_PRODUCT_UC864E
)
},
{
USB_DEVICE
(
TELIT_VENDOR_ID
,
TELIT_PRODUCT_UC864G
)
},
{
USB_DEVICE_AND_INTERFACE_INFO
(
ZTE_VENDOR_ID
,
ZTE_PRODUCT_MF622
,
0xff
,
0xff
,
0xff
)
},
/* ZTE WCDMA products */
{
USB_DEVICE_AND_INTERFACE_INFO
(
ZTE_VENDOR_ID
,
0x0002
,
0xff
,
0xff
,
0xff
)
},
{
USB_DEVICE_AND_INTERFACE_INFO
(
ZTE_VENDOR_ID
,
0x0003
,
0xff
,
0xff
,
0xff
)
},
...
...
@@ -572,6 +575,7 @@ static struct usb_device_id option_ids[] = {
{
USB_DEVICE_AND_INTERFACE_INFO
(
ZTE_VENDOR_ID
,
0x0073
,
0xff
,
0xff
,
0xff
)
},
{
USB_DEVICE_AND_INTERFACE_INFO
(
ZTE_VENDOR_ID
,
ZTE_PRODUCT_CDMA_TECH
,
0xff
,
0xff
,
0xff
)
},
{
USB_DEVICE_AND_INTERFACE_INFO
(
ZTE_VENDOR_ID
,
ZTE_PRODUCT_AC8710
,
0xff
,
0xff
,
0xff
)
},
{
USB_DEVICE_AND_INTERFACE_INFO
(
ZTE_VENDOR_ID
,
ZTE_PRODUCT_AC2726
,
0xff
,
0xff
,
0xff
)
},
{
USB_DEVICE
(
BENQ_VENDOR_ID
,
BENQ_PRODUCT_H10
)
},
{
USB_DEVICE
(
DLINK_VENDOR_ID
,
DLINK_PRODUCT_DWM_652
)
},
{
USB_DEVICE
(
QISDA_VENDOR_ID
,
QISDA_PRODUCT_H21_4512
)
},
...
...
drivers/usb/serial/pl2303.c
View file @
de07c29a
...
...
@@ -96,6 +96,7 @@ static struct usb_device_id id_table [] = {
{
USB_DEVICE
(
HP_VENDOR_ID
,
HP_LD220_PRODUCT_ID
)
},
{
USB_DEVICE
(
CRESSI_VENDOR_ID
,
CRESSI_EDY_PRODUCT_ID
)
},
{
USB_DEVICE
(
SONY_VENDOR_ID
,
SONY_QN3USB_PRODUCT_ID
)
},
{
USB_DEVICE
(
SANWA_VENDOR_ID
,
SANWA_PRODUCT_ID
)
},
{
}
/* Terminating entry */
};
...
...
drivers/usb/serial/pl2303.h
View file @
de07c29a
...
...
@@ -130,3 +130,7 @@
/* Sony, USB data cable for CMD-Jxx mobile phones */
#define SONY_VENDOR_ID 0x054c
#define SONY_QN3USB_PRODUCT_ID 0x0437
/* Sanwa KB-USB2 multimeter cable (ID: 11ad:0001) */
#define SANWA_VENDOR_ID 0x11ad
#define SANWA_PRODUCT_ID 0x0001
drivers/usb/serial/usb-serial.c
View file @
de07c29a
...
...
@@ -223,8 +223,7 @@ static int serial_open (struct tty_struct *tty, struct file *filp)
tty
->
driver_data
=
port
;
tty_port_tty_set
(
&
port
->
port
,
tty
);
/* If the console is attached, the device is already open */
if
(
port
->
port
.
count
==
1
&&
!
port
->
console
)
{
if
(
port
->
port
.
count
==
1
)
{
first
=
1
;
/* lock this module before we call it
* this may fail, which means we must bail out,
...
...
@@ -242,11 +241,17 @@ static int serial_open (struct tty_struct *tty, struct file *filp)
if
(
retval
)
goto
bailout_module_put
;
/* only call the device specific open if this
* is the first time the port is opened */
/* only call the device specific open if this is the
* first time the port is opened and it is not a
* console port where the HW has already been
* initialized */
if
(
port
->
console
)
{
tty_encode_baud_rate
(
tty
,
port
->
console_init_baud
,
port
->
console_init_baud
);
}
else
{
retval
=
serial
->
type
->
open
(
tty
,
port
,
filp
);
if
(
retval
)
goto
bailout_interface_put
;
}
mutex_unlock
(
&
serial
->
disc_mutex
);
set_bit
(
ASYNCB_INITIALIZED
,
&
port
->
port
.
flags
);
}
...
...
drivers/usb/storage/onetouch.c
View file @
de07c29a
...
...
@@ -163,7 +163,7 @@ static void usb_onetouch_pm_hook(struct us_data *us, int action)
usb_kill_urb
(
onetouch
->
irq
);
break
;
case
US_RESUME
:
if
(
usb_submit_urb
(
onetouch
->
irq
,
GFP_
KERNEL
)
!=
0
)
if
(
usb_submit_urb
(
onetouch
->
irq
,
GFP_
NOIO
)
!=
0
)
dev_err
(
&
onetouch
->
irq
->
dev
->
dev
,
"usb_submit_urb failed
\n
"
);
break
;
...
...
include/linux/usb/serial.h
View file @
de07c29a
...
...
@@ -107,6 +107,7 @@ struct usb_serial_port {
char
throttled
;
char
throttle_req
;
char
console
;
int
console_init_baud
;
unsigned
long
sysrq
;
/* sysrq timeout */
struct
device
dev
;
enum
port_dev_state
dev_state
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment