Watch
1
0
Fork
You've already forked kernel_a52xq
0
mirror of https://github.com/a52xq-dev/kernel.git synced 2026-11-21 08:56:58 +07:00
Commit graph kernel_a52xq/arch/x86/kernel/apic_32.c
Message SHA1
Merge branch 'linus' into oprofile-v2
Conflicts:
	arch/x86/kernel/apic_32.c
	arch/x86/oprofile/nmi_int.c
	include/linux/pci_ids.h

Ingo Molnar   commited 2008-10-13 11:05:51 +02:00
accba5f396
Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B
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

Ingo Molnar   commited 2008-10-11 20:17:36 +02:00
d84705969f
x86: apic - compilation warnings fix
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-19 02:07:20 +02:00
1b4ee4e409
x86: apic - lapic_resume 32bit - unification fix
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>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-19 02:07:20 +02:00
e75bedf415
x86: apic - rearrange parse_lapic_timer_c2_ok
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-19 02:07:19 +02:00
3415610b8e
x86: apic - unify disableapic and nolapic setup handlers
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-19 02:07:19 +02:00
789fa73571
x86: apic - unify apic_set_verbosity
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-19 02:07:18 +02:00
79af9bec60
x86: apic - unify local_apic_timer_interrupt
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-19 02:07:17 +02:00
0b23e8cf55
x86: apic - unify end_local_APIC_setup
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-19 02:07:17 +02:00
fa6b95fc7c
x86: apic - generic_processor_info
- 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>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-19 02:07:16 +02:00
1b313f4a6d
x86: apic - unify disconnect_bsp_APIC
- just #ifdef added

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

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-19 02:07:16 +02:00
c177b0bc03
x86: apic - unify __setup_APIC_LVTT
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-19 02:07:15 +02:00
c40aaec686
x86: apic - unify lapic_setup_esr
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>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-19 02:07:15 +02:00
c43da2f5e9
x86: apic - unify connect_bsp_APIC
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-19 02:07:14 +02:00
36c9d67428
x86: apic - unify lapic_shutdown
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-19 02:07:13 +02:00
fe4024dcb0
x86: apic - unify disable_local_APIC
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-19 02:07:13 +02:00
990b183e58
x86: apic - unify setup_boot_APIC_clock
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-19 02:07:12 +02:00
f1ee37891d
x86: apic - rearrange maxcpu definition
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-19 02:07:12 +02:00
b6c8051311
x86: apic - unify lapic_is_integrated
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-17 14:41:50 +02:00
9c803869f5
x86: apic - rearrange functions and comments
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>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-17 14:41:49 +02:00
274cfe5912
x86: apic - unify lapic_suspend
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-17 14:41:48 +02:00
24968cfdd4
x86: apic - unify lapic_resume
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-17 14:41:48 +02:00
92206c909a
x86: apic - unify clear_local_APIC
- 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>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-17 14:41:47 +02:00
6764014bc8
x86: apic - unify init_bsp_APIC
- 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>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-16 15:37:45 +02:00
638c041192
x86: apic - sync_Arb_IDs style fixup
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>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-16 15:37:27 +02:00
6f6da97faf
x86: apic - unify sync_Arb_IDs
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-15 13:51:23 +02:00
296cb9511d
x86: apic - unify verify_local_APIC
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-15 13:51:22 +02:00
c93baa1ae5
x86: apic - get rid of local_apic_timer_verify_ok
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>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-15 13:51:22 +02:00
64e474d168
x86: apic - do not clear APIC twice in lapic_shutdown
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>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-15 13:51:21 +02:00
9ce122c6e5
x86: apic - unify disable_apic_timer
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>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-15 13:51:20 +02:00
36fef0949c
Merge branch 'x86/apic' into x86/core
Ingo Molnar   commited 2008-08-14 15:13:47 +02:00
881b374705
Merge branch 'linus' into x86/core
Conflicts:
	arch/x86/kernel/genapic_64.c
	include/asm-x86/kvm_host.h

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

Ingo Molnar   commited 2008-08-14 14:58:01 +02:00
51ca3c6791
x86: resurrect proper handling of maxcpus= kernel option (v2)
For some reason we had two parsers registered for maxcpus=. One in init/main.c
and another in arch/x86/smpboot.c. So I nuked the one in arch/x86.

Also 64-bit kernels used to handle maxcpus= as documented in
Documentation/cpu-hotplug.txt. CPUs with 'id > maxcpus' are initialized
but not booted. 32-bit version for some reason ignored them even though
all the infrastructure for booting them later is there.

In the current mainline both 64 and 32 bit versions are broken.
This patch restores the correct behaviour. I've tested x86_64 version on
4- and 8- way Core2 and 2-way Opteron based machines. Various config
combinations SMP, !SMP, CPU_HOTPLUG, !CPU_HOTPLUG.
Booted with maxcpus=1 and maxcpus=4, etc. Everything is working as expected.

So far we've received two reports from different people confirming that 32-bit
version also works fine, both on dual core laptops and 16way server machines.

[v2: This version fixes visws breakage pointed out by Ingo.]

Signed-off-by: Max Krasnyansky <maxk@qualcomm.com>
Cc: lizf@cn.fujitsu.com
Cc: jeff.chua.linux@gmail.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Max Krasnyansky   authored and   Ingo Molnar   commited 2008-08-14 11:18:08 +02:00
23b49c19f6
x86: make "apic" an early_param() on 32-bit, NULL check
Cyrill Gorcunov observed:

> you turned it into early_param so now it's NULL injecting vulnerabled.
> Could you please add checking for NULL str param?

fix that.

Also, change the name of 'str' into 'arg', to make it more apparent
that this is an optional argument that can be NULL, not a string
parameter that is empty when unset.

Reported-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Rene Herman   authored and   Ingo Molnar   commited 2008-08-11 19:40:38 +02:00
48d97cb65e
x86: make "apic" an early_param() on 32-bit
On 32-bit, "apic" is a __setup() param meaning it is parsed rather
late in the game. Make it an early_param() for apic_printk() use
by arch/x86/kernel/mpparse.c.

On 64-bit, it already is an early_param().

Signed-off-by: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Rene Herman   authored and   Ingo Molnar   commited 2008-08-11 18:36:04 +02:00
fb6bef8002
x86: apic interrupts - move assignments to irqinit_32.c, v2
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>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-08-11 16:43:09 +02:00
2ae111cdd8
x86: apic: changing export symbols to *_GPL
This fits better here.

Signed-off-by: Robert Richter <robert.richter@amd.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Barry Kasindorf <barry.kasindorf@amd.com>
Cc: oprofile-list <oprofile-list@lists.sourceforge.net>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Robert Richter   authored and   Ingo Molnar   commited 2008-07-26 11:48:12 +02:00
6aa360e6c1
x86: apic: export symbols for extended interrupt LVT functions
This patch adds EXPORT_SYMBOLs to allow OProfile to be built as
module.

Cc: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Robert Richter <robert.richter@amd.com>
Cc: oprofile-list <oprofile-list@lists.sourceforge.net>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Barry Kasindorf <barry.kasindorf@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Robert Richter   authored and   Ingo Molnar   commited 2008-07-26 11:48:12 +02:00
0969161685
x86: apic_*.c: add description to AMD's extended LVT functions
Signed-off-by: Robert Richter <robert.richter@amd.com>
Cc: oprofile-list <oprofile-list@lists.sourceforge.net>
Cc: Barry Kasindorf <barry.kasindorf@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Robert Richter   authored and   Ingo Molnar   commited 2008-07-26 11:47:59 +02:00
286f571837
x86: apic unification - merge down enable_NMI_through_LVT0
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>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-07-24 13:52:29 +02:00
d4c63ec060
x86: apic unification - merge down lapic_get_maxlvt
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>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-07-24 13:52:28 +02:00
36a028de78
Merge branch 'linus' into x86/x2apic
Ingo Molnar   commited 2008-07-22 09:06:21 +02:00
76c3bb15d6
Merge branches 'x86/urgent', 'x86/amd-iommu', 'x86/apic', 'x86/cleanups', 'x86/core', 'x86/cpu', 'x86/fixmap', 'x86/gart', 'x86/kprobes', 'x86/memtest', 'x86/modules', 'x86/nmi', 'x86/pat', 'x86/reboot', 'x86/setup', 'x86/step', 'x86/unify-pci', 'x86/uv', 'x86/xen' and 'xen-64bit' into x86/for-linus
Ingo Molnar   commited 2008-07-21 16:37:17 +02:00
acee709cab
x86: use setup_clear_cpu_cap() when disabling the lapic
... so don't need to call clear_cpu_cap again in early_identify_cpu,
and could use cleared_cpu_caps like other places.

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-07-21 13:03:12 +02:00
9175fc06ae
x86: APIC: Remove apic_write_around(); use alternatives, merge fix
On Fri, Jul 18, 2008 at 02:03:48PM -0700, Ingo Molnar wrote:
>
> * Yinghai Lu <yhlu.kernel@gmail.com> wrote:
>
> > > git merge tip/x86/x2apic
> > CONFLICT (content): Merge conflict in arch/x86/kernel/Makefile
> > CONFLICT (content): Merge conflict in arch/x86/kernel/paravirt.c
> > CONFLICT (content): Merge conflict in arch/x86/kernel/smpboot.c
> > CONFLICT (content): Merge conflict in arch/x86/kernel/vmi_32.c
> > CONFLICT (content): Merge conflict in arch/x86/xen/enlighten.c
> > CONFLICT (content): Merge conflict in include/asm-x86/apic.h
> > CONFLICT (content): Merge conflict in include/asm-x86/paravirt.h
>
> that's due to the changes in tip/x86/apic and in tip/x86/uv.
>
> ok, i've just merged x86/apic into x86/x2apic and x86/uv as well, and
> pushed out the result.
>
> Note: it's a first raw merge and completely untested. It will now merge
> cleanly into tip/master. There are probably a few details missing.

Ingo, thanks for doing this. While I was testing my merge changes, you posted
yours... anyhow we need this piece, which is missing from your merge.

Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: "Maciej W. Rozycki" <macro@linux-mips.org>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Zachary Amsden <zach@vmware.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Suresh Siddha   authored and   Ingo Molnar   commited 2008-07-19 23:44:30 +02:00
f586bf7df9
Merge branch 'x86/apic' into x86/x2apic
Conflicts:

	arch/x86/kernel/paravirt.c
	arch/x86/kernel/smpboot.c
	arch/x86/kernel/vmi_32.c
	arch/x86/lguest/boot.c
	arch/x86/xen/enlighten.c
	include/asm-x86/apic.h
	include/asm-x86/paravirt.h

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

Ingo Molnar   commited 2008-07-18 23:00:05 +02:00
453c1404c5
Merge branch 'linus' into x86/x2apic
Ingo Molnar   commited 2008-07-18 22:50:34 +02:00
a208f37a46
x86: let 32bit use apic_ops too - fix
Fix VMI apic_ops.

Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Acked-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Suresh Siddha   authored and   Ingo Molnar   commited 2008-07-18 19:05:29 +02:00
9a8f0e6b5d
x86: APIC: Make apic_verbosity unsigned
As a microoptimisation, make apic_verbosity unsigned.  This will make
apic_printk(APIC_QUIET, ...) expand into just printk(...) with the
surrounding condition and a reference to apic_verbosity removed.

Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Maciej W. Rozycki   authored and   Ingo Molnar   commited 2008-07-18 14:27:43 +02:00
baa1318841
x86: apic_32 - introduce calibrate_APIC_clock
Introduce calibrate_APIC_clock so it could help in further 32/64bit
apic code merging.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: macro@linux-mips.org
Cc: yhlu.kernel@gmail.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Cyrill Gorcunov   authored and   Ingo Molnar   commited 2008-07-18 14:17:30 +02:00
836c129de9