Date: Fri, 26 Jul 2002 19:35:58 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 14968 for review Message-ID: <200207270235.g6R2ZwHN025207@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14968 Change 14968 by peter@peter_ia64 on 2002/07/26 19:35:30 refine my understanding of the routing Affected files ... .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#6 edit .. //depot/projects/ia64/sys/dev/pci/pci_pci.c#6 edit Differences ... ==== //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#6 (text+ko) ==== @@ -343,13 +343,13 @@ #ifdef TIGER4 device_printf(sc->ap_dev, "acpi_pcib_route_interrupt: %s pci%d:%d:%d\n", acpi_name(sc->ap_handle), bus, slot, pin); if (bus == 0 && slot == 29 && pin == 0) { - interrupt = 50; /* usb0 */ + interrupt = 50; /* usb0 50 */ device_printf(sc->ap_dev, "IRQ ROUTING KLUDGE %s bus %d slot %d pin %d -> %d\n", acpi_name(sc->ap_handle), bus, slot, pin, interrupt); goto out; } if (bus == 0 && slot == 29 && pin == 1) { - interrupt = 49; /* usb1 */ + interrupt = 49; /* usb1 49 */ device_printf(sc->ap_dev, "IRQ ROUTING KLUDGE %s bus %d slot %d pin %d -> %d\n", acpi_name(sc->ap_handle), bus, slot, pin, interrupt); goto out; ==== //depot/projects/ia64/sys/dev/pci/pci_pci.c#6 (text+ko) ==== @@ -429,15 +429,7 @@ int childslot = pci_get_slot(dev); int childpin = pin - 1; int childbus = pci_get_bus(dev); -device_printf(dev, "pcib_route_interrupt: pci%d:%d:%d\n", childbus, childslot, childpin); intnum = 255; -/* -em0: pcib_route_interrupt: pci1:0:0 -fxp0: pcib_route_interrupt: pci3:2:0 -fxp1: pcib_route_interrupt: pci5:1:0 -isp0: pcib_route_interrupt: pci10:2:0 -fxp2: pcib_route_interrupt: pci13:1:0 -*/ #if 0 /* XXX need to hack this at acpi level */ if (childbus == 1 && childslot == 29 && childpin == 0) intnum = 50; /* usb */ @@ -445,13 +437,18 @@ intnum = 49; /* usb */ #endif if (childbus == 1 && childslot == 0 && childpin == 0) - intnum = 51; /* em */ + intnum = 18; /* em 51 */ if (childbus == 3 && childslot == 2 && childpin == 0) - intnum = 63; /* fxp0 */ + intnum = 52; /* fxp0 63 */ + if (childbus == 5 && childslot == 1 && childpin == 0) + intnum = 24; /* fxp1 52 */ + if (childbus == 10 && childslot == 2 && childpin == 0) + intnum = 76; /* isp0 72 */ + if (childbus == 13 && childslot == 1 && childpin == 0) + intnum = 16; /* fxp2 86 */ +#if 0 if (childbus == 3 && childslot == 31 && childpin == 0) intnum = 67; /* hotplug */ - if (childbus == 5 && childslot == 1 && childpin == 0) - intnum = 52; /* fxp1 */ if (childbus == 5 && childslot == 2 && childpin == 0) intnum = 56; /* mpt0 */ if (childbus == 5 && childslot == 2 && childpin == 1) @@ -460,18 +457,15 @@ intnum = 58; /* hotplug */ if (childbus == 8 && childslot == 31 && childpin == 0) intnum = 80; /* hotplug */ - if (childbus == 10 && childslot == 2 && childpin == 0) - intnum = 72; /* isp0 */ if (childbus == 10 && childslot == 31 && childpin == 0) intnum = 75; /* hotplug */ - if (childbus == 13 && childslot == 1 && childpin == 0) - intnum = 86; /* fxp2 */ if (childbus == 13 && childslot == 31 && childpin == 0) intnum = 90; /* hotplug */ if (childbus == 14 && childslot == 31 && childpin == 0) intnum = 85; /* hotplug */ +#endif if (intnum != 255) { -device_printf(dev, "Hardwiring IRQ to %d\n", intnum); +device_printf(dev, "pcib_route_interrupt: pci%d:%d:%d - Hardwiring to IRQ %d\n", childbus, childslot, childpin, intnum); return intnum; } #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207270235.g6R2ZwHN025207>