vSMP Foundation detection and initialization could be done by the
hypervisor layer, so set it up that way.
Signed-off-by: Ido Yariv <i...@wizery.com>
Acked-by: Shai Fultheim <s...@scalemp.com>
---
arch/x86/include/asm/hypervisor.h | 1 +
arch/x86/include/asm/setup.h | 7 -------
arch/x86/kernel/cpu/hypervisor.c | 1 +
arch/x86/kernel/setup.c | 2 --
arch/x86/kernel/vsmp_64.c | 27 +++++++++++++++++----------
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/arch/x86/include/asm/hypervisor.h
b/arch/x86/include/asm/hypervisor.h
index b518c75..eb617ae 100644
--- a/arch/x86/include/asm/hypervisor.h
+++ b/arch/x86/include/asm/hypervisor.h
@@ -50,6 +50,7 @@ extern const struct hypervisor_x86 x86_hyper_vmware;
extern const struct hypervisor_x86 x86_hyper_ms_hyperv;
extern const struct hypervisor_x86 x86_hyper_xen_hvm;
extern const struct hypervisor_x86 x86_hyper_kvm;
+extern const struct hypervisor_x86 x86_hyper_vsmp;
static inline bool hypervisor_x2apic_available(void)
{
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index d0f19f9..a4c5b14 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -26,13 +26,6 @@
#include <asm/bootparam.h>
#include <asm/x86_init.h>
-/* Interrupt control for vSMPowered x86_64 systems */
-#ifdef CONFIG_X86_64
-void vsmp_init(void);
-#else
-static inline void vsmp_init(void) { }
-#endif
-
void setup_bios_corruption_check(void);
#ifdef CONFIG_X86_VISWS
diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c
index a8f8fa9..bcac2ff6 100644
--- a/arch/x86/kernel/cpu/hypervisor.c
+++ b/arch/x86/kernel/cpu/hypervisor.c
@@ -40,6 +40,7 @@ static const __initconst struct hypervisor_x86 * const
hypervisors[] =
#ifdef CONFIG_KVM_GUEST
&x86_hyper_kvm,
#endif
+ &x86_hyper_vsmp,
};
const struct hypervisor_x86 *x86_hyper;
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index f4b9b80..f9706d1 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -943,8 +943,6 @@ void __init setup_arch(char **cmdline_p)
reserve_crashkernel();
- vsmp_init();
-
io_delay_init();
/*
diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
index 992f890..f655f2c 100644
--- a/arch/x86/kernel/vsmp_64.c
+++ b/arch/x86/kernel/vsmp_64.c
@@ -17,12 +17,14 @@
#include <linux/pci_regs.h>
#include <linux/smp.h>
#include <linux/irq.h>
+#include <linux/module.h>
#include <asm/apic.h>
#include <asm/pci-direct.h>
#include <asm/io.h>
#include <asm/paravirt.h>
#include <asm/setup.h>
+#include <asm/hypervisor.h>
#define TOPOLOGY_REGISTER_OFFSET 0x10
@@ -132,17 +134,20 @@ static void __init set_vsmp_pv_ops(void)
#ifdef CONFIG_PCI
static int is_vsmp = -1;
-static void __init detect_vsmp_box(void)
+static bool __init detect_vsmp_box(void)
{
is_vsmp = 0;
if (!early_pci_allowed())
- return;
+ goto out;
/* Check if we are running on a ScaleMP vSMPowered box */
if (read_pci_config(0, 0x1f, 0, PCI_VENDOR_ID) ==
(PCI_VENDOR_ID_SCALEMP | (PCI_DEVICE_ID_SCALEMP_VSMP_CTL << 16)))
is_vsmp = 1;
+
+out:
+ return is_vsmp == 1;
}
int is_vsmp_box(void)
@@ -156,8 +161,9 @@ int is_vsmp_box(void)
}
#else
-static void __init detect_vsmp_box(void)
+static bool __init detect_vsmp_box(void)
{
+ return false;
}
int is_vsmp_box(void)
{
@@ -221,16 +227,17 @@ static void vsmp_apic_post_init(void)
apic->vector_allocation_domain = fill_vector_allocation_domain;
}
-void __init vsmp_init(void)
+static void __init vsmp_platform_setup(void)
{
- detect_vsmp_box();
- if (!is_vsmp_box())
- return;
-
x86_platform.apic_post_init = vsmp_apic_post_init;
vsmp_cap_cpus();
-
set_vsmp_pv_ops();
- return;
}
+
+const __refconst struct hypervisor_x86 x86_hyper_vsmp = {
+ .name = "ScaleMP vSMP Foundation",
+ .detect = detect_vsmp_box,
+ .init_platform = vsmp_platform_setup,
+};
+EXPORT_SYMBOL(x86_hyper_vsmp);
--
1.7.7.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
