Commit graph android_kernel_sony_sdm845/include
Message SHA1
x86: introduce smpboot_clear_io_apic
x86_64 has two nr_ioapics = 0 statements. In 32-bit, it can be done
too. We do it through the smpboot_clear_io_apic() inline function,
to cope with subarchitectures (visws) that does not compile mpparse in

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber de Oliveira Costa   authored and   Ingo Molnar   commited 2008-04-17 17:41:04 +02:00
9f3734f631
x86: assign nr_ioapics = 0 in smpboot_hooks.h
change smpboot_setup_io_apic() by to match x86_64 behaviour

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber de Oliveira Costa   authored and   Ingo Molnar   commited 2008-04-17 17:41:04 +02:00
3fa7b3487a
x86: integrate do_boot_cpu
This is a very large patch, because it depends on a lot
of auxiliary static functions. But they all have been modified
to the point that they're sufficiently close now. So they're just
merged in smpboot.c

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber de Oliveira Costa   authored and   Ingo Molnar   commited 2008-04-17 17:41:03 +02:00
cb3c8b9003
x86: change boot_cpu_id to boot_cpu_physical_apicid
This is to match i386. The former name was cuter,
but the current is more meaningful and more general,
since cpu_id can be a logical id.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber de Oliveira Costa   authored and   Ingo Molnar   commited 2008-04-17 17:41:02 +02:00
c70dcb7430
x86: move stack_start to smp.h
voyager would conflict with it, but the types are ultimately
compatible. So remove the extern definition from voyager_smp.c
in favour of the common one

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber de Oliveira Costa   authored and   Ingo Molnar   commited 2008-04-17 17:41:02 +02:00
9d97d0da71
x86: include mach_apic.h in smpboot_64.c and smpboot.c
After the inclusion, a lot of files needs fixing for conflicts,
some of them in the headers themselves, to accomodate for both
i386 and x86_64 versions.

[ mingo@elte.hu: build fix ]

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber de Oliveira Costa   authored and   Ingo Molnar   commited 2008-04-17 17:41:02 +02:00
f6bc402909
x86: call nmi_watchdog_default in i386
this does not exist, so it will be an empty macro

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber de Oliveira Costa   authored and   Ingo Molnar   commited 2008-04-17 17:41:01 +02:00
50e440aa53
x86: unify nmi_32.h and nmi_64.h
Two more files goes away. nmi_64.h and nmi_32.h gives birth
to nmi.h

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber de Oliveira Costa   authored and   Ingo Molnar   commited 2008-04-17 17:41:01 +02:00
6d60cd5359
x86: wipe get_nmi_reason out of nmi_64.h
use mach_traps when it is supposed to be used.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber de Oliveira Costa   authored and   Ingo Molnar   commited 2008-04-17 17:41:01 +02:00
e32ede19ac
x86: fix alloc_bootmem_pages_node macro
missing a semicolon

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber de Oliveira Costa   authored and   Ingo Molnar   commited 2008-04-17 17:41:00 +02:00
fbac7fcbad
x86: make node to apic mapping declarations unconditional
Instead of declaring them inside of X86_64 ifdef, do it
unconditionally

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber de Oliveira Costa   authored and   Ingo Molnar   commited 2008-04-17 17:41:00 +02:00
04d1dd20f6
x86: define bios to apicid mapping
This mapping already exists in x86_64, just provide it for
i386

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber de Oliveira Costa   authored and   Ingo Molnar   commited 2008-04-17 17:41:00 +02:00
cbe879fc6c
x86: unify extern masks declaration
take them off smp_{32,64}.h and move to smp.h

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber de Oliveira Costa   authored and   Ingo Molnar   commited 2008-04-17 17:41:00 +02:00
7e1efc0cde
x86: provide APIC_INTEGRATED definition for x86_64
it is always integrated, so define as 1.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber de Oliveira Costa   authored and   Ingo Molnar   commited 2008-04-17 17:41:00 +02:00
ac56ef61a1
x86: merge smp_store_cpu_info
now that it is the same between arches, put it into smpboot.c

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber de Oliveira Costa   authored and   Ingo Molnar   commited 2008-04-17 17:41:00 +02:00
1d89a7f072
x86: use start_ipi_hook in x86_64
It is used to match i386. The definition for the non-paravirt
case is moved to smp.h instead of smp_32.h

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber de Oliveira Costa   authored and   Ingo Molnar   commited 2008-04-17 17:40:59 +02:00
d0173aeac4
x86: move mp_bus_id_to_node to numa.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Alexey Starikovskiy   authored and   Ingo Molnar   commited 2008-04-17 17:40:59 +02:00
037cab07e9
x86: move mp_bus_id_to_local to numa.c
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Alexey Starikovskiy   authored and   Ingo Molnar   commited 2008-04-17 17:40:59 +02:00
e129cb490e
x86: make mp_bus_id_to_type optional
[ mingo@elte.hu: fix boot regression. ]

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Alexey Starikovskiy   authored and   Ingo Molnar   commited 2008-04-17 17:40:59 +02:00
c0a282c251
x86: add mp_bus_not_pci bitmap to mpparse_32.c
Signed-off: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Alexey Starikovskiy   authored and   Ingo Molnar   commited 2008-04-17 17:40:58 +02:00
a6333c3ccb
x86: get boot_cpu_id as early for k8_scan_nodes
When acpi=off or there is no SRAT defined, apicid_to_node is got from K8
Northbridge PCI configuration space in k8_scan_nodes() in
arch/x86_64/mm/k8toplogy.c.

The problem is that it assumes bsp apic id is 0 at that point.

For four socket system with Quad core cpus installed, all cpus apic id
is offset by 4, and bsp apic id is 4.

For eight socket system with dual core cpus installed, all cpus apic id
is offset by 2, and bsp apic id is 2.

We need get boot_cpu_id --- bsp apic id, before k8_scan_nodes by called.

So create early_acpi_boot_init and early_get_smp_config for get boot_cpu_id.

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Yinghai Lu   authored and   Ingo Molnar   commited 2008-04-17 17:40:58 +02:00
8643f9d02a
x86: move quad_local_to_mp_bus_id to numa.c
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Alexey Starikovskiy   authored and   Ingo Molnar   commited 2008-04-17 17:40:58 +02:00
6079d2d5d1
x86: correct/clarify comment in nops.h
<asm-x86/nops.h> describes certain multibyte instructions as
"generic" nops when in fact they aren't nops at all in 64-bit
mode (missing REX.W causing truncation of a register).

Update the comment to state that K8 or P6 style nops should be
used in 64-bit mode. This matches what the alternatives code does.

Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Mikael Pettersson   authored and   Ingo Molnar   commited 2008-04-17 17:40:58 +02:00
5d570cbbf2
x86: prevent unconditional writes to DebugCtl MSR
Otherwise, enabling (or better, subsequent disabling) of single
stepping would cause a kernel oops on CPUs not having this MSR.

The patch could have been added a conditional to the MSR write in
user_disable_single_step(), but centralizing the updates seems safer
and (looking forward) better manageable.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: Markus Metzger <markus.t.metzger@intel.com>

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Jan Beulich   authored and   Ingo Molnar   commited 2008-04-17 17:40:58 +02:00
5b0e508415
x86: add AMD Northbridge MSR definition
adds AMD Northbridge config MSR definition

Signed-off-by: Stephane Eranian <eranian@gmail.com>
Signed-off-by: Robert Richter <robert.richter@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

stephane eranian   authored and   Ingo Molnar   commited 2008-04-17 17:40:58 +02:00
12db648c15
x86: add cpu_has_arch_perfmon
adds cpu_has_arch_perfmon to test presence of architectural perfmon on
Intel x86 processor

Signed-off-by: Stephane Eranian <eranian@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

stephane eranian   authored and   Ingo Molnar   commited 2008-04-17 17:40:58 +02:00
86975101e4
x86: cleanup duplicate includes
Signed-off-by: Joe Perches <joe@perches.com>

 arch/x86/kernel/reboot.c      |    1 -
 include/asm-x86/elf.h         |    5 ++---
 include/asm-x86/posix_types.h |    8 +-------
 include/asm-x86/processor.h   |    3 +--
 include/asm-x86/unistd.h      |    8 +-------
 5 files changed, 5 insertions(+), 20 deletions(-)

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Joe Perches   authored and   Ingo Molnar   commited 2008-04-17 17:40:58 +02:00
e40c0fe6b0
x86: introduce initial apicid
store initial_apicid from early identify. it is could be different from
phys_proc_id later.

also print it out in /proc/cpuinfo.

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Yinghai Lu   authored and   Ingo Molnar   commited 2008-04-17 17:40:58 +02:00
01aaea1afb
x86: remove mach_reboot.h
all reboot details are handled in reboot.c and quirks are handled
via reboot_fixups_32.c.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Ingo Molnar   commited 2008-04-17 17:40:58 +02:00
459cce7267
x86: enhance DEBUG_RODATA support - alternatives
Fix a memcpy that should be a text_poke (in apply_alternatives).

Use kernel_wp_save/kernel_wp_restore in text_poke to support DEBUG_RODATA
correctly and so the CPU HOTPLUG special case can be removed.

Add text_poke_early, for alternatives and paravirt boot-time and module load
time patching.

Changelog:

- Fix text_set and text_poke alignment check (mixed up bitwise and and or)
- Remove text_set
- Export add_nops, so it can be used by others.
- Document text_poke_early.
- Remove clflush, since it breaks some VIA architectures and is not strictly
  necessary.
- Add kerneldoc to text_poke and text_poke_early.
- Create a second vmap instead of using the WP bit to support Xen and VMI.
- Move local_irq disable within text_poke and text_poke_early to be able to
  be sleepable in these functions.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
CC: Andi Kleen <andi@firstfloor.org>
CC: pageexec@freemail.hu
CC: H. Peter Anvin <hpa@zytor.com>
CC: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Mathieu Desnoyers   authored and   Ingo Molnar   commited 2008-04-17 17:40:58 +02:00
e587cadd8f
x86: move extern declaration to vdso.h
Before:
   total: 0 errors, 3 warnings, 685 lines checked
After:
   total: 0 errors, 1 warnings, 678 lines checked

No code changed:

arch/x86/kernel/signal_32.o:

   text	   data	    bss	    dec	    hex	filename
   5333	      0	      4	   5337	   14d9	signal_32.o.before
   5333	      0	      4	   5337	   14d9	signal_32.o.after

md5:
   c279e98012a2808e90cfa2a7787e42a4  signal_32.o.before.asm
   c279e98012a2808e90cfa2a7787e42a4  signal_32.o.after.asm

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Ingo Molnar   commited 2008-04-17 17:40:57 +02:00
eee6dd1572
x86: include/asm-x86/mutex_32.h - use angle brackets for include
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Joe Perches   authored and   Ingo Molnar   commited 2008-04-17 17:40:57 +02:00
16281a998d
x86: add comments to processor.h
add comments to the FPU structures of processor.h.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Ingo Molnar   commited 2008-04-17 17:40:57 +02:00
ca9cda2f7b
x86: unify setup_trampoline
setup_trampoline() looks very similar between architectures, and this
patch unifies them. The i386 version allocates bootmem memory, while
the x86_64 version uses a fixed address.

In this patch, we initialize the global trampoline_base to the x86_64 version,
and i386 allocation can later override it.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber Costa   authored and   Ingo Molnar   commited 2008-04-17 17:40:57 +02:00
91718e8d13
x86: move trampoline arrays extern definition to smp.h
In here, they can serve both architectures

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber Costa   authored and   Ingo Molnar   commited 2008-04-17 17:40:56 +02:00
4206882939
x86: merge __cpu_disable and cpu_die
They are now equal, and are moved to a common file

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber Costa   authored and   Ingo Molnar   commited 2008-04-17 17:40:56 +02:00
69c18c15d3
x86: move hotplug related extern definitions to smp.h
definitions that are inside CONFIG_HOTPLUG_CPU in
the arch-specific smp*.h files are moved to common
header

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber Costa   authored and   Ingo Molnar   commited 2008-04-17 17:40:56 +02:00
1dbb4726fa
x86: make set_cpu_sibling_map nonstatic
And move its extern definition to smp.h, the common header

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber Costa   authored and   Ingo Molnar   commited 2008-04-17 17:40:56 +02:00
1452207689
x86: move equal types to common file
move definitions that are now equal in type from
smpboot_{32,64}.c to smpboot.c

cpu_callin_map is put temporarily in smp_64.h (already
exists in smp_32.h), and will soon be merged.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber Costa   authored and   Ingo Molnar   commited 2008-04-17 17:40:56 +02:00
a355352b97
x86: adjust types in smpcommon_32.c
so they can have the same type as x86_64

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber Costa   authored and   Ingo Molnar   commited 2008-04-17 17:40:56 +02:00
5382e89670
x86: remove cpu_llc_id from processor.h
it is already defined in smp.h

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber Costa   authored and   Ingo Molnar   commited 2008-04-17 17:40:56 +02:00
fe6762030c
x86: unify smp_send_stop
function definition is moved to common header.
x86_64 version is now called native_smp_send_stop

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber Costa   authored and   Ingo Molnar   commited 2008-04-17 17:40:56 +02:00
377d698426
x86: provide hlt_works function.
In x86_64, hlt always work. in i386, we'll query the cpuinfo associated
with this cpu

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber Costa   authored and   Ingo Molnar   commited 2008-04-17 17:40:55 +02:00
3d3f487c58
x86: move prefill_possible_map to common file
this patches moves prefill_possible_map() to smpboot.c
Right now it is x86_64-specific, but nothing intrinsically
prevents it to be used by i386

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber Costa   authored and   Ingo Molnar   commited 2008-04-17 17:40:53 +02:00
68a1c3f8cd
x86: move disabled_cpus to common header
disabled_cpus is (up to now) a x86_64-only contruction.
But it's extern declaration can be moved to common header anyway

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber Costa   authored and   Ingo Molnar   commited 2008-04-17 17:40:53 +02:00
93b016f8f3
x86: unify smp_cpus_done
definition is moved to common header. x86_64 version is now called
native_smp_cpus_done

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber Costa   authored and   Ingo Molnar   commited 2008-04-17 17:40:53 +02:00
c559764923
x86: unify smp_prepare_cpus
definition is moved to common header. x86_64 version is now called
native_smp_prepare_cpus

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber Costa   authored and   Ingo Molnar   commited 2008-04-17 17:40:53 +02:00
7557da6720
x86: unify prepare_boot_cpu
definition is moved to common header. x86_64 version is now called
native_prepare_boot_cpu

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber Costa   authored and   Ingo Molnar   commited 2008-04-17 17:40:53 +02:00
1e3fac83da
x86: unify __cpu_up.
function definition is moved to common header. x86_64 version
is now called native_cpu_up

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber Costa   authored and   Ingo Molnar   commited 2008-04-17 17:40:53 +02:00
71d195492a
x86: unify smp_call_function_mask
definition is moved to common header, x86_64 function name
now is native_smp_call_function_mask

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Glauber Costa   authored and   Ingo Molnar   commited 2008-04-17 17:40:53 +02:00
64b1a21e09