Module Name: src
Committed By: nakayama
Date: Wed Nov 5 13:30:11 UTC 2014
Modified Files:
src/sys/arch/sparc64/sparc64: cache.h cpu.c ipifuncs.c
Log Message:
Remove more #ifdef SUN4V to make compilable w/o options SUN4V.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/sparc64/sparc64/cache.h
cvs rdiff -u -r1.119 -r1.120 src/sys/arch/sparc64/sparc64/cpu.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/sparc64/sparc64/ipifuncs.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/sparc64/cache.h
diff -u src/sys/arch/sparc64/sparc64/cache.h:1.24 src/sys/arch/sparc64/sparc64/cache.h:1.25
--- src/sys/arch/sparc64/sparc64/cache.h:1.24 Tue Nov 4 18:11:42 2014
+++ src/sys/arch/sparc64/sparc64/cache.h Wed Nov 5 13:30:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cache.h,v 1.24 2014/11/04 18:11:42 palle Exp $ */
+/* $NetBSD: cache.h,v 1.25 2014/11/05 13:30:11 nakayama Exp $ */
/*
* Copyright (c) 2011 Matthew R. Green
@@ -82,9 +82,7 @@
*/
#include <machine/psl.h>
-#ifdef SUN4V
#include <machine/hypervisor.h>
-#endif
/* Various cache size/line sizes */
extern int ecache_min_line_size;
@@ -120,7 +118,6 @@ void sp_tlb_flush_pte_usiii(vaddr_t, int
void sp_tlb_flush_all_us(void);
void sp_tlb_flush_all_usiii(void);
-#ifdef SUN4V
static __inline__ void
sp_tlb_flush_pte_sun4v(vaddr_t va, int ctx)
{
@@ -129,7 +126,6 @@ sp_tlb_flush_pte_sun4v(vaddr_t va, int c
if ( hv_rc != H_EOK )
panic("hv_mmu_demap_page(%p,%d) failed - rc = %" PRIx64 "\n", (void*)va, ctx, hv_rc);
}
-#endif
static __inline__ void
sp_tlb_flush_pte(vaddr_t va, int ctx)
Index: src/sys/arch/sparc64/sparc64/cpu.c
diff -u src/sys/arch/sparc64/sparc64/cpu.c:1.119 src/sys/arch/sparc64/sparc64/cpu.c:1.120
--- src/sys/arch/sparc64/sparc64/cpu.c:1.119 Tue Nov 4 18:11:42 2014
+++ src/sys/arch/sparc64/sparc64/cpu.c Wed Nov 5 13:30:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.119 2014/11/04 18:11:42 palle Exp $ */
+/* $NetBSD: cpu.c,v 1.120 2014/11/05 13:30:11 nakayama Exp $ */
/*
* Copyright (c) 1996
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.119 2014/11/04 18:11:42 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.120 2014/11/05 13:30:11 nakayama Exp $");
#include "opt_multiprocessor.h"
@@ -74,14 +74,10 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.11
#include <machine/openfirm.h>
#include <sparc64/sparc64/cache.h>
-#ifdef SUN4V
#include <sparc64/hypervisor.h>
-#endif
-#ifdef SUN4V
#define SUN4V_MONDO_QUEUE_SIZE 32
#define SUN4V_QUEUE_ENTRY_SIZE 64
-#endif
int ecache_min_line_size;
Index: src/sys/arch/sparc64/sparc64/ipifuncs.c
diff -u src/sys/arch/sparc64/sparc64/ipifuncs.c:1.52 src/sys/arch/sparc64/sparc64/ipifuncs.c:1.53
--- src/sys/arch/sparc64/sparc64/ipifuncs.c:1.52 Tue Nov 4 18:11:42 2014
+++ src/sys/arch/sparc64/sparc64/ipifuncs.c Wed Nov 5 13:30:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ipifuncs.c,v 1.52 2014/11/04 18:11:42 palle Exp $ */
+/* $NetBSD: ipifuncs.c,v 1.53 2014/11/05 13:30:11 nakayama Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.52 2014/11/04 18:11:42 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.53 2014/11/05 13:30:11 nakayama Exp $");
#include "opt_ddb.h"
@@ -53,9 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v
#endif
#endif
-#ifdef SUN4V
#define SPARC64_IPI_RETRIES 10000
-#endif
/* CPU sets containing halted, paused and resumed cpus */
static volatile sparc64_cpuset_t cpus_halted;
@@ -69,9 +67,7 @@ static void sparc64_ipi_error(const char
/* Send IPI functions for supported platforms */
static void sparc64_send_ipi_sun4u(int, ipifunc_t, uint64_t, uint64_t);
-#ifdef SUN4V
static void sparc64_send_ipi_sun4v(int, ipifunc_t, uint64_t, uint64_t);
-#endif
/*
* These are the "function" entry points in locore.s/mp_subr.s to handle IPI's.
@@ -80,14 +76,10 @@ void sparc64_ipi_halt(void *, void *);
void sparc64_ipi_pause(void *, void *);
void sparc64_ipi_flush_pte_us(void *, void *);
void sparc64_ipi_flush_pte_usiii(void *, void *);
-#ifdef SUN4V
void sparc64_ipi_flush_pte_sun4v(void *, void *);
-#endif
void sparc64_ipi_dcache_flush_page_us(void *, void *);
void sparc64_ipi_dcache_flush_page_usiii(void *, void *);
-#ifdef SUN4V
void sparc64_ipi_dcache_flush_page_sun4v(void *, void *);
-#endif
void sparc64_ipi_blast_dcache(void *, void *);
void sparc64_ipi_ccall(void *, void *);
@@ -289,7 +281,6 @@ sparc64_send_ipi_sun4u(int upaid, ipifun
" (tried %d times)", cpu_number(), upaid, i);
}
-#ifdef SUN4V
/*
* Send an interprocessor interrupt - sun4v.
*/
@@ -314,7 +305,6 @@ sparc64_send_ipi_sun4v(int cpuid, ipifun
panic("Unable to send mondo %lx to cpu %d: %d",
(long unsigned int)func, cpuid, err);
}
-#endif
/*
* Wait for IPI operation to complete.
