summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic_32.c
Commit message (Collapse)AuthorAgeFilesLines
* x86: rename apic_32.c and apic_64.c to apic.cYinghai Lu2008-10-161-2312/+0
| | | | | Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic copy apic_64.c to apic_32.cYinghai Lu2008-10-161-0/+188
| | | | | Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic copy calibrate_APIC_clock to each other in apic_32/64.cYinghai Lu2008-10-161-0/+86
| | | | | Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic unify smp_spurious/error_interruptYinghai Lu2008-10-161-3/+21
| | | | | Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: merge header files in apic_xx.cYinghai Lu2008-10-161-0/+8
| | | | | Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: copy detect_init_APIC to the otherYinghai Lu2008-10-161-0/+20
| | | | | Signed-off-by: Yinghai Lu <yhlu.kernel@mgail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: merge APIC_init_uniprocessorYinghai Lu2008-10-161-6/+45
| | | | | Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: make apic_32/64.c more likeYinghai Lu2008-10-161-12/+113
| | | | | | | except x2apic, detec_init_APIC, and calibrating_APIC_clock Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: add hard_smp_prossor_id with MACRO in io_apic_xx.cYinghai Lu2008-10-161-0/+7
| | | | | Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic_xx.c order variablesYinghai Lu2008-10-161-22/+24
| | | | | Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify smp_apic_timer_interruptCyrill Gorcunov2008-10-161-0/+3
| | | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic_32.c should use __cpuinit sectionCyrill Gorcunov2008-10-161-3/+3
| | | | | | | | | All callers are __init or __cpuinit so there is no need to hold this code without CPU_HOTPLUG being set. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify setup_local_APICCyrill Gorcunov2008-10-161-5/+16
| | | | | | | | | | | | | | - remove useless read of APIC_LVR - wrap with preempt_disable/enable - check for integrated APIC just in place v2: fix by Yinghai Lu. fix lapic_is_integrated using let 64-bit too have pic_mode Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify setup_apicpmtimerCyrill Gorcunov2008-10-161-0/+10
| | | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* Merge branch 'linus' into oprofile-v2Ingo Molnar2008-10-131-198/+263
|\ | | | | | | | | | | | | Conflicts: arch/x86/kernel/apic_32.c arch/x86/oprofile/nmi_int.c include/linux/pci_ids.h
| * Merge branch 'x86/apic' into x86-v28-for-linus-phase4-BIngo Molnar2008-10-111-184/+253
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/x86/kernel/apic_32.c arch/x86/kernel/apic_64.c arch/x86/kernel/setup.c drivers/pci/intel-iommu.c include/asm-x86/cpufeature.h include/asm-x86/dma-mapping.h
| | * x86: apic - compilation warnings fixCyrill Gorcunov2008-08-191-6/+9
| | | | | | | | | | | | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - lapic_resume 32bit - unification fixCyrill Gorcunov2008-08-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Just add parenthesis to be identical of current 64bit implementation (so diff will not complain). Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - rearrange parse_lapic_timer_c2_okCyrill Gorcunov2008-08-191-7/+7
| | | | | | | | | | | | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - unify disableapic and nolapic setup handlersCyrill Gorcunov2008-08-191-2/+9
| | | | | | | | | | | | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - unify apic_set_verbosityCyrill Gorcunov2008-08-191-3/+14
| | | | | | | | | | | | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - unify local_apic_timer_interruptCyrill Gorcunov2008-08-191-0/+4
| | | | | | | | | | | | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - unify end_local_APIC_setupCyrill Gorcunov2008-08-191-2/+4
| | | | | | | | | | | | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - generic_processor_infoCyrill Gorcunov2008-08-191-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use physid_set instead of phys_cpu and physids_or - set phys_cpu_present_map bit AFTER check for allowed number of processors - add checking for APIC valid version in 64bit mode (mostly not needed but added for merging purpose) - add apic_version definition for 64bit mode which is used now Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - unify disconnect_bsp_APICCyrill Gorcunov2008-08-191-32/+34
| | | | | | | | | | | | | | | | | | | | | - just #ifdef added Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - unify __setup_APIC_LVTTCyrill Gorcunov2008-08-191-3/+7
| | | | | | | | | | | | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - unify lapic_setup_esrCyrill Gorcunov2008-08-191-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | We use 32bit code former for 64bit mode since it's much better implementation and easier to merge. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - unify connect_bsp_APICCyrill Gorcunov2008-08-191-0/+2
| | | | | | | | | | | | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - unify lapic_shutdownCyrill Gorcunov2008-08-191-3/+6
| | | | | | | | | | | | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - unify disable_local_APICCyrill Gorcunov2008-08-191-1/+3
| | | | | | | | | | | | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - unify setup_boot_APIC_clockCyrill Gorcunov2008-08-191-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - rearrange maxcpu definitionCyrill Gorcunov2008-08-191-2/+2
| | | | | | | | | | | | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - unify lapic_is_integratedCyrill Gorcunov2008-08-171-0/+4
| | | | | | | | | | | | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - rearrange functions and commentsCyrill Gorcunov2008-08-171-30/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rearrange functions and comments to find differences easier. Also use apic_printk in setup_boot_APIC_clock for 64bit mode. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - unify lapic_suspendCyrill Gorcunov2008-08-171-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - unify lapic_resumeCyrill Gorcunov2008-08-171-11/+18
| | | | | | | | | | | | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - unify clear_local_APICCyrill Gorcunov2008-08-171-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove redundant masking of APIC_LVTTHMR register in apic_32.c - Add masking of APIC_LVTTHMR register to apic_64.c. We use a bit complicated #ifdef here: CONFIG_X86_MCE_P4THERMAL is 32bit specific and X86_MCE_INTEL is 64bit specific so the appropriate config variable will be set by Kconfig. - the APIC_ESR register clearing in apic_64.c now uses not straightforward way but this is allowed tradeoff. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - unify init_bsp_APICCyrill Gorcunov2008-08-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove redundant read of APIC_LVR register in 64bit mode - APIC is always integrated for 64bit mode so gcc will eliminate lapic_is_integrated call 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>
| | * x86: apic - sync_Arb_IDs style fixupCyrill Gorcunov2008-08-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | No changes on binary level 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>
| | * x86: apic - unify sync_Arb_IDsCyrill Gorcunov2008-08-151-2/+1
| | | | | | | | | | | | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - unify verify_local_APICCyrill Gorcunov2008-08-151-0/+6
| | | | | | | | | | | | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - get rid of local_apic_timer_verify_okCyrill Gorcunov2008-08-151-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | We are able to use clock_event_device as it's done in 64bit apic code so lets get rid of local_apic_timer_verify_ok variable. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - do not clear APIC twice in lapic_shutdownCyrill Gorcunov2008-08-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | There is no need to clear APIC twice since disable_local_APIC will clear it anyway. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * x86: apic - unify disable_apic_timerCyrill Gorcunov2008-08-151-5/+12
| | | | | | | | | | | | | | | | | | | | | Get rid of local_apic_timer_disabled and use disable_apic_timer instead. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * Merge branch 'x86/apic' into x86/coreIngo Molnar2008-08-141-4/+12
| | |\
| | | * x86: apic unification - merge down enable_NMI_through_LVT0Cyrill Gorcunov2008-07-241-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No code change on binary level. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Cc: macro@linux-mips.org Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | | * x86: apic unification - merge down lapic_get_maxlvtCyrill Gorcunov2008-07-241-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No code change on binary level. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Cc: macro@linux-mips.org Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * | Merge branch 'linus' into x86/coreIngo Molnar2008-08-141-5/+9
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/x86/kernel/genapic_64.c include/asm-x86/kvm_host.h Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * | | x86: apic interrupts - move assignments to irqinit_32.c, v2Cyrill Gorcunov2008-08-111-48/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64bit mode APIC interrupt handlers are set within irqinit_64.c. Lets do tha same for 32bit mode which would help in furter code merging. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * | | Merge branch 'linus' into x86/x2apicIngo Molnar2008-07-221-4/+1
| | |\ \ \ | | | | |/ | | | |/|