Commit ecf600f8 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Dave Hansen
Browse files

x86/apic/ioapic: Rename skip_ioapic_setup 



Another variable name which is confusing at best. Convert to bool.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: default avatarMichael Kelley <mikelley@microsoft.com>
Tested-by: default avatarSohil Mehta <sohil.mehta@intel.com>
Tested-by: Juergen Gross <jgross@suse.com> # Xen PV (dom0 and unpriv. guest)
parent 49062454

arch/x86/include/asm/io_apic.h

+4 −3
Original line number Diff line number Diff line
@@ -109,8 +109,8 @@ extern int mp_irq_entries; 
/* MP IRQ source entries */

extern struct mpc_intsrc mp_irqs[MAX_IRQ_SOURCES];



/* 1 if "noapic" boot option passed */

extern int skip_ioapic_setup;

/* True if "noapic" boot option passed */

extern bool ioapic_is_disabled;



/* 1 if "noapic" boot option passed */

extern int noioapicquirk;
@@ -129,7 +129,7 @@ extern unsigned long io_apic_irqs; 
 * assignment of PCI IRQ's.

 */

#define io_apic_assign_pci_irqs \

	(mp_irq_entries && !skip_ioapic_setup && io_apic_irqs)

	(mp_irq_entries && !ioapic_is_disabled && io_apic_irqs)



struct irq_cfg;

extern void ioapic_insert_resources(void);
@@ -179,6 +179,7 @@ extern void print_IO_APICs(void); 
#define IO_APIC_IRQ(x)		0

#define io_apic_assign_pci_irqs 0

#define setup_ioapic_ids_from_mpc x86_init_noop

#define nr_ioapics		(0)

static inline void ioapic_insert_resources(void) { }

static inline int arch_early_ioapic_init(void) { return 0; }

static inline void print_IO_APICs(void) {}

arch/x86/kernel/acpi/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -1275,7 +1275,7 @@ static int __init acpi_parse_madt_ioapic_entries(void) 
	/*

	 * if "noapic" boot option, don't look for IO-APICs

	 */

	if (skip_ioapic_setup) {

	if (ioapic_is_disabled) {

		pr_info("Skipping IOAPIC probe due to 'noapic' option.\n");

		return -ENODEV;

	}

arch/x86/kernel/apic/apic.c

+6 −6
Original line number Diff line number Diff line
@@ -1691,7 +1691,7 @@ static void setup_local_APIC(void) 
	 * TODO: set up through-local-APIC from through-I/O-APIC? --macro

	 */

	value = apic_read(APIC_LVT0) & APIC_LVT_MASKED;

	if (!cpu && (pic_mode || !value || skip_ioapic_setup)) {

	if (!cpu && (pic_mode || !value || ioapic_is_disabled)) {

		value = APIC_DM_EXTINT;

		apic_printk(APIC_VERBOSE, "enabled ExtINT on CPU#%d\n", cpu);

	} else {
@@ -1956,7 +1956,7 @@ void __init enable_IR_x2apic(void) 
	unsigned long flags;

	int ret, ir_stat;



	if (skip_ioapic_setup) {

	if (ioapic_is_disabled) {

		pr_info("Not enabling interrupt remapping due to skipped IO-APIC setup\n");

		return;

	}
@@ -2956,11 +2956,11 @@ early_param("nolapic_timer", parse_nolapic_timer); 
static int __init apic_set_verbosity(char *arg)

{

	if (!arg)  {

#ifdef CONFIG_X86_64

		skip_ioapic_setup = 0;

		return 0;

#endif

		if (IS_ENABLED(CONFIG_X86_32))

			return -EINVAL;



		ioapic_is_disabled = false;

		return 0;

	}



	if (strcmp("debug", arg) == 0)

arch/x86/kernel/apic/io_apic.c

+6 −6
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ int mp_bus_id_to_type[MAX_MP_BUSSES]; 


DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES);



int skip_ioapic_setup;

bool ioapic_is_disabled __ro_after_init;



/**

 * disable_ioapic_support() - disables ioapic support at runtime
@@ -189,7 +189,7 @@ void disable_ioapic_support(void) 
	noioapicquirk = 1;

	noioapicreroute = -1;

#endif

	skip_ioapic_setup = 1;

	ioapic_is_disabled = true;

}



static int __init parse_noapic(char *str)
@@ -831,7 +831,7 @@ static int __acpi_get_override_irq(u32 gsi, bool *trigger, bool *polarity) 
{

	int ioapic, pin, idx;



	if (skip_ioapic_setup)

	if (ioapic_is_disabled)

		return -1;



	ioapic = mp_find_ioapic(gsi);
@@ -1366,7 +1366,7 @@ void __init enable_IO_APIC(void) 
	int i8259_apic, i8259_pin;

	int apic, pin;



	if (skip_ioapic_setup)

	if (ioapic_is_disabled)

		nr_ioapics = 0;



	if (!nr_legacy_irqs() || !nr_ioapics)
@@ -2399,7 +2399,7 @@ void __init setup_IO_APIC(void) 
{

	int ioapic;



	if (skip_ioapic_setup || !nr_ioapics)

	if (ioapic_is_disabled || !nr_ioapics)

		return;



	io_apic_irqs = nr_legacy_irqs() ? ~PIC_IRQS : ~0UL;
@@ -2715,7 +2715,7 @@ void __init io_apic_init_mappings(void) 
				       "address found in MPTABLE, "

				       "disabling IO/APIC support!\n");

				smp_found_config = 0;

				skip_ioapic_setup = 1;

				ioapic_is_disabled = true;

				goto fake_ioapic_page;

			}

#endif

arch/x86/xen/smp_pv.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static void __init xen_pv_smp_prepare_cpus(unsigned int max_cpus) 
{

	unsigned cpu;



	if (skip_ioapic_setup) {

	if (ioapic_is_disabled) {

		char *m = (max_cpus == 0) ?

			"The nosmp parameter is incompatible with Xen; " \

			"use Xen dom0_max_vcpus=1 parameter" :