Date: Thu, 8 Jun 2006 21:02:25 +0000 (UTC) From: Marius Strobl <marius@FreeBSD.org> To: src-committers@freebsd.org, cvs-src@freebsd.org, cvs-all@freebsd.org Subject: cvs commit: src/sys/sparc64/sbus sbus.c Message-ID: <200606082102.k58L2PwU072247@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
marius 2006-06-08 21:02:25 UTC
FreeBSD src repository
Modified files:
sys/sparc64/sbus sbus.c
Log:
- Merge sys/sparc64/pci/psycho.c rev. 1.8:
Map the device memory belonging to resources of type SYS_RES_MEMORY into
KVA upon activation so that rman_get_virtual() works as expected.
- In sbus_alloc_resource() checking whether toffs is 0 as an indication
that no applicable child range was found isn't appropriate as it's
perfectly valid for the requested SYS_RES_MEMORY resource to start at
the beginning of a child range. So check for the RMAN still being NULL
instead.
- As a minor runtime speed optimization break out of the loop where we
search for the applicable child range in sbus_alloc_resource() as soon
as it's found.
- Let sbus_setup_intr() return ENOMEM rather than 0 if it can't allocate
memory for the interrupt clearing info.
- Actually do what the comment in sbus_setup_intr() says and disable the
respective interrupt while fiddling with it.
- Remove some superfluous INTVEC() around inr, which already only contains
the interrupt vector, in sbus_setup_intr().
- While here, fix a style(9) bug in sbus_setup_intr() (don't use function
calls in initializers).
The first two changes are required for a CG6 driver.
MFC after: 2 weeks
Revision Changes Path
1.39 +26 -7 src/sys/sparc64/sbus/sbus.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200606082102.k58L2PwU072247>