From owner-cvs-src-old@FreeBSD.ORG Tue Mar 30 20:30:14 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5F2601065674 for ; Tue, 30 Mar 2010 20:30:14 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D01D08FC1F for ; Tue, 30 Mar 2010 20:30:09 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2UKU90K012492 for ; Tue, 30 Mar 2010 20:30:09 GMT (envelope-from marius@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2UKU9N7012491 for cvs-src-old@freebsd.org; Tue, 30 Mar 2010 20:30:09 GMT (envelope-from marius@repoman.freebsd.org) Message-Id: <201003302030.o2UKU9N7012491@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to marius@repoman.freebsd.org using -f From: Marius Strobl Date: Tue, 30 Mar 2010 20:29:45 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: RELENG_7 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 X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Mar 2010 20:30:14 -0000 marius 2010-03-30 20:29:45 UTC FreeBSD src repository Modified files: (Branch: RELENG_7) sys/sparc64/include ktr.h md_var.h upa.h sys/sparc64/sparc64 machdep.c mp_locore.S mp_machdep.c Log: SVN rev 205926 on 2010-03-30 20:29:45Z by marius MFC: r203838 - 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.6.2.1 +3 -5 src/sys/sparc64/include/ktr.h 1.16.10.2 +2 -0 src/sys/sparc64/include/md_var.h 1.4.24.1 +2 -11 src/sys/sparc64/include/upa.h 1.138.2.14 +89 -22 src/sys/sparc64/sparc64/machdep.c 1.8.2.5 +3 -17 src/sys/sparc64/sparc64/mp_locore.S 1.36.2.10 +100 -70 src/sys/sparc64/sparc64/mp_machdep.c