Date: Fri, 30 May 2003 13:48:05 -0700 (PDT) From: Thomas Moestl <tmm@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/sparc64/ebus ebus.c src/sys/sparc64/include ofw_bus.h src/sys/sparc64/isa isa.c src/sys/sparc64/pci ofw_pci.c ofw_pci.h psycho.c psychovar.h src/sys/sparc64/sparc64 ofw_bus.c sparcbus_if.m Message-ID: <200305302048.h4UKm5YS069643@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
tmm 2003/05/30 13:48:05 PDT
FreeBSD src repository
Modified files:
sys/sparc64/ebus ebus.c
sys/sparc64/include ofw_bus.h
sys/sparc64/isa isa.c
sys/sparc64/pci ofw_pci.c ofw_pci.h psycho.c psychovar.h
sys/sparc64/sparc64 ofw_bus.c sparcbus_if.m
Log:
Fix interrupt assignment for non-builtin PCI devices on e450s.
This machine uses a non-standard scheme to specify the interrupts to
be assigned for devices in PCI slots; instead of giving the INO
or full interrupt number (which is done for the other devices in this
box), the firmware interrupt properties contain intpin numbers, which
have to be swizzled as usual on PCI-PCI bridges; however, the PCI host
bridge nodes have no interrupt map, so we need to guess the
correct INO by slot number of the device or the closest PCI-PCI
bridge leading to it, and the intpin.
To do this, this fix makes the following changes:
- Add a newbus method for sparc64 PCI host bridges to guess
the INO, and glue code in ofw_pci_orb_callback() to invoke it based
on a new quirk entry. The guessing is only done for interrupt numbers
too low to contain any IGN found on e450s.
- Create another new quirk entry was created to prevent mapping of EBus
interrupts at PCI level; the e450 has full INOs in the interrupt
properties of EBus devices, so trying to remap them could cause
problems.
- Set both quirk entries for e450s; remove the no-swizzle entry.
- Determine the psycho half (bus A or B) a driver instance manages
in psycho_attach()
- Implement the new guessing method for psycho, using the slot number,
psycho half and property value (intpin).
Thanks go to the testers, especially Brian Denehy, who tested many kernels
for me until I had found the right workaround.
Tested by: Brian Denehy <B.Denehy@90east.com>, jake, fenner,
Marius Strobl <marius@alchemy.franken.de>,
Marian Dobre <mari@onix.ro>
Approved by: re (scottl)
Revision Changes Path
1.8 +6 -4 src/sys/sparc64/ebus/ebus.c
1.4 +2 -2 src/sys/sparc64/include/ofw_bus.h
1.6 +1 -1 src/sys/sparc64/isa/isa.c
1.11 +67 -19 src/sys/sparc64/pci/ofw_pci.c
1.5 +0 -1 src/sys/sparc64/pci/ofw_pci.h
1.35 +43 -8 src/sys/sparc64/pci/psycho.c
1.8 +3 -0 src/sys/sparc64/pci/psychovar.h
1.6 +2 -2 src/sys/sparc64/sparc64/ofw_bus.c
1.2 +22 -4 src/sys/sparc64/sparc64/sparcbus_if.m
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305302048.h4UKm5YS069643>