Module Name: src
Committed By: macallan
Date: Fri Dec 13 23:01:41 UTC 2019
Modified Files:
src/sys/arch/macppc/macppc: cpu.c
Log Message:
call cpu_topology_set() with adjustments for 970MP CPUs
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/macppc/macppc/cpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/macppc/macppc/cpu.c
diff -u src/sys/arch/macppc/macppc/cpu.c:1.67 src/sys/arch/macppc/macppc/cpu.c:1.68
--- src/sys/arch/macppc/macppc/cpu.c:1.67 Thu May 17 19:08:51 2018
+++ src/sys/arch/macppc/macppc/cpu.c Fri Dec 13 23:01:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.67 2018/05/17 19:08:51 macallan Exp $ */
+/* $NetBSD: cpu.c,v 1.68 2019/12/13 23:01:41 macallan Exp $ */
/*-
* Copyright (c) 2001 Tsubai Masanari.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.67 2018/05/17 19:08:51 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.68 2019/12/13 23:01:41 macallan Exp $");
#include "opt_ppcparam.h"
#include "opt_multiprocessor.h"
@@ -45,6 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.67
#include <sys/device.h>
#include <sys/types.h>
#include <sys/lwp.h>
+#include <sys/cpu.h>
#include <dev/ofw/openfirm.h>
#include <powerpc/oea/hid.h>
@@ -159,12 +160,23 @@ cpuattach(device_t parent, device_t self
{
struct cpu_info *ci;
struct confargs *ca = aux;
- int id = ca->ca_reg[0];
+ int id = ca->ca_reg[0], vers, package, core;
ci = cpu_attach_common(self, id);
if (ci == NULL)
return;
+ package = id;
+ core = 0;
+
+ vers = (mfpvr() >> 16) & 0xffff;
+
+ if (vers == IBM970MP) {
+ core = package & 1;
+ package >>= 1;
+ }
+ cpu_topology_set(ci, package, core, 0);
+
if (ci->ci_khz == 0) {
cpu_OFgetspeed(self, ci);
}
