Date: Sat, 13 Feb 2010 16:52:33 +0000 (UTC) From: Marius Strobl <marius@FreeBSD.org> To: cvs-src-old@freebsd.org Subject: cvs commit: src/sys/sparc64/include ktr.h md_var.h upa.h src/sys/sparc64/sparc64 machdep.c mp_locore.S mp_machdep.c Message-ID: <201002131652.o1DGqkJb059192@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
marius 2010-02-13 16:52:33 UTC
FreeBSD src repository
Modified files:
sys/sparc64/include ktr.h md_var.h upa.h
sys/sparc64/sparc64 machdep.c mp_locore.S mp_machdep.c
Log:
SVN rev 203838 on 2010-02-13 16:52:33Z by marius
- Search the whole OFW device tree instead of only the children of the
root nexus device for the CPUs as starting with UltraSPARC IV the 'cpu'
nodes hang off of from 'cmp' (chip multi-threading processor) or 'core'
or combinations thereof. Also in large UltraSPARC III based machines
the 'cpu' nodes hang off of 'ssm' (scalable shared memory) nodes which
group snooping-coherency domains together instead of directly from the
nexus.
It would be great if we could use newbus to deal with the different ways
the 'cpu' devices can hang off of pseudo ones but unfortunately both
cpu_mp_setmaxid() and sparc64_init() have to work prior to regular device
probing.
- Add support for UltraSPARC IV and IV+ CPUs. Due to the fact that these
are multi-core each CPU has two Fireplane config registers and thus the
module/target ID has to be determined differently so the one specific
to a certain core is used. Similarly, starting with UltraSPARC IV the
individual cores use a different property in the OFW device tree to
indicate the CPU/core ID as it no longer is in coincidence with the
shared slot/socket ID.
This involves changing the MD KTR code to not directly read the UPA
module ID either. We use the MID stored in the per-CPU data instead of
calling cpu_get_mid() as a replacement in order prevent clobbering any
registers as side-effect in the assembler version. This requires CATR()
invocations from mp_startup() prior to mapping the per-CPU pages to be
removed though.
While at it additionally distinguish between CPUs with Fireplane and
JBus interconnects as these also use slightly different sizes for the
JBus/agent/module/target IDs.
- Make sparc64_shutdown_final() static as it's not used outside of
machdep.c.
Revision Changes Path
1.7 +3 -5 src/sys/sparc64/include/ktr.h
1.18 +2 -0 src/sys/sparc64/include/md_var.h
1.5 +2 -11 src/sys/sparc64/include/upa.h
1.159 +89 -22 src/sys/sparc64/sparc64/machdep.c
1.13 +3 -17 src/sys/sparc64/sparc64/mp_locore.S
1.53 +101 -72 src/sys/sparc64/sparc64/mp_machdep.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002131652.o1DGqkJb059192>