Commit a4384df3 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by H. Peter Anvin
Browse files

x86, irq: Rename gsi_end gsi_top, and fix off by one errors 



When I introduced the global variable gsi_end I thought gsi_end on
io_apics was one past the end of the gsi range for the io_apic.  After
it was pointed out the the range on io_apics was inclusive I changed
my global variable to match.  That was a big mistake.  Inclusive
semantics without a range start cannot describe the case when no gsi's
are allocated.  Describing the case where no gsi's are allocated is
important in sfi.c and mpparse.c so that we can assign gsi numbers
instead of blindly copying the gsi assignments the BIOS has done as we
do in the acpi case.

To keep from getting the global variable confused with the gsi range
end rename it gsi_top.

To allow describing the case where no gsi's are allocated have gsi_top
be one place the highest gsi number seen in the system.

This fixes an off by one bug in sfi.c:
Reported-by: default avatarjacob pan <jacob.jun.pan@linux.intel.com>

This fixes the same off by one bug in mpparse.c:

This fixes an off unreachable by one bug in acpi/boot.c:irq_to_gsi
Reported-by: default avatarYinghai <yinghai.lu@oracle.com>

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
LKML-Reference: <m17hm9jre7.fsf_-_@fess.ebiederm.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent fc4ac7a5

arch/x86/include/asm/io_apic.h

+2 −2
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ struct mp_ioapic_gsi{ 
	u32 gsi_end;

};

extern struct mp_ioapic_gsi  mp_gsi_routing[];

extern u32 gsi_end;

extern u32 gsi_top;

int mp_find_ioapic(u32 gsi);

int mp_find_ioapic_pin(int ioapic, u32 gsi);

void __init mp_register_ioapic(int id, u32 address, u32 gsi_base);
@@ -197,7 +197,7 @@ static const int timer_through_8259 = 0; 
static inline void ioapic_init_mappings(void)	{ }

static inline void ioapic_insert_resources(void) { }

static inline void probe_nr_irqs_gsi(void)	{ }

#define gsi_end (NR_IRQS_LEGACY - 1)

#define gsi_top (NR_IRQS_LEGACY)

static inline int mp_find_ioapic(u32 gsi) { return 0; }



struct io_apic_irq_attr;

arch/x86/kernel/acpi/boot.c

+4 −4
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static unsigned int gsi_to_irq(unsigned int gsi) 
	if (gsi >= NR_IRQS_LEGACY)

		irq = gsi;

	else

		irq = gsi_end + 1 + gsi;

		irq = gsi_top + gsi;



	return irq;

}
@@ -129,10 +129,10 @@ static u32 irq_to_gsi(int irq) 


	if (irq < NR_IRQS_LEGACY)

		gsi = isa_irq_to_gsi[irq];

	else if (irq <= gsi_end)

	else if (irq < gsi_top)

		gsi = irq;

	else if (irq <= (gsi_end + NR_IRQS_LEGACY))

		gsi = irq - gsi_end;

	else if (irq < (gsi_top + NR_IRQS_LEGACY))

		gsi = irq - gsi_top;

	else

		gsi = 0xffffffff;

arch/x86/kernel/apic/io_apic.c

+6 −6
Original line number Diff line number Diff line
@@ -89,8 +89,8 @@ int nr_ioapics; 
/* IO APIC gsi routing info */

struct mp_ioapic_gsi  mp_gsi_routing[MAX_IO_APICS];



/* The last gsi number used */

u32 gsi_end;

/* The one past the highest gsi number used */

u32 gsi_top;



/* MP IRQ source entries */

struct mpc_intsrc mp_irqs[MAX_IRQ_SOURCES];
@@ -1035,7 +1035,7 @@ static int pin_2_irq(int idx, int apic, int pin) 
		if (gsi >= NR_IRQS_LEGACY)

			irq = gsi;

		else

			irq = gsi_end + 1 + gsi;

			irq = gsi_top + gsi;

	}



#ifdef CONFIG_X86_32
@@ -3853,7 +3853,7 @@ void __init probe_nr_irqs_gsi(void) 
{

	int nr;



	nr = gsi_end + 1 + NR_IRQS_LEGACY;

	nr = gsi_top + NR_IRQS_LEGACY;

	if (nr > nr_irqs_gsi)

		nr_irqs_gsi = nr;
@@ -4294,8 +4294,8 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base) 
	 */

	nr_ioapic_registers[idx] = entries;



	if (mp_gsi_routing[idx].gsi_end > gsi_end)

		gsi_end = mp_gsi_routing[idx].gsi_end;

	if (mp_gsi_routing[idx].gsi_end >= gsi_top)

		gsi_top = mp_gsi_routing[idx].gsi_end + 1;



	printk(KERN_INFO "IOAPIC[%d]: apic_id %d, version %d, address 0x%x, "

	       "GSI %d-%d\n", idx, mp_ioapics[idx].apicid,

arch/x86/kernel/mpparse.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static void __init MP_ioapic_info(struct mpc_ioapic *m) 
	printk(KERN_INFO "I/O APIC #%d Version %d at 0x%X.\n",

	       m->apicid, m->apicver, m->apicaddr);



	mp_register_ioapic(m->apicid, m->apicaddr, gsi_end + 1);

	mp_register_ioapic(m->apicid, m->apicaddr, gsi_top);

}



static void print_MP_intsrc_info(struct mpc_intsrc *m)

arch/x86/kernel/sfi.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static int __init sfi_parse_ioapic(struct sfi_table_header *table) 
	pentry = (struct sfi_apic_table_entry *)sb->pentry;



	for (i = 0; i < num; i++) {

		mp_register_ioapic(i, pentry->phys_addr, gsi_end + 1);

		mp_register_ioapic(i, pentry->phys_addr, gsi_top);

		pentry++;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE