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

Commit 7fc1a1ab authored by Ivan Kokshaysky's avatar Ivan Kokshaysky Committed by Linus Torvalds
Browse files

alpha: more fixes for specific machine types 



arch/alpha/kernel/sys_sx164.c

	Earlier firmware revisions need MVI fix as well.

arch/alpha/kernel/sys_nautilus.c

	On UP1500 firmware reports wrong AGP IRQ (10 instead of 5).
	This causes interrupt storm if there is a PCI device that
	uses IRQ 5.

Signed-off-by: default avatarIvan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1b75b05b

arch/alpha/kernel/sys_nautilus.c

+6 −0
Original line number Diff line number Diff line
@@ -70,6 +70,12 @@ nautilus_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 
	/* Preserve the IRQ set up by the console.  */



	u8 irq;

	/* UP1500: AGP INTA is actually routed to IRQ 5, not IRQ 10 as

	   console reports. Check the device id of AGP bridge to distinguish

	   UP1500 from UP1000/1100. Note: 'pin' is 2 due to bridge swizzle. */

	if (slot == 1 && pin == 2 &&

	    dev->bus->self && dev->bus->self->device == 0x700f)

		return 5;

	pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &irq);

	return irq;

}

arch/alpha/kernel/sys_sx164.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ sx164_init_arch(void) 


	if (amask(AMASK_MAX) != 0

	    && alpha_using_srm

	    && (cpu->pal_revision & 0xffff) == 0x117) {

	    && (cpu->pal_revision & 0xffff) <= 0x117) {

		__asm__ __volatile__(

		"lda	$16,8($31)\n"

		"call_pal 9\n"		/* Allow PALRES insns in kernel mode */