Module Name: src
Committed By: palle
Date: Sat Apr 3 17:01:24 UTC 2021
Modified Files:
src/sys/arch/sparc64/include: cpu.h
src/sys/arch/sparc64/sparc64: cpu.c genassym.cf locore.s
Log Message:
Improve cpu_idle() by allowing a platform specific implementaion (same logic as
the sparc implementation) - currently only used by sun4v
To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/sys/arch/sparc64/include/cpu.h
cvs rdiff -u -r1.138 -r1.139 src/sys/arch/sparc64/sparc64/cpu.c
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/sparc64/sparc64/genassym.cf
cvs rdiff -u -r1.426 -r1.427 src/sys/arch/sparc64/sparc64/locore.s
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/sparc64/include/cpu.h
diff -u src/sys/arch/sparc64/include/cpu.h:1.130 src/sys/arch/sparc64/include/cpu.h:1.131
--- src/sys/arch/sparc64/include/cpu.h:1.130 Tue Mar 10 03:49:56 2020
+++ src/sys/arch/sparc64/include/cpu.h Sat Apr 3 17:01:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.130 2020/03/10 03:49:56 christos Exp $ */
+/* $NetBSD: cpu.h,v 1.131 2021/04/03 17:01:24 palle Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -212,12 +212,14 @@ struct cpu_info {
paddr_t ci_devmq; /* device mondo queue address */
paddr_t ci_cpuset; /* mondo recipient address */
paddr_t ci_mondo; /* mondo message address */
-
+
/* probe fault in PCI config space reads */
bool ci_pci_probe;
bool ci_pci_fault;
volatile void *ci_ddb_regs; /* DDB regs */
+
+ void (*ci_idlespin)(void);
};
#endif /* _KERNEL || _KMEMUSER */
@@ -438,6 +440,9 @@ void switchtoctx_usiii(int);
void next_tick(long);
void next_stick(long);
void next_stick_init(void);
+#ifdef SUN4V
+void cpu_idle_sun4v(void);
+#endif
/* trap.c */
void cpu_vmspace_exec(struct lwp *, vaddr_t, vaddr_t);
int rwindow_save(struct lwp *);
Index: src/sys/arch/sparc64/sparc64/cpu.c
diff -u src/sys/arch/sparc64/sparc64/cpu.c:1.138 src/sys/arch/sparc64/sparc64/cpu.c:1.139
--- src/sys/arch/sparc64/sparc64/cpu.c:1.138 Fri Aug 7 14:20:08 2020
+++ src/sys/arch/sparc64/sparc64/cpu.c Sat Apr 3 17:01:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.138 2020/08/07 14:20:08 fcambus Exp $ */
+/* $NetBSD: cpu.c,v 1.139 2021/04/03 17:01:24 palle Exp $ */
/*
* Copyright (c) 1996
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.138 2020/08/07 14:20:08 fcambus Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.139 2021/04/03 17:01:24 palle Exp $");
#include "opt_multiprocessor.h"
@@ -695,9 +695,22 @@ cpu_attach(device_t parent, device_t dev
ci->ci_cpuset = pa;
pa += 64;
}
-
+
+ /*
+ * cpu_idle setup (currently only necessary for sun4v)
+ */
+ if (CPU_ISSUN4V) {
+ ci->ci_idlespin = cpu_idle_sun4v;
+ }
}
+#ifdef SUN4V
+void cpu_idle_sun4v(void)
+{
+ hv_cpu_yield();
+}
+#endif
+
int
cpu_myid(void)
{
Index: src/sys/arch/sparc64/sparc64/genassym.cf
diff -u src/sys/arch/sparc64/sparc64/genassym.cf:1.84 src/sys/arch/sparc64/sparc64/genassym.cf:1.85
--- src/sys/arch/sparc64/sparc64/genassym.cf:1.84 Mon Feb 17 09:09:49 2020
+++ src/sys/arch/sparc64/sparc64/genassym.cf Sat Apr 3 17:01:24 2021
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.84 2020/02/17 09:09:49 skrll Exp $
+# $NetBSD: genassym.cf,v 1.85 2021/04/03 17:01:24 palle Exp $
#
# Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -183,6 +183,7 @@ define CI_DEVMQ offsetof(struct cpu_info
ifdef MULTIPROCESSOR
define CI_IPIEVC offsetof(struct cpu_info, ci_ipi_evcnt[0].ev_count)
endif
+define CI_IDLESPIN offsetof(struct cpu_info, ci_idlespin)
# CPU boot arguments structure
define CBA_NODE offsetof(struct cpu_bootargs, cb_node)
Index: src/sys/arch/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.426 src/sys/arch/sparc64/sparc64/locore.s:1.427
--- src/sys/arch/sparc64/sparc64/locore.s:1.426 Tue Mar 30 20:03:14 2021
+++ src/sys/arch/sparc64/sparc64/locore.s Sat Apr 3 17:01:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.426 2021/03/30 20:03:14 palle Exp $ */
+/* $NetBSD: locore.s,v 1.427 2021/04/03 17:01:24 palle Exp $ */
/*
* Copyright (c) 2006-2010 Matthew R. Green
@@ -6619,11 +6619,19 @@ ENTRY(getfp)
mov %fp, %o0
/*
- * nothing MD to do in the idle loop
+ * Call optional cpu_idle handler if provided
*/
ENTRY(cpu_idle)
- retl
+ set CPUINFO_VA, %o0
+ LDPTR [%o0 + CI_IDLESPIN], %o1
+ tst %o1
+ bz 1f
+ nop
+ jmp %o1
nop
+1:
+ retl
+ nop
/*
* cpu_switchto() switches to an lwp to run and runs it, saving the
