diff options
| -rw-r--r-- | lib/libc/powerpc/gen/syncicache.c | 32 | ||||
| -rw-r--r-- | sys/powerpc/aim/machdep.c | 8 | ||||
| -rw-r--r-- | sys/powerpc/booke/machdep.c | 5 | ||||
| -rw-r--r-- | sys/powerpc/include/md_var.h | 5 | ||||
| -rw-r--r-- | sys/powerpc/powerpc/syncicache.c | 48 |
5 files changed, 36 insertions, 62 deletions
diff --git a/lib/libc/powerpc/gen/syncicache.c b/lib/libc/powerpc/gen/syncicache.c index 02ab938..21a477e 100644 --- a/lib/libc/powerpc/gen/syncicache.c +++ b/lib/libc/powerpc/gen/syncicache.c @@ -1,4 +1,4 @@ -/* +/*- * Copyright (C) 1995-1997, 1999 Wolfgang Solfrank. * Copyright (C) 1995-1997, 1999 TooLs GmbH. * All rights reserved. @@ -47,28 +47,25 @@ static const char rcsid[] = #include <machine/cpu.h> #include <machine/md_var.h> -#if defined(_KERNEL) || defined(_STANDALONE) -#ifndef CACHELINESIZE -#error "Must know the size of a cache line" +#ifndef _KERNEL +int cacheline_size = 32; #endif -#else + +#if !defined(_KERNEL) && !defined(_STANDALONE) #include <stdlib.h> static void getcachelinesize(void); -static int _cachelinesize; -#define CACHELINESIZE _cachelinesize - static void getcachelinesize() { static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; int clen; - clen = sizeof(_cachelinesize); + clen = sizeof(cacheline_size); if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), - &_cachelinesize, &clen, NULL, 0) < 0 || !_cachelinesize) { + &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) { abort(); } } @@ -81,21 +78,24 @@ __syncicache(void *from, int len) char *p; #if !defined(_KERNEL) && !defined(_STANDALONE) - if (!_cachelinesize) + if (!cacheline_size) getcachelinesize(); #endif - off = (u_int)from & (CACHELINESIZE - 1); + + off = (u_int)from & (cacheline_size - 1); l = len += off; p = (char *)from - off; + do { __asm __volatile ("dcbst 0,%0" :: "r"(p)); - p += CACHELINESIZE; - } while ((l -= CACHELINESIZE) > 0); + p += cacheline_size; + } while ((l -= cacheline_size) > 0); __asm __volatile ("sync"); p = (char *)from - off; do { __asm __volatile ("icbi 0,%0" :: "r"(p)); - p += CACHELINESIZE; - } while ((len -= CACHELINESIZE) > 0); + p += cacheline_size; + } while ((len -= cacheline_size) > 0); __asm __volatile ("sync; isync"); } + diff --git a/sys/powerpc/aim/machdep.c b/sys/powerpc/aim/machdep.c index 7f8d8df..13fc2a7 100644 --- a/sys/powerpc/aim/machdep.c +++ b/sys/powerpc/aim/machdep.c @@ -128,6 +128,7 @@ extern vm_offset_t ksym_start, ksym_end; #endif int cold = 1; +int cacheline_size = 32; struct pcpu __pcpu[MAXCPU]; @@ -136,13 +137,12 @@ static struct trapframe frame0; char machine[] = "powerpc"; SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, ""); -static int cacheline_size = CACHELINESIZE; -SYSCTL_INT(_machdep, CPU_CACHELINE, cacheline_size, - CTLFLAG_RD, &cacheline_size, 0, ""); - static void cpu_startup(void *); SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL); +SYSCTL_INT(_machdep, CPU_CACHELINE, cacheline_size, + CTLFLAG_RD, &cacheline_size, 0, ""); + u_int powerpc_init(u_int, u_int, u_int, void *); int save_ofw_mapping(void); diff --git a/sys/powerpc/booke/machdep.c b/sys/powerpc/booke/machdep.c index 4e9141e..218127d 100644 --- a/sys/powerpc/booke/machdep.c +++ b/sys/powerpc/booke/machdep.c @@ -171,9 +171,10 @@ struct bootinfo *bootinfo; char machine[] = "powerpc"; SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, ""); -static int cacheline_size = CACHELINESIZE; +int cacheline_size = 32; + SYSCTL_INT(_machdep, CPU_CACHELINE, cacheline_size, - CTLFLAG_RD, &cacheline_size, 0, ""); + CTLFLAG_RD, &cacheline_size, 0, ""); static void cpu_e500_startup(void *); SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_e500_startup, NULL); diff --git a/sys/powerpc/include/md_var.h b/sys/powerpc/include/md_var.h index f0f254a..c554f5f 100644 --- a/sys/powerpc/include/md_var.h +++ b/sys/powerpc/include/md_var.h @@ -45,10 +45,7 @@ extern vm_offset_t kstack0_phys; extern u_long ns_per_tick; extern int powerpc_pow_enabled; - -#if defined(_KERNEL) || defined(_STANDALONE) -#define CACHELINESIZE 32 -#endif +extern int cacheline_size; void __syncicache(void *, int); diff --git a/sys/powerpc/powerpc/syncicache.c b/sys/powerpc/powerpc/syncicache.c index 3d4f732..6fb4306 100644 --- a/sys/powerpc/powerpc/syncicache.c +++ b/sys/powerpc/powerpc/syncicache.c @@ -31,8 +31,10 @@ * $NetBSD: syncicache.c,v 1.2 1999/05/05 12:36:40 tsubai Exp $ */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); +#ifndef lint +static const char rcsid[] = + "$FreeBSD$"; +#endif /* not lint */ #include <sys/param.h> #if defined(_KERNEL) || defined(_STANDALONE) @@ -42,55 +44,29 @@ __FBSDID("$FreeBSD$"); #endif #include <sys/sysctl.h> +#include <machine/cpu.h> #include <machine/md_var.h> -#if defined(_KERNEL) || defined(_STANDALONE) -#ifndef CACHELINESIZE -#error "Must know the size of a cache line" -#endif -#else -static void getcachelinesize(void); - -static int _cachelinesize; -#define CACHELINESIZE _cachelinesize - -static void -getcachelinesize() -{ - static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; - int clen; - - clen = sizeof(_cachelinesize); - - if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), - &_cachelinesize, &clen, NULL, 0) < 0 || !_cachelinesize) { - abort(); - } -} -#endif - void __syncicache(void *from, int len) { int l, off; char *p; -#if !defined(_KERNEL) && !defined(_STANDALONE) - if (!_cachelinesize) - getcachelinesize(); -#endif - off = (u_int)from & (CACHELINESIZE - 1); + off = (u_int)from & (cacheline_size - 1); l = len += off; p = (char *)from - off; + do { __asm __volatile ("dcbst 0,%0" :: "r"(p)); - p += CACHELINESIZE; - } while ((l -= CACHELINESIZE) > 0); + p += cacheline_size; + } while ((l -= cacheline_size) > 0); __asm __volatile ("sync"); p = (char *)from - off; do { __asm __volatile ("icbi 0,%0" :: "r"(p)); - p += CACHELINESIZE; - } while ((len -= CACHELINESIZE) > 0); + p += cacheline_size; + } while ((len -= cacheline_size) > 0); __asm __volatile ("sync; isync"); } + |
