x86/apic: Rename disable_apic

It reflects a state and not a command. Make it bool while at it.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Michael Kelley <mikelley@microsoft.com>
Tested-by: Sohil Mehta <sohil.mehta@intel.com>
Tested-by: Juergen Gross <jgross@suse.com> # Xen PV (dom0 and unpriv. guest)

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 98c32aa..4b1110a 100644 (file)
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -52,7 +52,7 @@ static inline void generic_apic_probe(void)
 extern int apic_verbosity;
 extern int local_apic_timer_c2_ok;
 
-extern int disable_apic;
+extern bool apic_is_disabled;
 extern unsigned int lapic_timer_period;
 
 extern int cpuid_to_apicid[];
@@ -90,7 +90,7 @@ static inline void default_inquire_remote_apic(int apicid)
  */
 static inline bool apic_from_smp_config(void)
 {
-       return smp_found_config && !disable_apic;
+       return smp_found_config && !apic_is_disabled;
 }
 
 /*

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index af49e24..a9dd903 100644 (file)
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -180,7 +180,7 @@ __setup("apicpmtimer", setup_apicpmtimer);
 #endif
 
 unsigned long mp_lapic_addr __ro_after_init;
-int disable_apic __ro_after_init;
+bool apic_is_disabled __ro_after_init;
 /* Disable local APIC timer from the kernel commandline or via dmi quirk */
 static int disable_apic_timer __initdata;
 /* Local APIC timer works in C2 */
@@ -810,7 +810,7 @@ bool __init apic_needs_pit(void)
                return true;
 
        /* Is there an APIC at all or is it disabled? */
-       if (!boot_cpu_has(X86_FEATURE_APIC) || disable_apic)
+       if (!boot_cpu_has(X86_FEATURE_APIC) || apic_is_disabled)
                return true;
 
        /*
@@ -1299,7 +1299,7 @@ enum apic_intr_mode_id apic_intr_mode __ro_after_init;
 static int __init __apic_intr_mode_select(void)
 {
        /* Check kernel option */
-       if (disable_apic) {
+       if (apic_is_disabled) {
                pr_info("APIC disabled via kernel command line\n");
                return APIC_PIC;
        }
@@ -1308,7 +1308,7 @@ static int __init __apic_intr_mode_select(void)
 #ifdef CONFIG_X86_64
        /* On 64-bit, the APIC must be integrated, Check local APIC only */
        if (!boot_cpu_has(X86_FEATURE_APIC)) {
-               disable_apic = 1;
+               apic_is_disabled = true;
                pr_info("APIC disabled by BIOS\n");
                return APIC_PIC;
        }
@@ -1317,14 +1317,14 @@ static int __init __apic_intr_mode_select(void)
 
        /* Neither 82489DX nor integrated APIC ? */
        if (!boot_cpu_has(X86_FEATURE_APIC) && !smp_found_config) {
-               disable_apic = 1;
+               apic_is_disabled = true;
                return APIC_PIC;
        }
 
        /* If the BIOS pretends there is an integrated APIC ? */
        if (!boot_cpu_has(X86_FEATURE_APIC) &&
                APIC_INTEGRATED(boot_cpu_apic_version)) {
-               disable_apic = 1;
+               apic_is_disabled = true;
                pr_err(FW_BUG "Local APIC %d not detected, force emulation\n",
                                       boot_cpu_physical_apicid);
                return APIC_PIC;
@@ -1567,7 +1567,7 @@ static void setup_local_APIC(void)
        int cpu = smp_processor_id();
        unsigned int value;
 
-       if (disable_apic) {
+       if (apic_is_disabled) {
                disable_ioapic_support();
                return;
        }
@@ -1943,7 +1943,7 @@ void __init check_x2apic(void)
        pr_err("Kernel does not support x2APIC, please recompile with CONFIG_X86_X2APIC.\n");
        pr_err("Disabling APIC, expect reduced performance and functionality.\n");
 
-       disable_apic = 1;
+       apic_is_disabled = true;
        setup_clear_cpu_cap(X86_FEATURE_APIC);
 }
 
@@ -2037,7 +2037,7 @@ int __init apic_force_enable(unsigned long addr)
 {
        u32 h, l;
 
-       if (disable_apic)
+       if (apic_is_disabled)
                return -1;
 
        /*
@@ -2064,7 +2064,7 @@ int __init apic_force_enable(unsigned long addr)
 static int __init detect_init_APIC(void)
 {
        /* Disabled by kernel option? */
-       if (disable_apic)
+       if (apic_is_disabled)
                return -1;
 
        switch (boot_cpu_data.x86_vendor) {
@@ -2919,7 +2919,7 @@ int apic_is_clustered_box(void)
  */
 static int __init setup_disableapic(char *arg)
 {
-       disable_apic = 1;
+       apic_is_disabled = true;
        setup_clear_cpu_cap(X86_FEATURE_APIC);
        return 0;
 }

diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
index fe78319..f310dc2 100644 (file)
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -71,13 +71,13 @@ static int noop_apic_id_registered(void)
 
 static u32 noop_apic_read(u32 reg)
 {
-       WARN_ON_ONCE(boot_cpu_has(X86_FEATURE_APIC) && !disable_apic);
+       WARN_ON_ONCE(boot_cpu_has(X86_FEATURE_APIC) && !apic_is_disabled);
        return 0;
 }
 
-static void noop_apic_write(u32 reg, u32 v)
+static void noop_apic_write(u32 reg, u32 val)
 {
-       WARN_ON_ONCE(boot_cpu_has(X86_FEATURE_APIC) && !disable_apic);
+       WARN_ON_ONCE(boot_cpu_has(X86_FEATURE_APIC) && !apic_is_disabled);
 }
 
 #ifdef CONFIG_X86_32

diff --git a/arch/x86/kernel/apic/msi.c b/arch/x86/kernel/apic/msi.c
index 35d5b8f..6b6b711 100644 (file)
--- a/arch/x86/kernel/apic/msi.c
+++ b/arch/x86/kernel/apic/msi.c
@@ -269,7 +269,7 @@ static const struct msi_parent_ops x86_vector_msi_parent_ops = {
 
 struct irq_domain * __init native_create_pci_msi_domain(void)
 {
-       if (disable_apic)
+       if (apic_is_disabled)
                return NULL;
 
        x86_vector_domain->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT;

diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
index 01c359a..04655b7 100644 (file)
--- a/arch/x86/kernel/apic/vector.c
+++ b/arch/x86/kernel/apic/vector.c
@@ -547,7 +547,7 @@ static int x86_vector_alloc_irqs(struct irq_domain *domain, unsigned int virq,
        struct irq_data *irqd;
        int i, err, node;
 
-       if (disable_apic)
+       if (apic_is_disabled)
                return -ENXIO;
 
        /*

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index fd975a4..a5ef400 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1020,7 +1020,7 @@ void __init setup_arch(char **cmdline_p)
 
        if (acpi_mps_check()) {
 #ifdef CONFIG_X86_LOCAL_APIC
-               disable_apic = 1;
+               apic_is_disabled = true;
 #endif
                setup_clear_cpu_cap(X86_FEATURE_APIC);
        }

diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 014c508..652cd53 100644 (file)
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -517,7 +517,7 @@ int __init pci_xen_init(void)
 #ifdef CONFIG_PCI_MSI
 static void __init xen_hvm_msi_init(void)
 {
-       if (!disable_apic) {
+       if (!apic_is_disabled) {
                /*
                 * If hardware supports (x2)APIC virtualization (as indicated
                 * by hypervisor's leaf 4) then we don't need to use pirqs/