Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
f8e98843
L
linux
项目概览
xiphi1978
/
linux
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f8e98843
编写于
11月 30, 2005
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
上级
c801147c
8926bfa7
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
168 addition
and
44 deletion
+168
-44
Documentation/usb/error-codes.txt
Documentation/usb/error-codes.txt
+3
-2
drivers/hwmon/w83792d.c
drivers/hwmon/w83792d.c
+18
-7
drivers/usb/atm/cxacru.c
drivers/usb/atm/cxacru.c
+3
-0
drivers/usb/core/hcd-pci.c
drivers/usb/core/hcd-pci.c
+2
-1
drivers/usb/core/hcd.c
drivers/usb/core/hcd.c
+10
-5
drivers/usb/core/hcd.h
drivers/usb/core/hcd.h
+6
-1
drivers/usb/host/ehci-pci.c
drivers/usb/host/ehci-pci.c
+38
-8
drivers/usb/host/ehci-q.c
drivers/usb/host/ehci-q.c
+16
-8
drivers/usb/host/ehci-sched.c
drivers/usb/host/ehci-sched.c
+16
-2
drivers/usb/host/ohci-hcd.c
drivers/usb/host/ohci-hcd.c
+5
-1
drivers/usb/host/ohci-hub.c
drivers/usb/host/ohci-hub.c
+20
-4
drivers/usb/host/ohci-pci.c
drivers/usb/host/ohci-pci.c
+25
-2
drivers/usb/host/uhci-hcd.c
drivers/usb/host/uhci-hcd.c
+6
-0
include/linux/pci_ids.h
include/linux/pci_ids.h
+0
-3
未找到文件。
Documentation/usb/error-codes.txt
浏览文件 @
f8e98843
...
...
@@ -46,8 +46,9 @@ USB-specific:
-EMSGSIZE (a) endpoint maxpacket size is zero; it is not usable
in the current interface altsetting.
(b) ISO packet is biger than endpoint maxpacket
(c) requested data transfer size is invalid (negative)
(b) ISO packet is larger than the endpoint maxpacket.
(c) requested data transfer length is invalid: negative
or too large for the host controller.
-ENOSPC This request would overcommit the usb bandwidth reserved
for periodic transfers (interrupt, isochronous).
...
...
drivers/hwmon/w83792d.c
浏览文件 @
f8e98843
...
...
@@ -193,6 +193,7 @@ static const u8 W83792D_REG_LEVELS[3][4] = {
0xE2
}
/* (bit3-0) SmartFanII: Fan3 Level 3 */
};
#define W83792D_REG_GPIO_EN 0x1A
#define W83792D_REG_CONFIG 0x40
#define W83792D_REG_VID_FANDIV 0x47
#define W83792D_REG_CHIPID 0x49
...
...
@@ -257,7 +258,7 @@ DIV_TO_REG(long val)
{
int
i
;
val
=
SENSORS_LIMIT
(
val
,
1
,
128
)
>>
1
;
for
(
i
=
0
;
i
<
6
;
i
++
)
{
for
(
i
=
0
;
i
<
7
;
i
++
)
{
if
(
val
==
0
)
break
;
val
>>=
1
;
...
...
@@ -1282,8 +1283,8 @@ w83792d_detect(struct i2c_adapter *adapter, int address, int kind)
w83792d_init_client
(
new_client
);
/* A few vars need to be filled upon startup */
for
(
i
=
1
;
i
<=
7
;
i
++
)
{
data
->
fan_min
[
i
-
1
]
=
w83792d_read_value
(
new_client
,
for
(
i
=
0
;
i
<
7
;
i
++
)
{
data
->
fan_min
[
i
]
=
w83792d_read_value
(
new_client
,
W83792D_REG_FAN_MIN
[
i
]);
}
...
...
@@ -1306,10 +1307,20 @@ w83792d_detect(struct i2c_adapter *adapter, int address, int kind)
device_create_file_fan
(
new_client
,
1
);
device_create_file_fan
(
new_client
,
2
);
device_create_file_fan
(
new_client
,
3
);
device_create_file_fan
(
new_client
,
4
);
device_create_file_fan
(
new_client
,
5
);
device_create_file_fan
(
new_client
,
6
);
device_create_file_fan
(
new_client
,
7
);
/* Read GPIO enable register to check if pins for fan 4,5 are used as
GPIO */
val1
=
w83792d_read_value
(
new_client
,
W83792D_REG_GPIO_EN
);
if
(
!
(
val1
&
0x40
))
device_create_file_fan
(
new_client
,
4
);
if
(
!
(
val1
&
0x20
))
device_create_file_fan
(
new_client
,
5
);
val1
=
w83792d_read_value
(
new_client
,
W83792D_REG_PIN
);
if
(
val1
&
0x40
)
device_create_file_fan
(
new_client
,
6
);
if
(
val1
&
0x04
)
device_create_file_fan
(
new_client
,
7
);
device_create_file_temp1
(
new_client
);
/* Temp1 */
device_create_file_temp_add
(
new_client
,
2
);
/* Temp2 */
...
...
drivers/usb/atm/cxacru.c
浏览文件 @
f8e98843
...
...
@@ -787,6 +787,9 @@ static const struct usb_device_id cxacru_usb_ids[] = {
{
/* V = Conexant P = ADSL modem (Hasbani project) */
USB_DEVICE
(
0x0572
,
0xcb00
),
.
driver_info
=
(
unsigned
long
)
&
cxacru_cb00
},
{
/* V = Conexant P = ADSL modem (Well PTI-800 */
USB_DEVICE
(
0x0572
,
0xcb02
),
.
driver_info
=
(
unsigned
long
)
&
cxacru_cb00
},
{
/* V = Conexant P = ADSL modem */
USB_DEVICE
(
0x0572
,
0xcb01
),
.
driver_info
=
(
unsigned
long
)
&
cxacru_cb00
},
...
...
drivers/usb/core/hcd-pci.c
浏览文件 @
f8e98843
...
...
@@ -219,6 +219,7 @@ int usb_hcd_pci_suspend (struct pci_dev *dev, pm_message_t message)
goto
done
;
}
}
synchronize_irq
(
dev
->
irq
);
/* FIXME until the generic PM interfaces change a lot more, this
* can't use PCI D1 and D2 states. For example, the confusion
...
...
@@ -392,7 +393,7 @@ int usb_hcd_pci_resume (struct pci_dev *dev)
dev
->
dev
.
power
.
power_state
=
PMSG_ON
;
hcd
->
saw_irq
=
0
;
clear_bit
(
HCD_FLAG_SAW_IRQ
,
&
hcd
->
flags
)
;
if
(
hcd
->
driver
->
resume
)
{
retval
=
hcd
->
driver
->
resume
(
hcd
);
...
...
drivers/usb/core/hcd.c
浏览文件 @
f8e98843
...
...
@@ -1315,11 +1315,12 @@ static int hcd_unlink_urb (struct urb *urb, int status)
* finish unlinking the initial failed usb_set_address()
* or device descriptor fetch.
*/
if
(
!
hcd
->
saw_irq
&&
hcd
->
self
.
root_hub
!=
urb
->
dev
)
{
if
(
!
test_bit
(
HCD_FLAG_SAW_IRQ
,
&
hcd
->
flags
)
&&
hcd
->
self
.
root_hub
!=
urb
->
dev
)
{
dev_warn
(
hcd
->
self
.
controller
,
"Unlink after no-IRQ? "
"Controller is probably using the wrong IRQ."
"
\n
"
);
hcd
->
saw_irq
=
1
;
set_bit
(
HCD_FLAG_SAW_IRQ
,
&
hcd
->
flags
)
;
}
urb
->
status
=
status
;
...
...
@@ -1649,13 +1650,15 @@ irqreturn_t usb_hcd_irq (int irq, void *__hcd, struct pt_regs * r)
struct
usb_hcd
*
hcd
=
__hcd
;
int
start
=
hcd
->
state
;
if
(
start
==
HC_STATE_HALT
)
if
(
unlikely
(
start
==
HC_STATE_HALT
||
!
test_bit
(
HCD_FLAG_HW_ACCESSIBLE
,
&
hcd
->
flags
)))
return
IRQ_NONE
;
if
(
hcd
->
driver
->
irq
(
hcd
,
r
)
==
IRQ_NONE
)
return
IRQ_NONE
;
hcd
->
saw_irq
=
1
;
if
(
hcd
->
state
==
HC_STATE_HALT
)
set_bit
(
HCD_FLAG_SAW_IRQ
,
&
hcd
->
flags
);
if
(
unlikely
(
hcd
->
state
==
HC_STATE_HALT
))
usb_hc_died
(
hcd
);
return
IRQ_HANDLED
;
}
...
...
@@ -1768,6 +1771,8 @@ int usb_add_hcd(struct usb_hcd *hcd,
dev_info
(
hcd
->
self
.
controller
,
"%s
\n
"
,
hcd
->
product_desc
);
set_bit
(
HCD_FLAG_HW_ACCESSIBLE
,
&
hcd
->
flags
);
/* till now HC has been in an indeterminate state ... */
if
(
hcd
->
driver
->
reset
&&
(
retval
=
hcd
->
driver
->
reset
(
hcd
))
<
0
)
{
dev_err
(
hcd
->
self
.
controller
,
"can't reset
\n
"
);
...
...
drivers/usb/core/hcd.h
浏览文件 @
f8e98843
...
...
@@ -72,7 +72,12 @@ struct usb_hcd { /* usb_bus.hcpriv points to this */
* hardware info/state
*/
const
struct
hc_driver
*
driver
;
/* hw-specific hooks */
unsigned
saw_irq
:
1
;
/* Flags that need to be manipulated atomically */
unsigned
long
flags
;
#define HCD_FLAG_HW_ACCESSIBLE 0x00000001
#define HCD_FLAG_SAW_IRQ 0x00000002
unsigned
can_wakeup
:
1
;
/* hw supports wakeup? */
unsigned
remote_wakeup
:
1
;
/* sw should use wakeup? */
unsigned
rh_registered
:
1
;
/* is root hub registered? */
...
...
drivers/usb/host/ehci-pci.c
浏览文件 @
f8e98843
...
...
@@ -121,8 +121,8 @@ static int ehci_pci_reinit(struct ehci_hcd *ehci, struct pci_dev *pdev)
return
0
;
}
/* called
by khubd or root hub (re)init threads; leaves HC in halt state
*/
static
int
ehci_pci_
reset
(
struct
usb_hcd
*
hcd
)
/* called
during probe() after chip reset completes
*/
static
int
ehci_pci_
setup
(
struct
usb_hcd
*
hcd
)
{
struct
ehci_hcd
*
ehci
=
hcd_to_ehci
(
hcd
);
struct
pci_dev
*
pdev
=
to_pci_dev
(
hcd
->
self
.
controller
);
...
...
@@ -141,6 +141,11 @@ static int ehci_pci_reset(struct usb_hcd *hcd)
if
(
retval
)
return
retval
;
/* data structure init */
retval
=
ehci_init
(
hcd
);
if
(
retval
)
return
retval
;
/* NOTE: only the parts below this line are PCI-specific */
switch
(
pdev
->
vendor
)
{
...
...
@@ -154,7 +159,8 @@ static int ehci_pci_reset(struct usb_hcd *hcd)
/* AMD8111 EHCI doesn't work, according to AMD errata */
if
(
pdev
->
device
==
0x7463
)
{
ehci_info
(
ehci
,
"ignoring AMD8111 (errata)
\n
"
);
return
-
EIO
;
retval
=
-
EIO
;
goto
done
;
}
break
;
case
PCI_VENDOR_ID_NVIDIA
:
...
...
@@ -207,9 +213,8 @@ static int ehci_pci_reset(struct usb_hcd *hcd)
/* REVISIT: per-port wake capability (PCI 0x62) currently unused */
retval
=
ehci_pci_reinit
(
ehci
,
pdev
);
/* finish init */
return
ehci_init
(
hcd
);
done:
return
retval
;
}
/*-------------------------------------------------------------------------*/
...
...
@@ -228,14 +233,36 @@ static int ehci_pci_reset(struct usb_hcd *hcd)
static
int
ehci_pci_suspend
(
struct
usb_hcd
*
hcd
,
pm_message_t
message
)
{
struct
ehci_hcd
*
ehci
=
hcd_to_ehci
(
hcd
);
unsigned
long
flags
;
int
rc
=
0
;
if
(
time_before
(
jiffies
,
ehci
->
next_statechange
))
msleep
(
10
);
/* Root hub was already suspended. Disable irq emission and
* mark HW unaccessible, bail out if RH has been resumed. Use
* the spinlock to properly synchronize with possible pending
* RH suspend or resume activity.
*
* This is still racy as hcd->state is manipulated outside of
* any locks =P But that will be a different fix.
*/
spin_lock_irqsave
(
&
ehci
->
lock
,
flags
);
if
(
hcd
->
state
!=
HC_STATE_SUSPENDED
)
{
rc
=
-
EINVAL
;
goto
bail
;
}
writel
(
0
,
&
ehci
->
regs
->
intr_enable
);
(
void
)
readl
(
&
ehci
->
regs
->
intr_enable
);
clear_bit
(
HCD_FLAG_HW_ACCESSIBLE
,
&
hcd
->
flags
);
bail:
spin_unlock_irqrestore
(
&
ehci
->
lock
,
flags
);
// could save FLADJ in case of Vaux power loss
// ... we'd only use it to handle clock skew
return
0
;
return
rc
;
}
static
int
ehci_pci_resume
(
struct
usb_hcd
*
hcd
)
...
...
@@ -251,6 +278,9 @@ static int ehci_pci_resume(struct usb_hcd *hcd)
if
(
time_before
(
jiffies
,
ehci
->
next_statechange
))
msleep
(
100
);
/* Mark hardware accessible again as we are out of D3 state by now */
set_bit
(
HCD_FLAG_HW_ACCESSIBLE
,
&
hcd
->
flags
);
/* If CF is clear, we lost PCI Vaux power and need to restart. */
if
(
readl
(
&
ehci
->
regs
->
configured_flag
)
!=
FLAG_CF
)
goto
restart
;
...
...
@@ -319,7 +349,7 @@ static const struct hc_driver ehci_pci_hc_driver = {
/*
* basic lifecycle operations
*/
.
reset
=
ehci_pci_
reset
,
.
reset
=
ehci_pci_
setup
,
.
start
=
ehci_run
,
#ifdef CONFIG_PM
.
suspend
=
ehci_pci_suspend
,
...
...
drivers/usb/host/ehci-q.c
浏览文件 @
f8e98843
...
...
@@ -912,6 +912,7 @@ submit_async (
int
epnum
;
unsigned
long
flags
;
struct
ehci_qh
*
qh
=
NULL
;
int
rc
=
0
;
qtd
=
list_entry
(
qtd_list
->
next
,
struct
ehci_qtd
,
qtd_list
);
epnum
=
ep
->
desc
.
bEndpointAddress
;
...
...
@@ -926,21 +927,28 @@ submit_async (
#endif
spin_lock_irqsave
(
&
ehci
->
lock
,
flags
);
if
(
unlikely
(
!
test_bit
(
HCD_FLAG_HW_ACCESSIBLE
,
&
ehci_to_hcd
(
ehci
)
->
flags
)))
{
rc
=
-
ESHUTDOWN
;
goto
done
;
}
qh
=
qh_append_tds
(
ehci
,
urb
,
qtd_list
,
epnum
,
&
ep
->
hcpriv
);
if
(
unlikely
(
qh
==
NULL
))
{
rc
=
-
ENOMEM
;
goto
done
;
}
/* Control/bulk operations through TTs don't need scheduling,
* the HC and TT handle it when the TT has a buffer ready.
*/
if
(
likely
(
qh
!=
NULL
))
{
if
(
likely
(
qh
->
qh_state
==
QH_STATE_IDLE
))
qh_link_async
(
ehci
,
qh_get
(
qh
));
}
if
(
likely
(
qh
->
qh_state
==
QH_STATE_IDLE
))
qh_link_async
(
ehci
,
qh_get
(
qh
));
done:
spin_unlock_irqrestore
(
&
ehci
->
lock
,
flags
);
if
(
unlikely
(
qh
==
NULL
))
{
if
(
unlikely
(
qh
==
NULL
))
qtd_list_free
(
ehci
,
urb
,
qtd_list
);
return
-
ENOMEM
;
}
return
0
;
return
rc
;
}
/*-------------------------------------------------------------------------*/
...
...
drivers/usb/host/ehci-sched.c
浏览文件 @
f8e98843
...
...
@@ -602,6 +602,12 @@ static int intr_submit (
spin_lock_irqsave
(
&
ehci
->
lock
,
flags
);
if
(
unlikely
(
!
test_bit
(
HCD_FLAG_HW_ACCESSIBLE
,
&
ehci_to_hcd
(
ehci
)
->
flags
)))
{
status
=
-
ESHUTDOWN
;
goto
done
;
}
/* get qh and force any scheduling errors */
INIT_LIST_HEAD
(
&
empty
);
qh
=
qh_append_tds
(
ehci
,
urb
,
&
empty
,
epnum
,
&
ep
->
hcpriv
);
...
...
@@ -1456,7 +1462,11 @@ static int itd_submit (struct ehci_hcd *ehci, struct urb *urb,
/* schedule ... need to lock */
spin_lock_irqsave
(
&
ehci
->
lock
,
flags
);
status
=
iso_stream_schedule
(
ehci
,
urb
,
stream
);
if
(
unlikely
(
!
test_bit
(
HCD_FLAG_HW_ACCESSIBLE
,
&
ehci_to_hcd
(
ehci
)
->
flags
)))
status
=
-
ESHUTDOWN
;
else
status
=
iso_stream_schedule
(
ehci
,
urb
,
stream
);
if
(
likely
(
status
==
0
))
itd_link_urb
(
ehci
,
urb
,
ehci
->
periodic_size
<<
3
,
stream
);
spin_unlock_irqrestore
(
&
ehci
->
lock
,
flags
);
...
...
@@ -1815,7 +1825,11 @@ static int sitd_submit (struct ehci_hcd *ehci, struct urb *urb,
/* schedule ... need to lock */
spin_lock_irqsave
(
&
ehci
->
lock
,
flags
);
status
=
iso_stream_schedule
(
ehci
,
urb
,
stream
);
if
(
unlikely
(
!
test_bit
(
HCD_FLAG_HW_ACCESSIBLE
,
&
ehci_to_hcd
(
ehci
)
->
flags
)))
status
=
-
ESHUTDOWN
;
else
status
=
iso_stream_schedule
(
ehci
,
urb
,
stream
);
if
(
status
==
0
)
sitd_link_urb
(
ehci
,
urb
,
ehci
->
periodic_size
<<
3
,
stream
);
spin_unlock_irqrestore
(
&
ehci
->
lock
,
flags
);
...
...
drivers/usb/host/ohci-hcd.c
浏览文件 @
f8e98843
...
...
@@ -115,7 +115,7 @@
/*-------------------------------------------------------------------------*/
// #define
OHCI_VERBOSE_DEBUG /* not always helpful */
#undef
OHCI_VERBOSE_DEBUG
/* not always helpful */
/* For initializing controller (mask in an HCFS mode too) */
#define OHCI_CONTROL_INIT OHCI_CTRL_CBSR
...
...
@@ -253,6 +253,10 @@ static int ohci_urb_enqueue (
spin_lock_irqsave
(
&
ohci
->
lock
,
flags
);
/* don't submit to a dead HC */
if
(
!
test_bit
(
HCD_FLAG_HW_ACCESSIBLE
,
&
hcd
->
flags
))
{
retval
=
-
ENODEV
;
goto
fail
;
}
if
(
!
HC_IS_RUNNING
(
hcd
->
state
))
{
retval
=
-
ENODEV
;
goto
fail
;
...
...
drivers/usb/host/ohci-hub.c
浏览文件 @
f8e98843
...
...
@@ -53,6 +53,11 @@ static int ohci_bus_suspend (struct usb_hcd *hcd)
spin_lock_irqsave
(
&
ohci
->
lock
,
flags
);
if
(
unlikely
(
!
test_bit
(
HCD_FLAG_HW_ACCESSIBLE
,
&
hcd
->
flags
)))
{
spin_unlock_irqrestore
(
&
ohci
->
lock
,
flags
);
return
-
ESHUTDOWN
;
}
ohci
->
hc_control
=
ohci_readl
(
ohci
,
&
ohci
->
regs
->
control
);
switch
(
ohci
->
hc_control
&
OHCI_CTRL_HCFS
)
{
case
OHCI_USB_RESUME
:
...
...
@@ -140,11 +145,19 @@ static int ohci_bus_resume (struct usb_hcd *hcd)
struct
ohci_hcd
*
ohci
=
hcd_to_ohci
(
hcd
);
u32
temp
,
enables
;
int
status
=
-
EINPROGRESS
;
unsigned
long
flags
;
if
(
time_before
(
jiffies
,
ohci
->
next_statechange
))
msleep
(
5
);
spin_lock_irq
(
&
ohci
->
lock
);
spin_lock_irqsave
(
&
ohci
->
lock
,
flags
);
if
(
unlikely
(
!
test_bit
(
HCD_FLAG_HW_ACCESSIBLE
,
&
hcd
->
flags
)))
{
spin_unlock_irqrestore
(
&
ohci
->
lock
,
flags
);
return
-
ESHUTDOWN
;
}
ohci
->
hc_control
=
ohci_readl
(
ohci
,
&
ohci
->
regs
->
control
);
if
(
ohci
->
hc_control
&
(
OHCI_CTRL_IR
|
OHCI_SCHED_ENABLES
))
{
...
...
@@ -179,7 +192,7 @@ static int ohci_bus_resume (struct usb_hcd *hcd)
ohci_dbg
(
ohci
,
"lost power
\n
"
);
status
=
-
EBUSY
;
}
spin_unlock_irq
(
&
ohci
->
lock
);
spin_unlock_irq
restore
(
&
ohci
->
lock
,
flags
);
if
(
status
==
-
EBUSY
)
{
(
void
)
ohci_init
(
ohci
);
return
ohci_restart
(
ohci
);
...
...
@@ -297,8 +310,8 @@ ohci_hub_status_data (struct usb_hcd *hcd, char *buf)
/* handle autosuspended root: finish resuming before
* letting khubd or root hub timer see state changes.
*/
if
((
ohci
->
hc_control
&
OHCI_CTRL_HCFS
)
!=
OHCI_USB_OPER
||
!
HC_IS_RUNNING
(
hcd
->
state
))
{
if
(
unlikely
(
(
ohci
->
hc_control
&
OHCI_CTRL_HCFS
)
!=
OHCI_USB_OPER
||
!
HC_IS_RUNNING
(
hcd
->
state
)
))
{
can_suspend
=
0
;
goto
done
;
}
...
...
@@ -508,6 +521,9 @@ static int ohci_hub_control (
u32
temp
;
int
retval
=
0
;
if
(
unlikely
(
!
test_bit
(
HCD_FLAG_HW_ACCESSIBLE
,
&
hcd
->
flags
)))
return
-
ESHUTDOWN
;
switch
(
typeReq
)
{
case
ClearHubFeature
:
switch
(
wValue
)
{
...
...
drivers/usb/host/ohci-pci.c
浏览文件 @
f8e98843
...
...
@@ -105,13 +105,36 @@ ohci_pci_start (struct usb_hcd *hcd)
static
int
ohci_pci_suspend
(
struct
usb_hcd
*
hcd
,
pm_message_t
message
)
{
/* root hub was already suspended */
return
0
;
struct
ohci_hcd
*
ohci
=
hcd_to_ohci
(
hcd
);
unsigned
long
flags
;
int
rc
=
0
;
/* Root hub was already suspended. Disable irq emission and
* mark HW unaccessible, bail out if RH has been resumed. Use
* the spinlock to properly synchronize with possible pending
* RH suspend or resume activity.
*
* This is still racy as hcd->state is manipulated outside of
* any locks =P But that will be a different fix.
*/
spin_lock_irqsave
(
&
ohci
->
lock
,
flags
);
if
(
hcd
->
state
!=
HC_STATE_SUSPENDED
)
{
rc
=
-
EINVAL
;
goto
bail
;
}
ohci_writel
(
ohci
,
OHCI_INTR_MIE
,
&
ohci
->
regs
->
intrdisable
);
(
void
)
ohci_readl
(
ohci
,
&
ohci
->
regs
->
intrdisable
);
clear_bit
(
HCD_FLAG_HW_ACCESSIBLE
,
&
hcd
->
flags
);
bail:
spin_unlock_irqrestore
(
&
ohci
->
lock
,
flags
);
return
rc
;
}
static
int
ohci_pci_resume
(
struct
usb_hcd
*
hcd
)
{
set_bit
(
HCD_FLAG_HW_ACCESSIBLE
,
&
hcd
->
flags
);
usb_hcd_resume_root_hub
(
hcd
);
return
0
;
}
...
...
drivers/usb/host/uhci-hcd.c
浏览文件 @
f8e98843
...
...
@@ -717,6 +717,7 @@ static int uhci_suspend(struct usb_hcd *hcd, pm_message_t message)
* at the source, so we must turn off PIRQ.
*/
pci_write_config_word
(
to_pci_dev
(
uhci_dev
(
uhci
)),
USBLEGSUP
,
0
);
clear_bit
(
HCD_FLAG_HW_ACCESSIBLE
,
&
hcd
->
flags
);
uhci
->
hc_inaccessible
=
1
;
hcd
->
poll_rh
=
0
;
...
...
@@ -733,6 +734,11 @@ static int uhci_resume(struct usb_hcd *hcd)
dev_dbg
(
uhci_dev
(
uhci
),
"%s
\n
"
,
__FUNCTION__
);
/* We aren't in D3 state anymore, we do that even if dead as I
* really don't want to keep a stale HCD_FLAG_HW_ACCESSIBLE=0
*/
set_bit
(
HCD_FLAG_HW_ACCESSIBLE
,
&
hcd
->
flags
);
if
(
uhci
->
rh_state
==
UHCI_RH_RESET
)
/* Dead */
return
0
;
spin_lock_irq
(
&
uhci
->
lock
);
...
...
include/linux/pci_ids.h
浏览文件 @
f8e98843
...
...
@@ -387,7 +387,6 @@
#define PCI_DEVICE_ID_NS_SC1100_SMI 0x0511
#define PCI_DEVICE_ID_NS_SC1100_XBUS 0x0515
#define PCI_DEVICE_ID_NS_87410 0xd001
#define PCI_DEVICE_ID_NS_CS5535_IDE 0x002d
#define PCI_VENDOR_ID_TSENG 0x100c
#define PCI_DEVICE_ID_TSENG_W32P_2 0x3202
...
...
@@ -489,8 +488,6 @@
#define PCI_DEVICE_ID_AMD_8151_0 0x7454
#define PCI_DEVICE_ID_AMD_8131_APIC 0x7450
#define PCI_DEVICE_ID_AMD_CS5536_IDE 0x209A
#define PCI_VENDOR_ID_TRIDENT 0x1023
#define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000
#define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX 0x2001
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录