lkml.org 
[lkml]   [2015]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[patch 22/23] x86/apic: Reuse apic_bsp_setup() for UP APIC setup
Extend apic_bsp_setup() so the same code flow can be used for
APIC_init_uniprocessor().

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/include/asm/apic.h | 2 -
arch/x86/kernel/apic/apic.c | 54 ++++++++++++++++++--------------------------
arch/x86/kernel/smpboot.c | 4 +--
3 files changed, 26 insertions(+), 34 deletions(-)

Index: tip/arch/x86/include/asm/apic.h
===================================================================
--- tip.orig/arch/x86/include/asm/apic.h
+++ tip/arch/x86/include/asm/apic.h
@@ -212,7 +212,7 @@ extern void setup_secondary_APIC_clock(v
extern int APIC_init_uniprocessor(void);
extern int apic_force_enable(unsigned long addr);

-extern int apic_bsp_setup(void);
+extern int apic_bsp_setup(bool upmode);
extern void apic_ap_setup(void);

/*
Index: tip/arch/x86/kernel/apic/apic.c
===================================================================
--- tip.orig/arch/x86/kernel/apic/apic.c
+++ tip/arch/x86/kernel/apic/apic.c
@@ -2200,36 +2200,48 @@ void __init apic_set_eoi_write(void (*eo
}
}

-static void __init bsp_end_local_APIC_setup(void)
+static void __init apic_bsp_up_setup(void)
{
- end_local_APIC_setup();
+#ifdef CONFIG_X86_64
+ apic_write(APIC_ID, SET_APIC_ID(boot_cpu_physical_apicid));
+#else
/*
- * Now that local APIC setup is completed for BP, configure the fault
- * handling for interrupt remapping.
+ * Hack: In case of kdump, after a crash, kernel might be booting
+ * on a cpu with non-zero lapic id. But boot_cpu_physical_apicid
+ * might be zero if read from MP tables. Get it from LAPIC.
*/
- irq_remap_enable_fault_handling();
+# ifdef CONFIG_CRASH_DUMP
+ boot_cpu_physical_apicid = read_apic_id();
+# endif
+#endif
+ physid_set_mask_of_physid(boot_cpu_physical_apicid, &phys_cpu_present_map);
}

/**
* apic_bsp_setup - Setup function for local apic and io-apic
+ * @upmode: Force UP mode (for APIC_init_uniprocessor)
*
* Returns:
* apic_id of BSP APIC
*/
-int __init apic_bsp_setup(void)
+int __init apic_bsp_setup(bool upmode)
{
int id;

connect_bsp_APIC();
setup_local_APIC();

+ if (upmode)
+ apic_bsp_up_setup();
+
if (x2apic_mode)
id = apic_read(APIC_LDR);
else
id = GET_APIC_LOGICAL_ID(apic_read(APIC_LDR));

enable_IO_APIC();
- bsp_end_local_APIC_setup();
+ end_local_APIC_setup();
+ irq_remap_enable_fault_handling();
setup_IO_APIC();
return id;
}
@@ -2265,32 +2277,12 @@ int __init APIC_init_uniprocessor(void)
}
#endif

- default_setup_apic_routing();
+ if (!smp_found_config)
+ disable_ioapic_support();

+ default_setup_apic_routing();
verify_local_APIC();
- connect_bsp_APIC();
-
-#ifdef CONFIG_X86_64
- apic_write(APIC_ID, SET_APIC_ID(boot_cpu_physical_apicid));
-#else
- /*
- * Hack: In case of kdump, after a crash, kernel might be booting
- * on a cpu with non-zero lapic id. But boot_cpu_physical_apicid
- * might be zero if read from MP tables. Get it from LAPIC.
- */
-# ifdef CONFIG_CRASH_DUMP
- boot_cpu_physical_apicid = read_apic_id();
-# endif
-#endif
- physid_set_mask_of_physid(boot_cpu_physical_apicid, &phys_cpu_present_map);
- setup_local_APIC();
-
- if (smp_found_config)
- enable_IO_APIC();
-
- bsp_end_local_APIC_setup();
-
- setup_IO_APIC();
+ apic_bsp_setup(true);

x86_init.timers.setup_percpu_clockev();
return 0;
Index: tip/arch/x86/kernel/smpboot.c
===================================================================
--- tip.orig/arch/x86/kernel/smpboot.c
+++ tip/arch/x86/kernel/smpboot.c
@@ -1147,7 +1147,7 @@ void __init native_smp_prepare_cpus(unsi
return;
case SMP_FORCE_UP:
disable_smp();
- apic_bsp_setup();
+ apic_bsp_setup(false);
return;
case SMP_OK:
break;
@@ -1161,7 +1161,7 @@ void __init native_smp_prepare_cpus(unsi
/* Or can we switch back to PIC here? */
}

- cpu0_logical_apicid = apic_bsp_setup();
+ cpu0_logical_apicid = apic_bsp_setup(false);

/*
* Set up local APIC timer on boot CPU.



\
 
 \ /
  Last update: 2015-01-15 22:41    [W:0.290 / U:0.396 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site