Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d450c088 authored by Jacob Pan's avatar Jacob Pan Committed by Ingo Molnar
Browse files

x86/mrst: Set ISA bus type for fake MP IRQs 



We use MP IRQs for SFI presented timer interrupts, we should
also set mp_bus_not_pci for MP_ISA_BUS so that pin_2_irq mapping
is correct.

Signed-off-by: default avatarJacob Pan <jacob.jun.pan@linux.intel.com>
Signed-off-by: default avatarDirk Brandewie <dirk.brandewie@gmail.com>
Link: http://lkml.kernel.org/n/tip-8h3rc1igpp8ir94aas69qmhk@git.kernel.org


Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b3eea29c

arch/x86/kernel/apic/io_apic.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1010,7 +1010,7 @@ static int pin_2_irq(int idx, int apic, int pin) 
	} else {

	} else {

		u32 gsi = gsi_cfg->gsi_base + pin;

		u32 gsi = gsi_cfg->gsi_base + pin;





		if (gsi >= legacy_pic->nr_legacy_irqs)

		if (gsi >= NR_IRQS_LEGACY)

			irq = gsi;

			irq = gsi;

		else

		else

			irq = gsi_top + gsi;

			irq = gsi_top + gsi;
@@ -3610,7 +3610,7 @@ static void __init probe_nr_irqs_gsi(void) 
{

{

	int nr;

	int nr;





	nr = gsi_top + legacy_pic->nr_legacy_irqs;

	nr = gsi_top + NR_IRQS_LEGACY;

	if (nr > nr_irqs_gsi)

	if (nr > nr_irqs_gsi)

		nr_irqs_gsi = nr;

		nr_irqs_gsi = nr;