Commit graph android_kernel_sony_sdm845/arch/x86/kernel/apic.c
Message SHA1
Merge branch 'x86/irq' into x86/core
Ingo Molnar   commited 2008-12-23 16:30:31 +01:00
bed4f13065
Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/detect-hyper', 'x86/doc', 'x86/dumpstack', 'x86/early-printk', 'x86/fpu', 'x86/idle', 'x86/io', 'x86/memory-corruption-check', 'x86/microcode', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/pat2', 'x86/pci-ioapic-boot-irq-quirks', 'x86/ptrace', 'x86/quirks', 'x86/reboot', 'x86/setup-memory', 'x86/signal', 'x86/sparse-fixes', 'x86/time', 'x86/uv' and 'x86/xen' into x86/core
Ingo Molnar   commited 2008-12-23 16:27:23 +01:00
fa623d1b02
Merge branch 'x86/apic' into x86/irq
Conflicts:
	arch/x86/kernel/apic.c

Ingo Molnar   commited 2008-12-23 16:24:15 +01:00
bf8bd66d05
Merge commit 'v2.6.28-rc9' into x86/apic
Ingo Molnar   commited 2008-12-23 16:23:23 +01:00
1ccedb7cdb
x86: hardirq: introduce inc_irq_stat()
Impact: cleanup

Introduce inc_irq_stat() macro and unify irq_stat accounting code.

Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Hiroshi Shimamoto   authored and   Ingo Molnar   commited 2008-12-12 11:59:49 +01:00
915b0d0104
x86: kill #ifdef for exit_idle()
Impact: cleanup

Introduce helper inline function in arch/x86/include/asm/idle.h
to remove #ifdefs around exit_idle().

Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Hiroshi Shimamoto   authored and   Ingo Molnar   commited 2008-12-12 11:58:36 +01:00
8f2466f45f
enable_IR_x2apic() needs to be __init
calls __init, called only from __init

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Al Viro   authored and   Linus Torvalds   commited 2008-11-30 10:03:37 -08:00
2236d252e0
x86: apic reset counter on shutdown
Impact: avoid spurious lapic timer events on shutdown

The apic timer might be close to firing when it is shutdown. We can
not really disable the timer - we just mask the interrupt. That way we
can get an extra interrupt when it is reenabled. Set the counter to
max on shutdown to avoid this.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Thomas Gleixner   commited 2008-11-11 14:56:55 +01:00
a98f8fd24f
x86: apic - use pr_ macros for logging
Impact: cleanup

It saves us some source lines and shift the code a bit righter.

And a multiline comment style is fixed too :-)

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Acked-by: "Maciej W. Rozycki" <macro@linux-mips.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-11-10 09:16:41 +01:00
ba21ebb6ab
x86: apic - calibrate_APIC_clock remove redundant irq-enable-disable
Impact: cleanup

lapic_timer_setup is self-protected with local_irq_save/restore
no need to use them in caller and levt is the per-cpu variable so
no concurrent access from another cpu.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Acked-by: "Maciej W. Rozycki" <macro@linux-mips.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-11-10 09:16:40 +01:00
4e0304310f
x86: apic - unify APIC_DIVISOR
Use APIC_DIVISOR being set to 16 for both 32/64bit
mode. To escape APIC timer underflow during calibration
set it to the maximum possible value.

Also typo error (CONFG instead of proper CONFIG) fixed.
The error was caught by Venkatesh Pallipadi, thanks a lot Venkatesh!

See details on http://lkml.org/lkml/2008/10/9/425

Reported-by: Venkatesh Pallipad <venkatesh.pallipadi@intel.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Acked-by: "Maciej W. Rozycki" <macro@linux-mips.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-10-16 16:53:14 +02:00
81608f3c25
x86: io-apic - interrupt remapping fix
Interrupt remapping could lead to NULL dereference in case of
kzalloc failed and memory leak in other way. So fix the
both cases.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: "Maciej W. Rozycki" <macro@linux-mips.org>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-10-16 16:53:11 +02:00
5ffa4eb222
x86: apic - fix unused vars warning in calibrate_APIC_clock
If we don't have CONFIG_X86_PM_TIMER=y compiler warns about
unused variables. Move PM timer based calibration into a
separate function and make the code cleaner and the compiler
happy as well.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-10-16 16:53:10 +02:00
b189892de4
x86: apic - skip writting ESR register if we dont have on
On 82489DX we don't have ESR register so we should not
write it.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-10-16 16:53:10 +02:00
08ad776e3c
x86: apic - lapic_setup_esr does not handle esr_disable - fix it
lapic_setup_esr doesn't handle esr_disable inquire.
The error brought in during unification process.
Fix it.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-10-16 16:53:10 +02:00
9df08f1095
x86: print out apic id in hex format
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-10-16 16:53:09 +02:00
823b259b80
x86: lapic address print out like io apic addr
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-10-16 16:53:08 +02:00
79c09698ca
x86: apic - unify smp_spurious/error_interrupt declaration
According to entry_64.S we do pass pt_regs pointer
into interrupt handlers but don't use them. So we
safely may merge the declarations.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-10-16 16:53:04 +02:00
1dd6ba2e17
x86: let 64 bit to use 32 bit calibrate_apic_clock
Use the 32-bit APIC calibration code - it's more mature.

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

Yinghai Lu   authored and   Ingo Molnar   commited 2008-10-16 16:53:03 +02:00
e492c5ae85
x86: rename apic_32.c and apic_64.c to apic.c
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-10-16 16:53:03 +02:00
0f611ffaea
Renamed from arch/x86/kernel/apic_64.c (Browse further)