From 28311595e6b0b88f0062c31e9ea83bdc9cb7b36a Mon Sep 17 00:00:00 2001 From: ian Date: Tue, 13 May 2014 16:50:10 +0000 Subject: [PATCH] MFC r256792, r256793, r256799 (by nwhitehorn): Unify AIM and booke code. git-svn-id: svn://svn.freebsd.org/base/stable/10@265952 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/conf/files.powerpc | 9 +- sys/powerpc/aim/machdep.c | 8 - sys/powerpc/aim/vm_machdep.c | 413 -------------------- sys/powerpc/booke/clock.c | 280 ------------- sys/powerpc/mpc85xx/nexus.c | 201 ---------- sys/powerpc/{aim => powerpc}/clock.c | 53 ++- sys/powerpc/{aim => powerpc}/nexus.c | 0 sys/powerpc/{booke => powerpc}/vm_machdep.c | 116 +++--- 8 files changed, 107 insertions(+), 973 deletions(-) delete mode 100644 sys/powerpc/aim/vm_machdep.c delete mode 100644 sys/powerpc/booke/clock.c delete mode 100644 sys/powerpc/mpc85xx/nexus.c rename sys/powerpc/{aim => powerpc}/clock.c (91%) rename sys/powerpc/{aim => powerpc}/nexus.c (100%) rename sys/powerpc/{booke => powerpc}/vm_machdep.c (79%) diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index e97af304e..f97bde6a4 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -88,7 +88,6 @@ libkern/qdivrem.c optional powerpc libkern/ucmpdi2.c optional powerpc libkern/udivdi3.c optional powerpc libkern/umoddi3.c optional powerpc -powerpc/aim/clock.c optional aim powerpc/aim/copyinout.c optional aim powerpc/aim/interrupt.c optional aim powerpc/aim/locore.S optional aim no-obj @@ -98,14 +97,11 @@ powerpc/aim/mmu_oea64.c optional aim powerpc/aim/moea64_if.m optional aim powerpc/aim/moea64_native.c optional aim powerpc/aim/mp_cpudep.c optional aim -powerpc/aim/nexus.c optional aim powerpc/aim/slb.c optional aim powerpc64 powerpc/aim/swtch32.S optional aim powerpc powerpc/aim/swtch64.S optional aim powerpc64 powerpc/aim/trap.c optional aim powerpc/aim/uma_machdep.c optional aim -powerpc/aim/vm_machdep.c optional aim -powerpc/booke/clock.c optional booke powerpc/booke/copyinout.c optional booke powerpc/booke/interrupt.c optional booke powerpc/booke/locore.S optional booke no-obj @@ -116,7 +112,6 @@ powerpc/booke/platform_bare.c optional mpc85xx powerpc/booke/pmap.c optional booke powerpc/booke/swtch.S optional booke powerpc/booke/trap.c optional booke -powerpc/booke/vm_machdep.c optional booke powerpc/cpufreq/dfs.c optional cpufreq powerpc/cpufreq/pcr.c optional cpufreq aim powerpc/cpufreq/pmufreq.c optional cpufreq aim pmu @@ -141,7 +136,6 @@ powerpc/mpc85xx/i2c.c optional iicbus fdt powerpc/mpc85xx/isa.c optional mpc85xx isa powerpc/mpc85xx/lbc.c optional mpc85xx powerpc/mpc85xx/mpc85xx.c optional mpc85xx -powerpc/mpc85xx/nexus.c optional mpc85xx powerpc/mpc85xx/pci_fdt.c optional pci mpc85xx powerpc/ofw/ofw_cpu.c optional aim powerpc/ofw/ofw_machdep.c standard @@ -184,6 +178,7 @@ powerpc/powerpc/autoconf.c standard powerpc/powerpc/bcopy.c standard powerpc/powerpc/bus_machdep.c standard powerpc/powerpc/busdma_machdep.c standard +powerpc/powerpc/clock.c standard powerpc/powerpc/copystr.c standard powerpc/powerpc/cpu.c standard powerpc/powerpc/db_disasm.c optional ddb @@ -203,6 +198,7 @@ powerpc/powerpc/iommu_if.m standard powerpc/powerpc/mem.c optional mem powerpc/powerpc/mmu_if.m standard powerpc/powerpc/mp_machdep.c optional smp +powerpc/powerpc/nexus.c standard powerpc/powerpc/openpic.c standard powerpc/powerpc/openpic_fdt.c optional fdt powerpc/powerpc/pic_if.m standard @@ -218,6 +214,7 @@ powerpc/powerpc/suswintr.c standard powerpc/powerpc/syncicache.c standard powerpc/powerpc/sys_machdep.c standard powerpc/powerpc/uio_machdep.c standard +powerpc/powerpc/vm_machdep.c standard powerpc/ps3/ehci_ps3.c optional ps3 ehci powerpc/ps3/ohci_ps3.c optional ps3 ohci powerpc/ps3/if_glc.c optional ps3 glc diff --git a/sys/powerpc/aim/machdep.c b/sys/powerpc/aim/machdep.c index 1a9ecbef2..6cf3b2410 100644 --- a/sys/powerpc/aim/machdep.c +++ b/sys/powerpc/aim/machdep.c @@ -647,14 +647,6 @@ cpu_flush_dcache(void *ptr, size_t len) /* TBD */ } -void -cpu_initclocks(void) -{ - - decr_tc_init(); - cpu_initclocks_bsp(); -} - /* * Shutdown the CPU as much as possible. */ diff --git a/sys/powerpc/aim/vm_machdep.c b/sys/powerpc/aim/vm_machdep.c deleted file mode 100644 index 21cc8f34c..000000000 --- a/sys/powerpc/aim/vm_machdep.c +++ /dev/null @@ -1,413 +0,0 @@ -/*- - * Copyright (c) 1982, 1986 The Regents of the University of California. - * Copyright (c) 1989, 1990 William Jolitz - * Copyright (c) 1994 John Dyson - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * the Systems Programming Group of the University of Utah Computer - * Science Department, and William Jolitz. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 - * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD$ - */ -/*- - * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. - * All rights reserved. - * - * Author: Chris G. Demetriou - * - * Permission to use, copy, modify and distribute this software and - * its documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND - * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * Carnegie Mellon requests users of this software to return to - * - * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - * School of Computer Science - * Carnegie Mellon University - * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie the - * rights to redistribute these changes. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include -#include -#include - -/* - * On systems without a direct mapped region (e.g. PPC64), - * we use the same code as the Book E implementation. Since - * we need to have runtime detection of this, define some machinery - * for sf_bufs in this case, and ignore it on systems with direct maps. - */ - -#ifndef NSFBUFS -#define NSFBUFS (512 + maxusers * 16) -#endif - -static int nsfbufs; -static int nsfbufspeak; -static int nsfbufsused; - -SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufs, CTLFLAG_RDTUN, &nsfbufs, 0, - "Maximum number of sendfile(2) sf_bufs available"); -SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufspeak, CTLFLAG_RD, &nsfbufspeak, 0, - "Number of sendfile(2) sf_bufs at peak usage"); -SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufsused, CTLFLAG_RD, &nsfbufsused, 0, - "Number of sendfile(2) sf_bufs in use"); - -static void sf_buf_init(void *arg); -SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL); - -LIST_HEAD(sf_head, sf_buf); - -/* A hash table of active sendfile(2) buffers */ -static struct sf_head *sf_buf_active; -static u_long sf_buf_hashmask; - -#define SF_BUF_HASH(m) (((m) - vm_page_array) & sf_buf_hashmask) - -static TAILQ_HEAD(, sf_buf) sf_buf_freelist; -static u_int sf_buf_alloc_want; - -/* - * A lock used to synchronize access to the hash table and free list - */ -static struct mtx sf_buf_lock; - -#ifdef __powerpc64__ -extern uintptr_t tocbase; -#endif - - -/* - * Finish a fork operation, with process p2 nearly set up. - * Copy and update the pcb, set up the stack so that the child - * ready to run and return to user mode. - */ -void -cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags) -{ - struct trapframe *tf; - struct callframe *cf; - struct pcb *pcb; - - KASSERT(td1 == curthread || td1 == &thread0, - ("cpu_fork: p1 not curproc and not proc0")); - CTR3(KTR_PROC, "cpu_fork: called td1=%p p2=%p flags=%x", - td1, p2, flags); - - if ((flags & RFPROC) == 0) - return; - - pcb = (struct pcb *)((td2->td_kstack + - td2->td_kstack_pages * PAGE_SIZE - sizeof(struct pcb)) & ~0x2fUL); - td2->td_pcb = pcb; - - /* Copy the pcb */ - bcopy(td1->td_pcb, pcb, sizeof(struct pcb)); - - /* - * Create a fresh stack for the new process. - * Copy the trap frame for the return to user mode as if from a - * syscall. This copies most of the user mode register values. - */ - tf = (struct trapframe *)pcb - 1; - bcopy(td1->td_frame, tf, sizeof(*tf)); - - /* Set up trap frame. */ - tf->fixreg[FIRSTARG] = 0; - tf->fixreg[FIRSTARG + 1] = 0; - tf->cr &= ~0x10000000; - - td2->td_frame = tf; - - cf = (struct callframe *)tf - 1; - memset(cf, 0, sizeof(struct callframe)); - #ifdef __powerpc64__ - cf->cf_toc = tocbase; - #endif - cf->cf_func = (register_t)fork_return; - cf->cf_arg0 = (register_t)td2; - cf->cf_arg1 = (register_t)tf; - - pcb->pcb_sp = (register_t)cf; - KASSERT(pcb->pcb_sp % 16 == 0, ("stack misaligned")); - #ifdef __powerpc64__ - pcb->pcb_lr = ((register_t *)fork_trampoline)[0]; - pcb->pcb_toc = ((register_t *)fork_trampoline)[1]; - #else - pcb->pcb_lr = (register_t)fork_trampoline; - #endif - pcb->pcb_cpu.aim.usr_vsid = 0; - - /* Setup to release spin count in fork_exit(). */ - td2->td_md.md_spinlock_count = 1; - td2->td_md.md_saved_msr = PSL_KERNSET; - - /* - * Now cpu_switch() can schedule the new process. - */ -} - -/* - * Intercept the return address from a freshly forked process that has NOT - * been scheduled yet. - * - * This is needed to make kernel threads stay in kernel mode. - */ -void -cpu_set_fork_handler(td, func, arg) - struct thread *td; - void (*func)(void *); - void *arg; -{ - struct callframe *cf; - - CTR4(KTR_PROC, "%s called with td=%p func=%p arg=%p", - __func__, td, func, arg); - - cf = (struct callframe *)td->td_pcb->pcb_sp; - - cf->cf_func = (register_t)func; - cf->cf_arg0 = (register_t)arg; -} - -void -cpu_exit(td) - register struct thread *td; -{ -} - -/* - * Allocate a pool of sf_bufs (sendfile(2) or "super-fast" if you prefer. :-)) - */ -static void -sf_buf_init(void *arg) -{ - struct sf_buf *sf_bufs; - vm_offset_t sf_base; - int i; - - /* Don't bother on systems with a direct map */ - - if (hw_direct_map) - return; - - nsfbufs = NSFBUFS; - TUNABLE_INT_FETCH("kern.ipc.nsfbufs", &nsfbufs); - - sf_buf_active = hashinit(nsfbufs, M_TEMP, &sf_buf_hashmask); - TAILQ_INIT(&sf_buf_freelist); - sf_base = kva_alloc(nsfbufs * PAGE_SIZE); - sf_bufs = malloc(nsfbufs * sizeof(struct sf_buf), M_TEMP, M_NOWAIT | M_ZERO); - - for (i = 0; i < nsfbufs; i++) { - sf_bufs[i].kva = sf_base + i * PAGE_SIZE; - TAILQ_INSERT_TAIL(&sf_buf_freelist, &sf_bufs[i], free_entry); - } - sf_buf_alloc_want = 0; - mtx_init(&sf_buf_lock, "sf_buf", NULL, MTX_DEF); -} - -/* - * Get an sf_buf from the freelist. Will block if none are available. - */ -struct sf_buf * -sf_buf_alloc(struct vm_page *m, int flags) -{ - struct sf_head *hash_list; - struct sf_buf *sf; - int error; - - if (hw_direct_map) { - /* Shortcut the direct mapped case */ - - return ((struct sf_buf *)m); - } - - hash_list = &sf_buf_active[SF_BUF_HASH(m)]; - mtx_lock(&sf_buf_lock); - LIST_FOREACH(sf, hash_list, list_entry) { - if (sf->m == m) { - sf->ref_count++; - if (sf->ref_count == 1) { - TAILQ_REMOVE(&sf_buf_freelist, sf, free_entry); - nsfbufsused++; - nsfbufspeak = imax(nsfbufspeak, nsfbufsused); - } - goto done; - } - } - - while ((sf = TAILQ_FIRST(&sf_buf_freelist)) == NULL) { - if (flags & SFB_NOWAIT) - goto done; - - sf_buf_alloc_want++; - SFSTAT_INC(sf_allocwait); - error = msleep(&sf_buf_freelist, &sf_buf_lock, - (flags & SFB_CATCH) ? PCATCH | PVM : PVM, "sfbufa", 0); - sf_buf_alloc_want--; - - /* - * If we got a signal, don't risk going back to sleep. - */ - if (error) - goto done; - } - - TAILQ_REMOVE(&sf_buf_freelist, sf, free_entry); - if (sf->m != NULL) - LIST_REMOVE(sf, list_entry); - - LIST_INSERT_HEAD(hash_list, sf, list_entry); - sf->ref_count = 1; - sf->m = m; - nsfbufsused++; - nsfbufspeak = imax(nsfbufspeak, nsfbufsused); - pmap_qenter(sf->kva, &sf->m, 1); -done: - mtx_unlock(&sf_buf_lock); - return (sf); -} - -/* - * Detatch mapped page and release resources back to the system. - * - * Remove a reference from the given sf_buf, adding it to the free - * list when its reference count reaches zero. A freed sf_buf still, - * however, retains its virtual-to-physical mapping until it is - * recycled or reactivated by sf_buf_alloc(9). - */ -void -sf_buf_free(struct sf_buf *sf) -{ - if (hw_direct_map) - return; - - mtx_lock(&sf_buf_lock); - sf->ref_count--; - if (sf->ref_count == 0) { - TAILQ_INSERT_TAIL(&sf_buf_freelist, sf, free_entry); - nsfbufsused--; - - if (sf_buf_alloc_want > 0) - wakeup(&sf_buf_freelist); - } - mtx_unlock(&sf_buf_lock); -} - -/* - * Software interrupt handler for queued VM system processing. - */ -void -swi_vm(void *dummy) -{ - - if (busdma_swi_pending != 0) - busdma_swi(); -} - -/* - * Tell whether this address is in some physical memory region. - * Currently used by the kernel coredump code in order to avoid - * dumping the ``ISA memory hole'' which could cause indefinite hangs, - * or other unpredictable behaviour. - */ - - -int -is_physical_memory(addr) - vm_offset_t addr; -{ - /* - * stuff other tests for known memory-mapped devices (PCI?) - * here - */ - - return 1; -} - -/* - * CPU threading functions related to the VM layer. These could be used - * to map the SLB bits required for the kernel stack instead of forcing a - * fixed-size KVA. - */ - -void -cpu_thread_swapin(struct thread *td) -{ -} - -void -cpu_thread_swapout(struct thread *td) -{ -} - diff --git a/sys/powerpc/booke/clock.c b/sys/powerpc/booke/clock.c deleted file mode 100644 index 5827e73c2..000000000 --- a/sys/powerpc/booke/clock.c +++ /dev/null @@ -1,280 +0,0 @@ -/*- - * Copyright (C) 1995, 1996 Wolfgang Solfrank. - * Copyright (C) 1995, 1996 TooLs GmbH. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by TooLs GmbH. - * 4. The name of TooLs GmbH may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $NetBSD: clock.c,v 1.9 2000/01/19 02:52:19 msaitoh Exp $ - */ -/* - * Copyright (C) 2001 Benno Rice. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY Benno Rice ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -__FBSDID("$FreeBSD$"); - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -/* - * Initially we assume a processor with a bus frequency of 12.5 MHz. - */ -static int initialized = 0; -static u_long ns_per_tick = 80; -static u_long ticks_per_sec = 12500000; -static u_long *decr_counts[MAXCPU]; - -#define DIFF19041970 2082844800 - -static int decr_et_start(struct eventtimer *et, - sbintime_t first, sbintime_t period); -static int decr_et_stop(struct eventtimer *et); -static timecounter_get_t decr_get_timecount; - -struct decr_state { - int mode; /* 0 - off, 1 - periodic, 2 - one-shot. */ - int32_t div; /* Periodic divisor. */ -}; -static DPCPU_DEFINE(struct decr_state, decr_state); - -static struct eventtimer decr_et; -static struct timecounter decr_timecounter = { - decr_get_timecount, /* get_timecount */ - 0, /* no poll_pps */ - ~0u, /* counter_mask */ - 0, /* frequency */ - "timebase" /* name */ -}; - -/* - * Decrementer interrupt handler. - */ -void -decr_intr(struct trapframe *frame) -{ - struct decr_state *s = DPCPU_PTR(decr_state); - - if (!initialized) - return; - - (*decr_counts[curcpu])++; - - /* - * Interrupt handler must reset DIS to avoid getting another - * interrupt once EE is enabled. - */ - mtspr(SPR_TSR, TSR_DIS); - - CTR1(KTR_INTR, "%s: DEC interrupt", __func__); - - if (s->mode == 2) - decr_et_stop(NULL); - - if (decr_et.et_active) - decr_et.et_event_cb(&decr_et, decr_et.et_arg); -} - -void -cpu_initclocks(void) -{ - - decr_tc_init(); - cpu_initclocks_bsp(); -} - -/* - * BSP early initialization. - */ -void -decr_init(void) -{ - struct cpuref cpu; - char buf[32]; - - if (platform_smp_get_bsp(&cpu) != 0) - platform_smp_first_cpu(&cpu); - ticks_per_sec = platform_timebase_freq(&cpu); - ns_per_tick = 1000000000 / ticks_per_sec; - - set_cputicker(mftb, ticks_per_sec, 0); - snprintf(buf, sizeof(buf), "cpu%d:decrementer", curcpu); - intrcnt_add(buf, &decr_counts[curcpu]); - decr_et_stop(NULL); - initialized = 1; -} - -#ifdef SMP -/* - * AP early initialization. - */ -void -decr_ap_init(void) -{ - char buf[32]; - - snprintf(buf, sizeof(buf), "cpu%d:decrementer", curcpu); - intrcnt_add(buf, &decr_counts[curcpu]); - decr_et_stop(NULL); -} -#endif - -/* - * Final initialization. - */ -void -decr_tc_init(void) -{ - - decr_timecounter.tc_frequency = ticks_per_sec; - tc_init(&decr_timecounter); - decr_et.et_name = "decrementer"; - decr_et.et_flags = ET_FLAGS_PERIODIC | ET_FLAGS_ONESHOT | - ET_FLAGS_PERCPU; - decr_et.et_quality = 1000; - decr_et.et_frequency = ticks_per_sec; - decr_et.et_min_period = (0x00000002LLU << 32) / ticks_per_sec; - decr_et.et_max_period = (0xfffffffeLLU << 32) / ticks_per_sec; - decr_et.et_start = decr_et_start; - decr_et.et_stop = decr_et_stop; - decr_et.et_priv = NULL; - et_register(&decr_et); -} - -/* - * Event timer start method. - */ -static int -decr_et_start(struct eventtimer *et, sbintime_t first, sbintime_t period) -{ - struct decr_state *s = DPCPU_PTR(decr_state); - uint32_t fdiv, tcr; - - if (period != 0) { - s->mode = 1; - s->div = (decr_et.et_frequency * period) >> 32; - } else { - s->mode = 2; - s->div = 0; - } - if (first != 0) - fdiv = (decr_et.et_frequency * first) >> 32; - else - fdiv = s->div; - - tcr = mfspr(SPR_TCR); - tcr |= TCR_DIE; - if (s->mode == 1) { - mtspr(SPR_DECAR, s->div); - tcr |= TCR_ARE; - } else - tcr &= ~TCR_ARE; - mtdec(fdiv); - mtspr(SPR_TCR, tcr); - return (0); -} - -/* - * Event timer stop method. - */ -static int -decr_et_stop(struct eventtimer *et) -{ - struct decr_state *s = DPCPU_PTR(decr_state); - uint32_t tcr; - - s->mode = 0; - s->div = 0xffffffff; - tcr = mfspr(SPR_TCR); - tcr &= ~(TCR_DIE | TCR_ARE); - mtspr(SPR_TCR, tcr); - return (0); -} - -/* - * Timecounter get method. - */ -static unsigned -decr_get_timecount(struct timecounter *tc) -{ - quad_t tb; - - tb = mftb(); - return (tb); -} - -/* - * Wait for about n microseconds (at least!). - */ -void -DELAY(int n) -{ - u_quad_t start, end, now; - - start = mftb(); - end = start + (u_quad_t)ticks_per_sec / (1000000ULL / n); - do { - now = mftb(); - } while (now < end || (now > start && end < start)); -} - diff --git a/sys/powerpc/mpc85xx/nexus.c b/sys/powerpc/mpc85xx/nexus.c deleted file mode 100644 index 5220d1e4c..000000000 --- a/sys/powerpc/mpc85xx/nexus.c +++ /dev/null @@ -1,201 +0,0 @@ -/*- - * Copyright 1998 Massachusetts Institute of Technology - * - * Permission to use, copy, modify, and distribute this software and - * its documentation for any purpose and without fee is hereby - * granted, provided that both the above copyright notice and this - * permission notice appear in all copies, that both the above - * copyright notice and this permission notice appear in all - * supporting documentation, and that the name of M.I.T. not be used - * in advertising or publicity pertaining to distribution of the - * software without specific, written prior permission. M.I.T. makes - * no representations about the suitability of this software for any - * purpose. It is provided "as is" without express or implied - * warranty. - * - * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''. M.I.T. DISCLAIMS - * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT - * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -/*- - * Copyright 2001 by Thomas Moestl . All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * from: FreeBSD: src/sys/i386/i386/nexus.c,v 1.43 2001/02/09 - */ - -#include -__FBSDID("$FreeBSD$"); - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -/* - * Device interface - */ -static int nexus_probe(device_t); -static int nexus_attach(device_t); -static int nexus_activate_resource(device_t, device_t, int, int, - struct resource *); -static int nexus_deactivate_resource(device_t, device_t, int, int, - struct resource *); - -static int nexus_config_intr(device_t, int, enum intr_trigger, - enum intr_polarity); -static int nexus_setup_intr(device_t, device_t, struct resource *, int, - driver_filter_t *, driver_intr_t *, void *, void **); -static int nexus_teardown_intr(device_t, device_t, struct resource *, - void *); - -static device_method_t nexus_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, nexus_probe), - DEVMETHOD(device_attach, nexus_attach), - DEVMETHOD(device_detach, bus_generic_detach), - DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, bus_generic_suspend), - DEVMETHOD(device_resume, bus_generic_resume), - - /* Bus interface. Resource management is business of the children... */ - DEVMETHOD(bus_add_child, bus_generic_add_child), - DEVMETHOD(bus_probe_nomatch, NULL), - DEVMETHOD(bus_read_ivar, NULL), - DEVMETHOD(bus_write_ivar, NULL), - DEVMETHOD(bus_config_intr, nexus_config_intr), - DEVMETHOD(bus_setup_intr, nexus_setup_intr), - DEVMETHOD(bus_teardown_intr, nexus_teardown_intr), - DEVMETHOD(bus_alloc_resource, NULL), - DEVMETHOD(bus_activate_resource, nexus_activate_resource), - DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource), - DEVMETHOD(bus_release_resource, NULL), - - DEVMETHOD_END -}; - -static driver_t nexus_driver = { - "nexus", - nexus_methods -}; - -static devclass_t nexus_devclass; - -DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0); - -static int -nexus_probe(device_t dev) -{ - - if (!bootverbose) - device_quiet(dev); - return (BUS_PROBE_DEFAULT); -} - -static int -nexus_attach(device_t dev) -{ - - bus_generic_probe(dev); - bus_generic_attach(dev); - return (0); -} - -static int -nexus_activate_resource(device_t bus, device_t child, int type, int rid, - struct resource *res) -{ - - /* Not much to be done yet... */ - return (rman_activate_resource(res)); -} - -static int -nexus_deactivate_resource(device_t bus, device_t child, int type, int rid, - struct resource *res) -{ - - /* Not much to be done yet... */ - return (rman_deactivate_resource(res)); -} - -static int -nexus_config_intr(device_t bus, int irq, enum intr_trigger trig, - enum intr_polarity pol) -{ - - return (powerpc_config_intr(irq, trig, pol)); -} - -static int -nexus_setup_intr(device_t bus, device_t child, struct resource *res, int flags, - driver_filter_t *ifilt, driver_intr_t *ihand, void *arg, void **cookiep) -{ - int error; - - *cookiep = NULL; - - /* somebody tried to setup an irq that failed to allocate! */ - if (res == NULL) - return (EINVAL); - - if ((rman_get_flags(res) & RF_SHAREABLE) == 0) - flags |= INTR_EXCL; - - /* We depend on rman_activate_resource() being idempotent. */ - error = rman_activate_resource(res); - if (error) - return (error); - - error = powerpc_setup_intr(device_get_nameunit(child), - rman_get_start(res), ifilt, ihand, arg, flags, cookiep); - return (error); -} - -static int -nexus_teardown_intr(device_t bus, device_t child, struct resource *res, - void *cookie) -{ - int error; - - if (res == NULL) - return (EINVAL); - - error = powerpc_teardown_intr(cookie); - return (error); -} diff --git a/sys/powerpc/aim/clock.c b/sys/powerpc/powerpc/clock.c similarity index 91% rename from sys/powerpc/aim/clock.c rename to sys/powerpc/powerpc/clock.c index ae98d26ef..2b9477abc 100644 --- a/sys/powerpc/aim/clock.c +++ b/sys/powerpc/powerpc/clock.c @@ -119,6 +119,14 @@ decr_intr(struct trapframe *frame) (*decr_counts[curcpu])++; +#ifdef BOOKE + /* + * Interrupt handler must reset DIS to avoid getting another + * interrupt once EE is enabled. + */ + mtspr(SPR_TSR, TSR_DIS); +#endif + if (s->mode == 1) { /* * Based on the actual time delay since the last decrementer @@ -141,6 +149,14 @@ decr_intr(struct trapframe *frame) } } +void +cpu_initclocks(void) +{ + + decr_tc_init(); + cpu_initclocks_bsp(); +} + /* * BSP early initialization. */ @@ -207,11 +223,13 @@ decr_tc_init(void) * Event timer start method. */ static int -decr_et_start(struct eventtimer *et, - sbintime_t first, sbintime_t period) +decr_et_start(struct eventtimer *et, sbintime_t first, sbintime_t period) { struct decr_state *s = DPCPU_PTR(decr_state); uint32_t fdiv; +#ifdef BOOKE + uint32_t tcr; +#endif if (period != 0) { s->mode = 1; @@ -220,12 +238,25 @@ decr_et_start(struct eventtimer *et, s->mode = 2; s->div = 0; } - if (first != 0) { + if (first != 0) fdiv = (decr_et.et_frequency * first) >> 32; - } else + else fdiv = s->div; +#ifdef BOOKE + tcr = mfspr(SPR_TCR); + tcr |= TCR_DIE; + if (s->mode == 1) { + mtspr(SPR_DECAR, s->div); + tcr |= TCR_ARE; + } else + tcr &= ~TCR_ARE; mtdec(fdiv); + mtspr(SPR_TCR, tcr); +#else + mtdec(fdiv); +#endif + return (0); } @@ -236,10 +267,19 @@ static int decr_et_stop(struct eventtimer *et) { struct decr_state *s = DPCPU_PTR(decr_state); +#ifdef BOOKE + uint32_t tcr; +#endif s->mode = 0; s->div = 0x7fffffff; +#ifdef BOOKE + tcr = mfspr(SPR_TCR); + tcr &= ~(TCR_DIE | TCR_ARE); + mtspr(SPR_TCR, tcr); +#else mtdec(s->div); +#endif return (0); } @@ -249,10 +289,7 @@ decr_et_stop(struct eventtimer *et) static unsigned decr_get_timecount(struct timecounter *tc) { - register_t tb; - - __asm __volatile("mftb %0" : "=r"(tb)); - return (tb); + return (mftb()); } /* diff --git a/sys/powerpc/aim/nexus.c b/sys/powerpc/powerpc/nexus.c similarity index 100% rename from sys/powerpc/aim/nexus.c rename to sys/powerpc/powerpc/nexus.c diff --git a/sys/powerpc/booke/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c similarity index 79% rename from sys/powerpc/booke/vm_machdep.c rename to sys/powerpc/powerpc/vm_machdep.c index 4db39766b..d9d3987c2 100644 --- a/sys/powerpc/booke/vm_machdep.c +++ b/sys/powerpc/powerpc/vm_machdep.c @@ -1,33 +1,3 @@ -/*- - * Copyright (C) 2006 Semihalf, Marian Balakowicz - * Copyright (C) 2006 Semihalf, Rafal Jaworowski - * All rights reserved. - * - * Adapted for Freescale's e500 core CPUs. - * sf_buf implementation was derived from sys/arm/arm/vm_machdep. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * from: $FreeBSD$ - */ /*- * Copyright (c) 1982, 1986 The Regents of the University of California. * Copyright (c) 1989, 1990 William Jolitz @@ -48,8 +18,8 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. + * This product includes software developed by the University of + * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -66,8 +36,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 + * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ + * $FreeBSD$ */ /*- * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -96,9 +67,6 @@ * rights to redistribute these changes. */ -#include -__FBSDID("$FreeBSD$"); - #include #include #include @@ -113,18 +81,17 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include -#include #include +#include #include #include #include -#include -#include + +#include #include #include @@ -133,6 +100,13 @@ __FBSDID("$FreeBSD$"); #include #include +/* + * On systems without a direct mapped region (e.g. PPC64), + * we use the same code as the Book E implementation. Since + * we need to have runtime detection of this, define some machinery + * for sf_bufs in this case, and ignore it on systems with direct maps. + */ + #ifndef NSFBUFS #define NSFBUFS (512 + maxusers * 16) #endif @@ -150,9 +124,9 @@ SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufsused, CTLFLAG_RD, &nsfbufsused, 0, static void sf_buf_init(void *arg); SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL); - + LIST_HEAD(sf_head, sf_buf); - + /* A hash table of active sendfile(2) buffers */ static struct sf_head *sf_buf_active; static u_long sf_buf_hashmask; @@ -167,6 +141,11 @@ static u_int sf_buf_alloc_want; */ static struct mtx sf_buf_lock; +#ifdef __powerpc64__ +extern uintptr_t tocbase; +#endif + + /* * Finish a fork operation, with process p2 nearly set up. * Copy and update the pcb, set up the stack so that the child @@ -175,23 +154,20 @@ static struct mtx sf_buf_lock; void cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags) { - struct proc *p1; - struct trapframe *tf; - struct callframe *cf; - struct pcb *pcb; + struct trapframe *tf; + struct callframe *cf; + struct pcb *pcb; KASSERT(td1 == curthread || td1 == &thread0, ("cpu_fork: p1 not curproc and not proc0")); - CTR3(KTR_PROC, "cpu_fork: called td1=%08x p2=%08x flags=%x", (u_int)td1, - (u_int)p2, flags); + CTR3(KTR_PROC, "cpu_fork: called td1=%p p2=%p flags=%x", + td1, p2, flags); if ((flags & RFPROC) == 0) return; - p1 = td1->td_proc; - pcb = (struct pcb *)((td2->td_kstack + - td2->td_kstack_pages * PAGE_SIZE - sizeof(struct pcb)) & ~0x3fU); + td2->td_kstack_pages * PAGE_SIZE - sizeof(struct pcb)) & ~0x2fUL); td2->td_pcb = pcb; /* Copy the pcb */ @@ -214,19 +190,31 @@ cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags) cf = (struct callframe *)tf - 1; memset(cf, 0, sizeof(struct callframe)); + #ifdef __powerpc64__ + cf->cf_toc = tocbase; + #endif cf->cf_func = (register_t)fork_return; cf->cf_arg0 = (register_t)td2; cf->cf_arg1 = (register_t)tf; pcb->pcb_sp = (register_t)cf; + KASSERT(pcb->pcb_sp % 16 == 0, ("stack misaligned")); + #ifdef __powerpc64__ + pcb->pcb_lr = ((register_t *)fork_trampoline)[0]; + pcb->pcb_toc = ((register_t *)fork_trampoline)[1]; + #else pcb->pcb_lr = (register_t)fork_trampoline; + #endif + #ifdef AIM + pcb->pcb_cpu.aim.usr_vsid = 0; + #endif - /* Setup to release sched_lock in fork_exit(). */ + /* Setup to release spin count in fork_exit(). */ td2->td_md.md_spinlock_count = 1; td2->td_md.md_saved_msr = PSL_KERNSET; /* - * Now cpu_switch() can schedule the new process. + * Now cpu_switch() can schedule the new process. */ } @@ -241,8 +229,8 @@ cpu_set_fork_handler(struct thread *td, void (*func)(void *), void *arg) { struct callframe *cf; - CTR3(KTR_PROC, "cpu_set_fork_handler: called with td=%08x func=%08x arg=%08x", - (u_int)td, (u_int)func, (u_int)arg); + CTR4(KTR_PROC, "%s called with td=%p func=%p arg=%p", + __func__, td, func, arg); cf = (struct callframe *)td->td_pcb->pcb_sp; @@ -266,13 +254,18 @@ sf_buf_init(void *arg) vm_offset_t sf_base; int i; + /* Don't bother on systems with a direct map */ + if (hw_direct_map) + return; + nsfbufs = NSFBUFS; TUNABLE_INT_FETCH("kern.ipc.nsfbufs", &nsfbufs); sf_buf_active = hashinit(nsfbufs, M_TEMP, &sf_buf_hashmask); TAILQ_INIT(&sf_buf_freelist); sf_base = kva_alloc(nsfbufs * PAGE_SIZE); - sf_bufs = malloc(nsfbufs * sizeof(struct sf_buf), M_TEMP, M_NOWAIT | M_ZERO); + sf_bufs = malloc(nsfbufs * sizeof(struct sf_buf), M_TEMP, + M_NOWAIT | M_ZERO); for (i = 0; i < nsfbufs; i++) { sf_bufs[i].kva = sf_base + i * PAGE_SIZE; @@ -292,6 +285,11 @@ sf_buf_alloc(struct vm_page *m, int flags) struct sf_buf *sf; int error; + if (hw_direct_map) { + /* Shortcut the direct mapped case */ + return ((struct sf_buf *)m); + } + hash_list = &sf_buf_active[SF_BUF_HASH(m)]; mtx_lock(&sf_buf_lock); LIST_FOREACH(sf, hash_list, list_entry) { @@ -349,6 +347,8 @@ sf_buf_alloc(struct vm_page *m, int flags) void sf_buf_free(struct sf_buf *sf) { + if (hw_direct_map) + return; mtx_lock(&sf_buf_lock); sf->ref_count--; @@ -391,7 +391,9 @@ is_physical_memory(vm_offset_t addr) } /* - * CPU threading functions related to VM. + * CPU threading functions related to the VM layer. These could be used + * to map the SLB bits required for the kernel stack instead of forcing a + * fixed-size KVA. */ void -- 2.45.0