 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu_topology.c,v 1.5 2010/05/09 20:32:41 rmind Exp $	*/
+/*	$NetBSD: cpu_topology.c,v 1.6 2010/05/29 05:53:57 rmind Exp $	*/
 /*-
  * Copyright (c) 2009 Mindaugas Rasiukevicius <rmind at NetBSD org>,
  * Copyright (c) 2008 YAMAMOTO Takashi,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -26,51 +26,51 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * x86 CPU topology detection.
+ *
  * References:
  * - 53668.pdf (7.10.2), 276613.pdf
  * - 31116.pdf, 41256.pdf, 25481.pdf
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_topology.c,v 1.5 2010/05/09 20:32:41 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_topology.c,v 1.6 2010/05/29 05:53:57 rmind Exp $");
 #include <sys/param.h>
 #include <sys/bitops.h>
 #include <machine/specialreg.h>
 #include <machine/cpu.h>
 #include <x86/cpufunc.h>
 #include <x86/cputypes.h>
 #include <x86/cpuvar.h>
 void
 x86_cpu_topology(struct cpu_info *ci)
+{
 	u_int lp_max;		/* Logical processors per package (node) */
 	u_int core_max;		/* Core per package */
 	int n, cpu_family, apic_id, smt_bits, core_bits = 0;
 	uint32_t descs[4], lextmode;
 	apic_id = ci->ci_initapicid;
 	cpu_family = CPUID2FAMILY(ci->ci_signature);
 	/* Initial values. */
-	ci->ci_node_id = apic_id;
+	ci->ci_package_id = apic_id;
 	ci->ci_core_id = 0;
 	ci->ci_smt_id = 0;
 	switch (cpu_vendor) {
 	case CPUVENDOR_INTEL:
 		if (cpu_family < 6)
 			return;
 		break;
 	case CPUVENDOR_AMD:
 		if (cpu_family < 0xf)
 			return;
 		break;
 	default:
 @@ -151,24 +151,24 @@ x86_cpu_topology(struct cpu_info *ci)
 		if ((reg & NB_CFG_INITAPICCPUIDLO) == 0) {
 			/*
 			 * 0xf:  { CoreId, NodeId[2:0] }
 			 * 0x10: { CoreId[1:0], 000b, NodeId[2:0] }
 			 */
 			const u_int node_id = apic_id & __BITS(0, 2);
 			apic_id = (cpu_family == 0xf) ?
 			    (apic_id >> core_bits) | (node_id << core_bits) :
 			    (apic_id >> 5) | (node_id << 2);
+		}
+	}
 	if (smt_bits + core_bits) {
-		ci->ci_node_id = apic_id >> (smt_bits + core_bits);
+		ci->ci_package_id = apic_id >> (smt_bits + core_bits);
+	}
 	if (core_bits) {
 		u_int core_mask = __BITS(smt_bits, smt_bits + core_bits - 1);
 		ci->ci_core_id = __SHIFTOUT(apic_id, core_mask);
+	}
 	if (smt_bits) {
 		u_int smt_mask = __BITS(0, smt_bits - 1);
 		ci->ci_smt_id = __SHIFTOUT(apic_id, smt_mask);
+	}
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu_data.h,v 1.30 2010/05/09 20:18:40 rmind Exp $	*/
+/*	$NetBSD: cpu_data.h,v 1.31 2010/05/29 05:53:57 rmind Exp $	*/
 /*-
  * Copyright (c) 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -61,27 +61,27 @@ struct cpu_data {
 	 * The first section is likely to be touched by other CPUs -
 	 * it is cache hot.
 	 */
 	lwp_t		*cpu_biglock_wanted;	/* LWP spinning on biglock */
 	void		*cpu_callout;		/* per-CPU callout state */
 	void		*cpu_unused1;		/* unused */
 	u_int		cpu_unused2;		/* unused */
 	struct schedstate_percpu cpu_schedstate; /* scheduler state */
 	kcondvar_t	cpu_xcall;		/* cross-call support */
 	int		cpu_xcall_pending;	/* cross-call support */
 	lwp_t		*cpu_onproc;		/* bottom level LWP */
 	CIRCLEQ_ENTRY(cpu_info) cpu_qchain;	/* circleq of all CPUs */
-	cpuid_t		cpu_node_id;
+	cpuid_t		cpu_package_id;
 	cpuid_t		cpu_core_id;
 	cpuid_t		cpu_smt_id;
 	/*
 	 * This section is mostly CPU-private.
 	 */
 	lwp_t		*cpu_idlelwp;		/* idle lwp */
 	void		*cpu_lockstat;		/* lockstat private tables */
 	u_int		cpu_index;		/* CPU index */
 	u_int		cpu_biglock_count;	/* # recursive holds */
 	u_int		cpu_spin_locks;		/* # of spinlockmgr locks */
 	u_int		cpu_simple_locks;	/* # of simple locks held */
 	u_int		cpu_spin_locks2;	/* # of spin locks held XXX */
 @@ -104,20 +104,20 @@ struct cpu_data {
 };
 /* compat definitions */
 #define	ci_schedstate		ci_data.cpu_schedstate
 #define	ci_index		ci_data.cpu_index
 #define	ci_biglock_count	ci_data.cpu_biglock_count
 #define	ci_biglock_wanted	ci_data.cpu_biglock_wanted
 #define	ci_spin_locks		ci_data.cpu_spin_locks
 #define	ci_simple_locks		ci_data.cpu_simple_locks
 #define	ci_lockstat		ci_data.cpu_lockstat
 #define	ci_spin_locks2		ci_data.cpu_spin_locks2
 #define	ci_lkdebug_recurse	ci_data.cpu_lkdebug_recurse
-#define	ci_node_id		ci_data.cpu_node_id
+#define	ci_package_id		ci_data.cpu_package_id
 #define	ci_core_id		ci_data.cpu_core_id
 #define	ci_smt_id		ci_data.cpu_smt_id
 int mi_cpu_attach(struct cpu_info *ci);
 #endif /* _SYS_CPU_DATA_H_ */