Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Linux-御风守护者
linux
提交
0af2f653
L
linux
项目概览
Linux-御风守护者
/
linux
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
0af2f653
编写于
11月 20, 2007
作者:
L
Len Brown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "ACPI: EC: Workaround for optimized controllers"
This reverts commit
f2d68935
.
上级
f2d68935
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
13 addition
and
22 deletion
+13
-22
drivers/acpi/ec.c
drivers/acpi/ec.c
+13
-22
未找到文件。
drivers/acpi/ec.c
浏览文件 @
0af2f653
...
...
@@ -75,8 +75,7 @@ enum {
EC_FLAGS_WAIT_GPE
=
0
,
/* Don't check status until GPE arrives */
EC_FLAGS_QUERY_PENDING
,
/* Query is pending */
EC_FLAGS_GPE_MODE
,
/* Expect GPE to be sent for status change */
EC_FLAGS_NO_ADDRESS_GPE
,
/* Expect GPE only for non-address event */
EC_FLAGS_ADDRESS
,
/* Address is being written */
EC_FLAGS_ONLY_IBF_GPE
,
/* Expect GPE only for IBF = 0 event */
};
static
int
acpi_ec_remove
(
struct
acpi_device
*
device
,
int
type
);
...
...
@@ -167,45 +166,38 @@ static inline int acpi_ec_check_status(struct acpi_ec *ec, enum ec_event event)
static
int
acpi_ec_wait
(
struct
acpi_ec
*
ec
,
enum
ec_event
event
,
int
force_poll
)
{
int
ret
=
0
;
if
(
unlikely
(
test_bit
(
EC_FLAGS_ADDRESS
,
&
ec
->
flags
)
&&
test_bit
(
EC_FLAGS_NO_ADDRESS_GPE
,
&
ec
->
flags
)))
force_poll
=
1
;
if
(
likely
(
test_bit
(
EC_FLAGS_GPE_MODE
,
&
ec
->
flags
))
&&
likely
(
!
force_poll
))
{
if
(
wait_event_timeout
(
ec
->
wait
,
acpi_ec_check_status
(
ec
,
event
),
msecs_to_jiffies
(
ACPI_EC_DELAY
)))
goto
end
;
return
0
;
clear_bit
(
EC_FLAGS_WAIT_GPE
,
&
ec
->
flags
);
if
(
acpi_ec_check_status
(
ec
,
event
))
{
if
(
test_bit
(
EC_FLAGS_ADDRESS
,
&
ec
->
flags
)
)
{
/* miss
address
GPE, don't expect it anymore */
printk
(
KERN_INFO
PREFIX
"missing
address
confirmation,"
"
don't expect it any longer
.
\n
"
);
set_bit
(
EC_FLAGS_
NO_ADDRESS
_GPE
,
&
ec
->
flags
);
if
(
event
==
ACPI_EC_EVENT_OBF_1
)
{
/* miss
OBF = 1
GPE, don't expect it anymore */
printk
(
KERN_INFO
PREFIX
"missing
OBF_1
confirmation,"
"
switching to degraded mode
.
\n
"
);
set_bit
(
EC_FLAGS_
ONLY_IBF
_GPE
,
&
ec
->
flags
);
}
else
{
/* missing GPEs, switch back to poll mode */
printk
(
KERN_INFO
PREFIX
"missing confirmations,"
printk
(
KERN_INFO
PREFIX
"missing
IBF_1
confirmations,"
"switch off interrupt mode.
\n
"
);
clear_bit
(
EC_FLAGS_GPE_MODE
,
&
ec
->
flags
);
}
goto
end
;
return
0
;
}
}
else
{
unsigned
long
delay
=
jiffies
+
msecs_to_jiffies
(
ACPI_EC_DELAY
);
clear_bit
(
EC_FLAGS_WAIT_GPE
,
&
ec
->
flags
);
while
(
time_before
(
jiffies
,
delay
))
{
if
(
acpi_ec_check_status
(
ec
,
event
))
goto
end
;
return
0
;
}
}
printk
(
KERN_ERR
PREFIX
"acpi_ec_wait timeout,"
" status = %d, expect_event = %d
\n
"
,
acpi_ec_read_status
(
ec
),
event
);
ret
=
-
ETIME
;
end:
clear_bit
(
EC_FLAGS_ADDRESS
,
&
ec
->
flags
);
return
ret
;
return
-
ETIME
;
}
static
int
acpi_ec_transaction_unlocked
(
struct
acpi_ec
*
ec
,
u8
command
,
...
...
@@ -224,9 +216,6 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,
"write_cmd timeout, command = %d
\n
"
,
command
);
goto
end
;
}
/* mark the address byte written to EC */
if
(
rdata_len
+
wdata_len
>
1
)
set_bit
(
EC_FLAGS_ADDRESS
,
&
ec
->
flags
);
set_bit
(
EC_FLAGS_WAIT_GPE
,
&
ec
->
flags
);
acpi_ec_write_data
(
ec
,
*
(
wdata
++
));
}
...
...
@@ -242,6 +231,8 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,
clear_bit
(
EC_FLAGS_QUERY_PENDING
,
&
ec
->
flags
);
for
(;
rdata_len
>
0
;
--
rdata_len
)
{
if
(
test_bit
(
EC_FLAGS_ONLY_IBF_GPE
,
&
ec
->
flags
))
force_poll
=
1
;
result
=
acpi_ec_wait
(
ec
,
ACPI_EC_EVENT_OBF_1
,
force_poll
);
if
(
result
)
{
printk
(
KERN_ERR
PREFIX
"read timeout, command = %d
\n
"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录