Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
bb49d1d1
Commit
bb49d1d1
authored
Feb 13, 2004
by
Len Brown
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
a394cc86
f6497de6
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
30 additions
and
19 deletions
+30
-19
arch/i386/Kconfig
arch/i386/Kconfig
+3
-3
arch/i386/kernel/acpi/boot.c
arch/i386/kernel/acpi/boot.c
+4
-0
arch/i386/kernel/mpparse.c
arch/i386/kernel/mpparse.c
+6
-5
arch/x86_64/kernel/acpi/boot.c
arch/x86_64/kernel/acpi/boot.c
+5
-0
arch/x86_64/kernel/mpparse.c
arch/x86_64/kernel/mpparse.c
+7
-6
drivers/acpi/Kconfig
drivers/acpi/Kconfig
+1
-1
drivers/acpi/numa.c
drivers/acpi/numa.c
+1
-1
drivers/acpi/processor.c
drivers/acpi/processor.c
+3
-3
No files found.
arch/i386/Kconfig
View file @
bb49d1d1
...
@@ -701,7 +701,7 @@ config X86_PAE
...
@@ -701,7 +701,7 @@ config X86_PAE
# Common NUMA Features
# Common NUMA Features
config NUMA
config NUMA
bool "Numa Memory Allocation Support"
bool "Numa Memory Allocation Support"
depends on SMP && HIGHMEM64G && (X86_PC || X86_NUMAQ || X86_GENERICARCH || (X86_SUMMIT && ACPI
&& !ACPI_HT_ONLY
))
depends on SMP && HIGHMEM64G && (X86_PC || X86_NUMAQ || X86_GENERICARCH || (X86_SUMMIT && ACPI))
default n if X86_PC
default n if X86_PC
default y if (X86_NUMAQ || X86_SUMMIT)
default y if (X86_NUMAQ || X86_SUMMIT)
...
@@ -709,8 +709,8 @@ config NUMA
...
@@ -709,8 +709,8 @@ config NUMA
comment "NUMA (NUMA-Q) requires SMP, 64GB highmem support"
comment "NUMA (NUMA-Q) requires SMP, 64GB highmem support"
depends on X86_NUMAQ && (!HIGHMEM64G || !SMP)
depends on X86_NUMAQ && (!HIGHMEM64G || !SMP)
comment "NUMA (Summit) requires SMP, 64GB highmem support,
full
ACPI"
comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI"
depends on X86_SUMMIT && (!HIGHMEM64G || !ACPI
|| ACPI_HT_ONLY
)
depends on X86_SUMMIT && (!HIGHMEM64G || !ACPI)
config DISCONTIGMEM
config DISCONTIGMEM
bool
bool
...
...
arch/i386/kernel/acpi/boot.c
View file @
bb49d1d1
...
@@ -141,6 +141,10 @@ acpi_parse_lapic (
...
@@ -141,6 +141,10 @@ acpi_parse_lapic (
acpi_table_print_madt_entry
(
header
);
acpi_table_print_madt_entry
(
header
);
/* no utility in registering a disabled processor */
if
(
processor
->
flags
.
enabled
==
0
)
return
0
;
mp_register_lapic
(
mp_register_lapic
(
processor
->
id
,
/* APIC ID */
processor
->
id
,
/* APIC ID */
processor
->
flags
.
enabled
);
/* Enabled? */
processor
->
flags
.
enabled
);
/* Enabled? */
...
...
arch/i386/kernel/mpparse.c
View file @
bb49d1d1
...
@@ -634,7 +634,7 @@ void __init get_smp_config (void)
...
@@ -634,7 +634,7 @@ void __init get_smp_config (void)
/*
/*
* ACPI may be used to obtain the entire SMP configuration or just to
* ACPI may be used to obtain the entire SMP configuration or just to
* enumerate/configure processors (CONFIG_ACPI_
H
T). Note that
* enumerate/configure processors (CONFIG_ACPI_
BOO
T). Note that
* ACPI supports both logical (e.g. Hyper-Threading) and physical
* ACPI supports both logical (e.g. Hyper-Threading) and physical
* processors, where MPS only supports physical.
* processors, where MPS only supports physical.
*/
*/
...
@@ -940,7 +940,7 @@ void __init mp_override_legacy_irq (
...
@@ -940,7 +940,7 @@ void __init mp_override_legacy_irq (
* erroneously sets the trigger to level, resulting in a HUGE
* erroneously sets the trigger to level, resulting in a HUGE
* increase of timer interrupts!
* increase of timer interrupts!
*/
*/
if
((
bus_irq
==
0
)
&&
(
global_irq
==
2
)
&&
(
trigger
==
3
))
if
((
bus_irq
==
0
)
&&
(
trigger
==
3
))
trigger
=
1
;
trigger
=
1
;
intsrc
.
mpc_type
=
MP_INTSRC
;
intsrc
.
mpc_type
=
MP_INTSRC
;
...
@@ -961,7 +961,7 @@ void __init mp_override_legacy_irq (
...
@@ -961,7 +961,7 @@ void __init mp_override_legacy_irq (
* Otherwise create a new entry (e.g. global_irq == 2).
* Otherwise create a new entry (e.g. global_irq == 2).
*/
*/
for
(
i
=
0
;
i
<
mp_irq_entries
;
i
++
)
{
for
(
i
=
0
;
i
<
mp_irq_entries
;
i
++
)
{
if
((
mp_irqs
[
i
].
mpc_
dstapic
==
intsrc
.
mpc_dstapic
)
if
((
mp_irqs
[
i
].
mpc_
srcbus
==
intsrc
.
mpc_srcbus
)
&&
(
mp_irqs
[
i
].
mpc_srcbusirq
==
intsrc
.
mpc_srcbusirq
))
{
&&
(
mp_irqs
[
i
].
mpc_srcbusirq
==
intsrc
.
mpc_srcbusirq
))
{
mp_irqs
[
i
]
=
intsrc
;
mp_irqs
[
i
]
=
intsrc
;
found
=
1
;
found
=
1
;
...
@@ -1008,9 +1008,10 @@ void __init mp_config_acpi_legacy_irqs (void)
...
@@ -1008,9 +1008,10 @@ void __init mp_config_acpi_legacy_irqs (void)
*/
*/
for
(
i
=
0
;
i
<
16
;
i
++
)
{
for
(
i
=
0
;
i
<
16
;
i
++
)
{
if
(
i
==
2
)
continue
;
/* Don't connect IRQ2 */
if
(
i
==
2
)
continue
;
/* Don't connect IRQ2 */
intsrc
.
mpc_irqtype
=
i
?
mp_INT
:
mp_ExtINT
;
/* 8259A to #0 */
intsrc
.
mpc_irqtype
=
mp_INT
;
intsrc
.
mpc_srcbusirq
=
i
;
/* Identity mapped */
intsrc
.
mpc_srcbusirq
=
i
;
/* Identity mapped */
intsrc
.
mpc_dstirq
=
i
;
intsrc
.
mpc_dstirq
=
i
;
...
...
arch/x86_64/kernel/acpi/boot.c
View file @
bb49d1d1
...
@@ -120,6 +120,11 @@ acpi_parse_lapic (
...
@@ -120,6 +120,11 @@ acpi_parse_lapic (
acpi_table_print_madt_entry
(
header
);
acpi_table_print_madt_entry
(
header
);
/* no utility in registering a disabled processor */
if
(
processor
->
flags
.
enabled
==
0
)
return
0
;
mp_register_lapic
(
mp_register_lapic
(
processor
->
id
,
/* APIC ID */
processor
->
id
,
/* APIC ID */
processor
->
flags
.
enabled
);
/* Enabled? */
processor
->
flags
.
enabled
);
/* Enabled? */
...
...
arch/x86_64/kernel/mpparse.c
View file @
bb49d1d1
...
@@ -487,7 +487,7 @@ void __init get_smp_config (void)
...
@@ -487,7 +487,7 @@ void __init get_smp_config (void)
/*
/*
* ACPI may be used to obtain the entire SMP configuration or just to
* ACPI may be used to obtain the entire SMP configuration or just to
* enumerate/configure processors (CONFIG_ACPI_
HT_ONLY
). Note that
* enumerate/configure processors (CONFIG_ACPI_
BOOT
). Note that
* ACPI supports both logical (e.g. Hyper-Threading) and physical
* ACPI supports both logical (e.g. Hyper-Threading) and physical
* processors, where MPS only supports physical.
* processors, where MPS only supports physical.
*/
*/
...
@@ -787,7 +787,7 @@ void __init mp_override_legacy_irq (
...
@@ -787,7 +787,7 @@ void __init mp_override_legacy_irq (
* erroneously sets the trigger to level, resulting in a HUGE
* erroneously sets the trigger to level, resulting in a HUGE
* increase of timer interrupts!
* increase of timer interrupts!
*/
*/
if
((
bus_irq
==
0
)
&&
(
global_irq
==
2
)
&&
(
trigger
==
3
))
if
((
bus_irq
==
0
)
&&
(
trigger
==
3
))
trigger
=
1
;
trigger
=
1
;
intsrc
.
mpc_type
=
MP_INTSRC
;
intsrc
.
mpc_type
=
MP_INTSRC
;
...
@@ -808,8 +808,8 @@ void __init mp_override_legacy_irq (
...
@@ -808,8 +808,8 @@ void __init mp_override_legacy_irq (
* Otherwise create a new entry (e.g. global_irq == 2).
* Otherwise create a new entry (e.g. global_irq == 2).
*/
*/
for
(
i
=
0
;
i
<
mp_irq_entries
;
i
++
)
{
for
(
i
=
0
;
i
<
mp_irq_entries
;
i
++
)
{
if
((
mp_irqs
[
i
].
mpc_
dstapic
==
intsrc
.
mpc_dstapic
)
if
((
mp_irqs
[
i
].
mpc_
srcbus
==
intsrc
.
mpc_srcbus
)
&&
(
mp_irqs
[
i
].
mpc_
dstirq
==
intsrc
.
mpc_dst
irq
))
{
&&
(
mp_irqs
[
i
].
mpc_
srcbusirq
==
intsrc
.
mpc_srcbus
irq
))
{
mp_irqs
[
i
]
=
intsrc
;
mp_irqs
[
i
]
=
intsrc
;
found
=
1
;
found
=
1
;
break
;
break
;
...
@@ -855,9 +855,10 @@ void __init mp_config_acpi_legacy_irqs (void)
...
@@ -855,9 +855,10 @@ void __init mp_config_acpi_legacy_irqs (void)
*/
*/
for
(
i
=
0
;
i
<
16
;
i
++
)
{
for
(
i
=
0
;
i
<
16
;
i
++
)
{
if
(
i
==
2
)
continue
;
/* Don't connect IRQ2 */
if
(
i
==
2
)
continue
;
/* Don't connect IRQ2 */
intsrc
.
mpc_irqtype
=
i
?
mp_INT
:
mp_ExtINT
;
/* 8259A to #0 */
intsrc
.
mpc_irqtype
=
mp_INT
;
intsrc
.
mpc_srcbusirq
=
i
;
/* Identity mapped */
intsrc
.
mpc_srcbusirq
=
i
;
/* Identity mapped */
intsrc
.
mpc_dstirq
=
i
;
intsrc
.
mpc_dstirq
=
i
;
...
...
drivers/acpi/Kconfig
View file @
bb49d1d1
...
@@ -143,7 +143,7 @@ config ACPI_NUMA
...
@@ -143,7 +143,7 @@ config ACPI_NUMA
bool "NUMA support"
bool "NUMA support"
depends on ACPI_INTERPRETER
depends on ACPI_INTERPRETER
depends on NUMA
depends on NUMA
depends on
!X86_
64
depends on
IA
64
default y if IA64_GENERIC || IA64_SGI_SN2
default y if IA64_GENERIC || IA64_SGI_SN2
config ACPI_ASUS
config ACPI_ASUS
...
...
drivers/acpi/numa.c
View file @
bb49d1d1
...
@@ -172,7 +172,7 @@ acpi_numa_init()
...
@@ -172,7 +172,7 @@ acpi_numa_init()
NR_CPUS
);
NR_CPUS
);
result
=
acpi_table_parse_srat
(
ACPI_SRAT_MEMORY_AFFINITY
,
result
=
acpi_table_parse_srat
(
ACPI_SRAT_MEMORY_AFFINITY
,
acpi_parse_memory_affinity
,
acpi_parse_memory_affinity
,
NR_NODE_MEMBLKS
);
NR_NODE_MEMBLKS
);
// IA64 specific
}
else
{
}
else
{
/* FIXME */
/* FIXME */
printk
(
"Warning: acpi_table_parse(ACPI_SRAT) returned %d!
\n
"
,
result
);
printk
(
"Warning: acpi_table_parse(ACPI_SRAT) returned %d!
\n
"
,
result
);
...
...
drivers/acpi/processor.c
View file @
bb49d1d1
...
@@ -1022,7 +1022,7 @@ acpi_processor_get_performance_states (
...
@@ -1022,7 +1022,7 @@ acpi_processor_get_performance_states (
(
u32
)
px
->
status
));
(
u32
)
px
->
status
));
if
(
!
px
->
core_frequency
)
{
if
(
!
px
->
core_frequency
)
{
ACPI_DEBUG_PRINT
((
ACPI_DB_ERROR
,
"
core_frequency is 0
\n
"
));
ACPI_DEBUG_PRINT
((
ACPI_DB_ERROR
,
"
Invalid _PSS data: freq is zero
\n
"
));
result
=
-
EFAULT
;
result
=
-
EFAULT
;
kfree
(
pr
->
performance
->
states
);
kfree
(
pr
->
performance
->
states
);
goto
end
;
goto
end
;
...
@@ -1607,7 +1607,7 @@ static int cpu_has_cpufreq(unsigned int cpu)
...
@@ -1607,7 +1607,7 @@ static int cpu_has_cpufreq(unsigned int cpu)
static
int
acpi_thermal_cpufreq_increase
(
unsigned
int
cpu
)
static
int
acpi_thermal_cpufreq_increase
(
unsigned
int
cpu
)
{
{
if
(
!
cpu_has_cpufreq
)
if
(
!
cpu_has_cpufreq
(
cpu
)
)
return
-
ENODEV
;
return
-
ENODEV
;
if
(
cpufreq_thermal_reduction_pctg
[
cpu
]
<
60
)
{
if
(
cpufreq_thermal_reduction_pctg
[
cpu
]
<
60
)
{
...
@@ -1622,7 +1622,7 @@ static int acpi_thermal_cpufreq_increase(unsigned int cpu)
...
@@ -1622,7 +1622,7 @@ static int acpi_thermal_cpufreq_increase(unsigned int cpu)
static
int
acpi_thermal_cpufreq_decrease
(
unsigned
int
cpu
)
static
int
acpi_thermal_cpufreq_decrease
(
unsigned
int
cpu
)
{
{
if
(
!
cpu_has_cpufreq
)
if
(
!
cpu_has_cpufreq
(
cpu
)
)
return
-
ENODEV
;
return
-
ENODEV
;
if
(
cpufreq_thermal_reduction_pctg
[
cpu
]
>=
20
)
{
if
(
cpufreq_thermal_reduction_pctg
[
cpu
]
>=
20
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment