Module Name: src
Committed By: palle
Date: Tue Nov 4 18:11:42 UTC 2014
Modified Files:
src/sys/arch/sparc64/dev: ebus_mainbus.c
src/sys/arch/sparc64/sparc64: cache.h cpu.c ipifuncs.c pmap.c
Log Message:
sun4v: Removed a bunch of ifdef SUN4V since the CPU_ISSUN4V already has the
necessary logic. Noticed by mrg@
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sparc64/dev/ebus_mainbus.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sparc64/sparc64/cache.h
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/sparc64/sparc64/cpu.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/sparc64/sparc64/ipifuncs.c
cvs rdiff -u -r1.291 -r1.292 src/sys/arch/sparc64/sparc64/pmap.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/sparc64/dev/ebus_mainbus.c
diff -u src/sys/arch/sparc64/dev/ebus_mainbus.c:1.14 src/sys/arch/sparc64/dev/ebus_mainbus.c:1.15
--- src/sys/arch/sparc64/dev/ebus_mainbus.c:1.14 Wed Aug 27 19:02:17 2014
+++ src/sys/arch/sparc64/dev/ebus_mainbus.c Tue Nov 4 18:11:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ebus_mainbus.c,v 1.14 2014/08/27 19:02:17 palle Exp $ */
+/* $NetBSD: ebus_mainbus.c,v 1.15 2014/11/04 18:11:42 palle Exp $ */
/* $OpenBSD: ebus_mainbus.c,v 1.7 2010/11/11 17:58:23 miod Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ebus_mainbus.c,v 1.14 2014/08/27 19:02:17 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ebus_mainbus.c,v 1.15 2014/11/04 18:11:42 palle Exp $");
#ifdef DEBUG
#define EDB_PROM 0x01
@@ -277,7 +277,6 @@ ebus_mainbus_intr_establish(bus_space_ta
u_int64_t *imap, *iclr;
int ino;
-#ifdef SUN4V
#if 0
XXX
if (CPU_ISSUN4V) {
@@ -329,7 +328,6 @@ XXX
return (ih);
}
#endif
-#endif
ino = INTINO(ihandle);
Index: src/sys/arch/sparc64/sparc64/cache.h
diff -u src/sys/arch/sparc64/sparc64/cache.h:1.23 src/sys/arch/sparc64/sparc64/cache.h:1.24
--- src/sys/arch/sparc64/sparc64/cache.h:1.23 Sun Jun 8 17:33:24 2014
+++ src/sys/arch/sparc64/sparc64/cache.h Tue Nov 4 18:11:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cache.h,v 1.23 2014/06/08 17:33:24 palle Exp $ */
+/* $NetBSD: cache.h,v 1.24 2014/11/04 18:11:42 palle Exp $ */
/*
* Copyright (c) 2011 Matthew R. Green
@@ -140,10 +140,8 @@ sp_tlb_flush_pte(vaddr_t va, int ctx)
else
sp_tlb_flush_pte_us(va, ctx);
}
-#ifdef SUN4V
- else
+ else if (CPU_ISSUN4V)
sp_tlb_flush_pte_sun4v(va, ctx);
-#endif
}
static __inline__ void
Index: src/sys/arch/sparc64/sparc64/cpu.c
diff -u src/sys/arch/sparc64/sparc64/cpu.c:1.118 src/sys/arch/sparc64/sparc64/cpu.c:1.119
--- src/sys/arch/sparc64/sparc64/cpu.c:1.118 Wed Sep 24 18:32:10 2014
+++ src/sys/arch/sparc64/sparc64/cpu.c Tue Nov 4 18:11:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.118 2014/09/24 18:32:10 palle Exp $ */
+/* $NetBSD: cpu.c,v 1.119 2014/11/04 18:11:42 palle Exp $ */
/*
* Copyright (c) 1996
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.118 2014/09/24 18:32:10 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.119 2014/11/04 18:11:42 palle Exp $");
#include "opt_multiprocessor.h"
@@ -140,7 +140,6 @@ cpuid_from_node(u_int cpu_node)
id = prom_getpropint(cpu_node, "portid", -1);
if (id == -1)
id = prom_getpropint(cpu_node, "cpuid", -1);
-#ifdef SUN4V
if (CPU_ISSUN4V) {
int reg[4];
int* regp=reg;
@@ -152,7 +151,6 @@ cpuid_from_node(u_int cpu_node)
/* cpuid in the lower 24 bits - sun4v hypervisor arch */
id = reg[0] & 0x0fffffff;
}
-#endif
if (id == -1)
panic("failed to determine cpuid");
@@ -210,10 +208,8 @@ alloc_cpuinfo(u_int cpu_node)
cpi->ci_spinup = NULL;
cpi->ci_paddr = pa0;
cpi->ci_self = cpi;
-#ifdef SUN4V
if (CPU_ISSUN4V)
cpi->ci_mmfsa = pa0;
-#endif
cpi->ci_node = cpu_node;
cpi->ci_idepth = -1;
memset(cpi->ci_intrpending, -1, sizeof(cpi->ci_intrpending));
@@ -461,7 +457,6 @@ cpu_attach(device_t parent, device_t dev
* CPU specific ipi setup
* Currently only necessary for SUN4V
*/
-#ifdef SUN4V
if (CPU_ISSUN4V) {
paddr_t pa = ci->ci_paddr;
int err;
@@ -487,7 +482,6 @@ cpu_attach(device_t parent, device_t dev
ci->ci_cpuset = pa;
pa += 64;
}
-#endif
}
@@ -497,13 +491,11 @@ cpu_myid(void)
char buf[32];
int impl;
-#ifdef SUN4V
if (CPU_ISSUN4V) {
uint64_t myid;
hv_cpu_myid(&myid);
return myid;
}
-#endif
if (OF_getprop(findroot(), "name", buf, sizeof(buf)) > 0 &&
strcmp(buf, "SUNW,Ultra-Enterprise-10000") == 0)
return lduwa(0x1fff40000d0UL, ASI_PHYS_NON_CACHED);
Index: src/sys/arch/sparc64/sparc64/ipifuncs.c
diff -u src/sys/arch/sparc64/sparc64/ipifuncs.c:1.51 src/sys/arch/sparc64/sparc64/ipifuncs.c:1.52
--- src/sys/arch/sparc64/sparc64/ipifuncs.c:1.51 Sun Nov 2 19:40:06 2014
+++ src/sys/arch/sparc64/sparc64/ipifuncs.c Tue Nov 4 18:11:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ipifuncs.c,v 1.51 2014/11/02 19:40:06 palle Exp $ */
+/* $NetBSD: ipifuncs.c,v 1.52 2014/11/04 18:11:42 palle Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.51 2014/11/02 19:40:06 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.52 2014/11/04 18:11:42 palle Exp $");
#include "opt_ddb.h"
@@ -219,11 +219,9 @@ sparc64_broadcast_ipi(ipifunc_t func, ui
void
sparc64_send_ipi(int upaid, ipifunc_t func, uint64_t arg1, uint64_t arg2)
{
-#ifdef SUN4V
if (CPU_ISSUN4V)
sparc64_send_ipi_sun4v(upaid, func, arg1, arg2);
else
-#endif
sparc64_send_ipi_sun4u(upaid, func, arg1, arg2);
}
@@ -451,13 +449,9 @@ smp_tlb_flush_pte(vaddr_t va, struct pma
int ctx;
bool kpm = (pm == pmap_kernel());
ipifunc_t func;
-#ifdef SUN4V
if (CPU_ISSUN4V)
func = sparc64_ipi_flush_pte_sun4v;
else if (CPU_IS_USIII_UP())
-#else
- if (CPU_IS_USIII_UP())
-#endif
func = sparc64_ipi_flush_pte_usiii;
else
func = sparc64_ipi_flush_pte_us;
@@ -494,13 +488,9 @@ smp_dcache_flush_page_cpuset(paddr_t pa,
{
ipifunc_t func;
-#ifdef SUN4V
if (CPU_ISSUN4V)
func = sparc64_ipi_dcache_flush_page_sun4v;
else if (CPU_IS_USIII_UP())
-#else
- if (CPU_IS_USIII_UP())
-#endif
func = sparc64_ipi_dcache_flush_page_usiii;
else
func = sparc64_ipi_dcache_flush_page_us;
Index: src/sys/arch/sparc64/sparc64/pmap.c
diff -u src/sys/arch/sparc64/sparc64/pmap.c:1.291 src/sys/arch/sparc64/sparc64/pmap.c:1.292
--- src/sys/arch/sparc64/sparc64/pmap.c:1.291 Thu Oct 30 13:57:14 2014
+++ src/sys/arch/sparc64/sparc64/pmap.c Tue Nov 4 18:11:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.291 2014/10/30 13:57:14 palle Exp $ */
+/* $NetBSD: pmap.c,v 1.292 2014/11/04 18:11:42 palle Exp $ */
/*
*
* Copyright (C) 1996-1999 Eduardo Horvath.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.291 2014/10/30 13:57:14 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.292 2014/11/04 18:11:42 palle Exp $");
#undef NO_VCACHE /* Don't forget the locked TLB in dostart */
#define HWREF
@@ -1155,12 +1155,10 @@ pmap_bootstrap(u_long kernelstart, u_lon
cpus->ci_eintstack = NULL;
cpus->ci_spinup = main; /* Call main when we're running. */
cpus->ci_paddr = cpu0paddr;
-#ifdef SUN4V
if (CPU_ISSUN4V) {
cpus->ci_mmfsa = cpu0paddr;
cpus->ci_tsb_desc = NULL;
}
-#endif
cpus->ci_cpcb = (struct pcb *)u0va;
cpus->ci_idepth = -1;
memset(cpus->ci_intrpending, -1, sizeof(cpus->ci_intrpending));
@@ -1244,7 +1242,6 @@ cpu_pmap_prepare(struct cpu_info *ci, bo
ci->ci_ctxbusy = curcpu()->ci_ctxbusy;
}
-#ifdef SUN4V
if (CPU_ISSUN4V) {
ci->ci_tsb_desc = (struct tsb_desc *)kdata_alloc(
sizeof(struct tsb_desc), 16);
@@ -1261,7 +1258,6 @@ cpu_pmap_prepare(struct cpu_info *ci, bo
ci->ci_index, ci->ci_tsb_desc, sizeof(struct tsb_desc),
ci->ci_tsb_desc->td_pa));
}
-#endif
BDPRINTF(PDB_BOOT1, ("cpu %d: TSB allocated at %p/%p size %08x\n",
ci->ci_index, ci->ci_tsb_dmmu, ci->ci_tsb_immu, TSBSIZE));
