Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
1dab1f42
Commit
1dab1f42
authored
Aug 13, 2002
by
Greg Kroah-Hartman
Browse files
Options
Browse Files
Download
Plain Diff
Merge kroah.com:/home/greg/linux/BK/bleeding_edge-2.5
into kroah.com:/home/greg/linux/BK/gregkh-2.5
parents
456f17cd
015377da
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
72 additions
and
153 deletions
+72
-153
drivers/usb/core/hcd.c
drivers/usb/core/hcd.c
+33
-0
drivers/usb/core/usb.c
drivers/usb/core/usb.c
+1
-1
drivers/usb/host/ehci-q.c
drivers/usb/host/ehci-q.c
+8
-42
drivers/usb/host/ehci-sched.c
drivers/usb/host/ehci-sched.c
+3
-16
drivers/usb/host/ehci.h
drivers/usb/host/ehci.h
+0
-1
drivers/usb/host/ohci-q.c
drivers/usb/host/ohci-q.c
+7
-41
drivers/usb/host/ohci-sa1111.c
drivers/usb/host/ohci-sa1111.c
+8
-0
drivers/usb/host/uhci-hcd.c
drivers/usb/host/uhci-hcd.c
+5
-46
drivers/usb/host/uhci-hcd.h
drivers/usb/host/uhci-hcd.h
+0
-3
drivers/usb/net/cdc-ether.c
drivers/usb/net/cdc-ether.c
+7
-3
No files found.
drivers/usb/core/hcd.c
View file @
1dab1f42
...
@@ -29,6 +29,7 @@
...
@@ -29,6 +29,7 @@
#include <linux/slab.h>
#include <linux/slab.h>
#include <linux/completion.h>
#include <linux/completion.h>
#include <linux/uts.h>
/* for UTS_SYSNAME */
#include <linux/uts.h>
/* for UTS_SYSNAME */
#include <linux/pci.h>
/* for hcd->pdev and dma addressing */
#include <asm/byteorder.h>
#include <asm/byteorder.h>
...
@@ -1021,6 +1022,24 @@ static int hcd_submit_urb (struct urb *urb, int mem_flags)
...
@@ -1021,6 +1022,24 @@ static int hcd_submit_urb (struct urb *urb, int mem_flags)
if
(
status
)
if
(
status
)
return
status
;
return
status
;
/* lower level hcd code should use *_dma exclusively */
if
(
!
(
urb
->
transfer_flags
&
URB_NO_DMA_MAP
))
{
if
(
usb_pipecontrol
(
urb
->
pipe
))
urb
->
setup_dma
=
pci_map_single
(
hcd
->
pdev
,
urb
->
setup_packet
,
sizeof
(
struct
usb_ctrlrequest
),
PCI_DMA_TODEVICE
);
if
(
urb
->
transfer_buffer_length
!=
0
)
urb
->
transfer_dma
=
pci_map_single
(
hcd
->
pdev
,
urb
->
transfer_buffer
,
urb
->
transfer_buffer_length
,
usb_pipein
(
urb
->
pipe
)
?
PCI_DMA_FROMDEVICE
:
PCI_DMA_TODEVICE
);
}
/* increment urb's reference count as part of giving it to the HCD
/* increment urb's reference count as part of giving it to the HCD
* (which now controls it). HCD guarantees that it either returns
* (which now controls it). HCD guarantees that it either returns
* an error or calls giveback(), but not both.
* an error or calls giveback(), but not both.
...
@@ -1289,6 +1308,20 @@ void usb_hcd_giveback_urb (struct usb_hcd *hcd, struct urb *urb)
...
@@ -1289,6 +1308,20 @@ void usb_hcd_giveback_urb (struct usb_hcd *hcd, struct urb *urb)
dbg
(
"giveback urb %p status %d len %d"
,
dbg
(
"giveback urb %p status %d len %d"
,
urb
,
urb
->
status
,
urb
->
actual_length
);
urb
,
urb
->
status
,
urb
->
actual_length
);
/* lower level hcd code should use *_dma exclusively */
if
(
!
(
urb
->
transfer_flags
&
URB_NO_DMA_MAP
))
{
if
(
usb_pipecontrol
(
urb
->
pipe
))
pci_unmap_single
(
hcd
->
pdev
,
urb
->
setup_dma
,
sizeof
(
struct
usb_ctrlrequest
),
PCI_DMA_TODEVICE
);
if
(
urb
->
transfer_buffer_length
!=
0
)
pci_unmap_single
(
hcd
->
pdev
,
urb
->
transfer_dma
,
urb
->
transfer_buffer_length
,
usb_pipein
(
urb
->
pipe
)
?
PCI_DMA_FROMDEVICE
:
PCI_DMA_TODEVICE
);
}
/* pass ownership to the completion handler */
/* pass ownership to the completion handler */
urb
->
complete
(
urb
);
urb
->
complete
(
urb
);
usb_put_urb
(
urb
);
usb_put_urb
(
urb
);
...
...
drivers/usb/core/usb.c
View file @
1dab1f42
...
@@ -1641,10 +1641,10 @@ static int __init usb_init(void)
...
@@ -1641,10 +1641,10 @@ static int __init usb_init(void)
*/
*/
static
void
__exit
usb_exit
(
void
)
static
void
__exit
usb_exit
(
void
)
{
{
put_bus
(
&
usb_bus_type
);
usb_major_cleanup
();
usb_major_cleanup
();
usbfs_cleanup
();
usbfs_cleanup
();
usb_hub_cleanup
();
usb_hub_cleanup
();
put_bus
(
&
usb_bus_type
);
}
}
subsys_initcall
(
usb_init
);
subsys_initcall
(
usb_init
);
...
...
drivers/usb/host/ehci-q.c
View file @
1dab1f42
...
@@ -163,7 +163,6 @@ static inline void qtd_copy_status (struct urb *urb, size_t length, u32 token)
...
@@ -163,7 +163,6 @@ static inline void qtd_copy_status (struct urb *urb, size_t length, u32 token)
static
void
ehci_urb_done
(
static
void
ehci_urb_done
(
struct
ehci_hcd
*
ehci
,
struct
ehci_hcd
*
ehci
,
dma_addr_t
addr
,
struct
urb
*
urb
struct
urb
*
urb
)
{
)
{
#ifdef INTR_AUTOMAGIC
#ifdef INTR_AUTOMAGIC
...
@@ -171,13 +170,6 @@ static void ehci_urb_done (
...
@@ -171,13 +170,6 @@ static void ehci_urb_done (
struct
usb_device
*
dev
=
0
;
struct
usb_device
*
dev
=
0
;
#endif
#endif
if
(
urb
->
transfer_buffer_length
)
pci_unmap_single
(
ehci
->
hcd
.
pdev
,
addr
,
urb
->
transfer_buffer_length
,
usb_pipein
(
urb
->
pipe
)
?
PCI_DMA_FROMDEVICE
:
PCI_DMA_TODEVICE
);
if
(
likely
(
urb
->
hcpriv
!=
0
))
{
if
(
likely
(
urb
->
hcpriv
!=
0
))
{
struct
ehci_qh
*
qh
=
(
struct
ehci_qh
*
)
urb
->
hcpriv
;
struct
ehci_qh
*
qh
=
(
struct
ehci_qh
*
)
urb
->
hcpriv
;
...
@@ -263,7 +255,7 @@ qh_completions (struct ehci_hcd *ehci, struct ehci_qh *qh)
...
@@ -263,7 +255,7 @@ qh_completions (struct ehci_hcd *ehci, struct ehci_qh *qh)
if
(
likely
(
last
->
urb
!=
urb
))
{
if
(
likely
(
last
->
urb
!=
urb
))
{
/* complete() can reenter this HCD */
/* complete() can reenter this HCD */
spin_unlock_irqrestore
(
&
ehci
->
lock
,
flags
);
spin_unlock_irqrestore
(
&
ehci
->
lock
,
flags
);
ehci_urb_done
(
ehci
,
last
->
buf_dma
,
last
->
urb
);
ehci_urb_done
(
ehci
,
last
->
urb
);
spin_lock_irqsave
(
&
ehci
->
lock
,
flags
);
spin_lock_irqsave
(
&
ehci
->
lock
,
flags
);
}
}
...
@@ -347,12 +339,6 @@ qh_completions (struct ehci_hcd *ehci, struct ehci_qh *qh)
...
@@ -347,12 +339,6 @@ qh_completions (struct ehci_hcd *ehci, struct ehci_qh *qh)
urb, urb->status, qtd, token,
urb, urb->status, qtd, token,
urb->actual_length);
urb->actual_length);
#endif
#endif
/* SETUP for control urb? */
if
(
unlikely
(
QTD_PID
(
token
)
==
2
))
pci_unmap_single
(
ehci
->
hcd
.
pdev
,
qtd
->
buf_dma
,
sizeof
(
struct
usb_ctrlrequest
),
PCI_DMA_TODEVICE
);
}
}
/* patch up list head? */
/* patch up list head? */
...
@@ -364,7 +350,7 @@ qh_completions (struct ehci_hcd *ehci, struct ehci_qh *qh)
...
@@ -364,7 +350,7 @@ qh_completions (struct ehci_hcd *ehci, struct ehci_qh *qh)
/* last urb's completion might still need calling */
/* last urb's completion might still need calling */
if
(
likely
(
last
!=
0
))
{
if
(
likely
(
last
!=
0
))
{
ehci_urb_done
(
ehci
,
last
->
buf_dma
,
last
->
urb
);
ehci_urb_done
(
ehci
,
last
->
urb
);
ehci_qtd_free
(
ehci
,
last
);
ehci_qtd_free
(
ehci
,
last
);
}
}
}
}
...
@@ -405,10 +391,6 @@ static void qtd_list_free (
...
@@ -405,10 +391,6 @@ static void qtd_list_free (
size
=
qtd
->
urb
->
transfer_buffer_length
;
size
=
qtd
->
urb
->
transfer_buffer_length
;
unmapped
++
;
unmapped
++
;
}
}
if
(
qtd
->
buf_dma
)
pci_unmap_single
(
ehci
->
hcd
.
pdev
,
qtd
->
buf_dma
,
size
,
direction
);
}
}
ehci_qtd_free
(
ehci
,
qtd
);
ehci_qtd_free
(
ehci
,
qtd
);
}
}
...
@@ -425,7 +407,7 @@ qh_urb_transaction (
...
@@ -425,7 +407,7 @@ qh_urb_transaction (
int
flags
int
flags
)
{
)
{
struct
ehci_qtd
*
qtd
,
*
qtd_prev
;
struct
ehci_qtd
*
qtd
,
*
qtd_prev
;
dma_addr_t
buf
,
map_buf
;
dma_addr_t
buf
;
int
len
,
maxpacket
;
int
len
,
maxpacket
;
int
is_input
;
int
is_input
;
u32
token
;
u32
token
;
...
@@ -445,17 +427,8 @@ qh_urb_transaction (
...
@@ -445,17 +427,8 @@ qh_urb_transaction (
/* for split transactions, SplitXState initialized to zero */
/* for split transactions, SplitXState initialized to zero */
if
(
usb_pipecontrol
(
urb
->
pipe
))
{
if
(
usb_pipecontrol
(
urb
->
pipe
))
{
/* control request data is passed in the "setup" pid */
qtd
->
buf_dma
=
pci_map_single
(
ehci
->
hcd
.
pdev
,
urb
->
setup_packet
,
sizeof
(
struct
usb_ctrlrequest
),
PCI_DMA_TODEVICE
);
if
(
unlikely
(
!
qtd
->
buf_dma
))
goto
cleanup
;
/* SETUP pid */
/* SETUP pid */
qtd_fill
(
qtd
,
qtd
->
buf
_dma
,
sizeof
(
struct
usb_ctrlrequest
),
qtd_fill
(
qtd
,
urb
->
setup
_dma
,
sizeof
(
struct
usb_ctrlrequest
),
token
|
(
2
/* "setup" */
<<
8
));
token
|
(
2
/* "setup" */
<<
8
));
/* ... and always at least one more pid */
/* ... and always at least one more pid */
...
@@ -474,16 +447,10 @@ qh_urb_transaction (
...
@@ -474,16 +447,10 @@ qh_urb_transaction (
*/
*/
len
=
urb
->
transfer_buffer_length
;
len
=
urb
->
transfer_buffer_length
;
is_input
=
usb_pipein
(
urb
->
pipe
);
is_input
=
usb_pipein
(
urb
->
pipe
);
if
(
likely
(
len
>
0
))
{
if
(
likely
(
len
>
0
))
buf
=
map_buf
=
pci_map_single
(
ehci
->
hcd
.
pdev
,
buf
=
urb
->
transfer_dma
;
urb
->
transfer_buffer
,
len
,
else
is_input
buf
=
0
;
?
PCI_DMA_FROMDEVICE
:
PCI_DMA_TODEVICE
);
if
(
unlikely
(
!
buf
))
goto
cleanup
;
}
else
buf
=
map_buf
=
0
;
if
(
!
buf
||
is_input
)
if
(
!
buf
||
is_input
)
token
|=
(
1
/* "in" */
<<
8
);
token
|=
(
1
/* "in" */
<<
8
);
...
@@ -500,7 +467,6 @@ qh_urb_transaction (
...
@@ -500,7 +467,6 @@ qh_urb_transaction (
int
this_qtd_len
;
int
this_qtd_len
;
qtd
->
urb
=
urb
;
qtd
->
urb
=
urb
;
qtd
->
buf_dma
=
map_buf
;
this_qtd_len
=
qtd_fill
(
qtd
,
buf
,
len
,
token
);
this_qtd_len
=
qtd_fill
(
qtd
,
buf
,
len
,
token
);
len
-=
this_qtd_len
;
len
-=
this_qtd_len
;
buf
+=
this_qtd_len
;
buf
+=
this_qtd_len
;
...
...
drivers/usb/host/ehci-sched.c
View file @
1dab1f42
...
@@ -530,11 +530,6 @@ itd_free_list (struct ehci_hcd *ehci, struct urb *urb)
...
@@ -530,11 +530,6 @@ itd_free_list (struct ehci_hcd *ehci, struct urb *urb)
{
{
struct
ehci_itd
*
first_itd
=
urb
->
hcpriv
;
struct
ehci_itd
*
first_itd
=
urb
->
hcpriv
;
pci_unmap_single
(
ehci
->
hcd
.
pdev
,
first_itd
->
buf_dma
,
urb
->
transfer_buffer_length
,
usb_pipein
(
urb
->
pipe
)
?
PCI_DMA_FROMDEVICE
:
PCI_DMA_TODEVICE
);
while
(
!
list_empty
(
&
first_itd
->
itd_list
))
{
while
(
!
list_empty
(
&
first_itd
->
itd_list
))
{
struct
ehci_itd
*
itd
;
struct
ehci_itd
*
itd
;
...
@@ -630,16 +625,7 @@ itd_urb_transaction (
...
@@ -630,16 +625,7 @@ itd_urb_transaction (
int
frame_index
;
int
frame_index
;
struct
ehci_itd
*
first_itd
,
*
itd
;
struct
ehci_itd
*
first_itd
,
*
itd
;
int
status
;
int
status
;
dma_addr_t
buf_dma
,
itd_dma
;
dma_addr_t
itd_dma
;
/* set up one dma mapping for this urb */
buf_dma
=
pci_map_single
(
ehci
->
hcd
.
pdev
,
urb
->
transfer_buffer
,
urb
->
transfer_buffer_length
,
usb_pipein
(
urb
->
pipe
)
?
PCI_DMA_FROMDEVICE
:
PCI_DMA_TODEVICE
);
if
(
buf_dma
==
0
)
return
-
ENOMEM
;
/* allocate/init ITDs */
/* allocate/init ITDs */
for
(
frame_index
=
0
,
first_itd
=
0
;
for
(
frame_index
=
0
,
first_itd
=
0
;
...
@@ -653,7 +639,8 @@ itd_urb_transaction (
...
@@ -653,7 +639,8 @@ itd_urb_transaction (
memset
(
itd
,
0
,
sizeof
*
itd
);
memset
(
itd
,
0
,
sizeof
*
itd
);
itd
->
itd_dma
=
itd_dma
;
itd
->
itd_dma
=
itd_dma
;
status
=
itd_fill
(
ehci
,
itd
,
urb
,
frame_index
,
buf_dma
);
status
=
itd_fill
(
ehci
,
itd
,
urb
,
frame_index
,
urb
->
transfer_dma
);
if
(
status
!=
0
)
if
(
status
!=
0
)
goto
fail
;
goto
fail
;
...
...
drivers/usb/host/ehci.h
View file @
1dab1f42
...
@@ -219,7 +219,6 @@ struct ehci_qtd {
...
@@ -219,7 +219,6 @@ struct ehci_qtd {
/* dma same in urb's qtds, except 1st control qtd (setup buffer) */
/* dma same in urb's qtds, except 1st control qtd (setup buffer) */
struct
urb
*
urb
;
/* qtd's urb */
struct
urb
*
urb
;
/* qtd's urb */
dma_addr_t
buf_dma
;
/* buffer address */
size_t
length
;
/* length of buffer */
size_t
length
;
/* length of buffer */
}
__attribute__
((
aligned
(
32
)));
}
__attribute__
((
aligned
(
32
)));
...
...
drivers/usb/host/ohci-q.c
View file @
1dab1f42
...
@@ -14,27 +14,8 @@ static void urb_free_priv (struct ohci_hcd *hc, urb_priv_t *urb_priv)
...
@@ -14,27 +14,8 @@ static void urb_free_priv (struct ohci_hcd *hc, urb_priv_t *urb_priv)
if
(
last
>=
0
)
{
if
(
last
>=
0
)
{
int
i
;
int
i
;
struct
td
*
td
=
urb_priv
->
td
[
0
];
struct
td
*
td
;
int
len
=
td
->
urb
->
transfer_buffer_length
;
int
dir
=
usb_pipeout
(
td
->
urb
->
pipe
)
?
PCI_DMA_TODEVICE
:
PCI_DMA_FROMDEVICE
;
/* unmap CTRL URB setup buffer (always td 0) */
if
(
usb_pipecontrol
(
td
->
urb
->
pipe
))
{
pci_unmap_single
(
hc
->
hcd
.
pdev
,
td
->
data_dma
,
8
,
PCI_DMA_TODEVICE
);
/* CTRL data buffer starts at td 1 if len > 0 */
if
(
len
&&
last
>
0
)
td
=
urb_priv
->
td
[
1
];
}
/* else: ISOC, BULK, INTR data buffer starts at td 0 */
/* unmap data buffer */
if
(
len
&&
td
->
data_dma
)
pci_unmap_single
(
hc
->
hcd
.
pdev
,
td
->
data_dma
,
len
,
dir
);
for
(
i
=
0
;
i
<=
last
;
i
++
)
{
for
(
i
=
0
;
i
<=
last
;
i
++
)
{
td
=
urb_priv
->
td
[
i
];
td
=
urb_priv
->
td
[
i
];
if
(
td
)
if
(
td
)
...
@@ -85,15 +66,8 @@ static inline void intr_resub (struct ohci_hcd *hc, struct urb *urb)
...
@@ -85,15 +66,8 @@ static inline void intr_resub (struct ohci_hcd *hc, struct urb *urb)
struct
urb_priv
*
urb_priv
=
urb
->
hcpriv
;
struct
urb_priv
*
urb_priv
=
urb
->
hcpriv
;
unsigned
long
flags
;
unsigned
long
flags
;
// FIXME rewrite this resubmit path. use pci_dma_sync_single()
// FIXME going away along with the rest of interrrupt automagic...
// and requeue more cheaply, and only if needed.
// Better yet ... abolish the notion of automagic resubmission.
pci_unmap_single
(
hc
->
hcd
.
pdev
,
urb_priv
->
td
[
0
]
->
data_dma
,
urb
->
transfer_buffer_length
,
usb_pipeout
(
urb
->
pipe
)
?
PCI_DMA_TODEVICE
:
PCI_DMA_FROMDEVICE
);
/* FIXME: MP race. If another CPU partially unlinks
/* FIXME: MP race. If another CPU partially unlinks
* this URB (urb->status was updated, hasn't yet told
* this URB (urb->status was updated, hasn't yet told
* us to dequeue) before we call complete() here, an
* us to dequeue) before we call complete() here, an
...
@@ -612,13 +586,9 @@ static void td_submit_urb (
...
@@ -612,13 +586,9 @@ static void td_submit_urb (
urb_priv
->
td_cnt
=
0
;
urb_priv
->
td_cnt
=
0
;
if
(
data_len
)
{
if
(
data_len
)
data
=
pci_map_single
(
ohci
->
hcd
.
pdev
,
data
=
urb
->
transfer_dma
;
urb
->
transfer_buffer
,
data_len
,
else
is_out
?
PCI_DMA_TODEVICE
:
PCI_DMA_FROMDEVICE
);
}
else
data
=
0
;
data
=
0
;
/* NOTE: TD_CC is set so we can tell which TDs the HC processed by
/* NOTE: TD_CC is set so we can tell which TDs the HC processed by
...
@@ -665,11 +635,7 @@ static void td_submit_urb (
...
@@ -665,11 +635,7 @@ static void td_submit_urb (
*/
*/
case
PIPE_CONTROL
:
case
PIPE_CONTROL
:
info
=
TD_CC
|
TD_DP_SETUP
|
TD_T_DATA0
;
info
=
TD_CC
|
TD_DP_SETUP
|
TD_T_DATA0
;
td_fill
(
info
,
td_fill
(
info
,
urb
->
setup_dma
,
8
,
urb
,
cnt
++
);
pci_map_single
(
ohci
->
hcd
.
pdev
,
urb
->
setup_packet
,
8
,
PCI_DMA_TODEVICE
),
8
,
urb
,
cnt
++
);
if
(
data_len
>
0
)
{
if
(
data_len
>
0
)
{
info
=
TD_CC
|
TD_R
|
TD_T_DATA1
;
info
=
TD_CC
|
TD_R
|
TD_T_DATA1
;
info
|=
is_out
?
TD_DP_OUT
:
TD_DP_IN
;
info
|=
is_out
?
TD_DP_OUT
:
TD_DP_IN
;
...
...
drivers/usb/host/ohci-sa1111.c
View file @
1dab1f42
...
@@ -161,6 +161,12 @@ int usb_hcd_sa1111_probe (const struct hc_driver *driver, struct usb_hcd **hcd_o
...
@@ -161,6 +161,12 @@ int usb_hcd_sa1111_probe (const struct hc_driver *driver, struct usb_hcd **hcd_o
hcd
->
regs
=
(
void
*
)
&
USB_OHCI_OP_BASE
;
hcd
->
regs
=
(
void
*
)
&
USB_OHCI_OP_BASE
;
hcd
->
pdev
=
SA1111_FAKE_PCIDEV
;
hcd
->
pdev
=
SA1111_FAKE_PCIDEV
;
retval
=
hcd_buffer_create
(
hcd
);
if
(
retval
!=
0
)
{
dbg
(
"pool alloc fail"
);
goto
err1
;
}
set_irq_type
(
NIRQHCIM
,
IRQT_RISING
);
set_irq_type
(
NIRQHCIM
,
IRQT_RISING
);
retval
=
request_irq
(
NIRQHCIM
,
usb_hcd_sa1111_hcim_irq
,
SA_INTERRUPT
,
retval
=
request_irq
(
NIRQHCIM
,
usb_hcd_sa1111_hcim_irq
,
SA_INTERRUPT
,
hcd
->
description
,
hcd
);
hcd
->
description
,
hcd
);
...
@@ -193,6 +199,7 @@ int usb_hcd_sa1111_probe (const struct hc_driver *driver, struct usb_hcd **hcd_o
...
@@ -193,6 +199,7 @@ int usb_hcd_sa1111_probe (const struct hc_driver *driver, struct usb_hcd **hcd_o
return
0
;
return
0
;
err2:
err2:
hcd_buffer_destroy
(
hcd
);
if
(
hcd
)
driver
->
hcd_free
(
hcd
);
if
(
hcd
)
driver
->
hcd_free
(
hcd
);
err1:
err1:
sa1111_stop_hc
();
sa1111_stop_hc
();
...
@@ -233,6 +240,7 @@ void usb_hcd_sa1111_remove (struct usb_hcd *hcd)
...
@@ -233,6 +240,7 @@ void usb_hcd_sa1111_remove (struct usb_hcd *hcd)
hcd
->
state
=
USB_STATE_HALT
;
hcd
->
state
=
USB_STATE_HALT
;
free_irq
(
hcd
->
irq
,
hcd
);
free_irq
(
hcd
->
irq
,
hcd
);
hcd_buffer_destroy
(
hcd
);
usb_deregister_bus
(
&
hcd
->
self
);
usb_deregister_bus
(
&
hcd
->
self
);
if
(
atomic_read
(
&
hcd
->
self
.
refcnt
)
!=
1
)
if
(
atomic_read
(
&
hcd
->
self
.
refcnt
)
!=
1
)
...
...
drivers/usb/host/uhci-hcd.c
View file @
1dab1f42
...
@@ -646,23 +646,6 @@ static struct urb_priv *uhci_alloc_urb_priv(struct uhci_hcd *uhci, struct urb *u
...
@@ -646,23 +646,6 @@ static struct urb_priv *uhci_alloc_urb_priv(struct uhci_hcd *uhci, struct urb *u
urb
->
hcpriv
=
urbp
;
urb
->
hcpriv
=
urbp
;
if
(
urb
->
transfer_buffer_length
)
{
urbp
->
transfer_buffer_dma_handle
=
pci_map_single
(
uhci
->
dev
,
urb
->
transfer_buffer
,
urb
->
transfer_buffer_length
,
usb_pipein
(
urb
->
pipe
)
?
PCI_DMA_FROMDEVICE
:
PCI_DMA_TODEVICE
);
if
(
!
urbp
->
transfer_buffer_dma_handle
)
return
NULL
;
}
if
(
usb_pipetype
(
urb
->
pipe
)
==
PIPE_CONTROL
&&
urb
->
setup_packet
)
{
urbp
->
setup_packet_dma_handle
=
pci_map_single
(
uhci
->
dev
,
urb
->
setup_packet
,
sizeof
(
struct
usb_ctrlrequest
),
PCI_DMA_TODEVICE
);
if
(
!
urbp
->
setup_packet_dma_handle
)
return
NULL
;
}
return
urbp
;
return
urbp
;
}
}
...
@@ -721,19 +704,6 @@ static void uhci_destroy_urb_priv(struct uhci_hcd *uhci, struct urb *urb)
...
@@ -721,19 +704,6 @@ static void uhci_destroy_urb_priv(struct uhci_hcd *uhci, struct urb *urb)
uhci_free_td
(
uhci
,
td
);
uhci_free_td
(
uhci
,
td
);
}
}
if
(
urbp
->
setup_packet_dma_handle
)
{
pci_unmap_single
(
uhci
->
dev
,
urbp
->
setup_packet_dma_handle
,
sizeof
(
struct
usb_ctrlrequest
),
PCI_DMA_TODEVICE
);
urbp
->
setup_packet_dma_handle
=
0
;
}
if
(
urbp
->
transfer_buffer_dma_handle
)
{
pci_unmap_single
(
uhci
->
dev
,
urbp
->
transfer_buffer_dma_handle
,
urb
->
transfer_buffer_length
,
usb_pipein
(
urb
->
pipe
)
?
PCI_DMA_FROMDEVICE
:
PCI_DMA_TODEVICE
);
urbp
->
transfer_buffer_dma_handle
=
0
;
}
urb
->
hcpriv
=
NULL
;
urb
->
hcpriv
=
NULL
;
kmem_cache_free
(
uhci_up_cachep
,
urbp
);
kmem_cache_free
(
uhci_up_cachep
,
urbp
);
}
}
...
@@ -813,7 +783,7 @@ static int uhci_submit_control(struct uhci_hcd *uhci, struct urb *urb)
...
@@ -813,7 +783,7 @@ static int uhci_submit_control(struct uhci_hcd *uhci, struct urb *urb)
unsigned
long
destination
,
status
;
unsigned
long
destination
,
status
;
int
maxsze
=
usb_maxpacket
(
urb
->
dev
,
urb
->
pipe
,
usb_pipeout
(
urb
->
pipe
));
int
maxsze
=
usb_maxpacket
(
urb
->
dev
,
urb
->
pipe
,
usb_pipeout
(
urb
->
pipe
));
int
len
=
urb
->
transfer_buffer_length
;
int
len
=
urb
->
transfer_buffer_length
;
dma_addr_t
data
=
urb
p
->
transfer_buffer_dma_handle
;
dma_addr_t
data
=
urb
->
transfer_dma
;
/* The "pipe" thing contains the destination in bits 8--18 */
/* The "pipe" thing contains the destination in bits 8--18 */
destination
=
(
urb
->
pipe
&
PIPE_DEVEP_MASK
)
|
USB_PID_SETUP
;
destination
=
(
urb
->
pipe
&
PIPE_DEVEP_MASK
)
|
USB_PID_SETUP
;
...
@@ -832,7 +802,7 @@ static int uhci_submit_control(struct uhci_hcd *uhci, struct urb *urb)
...
@@ -832,7 +802,7 @@ static int uhci_submit_control(struct uhci_hcd *uhci, struct urb *urb)
uhci_add_td_to_urb
(
urb
,
td
);
uhci_add_td_to_urb
(
urb
,
td
);
uhci_fill_td
(
td
,
status
,
destination
|
uhci_explen
(
7
),
uhci_fill_td
(
td
,
status
,
destination
|
uhci_explen
(
7
),
urb
p
->
setup_packet_dma_handle
);
urb
->
setup_dma
);
/*
/*
* If direction is "send", change the frame from SETUP (0x2D)
* If direction is "send", change the frame from SETUP (0x2D)
...
@@ -1072,7 +1042,6 @@ static int uhci_submit_interrupt(struct uhci_hcd *uhci, struct urb *urb)
...
@@ -1072,7 +1042,6 @@ static int uhci_submit_interrupt(struct uhci_hcd *uhci, struct urb *urb)
{
{
struct
uhci_td
*
td
;
struct
uhci_td
*
td
;
unsigned
long
destination
,
status
;
unsigned
long
destination
,
status
;
struct
urb_priv
*
urbp
=
(
struct
urb_priv
*
)
urb
->
hcpriv
;
if
(
urb
->
transfer_buffer_length
>
usb_maxpacket
(
urb
->
dev
,
urb
->
pipe
,
usb_pipeout
(
urb
->
pipe
)))
if
(
urb
->
transfer_buffer_length
>
usb_maxpacket
(
urb
->
dev
,
urb
->
pipe
,
usb_pipeout
(
urb
->
pipe
)))
return
-
EINVAL
;
return
-
EINVAL
;
...
@@ -1094,7 +1063,7 @@ static int uhci_submit_interrupt(struct uhci_hcd *uhci, struct urb *urb)
...
@@ -1094,7 +1063,7 @@ static int uhci_submit_interrupt(struct uhci_hcd *uhci, struct urb *urb)
usb_dotoggle
(
urb
->
dev
,
usb_pipeendpoint
(
urb
->
pipe
),
usb_pipeout
(
urb
->
pipe
));
usb_dotoggle
(
urb
->
dev
,
usb_pipeendpoint
(
urb
->
pipe
),
usb_pipeout
(
urb
->
pipe
));
uhci_add_td_to_urb
(
urb
,
td
);
uhci_add_td_to_urb
(
urb
,
td
);
uhci_fill_td
(
td
,
status
,
destination
,
urb
p
->
transfer_buffer_dma_handle
);
uhci_fill_td
(
td
,
status
,
destination
,
urb
->
transfer_dma
);
uhci_insert_td
(
uhci
,
uhci
->
skeltd
[
__interval_to_skel
(
urb
->
interval
)],
td
);
uhci_insert_td
(
uhci
,
uhci
->
skeltd
[
__interval_to_skel
(
urb
->
interval
)],
td
);
...
@@ -1196,7 +1165,7 @@ static int uhci_submit_bulk(struct uhci_hcd *uhci, struct urb *urb, struct urb *
...
@@ -1196,7 +1165,7 @@ static int uhci_submit_bulk(struct uhci_hcd *uhci, struct urb *urb, struct urb *
int
maxsze
=
usb_maxpacket
(
urb
->
dev
,
urb
->
pipe
,
usb_pipeout
(
urb
->
pipe
));
int
maxsze
=
usb_maxpacket
(
urb
->
dev
,
urb
->
pipe
,
usb_pipeout
(
urb
->
pipe
));
int
len
=
urb
->
transfer_buffer_length
;
int
len
=
urb
->
transfer_buffer_length
;
struct
urb_priv
*
urbp
=
(
struct
urb_priv
*
)
urb
->
hcpriv
;
struct
urb_priv
*
urbp
=
(
struct
urb_priv
*
)
urb
->
hcpriv
;
dma_addr_t
data
=
urb
p
->
transfer_buffer_dma_handle
;
dma_addr_t
data
=
urb
->
transfer_dma
;
if
(
len
<
0
)
if
(
len
<
0
)
return
-
EINVAL
;
return
-
EINVAL
;
...
@@ -1358,7 +1327,6 @@ static int uhci_submit_isochronous(struct uhci_hcd *uhci, struct urb *urb)
...
@@ -1358,7 +1327,6 @@ static int uhci_submit_isochronous(struct uhci_hcd *uhci, struct urb *urb)
struct
uhci_td
*
td
;
struct
uhci_td
*
td
;
int
i
,
ret
,
frame
;
int
i
,
ret
,
frame
;
int
status
,
destination
;
int
status
,
destination
;
struct
urb_priv
*
urbp
=
(
struct
urb_priv
*
)
urb
->
hcpriv
;
status
=
TD_CTRL_ACTIVE
|
TD_CTRL_IOS
;
status
=
TD_CTRL_ACTIVE
|
TD_CTRL_IOS
;
destination
=
(
urb
->
pipe
&
PIPE_DEVEP_MASK
)
|
usb_packetid
(
urb
->
pipe
);
destination
=
(
urb
->
pipe
&
PIPE_DEVEP_MASK
)
|
usb_packetid
(
urb
->
pipe
);
...
@@ -1378,7 +1346,7 @@ static int uhci_submit_isochronous(struct uhci_hcd *uhci, struct urb *urb)
...
@@ -1378,7 +1346,7 @@ static int uhci_submit_isochronous(struct uhci_hcd *uhci, struct urb *urb)
uhci_add_td_to_urb
(
urb
,
td
);
uhci_add_td_to_urb
(
urb
,
td
);
uhci_fill_td
(
td
,
status
,
destination
|
uhci_explen
(
urb
->
iso_frame_desc
[
i
].
length
-
1
),
uhci_fill_td
(
td
,
status
,
destination
|
uhci_explen
(
urb
->
iso_frame_desc
[
i
].
length
-
1
),
urb
p
->
transfer_buffer_dma_handle
+
urb
->
iso_frame_desc
[
i
].
offset
);
urb
->
transfer_dma
+
urb
->
iso_frame_desc
[
i
].
offset
);
if
(
i
+
1
>=
urb
->
number_of_packets
)
if
(
i
+
1
>=
urb
->
number_of_packets
)
td
->
status
|=
cpu_to_le32
(
TD_CTRL_IOC
);
td
->
status
|=
cpu_to_le32
(
TD_CTRL_IOC
);
...
@@ -1832,15 +1800,6 @@ static void uhci_finish_urb(struct usb_hcd *hcd, struct urb *urb)
...
@@ -1832,15 +1800,6 @@ static void uhci_finish_urb(struct usb_hcd *hcd, struct urb *urb)
resubmit_interrupt
=
(
usb_pipetype
(
urb
->
pipe
)
==
PIPE_INTERRUPT
&&
resubmit_interrupt
=
(
usb_pipetype
(
urb
->
pipe
)
==
PIPE_INTERRUPT
&&
urb
->
interval
);
urb
->
interval
);
if
(
urbp
->
transfer_buffer_dma_handle
)
pci_dma_sync_single
(
uhci
->
dev
,
urbp
->
transfer_buffer_dma_handle
,
urb
->
transfer_buffer_length
,
usb_pipein
(
urb
->
pipe
)
?
PCI_DMA_FROMDEVICE
:
PCI_DMA_TODEVICE
);
if
(
urbp
->
setup_packet_dma_handle
)
pci_dma_sync_single
(
uhci
->
dev
,
urbp
->
setup_packet_dma_handle
,
sizeof
(
struct
usb_ctrlrequest
),
PCI_DMA_TODEVICE
);
status
=
urbp
->
status
;
status
=
urbp
->
status
;
if
(
!
resubmit_interrupt
||
killed
)
if
(
!
resubmit_interrupt
||
killed
)
/* We don't need urb_priv anymore */
/* We don't need urb_priv anymore */
...
...
drivers/usb/host/uhci-hcd.h
View file @
1dab1f42
...
@@ -338,9 +338,6 @@ struct urb_priv {
...
@@ -338,9 +338,6 @@ struct urb_priv {
struct
urb
*
urb
;
struct
urb
*
urb
;
struct
usb_device
*
dev
;
struct
usb_device
*
dev
;
dma_addr_t
setup_packet_dma_handle
;
dma_addr_t
transfer_buffer_dma_handle
;
struct
uhci_qh
*
qh
;
/* QH for this URB */
struct
uhci_qh
*
qh
;
/* QH for this URB */
struct
list_head
td_list
;
/* P: urb->lock */
struct
list_head
td_list
;
/* P: urb->lock */
...
...
drivers/usb/net/cdc-ether.c
View file @
1dab1f42
...
@@ -436,7 +436,10 @@ static void CDCEther_set_multicast( struct net_device *net )
...
@@ -436,7 +436,10 @@ static void CDCEther_set_multicast( struct net_device *net )
// Tell the kernel to stop sending us frames while we get this
// Tell the kernel to stop sending us frames while we get this
// all set up.
// all set up.
netif_stop_queue
(
net
);
// netif_stop_queue(net);
// FIXME: We hold xmit_lock. If you want to do the queue stuff you need
// to enable it from a completion handler
/* Note: do not reorder, GCC is clever about common statements. */
/* Note: do not reorder, GCC is clever about common statements. */
if
(
net
->
flags
&
IFF_PROMISC
)
{
if
(
net
->
flags
&
IFF_PROMISC
)
{
...
@@ -469,7 +472,7 @@ static void CDCEther_set_multicast( struct net_device *net )
...
@@ -469,7 +472,7 @@ static void CDCEther_set_multicast( struct net_device *net )
MODE_FLAG_DIRECTED
|
MODE_FLAG_DIRECTED
|
MODE_FLAG_BROADCAST
|
MODE_FLAG_BROADCAST
|
MODE_FLAG_MULTICAST
;
MODE_FLAG_MULTICAST
;
buff
=
kmalloc
(
6
*
net
->
mc_count
,
in_interrupt
()
?
GFP_ATOMIC
:
GFP_KERNEL
);
buff
=
kmalloc
(
6
*
net
->
mc_count
,
GFP_ATOMIC
);
for
(
i
=
0
,
mclist
=
net
->
mc_list
;
for
(
i
=
0
,
mclist
=
net
->
mc_list
;
mclist
&&
i
<
net
->
mc_count
;
mclist
&&
i
<
net
->
mc_count
;
i
++
,
mclist
=
mclist
->
next
)
{
i
++
,
mclist
=
mclist
->
next
)
{
...
@@ -477,6 +480,7 @@ static void CDCEther_set_multicast( struct net_device *net )
...
@@ -477,6 +480,7 @@ static void CDCEther_set_multicast( struct net_device *net )
}
}
#if 0
#if 0
usb_control_msg(ether_dev->usb,
usb_control_msg(ether_dev->usb,
// FIXME: We hold a spinlock. You must not use a synchronous API
usb_sndctrlpipe(ether_dev->usb, 0),
usb_sndctrlpipe(ether_dev->usb, 0),
SET_ETHERNET_MULTICAST_FILTER, /* request */
SET_ETHERNET_MULTICAST_FILTER, /* request */
USB_TYPE_CLASS | USB_DIR_OUT | USB_RECIP_INTERFACE, /* request type */
USB_TYPE_CLASS | USB_DIR_OUT | USB_RECIP_INTERFACE, /* request type */
...
@@ -493,7 +497,7 @@ static void CDCEther_set_multicast( struct net_device *net )
...
@@ -493,7 +497,7 @@ static void CDCEther_set_multicast( struct net_device *net )
CDC_SetEthernetPacketFilter(ether_dev);
CDC_SetEthernetPacketFilter(ether_dev);
#endif
#endif
// Tell the kernel to start giving frames to us again.
// Tell the kernel to start giving frames to us again.
netif_wake_queue
(
net
);
//
netif_wake_queue(net);
}
}
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
...
...
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