Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Linux-御风守护者
linux
提交
cee324b1
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,发现更多精彩内容 >>
提交
cee324b1
编写于
2月 02, 2007
作者:
A
Alexey Starikovskiy
提交者:
Len Brown
2月 02, 2007
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ACPICA: use new ACPI headers.
Signed-off-by:
N
Len Brown
<
len.brown@intel.com
>
上级
ceb6c468
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
51 addition
and
68 deletion
+51
-68
arch/i386/kernel/acpi/boot.c
arch/i386/kernel/acpi/boot.c
+5
-5
arch/i386/kernel/cpu/cpufreq/longhaul.c
arch/i386/kernel/cpu/cpufreq/longhaul.c
+6
-9
arch/i386/kernel/mpparse.c
arch/i386/kernel/mpparse.c
+2
-2
arch/ia64/kernel/acpi.c
arch/ia64/kernel/acpi.c
+3
-3
arch/x86_64/kernel/genapic.c
arch/x86_64/kernel/genapic.c
+2
-2
arch/x86_64/kernel/mpparse.c
arch/x86_64/kernel/mpparse.c
+1
-1
drivers/acpi/bus.c
drivers/acpi/bus.c
+3
-3
drivers/acpi/osl.c
drivers/acpi/osl.c
+1
-1
drivers/acpi/pci_link.c
drivers/acpi/pci_link.c
+1
-1
drivers/acpi/processor_core.c
drivers/acpi/processor_core.c
+3
-3
drivers/acpi/processor_idle.c
drivers/acpi/processor_idle.c
+14
-14
drivers/acpi/processor_perflib.c
drivers/acpi/processor_perflib.c
+6
-6
drivers/acpi/processor_throttling.c
drivers/acpi/processor_throttling.c
+2
-2
drivers/acpi/scan.c
drivers/acpi/scan.c
+2
-2
include/acpi/acglobal.h
include/acpi/acglobal.h
+0
-1
include/acpi/actbl.h
include/acpi/actbl.h
+0
-3
include/acpi/actbl1.h
include/acpi/actbl1.h
+0
-10
未找到文件。
arch/i386/kernel/acpi/boot.c
浏览文件 @
cee324b1
...
...
@@ -357,7 +357,7 @@ static void __init acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger)
/*
* stash over-ride to indicate we've been here
* and for later update of acpi_
fadt
* and for later update of acpi_
gbl_FADT
*/
acpi_sci_override_gsi
=
gsi
;
return
;
...
...
@@ -376,7 +376,7 @@ acpi_parse_int_src_ovr(acpi_table_entry_header * header,
acpi_table_print_madt_entry
(
header
);
if
(
intsrc
->
bus_irq
==
acpi_
fadt
.
sci_in
t
)
{
if
(
intsrc
->
bus_irq
==
acpi_
gbl_FADT
.
sci_interrup
t
)
{
acpi_sci_ioapic_setup
(
intsrc
->
global_irq
,
intsrc
->
flags
.
polarity
,
intsrc
->
flags
.
trigger
);
...
...
@@ -709,9 +709,9 @@ extern u32 pmtmr_ioport;
static
int
__init
acpi_parse_fadt
(
struct
acpi_table_header
*
header
)
{
struct
fadt_descriptor
*
fadt
=
NULL
;
struct
acpi_table_fadt
*
fadt
=
NULL
;
fadt
=
(
struct
fadt_descriptor
*
)
header
;
fadt
=
(
struct
acpi_table_fadt
*
)
header
;
if
(
!
fadt
)
{
printk
(
KERN_WARNING
PREFIX
"Unable to map FADT
\n
"
);
return
0
;
...
...
@@ -873,7 +873,7 @@ static int __init acpi_parse_madt_ioapic_entries(void)
* pretend we got one so we can set the SCI flags.
*/
if
(
!
acpi_sci_override_gsi
)
acpi_sci_ioapic_setup
(
acpi_
fadt
.
sci_in
t
,
0
,
0
);
acpi_sci_ioapic_setup
(
acpi_
gbl_FADT
.
sci_interrup
t
,
0
,
0
);
/* Fill in identity legacy mapings where no override */
mp_config_acpi_legacy_irqs
();
...
...
arch/i386/kernel/cpu/cpufreq/longhaul.c
浏览文件 @
cee324b1
...
...
@@ -190,7 +190,7 @@ static void do_powersaver(int cx_address, unsigned int clock_ratio_index)
/* Invoke C3 */
inb
(
cx_address
);
/* Dummy op - must do something useless after P_LVL3 read */
t
=
inl
(
acpi_
fadt
.
xpm_tmr_bl
k
.
address
);
t
=
inl
(
acpi_
gbl_FADT
.
xpm_timer_bloc
k
.
address
);
}
/* Disable bus ratio bit */
local_irq_disable
();
...
...
@@ -250,8 +250,7 @@ static void longhaul_setstate(unsigned int clock_ratio_index)
outb
(
3
,
0x22
);
}
else
if
((
pr
!=
NULL
)
&&
pr
->
flags
.
bm_control
)
{
/* Disable bus master arbitration */
acpi_set_register
(
ACPI_BITREG_ARB_DISABLE
,
1
,
ACPI_MTX_DO_NOT_LOCK
);
acpi_set_register
(
ACPI_BITREG_ARB_DISABLE
,
1
);
}
switch
(
longhaul_version
)
{
...
...
@@ -281,8 +280,7 @@ static void longhaul_setstate(unsigned int clock_ratio_index)
case
TYPE_POWERSAVER
:
if
(
longhaul_flags
&
USE_ACPI_C3
)
{
/* Don't allow wakeup */
acpi_set_register
(
ACPI_BITREG_BUS_MASTER_RLD
,
0
,
ACPI_MTX_DO_NOT_LOCK
);
acpi_set_register
(
ACPI_BITREG_BUS_MASTER_RLD
,
0
);
do_powersaver
(
cx
->
address
,
clock_ratio_index
);
}
else
{
do_powersaver
(
0
,
clock_ratio_index
);
...
...
@@ -295,8 +293,7 @@ static void longhaul_setstate(unsigned int clock_ratio_index)
outb
(
0
,
0x22
);
}
else
if
((
pr
!=
NULL
)
&&
pr
->
flags
.
bm_control
)
{
/* Enable bus master arbitration */
acpi_set_register
(
ACPI_BITREG_ARB_DISABLE
,
0
,
ACPI_MTX_DO_NOT_LOCK
);
acpi_set_register
(
ACPI_BITREG_ARB_DISABLE
,
0
);
}
outb
(
pic2_mask
,
0xA1
);
/* restore mask */
outb
(
pic1_mask
,
0x21
);
...
...
@@ -414,7 +411,7 @@ static int __init longhaul_get_ranges(void)
highest_speed
=
calc_speed
(
maxmult
);
lowest_speed
=
calc_speed
(
minmult
);
dprintk
(
"FSB:%dMHz Lowest speed: %s Highest speed:%s
\n
"
,
fsb
,
print_speed
(
lowest_speed
/
1000
),
print_speed
(
lowest_speed
/
1000
),
print_speed
(
highest_speed
/
1000
));
if
(
lowest_speed
==
highest_speed
)
{
...
...
@@ -498,7 +495,7 @@ static void __init longhaul_setup_voltagescaling(void)
maxvid
.
mV
/
1000
,
maxvid
.
mV
%
1000
,
minvid
.
mV
/
1000
,
minvid
.
mV
%
1000
,
numvscales
);
j
=
0
;
while
(
longhaul_table
[
j
].
frequency
!=
CPUFREQ_TABLE_END
)
{
speed
=
longhaul_table
[
j
].
frequency
;
...
...
arch/i386/kernel/mpparse.c
浏览文件 @
cee324b1
...
...
@@ -1057,7 +1057,7 @@ int mp_register_gsi(u32 gsi, int triggering, int polarity)
static
int
gsi_to_irq
[
MAX_GSI_NUM
];
/* Don't set up the ACPI SCI because it's already set up */
if
(
acpi_
fadt
.
sci_in
t
==
gsi
)
if
(
acpi_
gbl_FADT
.
sci_interrup
t
==
gsi
)
return
gsi
;
ioapic
=
mp_find_ioapic
(
gsi
);
...
...
@@ -1114,7 +1114,7 @@ int mp_register_gsi(u32 gsi, int triggering, int polarity)
/*
* Don't assign IRQ used by ACPI SCI
*/
if
(
gsi
==
acpi_
fadt
.
sci_in
t
)
if
(
gsi
==
acpi_
gbl_FADT
.
sci_interrup
t
)
gsi
=
pci_irq
++
;
gsi_to_irq
[
irq
]
=
gsi
;
}
else
{
...
...
arch/ia64/kernel/acpi.c
浏览文件 @
cee324b1
...
...
@@ -617,7 +617,7 @@ EXPORT_SYMBOL(acpi_unregister_gsi);
static
int
__init
acpi_parse_fadt
(
unsigned
long
phys_addr
,
unsigned
long
size
)
{
struct
acpi_table_header
*
fadt_header
;
struct
fadt_descriptor
*
fadt
;
struct
acpi_table_fadt
*
fadt
;
if
(
!
phys_addr
||
!
size
)
return
-
EINVAL
;
...
...
@@ -626,9 +626,9 @@ static int __init acpi_parse_fadt(unsigned long phys_addr, unsigned long size)
if
(
fadt_header
->
revision
!=
3
)
return
-
ENODEV
;
/* Only deal with ACPI 2.0 FADT */
fadt
=
(
struct
fadt_descriptor
*
)
fadt_header
;
fadt
=
(
struct
acpi_table_fadt
*
)
fadt_header
;
acpi_register_gsi
(
fadt
->
sci_int
,
ACPI_LEVEL_SENSITIVE
,
ACPI_ACTIVE_LOW
);
acpi_register_gsi
(
fadt
->
sci_int
errupt
,
ACPI_LEVEL_SENSITIVE
,
ACPI_ACTIVE_LOW
);
return
0
;
}
...
...
arch/x86_64/kernel/genapic.c
浏览文件 @
cee324b1
...
...
@@ -58,8 +58,8 @@ void __init clustered_apic_check(void)
* Some x86_64 machines use physical APIC mode regardless of how many
* procs/clusters are present (x86_64 ES7000 is an example).
*/
if
(
acpi_
fadt
.
revision
>
FADT2_REVISION_ID
)
if
(
acpi_
fadt
.
force_apic_physical_destination_mode
)
{
if
(
acpi_
gbl_FADT
.
header
.
revision
>
FADT2_REVISION_ID
)
if
(
acpi_
gbl_FADT
.
flags
&
ACPI_FADT_APIC_PHYSICAL
)
{
genapic
=
&
apic_cluster
;
goto
print
;
}
...
...
arch/x86_64/kernel/mpparse.c
浏览文件 @
cee324b1
...
...
@@ -798,7 +798,7 @@ int mp_register_gsi(u32 gsi, int triggering, int polarity)
return
gsi
;
/* Don't set up the ACPI SCI because it's already set up */
if
(
acpi_
fadt
.
sci_in
t
==
gsi
)
if
(
acpi_
gbl_FADT
.
sci_interrup
t
==
gsi
)
return
gsi
;
ioapic
=
mp_find_ioapic
(
gsi
);
...
...
drivers/acpi/bus.c
浏览文件 @
cee324b1
...
...
@@ -627,15 +627,15 @@ void __init acpi_early_init(void)
acpi_sci_flags
.
trigger
=
3
;
/* Set PIC-mode SCI trigger type */
acpi_pic_sci_set_trigger
(
acpi_
fadt
.
sci_in
t
,
acpi_pic_sci_set_trigger
(
acpi_
gbl_FADT
.
sci_interrup
t
,
acpi_sci_flags
.
trigger
);
}
else
{
extern
int
acpi_sci_override_gsi
;
/*
* now that acpi_
fadt
is initialized,
* now that acpi_
gbl_FADT
is initialized,
* update it with result from INT_SRC_OVR parsing
*/
acpi_
fadt
.
sci_in
t
=
acpi_sci_override_gsi
;
acpi_
gbl_FADT
.
sci_interrup
t
=
acpi_sci_override_gsi
;
}
#endif
...
...
drivers/acpi/osl.c
浏览文件 @
cee324b1
...
...
@@ -245,7 +245,7 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler,
* FADT. It may not be the same if an interrupt source override exists
* for the SCI.
*/
gsi
=
acpi_
fadt
.
sci_in
t
;
gsi
=
acpi_
gbl_FADT
.
sci_interrup
t
;
if
(
acpi_gsi_to_irq
(
gsi
,
&
irq
)
<
0
)
{
printk
(
KERN_ERR
PREFIX
"SCI (ACPI GSI %d) not registered
\n
"
,
gsi
);
...
...
drivers/acpi/pci_link.c
浏览文件 @
cee324b1
...
...
@@ -513,7 +513,7 @@ int __init acpi_irq_penalty_init(void)
}
}
/* Add a penalty for the SCI */
acpi_irq_penalty
[
acpi_
fadt
.
sci_in
t
]
+=
PIRQ_PENALTY_PCI_USING
;
acpi_irq_penalty
[
acpi_
gbl_FADT
.
sci_interrup
t
]
+=
PIRQ_PENALTY_PCI_USING
;
return
0
;
}
...
...
drivers/acpi/processor_core.c
浏览文件 @
cee324b1
...
...
@@ -431,7 +431,7 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
* Check to see if we have bus mastering arbitration control. This
* is required for proper C3 usage (to maintain cache coherency).
*/
if
(
acpi_
fadt
.
pm2_control_block
&&
acpi_fadt
.
pm2_control_length
)
{
if
(
acpi_
gbl_FADT
.
pm2_control_block
&&
acpi_gbl_FADT
.
pm2_control_length
)
{
pr
->
flags
.
bm_control
=
1
;
ACPI_DEBUG_PRINT
((
ACPI_DB_INFO
,
"Bus mastering arbitration control present
\n
"
));
...
...
@@ -490,8 +490,8 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
object
.
processor
.
pblk_length
);
else
{
pr
->
throttling
.
address
=
object
.
processor
.
pblk_address
;
pr
->
throttling
.
duty_offset
=
acpi_
fadt
.
duty_offset
;
pr
->
throttling
.
duty_width
=
acpi_
fadt
.
duty_width
;
pr
->
throttling
.
duty_offset
=
acpi_
gbl_FADT
.
duty_offset
;
pr
->
throttling
.
duty_width
=
acpi_
gbl_FADT
.
duty_width
;
pr
->
pblk
=
object
.
processor
.
pblk_address
;
...
...
drivers/acpi/processor_idle.c
浏览文件 @
cee324b1
...
...
@@ -160,7 +160,7 @@ static inline u32 ticks_elapsed(u32 t1, u32 t2)
{
if
(
t2
>=
t1
)
return
(
t2
-
t1
);
else
if
(
!
(
acpi_
fadt
.
flags
&
ACPI_FADT_32BIT_TIMER
))
else
if
(
!
(
acpi_
gbl_FADT
.
flags
&
ACPI_FADT_32BIT_TIMER
))
return
(((
0x00FFFFFF
-
t1
)
+
t2
)
&
0x00FFFFFF
);
else
return
((
0xFFFFFFFF
-
t1
)
+
t2
);
...
...
@@ -234,7 +234,7 @@ static void acpi_cstate_enter(struct acpi_processor_cx *cstate)
/* Dummy wait op - must do something useless after P_LVL2 read
because chipsets cannot guarantee that STPCLK# signal
gets asserted in time to freeze execution properly. */
unused
=
inl
(
acpi_
fadt
.
xpm_timer_block
.
address
);
unused
=
inl
(
acpi_
gbl_FADT
.
xpm_timer_block
.
address
);
}
}
...
...
@@ -334,7 +334,7 @@ static void acpi_processor_idle(void)
* detection phase, to work cleanly with logical CPU hotplug.
*/
if
((
cx
->
type
!=
ACPI_STATE_C1
)
&&
(
num_online_cpus
()
>
1
)
&&
!
pr
->
flags
.
has_cst
&&
!
(
acpi_
fadt
.
flags
&
ACPI_FADT_C2_MP_SUPPORTED
))
!
pr
->
flags
.
has_cst
&&
!
(
acpi_
gbl_FADT
.
flags
&
ACPI_FADT_C2_MP_SUPPORTED
))
cx
=
&
pr
->
power
.
states
[
ACPI_STATE_C1
];
#endif
...
...
@@ -380,11 +380,11 @@ static void acpi_processor_idle(void)
case
ACPI_STATE_C2
:
/* Get start time (ticks) */
t1
=
inl
(
acpi_
fadt
.
xpm_timer_block
.
address
);
t1
=
inl
(
acpi_
gbl_FADT
.
xpm_timer_block
.
address
);
/* Invoke C2 */
acpi_cstate_enter
(
cx
);
/* Get end time (ticks) */
t2
=
inl
(
acpi_
fadt
.
xpm_timer_block
.
address
);
t2
=
inl
(
acpi_
gbl_FADT
.
xpm_timer_block
.
address
);
#ifdef CONFIG_GENERIC_TIME
/* TSC halts in C2, so notify users */
...
...
@@ -415,11 +415,11 @@ static void acpi_processor_idle(void)
}
/* Get start time (ticks) */
t1
=
inl
(
acpi_
fadt
.
xpm_timer_block
.
address
);
t1
=
inl
(
acpi_
gbl_FADT
.
xpm_timer_block
.
address
);
/* Invoke C3 */
acpi_cstate_enter
(
cx
);
/* Get end time (ticks) */
t2
=
inl
(
acpi_
fadt
.
xpm_timer_block
.
address
);
t2
=
inl
(
acpi_
gbl_FADT
.
xpm_timer_block
.
address
);
if
(
pr
->
flags
.
bm_check
)
{
/* Enable bus master arbitration */
atomic_dec
(
&
c3_cpu_count
);
...
...
@@ -451,7 +451,7 @@ static void acpi_processor_idle(void)
#ifdef CONFIG_HOTPLUG_CPU
/* Don't do promotion/demotion */
if
((
cx
->
type
==
ACPI_STATE_C1
)
&&
(
num_online_cpus
()
>
1
)
&&
!
pr
->
flags
.
has_cst
&&
!
(
acpi_
fadt
.
flags
&
ACPI_FADT_C2_MP_SUPPORTED
))
{
!
pr
->
flags
.
has_cst
&&
!
(
acpi_
gbl_FADT
.
flags
&
ACPI_FADT_C2_MP_SUPPORTED
))
{
next_state
=
cx
;
goto
end
;
}
...
...
@@ -622,7 +622,7 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
* an SMP system.
*/
if
((
num_online_cpus
()
>
1
)
&&
!
(
acpi_
fadt
.
flags
&
ACPI_FADT_C2_MP_SUPPORTED
))
!
(
acpi_
gbl_FADT
.
flags
&
ACPI_FADT_C2_MP_SUPPORTED
))
return
-
ENODEV
;
#endif
...
...
@@ -631,8 +631,8 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
pr
->
power
.
states
[
ACPI_STATE_C3
].
address
=
pr
->
pblk
+
5
;
/* determine latencies from FADT */
pr
->
power
.
states
[
ACPI_STATE_C2
].
latency
=
acpi_
fadt
.
C2latency
;
pr
->
power
.
states
[
ACPI_STATE_C3
].
latency
=
acpi_
fadt
.
C3latency
;
pr
->
power
.
states
[
ACPI_STATE_C2
].
latency
=
acpi_
gbl_FADT
.
C2latency
;
pr
->
power
.
states
[
ACPI_STATE_C3
].
latency
=
acpi_
gbl_FADT
.
C3latency
;
ACPI_DEBUG_PRINT
((
ACPI_DB_INFO
,
"lvl2[0x%08x] lvl3[0x%08x]
\n
"
,
...
...
@@ -878,7 +878,7 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
* WBINVD should be set in fadt, for C3 state to be
* supported on when bm_check is not required.
*/
if
(
!
(
acpi_
fadt
.
flags
&
ACPI_FADT_WBINVD
))
{
if
(
!
(
acpi_
gbl_FADT
.
flags
&
ACPI_FADT_WBINVD
))
{
ACPI_DEBUG_PRINT
((
ACPI_DB_INFO
,
"Cache invalidation should work properly"
" for C3 to be enabled on SMP systems
\n
"
));
...
...
@@ -1158,9 +1158,9 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
if
(
!
pr
)
return
-
EINVAL
;
if
(
acpi_
fadt
.
cst_control
&&
!
nocst
)
{
if
(
acpi_
gbl_FADT
.
cst_control
&&
!
nocst
)
{
status
=
acpi_os_write_port
(
acpi_
fadt
.
smi_command
,
acpi_fadt
.
cst_control
,
8
);
acpi_os_write_port
(
acpi_
gbl_FADT
.
smi_command
,
acpi_gbl_FADT
.
cst_control
,
8
);
if
(
ACPI_FAILURE
(
status
))
{
ACPI_EXCEPTION
((
AE_INFO
,
status
,
"Notifying BIOS of _CST ability failed"
));
...
...
drivers/acpi/processor_perflib.c
浏览文件 @
cee324b1
...
...
@@ -353,7 +353,7 @@ int acpi_processor_notify_smm(struct module *calling_module)
is_done
=
-
EIO
;
/* Can't write pstate_control to smi_command if either value is zero */
if
((
!
acpi_
fadt
.
smi_command
)
||
(
!
acpi_fadt
.
pstate_control
))
{
if
((
!
acpi_
gbl_FADT
.
smi_command
)
||
(
!
acpi_gbl_FADT
.
pstate_control
))
{
ACPI_DEBUG_PRINT
((
ACPI_DB_INFO
,
"No SMI port or pstate_control
\n
"
));
module_put
(
calling_module
);
return
0
;
...
...
@@ -361,15 +361,15 @@ int acpi_processor_notify_smm(struct module *calling_module)
ACPI_DEBUG_PRINT
((
ACPI_DB_INFO
,
"Writing pstate_control [0x%x] to smi_command [0x%x]
\n
"
,
acpi_
fadt
.
pstate_control
,
acpi_fadt
.
smi_command
));
acpi_
gbl_FADT
.
pstate_control
,
acpi_gbl_FADT
.
smi_command
));
status
=
acpi_os_write_port
(
acpi_
fadt
.
smi_command
,
(
u32
)
acpi_
fadt
.
pstate_control
,
8
);
status
=
acpi_os_write_port
(
acpi_
gbl_FADT
.
smi_command
,
(
u32
)
acpi_
gbl_FADT
.
pstate_control
,
8
);
if
(
ACPI_FAILURE
(
status
))
{
ACPI_EXCEPTION
((
AE_INFO
,
status
,
"Failed to write pstate_control [0x%x] to "
"smi_command [0x%x]"
,
acpi_
fadt
.
pstate_control
,
acpi_
fadt
.
smi_command
));
"smi_command [0x%x]"
,
acpi_
gbl_FADT
.
pstate_control
,
acpi_
gbl_FADT
.
smi_command
));
module_put
(
calling_module
);
return
status
;
}
...
...
drivers/acpi/processor_throttling.c
浏览文件 @
cee324b1
...
...
@@ -125,7 +125,7 @@ int acpi_processor_set_throttling(struct acpi_processor *pr, int state)
/* Used to clear all duty_value bits */
duty_mask
=
pr
->
throttling
.
state_count
-
1
;
duty_mask
<<=
acpi_
fadt
.
duty_offset
;
duty_mask
<<=
acpi_
gbl_FADT
.
duty_offset
;
duty_mask
=
~
duty_mask
;
}
...
...
@@ -208,7 +208,7 @@ int acpi_processor_get_throttling_info(struct acpi_processor *pr)
return
0
;
}
pr
->
throttling
.
state_count
=
1
<<
acpi_
fadt
.
duty_width
;
pr
->
throttling
.
state_count
=
1
<<
acpi_
gbl_FADT
.
duty_width
;
/*
* Compute state values. Note that throttling displays a linear power/
...
...
drivers/acpi/scan.c
浏览文件 @
cee324b1
...
...
@@ -1333,7 +1333,7 @@ static int acpi_bus_scan_fixed(struct acpi_device *root)
/*
* Enumerate all fixed-feature devices.
*/
if
((
acpi_
fadt
.
flags
&
ACPI_FADT_POWER_BUTTON
)
==
0
)
{
if
((
acpi_
gbl_FADT
.
flags
&
ACPI_FADT_POWER_BUTTON
)
==
0
)
{
result
=
acpi_add_single_object
(
&
device
,
acpi_root
,
NULL
,
ACPI_BUS_TYPE_POWER_BUTTON
);
...
...
@@ -1341,7 +1341,7 @@ static int acpi_bus_scan_fixed(struct acpi_device *root)
result
=
acpi_start_single_object
(
device
);
}
if
((
acpi_
fadt
.
flags
&
ACPI_FADT_SLEEP_BUTTON
)
==
0
)
{
if
((
acpi_
gbl_FADT
.
flags
&
ACPI_FADT_SLEEP_BUTTON
)
==
0
)
{
result
=
acpi_add_single_object
(
&
device
,
acpi_root
,
NULL
,
ACPI_BUS_TYPE_SLEEP_BUTTON
);
...
...
include/acpi/acglobal.h
浏览文件 @
cee324b1
...
...
@@ -144,7 +144,6 @@ ACPI_EXTERN u32 acpi_gbl_trace_flags;
*/
ACPI_EXTERN
struct
acpi_internal_rsdt
acpi_gbl_root_table_list
;
ACPI_EXTERN
struct
acpi_table_fadt
acpi_gbl_FADT
;
#define acpi_fadt acpi_gbl_FADT
extern
acpi_native_uint
acpi_gbl_permanent_mmap
;
/* These addresses are calculated from FADT address values */
...
...
include/acpi/actbl.h
浏览文件 @
cee324b1
...
...
@@ -236,9 +236,6 @@ struct acpi_table_fadt {
struct
acpi_generic_address
xgpe1_block
;
/* 64-bit Extended General Purpose Event 1 Reg Blk address */
};
#define fadt_descriptor acpi_table_fadt
#define sci_int sci_interrupt
/* FADT flags */
#define ACPI_FADT_WBINVD (1)
/* 00: The wbinvd instruction works properly */
...
...
include/acpi/actbl1.h
浏览文件 @
cee324b1
...
...
@@ -669,16 +669,6 @@ struct acpi_srat_mem_affinity {
#define ACPI_SRAT_MEM_HOT_PLUGGABLE (1<<1)
/* 01: Memory region is hot pluggable */
#define ACPI_SRAT_MEM_NON_VOLATILE (1<<2)
/* 02: Memory region is non-volatile */
/* Memory types */
enum
acpi_address_range_id
{
ACPI_ADDRESS_RANGE_MEMORY
=
1
,
ACPI_ADDRESS_RANGE_RESERVED
=
2
,
ACPI_ADDRESS_RANGE_ACPI
=
3
,
ACPI_ADDRESS_RANGE_NVS
=
4
,
ACPI_ADDRESS_RANGE_COUNT
=
5
};
/*******************************************************************************
*
* TCPA - Trusted Computing Platform Alliance table
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录