diff options
author | Ido Yariv <ido@wizery.com> | 2012-06-02 18:11:34 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-06-06 03:06:19 -0400 |
commit | 7db971b235480849aa5b9209b67b62e987b3181b (patch) | |
tree | dbb69fb414c6de564bbbc079ae8038a4925a78a2 /arch/x86/kernel/vsmp_64.c | |
parent | f9ba7179ce91fb77b2adf6eaab3676ab3a1f5a15 (diff) |
x86/platform: Introduce APIC post-initialization callback
Some subarchitectures (such as vSMP) need to slightly adjust the
underlying APIC structure. Add an APIC post-initialization callback
to 'struct x86_platform_ops' for this purpose and use it for
adjusting the APIC structure on vSMP systems.
Signed-off-by: Ido Yariv <ido@wizery.com>
Acked-by: Shai Fultheim <shai@scalemp.com>
Link: http://lkml.kernel.org/r/1338675095-27260-1-git-send-email-ido@wizery.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/vsmp_64.c')
-rw-r--r-- | arch/x86/kernel/vsmp_64.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c index 8eeb55a551b4..59eea855f451 100644 --- a/arch/x86/kernel/vsmp_64.c +++ b/arch/x86/kernel/vsmp_64.c | |||
@@ -187,12 +187,25 @@ static void __init vsmp_cap_cpus(void) | |||
187 | #endif | 187 | #endif |
188 | } | 188 | } |
189 | 189 | ||
190 | static int apicid_phys_pkg_id(int initial_apic_id, int index_msb) | ||
191 | { | ||
192 | return hard_smp_processor_id() >> index_msb; | ||
193 | } | ||
194 | |||
195 | static void vsmp_apic_post_init(void) | ||
196 | { | ||
197 | /* need to update phys_pkg_id */ | ||
198 | apic->phys_pkg_id = apicid_phys_pkg_id; | ||
199 | } | ||
200 | |||
190 | void __init vsmp_init(void) | 201 | void __init vsmp_init(void) |
191 | { | 202 | { |
192 | detect_vsmp_box(); | 203 | detect_vsmp_box(); |
193 | if (!is_vsmp_box()) | 204 | if (!is_vsmp_box()) |
194 | return; | 205 | return; |
195 | 206 | ||
207 | x86_platform.apic_post_init = vsmp_apic_post_init; | ||
208 | |||
196 | vsmp_cap_cpus(); | 209 | vsmp_cap_cpus(); |
197 | 210 | ||
198 | set_vsmp_pv_ops(); | 211 | set_vsmp_pv_ops(); |