License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 14:07:57 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2005-04-16 22:20:36 +00:00
|
|
|
/*
|
|
|
|
* Universal Host Controller Interface driver for USB.
|
|
|
|
*
|
|
|
|
* Maintainer: Alan Stern <stern@rowland.harvard.edu>
|
|
|
|
*
|
|
|
|
* (C) Copyright 1999 Linus Torvalds
|
|
|
|
* (C) Copyright 1999-2002 Johannes Erdfelt, johannes@erdfelt.com
|
|
|
|
* (C) Copyright 1999 Randy Dunlap
|
|
|
|
* (C) Copyright 1999 Georg Acher, acher@in.tum.de
|
|
|
|
* (C) Copyright 1999 Deti Fliegl, deti@fliegl.de
|
|
|
|
* (C) Copyright 1999 Thomas Sailer, sailer@ife.ee.ethz.ch
|
|
|
|
* (C) Copyright 1999 Roman Weissgaerber, weissg@vienna.at
|
|
|
|
* (C) Copyright 2000 Yggdrasil Computing, Inc. (port of new PCI interface
|
|
|
|
* support from usb-ohci.c by Adam Richter, adam@yggdrasil.com).
|
|
|
|
* (C) Copyright 1999 Gregory P. Smith (from usb-ohci.c)
|
2007-02-19 20:52:45 +00:00
|
|
|
* (C) Copyright 2004-2007 Alan Stern, stern@rowland.harvard.edu
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Technically, updating td->status here is a race, but it's not really a
|
|
|
|
* problem. The worst that can happen is that we set the IOC bit again
|
|
|
|
* generating a spurious interrupt. We could fix this by creating another
|
|
|
|
* QH and leaving the IOC bit always set, but then we would have to play
|
|
|
|
* games with the FSBR code to make sure we get the correct order in all
|
|
|
|
* the cases. I don't think it's worth the effort
|
|
|
|
*/
|
2005-12-17 22:58:46 +00:00
|
|
|
static void uhci_set_next_interrupt(struct uhci_hcd *uhci)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2005-04-21 20:04:58 +00:00
|
|
|
if (uhci->is_stopped)
|
2005-09-05 17:59:51 +00:00
|
|
|
mod_timer(&uhci_to_hcd(uhci)->rh_timer, jiffies);
|
2011-05-18 08:44:51 +00:00
|
|
|
uhci->term_td->status |= cpu_to_hc32(uhci, TD_CTRL_IOC);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void uhci_clear_next_interrupt(struct uhci_hcd *uhci)
|
|
|
|
{
|
2011-05-18 08:44:51 +00:00
|
|
|
uhci->term_td->status &= ~cpu_to_hc32(uhci, TD_CTRL_IOC);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2006-05-12 15:35:45 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Full-Speed Bandwidth Reclamation (FSBR).
|
|
|
|
* We turn on FSBR whenever a queue that wants it is advancing,
|
|
|
|
* and leave it on for a short time thereafter.
|
|
|
|
*/
|
|
|
|
static void uhci_fsbr_on(struct uhci_hcd *uhci)
|
|
|
|
{
|
2007-03-19 19:31:42 +00:00
|
|
|
struct uhci_qh *lqh;
|
2007-02-19 20:52:45 +00:00
|
|
|
|
2007-03-19 19:31:42 +00:00
|
|
|
/* The terminating skeleton QH always points back to the first
|
|
|
|
* FSBR QH. Make the last async QH point to the terminating
|
|
|
|
* skeleton QH. */
|
2006-05-12 15:35:45 +00:00
|
|
|
uhci->fsbr_is_on = 1;
|
2007-02-19 20:52:45 +00:00
|
|
|
lqh = list_entry(uhci->skel_async_qh->node.prev,
|
|
|
|
struct uhci_qh, node);
|
2011-05-18 08:44:51 +00:00
|
|
|
lqh->link = LINK_TO_QH(uhci, uhci->skel_term_qh);
|
2006-05-12 15:35:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void uhci_fsbr_off(struct uhci_hcd *uhci)
|
|
|
|
{
|
2007-02-19 20:52:45 +00:00
|
|
|
struct uhci_qh *lqh;
|
|
|
|
|
2007-03-19 19:31:42 +00:00
|
|
|
/* Remove the link from the last async QH to the terminating
|
|
|
|
* skeleton QH. */
|
2006-05-12 15:35:45 +00:00
|
|
|
uhci->fsbr_is_on = 0;
|
2007-02-19 20:52:45 +00:00
|
|
|
lqh = list_entry(uhci->skel_async_qh->node.prev,
|
|
|
|
struct uhci_qh, node);
|
2011-05-18 08:44:51 +00:00
|
|
|
lqh->link = UHCI_PTR_TERM(uhci);
|
2006-05-12 15:35:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void uhci_add_fsbr(struct uhci_hcd *uhci, struct urb *urb)
|
|
|
|
{
|
|
|
|
struct urb_priv *urbp = urb->hcpriv;
|
|
|
|
|
|
|
|
if (!(urb->transfer_flags & URB_NO_FSBR))
|
|
|
|
urbp->fsbr = 1;
|
|
|
|
}
|
|
|
|
|
2006-06-05 16:28:57 +00:00
|
|
|
static void uhci_urbp_wants_fsbr(struct uhci_hcd *uhci, struct urb_priv *urbp)
|
2006-05-12 15:35:45 +00:00
|
|
|
{
|
|
|
|
if (urbp->fsbr) {
|
2006-06-05 16:28:57 +00:00
|
|
|
uhci->fsbr_is_wanted = 1;
|
2006-05-12 15:35:45 +00:00
|
|
|
if (!uhci->fsbr_is_on)
|
|
|
|
uhci_fsbr_on(uhci);
|
2006-06-05 16:28:57 +00:00
|
|
|
else if (uhci->fsbr_expiring) {
|
|
|
|
uhci->fsbr_expiring = 0;
|
|
|
|
del_timer(&uhci->fsbr_timer);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
treewide: setup_timer() -> timer_setup()
This converts all remaining cases of the old setup_timer() API into using
timer_setup(), where the callback argument is the structure already
holding the struct timer_list. These should have no behavioral changes,
since they just change which pointer is passed into the callback with
the same available pointers after conversion. It handles the following
examples, in addition to some other variations.
Casting from unsigned long:
void my_callback(unsigned long data)
{
struct something *ptr = (struct something *)data;
...
}
...
setup_timer(&ptr->my_timer, my_callback, ptr);
and forced object casts:
void my_callback(struct something *ptr)
{
...
}
...
setup_timer(&ptr->my_timer, my_callback, (unsigned long)ptr);
become:
void my_callback(struct timer_list *t)
{
struct something *ptr = from_timer(ptr, t, my_timer);
...
}
...
timer_setup(&ptr->my_timer, my_callback, 0);
Direct function assignments:
void my_callback(unsigned long data)
{
struct something *ptr = (struct something *)data;
...
}
...
ptr->my_timer.function = my_callback;
have a temporary cast added, along with converting the args:
void my_callback(struct timer_list *t)
{
struct something *ptr = from_timer(ptr, t, my_timer);
...
}
...
ptr->my_timer.function = (TIMER_FUNC_TYPE)my_callback;
And finally, callbacks without a data assignment:
void my_callback(unsigned long data)
{
...
}
...
setup_timer(&ptr->my_timer, my_callback, 0);
have their argument renamed to verify they're unused during conversion:
void my_callback(struct timer_list *unused)
{
...
}
...
timer_setup(&ptr->my_timer, my_callback, 0);
The conversion is done with the following Coccinelle script:
spatch --very-quiet --all-includes --include-headers \
-I ./arch/x86/include -I ./arch/x86/include/generated \
-I ./include -I ./arch/x86/include/uapi \
-I ./arch/x86/include/generated/uapi -I ./include/uapi \
-I ./include/generated/uapi --include ./include/linux/kconfig.h \
--dir . \
--cocci-file ~/src/data/timer_setup.cocci
@fix_address_of@
expression e;
@@
setup_timer(
-&(e)
+&e
, ...)
// Update any raw setup_timer() usages that have a NULL callback, but
// would otherwise match change_timer_function_usage, since the latter
// will update all function assignments done in the face of a NULL
// function initialization in setup_timer().
@change_timer_function_usage_NULL@
expression _E;
identifier _timer;
type _cast_data;
@@
(
-setup_timer(&_E->_timer, NULL, _E);
+timer_setup(&_E->_timer, NULL, 0);
|
-setup_timer(&_E->_timer, NULL, (_cast_data)_E);
+timer_setup(&_E->_timer, NULL, 0);
|
-setup_timer(&_E._timer, NULL, &_E);
+timer_setup(&_E._timer, NULL, 0);
|
-setup_timer(&_E._timer, NULL, (_cast_data)&_E);
+timer_setup(&_E._timer, NULL, 0);
)
@change_timer_function_usage@
expression _E;
identifier _timer;
struct timer_list _stl;
identifier _callback;
type _cast_func, _cast_data;
@@
(
-setup_timer(&_E->_timer, _callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, &_callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, _callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, &_callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)_callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)&_callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)_callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)&_callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, &_callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, &_callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)_callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)_callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)&_callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)&_callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
_E->_timer@_stl.function = _callback;
|
_E->_timer@_stl.function = &_callback;
|
_E->_timer@_stl.function = (_cast_func)_callback;
|
_E->_timer@_stl.function = (_cast_func)&_callback;
|
_E._timer@_stl.function = _callback;
|
_E._timer@_stl.function = &_callback;
|
_E._timer@_stl.function = (_cast_func)_callback;
|
_E._timer@_stl.function = (_cast_func)&_callback;
)
// callback(unsigned long arg)
@change_callback_handle_cast
depends on change_timer_function_usage@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _origtype;
identifier _origarg;
type _handletype;
identifier _handle;
@@
void _callback(
-_origtype _origarg
+struct timer_list *t
)
{
(
... when != _origarg
_handletype *_handle =
-(_handletype *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
|
... when != _origarg
_handletype *_handle =
-(void *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
|
... when != _origarg
_handletype *_handle;
... when != _handle
_handle =
-(_handletype *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
|
... when != _origarg
_handletype *_handle;
... when != _handle
_handle =
-(void *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
)
}
// callback(unsigned long arg) without existing variable
@change_callback_handle_cast_no_arg
depends on change_timer_function_usage &&
!change_callback_handle_cast@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _origtype;
identifier _origarg;
type _handletype;
@@
void _callback(
-_origtype _origarg
+struct timer_list *t
)
{
+ _handletype *_origarg = from_timer(_origarg, t, _timer);
+
... when != _origarg
- (_handletype *)_origarg
+ _origarg
... when != _origarg
}
// Avoid already converted callbacks.
@match_callback_converted
depends on change_timer_function_usage &&
!change_callback_handle_cast &&
!change_callback_handle_cast_no_arg@
identifier change_timer_function_usage._callback;
identifier t;
@@
void _callback(struct timer_list *t)
{ ... }
// callback(struct something *handle)
@change_callback_handle_arg
depends on change_timer_function_usage &&
!match_callback_converted &&
!change_callback_handle_cast &&
!change_callback_handle_cast_no_arg@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _handletype;
identifier _handle;
@@
void _callback(
-_handletype *_handle
+struct timer_list *t
)
{
+ _handletype *_handle = from_timer(_handle, t, _timer);
...
}
// If change_callback_handle_arg ran on an empty function, remove
// the added handler.
@unchange_callback_handle_arg
depends on change_timer_function_usage &&
change_callback_handle_arg@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _handletype;
identifier _handle;
identifier t;
@@
void _callback(struct timer_list *t)
{
- _handletype *_handle = from_timer(_handle, t, _timer);
}
// We only want to refactor the setup_timer() data argument if we've found
// the matching callback. This undoes changes in change_timer_function_usage.
@unchange_timer_function_usage
depends on change_timer_function_usage &&
!change_callback_handle_cast &&
!change_callback_handle_cast_no_arg &&
!change_callback_handle_arg@
expression change_timer_function_usage._E;
identifier change_timer_function_usage._timer;
identifier change_timer_function_usage._callback;
type change_timer_function_usage._cast_data;
@@
(
-timer_setup(&_E->_timer, _callback, 0);
+setup_timer(&_E->_timer, _callback, (_cast_data)_E);
|
-timer_setup(&_E._timer, _callback, 0);
+setup_timer(&_E._timer, _callback, (_cast_data)&_E);
)
// If we fixed a callback from a .function assignment, fix the
// assignment cast now.
@change_timer_function_assignment
depends on change_timer_function_usage &&
(change_callback_handle_cast ||
change_callback_handle_cast_no_arg ||
change_callback_handle_arg)@
expression change_timer_function_usage._E;
identifier change_timer_function_usage._timer;
identifier change_timer_function_usage._callback;
type _cast_func;
typedef TIMER_FUNC_TYPE;
@@
(
_E->_timer.function =
-_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E->_timer.function =
-&_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E->_timer.function =
-(_cast_func)_callback;
+(TIMER_FUNC_TYPE)_callback
;
|
_E->_timer.function =
-(_cast_func)&_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-&_callback;
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-(_cast_func)_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-(_cast_func)&_callback
+(TIMER_FUNC_TYPE)_callback
;
)
// Sometimes timer functions are called directly. Replace matched args.
@change_timer_function_calls
depends on change_timer_function_usage &&
(change_callback_handle_cast ||
change_callback_handle_cast_no_arg ||
change_callback_handle_arg)@
expression _E;
identifier change_timer_function_usage._timer;
identifier change_timer_function_usage._callback;
type _cast_data;
@@
_callback(
(
-(_cast_data)_E
+&_E->_timer
|
-(_cast_data)&_E
+&_E._timer
|
-_E
+&_E->_timer
)
)
// If a timer has been configured without a data argument, it can be
// converted without regard to the callback argument, since it is unused.
@match_timer_function_unused_data@
expression _E;
identifier _timer;
identifier _callback;
@@
(
-setup_timer(&_E->_timer, _callback, 0);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, _callback, 0L);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, _callback, 0UL);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, 0);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, 0L);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, 0UL);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_timer, _callback, 0);
+timer_setup(&_timer, _callback, 0);
|
-setup_timer(&_timer, _callback, 0L);
+timer_setup(&_timer, _callback, 0);
|
-setup_timer(&_timer, _callback, 0UL);
+timer_setup(&_timer, _callback, 0);
|
-setup_timer(_timer, _callback, 0);
+timer_setup(_timer, _callback, 0);
|
-setup_timer(_timer, _callback, 0L);
+timer_setup(_timer, _callback, 0);
|
-setup_timer(_timer, _callback, 0UL);
+timer_setup(_timer, _callback, 0);
)
@change_callback_unused_data
depends on match_timer_function_unused_data@
identifier match_timer_function_unused_data._callback;
type _origtype;
identifier _origarg;
@@
void _callback(
-_origtype _origarg
+struct timer_list *unused
)
{
... when != _origarg
}
Signed-off-by: Kees Cook <keescook@chromium.org>
2017-10-16 21:43:17 +00:00
|
|
|
static void uhci_fsbr_timeout(struct timer_list *t)
|
2006-06-05 16:28:57 +00:00
|
|
|
{
|
treewide: setup_timer() -> timer_setup()
This converts all remaining cases of the old setup_timer() API into using
timer_setup(), where the callback argument is the structure already
holding the struct timer_list. These should have no behavioral changes,
since they just change which pointer is passed into the callback with
the same available pointers after conversion. It handles the following
examples, in addition to some other variations.
Casting from unsigned long:
void my_callback(unsigned long data)
{
struct something *ptr = (struct something *)data;
...
}
...
setup_timer(&ptr->my_timer, my_callback, ptr);
and forced object casts:
void my_callback(struct something *ptr)
{
...
}
...
setup_timer(&ptr->my_timer, my_callback, (unsigned long)ptr);
become:
void my_callback(struct timer_list *t)
{
struct something *ptr = from_timer(ptr, t, my_timer);
...
}
...
timer_setup(&ptr->my_timer, my_callback, 0);
Direct function assignments:
void my_callback(unsigned long data)
{
struct something *ptr = (struct something *)data;
...
}
...
ptr->my_timer.function = my_callback;
have a temporary cast added, along with converting the args:
void my_callback(struct timer_list *t)
{
struct something *ptr = from_timer(ptr, t, my_timer);
...
}
...
ptr->my_timer.function = (TIMER_FUNC_TYPE)my_callback;
And finally, callbacks without a data assignment:
void my_callback(unsigned long data)
{
...
}
...
setup_timer(&ptr->my_timer, my_callback, 0);
have their argument renamed to verify they're unused during conversion:
void my_callback(struct timer_list *unused)
{
...
}
...
timer_setup(&ptr->my_timer, my_callback, 0);
The conversion is done with the following Coccinelle script:
spatch --very-quiet --all-includes --include-headers \
-I ./arch/x86/include -I ./arch/x86/include/generated \
-I ./include -I ./arch/x86/include/uapi \
-I ./arch/x86/include/generated/uapi -I ./include/uapi \
-I ./include/generated/uapi --include ./include/linux/kconfig.h \
--dir . \
--cocci-file ~/src/data/timer_setup.cocci
@fix_address_of@
expression e;
@@
setup_timer(
-&(e)
+&e
, ...)
// Update any raw setup_timer() usages that have a NULL callback, but
// would otherwise match change_timer_function_usage, since the latter
// will update all function assignments done in the face of a NULL
// function initialization in setup_timer().
@change_timer_function_usage_NULL@
expression _E;
identifier _timer;
type _cast_data;
@@
(
-setup_timer(&_E->_timer, NULL, _E);
+timer_setup(&_E->_timer, NULL, 0);
|
-setup_timer(&_E->_timer, NULL, (_cast_data)_E);
+timer_setup(&_E->_timer, NULL, 0);
|
-setup_timer(&_E._timer, NULL, &_E);
+timer_setup(&_E._timer, NULL, 0);
|
-setup_timer(&_E._timer, NULL, (_cast_data)&_E);
+timer_setup(&_E._timer, NULL, 0);
)
@change_timer_function_usage@
expression _E;
identifier _timer;
struct timer_list _stl;
identifier _callback;
type _cast_func, _cast_data;
@@
(
-setup_timer(&_E->_timer, _callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, &_callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, _callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, &_callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)_callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)&_callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)_callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)&_callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, &_callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, &_callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)_callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)_callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)&_callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)&_callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
_E->_timer@_stl.function = _callback;
|
_E->_timer@_stl.function = &_callback;
|
_E->_timer@_stl.function = (_cast_func)_callback;
|
_E->_timer@_stl.function = (_cast_func)&_callback;
|
_E._timer@_stl.function = _callback;
|
_E._timer@_stl.function = &_callback;
|
_E._timer@_stl.function = (_cast_func)_callback;
|
_E._timer@_stl.function = (_cast_func)&_callback;
)
// callback(unsigned long arg)
@change_callback_handle_cast
depends on change_timer_function_usage@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _origtype;
identifier _origarg;
type _handletype;
identifier _handle;
@@
void _callback(
-_origtype _origarg
+struct timer_list *t
)
{
(
... when != _origarg
_handletype *_handle =
-(_handletype *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
|
... when != _origarg
_handletype *_handle =
-(void *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
|
... when != _origarg
_handletype *_handle;
... when != _handle
_handle =
-(_handletype *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
|
... when != _origarg
_handletype *_handle;
... when != _handle
_handle =
-(void *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
)
}
// callback(unsigned long arg) without existing variable
@change_callback_handle_cast_no_arg
depends on change_timer_function_usage &&
!change_callback_handle_cast@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _origtype;
identifier _origarg;
type _handletype;
@@
void _callback(
-_origtype _origarg
+struct timer_list *t
)
{
+ _handletype *_origarg = from_timer(_origarg, t, _timer);
+
... when != _origarg
- (_handletype *)_origarg
+ _origarg
... when != _origarg
}
// Avoid already converted callbacks.
@match_callback_converted
depends on change_timer_function_usage &&
!change_callback_handle_cast &&
!change_callback_handle_cast_no_arg@
identifier change_timer_function_usage._callback;
identifier t;
@@
void _callback(struct timer_list *t)
{ ... }
// callback(struct something *handle)
@change_callback_handle_arg
depends on change_timer_function_usage &&
!match_callback_converted &&
!change_callback_handle_cast &&
!change_callback_handle_cast_no_arg@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _handletype;
identifier _handle;
@@
void _callback(
-_handletype *_handle
+struct timer_list *t
)
{
+ _handletype *_handle = from_timer(_handle, t, _timer);
...
}
// If change_callback_handle_arg ran on an empty function, remove
// the added handler.
@unchange_callback_handle_arg
depends on change_timer_function_usage &&
change_callback_handle_arg@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _handletype;
identifier _handle;
identifier t;
@@
void _callback(struct timer_list *t)
{
- _handletype *_handle = from_timer(_handle, t, _timer);
}
// We only want to refactor the setup_timer() data argument if we've found
// the matching callback. This undoes changes in change_timer_function_usage.
@unchange_timer_function_usage
depends on change_timer_function_usage &&
!change_callback_handle_cast &&
!change_callback_handle_cast_no_arg &&
!change_callback_handle_arg@
expression change_timer_function_usage._E;
identifier change_timer_function_usage._timer;
identifier change_timer_function_usage._callback;
type change_timer_function_usage._cast_data;
@@
(
-timer_setup(&_E->_timer, _callback, 0);
+setup_timer(&_E->_timer, _callback, (_cast_data)_E);
|
-timer_setup(&_E._timer, _callback, 0);
+setup_timer(&_E._timer, _callback, (_cast_data)&_E);
)
// If we fixed a callback from a .function assignment, fix the
// assignment cast now.
@change_timer_function_assignment
depends on change_timer_function_usage &&
(change_callback_handle_cast ||
change_callback_handle_cast_no_arg ||
change_callback_handle_arg)@
expression change_timer_function_usage._E;
identifier change_timer_function_usage._timer;
identifier change_timer_function_usage._callback;
type _cast_func;
typedef TIMER_FUNC_TYPE;
@@
(
_E->_timer.function =
-_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E->_timer.function =
-&_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E->_timer.function =
-(_cast_func)_callback;
+(TIMER_FUNC_TYPE)_callback
;
|
_E->_timer.function =
-(_cast_func)&_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-&_callback;
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-(_cast_func)_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-(_cast_func)&_callback
+(TIMER_FUNC_TYPE)_callback
;
)
// Sometimes timer functions are called directly. Replace matched args.
@change_timer_function_calls
depends on change_timer_function_usage &&
(change_callback_handle_cast ||
change_callback_handle_cast_no_arg ||
change_callback_handle_arg)@
expression _E;
identifier change_timer_function_usage._timer;
identifier change_timer_function_usage._callback;
type _cast_data;
@@
_callback(
(
-(_cast_data)_E
+&_E->_timer
|
-(_cast_data)&_E
+&_E._timer
|
-_E
+&_E->_timer
)
)
// If a timer has been configured without a data argument, it can be
// converted without regard to the callback argument, since it is unused.
@match_timer_function_unused_data@
expression _E;
identifier _timer;
identifier _callback;
@@
(
-setup_timer(&_E->_timer, _callback, 0);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, _callback, 0L);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, _callback, 0UL);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, 0);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, 0L);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, 0UL);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_timer, _callback, 0);
+timer_setup(&_timer, _callback, 0);
|
-setup_timer(&_timer, _callback, 0L);
+timer_setup(&_timer, _callback, 0);
|
-setup_timer(&_timer, _callback, 0UL);
+timer_setup(&_timer, _callback, 0);
|
-setup_timer(_timer, _callback, 0);
+timer_setup(_timer, _callback, 0);
|
-setup_timer(_timer, _callback, 0L);
+timer_setup(_timer, _callback, 0);
|
-setup_timer(_timer, _callback, 0UL);
+timer_setup(_timer, _callback, 0);
)
@change_callback_unused_data
depends on match_timer_function_unused_data@
identifier match_timer_function_unused_data._callback;
type _origtype;
identifier _origarg;
@@
void _callback(
-_origtype _origarg
+struct timer_list *unused
)
{
... when != _origarg
}
Signed-off-by: Kees Cook <keescook@chromium.org>
2017-10-16 21:43:17 +00:00
|
|
|
struct uhci_hcd *uhci = from_timer(uhci, t, fsbr_timer);
|
2006-06-05 16:28:57 +00:00
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&uhci->lock, flags);
|
|
|
|
if (uhci->fsbr_expiring) {
|
|
|
|
uhci->fsbr_expiring = 0;
|
|
|
|
uhci_fsbr_off(uhci);
|
2006-05-12 15:35:45 +00:00
|
|
|
}
|
2006-06-05 16:28:57 +00:00
|
|
|
spin_unlock_irqrestore(&uhci->lock, flags);
|
2006-05-12 15:35:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-04-25 15:14:31 +00:00
|
|
|
static struct uhci_td *uhci_alloc_td(struct uhci_hcd *uhci)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
dma_addr_t dma_handle;
|
|
|
|
struct uhci_td *td;
|
|
|
|
|
|
|
|
td = dma_pool_alloc(uhci->td_pool, GFP_ATOMIC, &dma_handle);
|
|
|
|
if (!td)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
td->dma_handle = dma_handle;
|
|
|
|
td->frame = -1;
|
|
|
|
|
|
|
|
INIT_LIST_HEAD(&td->list);
|
|
|
|
INIT_LIST_HEAD(&td->fl_list);
|
|
|
|
|
|
|
|
return td;
|
|
|
|
}
|
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
static void uhci_free_td(struct uhci_hcd *uhci, struct uhci_td *td)
|
|
|
|
{
|
2008-09-21 02:09:37 +00:00
|
|
|
if (!list_empty(&td->list))
|
|
|
|
dev_WARN(uhci_dev(uhci), "td %p still in list!\n", td);
|
|
|
|
if (!list_empty(&td->fl_list))
|
|
|
|
dev_WARN(uhci_dev(uhci), "td %p still in fl_list!\n", td);
|
2005-12-17 22:58:46 +00:00
|
|
|
|
|
|
|
dma_pool_free(uhci->td_pool, td, td->dma_handle);
|
|
|
|
}
|
|
|
|
|
2011-05-18 08:44:51 +00:00
|
|
|
static inline void uhci_fill_td(struct uhci_hcd *uhci, struct uhci_td *td,
|
|
|
|
u32 status, u32 token, u32 buffer)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2011-05-18 08:44:51 +00:00
|
|
|
td->status = cpu_to_hc32(uhci, status);
|
|
|
|
td->token = cpu_to_hc32(uhci, token);
|
|
|
|
td->buffer = cpu_to_hc32(uhci, buffer);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2006-05-12 15:29:04 +00:00
|
|
|
static void uhci_add_td_to_urbp(struct uhci_td *td, struct urb_priv *urbp)
|
|
|
|
{
|
|
|
|
list_add_tail(&td->list, &urbp->td_list);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void uhci_remove_td_from_urbp(struct uhci_td *td)
|
|
|
|
{
|
|
|
|
list_del_init(&td->list);
|
|
|
|
}
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/*
|
2005-11-30 22:16:19 +00:00
|
|
|
* We insert Isochronous URBs directly into the frame list at the beginning
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
2005-12-17 22:58:46 +00:00
|
|
|
static inline void uhci_insert_td_in_frame_list(struct uhci_hcd *uhci,
|
|
|
|
struct uhci_td *td, unsigned framenum)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
framenum &= (UHCI_NUMFRAMES - 1);
|
|
|
|
|
|
|
|
td->frame = framenum;
|
|
|
|
|
|
|
|
/* Is there a TD already mapped there? */
|
2005-09-16 18:22:51 +00:00
|
|
|
if (uhci->frame_cpu[framenum]) {
|
2005-04-16 22:20:36 +00:00
|
|
|
struct uhci_td *ftd, *ltd;
|
|
|
|
|
2005-09-16 18:22:51 +00:00
|
|
|
ftd = uhci->frame_cpu[framenum];
|
2005-04-16 22:20:36 +00:00
|
|
|
ltd = list_entry(ftd->fl_list.prev, struct uhci_td, fl_list);
|
|
|
|
|
|
|
|
list_add_tail(&td->fl_list, &ftd->fl_list);
|
|
|
|
|
|
|
|
td->link = ltd->link;
|
|
|
|
wmb();
|
2011-05-18 08:44:51 +00:00
|
|
|
ltd->link = LINK_TO_TD(uhci, td);
|
2005-04-16 22:20:36 +00:00
|
|
|
} else {
|
2005-09-16 18:22:51 +00:00
|
|
|
td->link = uhci->frame[framenum];
|
2005-04-16 22:20:36 +00:00
|
|
|
wmb();
|
2011-05-18 08:44:51 +00:00
|
|
|
uhci->frame[framenum] = LINK_TO_TD(uhci, td);
|
2005-09-16 18:22:51 +00:00
|
|
|
uhci->frame_cpu[framenum] = td;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
static inline void uhci_remove_td_from_frame_list(struct uhci_hcd *uhci,
|
2005-10-13 21:00:24 +00:00
|
|
|
struct uhci_td *td)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
/* If it's not inserted, don't remove it */
|
2005-10-13 21:00:24 +00:00
|
|
|
if (td->frame == -1) {
|
|
|
|
WARN_ON(!list_empty(&td->fl_list));
|
2005-04-16 22:20:36 +00:00
|
|
|
return;
|
2005-10-13 21:00:24 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-10-13 21:00:24 +00:00
|
|
|
if (uhci->frame_cpu[td->frame] == td) {
|
2005-04-16 22:20:36 +00:00
|
|
|
if (list_empty(&td->fl_list)) {
|
2005-09-16 18:22:51 +00:00
|
|
|
uhci->frame[td->frame] = td->link;
|
|
|
|
uhci->frame_cpu[td->frame] = NULL;
|
2005-04-16 22:20:36 +00:00
|
|
|
} else {
|
|
|
|
struct uhci_td *ntd;
|
|
|
|
|
2010-12-09 13:24:27 +00:00
|
|
|
ntd = list_entry(td->fl_list.next,
|
|
|
|
struct uhci_td,
|
|
|
|
fl_list);
|
2011-05-18 08:44:51 +00:00
|
|
|
uhci->frame[td->frame] = LINK_TO_TD(uhci, ntd);
|
2005-09-16 18:22:51 +00:00
|
|
|
uhci->frame_cpu[td->frame] = ntd;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
struct uhci_td *ptd;
|
|
|
|
|
|
|
|
ptd = list_entry(td->fl_list.prev, struct uhci_td, fl_list);
|
|
|
|
ptd->link = td->link;
|
|
|
|
}
|
|
|
|
|
|
|
|
list_del_init(&td->fl_list);
|
|
|
|
td->frame = -1;
|
|
|
|
}
|
|
|
|
|
2006-05-19 20:52:35 +00:00
|
|
|
static inline void uhci_remove_tds_from_frame(struct uhci_hcd *uhci,
|
|
|
|
unsigned int framenum)
|
|
|
|
{
|
|
|
|
struct uhci_td *ftd, *ltd;
|
|
|
|
|
|
|
|
framenum &= (UHCI_NUMFRAMES - 1);
|
|
|
|
|
|
|
|
ftd = uhci->frame_cpu[framenum];
|
|
|
|
if (ftd) {
|
|
|
|
ltd = list_entry(ftd->fl_list.prev, struct uhci_td, fl_list);
|
|
|
|
uhci->frame[framenum] = ltd->link;
|
|
|
|
uhci->frame_cpu[framenum] = NULL;
|
|
|
|
|
|
|
|
while (!list_empty(&ftd->fl_list))
|
|
|
|
list_del_init(ftd->fl_list.prev);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
/*
|
|
|
|
* Remove all the TDs for an Isochronous URB from the frame list
|
|
|
|
*/
|
|
|
|
static void uhci_unlink_isochronous_tds(struct uhci_hcd *uhci, struct urb *urb)
|
2005-10-13 21:00:24 +00:00
|
|
|
{
|
|
|
|
struct urb_priv *urbp = (struct urb_priv *) urb->hcpriv;
|
|
|
|
struct uhci_td *td;
|
|
|
|
|
|
|
|
list_for_each_entry(td, &urbp->td_list, list)
|
2005-12-17 22:58:46 +00:00
|
|
|
uhci_remove_td_from_frame_list(uhci, td);
|
2005-10-13 21:00:24 +00:00
|
|
|
}
|
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
static struct uhci_qh *uhci_alloc_qh(struct uhci_hcd *uhci,
|
|
|
|
struct usb_device *udev, struct usb_host_endpoint *hep)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
dma_addr_t dma_handle;
|
|
|
|
struct uhci_qh *qh;
|
|
|
|
|
2015-10-28 07:14:35 +00:00
|
|
|
qh = dma_pool_zalloc(uhci->qh_pool, GFP_ATOMIC, &dma_handle);
|
2005-04-16 22:20:36 +00:00
|
|
|
if (!qh)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
qh->dma_handle = dma_handle;
|
|
|
|
|
2011-05-18 08:44:51 +00:00
|
|
|
qh->element = UHCI_PTR_TERM(uhci);
|
|
|
|
qh->link = UHCI_PTR_TERM(uhci);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
INIT_LIST_HEAD(&qh->queue);
|
|
|
|
INIT_LIST_HEAD(&qh->node);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
if (udev) { /* Normal QH */
|
2009-04-15 20:28:28 +00:00
|
|
|
qh->type = usb_endpoint_type(&hep->desc);
|
2007-01-08 17:01:43 +00:00
|
|
|
if (qh->type != USB_ENDPOINT_XFER_ISOC) {
|
|
|
|
qh->dummy_td = uhci_alloc_td(uhci);
|
|
|
|
if (!qh->dummy_td) {
|
|
|
|
dma_pool_free(uhci->qh_pool, qh, dma_handle);
|
|
|
|
return NULL;
|
|
|
|
}
|
2005-12-17 23:00:12 +00:00
|
|
|
}
|
2005-12-17 22:58:46 +00:00
|
|
|
qh->state = QH_STATE_IDLE;
|
|
|
|
qh->hep = hep;
|
|
|
|
qh->udev = udev;
|
|
|
|
hep->hcpriv = qh;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-01-16 16:56:32 +00:00
|
|
|
if (qh->type == USB_ENDPOINT_XFER_INT ||
|
|
|
|
qh->type == USB_ENDPOINT_XFER_ISOC)
|
|
|
|
qh->load = usb_calc_bus_time(udev->speed,
|
|
|
|
usb_endpoint_dir_in(&hep->desc),
|
|
|
|
qh->type == USB_ENDPOINT_XFER_ISOC,
|
2011-08-23 10:12:03 +00:00
|
|
|
usb_endpoint_maxp(&hep->desc))
|
2007-01-16 16:56:32 +00:00
|
|
|
/ 1000 + 1;
|
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
} else { /* Skeleton QH */
|
|
|
|
qh->state = QH_STATE_ACTIVE;
|
2006-05-05 20:26:58 +00:00
|
|
|
qh->type = -1;
|
2005-12-17 22:58:46 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
return qh;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void uhci_free_qh(struct uhci_hcd *uhci, struct uhci_qh *qh)
|
|
|
|
{
|
2005-12-17 22:58:46 +00:00
|
|
|
WARN_ON(qh->state != QH_STATE_IDLE && qh->udev);
|
2008-09-21 02:09:37 +00:00
|
|
|
if (!list_empty(&qh->queue))
|
|
|
|
dev_WARN(uhci_dev(uhci), "qh %p list not empty!\n", qh);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
list_del(&qh->node);
|
|
|
|
if (qh->udev) {
|
|
|
|
qh->hep->hcpriv = NULL;
|
2007-01-08 17:01:43 +00:00
|
|
|
if (qh->dummy_td)
|
|
|
|
uhci_free_td(uhci, qh->dummy_td);
|
2005-12-17 22:58:46 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
dma_pool_free(uhci->qh_pool, qh, qh->dma_handle);
|
|
|
|
}
|
|
|
|
|
2005-12-17 23:02:38 +00:00
|
|
|
/*
|
2006-05-12 15:23:19 +00:00
|
|
|
* When a queue is stopped and a dequeued URB is given back, adjust
|
|
|
|
* the previous TD link (if the URB isn't first on the queue) or
|
|
|
|
* save its toggle value (if it is first and is currently executing).
|
2006-05-19 20:39:52 +00:00
|
|
|
*
|
|
|
|
* Returns 0 if the URB should not yet be given back, 1 otherwise.
|
2005-12-17 23:02:38 +00:00
|
|
|
*/
|
2006-05-19 20:39:52 +00:00
|
|
|
static int uhci_cleanup_queue(struct uhci_hcd *uhci, struct uhci_qh *qh,
|
2006-05-12 15:23:19 +00:00
|
|
|
struct urb *urb)
|
2005-12-17 23:02:38 +00:00
|
|
|
{
|
2006-05-12 15:23:19 +00:00
|
|
|
struct urb_priv *urbp = urb->hcpriv;
|
2005-12-17 23:02:38 +00:00
|
|
|
struct uhci_td *td;
|
2006-05-19 20:39:52 +00:00
|
|
|
int ret = 1;
|
2005-12-17 23:02:38 +00:00
|
|
|
|
2006-05-12 15:23:19 +00:00
|
|
|
/* Isochronous pipes don't use toggles and their TD link pointers
|
2006-05-19 20:39:52 +00:00
|
|
|
* get adjusted during uhci_urb_dequeue(). But since their queues
|
|
|
|
* cannot truly be stopped, we have to watch out for dequeues
|
|
|
|
* occurring after the nominal unlink frame. */
|
|
|
|
if (qh->type == USB_ENDPOINT_XFER_ISOC) {
|
|
|
|
ret = (uhci->frame_number + uhci->is_stopped !=
|
|
|
|
qh->unlink_frame);
|
2006-06-05 16:28:57 +00:00
|
|
|
goto done;
|
2006-05-19 20:39:52 +00:00
|
|
|
}
|
2006-05-12 15:23:19 +00:00
|
|
|
|
|
|
|
/* If the URB isn't first on its queue, adjust the link pointer
|
|
|
|
* of the last TD in the previous URB. The toggle doesn't need
|
|
|
|
* to be saved since this URB can't be executing yet. */
|
|
|
|
if (qh->queue.next != &urbp->node) {
|
|
|
|
struct urb_priv *purbp;
|
|
|
|
struct uhci_td *ptd;
|
|
|
|
|
|
|
|
purbp = list_entry(urbp->node.prev, struct urb_priv, node);
|
|
|
|
WARN_ON(list_empty(&purbp->td_list));
|
|
|
|
ptd = list_entry(purbp->td_list.prev, struct uhci_td,
|
|
|
|
list);
|
|
|
|
td = list_entry(urbp->td_list.prev, struct uhci_td,
|
|
|
|
list);
|
|
|
|
ptd->link = td->link;
|
2006-06-05 16:28:57 +00:00
|
|
|
goto done;
|
2006-05-12 15:23:19 +00:00
|
|
|
}
|
|
|
|
|
2005-12-17 23:02:38 +00:00
|
|
|
/* If the QH element pointer is UHCI_PTR_TERM then then currently
|
|
|
|
* executing URB has already been unlinked, so this one isn't it. */
|
2011-05-18 08:44:51 +00:00
|
|
|
if (qh_element(qh) == UHCI_PTR_TERM(uhci))
|
2006-06-05 16:28:57 +00:00
|
|
|
goto done;
|
2011-05-18 08:44:51 +00:00
|
|
|
qh->element = UHCI_PTR_TERM(uhci);
|
2005-12-17 23:02:38 +00:00
|
|
|
|
2007-01-08 17:01:43 +00:00
|
|
|
/* Control pipes don't have to worry about toggles */
|
2006-05-12 15:23:19 +00:00
|
|
|
if (qh->type == USB_ENDPOINT_XFER_CONTROL)
|
2006-06-05 16:28:57 +00:00
|
|
|
goto done;
|
2005-12-17 23:02:38 +00:00
|
|
|
|
2006-05-12 15:23:19 +00:00
|
|
|
/* Save the next toggle value */
|
2006-05-12 15:19:19 +00:00
|
|
|
WARN_ON(list_empty(&urbp->td_list));
|
|
|
|
td = list_entry(urbp->td_list.next, struct uhci_td, list);
|
|
|
|
qh->needs_fixup = 1;
|
2011-05-18 08:44:51 +00:00
|
|
|
qh->initial_toggle = uhci_toggle(td_token(uhci, td));
|
2006-06-05 16:28:57 +00:00
|
|
|
|
|
|
|
done:
|
2006-05-19 20:39:52 +00:00
|
|
|
return ret;
|
2005-12-17 23:02:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fix up the data toggles for URBs in a queue, when one of them
|
|
|
|
* terminates early (short transfer, error, or dequeued).
|
|
|
|
*/
|
2011-05-18 08:44:51 +00:00
|
|
|
static void uhci_fixup_toggles(struct uhci_hcd *uhci, struct uhci_qh *qh,
|
|
|
|
int skip_first)
|
2005-12-17 23:02:38 +00:00
|
|
|
{
|
|
|
|
struct urb_priv *urbp = NULL;
|
|
|
|
struct uhci_td *td;
|
|
|
|
unsigned int toggle = qh->initial_toggle;
|
|
|
|
unsigned int pipe;
|
|
|
|
|
|
|
|
/* Fixups for a short transfer start with the second URB in the
|
|
|
|
* queue (the short URB is the first). */
|
|
|
|
if (skip_first)
|
|
|
|
urbp = list_entry(qh->queue.next, struct urb_priv, node);
|
|
|
|
|
|
|
|
/* When starting with the first URB, if the QH element pointer is
|
|
|
|
* still valid then we know the URB's toggles are okay. */
|
2011-05-18 08:44:51 +00:00
|
|
|
else if (qh_element(qh) != UHCI_PTR_TERM(uhci))
|
2005-12-17 23:02:38 +00:00
|
|
|
toggle = 2;
|
|
|
|
|
|
|
|
/* Fix up the toggle for the URBs in the queue. Normally this
|
|
|
|
* loop won't run more than once: When an error or short transfer
|
|
|
|
* occurs, the queue usually gets emptied. */
|
2006-01-31 15:02:55 +00:00
|
|
|
urbp = list_prepare_entry(urbp, &qh->queue, node);
|
2005-12-17 23:02:38 +00:00
|
|
|
list_for_each_entry_continue(urbp, &qh->queue, node) {
|
|
|
|
|
|
|
|
/* If the first TD has the right toggle value, we don't
|
|
|
|
* need to change any toggles in this URB */
|
|
|
|
td = list_entry(urbp->td_list.next, struct uhci_td, list);
|
2011-05-18 08:44:51 +00:00
|
|
|
if (toggle > 1 || uhci_toggle(td_token(uhci, td)) == toggle) {
|
2006-08-31 18:18:39 +00:00
|
|
|
td = list_entry(urbp->td_list.prev, struct uhci_td,
|
2005-12-17 23:02:38 +00:00
|
|
|
list);
|
2011-05-18 08:44:51 +00:00
|
|
|
toggle = uhci_toggle(td_token(uhci, td)) ^ 1;
|
2005-12-17 23:02:38 +00:00
|
|
|
|
|
|
|
/* Otherwise all the toggles in the URB have to be switched */
|
|
|
|
} else {
|
|
|
|
list_for_each_entry(td, &urbp->td_list, list) {
|
2011-05-18 08:44:51 +00:00
|
|
|
td->token ^= cpu_to_hc32(uhci,
|
2005-12-17 23:02:38 +00:00
|
|
|
TD_TOKEN_TOGGLE);
|
|
|
|
toggle ^= 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
wmb();
|
|
|
|
pipe = list_entry(qh->queue.next, struct urb_priv, node)->urb->pipe;
|
|
|
|
usb_settoggle(qh->udev, usb_pipeendpoint(pipe),
|
|
|
|
usb_pipeout(pipe), toggle);
|
|
|
|
qh->needs_fixup = 0;
|
|
|
|
}
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/*
|
2007-02-19 20:52:45 +00:00
|
|
|
* Link an Isochronous QH into its skeleton's list
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
2007-02-19 20:52:45 +00:00
|
|
|
static inline void link_iso(struct uhci_hcd *uhci, struct uhci_qh *qh)
|
|
|
|
{
|
|
|
|
list_add_tail(&qh->node, &uhci->skel_iso_qh->node);
|
|
|
|
|
|
|
|
/* Isochronous QHs aren't linked by the hardware */
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Link a high-period interrupt QH into the schedule at the end of its
|
|
|
|
* skeleton's list
|
|
|
|
*/
|
|
|
|
static void link_interrupt(struct uhci_hcd *uhci, struct uhci_qh *qh)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2005-12-17 22:58:46 +00:00
|
|
|
struct uhci_qh *pqh;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-02-19 20:52:45 +00:00
|
|
|
list_add_tail(&qh->node, &uhci->skelqh[qh->skel]->node);
|
|
|
|
|
|
|
|
pqh = list_entry(qh->node.prev, struct uhci_qh, node);
|
|
|
|
qh->link = pqh->link;
|
|
|
|
wmb();
|
2011-05-18 08:44:51 +00:00
|
|
|
pqh->link = LINK_TO_QH(uhci, qh);
|
2007-02-19 20:52:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Link a period-1 interrupt or async QH into the schedule at the
|
|
|
|
* correct spot in the async skeleton's list, and update the FSBR link
|
|
|
|
*/
|
|
|
|
static void link_async(struct uhci_hcd *uhci, struct uhci_qh *qh)
|
|
|
|
{
|
2007-03-19 19:31:42 +00:00
|
|
|
struct uhci_qh *pqh;
|
2011-05-18 08:44:51 +00:00
|
|
|
__hc32 link_to_new_qh;
|
2007-02-19 20:52:45 +00:00
|
|
|
|
|
|
|
/* Find the predecessor QH for our new one and insert it in the list.
|
|
|
|
* The list of QHs is expected to be short, so linear search won't
|
|
|
|
* take too long. */
|
|
|
|
list_for_each_entry_reverse(pqh, &uhci->skel_async_qh->node, node) {
|
|
|
|
if (pqh->skel <= qh->skel)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
list_add(&qh->node, &pqh->node);
|
|
|
|
|
|
|
|
/* Link it into the schedule */
|
2007-03-19 19:31:42 +00:00
|
|
|
qh->link = pqh->link;
|
2007-02-19 20:52:45 +00:00
|
|
|
wmb();
|
2011-05-18 08:44:51 +00:00
|
|
|
link_to_new_qh = LINK_TO_QH(uhci, qh);
|
2007-03-19 19:31:42 +00:00
|
|
|
pqh->link = link_to_new_qh;
|
|
|
|
|
|
|
|
/* If this is now the first FSBR QH, link the terminating skeleton
|
|
|
|
* QH to it. */
|
|
|
|
if (pqh->skel < SKEL_FSBR && qh->skel >= SKEL_FSBR)
|
|
|
|
uhci->skel_term_qh->link = link_to_new_qh;
|
2007-02-19 20:52:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Put a QH on the schedule in both hardware and software
|
|
|
|
*/
|
|
|
|
static void uhci_activate_qh(struct uhci_hcd *uhci, struct uhci_qh *qh)
|
|
|
|
{
|
2005-12-17 22:58:46 +00:00
|
|
|
WARN_ON(list_empty(&qh->queue));
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
/* Set the element pointer if it isn't set already.
|
|
|
|
* This isn't needed for Isochronous queues, but it doesn't hurt. */
|
2011-05-18 08:44:51 +00:00
|
|
|
if (qh_element(qh) == UHCI_PTR_TERM(uhci)) {
|
2005-12-17 22:58:46 +00:00
|
|
|
struct urb_priv *urbp = list_entry(qh->queue.next,
|
|
|
|
struct urb_priv, node);
|
|
|
|
struct uhci_td *td = list_entry(urbp->td_list.next,
|
|
|
|
struct uhci_td, list);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2011-05-18 08:44:51 +00:00
|
|
|
qh->element = LINK_TO_TD(uhci, td);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2006-05-12 15:35:45 +00:00
|
|
|
/* Treat the queue as if it has just advanced */
|
|
|
|
qh->wait_expired = 0;
|
|
|
|
qh->advance_jiffies = jiffies;
|
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
if (qh->state == QH_STATE_ACTIVE)
|
|
|
|
return;
|
|
|
|
qh->state = QH_STATE_ACTIVE;
|
|
|
|
|
2007-02-19 20:52:45 +00:00
|
|
|
/* Move the QH from its old list to the correct spot in the appropriate
|
2005-12-17 22:58:46 +00:00
|
|
|
* skeleton's list */
|
2005-12-17 23:02:38 +00:00
|
|
|
if (qh == uhci->next_qh)
|
|
|
|
uhci->next_qh = list_entry(qh->node.next, struct uhci_qh,
|
|
|
|
node);
|
2007-02-19 20:52:45 +00:00
|
|
|
list_del(&qh->node);
|
|
|
|
|
|
|
|
if (qh->skel == SKEL_ISO)
|
|
|
|
link_iso(uhci, qh);
|
|
|
|
else if (qh->skel < SKEL_ASYNC)
|
|
|
|
link_interrupt(uhci, qh);
|
|
|
|
else
|
|
|
|
link_async(uhci, qh);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Unlink a high-period interrupt QH from the schedule
|
|
|
|
*/
|
|
|
|
static void unlink_interrupt(struct uhci_hcd *uhci, struct uhci_qh *qh)
|
|
|
|
{
|
|
|
|
struct uhci_qh *pqh;
|
2005-12-17 22:58:46 +00:00
|
|
|
|
|
|
|
pqh = list_entry(qh->node.prev, struct uhci_qh, node);
|
2007-02-19 20:52:45 +00:00
|
|
|
pqh->link = qh->link;
|
|
|
|
mb();
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Unlink a period-1 interrupt or async QH from the schedule
|
|
|
|
*/
|
|
|
|
static void unlink_async(struct uhci_hcd *uhci, struct uhci_qh *qh)
|
|
|
|
{
|
2007-03-19 19:31:42 +00:00
|
|
|
struct uhci_qh *pqh;
|
2011-05-18 08:44:51 +00:00
|
|
|
__hc32 link_to_next_qh = qh->link;
|
2007-02-19 20:52:45 +00:00
|
|
|
|
|
|
|
pqh = list_entry(qh->node.prev, struct uhci_qh, node);
|
|
|
|
pqh->link = link_to_next_qh;
|
2007-03-19 19:31:42 +00:00
|
|
|
|
|
|
|
/* If this was the old first FSBR QH, link the terminating skeleton
|
|
|
|
* QH to the next (new first FSBR) QH. */
|
|
|
|
if (pqh->skel < SKEL_FSBR && qh->skel >= SKEL_FSBR)
|
|
|
|
uhci->skel_term_qh->link = link_to_next_qh;
|
2007-02-19 20:52:45 +00:00
|
|
|
mb();
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2005-12-17 22:58:46 +00:00
|
|
|
* Take a QH off the hardware schedule
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
2005-12-17 22:58:46 +00:00
|
|
|
static void uhci_unlink_qh(struct uhci_hcd *uhci, struct uhci_qh *qh)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2005-12-17 22:58:46 +00:00
|
|
|
if (qh->state == QH_STATE_UNLINKING)
|
2005-04-16 22:20:36 +00:00
|
|
|
return;
|
2005-12-17 22:58:46 +00:00
|
|
|
WARN_ON(qh->state != QH_STATE_ACTIVE || !qh->udev);
|
|
|
|
qh->state = QH_STATE_UNLINKING;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
/* Unlink the QH from the schedule and record when we did it */
|
2007-02-19 20:52:45 +00:00
|
|
|
if (qh->skel == SKEL_ISO)
|
|
|
|
;
|
|
|
|
else if (qh->skel < SKEL_ASYNC)
|
|
|
|
unlink_interrupt(uhci, qh);
|
|
|
|
else
|
|
|
|
unlink_async(uhci, qh);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
uhci_get_current_frame_number(uhci);
|
2005-12-17 22:58:46 +00:00
|
|
|
qh->unlink_frame = uhci->frame_number;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
/* Force an interrupt so we know when the QH is fully unlinked */
|
2010-06-09 21:34:39 +00:00
|
|
|
if (list_empty(&uhci->skel_unlink_qh->node) || uhci->is_stopped)
|
2005-04-16 22:20:36 +00:00
|
|
|
uhci_set_next_interrupt(uhci);
|
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
/* Move the QH from its old list to the end of the unlinking list */
|
2005-12-17 23:02:38 +00:00
|
|
|
if (qh == uhci->next_qh)
|
|
|
|
uhci->next_qh = list_entry(qh->node.next, struct uhci_qh,
|
|
|
|
node);
|
2005-12-17 22:58:46 +00:00
|
|
|
list_move_tail(&qh->node, &uhci->skel_unlink_qh->node);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
/*
|
|
|
|
* When we and the controller are through with a QH, it becomes IDLE.
|
|
|
|
* This happens when a QH has been off the schedule (on the unlinking
|
|
|
|
* list) for more than one frame, or when an error occurs while adding
|
|
|
|
* the first URB onto a new QH.
|
|
|
|
*/
|
|
|
|
static void uhci_make_qh_idle(struct uhci_hcd *uhci, struct uhci_qh *qh)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2005-12-17 22:58:46 +00:00
|
|
|
WARN_ON(qh->state == QH_STATE_ACTIVE);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 23:02:38 +00:00
|
|
|
if (qh == uhci->next_qh)
|
|
|
|
uhci->next_qh = list_entry(qh->node.next, struct uhci_qh,
|
|
|
|
node);
|
2005-12-17 22:58:46 +00:00
|
|
|
list_move(&qh->node, &uhci->idle_qh_list);
|
|
|
|
qh->state = QH_STATE_IDLE;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-05-12 15:19:19 +00:00
|
|
|
/* Now that the QH is idle, its post_td isn't being used */
|
|
|
|
if (qh->post_td) {
|
|
|
|
uhci_free_td(uhci, qh->post_td);
|
|
|
|
qh->post_td = NULL;
|
|
|
|
}
|
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
/* If anyone is waiting for a QH to become idle, wake them up */
|
|
|
|
if (uhci->num_waiting)
|
|
|
|
wake_up_all(&uhci->waitqh);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2007-01-16 16:56:32 +00:00
|
|
|
/*
|
|
|
|
* Find the highest existing bandwidth load for a given phase and period.
|
|
|
|
*/
|
|
|
|
static int uhci_highest_load(struct uhci_hcd *uhci, int phase, int period)
|
|
|
|
{
|
|
|
|
int highest_load = uhci->load[phase];
|
|
|
|
|
|
|
|
for (phase += period; phase < MAX_PHASE; phase += period)
|
|
|
|
highest_load = max_t(int, highest_load, uhci->load[phase]);
|
|
|
|
return highest_load;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set qh->phase to the optimal phase for a periodic transfer and
|
|
|
|
* check whether the bandwidth requirement is acceptable.
|
|
|
|
*/
|
|
|
|
static int uhci_check_bandwidth(struct uhci_hcd *uhci, struct uhci_qh *qh)
|
|
|
|
{
|
|
|
|
int minimax_load;
|
|
|
|
|
|
|
|
/* Find the optimal phase (unless it is already set) and get
|
|
|
|
* its load value. */
|
|
|
|
if (qh->phase >= 0)
|
|
|
|
minimax_load = uhci_highest_load(uhci, qh->phase, qh->period);
|
|
|
|
else {
|
|
|
|
int phase, load;
|
|
|
|
int max_phase = min_t(int, MAX_PHASE, qh->period);
|
|
|
|
|
|
|
|
qh->phase = 0;
|
|
|
|
minimax_load = uhci_highest_load(uhci, qh->phase, qh->period);
|
|
|
|
for (phase = 1; phase < max_phase; ++phase) {
|
|
|
|
load = uhci_highest_load(uhci, phase, qh->period);
|
|
|
|
if (load < minimax_load) {
|
|
|
|
minimax_load = load;
|
|
|
|
qh->phase = phase;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Maximum allowable periodic bandwidth is 90%, or 900 us per frame */
|
|
|
|
if (minimax_load + qh->load > 900) {
|
|
|
|
dev_dbg(uhci_dev(uhci), "bandwidth allocation failed: "
|
|
|
|
"period %d, phase %d, %d + %d us\n",
|
|
|
|
qh->period, qh->phase, minimax_load, qh->load);
|
|
|
|
return -ENOSPC;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Reserve a periodic QH's bandwidth in the schedule
|
|
|
|
*/
|
|
|
|
static void uhci_reserve_bandwidth(struct uhci_hcd *uhci, struct uhci_qh *qh)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int load = qh->load;
|
|
|
|
char *p = "??";
|
|
|
|
|
|
|
|
for (i = qh->phase; i < MAX_PHASE; i += qh->period) {
|
|
|
|
uhci->load[i] += load;
|
|
|
|
uhci->total_load += load;
|
|
|
|
}
|
|
|
|
uhci_to_hcd(uhci)->self.bandwidth_allocated =
|
|
|
|
uhci->total_load / MAX_PHASE;
|
|
|
|
switch (qh->type) {
|
|
|
|
case USB_ENDPOINT_XFER_INT:
|
|
|
|
++uhci_to_hcd(uhci)->self.bandwidth_int_reqs;
|
|
|
|
p = "INT";
|
|
|
|
break;
|
|
|
|
case USB_ENDPOINT_XFER_ISOC:
|
|
|
|
++uhci_to_hcd(uhci)->self.bandwidth_isoc_reqs;
|
|
|
|
p = "ISO";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
qh->bandwidth_reserved = 1;
|
|
|
|
dev_dbg(uhci_dev(uhci),
|
|
|
|
"%s dev %d ep%02x-%s, period %d, phase %d, %d us\n",
|
|
|
|
"reserve", qh->udev->devnum,
|
|
|
|
qh->hep->desc.bEndpointAddress, p,
|
|
|
|
qh->period, qh->phase, load);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Release a periodic QH's bandwidth reservation
|
|
|
|
*/
|
|
|
|
static void uhci_release_bandwidth(struct uhci_hcd *uhci, struct uhci_qh *qh)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int load = qh->load;
|
|
|
|
char *p = "??";
|
|
|
|
|
|
|
|
for (i = qh->phase; i < MAX_PHASE; i += qh->period) {
|
|
|
|
uhci->load[i] -= load;
|
|
|
|
uhci->total_load -= load;
|
|
|
|
}
|
|
|
|
uhci_to_hcd(uhci)->self.bandwidth_allocated =
|
|
|
|
uhci->total_load / MAX_PHASE;
|
|
|
|
switch (qh->type) {
|
|
|
|
case USB_ENDPOINT_XFER_INT:
|
|
|
|
--uhci_to_hcd(uhci)->self.bandwidth_int_reqs;
|
|
|
|
p = "INT";
|
|
|
|
break;
|
|
|
|
case USB_ENDPOINT_XFER_ISOC:
|
|
|
|
--uhci_to_hcd(uhci)->self.bandwidth_isoc_reqs;
|
|
|
|
p = "ISO";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
qh->bandwidth_reserved = 0;
|
|
|
|
dev_dbg(uhci_dev(uhci),
|
|
|
|
"%s dev %d ep%02x-%s, period %d, phase %d, %d us\n",
|
|
|
|
"release", qh->udev->devnum,
|
|
|
|
qh->hep->desc.bEndpointAddress, p,
|
|
|
|
qh->period, qh->phase, load);
|
|
|
|
}
|
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
static inline struct urb_priv *uhci_alloc_urb_priv(struct uhci_hcd *uhci,
|
|
|
|
struct urb *urb)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct urb_priv *urbp;
|
|
|
|
|
2007-02-10 09:45:03 +00:00
|
|
|
urbp = kmem_cache_zalloc(uhci_up_cachep, GFP_ATOMIC);
|
2005-04-16 22:20:36 +00:00
|
|
|
if (!urbp)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
urbp->urb = urb;
|
2005-12-17 22:58:46 +00:00
|
|
|
urb->hcpriv = urbp;
|
2010-12-09 13:24:27 +00:00
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
INIT_LIST_HEAD(&urbp->node);
|
2005-04-16 22:20:36 +00:00
|
|
|
INIT_LIST_HEAD(&urbp->td_list);
|
|
|
|
|
|
|
|
return urbp;
|
|
|
|
}
|
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
static void uhci_free_urb_priv(struct uhci_hcd *uhci,
|
|
|
|
struct urb_priv *urbp)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct uhci_td *td, *tmp;
|
|
|
|
|
2008-09-21 02:09:37 +00:00
|
|
|
if (!list_empty(&urbp->node))
|
|
|
|
dev_WARN(uhci_dev(uhci), "urb %p still on QH's list!\n",
|
2005-12-17 22:58:46 +00:00
|
|
|
urbp->urb);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
list_for_each_entry_safe(td, tmp, &urbp->td_list, list) {
|
2006-05-12 15:29:04 +00:00
|
|
|
uhci_remove_td_from_urbp(td);
|
|
|
|
uhci_free_td(uhci, td);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
kmem_cache_free(uhci_up_cachep, urbp);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Map status to standard result codes
|
|
|
|
*
|
2011-05-18 08:44:51 +00:00
|
|
|
* <status> is (td_status(uhci, td) & 0xF60000), a.k.a.
|
|
|
|
* uhci_status_bits(td_status(uhci, td)).
|
2005-04-16 22:20:36 +00:00
|
|
|
* Note: <status> does not include the TD_CTRL_NAK bit.
|
|
|
|
* <dir_out> is True for output TDs and False for input TDs.
|
|
|
|
*/
|
|
|
|
static int uhci_map_status(int status, int dir_out)
|
|
|
|
{
|
|
|
|
if (!status)
|
|
|
|
return 0;
|
|
|
|
if (status & TD_CTRL_BITSTUFF) /* Bitstuff error */
|
|
|
|
return -EPROTO;
|
|
|
|
if (status & TD_CTRL_CRCTIMEO) { /* CRC/Timeout */
|
|
|
|
if (dir_out)
|
|
|
|
return -EPROTO;
|
|
|
|
else
|
|
|
|
return -EILSEQ;
|
|
|
|
}
|
|
|
|
if (status & TD_CTRL_BABBLE) /* Babble */
|
|
|
|
return -EOVERFLOW;
|
|
|
|
if (status & TD_CTRL_DBUFERR) /* Buffer error */
|
|
|
|
return -ENOSR;
|
|
|
|
if (status & TD_CTRL_STALLED) /* Stalled */
|
|
|
|
return -EPIPE;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Control transfers
|
|
|
|
*/
|
2005-12-17 22:58:46 +00:00
|
|
|
static int uhci_submit_control(struct uhci_hcd *uhci, struct urb *urb,
|
|
|
|
struct uhci_qh *qh)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct uhci_td *td;
|
|
|
|
unsigned long destination, status;
|
2011-08-23 10:12:03 +00:00
|
|
|
int maxsze = usb_endpoint_maxp(&qh->hep->desc);
|
2005-04-16 22:20:36 +00:00
|
|
|
int len = urb->transfer_buffer_length;
|
|
|
|
dma_addr_t data = urb->transfer_dma;
|
2011-05-18 08:44:51 +00:00
|
|
|
__hc32 *plink;
|
2006-05-12 15:29:04 +00:00
|
|
|
struct urb_priv *urbp = urb->hcpriv;
|
2007-02-19 20:52:45 +00:00
|
|
|
int skel;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* The "pipe" thing contains the destination in bits 8--18 */
|
|
|
|
destination = (urb->pipe & PIPE_DEVEP_MASK) | USB_PID_SETUP;
|
|
|
|
|
2005-12-17 23:00:12 +00:00
|
|
|
/* 3 errors, dummy TD remains inactive */
|
|
|
|
status = uhci_maxerr(3);
|
2005-04-16 22:20:36 +00:00
|
|
|
if (urb->dev->speed == USB_SPEED_LOW)
|
|
|
|
status |= TD_CTRL_LS;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Build the TD for the control request setup packet
|
|
|
|
*/
|
2005-12-17 23:00:12 +00:00
|
|
|
td = qh->dummy_td;
|
2006-05-12 15:29:04 +00:00
|
|
|
uhci_add_td_to_urbp(td, urbp);
|
2011-05-18 08:44:51 +00:00
|
|
|
uhci_fill_td(uhci, td, status, destination | uhci_explen(8),
|
2005-12-17 22:58:46 +00:00
|
|
|
urb->setup_dma);
|
|
|
|
plink = &td->link;
|
2005-12-17 23:00:12 +00:00
|
|
|
status |= TD_CTRL_ACTIVE;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If direction is "send", change the packet ID from SETUP (0x2D)
|
|
|
|
* to OUT (0xE1). Else change it from SETUP to IN (0x69) and
|
|
|
|
* set Short Packet Detect (SPD) for all data packets.
|
2007-07-13 19:46:29 +00:00
|
|
|
*
|
|
|
|
* 0-length transfers always get treated as "send".
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
2007-07-13 19:46:29 +00:00
|
|
|
if (usb_pipeout(urb->pipe) || len == 0)
|
2005-04-16 22:20:36 +00:00
|
|
|
destination ^= (USB_PID_SETUP ^ USB_PID_OUT);
|
|
|
|
else {
|
|
|
|
destination ^= (USB_PID_SETUP ^ USB_PID_IN);
|
|
|
|
status |= TD_CTRL_SPD;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2005-11-30 22:16:19 +00:00
|
|
|
* Build the DATA TDs
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
|
|
|
while (len > 0) {
|
2007-07-13 19:46:29 +00:00
|
|
|
int pktsze = maxsze;
|
|
|
|
|
|
|
|
if (len <= pktsze) { /* The last data packet */
|
|
|
|
pktsze = len;
|
|
|
|
status &= ~TD_CTRL_SPD;
|
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-04-25 15:14:31 +00:00
|
|
|
td = uhci_alloc_td(uhci);
|
2005-04-16 22:20:36 +00:00
|
|
|
if (!td)
|
2005-12-17 23:00:12 +00:00
|
|
|
goto nomem;
|
2011-05-18 08:44:51 +00:00
|
|
|
*plink = LINK_TO_TD(uhci, td);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* Alternate Data0/1 (start with Data1) */
|
|
|
|
destination ^= TD_TOKEN_TOGGLE;
|
2010-12-09 13:24:27 +00:00
|
|
|
|
2006-05-12 15:29:04 +00:00
|
|
|
uhci_add_td_to_urbp(td, urbp);
|
2011-05-18 08:44:51 +00:00
|
|
|
uhci_fill_td(uhci, td, status,
|
|
|
|
destination | uhci_explen(pktsze), data);
|
2005-12-17 22:58:46 +00:00
|
|
|
plink = &td->link;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
data += pktsze;
|
|
|
|
len -= pktsze;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2010-12-09 13:24:27 +00:00
|
|
|
* Build the final TD for control status
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
2005-04-25 15:14:31 +00:00
|
|
|
td = uhci_alloc_td(uhci);
|
2005-04-16 22:20:36 +00:00
|
|
|
if (!td)
|
2005-12-17 23:00:12 +00:00
|
|
|
goto nomem;
|
2011-05-18 08:44:51 +00:00
|
|
|
*plink = LINK_TO_TD(uhci, td);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-07-13 19:46:29 +00:00
|
|
|
/* Change direction for the status transaction */
|
|
|
|
destination ^= (USB_PID_IN ^ USB_PID_OUT);
|
2005-04-16 22:20:36 +00:00
|
|
|
destination |= TD_TOKEN_TOGGLE; /* End in Data1 */
|
|
|
|
|
2006-05-12 15:29:04 +00:00
|
|
|
uhci_add_td_to_urbp(td, urbp);
|
2011-05-18 08:44:51 +00:00
|
|
|
uhci_fill_td(uhci, td, status | TD_CTRL_IOC,
|
2005-12-17 22:58:46 +00:00
|
|
|
destination | uhci_explen(0), 0);
|
2005-12-17 23:00:12 +00:00
|
|
|
plink = &td->link;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Build the new dummy TD and activate the old one
|
|
|
|
*/
|
|
|
|
td = uhci_alloc_td(uhci);
|
|
|
|
if (!td)
|
|
|
|
goto nomem;
|
2011-05-18 08:44:51 +00:00
|
|
|
*plink = LINK_TO_TD(uhci, td);
|
2005-12-17 23:00:12 +00:00
|
|
|
|
2011-05-18 08:44:51 +00:00
|
|
|
uhci_fill_td(uhci, td, 0, USB_PID_OUT | uhci_explen(0), 0);
|
2005-12-17 23:00:12 +00:00
|
|
|
wmb();
|
2011-05-18 08:44:51 +00:00
|
|
|
qh->dummy_td->status |= cpu_to_hc32(uhci, TD_CTRL_ACTIVE);
|
2005-12-17 23:00:12 +00:00
|
|
|
qh->dummy_td = td;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* Low-speed transfers get a different queue, and won't hog the bus.
|
|
|
|
* Also, some devices enumerate better without FSBR; the easiest way
|
|
|
|
* to do that is to put URBs on the low-speed queue while the device
|
2006-01-23 22:17:21 +00:00
|
|
|
* isn't in the CONFIGURED state. */
|
2005-04-16 22:20:36 +00:00
|
|
|
if (urb->dev->speed == USB_SPEED_LOW ||
|
2006-01-23 22:17:21 +00:00
|
|
|
urb->dev->state != USB_STATE_CONFIGURED)
|
2007-02-19 20:52:45 +00:00
|
|
|
skel = SKEL_LS_CONTROL;
|
2005-04-16 22:20:36 +00:00
|
|
|
else {
|
2007-02-19 20:52:45 +00:00
|
|
|
skel = SKEL_FS_CONTROL;
|
2006-05-12 15:35:45 +00:00
|
|
|
uhci_add_fsbr(uhci, urb);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2007-02-19 20:52:45 +00:00
|
|
|
if (qh->state != QH_STATE_ACTIVE)
|
|
|
|
qh->skel = skel;
|
2005-12-17 22:58:46 +00:00
|
|
|
return 0;
|
2005-12-17 23:00:12 +00:00
|
|
|
|
|
|
|
nomem:
|
|
|
|
/* Remove the dummy TD from the td_list so it doesn't get freed */
|
2006-05-12 15:29:04 +00:00
|
|
|
uhci_remove_td_from_urbp(qh->dummy_td);
|
2005-12-17 23:00:12 +00:00
|
|
|
return -ENOMEM;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Common submit for bulk and interrupt
|
|
|
|
*/
|
2005-12-17 22:58:46 +00:00
|
|
|
static int uhci_submit_common(struct uhci_hcd *uhci, struct urb *urb,
|
|
|
|
struct uhci_qh *qh)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct uhci_td *td;
|
|
|
|
unsigned long destination, status;
|
2011-08-23 10:12:03 +00:00
|
|
|
int maxsze = usb_endpoint_maxp(&qh->hep->desc);
|
2005-04-16 22:20:36 +00:00
|
|
|
int len = urb->transfer_buffer_length;
|
2010-09-30 12:32:44 +00:00
|
|
|
int this_sg_len;
|
|
|
|
dma_addr_t data;
|
2011-05-18 08:44:51 +00:00
|
|
|
__hc32 *plink;
|
2006-05-12 15:29:04 +00:00
|
|
|
struct urb_priv *urbp = urb->hcpriv;
|
2005-12-17 23:00:12 +00:00
|
|
|
unsigned int toggle;
|
2010-09-30 12:32:44 +00:00
|
|
|
struct scatterlist *sg;
|
|
|
|
int i;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
if (len < 0)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
/* The "pipe" thing contains the destination in bits 8--18 */
|
|
|
|
destination = (urb->pipe & PIPE_DEVEP_MASK) | usb_packetid(urb->pipe);
|
2005-12-17 23:00:12 +00:00
|
|
|
toggle = usb_gettoggle(urb->dev, usb_pipeendpoint(urb->pipe),
|
|
|
|
usb_pipeout(urb->pipe));
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 23:00:12 +00:00
|
|
|
/* 3 errors, dummy TD remains inactive */
|
|
|
|
status = uhci_maxerr(3);
|
2005-04-16 22:20:36 +00:00
|
|
|
if (urb->dev->speed == USB_SPEED_LOW)
|
|
|
|
status |= TD_CTRL_LS;
|
|
|
|
if (usb_pipein(urb->pipe))
|
|
|
|
status |= TD_CTRL_SPD;
|
|
|
|
|
2011-12-03 22:41:31 +00:00
|
|
|
i = urb->num_mapped_sgs;
|
2010-09-30 12:32:44 +00:00
|
|
|
if (len > 0 && i > 0) {
|
|
|
|
sg = urb->sg;
|
|
|
|
data = sg_dma_address(sg);
|
|
|
|
|
|
|
|
/* urb->transfer_buffer_length may be smaller than the
|
|
|
|
* size of the scatterlist (or vice versa)
|
|
|
|
*/
|
|
|
|
this_sg_len = min_t(int, sg_dma_len(sg), len);
|
|
|
|
} else {
|
|
|
|
sg = NULL;
|
|
|
|
data = urb->transfer_dma;
|
|
|
|
this_sg_len = len;
|
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
/*
|
2005-11-30 22:16:19 +00:00
|
|
|
* Build the DATA TDs
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
2005-12-17 23:00:12 +00:00
|
|
|
plink = NULL;
|
|
|
|
td = qh->dummy_td;
|
2010-09-30 12:32:44 +00:00
|
|
|
for (;;) { /* Allow zero length packets */
|
2005-04-16 22:20:36 +00:00
|
|
|
int pktsze = maxsze;
|
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
if (len <= pktsze) { /* The last packet */
|
2005-04-16 22:20:36 +00:00
|
|
|
pktsze = len;
|
|
|
|
if (!(urb->transfer_flags & URB_SHORT_NOT_OK))
|
|
|
|
status &= ~TD_CTRL_SPD;
|
|
|
|
}
|
|
|
|
|
2005-12-17 23:00:12 +00:00
|
|
|
if (plink) {
|
|
|
|
td = uhci_alloc_td(uhci);
|
|
|
|
if (!td)
|
|
|
|
goto nomem;
|
2011-05-18 08:44:51 +00:00
|
|
|
*plink = LINK_TO_TD(uhci, td);
|
2005-12-17 23:00:12 +00:00
|
|
|
}
|
2006-05-12 15:29:04 +00:00
|
|
|
uhci_add_td_to_urbp(td, urbp);
|
2011-05-18 08:44:51 +00:00
|
|
|
uhci_fill_td(uhci, td, status,
|
2005-12-17 23:00:12 +00:00
|
|
|
destination | uhci_explen(pktsze) |
|
|
|
|
(toggle << TD_TOKEN_TOGGLE_SHIFT),
|
|
|
|
data);
|
2005-12-17 22:58:46 +00:00
|
|
|
plink = &td->link;
|
2005-12-17 23:00:12 +00:00
|
|
|
status |= TD_CTRL_ACTIVE;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2010-09-30 12:32:44 +00:00
|
|
|
toggle ^= 1;
|
2005-04-16 22:20:36 +00:00
|
|
|
data += pktsze;
|
2010-09-30 12:32:44 +00:00
|
|
|
this_sg_len -= pktsze;
|
2005-04-16 22:20:36 +00:00
|
|
|
len -= maxsze;
|
2010-09-30 12:32:44 +00:00
|
|
|
if (this_sg_len <= 0) {
|
|
|
|
if (--i <= 0 || len <= 0)
|
|
|
|
break;
|
|
|
|
sg = sg_next(sg);
|
|
|
|
data = sg_dma_address(sg);
|
|
|
|
this_sg_len = min_t(int, sg_dma_len(sg), len);
|
|
|
|
}
|
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* URB_ZERO_PACKET means adding a 0-length packet, if direction
|
|
|
|
* is OUT and the transfer_length was an exact multiple of maxsze,
|
|
|
|
* hence (len = transfer_length - N * maxsze) == 0
|
|
|
|
* however, if transfer_length == 0, the zero packet was already
|
|
|
|
* prepared above.
|
|
|
|
*/
|
2005-12-17 22:58:46 +00:00
|
|
|
if ((urb->transfer_flags & URB_ZERO_PACKET) &&
|
|
|
|
usb_pipeout(urb->pipe) && len == 0 &&
|
|
|
|
urb->transfer_buffer_length > 0) {
|
2005-04-25 15:14:31 +00:00
|
|
|
td = uhci_alloc_td(uhci);
|
2005-04-16 22:20:36 +00:00
|
|
|
if (!td)
|
2005-12-17 23:00:12 +00:00
|
|
|
goto nomem;
|
2011-05-18 08:44:51 +00:00
|
|
|
*plink = LINK_TO_TD(uhci, td);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-05-12 15:29:04 +00:00
|
|
|
uhci_add_td_to_urbp(td, urbp);
|
2011-05-18 08:44:51 +00:00
|
|
|
uhci_fill_td(uhci, td, status,
|
2005-12-17 23:00:12 +00:00
|
|
|
destination | uhci_explen(0) |
|
|
|
|
(toggle << TD_TOKEN_TOGGLE_SHIFT),
|
|
|
|
data);
|
|
|
|
plink = &td->link;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 23:00:12 +00:00
|
|
|
toggle ^= 1;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Set the interrupt-on-completion flag on the last packet.
|
|
|
|
* A more-or-less typical 4 KB URB (= size of one memory page)
|
|
|
|
* will require about 3 ms to transfer; that's a little on the
|
|
|
|
* fast side but not enough to justify delaying an interrupt
|
|
|
|
* more than 2 or 3 URBs, so we will ignore the URB_NO_INTERRUPT
|
|
|
|
* flag setting. */
|
2011-05-18 08:44:51 +00:00
|
|
|
td->status |= cpu_to_hc32(uhci, TD_CTRL_IOC);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 23:00:12 +00:00
|
|
|
/*
|
|
|
|
* Build the new dummy TD and activate the old one
|
|
|
|
*/
|
|
|
|
td = uhci_alloc_td(uhci);
|
|
|
|
if (!td)
|
|
|
|
goto nomem;
|
2011-05-18 08:44:51 +00:00
|
|
|
*plink = LINK_TO_TD(uhci, td);
|
2005-12-17 23:00:12 +00:00
|
|
|
|
2011-05-18 08:44:51 +00:00
|
|
|
uhci_fill_td(uhci, td, 0, USB_PID_OUT | uhci_explen(0), 0);
|
2005-12-17 23:00:12 +00:00
|
|
|
wmb();
|
2011-05-18 08:44:51 +00:00
|
|
|
qh->dummy_td->status |= cpu_to_hc32(uhci, TD_CTRL_ACTIVE);
|
2005-12-17 23:00:12 +00:00
|
|
|
qh->dummy_td = td;
|
|
|
|
|
|
|
|
usb_settoggle(urb->dev, usb_pipeendpoint(urb->pipe),
|
|
|
|
usb_pipeout(urb->pipe), toggle);
|
2005-12-17 22:58:46 +00:00
|
|
|
return 0;
|
2005-12-17 23:00:12 +00:00
|
|
|
|
|
|
|
nomem:
|
|
|
|
/* Remove the dummy TD from the td_list so it doesn't get freed */
|
2006-05-12 15:29:04 +00:00
|
|
|
uhci_remove_td_from_urbp(qh->dummy_td);
|
2005-12-17 23:00:12 +00:00
|
|
|
return -ENOMEM;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2007-02-19 20:52:45 +00:00
|
|
|
static int uhci_submit_bulk(struct uhci_hcd *uhci, struct urb *urb,
|
2005-12-17 22:58:46 +00:00
|
|
|
struct uhci_qh *qh)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
/* Can't have low-speed bulk transfers */
|
|
|
|
if (urb->dev->speed == USB_SPEED_LOW)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2007-02-19 20:52:45 +00:00
|
|
|
if (qh->state != QH_STATE_ACTIVE)
|
|
|
|
qh->skel = SKEL_BULK;
|
2005-12-17 22:58:46 +00:00
|
|
|
ret = uhci_submit_common(uhci, urb, qh);
|
|
|
|
if (ret == 0)
|
2006-05-12 15:35:45 +00:00
|
|
|
uhci_add_fsbr(uhci, urb);
|
2005-04-16 22:20:36 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2006-05-19 20:44:55 +00:00
|
|
|
static int uhci_submit_interrupt(struct uhci_hcd *uhci, struct urb *urb,
|
2005-12-17 22:58:46 +00:00
|
|
|
struct uhci_qh *qh)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2007-01-16 16:56:32 +00:00
|
|
|
int ret;
|
2006-05-19 20:44:55 +00:00
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
/* USB 1.1 interrupt transfers only involve one packet per interval.
|
|
|
|
* Drivers can submit URBs of any length, but longer ones will need
|
|
|
|
* multiple intervals to complete.
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
2006-05-19 20:44:55 +00:00
|
|
|
|
2007-01-16 16:56:32 +00:00
|
|
|
if (!qh->bandwidth_reserved) {
|
|
|
|
int exponent;
|
2006-05-19 20:44:55 +00:00
|
|
|
|
2007-01-16 16:56:32 +00:00
|
|
|
/* Figure out which power-of-two queue to use */
|
|
|
|
for (exponent = 7; exponent >= 0; --exponent) {
|
|
|
|
if ((1 << exponent) <= urb->interval)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (exponent < 0)
|
|
|
|
return -EINVAL;
|
2006-05-19 20:44:55 +00:00
|
|
|
|
2008-09-25 20:59:57 +00:00
|
|
|
/* If the slot is full, try a lower period */
|
|
|
|
do {
|
|
|
|
qh->period = 1 << exponent;
|
|
|
|
qh->skel = SKEL_INDEX(exponent);
|
|
|
|
|
|
|
|
/* For now, interrupt phase is fixed by the layout
|
|
|
|
* of the QH lists.
|
|
|
|
*/
|
|
|
|
qh->phase = (qh->period / 2) & (MAX_PHASE - 1);
|
|
|
|
ret = uhci_check_bandwidth(uhci, qh);
|
|
|
|
} while (ret != 0 && --exponent >= 0);
|
2007-01-16 16:56:32 +00:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
} else if (qh->period > urb->interval)
|
|
|
|
return -EINVAL; /* Can't decrease the period */
|
|
|
|
|
|
|
|
ret = uhci_submit_common(uhci, urb, qh);
|
|
|
|
if (ret == 0) {
|
|
|
|
urb->interval = qh->period;
|
|
|
|
if (!qh->bandwidth_reserved)
|
|
|
|
uhci_reserve_bandwidth(uhci, qh);
|
|
|
|
}
|
|
|
|
return ret;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2006-05-12 15:14:25 +00:00
|
|
|
/*
|
|
|
|
* Fix up the data structures following a short transfer
|
|
|
|
*/
|
|
|
|
static int uhci_fixup_short_transfer(struct uhci_hcd *uhci,
|
2006-05-12 15:19:19 +00:00
|
|
|
struct uhci_qh *qh, struct urb_priv *urbp)
|
2006-05-12 15:14:25 +00:00
|
|
|
{
|
|
|
|
struct uhci_td *td;
|
2006-05-12 15:19:19 +00:00
|
|
|
struct list_head *tmp;
|
|
|
|
int ret;
|
2006-05-12 15:14:25 +00:00
|
|
|
|
|
|
|
td = list_entry(urbp->td_list.prev, struct uhci_td, list);
|
|
|
|
if (qh->type == USB_ENDPOINT_XFER_CONTROL) {
|
|
|
|
|
|
|
|
/* When a control transfer is short, we have to restart
|
|
|
|
* the queue at the status stage transaction, which is
|
|
|
|
* the last TD. */
|
2006-05-12 15:19:19 +00:00
|
|
|
WARN_ON(list_empty(&urbp->td_list));
|
2011-05-18 08:44:51 +00:00
|
|
|
qh->element = LINK_TO_TD(uhci, td);
|
2006-05-12 15:19:19 +00:00
|
|
|
tmp = td->list.prev;
|
2006-05-12 15:14:25 +00:00
|
|
|
ret = -EINPROGRESS;
|
|
|
|
|
2006-05-12 15:19:19 +00:00
|
|
|
} else {
|
2006-05-12 15:14:25 +00:00
|
|
|
|
|
|
|
/* When a bulk/interrupt transfer is short, we have to
|
|
|
|
* fix up the toggles of the following URBs on the queue
|
|
|
|
* before restarting the queue at the next URB. */
|
2011-05-18 08:44:51 +00:00
|
|
|
qh->initial_toggle =
|
|
|
|
uhci_toggle(td_token(uhci, qh->post_td)) ^ 1;
|
|
|
|
uhci_fixup_toggles(uhci, qh, 1);
|
2006-05-12 15:14:25 +00:00
|
|
|
|
2006-05-12 15:19:19 +00:00
|
|
|
if (list_empty(&urbp->td_list))
|
|
|
|
td = qh->post_td;
|
2006-05-12 15:14:25 +00:00
|
|
|
qh->element = td->link;
|
2006-05-12 15:19:19 +00:00
|
|
|
tmp = urbp->td_list.prev;
|
|
|
|
ret = 0;
|
2006-05-12 15:14:25 +00:00
|
|
|
}
|
|
|
|
|
2006-05-12 15:19:19 +00:00
|
|
|
/* Remove all the TDs we skipped over, from tmp back to the start */
|
|
|
|
while (tmp != &urbp->td_list) {
|
|
|
|
td = list_entry(tmp, struct uhci_td, list);
|
|
|
|
tmp = tmp->prev;
|
|
|
|
|
2006-05-12 15:29:04 +00:00
|
|
|
uhci_remove_td_from_urbp(td);
|
|
|
|
uhci_free_td(uhci, td);
|
2006-05-12 15:19:19 +00:00
|
|
|
}
|
2006-05-12 15:14:25 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Common result for control, bulk, and interrupt
|
|
|
|
*/
|
|
|
|
static int uhci_result_common(struct uhci_hcd *uhci, struct urb *urb)
|
|
|
|
{
|
|
|
|
struct urb_priv *urbp = urb->hcpriv;
|
|
|
|
struct uhci_qh *qh = urbp->qh;
|
2006-05-12 15:19:19 +00:00
|
|
|
struct uhci_td *td, *tmp;
|
2006-05-12 15:14:25 +00:00
|
|
|
unsigned status;
|
|
|
|
int ret = 0;
|
|
|
|
|
2006-05-12 15:19:19 +00:00
|
|
|
list_for_each_entry_safe(td, tmp, &urbp->td_list, list) {
|
2006-05-12 15:14:25 +00:00
|
|
|
unsigned int ctrlstat;
|
|
|
|
int len;
|
|
|
|
|
2011-05-18 08:44:51 +00:00
|
|
|
ctrlstat = td_status(uhci, td);
|
2006-05-12 15:14:25 +00:00
|
|
|
status = uhci_status_bits(ctrlstat);
|
|
|
|
if (status & TD_CTRL_ACTIVE)
|
|
|
|
return -EINPROGRESS;
|
|
|
|
|
|
|
|
len = uhci_actual_length(ctrlstat);
|
|
|
|
urb->actual_length += len;
|
|
|
|
|
|
|
|
if (status) {
|
|
|
|
ret = uhci_map_status(status,
|
2011-05-18 08:44:51 +00:00
|
|
|
uhci_packetout(td_token(uhci, td)));
|
2006-05-12 15:14:25 +00:00
|
|
|
if ((debug == 1 && ret != -EPIPE) || debug > 1) {
|
|
|
|
/* Some debugging code */
|
2006-06-05 16:16:39 +00:00
|
|
|
dev_dbg(&urb->dev->dev,
|
2006-05-12 15:14:25 +00:00
|
|
|
"%s: failed with status %x\n",
|
2008-03-04 00:08:34 +00:00
|
|
|
__func__, status);
|
2006-05-12 15:14:25 +00:00
|
|
|
|
|
|
|
if (debug > 1 && errbuf) {
|
|
|
|
/* Print the chain for debugging */
|
2007-03-19 19:31:42 +00:00
|
|
|
uhci_show_qh(uhci, urbp->qh, errbuf,
|
2013-01-23 08:13:41 +00:00
|
|
|
ERRBUF_LEN - EXTRA_SPACE, 0);
|
2006-05-12 15:14:25 +00:00
|
|
|
lprintk(errbuf);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-07-13 19:46:29 +00:00
|
|
|
/* Did we receive a short packet? */
|
2011-05-18 08:44:51 +00:00
|
|
|
} else if (len < uhci_expected_length(td_token(uhci, td))) {
|
2006-05-12 15:14:25 +00:00
|
|
|
|
2007-07-13 19:46:29 +00:00
|
|
|
/* For control transfers, go to the status TD if
|
|
|
|
* this isn't already the last data TD */
|
|
|
|
if (qh->type == USB_ENDPOINT_XFER_CONTROL) {
|
|
|
|
if (td->list.next != urbp->td_list.prev)
|
|
|
|
ret = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* For bulk and interrupt, this may be an error */
|
|
|
|
else if (urb->transfer_flags & URB_SHORT_NOT_OK)
|
2006-05-12 15:14:25 +00:00
|
|
|
ret = -EREMOTEIO;
|
2006-07-31 14:16:24 +00:00
|
|
|
|
|
|
|
/* Fixup needed only if this isn't the URB's last TD */
|
|
|
|
else if (&td->list != urbp->td_list.prev)
|
2006-05-12 15:14:25 +00:00
|
|
|
ret = 1;
|
|
|
|
}
|
|
|
|
|
2006-05-12 15:29:04 +00:00
|
|
|
uhci_remove_td_from_urbp(td);
|
2006-05-12 15:19:19 +00:00
|
|
|
if (qh->post_td)
|
2006-05-12 15:29:04 +00:00
|
|
|
uhci_free_td(uhci, qh->post_td);
|
2006-05-12 15:19:19 +00:00
|
|
|
qh->post_td = td;
|
|
|
|
|
2006-05-12 15:14:25 +00:00
|
|
|
if (ret != 0)
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
err:
|
|
|
|
if (ret < 0) {
|
|
|
|
/* Note that the queue has stopped and save
|
|
|
|
* the next toggle value */
|
2011-05-18 08:44:51 +00:00
|
|
|
qh->element = UHCI_PTR_TERM(uhci);
|
2006-05-12 15:14:25 +00:00
|
|
|
qh->is_stopped = 1;
|
|
|
|
qh->needs_fixup = (qh->type != USB_ENDPOINT_XFER_CONTROL);
|
2011-05-18 08:44:51 +00:00
|
|
|
qh->initial_toggle = uhci_toggle(td_token(uhci, td)) ^
|
2006-05-12 15:14:25 +00:00
|
|
|
(ret == -EREMOTEIO);
|
|
|
|
|
|
|
|
} else /* Short packet received */
|
2006-05-12 15:19:19 +00:00
|
|
|
ret = uhci_fixup_short_transfer(uhci, qh, urbp);
|
2006-05-12 15:14:25 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/*
|
|
|
|
* Isochronous transfers
|
|
|
|
*/
|
2005-12-17 23:02:38 +00:00
|
|
|
static int uhci_submit_isochronous(struct uhci_hcd *uhci, struct urb *urb,
|
|
|
|
struct uhci_qh *qh)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2005-12-17 23:02:38 +00:00
|
|
|
struct uhci_td *td = NULL; /* Since urb->number_of_packets > 0 */
|
2012-10-01 14:32:09 +00:00
|
|
|
int i;
|
|
|
|
unsigned frame, next;
|
2005-12-17 23:02:38 +00:00
|
|
|
unsigned long destination, status;
|
|
|
|
struct urb_priv *urbp = (struct urb_priv *) urb->hcpriv;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-05-19 20:44:55 +00:00
|
|
|
/* Values must not be too big (could overflow below) */
|
|
|
|
if (urb->interval >= UHCI_NUMFRAMES ||
|
|
|
|
urb->number_of_packets >= UHCI_NUMFRAMES)
|
2005-04-16 22:20:36 +00:00
|
|
|
return -EFBIG;
|
|
|
|
|
2012-10-01 14:32:09 +00:00
|
|
|
uhci_get_current_frame_number(uhci);
|
|
|
|
|
2006-05-19 20:44:55 +00:00
|
|
|
/* Check the period and figure out the starting frame number */
|
2007-01-16 16:56:32 +00:00
|
|
|
if (!qh->bandwidth_reserved) {
|
|
|
|
qh->period = urb->interval;
|
2012-10-01 14:32:09 +00:00
|
|
|
qh->phase = -1; /* Find the best phase */
|
|
|
|
i = uhci_check_bandwidth(uhci, qh);
|
|
|
|
if (i)
|
|
|
|
return i;
|
|
|
|
|
|
|
|
/* Allow a little time to allocate the TDs */
|
|
|
|
next = uhci->frame_number + 10;
|
|
|
|
frame = qh->phase;
|
|
|
|
|
|
|
|
/* Round up to the first available slot */
|
|
|
|
frame += (next - frame + qh->period - 1) & -qh->period;
|
2007-01-16 16:56:32 +00:00
|
|
|
|
2006-05-19 20:44:55 +00:00
|
|
|
} else if (qh->period != urb->interval) {
|
|
|
|
return -EINVAL; /* Can't change the period */
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-10-16 15:55:30 +00:00
|
|
|
} else {
|
2013-05-14 17:57:19 +00:00
|
|
|
next = uhci->frame_number + 1;
|
2012-10-01 14:32:09 +00:00
|
|
|
|
2007-10-16 15:55:30 +00:00
|
|
|
/* Find the next unused frame */
|
2005-12-17 23:02:38 +00:00
|
|
|
if (list_empty(&qh->queue)) {
|
2006-05-19 20:52:35 +00:00
|
|
|
frame = qh->iso_frame;
|
2006-05-19 20:44:55 +00:00
|
|
|
} else {
|
|
|
|
struct urb *lurb;
|
2005-12-17 23:02:38 +00:00
|
|
|
|
2006-05-19 20:44:55 +00:00
|
|
|
lurb = list_entry(qh->queue.prev,
|
2005-12-17 23:02:38 +00:00
|
|
|
struct urb_priv, node)->urb;
|
2006-05-19 20:44:55 +00:00
|
|
|
frame = lurb->start_frame +
|
|
|
|
lurb->number_of_packets *
|
|
|
|
lurb->interval;
|
2005-12-17 23:02:38 +00:00
|
|
|
}
|
2012-10-01 14:32:09 +00:00
|
|
|
|
|
|
|
/* Fell behind? */
|
2013-09-24 19:47:20 +00:00
|
|
|
if (!uhci_frame_before_eq(next, frame)) {
|
2012-10-01 14:32:09 +00:00
|
|
|
|
|
|
|
/* USB_ISO_ASAP: Round up to the first available slot */
|
|
|
|
if (urb->transfer_flags & URB_ISO_ASAP)
|
|
|
|
frame += (next - frame + qh->period - 1) &
|
|
|
|
-qh->period;
|
|
|
|
|
|
|
|
/*
|
2013-09-24 19:47:20 +00:00
|
|
|
* Not ASAP: Use the next slot in the stream,
|
|
|
|
* no matter what.
|
2007-10-16 15:55:30 +00:00
|
|
|
*/
|
2012-10-01 14:32:09 +00:00
|
|
|
else if (!uhci_frame_before_eq(next,
|
|
|
|
frame + (urb->number_of_packets - 1) *
|
|
|
|
qh->period))
|
2013-09-24 19:47:20 +00:00
|
|
|
dev_dbg(uhci_dev(uhci), "iso underrun %p (%u+%u < %u)\n",
|
|
|
|
urb, frame,
|
|
|
|
(urb->number_of_packets - 1) *
|
|
|
|
qh->period,
|
|
|
|
next);
|
2012-10-01 14:32:09 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2006-05-19 20:44:55 +00:00
|
|
|
/* Make sure we won't have to go too far into the future */
|
2006-05-19 20:52:35 +00:00
|
|
|
if (uhci_frame_before_eq(uhci->last_iso_frame + UHCI_NUMFRAMES,
|
2012-10-01 14:32:09 +00:00
|
|
|
frame + urb->number_of_packets * urb->interval))
|
2006-05-19 20:44:55 +00:00
|
|
|
return -EFBIG;
|
2012-10-01 14:32:09 +00:00
|
|
|
urb->start_frame = frame;
|
2006-05-19 20:44:55 +00:00
|
|
|
|
|
|
|
status = TD_CTRL_ACTIVE | TD_CTRL_IOS;
|
|
|
|
destination = (urb->pipe & PIPE_DEVEP_MASK) | usb_packetid(urb->pipe);
|
|
|
|
|
2005-10-13 21:00:24 +00:00
|
|
|
for (i = 0; i < urb->number_of_packets; i++) {
|
2005-04-25 15:14:31 +00:00
|
|
|
td = uhci_alloc_td(uhci);
|
2005-04-16 22:20:36 +00:00
|
|
|
if (!td)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2006-05-12 15:29:04 +00:00
|
|
|
uhci_add_td_to_urbp(td, urbp);
|
2011-05-18 08:44:51 +00:00
|
|
|
uhci_fill_td(uhci, td, status, destination |
|
2005-12-17 22:58:46 +00:00
|
|
|
uhci_explen(urb->iso_frame_desc[i].length),
|
|
|
|
urb->transfer_dma +
|
|
|
|
urb->iso_frame_desc[i].offset);
|
2005-10-13 21:00:24 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
/* Set the interrupt-on-completion flag on the last packet. */
|
2011-05-18 08:44:51 +00:00
|
|
|
td->status |= cpu_to_hc32(uhci, TD_CTRL_IOC);
|
2005-12-17 22:58:46 +00:00
|
|
|
|
|
|
|
/* Add the TDs to the frame list */
|
2005-10-13 21:00:24 +00:00
|
|
|
frame = urb->start_frame;
|
|
|
|
list_for_each_entry(td, &urbp->td_list, list) {
|
2005-12-17 22:58:46 +00:00
|
|
|
uhci_insert_td_in_frame_list(uhci, td, frame);
|
2006-05-19 20:52:35 +00:00
|
|
|
frame += qh->period;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (list_empty(&qh->queue)) {
|
|
|
|
qh->iso_packet_desc = &urb->iso_frame_desc[0];
|
|
|
|
qh->iso_frame = urb->start_frame;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2007-02-19 20:52:45 +00:00
|
|
|
qh->skel = SKEL_ISO;
|
2007-01-16 16:56:32 +00:00
|
|
|
if (!qh->bandwidth_reserved)
|
|
|
|
uhci_reserve_bandwidth(uhci, qh);
|
2005-12-17 22:58:46 +00:00
|
|
|
return 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int uhci_result_isochronous(struct uhci_hcd *uhci, struct urb *urb)
|
|
|
|
{
|
2006-05-19 20:52:35 +00:00
|
|
|
struct uhci_td *td, *tmp;
|
|
|
|
struct urb_priv *urbp = urb->hcpriv;
|
|
|
|
struct uhci_qh *qh = urbp->qh;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-05-19 20:52:35 +00:00
|
|
|
list_for_each_entry_safe(td, tmp, &urbp->td_list, list) {
|
|
|
|
unsigned int ctrlstat;
|
|
|
|
int status;
|
2005-04-16 22:20:36 +00:00
|
|
|
int actlength;
|
|
|
|
|
2006-05-19 20:52:35 +00:00
|
|
|
if (uhci_frame_before_eq(uhci->cur_iso_frame, qh->iso_frame))
|
2005-04-16 22:20:36 +00:00
|
|
|
return -EINPROGRESS;
|
|
|
|
|
2006-05-19 20:52:35 +00:00
|
|
|
uhci_remove_tds_from_frame(uhci, qh->iso_frame);
|
|
|
|
|
2011-05-18 08:44:51 +00:00
|
|
|
ctrlstat = td_status(uhci, td);
|
2006-05-19 20:52:35 +00:00
|
|
|
if (ctrlstat & TD_CTRL_ACTIVE) {
|
|
|
|
status = -EXDEV; /* TD was added too late? */
|
|
|
|
} else {
|
|
|
|
status = uhci_map_status(uhci_status_bits(ctrlstat),
|
|
|
|
usb_pipeout(urb->pipe));
|
|
|
|
actlength = uhci_actual_length(ctrlstat);
|
|
|
|
|
|
|
|
urb->actual_length += actlength;
|
|
|
|
qh->iso_packet_desc->actual_length = actlength;
|
|
|
|
qh->iso_packet_desc->status = status;
|
|
|
|
}
|
2007-08-21 19:37:50 +00:00
|
|
|
if (status)
|
2005-04-16 22:20:36 +00:00
|
|
|
urb->error_count++;
|
|
|
|
|
2006-05-19 20:52:35 +00:00
|
|
|
uhci_remove_td_from_urbp(td);
|
|
|
|
uhci_free_td(uhci, td);
|
|
|
|
qh->iso_frame += qh->period;
|
|
|
|
++qh->iso_packet_desc;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2007-08-21 19:37:50 +00:00
|
|
|
return 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int uhci_urb_enqueue(struct usb_hcd *hcd,
|
2005-10-21 07:21:58 +00:00
|
|
|
struct urb *urb, gfp_t mem_flags)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct uhci_hcd *uhci = hcd_to_uhci(hcd);
|
|
|
|
unsigned long flags;
|
2005-12-17 22:58:46 +00:00
|
|
|
struct urb_priv *urbp;
|
|
|
|
struct uhci_qh *qh;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
spin_lock_irqsave(&uhci->lock, flags);
|
|
|
|
|
2007-08-08 15:48:02 +00:00
|
|
|
ret = usb_hcd_link_urb_to_ep(hcd, urb);
|
|
|
|
if (ret)
|
|
|
|
goto done_not_linked;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
ret = -ENOMEM;
|
|
|
|
urbp = uhci_alloc_urb_priv(uhci, urb);
|
|
|
|
if (!urbp)
|
|
|
|
goto done;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-08-08 15:48:02 +00:00
|
|
|
if (urb->ep->hcpriv)
|
|
|
|
qh = urb->ep->hcpriv;
|
2005-12-17 22:58:46 +00:00
|
|
|
else {
|
2007-08-08 15:48:02 +00:00
|
|
|
qh = uhci_alloc_qh(uhci, urb->dev, urb->ep);
|
2005-12-17 22:58:46 +00:00
|
|
|
if (!qh)
|
|
|
|
goto err_no_qh;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2005-12-17 22:58:46 +00:00
|
|
|
urbp->qh = qh;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-05-05 20:26:58 +00:00
|
|
|
switch (qh->type) {
|
|
|
|
case USB_ENDPOINT_XFER_CONTROL:
|
2005-12-17 22:58:46 +00:00
|
|
|
ret = uhci_submit_control(uhci, urb, qh);
|
|
|
|
break;
|
2006-05-05 20:26:58 +00:00
|
|
|
case USB_ENDPOINT_XFER_BULK:
|
2005-12-17 22:58:46 +00:00
|
|
|
ret = uhci_submit_bulk(uhci, urb, qh);
|
2005-04-16 22:20:36 +00:00
|
|
|
break;
|
2006-05-05 20:26:58 +00:00
|
|
|
case USB_ENDPOINT_XFER_INT:
|
2007-01-16 16:56:32 +00:00
|
|
|
ret = uhci_submit_interrupt(uhci, urb, qh);
|
2005-04-16 22:20:36 +00:00
|
|
|
break;
|
2006-05-05 20:26:58 +00:00
|
|
|
case USB_ENDPOINT_XFER_ISOC:
|
2006-05-19 20:52:35 +00:00
|
|
|
urb->error_count = 0;
|
2005-12-17 22:58:46 +00:00
|
|
|
ret = uhci_submit_isochronous(uhci, urb, qh);
|
2005-04-16 22:20:36 +00:00
|
|
|
break;
|
|
|
|
}
|
2005-12-17 22:58:46 +00:00
|
|
|
if (ret != 0)
|
|
|
|
goto err_submit_failed;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
/* Add this URB to the QH */
|
|
|
|
list_add_tail(&urbp->node, &qh->queue);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
/* If the new URB is the first and only one on this QH then either
|
|
|
|
* the QH is new and idle or else it's unlinked and waiting to
|
2006-05-05 20:32:02 +00:00
|
|
|
* become idle, so we can activate it right away. But only if the
|
|
|
|
* queue isn't stopped. */
|
2006-05-12 15:35:45 +00:00
|
|
|
if (qh->queue.next == &urbp->node && !qh->is_stopped) {
|
2005-12-17 22:58:46 +00:00
|
|
|
uhci_activate_qh(uhci, qh);
|
2006-06-05 16:28:57 +00:00
|
|
|
uhci_urbp_wants_fsbr(uhci, urbp);
|
2006-05-12 15:35:45 +00:00
|
|
|
}
|
2005-12-17 22:58:46 +00:00
|
|
|
goto done;
|
|
|
|
|
|
|
|
err_submit_failed:
|
|
|
|
if (qh->state == QH_STATE_IDLE)
|
|
|
|
uhci_make_qh_idle(uhci, qh); /* Reclaim unused QH */
|
|
|
|
err_no_qh:
|
|
|
|
uhci_free_urb_priv(uhci, urbp);
|
|
|
|
done:
|
2007-08-08 15:48:02 +00:00
|
|
|
if (ret)
|
|
|
|
usb_hcd_unlink_urb_from_ep(hcd, urb);
|
|
|
|
done_not_linked:
|
2005-04-16 22:20:36 +00:00
|
|
|
spin_unlock_irqrestore(&uhci->lock, flags);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2007-08-08 15:48:02 +00:00
|
|
|
static int uhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
|
2005-12-17 23:02:38 +00:00
|
|
|
{
|
|
|
|
struct uhci_hcd *uhci = hcd_to_uhci(hcd);
|
|
|
|
unsigned long flags;
|
2006-05-19 20:39:52 +00:00
|
|
|
struct uhci_qh *qh;
|
2007-08-08 15:48:02 +00:00
|
|
|
int rc;
|
2005-12-17 23:02:38 +00:00
|
|
|
|
|
|
|
spin_lock_irqsave(&uhci->lock, flags);
|
2007-08-08 15:48:02 +00:00
|
|
|
rc = usb_hcd_check_unlink_urb(hcd, urb, status);
|
|
|
|
if (rc)
|
2005-12-17 23:02:38 +00:00
|
|
|
goto done;
|
2007-08-08 15:48:02 +00:00
|
|
|
|
|
|
|
qh = ((struct urb_priv *) urb->hcpriv)->qh;
|
2005-12-17 23:02:38 +00:00
|
|
|
|
|
|
|
/* Remove Isochronous TDs from the frame list ASAP */
|
2006-05-19 20:39:52 +00:00
|
|
|
if (qh->type == USB_ENDPOINT_XFER_ISOC) {
|
2005-12-17 23:02:38 +00:00
|
|
|
uhci_unlink_isochronous_tds(uhci, urb);
|
2006-05-19 20:39:52 +00:00
|
|
|
mb();
|
|
|
|
|
|
|
|
/* If the URB has already started, update the QH unlink time */
|
|
|
|
uhci_get_current_frame_number(uhci);
|
|
|
|
if (uhci_frame_before_eq(urb->start_frame, uhci->frame_number))
|
|
|
|
qh->unlink_frame = uhci->frame_number;
|
|
|
|
}
|
|
|
|
|
|
|
|
uhci_unlink_qh(uhci, qh);
|
2005-12-17 23:02:38 +00:00
|
|
|
|
|
|
|
done:
|
|
|
|
spin_unlock_irqrestore(&uhci->lock, flags);
|
2007-08-08 15:48:02 +00:00
|
|
|
return rc;
|
2005-12-17 23:02:38 +00:00
|
|
|
}
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/*
|
2005-12-17 23:02:38 +00:00
|
|
|
* Finish unlinking an URB and give it back
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
2005-12-17 23:02:38 +00:00
|
|
|
static void uhci_giveback_urb(struct uhci_hcd *uhci, struct uhci_qh *qh,
|
2007-08-24 19:42:24 +00:00
|
|
|
struct urb *urb, int status)
|
2005-12-17 23:02:38 +00:00
|
|
|
__releases(uhci->lock)
|
|
|
|
__acquires(uhci->lock)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2005-12-17 22:58:46 +00:00
|
|
|
struct urb_priv *urbp = (struct urb_priv *) urb->hcpriv;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-07-13 19:46:29 +00:00
|
|
|
if (qh->type == USB_ENDPOINT_XFER_CONTROL) {
|
|
|
|
|
2009-03-05 16:01:11 +00:00
|
|
|
/* Subtract off the length of the SETUP packet from
|
|
|
|
* urb->actual_length.
|
|
|
|
*/
|
|
|
|
urb->actual_length -= min_t(u32, 8, urb->actual_length);
|
2007-07-13 19:46:29 +00:00
|
|
|
}
|
|
|
|
|
2006-05-19 20:52:35 +00:00
|
|
|
/* When giving back the first URB in an Isochronous queue,
|
|
|
|
* reinitialize the QH's iso-related members for the next URB. */
|
2007-07-13 19:46:29 +00:00
|
|
|
else if (qh->type == USB_ENDPOINT_XFER_ISOC &&
|
2006-05-19 20:52:35 +00:00
|
|
|
urbp->node.prev == &qh->queue &&
|
|
|
|
urbp->node.next != &qh->queue) {
|
|
|
|
struct urb *nurb = list_entry(urbp->node.next,
|
|
|
|
struct urb_priv, node)->urb;
|
|
|
|
|
|
|
|
qh->iso_packet_desc = &nurb->iso_frame_desc[0];
|
|
|
|
qh->iso_frame = nurb->start_frame;
|
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 23:02:38 +00:00
|
|
|
/* Take the URB off the QH's queue. If the queue is now empty,
|
|
|
|
* this is a perfect time for a toggle fixup. */
|
|
|
|
list_del_init(&urbp->node);
|
|
|
|
if (list_empty(&qh->queue) && qh->needs_fixup) {
|
|
|
|
usb_settoggle(urb->dev, usb_pipeendpoint(urb->pipe),
|
|
|
|
usb_pipeout(urb->pipe), qh->initial_toggle);
|
|
|
|
qh->needs_fixup = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
uhci_free_urb_priv(uhci, urbp);
|
2007-08-08 15:48:02 +00:00
|
|
|
usb_hcd_unlink_urb_from_ep(uhci_to_hcd(uhci), urb);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 23:02:38 +00:00
|
|
|
spin_unlock(&uhci->lock);
|
2007-08-24 19:42:24 +00:00
|
|
|
usb_hcd_giveback_urb(uhci_to_hcd(uhci), urb, status);
|
2005-12-17 23:02:38 +00:00
|
|
|
spin_lock(&uhci->lock);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 23:02:38 +00:00
|
|
|
/* If the queue is now empty, we can unlink the QH and give up its
|
|
|
|
* reserved bandwidth. */
|
|
|
|
if (list_empty(&qh->queue)) {
|
|
|
|
uhci_unlink_qh(uhci, qh);
|
2007-01-16 16:56:32 +00:00
|
|
|
if (qh->bandwidth_reserved)
|
|
|
|
uhci_release_bandwidth(uhci, qh);
|
2005-12-17 23:02:38 +00:00
|
|
|
}
|
2005-12-17 22:58:46 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 22:58:46 +00:00
|
|
|
/*
|
2005-12-17 23:02:38 +00:00
|
|
|
* Scan the URBs in a QH's queue
|
2005-12-17 22:58:46 +00:00
|
|
|
*/
|
2005-12-17 23:02:38 +00:00
|
|
|
#define QH_FINISHED_UNLINKING(qh) \
|
|
|
|
(qh->state == QH_STATE_UNLINKING && \
|
|
|
|
uhci->frame_number + uhci->is_stopped != qh->unlink_frame)
|
2005-04-16 22:20:36 +00:00
|
|
|
|
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 13:55:46 +00:00
|
|
|
static void uhci_scan_qh(struct uhci_hcd *uhci, struct uhci_qh *qh)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct urb_priv *urbp;
|
2005-12-17 23:02:38 +00:00
|
|
|
struct urb *urb;
|
|
|
|
int status;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 23:02:38 +00:00
|
|
|
while (!list_empty(&qh->queue)) {
|
|
|
|
urbp = list_entry(qh->queue.next, struct urb_priv, node);
|
|
|
|
urb = urbp->urb;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-05-12 15:14:25 +00:00
|
|
|
if (qh->type == USB_ENDPOINT_XFER_ISOC)
|
2005-12-17 23:02:38 +00:00
|
|
|
status = uhci_result_isochronous(uhci, urb);
|
2006-05-12 15:14:25 +00:00
|
|
|
else
|
2005-12-17 23:02:38 +00:00
|
|
|
status = uhci_result_common(uhci, urb);
|
|
|
|
if (status == -EINPROGRESS)
|
|
|
|
break;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 23:02:38 +00:00
|
|
|
/* Dequeued but completed URBs can't be given back unless
|
|
|
|
* the QH is stopped or has finished unlinking. */
|
2007-08-21 19:40:36 +00:00
|
|
|
if (urb->unlinked) {
|
2006-05-05 20:32:02 +00:00
|
|
|
if (QH_FINISHED_UNLINKING(qh))
|
|
|
|
qh->is_stopped = 1;
|
|
|
|
else if (!qh->is_stopped)
|
|
|
|
return;
|
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-08-24 19:42:24 +00:00
|
|
|
uhci_giveback_urb(uhci, qh, urb, status);
|
2007-08-21 19:37:50 +00:00
|
|
|
if (status < 0)
|
2005-12-17 23:02:38 +00:00
|
|
|
break;
|
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 23:02:38 +00:00
|
|
|
/* If the QH is neither stopped nor finished unlinking (normal case),
|
|
|
|
* our work here is done. */
|
2006-05-05 20:32:02 +00:00
|
|
|
if (QH_FINISHED_UNLINKING(qh))
|
|
|
|
qh->is_stopped = 1;
|
|
|
|
else if (!qh->is_stopped)
|
2005-12-17 23:02:38 +00:00
|
|
|
return;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 23:02:38 +00:00
|
|
|
/* Otherwise give back each of the dequeued URBs */
|
2006-05-05 20:32:02 +00:00
|
|
|
restart:
|
2005-12-17 23:02:38 +00:00
|
|
|
list_for_each_entry(urbp, &qh->queue, node) {
|
|
|
|
urb = urbp->urb;
|
2007-08-21 19:40:36 +00:00
|
|
|
if (urb->unlinked) {
|
2006-05-19 20:39:52 +00:00
|
|
|
|
|
|
|
/* Fix up the TD links and save the toggles for
|
|
|
|
* non-Isochronous queues. For Isochronous queues,
|
|
|
|
* test for too-recent dequeues. */
|
|
|
|
if (!uhci_cleanup_queue(uhci, qh, urb)) {
|
|
|
|
qh->is_stopped = 0;
|
|
|
|
return;
|
|
|
|
}
|
2007-08-24 19:42:24 +00:00
|
|
|
uhci_giveback_urb(uhci, qh, urb, 0);
|
2005-12-17 23:02:38 +00:00
|
|
|
goto restart;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
qh->is_stopped = 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 23:02:38 +00:00
|
|
|
/* There are no more dequeued URBs. If there are still URBs on the
|
|
|
|
* queue, the QH can now be re-activated. */
|
|
|
|
if (!list_empty(&qh->queue)) {
|
|
|
|
if (qh->needs_fixup)
|
2011-05-18 08:44:51 +00:00
|
|
|
uhci_fixup_toggles(uhci, qh, 0);
|
2006-05-12 15:35:45 +00:00
|
|
|
|
|
|
|
/* If the first URB on the queue wants FSBR but its time
|
|
|
|
* limit has expired, set the next TD to interrupt on
|
|
|
|
* completion before reactivating the QH. */
|
|
|
|
urbp = list_entry(qh->queue.next, struct urb_priv, node);
|
|
|
|
if (urbp->fsbr && qh->wait_expired) {
|
|
|
|
struct uhci_td *td = list_entry(urbp->td_list.next,
|
|
|
|
struct uhci_td, list);
|
|
|
|
|
2011-05-18 08:44:51 +00:00
|
|
|
td->status |= cpu_to_hc32(uhci, TD_CTRL_IOC);
|
2006-05-12 15:35:45 +00:00
|
|
|
}
|
|
|
|
|
2005-12-17 23:02:38 +00:00
|
|
|
uhci_activate_qh(uhci, qh);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2005-12-17 23:02:38 +00:00
|
|
|
/* The queue is empty. The QH can become idle if it is fully
|
|
|
|
* unlinked. */
|
|
|
|
else if (QH_FINISHED_UNLINKING(qh))
|
|
|
|
uhci_make_qh_idle(uhci, qh);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2006-05-12 15:35:45 +00:00
|
|
|
/*
|
|
|
|
* Check for queues that have made some forward progress.
|
|
|
|
* Returns 0 if the queue is not Isochronous, is ACTIVE, and
|
|
|
|
* has not advanced since last examined; 1 otherwise.
|
2006-05-12 15:41:59 +00:00
|
|
|
*
|
|
|
|
* Early Intel controllers have a bug which causes qh->element sometimes
|
|
|
|
* not to advance when a TD completes successfully. The queue remains
|
|
|
|
* stuck on the inactive completed TD. We detect such cases and advance
|
|
|
|
* the element pointer by hand.
|
2006-05-12 15:35:45 +00:00
|
|
|
*/
|
|
|
|
static int uhci_advance_check(struct uhci_hcd *uhci, struct uhci_qh *qh)
|
|
|
|
{
|
|
|
|
struct urb_priv *urbp = NULL;
|
|
|
|
struct uhci_td *td;
|
|
|
|
int ret = 1;
|
|
|
|
unsigned status;
|
|
|
|
|
|
|
|
if (qh->type == USB_ENDPOINT_XFER_ISOC)
|
2006-06-05 16:28:57 +00:00
|
|
|
goto done;
|
2006-05-12 15:35:45 +00:00
|
|
|
|
|
|
|
/* Treat an UNLINKING queue as though it hasn't advanced.
|
|
|
|
* This is okay because reactivation will treat it as though
|
|
|
|
* it has advanced, and if it is going to become IDLE then
|
|
|
|
* this doesn't matter anyway. Furthermore it's possible
|
|
|
|
* for an UNLINKING queue not to have any URBs at all, or
|
|
|
|
* for its first URB not to have any TDs (if it was dequeued
|
|
|
|
* just as it completed). So it's not easy in any case to
|
|
|
|
* test whether such queues have advanced. */
|
|
|
|
if (qh->state != QH_STATE_ACTIVE) {
|
|
|
|
urbp = NULL;
|
|
|
|
status = 0;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
urbp = list_entry(qh->queue.next, struct urb_priv, node);
|
|
|
|
td = list_entry(urbp->td_list.next, struct uhci_td, list);
|
2011-05-18 08:44:51 +00:00
|
|
|
status = td_status(uhci, td);
|
2006-05-12 15:35:45 +00:00
|
|
|
if (!(status & TD_CTRL_ACTIVE)) {
|
|
|
|
|
|
|
|
/* We're okay, the queue has advanced */
|
|
|
|
qh->wait_expired = 0;
|
|
|
|
qh->advance_jiffies = jiffies;
|
2006-06-05 16:28:57 +00:00
|
|
|
goto done;
|
2006-05-12 15:35:45 +00:00
|
|
|
}
|
2010-06-09 21:34:39 +00:00
|
|
|
ret = uhci->is_stopped;
|
2006-05-12 15:35:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* The queue hasn't advanced; check for timeout */
|
2006-06-05 16:28:57 +00:00
|
|
|
if (qh->wait_expired)
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
if (time_after(jiffies, qh->advance_jiffies + QH_WAIT_TIMEOUT)) {
|
2006-05-12 15:41:59 +00:00
|
|
|
|
|
|
|
/* Detect the Intel bug and work around it */
|
2011-05-18 08:44:51 +00:00
|
|
|
if (qh->post_td && qh_element(qh) ==
|
|
|
|
LINK_TO_TD(uhci, qh->post_td)) {
|
2006-05-12 15:41:59 +00:00
|
|
|
qh->element = qh->post_td->link;
|
|
|
|
qh->advance_jiffies = jiffies;
|
2006-06-05 16:28:57 +00:00
|
|
|
ret = 1;
|
|
|
|
goto done;
|
2006-05-12 15:41:59 +00:00
|
|
|
}
|
|
|
|
|
2006-05-12 15:35:45 +00:00
|
|
|
qh->wait_expired = 1;
|
|
|
|
|
|
|
|
/* If the current URB wants FSBR, unlink it temporarily
|
|
|
|
* so that we can safely set the next TD to interrupt on
|
|
|
|
* completion. That way we'll know as soon as the queue
|
|
|
|
* starts moving again. */
|
|
|
|
if (urbp && urbp->fsbr && !(status & TD_CTRL_IOC))
|
|
|
|
uhci_unlink_qh(uhci, qh);
|
2006-06-05 16:28:57 +00:00
|
|
|
|
|
|
|
} else {
|
|
|
|
/* Unmoving but not-yet-expired queues keep FSBR alive */
|
|
|
|
if (urbp)
|
|
|
|
uhci_urbp_wants_fsbr(uhci, urbp);
|
2006-05-12 15:35:45 +00:00
|
|
|
}
|
2006-06-05 16:28:57 +00:00
|
|
|
|
|
|
|
done:
|
2006-05-12 15:35:45 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2005-12-17 23:02:38 +00:00
|
|
|
/*
|
|
|
|
* Process events in the schedule, but only in one thread at a time
|
|
|
|
*/
|
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 13:55:46 +00:00
|
|
|
static void uhci_scan_schedule(struct uhci_hcd *uhci)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2005-12-17 23:02:38 +00:00
|
|
|
int i;
|
|
|
|
struct uhci_qh *qh;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* Don't allow re-entrant calls */
|
|
|
|
if (uhci->scan_in_progress) {
|
|
|
|
uhci->need_rescan = 1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
uhci->scan_in_progress = 1;
|
2006-05-12 15:35:45 +00:00
|
|
|
rescan:
|
2005-04-16 22:20:36 +00:00
|
|
|
uhci->need_rescan = 0;
|
2006-06-05 16:28:57 +00:00
|
|
|
uhci->fsbr_is_wanted = 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-04-21 20:04:58 +00:00
|
|
|
uhci_clear_next_interrupt(uhci);
|
2005-04-16 22:20:36 +00:00
|
|
|
uhci_get_current_frame_number(uhci);
|
2006-05-19 20:52:35 +00:00
|
|
|
uhci->cur_iso_frame = uhci->frame_number;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-12-17 23:02:38 +00:00
|
|
|
/* Go through all the QH queues and process the URBs in each one */
|
|
|
|
for (i = 0; i < UHCI_NUM_SKELQH - 1; ++i) {
|
|
|
|
uhci->next_qh = list_entry(uhci->skelqh[i]->node.next,
|
|
|
|
struct uhci_qh, node);
|
|
|
|
while ((qh = uhci->next_qh) != uhci->skelqh[i]) {
|
|
|
|
uhci->next_qh = list_entry(qh->node.next,
|
|
|
|
struct uhci_qh, node);
|
2006-05-12 15:35:45 +00:00
|
|
|
|
|
|
|
if (uhci_advance_check(uhci, qh)) {
|
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 13:55:46 +00:00
|
|
|
uhci_scan_qh(uhci, qh);
|
2006-06-05 16:28:57 +00:00
|
|
|
if (qh->state == QH_STATE_ACTIVE) {
|
|
|
|
uhci_urbp_wants_fsbr(uhci,
|
|
|
|
list_entry(qh->queue.next, struct urb_priv, node));
|
|
|
|
}
|
2006-05-12 15:35:45 +00:00
|
|
|
}
|
2005-12-17 23:02:38 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2006-05-19 20:52:35 +00:00
|
|
|
uhci->last_iso_frame = uhci->cur_iso_frame;
|
2005-04-16 22:20:36 +00:00
|
|
|
if (uhci->need_rescan)
|
|
|
|
goto rescan;
|
|
|
|
uhci->scan_in_progress = 0;
|
|
|
|
|
2006-06-05 16:28:57 +00:00
|
|
|
if (uhci->fsbr_is_on && !uhci->fsbr_is_wanted &&
|
|
|
|
!uhci->fsbr_expiring) {
|
|
|
|
uhci->fsbr_expiring = 1;
|
|
|
|
mod_timer(&uhci->fsbr_timer, jiffies + FSBR_OFF_DELAY);
|
|
|
|
}
|
2006-05-12 15:35:45 +00:00
|
|
|
|
2006-05-12 15:29:04 +00:00
|
|
|
if (list_empty(&uhci->skel_unlink_qh->node))
|
2005-04-16 22:20:36 +00:00
|
|
|
uhci_clear_next_interrupt(uhci);
|
|
|
|
else
|
|
|
|
uhci_set_next_interrupt(uhci);
|
|
|
|
}
|