Re: CVS commit: src/sys/arch/amd64/conf
On Mar 15, 1:50pm, Jonathan A. Kollasch wrote: } } Module Name: src } Committed By: jakllsch } Date: Sat Mar 15 13:50:01 UTC 2014 } } Modified Files: } src/sys/arch/amd64/conf: XEN3_DOMU } } Log Message: } Enable PCI support in amd64 XEN3_DOMU config to match i386 XEN3_DOMU config. PCI support in a DOMU kernel would only be useful when the DOM0 is setup with pci passthrough for some device, which isn't the norm. My answer would be to go the opposite way and disable PCI support in both kernels. Also, simply enabling PCI support without adding a whole schwak of PCI devices isn't very useful. As well, I don't think PCI passthrough is working with modern versions of Xen. }-- End of excerpt from Jonathan A. Kollasch
Re: CVS commit: src/sys/arch/amd64/conf
John Nemeth jnem...@cue.bc.ca writes: On Mar 15, 1:50pm, Jonathan A. Kollasch wrote: } } Module Name:src } Committed By: jakllsch } Date: Sat Mar 15 13:50:01 UTC 2014 } } Modified Files: } src/sys/arch/amd64/conf: XEN3_DOMU } } Log Message: } Enable PCI support in amd64 XEN3_DOMU config to match i386 XEN3_DOMU config. PCI support in a DOMU kernel would only be useful when the DOM0 is setup with pci passthrough for some device, which isn't the norm. My answer would be to go the opposite way and disable PCI support in both kernels. Also, simply enabling PCI support without adding a whole schwak of PCI devices isn't very useful. As well, I don't think PCI passthrough is working with modern versions of Xen. John's comments seem sensible to me. Also, I find using PCI passthrough to be very unusual. pgpt4NlQQp6MV.pgp Description: PGP signature
Re: CVS commit: src/sys/arch/amd64/conf
John Nemeth jnem...@cue.bc.ca writes: On Mar 15, 1:50pm, Jonathan A. Kollasch wrote: } } Module Name:src } Committed By: jakllsch } Date: Sat Mar 15 13:50:01 UTC 2014 } } Modified Files: } src/sys/arch/amd64/conf: XEN3_DOMU } } Log Message: } Enable PCI support in amd64 XEN3_DOMU config to match i386 XEN3_DOMU config. PCI support in a DOMU kernel would only be useful when the DOM0 is setup with pci passthrough for some device, which isn't the norm. My answer would be to go the opposite way and disable PCI support in both kernels. Also, simply enabling PCI support without adding a whole schwak of PCI devices isn't very useful. As well, I don't think PCI passthrough is working with modern versions of Xen. John's comments seem sensible to me. Also, I find using PCI passthrough to be very unusual. pgp8mWlUycFXS.pgp Description: PGP signature
CVS commit: src/external/cddl/osnet/dev/dtrace/arm
Module Name:src Committed By: ozaki-r Date: Sat Mar 15 07:43:01 UTC 2014 Modified Files: src/external/cddl/osnet/dev/dtrace/arm: dtrace_isa.c Log Message: Make arm/dtrace_isa.c buildable This is a band-aid for build, but it works anyway. We have to do a real fix in the future. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c diff -u src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c:1.3 src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c:1.4 --- src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c:1.3 Sat Mar 8 11:46:01 2014 +++ src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c Sat Mar 15 07:43:01 2014 @@ -39,6 +39,17 @@ #include ddb/db_sym.h #include ddb/ddb.h +uintptr_t kernelbase = (uintptr_t)KERNEL_BASE; + +/* TODO: support AAPCS */ +/* XXX: copied from sys/arch/arm/arm/db_trace.c */ +#define INKERNEL(va) (((vaddr_t)(va)) = VM_MIN_KERNEL_ADDRESS) + +#define FR_SCP (0) +#define FR_RLV (-1) +#define FR_RSP (-2) +#define FR_RFP (-3) + #include regset.h /*
CVS commit: src/external/cddl/osnet/dev/dtrace/arm
Module Name:src Committed By: ozaki-r Date: Sat Mar 15 07:49:15 UTC 2014 Modified Files: src/external/cddl/osnet/dev/dtrace/arm: dtrace_asm.S Log Message: Enable invop handler on module load It sets a fbt handler to dtrace_invop_jump_addr on module load, which is used to call the dtrace probing function from the trap handler. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/dev/dtrace/arm/dtrace_asm.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dev/dtrace/arm/dtrace_asm.S diff -u src/external/cddl/osnet/dev/dtrace/arm/dtrace_asm.S:1.4 src/external/cddl/osnet/dev/dtrace/arm/dtrace_asm.S:1.5 --- src/external/cddl/osnet/dev/dtrace/arm/dtrace_asm.S:1.4 Mon Mar 10 06:38:22 2014 +++ src/external/cddl/osnet/dev/dtrace/arm/dtrace_asm.S Sat Mar 15 07:49:15 2014 @@ -202,13 +202,24 @@ END(dtrace_copystr) void dtrace_invop_init(void) */ ENTRY(dtrace_invop_init) + ldr r1, .Ldtrace_invop + ldr r2, .Ldtrace_invop_jump_addr + str r1, [r2] RET + .align 0 +.Ldtrace_invop: + .word dtrace_invop +.Ldtrace_invop_jump_addr: + .word dtrace_invop_jump_addr END(dtrace_invop_init) /* void dtrace_invop_uninit(void) */ ENTRY(dtrace_invop_uninit) + mov r0, #0 + ldr r1, .Ldtrace_invop_jump_addr + str r0, [r1] RET END(dtrace_invop_uninit)
CVS commit: src/external/cddl/osnet
Module Name:src
Committed By: ozaki-r
Date: Sat Mar 15 08:00:19 UTC 2014
Modified Files:
src/external/cddl/osnet/dev/fbt: fbt.c
src/external/cddl/osnet/dist/uts/common/sys: dtrace.h
Log Message:
Implement DTrace FBT provider for ARM
- Finding probable functions
- Replacing instructions
- Emulating instructions
It is tested only on ARMv7 CPUs yet, for example,
-m evbarm (-a earm) kernel=BEAGLEBONE.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/cddl/osnet/dev/fbt/fbt.c
cvs rdiff -u -r1.9 -r1.10 \
src/external/cddl/osnet/dist/uts/common/sys/dtrace.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dev/fbt/fbt.c
diff -u src/external/cddl/osnet/dev/fbt/fbt.c:1.13 src/external/cddl/osnet/dev/fbt/fbt.c:1.14
--- src/external/cddl/osnet/dev/fbt/fbt.c:1.13 Wed Mar 5 20:14:15 2014
+++ src/external/cddl/osnet/dev/fbt/fbt.c Sat Mar 15 08:00:19 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fbt.c,v 1.13 2014/03/05 20:14:15 tron Exp $ */
+/* $NetBSD: fbt.c,v 1.14 2014/03/15 08:00:19 ozaki-r Exp $ */
/*
* CDDL HEADER START
@@ -58,12 +58,19 @@
#include sys/unistd.h
#include machine/cpu.h
+#if defined(__i386__) || defined(__amd64__)
#include machine/cpufunc.h
#include machine/specialreg.h
#if 0
#include x86/cpuvar.h
#endif
#include x86/cputypes.h
+#elif __arm__
+#include machine/trap.h
+#include arm/cpufunc.h
+#include arm/armreg.h
+#include arm/frame.h
+#endif
#define ELFSIZE ARCH_ELFSIZE
#include sys/exec_elf.h
@@ -77,6 +84,7 @@ mod_ctf_t *modptr;
MALLOC_DEFINE(M_FBT, fbt, Function Boundary Tracing);
+#if defined(__i386__) || defined(__amd64__)
#define FBT_PUSHL_EBP 0x55
#define FBT_MOVL_ESP_EBP0_V0 0x8b
#define FBT_MOVL_ESP_EBP1_V0 0xec
@@ -88,11 +96,43 @@ MALLOC_DEFINE(M_FBT, fbt, Function Bo
#define FBT_RET 0xc3
#define FBT_RET_IMM16 0xc2
#define FBT_LEAVE 0xc9
+#endif
#ifdef __amd64__
#define FBT_PATCHVAL 0xcc
-#else
+#elif defined(__i386__)
#define FBT_PATCHVAL 0xf0
+
+#elif defined(__arm__)
+#define FBT_PATCHVAL DTRACE_BREAKPOINT
+
+/* entry and return */
+#define FBT_BX_LR_P(insn) (((insn) ~INSN_COND_MASK) == 0x012fff1e)
+#define FBT_B_LABEL_P(insn) (((insn) 0xff00) == 0xea00)
+/* entry */
+#define FBT_MOV_IP_SP_P(insn) ((insn) == 0xe1a0c00d)
+/* index=1, add=1, wback=0 */
+#define FBT_LDR_IMM_P(insn) (((insn) 0xfff0) == 0xe590)
+#define FBT_MOVW_P(insn) (((insn) 0xfff0) == 0xe300)
+#define FBT_MOV_IMM_P(insn) (((insn) 0x) == 0xe3a0)
+#define FBT_CMP_IMM_P(insn) (((insn) 0xfff0) == 0xe350)
+#define FBT_PUSH_P(insn) (((insn) 0x) == 0xe92d)
+/* return */
+/* cond=always, writeback=no, rn=sp and register_list includes pc */
+#define FBT_LDM_P(insn) (((insn) 0x0fff8000) == 0x089d8000)
+#define FBT_LDMIB_P(insn) (((insn) 0x0fff8000) == 0x099d8000)
+#define FBT_MOV_PC_LR_P(insn) (((insn) ~INSN_COND_MASK) == 0x01a0f00e)
+/* cond=always, writeback=no, rn=sp and register_list includes lr, but not pc */
+#define FBT_LDM_LR_P(insn) (((insn) 0xc000) == 0xe89d4000)
+#define FBT_LDMIB_LR_P(insn) (((insn) 0xc000) == 0xe99d4000)
+
+/* rval = insn | invop_id (overwriting cond with invop ID) */
+#define BUILD_RVAL(insn, id) (((insn) ~INSN_COND_MASK) | __SHIFTIN((id), INSN_COND_MASK))
+/* encode cond in the first byte */
+#define PATCHVAL_ENCODE_COND(insn) (FBT_PATCHVAL | __SHIFTOUT((insn), INSN_COND_MASK))
+
+#else
+#error architecture not supported
#endif
static dev_type_open(fbt_open);
@@ -140,10 +180,17 @@ static dtrace_pops_t fbt_pops = {
typedef struct fbt_probe {
struct fbt_probe *fbtp_hashnext;
+#if defined(__i386__) || defined(__amd64__)
uint8_t *fbtp_patchpoint;
int8_t fbtp_rval;
uint8_t fbtp_patchval;
uint8_t fbtp_savedval;
+#elif __arm__
+ uint32_t *fbtp_patchpoint;
+ int32_t fbtp_rval;
+ uint32_t fbtp_patchval;
+ uint32_t fbtp_savedval;
+#endif
uintptr_t fbtp_roffset;
dtrace_id_t fbtp_id;
const char *fbtp_name;
@@ -164,6 +211,226 @@ static fbt_probe_t **fbt_probetab;
static int fbt_probetab_size;
static int fbt_probetab_mask;
+#ifdef __arm__
+extern void (* dtrace_emulation_jump_addr)(int, struct trapframe *);
+
+static uint32_t
+expand_imm(uint32_t imm12)
+{
+ uint32_t unrot = imm12 0xff;
+ int amount = 2 * (imm12 8);
+
+ if (amount)
+ return (unrot amount) | (unrot (32 - amount));
+ else
+ return unrot;
+}
+
+static uint32_t
+add_with_carry(uint32_t x, uint32_t y, int carry_in,
+ int *carry_out, int *overflow)
+{
+ uint32_t result;
+ uint64_t unsigned_sum = x + y + (uint32_t)carry_in;
+ int64_t signed_sum = (int32_t)x + (int32_t)y + (int32_t)carry_in;
+ KASSERT(carry_in == 1);
+
+ result = (uint32_t)(unsigned_sum 0x);
+ *carry_out = ((uint64_t)result == unsigned_sum) ? 1 : 0;
+ *overflow = ((int64_t)result == signed_sum) ? 0 : 1;
+
+ return result;
+}
+
+static void
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src
Committed By: rmind
Date: Sat Mar 15 08:46:01 UTC 2014
Modified Files:
src/usr.sbin/npf/npfctl: npf_bpf_comp.c
Log Message:
npfctl_bpf_cidr: another buf fix in handling IPv6 masks (bug found on ARM).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/npf/npfctl/npf_bpf_comp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/npfctl/npf_bpf_comp.c
diff -u src/usr.sbin/npf/npfctl/npf_bpf_comp.c:1.3 src/usr.sbin/npf/npfctl/npf_bpf_comp.c:1.4
--- src/usr.sbin/npf/npfctl/npf_bpf_comp.c:1.3 Thu Feb 13 00:42:01 2014
+++ src/usr.sbin/npf/npfctl/npf_bpf_comp.c Sat Mar 15 08:46:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_bpf_comp.c,v 1.3 2014/02/13 00:42:01 rmind Exp $ */
+/* $NetBSD: npf_bpf_comp.c,v 1.4 2014/03/15 08:46:01 rmind Exp $ */
/*-
* Copyright (c) 2010-2013 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: npf_bpf_comp.c,v 1.3 2014/02/13 00:42:01 rmind Exp $);
+__RCSID($NetBSD: npf_bpf_comp.c,v 1.4 2014/03/15 08:46:01 rmind Exp $);
#include stdlib.h
#include stdbool.h
@@ -421,7 +421,7 @@ npfctl_bpf_cidr(npf_bpf_t *ctx, u_int op
wordmask = 0;
length -= 32;
} else if (length) {
- wordmask = 0x (maxmask - length);
+ wordmask = 0x (32 - length);
length = 0;
} else {
/* The mask became zero - skip the rest. */
CVS commit: src/sys/arch/m68k/m68k
Module Name:src Committed By: tsutsui Date: Sat Mar 15 09:22:37 UTC 2014 Added Files: src/sys/arch/m68k/m68k: busaddrerr.s Log Message: Add a common source of m68k bus error and address error handlers. This will be included from each MD locore.s as other common m68k asm files like trap_subr.s and support.s etc. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/m68k/m68k/busaddrerr.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/m68k/m68k/busaddrerr.s diff -u /dev/null src/sys/arch/m68k/m68k/busaddrerr.s:1.1 --- /dev/null Sat Mar 15 09:22:37 2014 +++ src/sys/arch/m68k/m68k/busaddrerr.s Sat Mar 15 09:22:36 2014 @@ -0,0 +1,272 @@ +/* $NetBSD: busaddrerr.s,v 1.1 2014/03/15 09:22:36 tsutsui Exp $ */ + +/* + * Copyright (c) 1988 University of Utah. + * Copyright (c) 1980, 1990, 1993 + * The Regents of the University of California. 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. + * + * 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. 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: Utah $Hdr: locore.s 1.66 92/12/22$ + * + * @(#)locore.s 8.6 (Berkeley) 5/27/94 + */ + +/* + * bus error and address error handler routines common to all m68k ports. + */ + +/* + * NOTICE: This is not a standalone file. To use it, #include it in + * your port's locore.s, like so: + * + * #include m68k/m68k/busaddrerr.s + */ + +/* assume M68K_MMU_MOTOROLA is default if none is defined */ +#if !defined(M68K_MMU_MOTOROLA) !defined(M68K_MMU_HP) +#define M68K_MMU_MOTOROLA +#endif + +/* + * address error handler for 68040/68060 + */ +#if defined(M68040) || defined(M68060) +ENTRY_NOPROFILE(addrerr4060) + clrl %sp@- | stack adjust count + moveml %d0-%d7/%a0-%a7,%sp@- | save user registers + movl %usp,%a0 | save the user SP + movl %a0,%sp@(FR_SP) | in the savearea + movl %sp@(FR_HW+8),%sp@- + clrl %sp@- | dummy code + movl #T_ADDRERR,%sp@- | mark address error + jra _ASM_LABEL(faultstkadj) | and deal with it +#endif + +/* + * bus error handler for 68060 + */ +#if defined(M68060) +ENTRY_NOPROFILE(buserr60) + clrl %sp@- | stack adjust count + moveml %d0-%d7/%a0-%a7,%sp@- | save user registers + movl %usp,%a0 | save the user SP + movl %a0,%sp@(FR_SP) | in the savearea + movel %sp@(FR_HW+12),%d0 | FSLW + btst #2,%d0 | branch prediction error? + jeq Lnobpe + movc %cacr,%d2 + orl #IC60_CABC,%d2 | clear all branch cache entries + movc %d2,%cacr + movl %d0,%d1 +#if defined(amiga) || defined(atari) + addql #1,L60bpe +#endif + andl #0x7ffd,%d1 | check other faults + jeq _ASM_LABEL(faultstkadjnotrap2) +Lnobpe: +| we need to adjust for misaligned addresses + movl %sp@(FR_HW+8),%d1 | grab VA + btst #27,%d0 | check for mis-aligned access + jeq Lberr3 | no, skip + addl #28,%d1 | yes, get into next page + | operand case: 3, + | instruction case: 4+12+12 + | XXX instr. case not done yet + andl #PG_FRAME,%d1 | and truncate +Lberr3: + movl %d1,%sp@- + movl %d0,%sp@- | code is FSLW now. + andw #0x1f80,%d0 + jeq Lberr60 | it is a bus error + movl #T_MMUFLT,%sp@- | show that we are an MMU fault + jra _ASM_LABEL(faultstkadj) | and deal with it +Lberr60: + tstl _C_LABEL(nofault) | catch bus error? + jeq Lisberr | no, handle as usual +#ifdef mac68k + movl %a2,_C_LABEL(mac68k_a2_fromfault) | save %a2 + movl %sp@(FR_HW+8+8),_C_LABEL(m68k_fault_addr)
CVS commit: src/sys/arch/news68k/news68k
Module Name:src Committed By: tsutsui Date: Sat Mar 15 09:24:56 UTC 2014 Modified Files: src/sys/arch/news68k/news68k: locore.s Log Message: Use common m68k/busaddrerr.s for bus error and address error handlers. No binary changes on GENERIC, and also tested on NWS-1750. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/arch/news68k/news68k/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/news68k/news68k/locore.s diff -u src/sys/arch/news68k/news68k/locore.s:1.64 src/sys/arch/news68k/news68k/locore.s:1.65 --- src/sys/arch/news68k/news68k/locore.s:1.64 Sun Mar 9 16:18:00 2014 +++ src/sys/arch/news68k/news68k/locore.s Sat Mar 15 09:24:56 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.64 2014/03/09 16:18:00 tsutsui Exp $ */ +/* $NetBSD: locore.s,v 1.65 2014/03/15 09:24:56 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -479,100 +479,10 @@ Lenab3: */ #include m68k/m68k/trap_subr.s -#if defined(M68020) || defined(M68030) -ENTRY_NOPROFILE(busaddrerr2030) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - moveq #0,%d0 - movw %sp@(FR_HW+10),%d0 | grab SSW for fault processing - btst #12,%d0 | RB set? - jeq LbeX0 | no, test RC - bset #14,%d0 | yes, must set FB - movw %d0,%sp@(FR_HW+10) | for hardware too -LbeX0: - btst #13,%d0 | RC set? - jeq LbeX1 | no, skip - bset #15,%d0 | yes, must set FC - movw %d0,%sp@(FR_HW+10) | for hardware too -LbeX1: - btst #8,%d0 | data fault? - jeq Lbe0 | no, check for hard cases - movl %sp@(FR_HW+16),%d1 | fault address is as given in frame - jra Lbe10 | thats it -Lbe0: - btst #4,%sp@(FR_HW+6) | long (type B) stack frame? - jne Lbe4 | yes, go handle - movl %sp@(FR_HW+2),%d1 | no, can use save PC - btst #14,%d0 | FB set? - jeq Lbe3 | no, try FC - addql #4,%d1 | yes, adjust address - jra Lbe10 | done -Lbe3: - btst #15,%d0 | FC set? - jeq Lbe10 | no, done - addql #2,%d1 | yes, adjust address - jra Lbe10 | done -Lbe4: - movl %sp@(FR_HW+36),%d1 | long format, use stage B address - btst #15,%d0 | FC set? - jeq Lbe10 | no, all done - subql #2,%d1 | yes, adjust address -Lbe10: - movl %d1,%sp@- | push fault VA - movl %d0,%sp@- | and padded SSW - movw %sp@(FR_HW+8+6),%d0 | get frame format/vector offset - andw #0x0FFF,%d0 | clear out frame format - cmpw #12,%d0 | address error vector? - jeq Lisaerr | yes, go to it - movl %d1,%a0 | fault address - movl %sp@,%d0 | function code from ssw - btst #8,%d0 | data fault? - jne Lbe10a -#if 0 - movql #1,%d0 | user program access FC -#else - moveq #1,%d0 | user program access FC -#endif - | (we dont separate data/program) - btst #5,%sp@(FR_HW+8) | supervisor mode? - jeq Lbe10a | if no, done - movql #5,%d0 | else supervisor program access -Lbe10a: - ptestr %d0,%a0@,#7 | do a table search - pmove %psr,%sp@ | save result - movb %sp@,%d1 - btst #2,%d1 | invalid (incl. limit viol. and berr)? - jeq Lmightnotbemerr | no - wp check - btst #7,%d1 | is it MMU table berr? - jne Lisberr1 | yes, needs not be fast. -Lismerr: - movl #T_MMUFLT,%sp@- | show that we are an MMU fault - jra _ASM_LABEL(faultstkadj) | and deal with it -Lmightnotbemerr: - btst #3,%d1 | write protect bit set? - jeq Lisberr1 | no: must be bus error - movl %sp@,%d0 | ssw into low word of %d0 - andw #0xc0,%d0 | Write protect is set on page: - cmpw #0x40,%d0 | was it read cycle? - jne Lismerr | no, was not WPE, must be MMU fault - jra Lisberr1 | real bus err needs not be fast. -Lisaerr: - movl #T_ADDRERR,%sp@- | mark address error - jra _ASM_LABEL(faultstkadj) | and deal with it -Lisberr1: - clrw %sp@ | re-clear pad word - tstl _C_LABEL(nofault) | catch bus error? - jeq Lisberr | no, handle as usual - movl _C_LABEL(nofault),%sp@- | yes, - jbsr _C_LABEL(longjmp) | longjmp(nofault) - /* NOTREACHED */ -#endif /* M68020 || M68030 */ - -Lisberr:| also used by M68040/60 - movl #T_BUSERR,%sp@- | mark bus error - jra _ASM_LABEL(faultstkadj) | and deal with it +/* + * Use common m68k bus error and address error handlers. + */ +#include m68k/m68k/busaddrerr.s /* * FP exceptions.
CVS commit: src/sys/arch/hp300/hp300
Module Name:src Committed By: tsutsui Date: Sat Mar 15 09:26:36 UTC 2014 Modified Files: src/sys/arch/hp300/hp300: locore.s Log Message: Use common m68k/busaddrerr.s for bus error and address error handlers. No binary changes on GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.169 -r1.170 src/sys/arch/hp300/hp300/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/hp300/hp300/locore.s diff -u src/sys/arch/hp300/hp300/locore.s:1.169 src/sys/arch/hp300/hp300/locore.s:1.170 --- src/sys/arch/hp300/hp300/locore.s:1.169 Sun Mar 9 16:28:43 2014 +++ src/sys/arch/hp300/hp300/locore.s Sat Mar 15 09:26:36 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.169 2014/03/09 16:28:43 tsutsui Exp $ */ +/* $NetBSD: locore.s,v 1.170 2014/03/15 09:26:36 tsutsui Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -621,192 +621,10 @@ Lnocache0: */ #include m68k/m68k/trap_subr.s -#if defined(M68040) || defined(M68060) -ENTRY_NOPROFILE(addrerr4060) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - movl %sp@(FR_HW+8),%sp@- - clrl %sp@- | dummy code - movl #T_ADDRERR,%sp@- | mark address error - jra _ASM_LABEL(faultstkadj) | and deal with it -#endif - -#if defined(M68060) -ENTRY_NOPROFILE(buserr60) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - movel %sp@(FR_HW+12),%d0 | FSLW - btst #2,%d0 | branch prediction error? - jeq Lnobpe - movc %cacr,%d2 - orl #IC60_CABC,%d2 | clear all branch cache entries - movc %d2,%cacr - movl %d0,%d1 - andl #0x7ffd,%d1 - jeq _ASM_LABEL(faultstkadjnotrap2) -Lnobpe: -| we need to adjust for misaligned addresses - movl %sp@(FR_HW+8),%d1 | grab VA - btst #27,%d0 | check for mis-aligned access - jeq Lberr3 | no, skip - addl #28,%d1 | yes, get into next page - | operand case: 3, - | instruction case: 4+12+12 - andl #PG_FRAME,%d1 | and truncate -Lberr3: - movl %d1,%sp@- - movl %d0,%sp@- | code is FSLW now. - andw #0x1f80,%d0 - jeq Lberr60 | it is a bus error - movl #T_MMUFLT,%sp@- | show that we are an MMU fault - jra _ASM_LABEL(faultstkadj) | and deal with it -Lberr60: - tstl _C_LABEL(nofault) | catch bus error? - jeq Lisberr | no, handle as usual - movl _C_LABEL(nofault),%sp@- | yes, - jbsr _C_LABEL(longjmp) | longjmp(nofault) - /* NOTREACHED */ -#endif -#if defined(M68040) -ENTRY_NOPROFILE(buserr40) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - movl %sp@(FR_HW+20),%d1 | get fault address - moveq #0,%d0 - movw %sp@(FR_HW+12),%d0 | get SSW - btst #11,%d0 | check for mis-aligned - jeq Lbe1stpg | no skip - addl #3,%d1 | get into next page - andl #PG_FRAME,%d1 | and truncate -Lbe1stpg: - movl %d1,%sp@- | pass fault address. - movl %d0,%sp@- | pass SSW as code - btst #10,%d0 | test ATC - jeq Lberr40 | it is a bus error - movl #T_MMUFLT,%sp@- | show that we are an MMU fault - jra _ASM_LABEL(faultstkadj) | and deal with it -Lberr40: - tstl _C_LABEL(nofault) | catch bus error? - jeq Lisberr | no, handle as usual - movl _C_LABEL(nofault),%sp@- | yes, - jbsr _C_LABEL(longjmp) | longjmp(nofault) - /* NOTREACHED */ -#endif - -#if defined(M68020) || defined(M68030) -ENTRY_NOPROFILE(busaddrerr2030) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - moveq #0,%d0 - movw %sp@(FR_HW+10),%d0 | grab SSW for fault processing - btst #12,%d0 | RB set? - jeq LbeX0 | no, test RC - bset #14,%d0 | yes, must set FB - movw %d0,%sp@(FR_HW+10) | for hardware too -LbeX0: - btst #13,%d0 | RC set? - jeq LbeX1 | no, skip - bset #15,%d0 | yes, must set FC - movw %d0,%sp@(FR_HW+10) | for hardware too -LbeX1: - btst #8,%d0 | data fault? - jeq Lbe0 | no, check for hard cases - movl %sp@(FR_HW+16),%d1 | fault address is as given in frame - jra Lbe10 | thats it -Lbe0: - btst #4,%sp@(FR_HW+6) | long (type B) stack frame? - jne Lbe4 | yes, go handle - movl %sp@(FR_HW+2),%d1 | no, can use save PC - btst #14,%d0 | FB set? - jeq Lbe3 | no, try FC - addql #4,%d1 | yes, adjust address - jra Lbe10 | done -Lbe3: - btst #15,%d0 | FC set? - jeq Lbe10 | no, done - addql #2,%d1 | yes, adjust address - jra Lbe10 | done -Lbe4: - movl %sp@(FR_HW+36),%d1 | long format, use stage B address - btst #15,%d0 | FC set? - jeq Lbe10 | no, all done - subql #2,%d1 | yes, adjust address -Lbe10: - movl %d1,%sp@- | push fault VA - movl %d0,%sp@- | and padded SSW - movw %sp@(FR_HW+8+6),%d0 | get frame format/vector offset - andw #0x0FFF,%d0 | clear out frame format - cmpw #12,%d0
CVS commit: src/sys/arch/luna68k/luna68k
Module Name:src Committed By: tsutsui Date: Sat Mar 15 09:30:33 UTC 2014 Modified Files: src/sys/arch/luna68k/luna68k: locore.s Log Message: Use common m68k/busaddrerr.s for bus error and address error handlers. No binary changes on GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/arch/luna68k/luna68k/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/luna68k/luna68k/locore.s diff -u src/sys/arch/luna68k/luna68k/locore.s:1.57 src/sys/arch/luna68k/luna68k/locore.s:1.58 --- src/sys/arch/luna68k/luna68k/locore.s:1.57 Sun Mar 9 16:28:43 2014 +++ src/sys/arch/luna68k/luna68k/locore.s Sat Mar 15 09:30:33 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.57 2014/03/09 16:28:43 tsutsui Exp $ */ +/* $NetBSD: locore.s,v 1.58 2014/03/15 09:30:33 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -350,172 +350,10 @@ Lenab3: */ #include m68k/m68k/trap_subr.s -#if defined(M68040) || defined(M68060) -ENTRY_NOPROFILE(addrerr4060) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - movl %sp@(FR_HW+8),%sp@- - clrl %sp@- | dummy code - movl #T_ADDRERR,%sp@- | mark address error - jra _ASM_LABEL(faultstkadj) | and deal with it -#endif - -#if defined(M68060) -ENTRY_NOPROFILE(buserr60) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - movel %sp@(FR_HW+12),%d0 | FSLW - btst #2,%d0 | branch prediction error? - jeq Lnobpe - movc %cacr,%d2 - orl #IC60_CABC,%d2 | clear all branch cache entries - movc %d2,%cacr - movl %d0,%d1 - andl #0x7ffd,%d1 - jeq _ASM_LABEL(faultstkadjnotrap2) -Lnobpe: -| we need to adjust for misaligned addresses - movl %sp@(FR_HW+8),%d1 | grab VA - btst #27,%d0 | check for mis-aligned access - jeq Lberr3 | no, skip - addl #28,%d1 | yes, get into next page - | operand case: 3, - | instruction case: 4+12+12 - andl #PG_FRAME,%d1 | and truncate -Lberr3: - movl %d1,%sp@- - movl %d0,%sp@- | code is FSLW now. - andw #0x1f80,%d0 - jeq Lberr60 | it is a bus error - movl #T_MMUFLT,%sp@- | show that we are an MMU fault - jra _ASM_LABEL(faultstkadj) | and deal with it -Lberr60: - tstl _C_LABEL(nofault) | catch bus error? - jeq Lisberr | no, handle as usual - movl _C_LABEL(nofault),%sp@- | yes, - jbsr _C_LABEL(longjmp) | longjmp(nofault) - /* NOTREACHED */ -#endif -#if defined(M68040) -ENTRY_NOPROFILE(buserr40) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - movl %sp@(FR_HW+20),%d1 | get fault address - moveq #0,%d0 - movw %sp@(FR_HW+12),%d0 | get SSW - btst #11,%d0 | check for mis-aligned - jeq Lbe1stpg | no skip - addl #3,%d1 | get into next page - andl #PG_FRAME,%d1 | and truncate -Lbe1stpg: - movl %d1,%sp@- | pass fault address. - movl %d0,%sp@- | pass SSW as code - btst #10,%d0 | test ATC - jeq Lberr40 | it is a bus error - movl #T_MMUFLT,%sp@- | show that we are an MMU fault - jra _ASM_LABEL(faultstkadj) | and deal with it -Lberr40: - tstl _C_LABEL(nofault) | catch bus error? - jeq Lisberr | no, handle as usual - movl _C_LABEL(nofault),%sp@- | yes, - jbsr _C_LABEL(longjmp) | longjmp(nofault) - /* NOTREACHED */ -#endif - -ENTRY_NOPROFILE(busaddrerr2030) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - moveq #0,%d0 - movw %sp@(FR_HW+10),%d0 | grab SSW for fault processing - btst #12,%d0 | RB set? - jeq LbeX0 | no, test RC - bset #14,%d0 | yes, must set FB - movw %d0,%sp@(FR_HW+10) | for hardware too -LbeX0: - btst #13,%d0 | RC set? - jeq LbeX1 | no, skip - bset #15,%d0 | yes, must set FC - movw %d0,%sp@(FR_HW+10) | for hardware too -LbeX1: - btst #8,%d0 | data fault? - jeq Lbe0 | no, check for hard cases - movl %sp@(FR_HW+16),%d1 | fault address is as given in frame - jra Lbe10 | thats it -Lbe0: - btst #4,%sp@(FR_HW+6) | long (type B) stack frame? - jne Lbe4 | yes, go handle - movl %sp@(FR_HW+2),%d1 | no, can use save PC - btst #14,%d0 | FB set? - jeq Lbe3 | no, try FC - addql #4,%d1 | yes, adjust address - jra Lbe10 | done -Lbe3: - btst #15,%d0 | FC set? - jeq Lbe10 | no, done - addql #2,%d1 | yes, adjust address - jra Lbe10 | done -Lbe4: - movl %sp@(FR_HW+36),%d1 | long format, use stage B address - btst #15,%d0 | FC set? - jeq Lbe10 | no, all done - subql #2,%d1 | yes, adjust address -Lbe10: - movl %d1,%sp@- | push fault VA - movl %d0,%sp@- | and padded SSW - movw %sp@(FR_HW+8+6),%d0 | get frame format/vector offset - andw #0x0FFF,%d0 | clear out frame format - cmpw #12,%d0 | address
CVS commit: src/sys/dev/pci
Module Name:src Committed By: kiyohara Date: Sat Mar 15 10:30:41 UTC 2014 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add some Armada 370 IDs. To generate a diff of this commit: cvs rdiff -u -r1.1183 -r1.1184 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1183 src/sys/dev/pci/pcidevs:1.1184 --- src/sys/dev/pci/pcidevs:1.1183 Fri Feb 14 13:24:46 2014 +++ src/sys/dev/pci/pcidevs Sat Mar 15 10:30:41 2014 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1183 2014/02/14 13:24:46 njoly Exp $ +$NetBSD: pcidevs,v 1.1184 2014/03/15 10:30:41 kiyohara Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2326,6 +2326,9 @@ product MARVELL GT64130 0x6320 GT-64130 product MARVELL GT64260 0x6430 GT-64260 System Controller product MARVELL MV64360 0x6460 MV6436x System Controller product MARVELL MV64460 0x6480 MV6446x System Controller +product MARVELL MV6707 0x6707 MV6707 SoC Armada 370 +product MARVELL MV6710 0x6710 MV6710 SoC Armada 370 +product MARVELL MV6W11 0x6711 MV6W11 SoC Armada 370 product MARVELL 88SX7042 0x7042 88SX7042 SATA IIe product MARVELL MV78100 0x7810 MV78100 SoC Discovery Innovation product MARVELL MV78130 0x7813 MV78130 SoC Armada XP
CVS commit: src/sys/arch/arm/marvell
Module Name:src Committed By: kiyohara Date: Sat Mar 15 10:44:10 UTC 2014 Modified Files: src/sys/arch/arm/marvell: mvsoctmr.c Log Message: Support Armada 370. tested on MiraBox. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/marvell/mvsoctmr.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/arm/marvell/mvsoctmr.c diff -u src/sys/arch/arm/marvell/mvsoctmr.c:1.12 src/sys/arch/arm/marvell/mvsoctmr.c:1.13 --- src/sys/arch/arm/marvell/mvsoctmr.c:1.12 Wed Feb 26 19:41:46 2014 +++ src/sys/arch/arm/marvell/mvsoctmr.c Sat Mar 15 10:44:10 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: mvsoctmr.c,v 1.12 2014/02/26 19:41:46 martin Exp $ */ +/* $NetBSD: mvsoctmr.c,v 1.13 2014/03/15 10:44:10 kiyohara Exp $ */ /* * Copyright (c) 2007, 2008, 2010 KIYOHARA Takashi * All rights reserved. @@ -25,7 +25,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mvsoctmr.c,v 1.12 2014/02/26 19:41:46 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: mvsoctmr.c,v 1.13 2014/03/15 10:44:10 kiyohara Exp $); #include opt_ddb.h #include opt_mvsoc.h @@ -159,13 +159,11 @@ mvsoctmr_attach(device_t parent, device_ case MARVELL_ARMADAXP_MV78460: sc-sc_flags = TMR_FLAGS_25MHZ | TMR_FLAGS_NOBRIDGE; break; -#if 0 case MARVELL_ARMADA370_MV6707: case MARVELL_ARMADA370_MV6710: case MARVELL_ARMADA370_MV6W11: sc-sc_flags = TMR_FLAGS_NOBRIDGE | TMR_FLAGS_SYSCLK; break; -#endif } mvsoctmr_timecounter.tc_name = device_xname(self);
CVS commit: src/sys/dev/marvell
Module Name:src Committed By: kiyohara Date: Sat Mar 15 10:40:39 UTC 2014 Modified Files: src/sys/dev/marvell: marvellreg.h Log Message: Add some Armada 370 IDs. And fix comment-out-ed ID for Discovery VI. (from Marvell USP) To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/dev/marvell/marvellreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/marvell/marvellreg.h diff -u src/sys/dev/marvell/marvellreg.h:1.7 src/sys/dev/marvell/marvellreg.h:1.8 --- src/sys/dev/marvell/marvellreg.h:1.7 Wed May 1 12:23:24 2013 +++ src/sys/dev/marvell/marvellreg.h Sat Mar 15 10:40:39 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: marvellreg.h,v 1.7 2013/05/01 12:23:24 rkujawa Exp $ */ +/* $NetBSD: marvellreg.h,v 1.8 2014/03/15 10:40:39 kiyohara Exp $ */ /* * Copyright (c) 2009 KIYOHARA Takashi * All rights reserved. @@ -36,7 +36,7 @@ #if 0 #define MARVELL_DISCOVERY_LT /* : 0x */ #define MARVELL_DISCOVERY_V /* : 0x6450 ? */ -#define MARVELL_DISCOVERY_VI /* : 0x6490 ? */ +#define MARVELL_DISCOVERY_VI /* : 0x6460 ? */ #endif #define MARVELL_ORION_1_88F1181 PCI_PRODUCT_MARVELL_88F1181 @@ -65,6 +65,10 @@ #define MARVELL_ARMADAXP_MV78260 PCI_PRODUCT_MARVELL_MV78260 #define MARVELL_ARMADAXP_MV78460 PCI_PRODUCT_MARVELL_MV78460 +#define MARVELL_ARMADA370_MV6707 PCI_PRODUCT_MARVELL_MV6707 +#define MARVELL_ARMADA370_MV6710 PCI_PRODUCT_MARVELL_MV6710 +#define MARVELL_ARMADA370_MV6W11 PCI_PRODUCT_MARVELL_MV6W11 + #define MARVELL_DISCOVERY_REVA 0x10 #define MARVELL_DISCOVERY_REVB 0x20
CVS commit: src/sys/arch/arm/marvell
Module Name:src
Committed By: kiyohara
Date: Sat Mar 15 10:54:40 UTC 2014
Modified Files:
src/sys/arch/arm/marvell: armadaxp.c mvsocvar.h
Log Message:
Add armada370_getclks().
Remove some white spaces.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/marvell/armadaxp.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/marvell/mvsocvar.h
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/arm/marvell/armadaxp.c
diff -u src/sys/arch/arm/marvell/armadaxp.c:1.6 src/sys/arch/arm/marvell/armadaxp.c:1.7
--- src/sys/arch/arm/marvell/armadaxp.c:1.6 Mon Dec 23 04:12:09 2013
+++ src/sys/arch/arm/marvell/armadaxp.c Sat Mar 15 10:54:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: armadaxp.c,v 1.6 2013/12/23 04:12:09 kiyohara Exp $ */
+/* $NetBSD: armadaxp.c,v 1.7 2014/03/15 10:54:40 kiyohara Exp $ */
/***
Copyright (C) Marvell International Ltd. and its affiliates
@@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
***/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: armadaxp.c,v 1.6 2013/12/23 04:12:09 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: armadaxp.c,v 1.7 2014/03/15 10:54:40 kiyohara Exp $);
#define _INTR_PRIVATE
@@ -61,10 +61,12 @@ __KERNEL_RCSID(0, $NetBSD: armadaxp.c,v
#include dev/marvell/marvellreg.h
-#define EXTRACT_CPU_FREQ_FIELD(sar) (((0x01 (sar 52)) 3) | \
+#define EXTRACT_XP_CPU_FREQ_FIELD(sar) (((0x01 (sar 52)) 3) | \
(0x07 (sar 21)))
-#define EXTRACT_FAB_FREQ_FIELD(sar) (((0x01 (sar 51)) 4) | \
+#define EXTRACT_XP_FAB_FREQ_FIELD(sar) (((0x01 (sar 51)) 4) | \
(0x0F (sar 24)))
+#define EXTRACT_370_CPU_FREQ_FIELD(sar) ((sar 11) 0xf)
+#define EXTRACT_370_FAB_FREQ_FIELD(sar) ((sar 15) 0x1f)
#define MPIC_WRITE(reg, val) (bus_space_write_4(mvsoc_bs_tag, \
mpic_handle, reg, val))
@@ -133,9 +135,15 @@ static struct vco_freq_ratio freq_conf_t
/*22*/ { 2, 5, 10, 5 }
};
-static uint16_t cpu_clock_table[] = {
-1000, 1066, 1200, 1333, 1500, 1666, 1800, 2000, 600, 667, 800, 1600,
-2133, 2200, 2400 };
+static uint16_t clock_table_xp[] = {
+ 1000, 1066, 1200, 1333, 1500, 1666, 1800, 2000,
+ 600, 667, 800, 1600, 2133, 2200, 2400
+};
+static uint16_t clock_table_370[] = {
+ 400, 533, 667, 800, 1000, 1067, 1200, 1333,
+ 1500, 1600, 1667, 1800, 2000, 333, 600, 900,
+ 0
+};
static struct pic_ops armadaxp_picops = {
.pic_unblock_irqs = armadaxp_pic_unblock_irqs,
@@ -324,7 +332,7 @@ void
armadaxp_getclks(void)
{
uint64_t sar_reg;
- uint8_t sar_cpu_freq, sar_fab_freq, array_size;
+ uint8_t sar_cpu_freq, sar_fab_freq;
if (cputype == CPU_ID_MV88SV584X_V7)
mvTclk = 25000; /* 250 MHz */
@@ -334,23 +342,21 @@ armadaxp_getclks(void)
sar_reg = (read_miscreg(ARMADAXP_MISC_SAR_HI) 31) |
read_miscreg(ARMADAXP_MISC_SAR_LO);
- sar_cpu_freq = EXTRACT_CPU_FREQ_FIELD(sar_reg);
- sar_fab_freq = EXTRACT_FAB_FREQ_FIELD(sar_reg);
+ sar_cpu_freq = EXTRACT_XP_CPU_FREQ_FIELD(sar_reg);
+ sar_fab_freq = EXTRACT_XP_FAB_FREQ_FIELD(sar_reg);
/* Check if CPU frequency field has correct value */
- array_size = sizeof(cpu_clock_table) / sizeof(cpu_clock_table[0]);
- if (sar_cpu_freq = array_size)
+ if (sar_cpu_freq = __arraycount(clock_table_xp))
panic(Reserved value in cpu frequency configuration field:
%d, sar_cpu_freq);
/* Check if fabric frequency field has correct value */
- array_size = sizeof(freq_conf_table) / sizeof(freq_conf_table[0]);
- if (sar_fab_freq = array_size)
+ if (sar_fab_freq = __arraycount(freq_conf_table))
panic(Reserved value in fabric frequency configuration field:
%d, sar_fab_freq);
/* Get CPU clock frequency */
- mvPclk = cpu_clock_table[sar_cpu_freq] *
+ mvPclk = clock_table_xp[sar_cpu_freq] *
freq_conf_table[sar_fab_freq].vco_cpu;
/* Get L2CLK clock frequency and use as system clock (mvSysclk) */
@@ -361,8 +367,49 @@ armadaxp_getclks(void)
freq_conf_table[sar_fab_freq].vco_l2c) = 5)
mvSysclk++;
- mvPclk = mvPclk * 100;
- mvSysclk = mvSysclk * 100;
+ mvPclk *= 100;
+ mvSysclk *= 100;
+}
+
+void
+armada370_getclks(void)
+{
+ uint32_t sar;
+ uint8_t cpu_freq, fab_freq;
+
+ sar = read_miscreg(ARMADAXP_MISC_SAR_LO);
+ if (sar 0x0010)
+ mvTclk = 2; /* 200 MHz */
+ else
+ mvTclk = 16667; /* 166 MHz */
+
+ cpu_freq = EXTRACT_370_CPU_FREQ_FIELD(sar);
+ fab_freq = EXTRACT_370_FAB_FREQ_FIELD(sar);
+
+ /* Check if CPU frequency field has correct value */
+ if (cpu_freq = __arraycount(clock_table_370))
+ panic(Reserved value in cpu frequency configuration field:
+ %d, cpu_freq);
+
+ /* Check if fabric frequency field has correct value */
+ if (fab_freq = __arraycount(freq_conf_table))
+ panic(Reserved value in fabric
CVS commit: src/sys/dev/marvell
Module Name:src
Committed By: kiyohara
Date: Sat Mar 15 11:47:43 UTC 2014
Modified Files:
src/sys/dev/marvell: marvellvar.h
Log Message:
Add tags to marvell_attach_args.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/marvell/marvellvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/marvell/marvellvar.h
diff -u src/sys/dev/marvell/marvellvar.h:1.4 src/sys/dev/marvell/marvellvar.h:1.5
--- src/sys/dev/marvell/marvellvar.h:1.4 Mon Feb 17 04:52:44 2014
+++ src/sys/dev/marvell/marvellvar.h Sat Mar 15 11:47:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: marvellvar.h,v 1.4 2014/02/17 04:52:44 kiyohara Exp $ */
+/* $NetBSD: marvellvar.h,v 1.5 2014/03/15 11:47:43 kiyohara Exp $ */
/*
* Copyright (c) 2009 KIYOHARA Takashi
* All rights reserved.
@@ -59,6 +59,7 @@ struct marvell_attach_args {
bus_size_t mva_size;
bus_dma_tag_t mva_dmat;
int mva_irq;
+ enum marvell_tags *mva_tags;
};
#include locators.h
CVS commit: src/sys/arch/arm/marvell
Module Name:src
Committed By: kiyohara
Date: Sat Mar 15 11:48:38 UTC 2014
Modified Files:
src/sys/arch/arm/marvell: mvsoc.c
Log Message:
Support Armada 370.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/marvell/mvsoc.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/arm/marvell/mvsoc.c
diff -u src/sys/arch/arm/marvell/mvsoc.c:1.17 src/sys/arch/arm/marvell/mvsoc.c:1.18
--- src/sys/arch/arm/marvell/mvsoc.c:1.17 Mon Feb 17 05:00:38 2014
+++ src/sys/arch/arm/marvell/mvsoc.c Sat Mar 15 11:48:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsoc.c,v 1.17 2014/02/17 05:00:38 kiyohara Exp $ */
+/* $NetBSD: mvsoc.c,v 1.18 2014/03/15 11:48:37 kiyohara Exp $ */
/*
* Copyright (c) 2007, 2008, 2013, 2014 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mvsoc.c,v 1.17 2014/02/17 05:00:38 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: mvsoc.c,v 1.18 2014/03/15 11:48:37 kiyohara Exp $);
#include opt_cputypes.h
#include opt_mvsoc.h
@@ -271,10 +271,6 @@ static struct {
#endif
};
-#if defined(ARMADAXP)
-#undef ARMADAXP
-#define ARMADAXP(m) MARVELL_ARMADAXP_ ## m
-#endif
#if defined(ORION)
#define ORION_1(m) MARVELL_ORION_1_ ## m
#define ORION_2(m) MARVELL_ORION_2_ ## m
@@ -287,6 +283,11 @@ static struct {
#undef MV78XX0
#define MV78XX0(m) MARVELL_MV78XX0_ ## m
#endif
+#if defined(ARMADAXP)
+#undef ARMADAXP
+#define ARMADAXP(m) MARVELL_ARMADAXP_ ## m
+#define ARMADA370(m) MARVELL_ARMADA370_ ## m
+#endif
static struct {
uint16_t model;
uint8_t rev;
@@ -348,9 +349,102 @@ static struct {
{ ARMADAXP(MV78260), 1, MV78260, A0, Armada XP },
{ ARMADAXP(MV78460), 1, MV78460, A0, Armada XP },
{ ARMADAXP(MV78460), 2, MV78460, B0, Armada XP },
+
+ { ARMADA370(MV6707), 0, MV6707, A0, Armada 370 },
+ { ARMADA370(MV6707), 1, MV6707, A1, Armada 370 },
+ { ARMADA370(MV6710), 0, MV6710, A0, Armada 370 },
+ { ARMADA370(MV6710), 1, MV6710, A1, Armada 370 },
+ { ARMADA370(MV6W11), 0, MV6W11, A0, Armada 370 },
+ { ARMADA370(MV6W11), 1, MV6W11, A1, Armada 370 },
+#endif
+};
+
+enum marvell_tags ddr_tags[] = {
+ MARVELL_TAG_SDRAM_CS0,
+ MARVELL_TAG_SDRAM_CS1,
+ MARVELL_TAG_SDRAM_CS2,
+ MARVELL_TAG_SDRAM_CS3,
+
+ MARVELL_TAG_UNDEFINED
+};
+enum marvell_tags ddr3_tags[] = {
+ MARVELL_TAG_DDR3_CS0,
+ MARVELL_TAG_DDR3_CS1,
+ MARVELL_TAG_DDR3_CS2,
+ MARVELL_TAG_DDR3_CS3,
+
+ MARVELL_TAG_UNDEFINED
+};
+static struct {
+ uint16_t model;
+ uint8_t rev;
+ enum marvell_tags *tags;
+} tagstbl[] = {
+#if defined(ORION)
+ { ORION_1(88F1181), 0, ddr_tags },
+ { ORION_1(88F5082), 2, ddr_tags },
+ { ORION_1(88F5180N), 3, ddr_tags },
+ { ORION_1(88F5181), 0, ddr_tags },
+ { ORION_1(88F5181), 1, ddr_tags },
+ { ORION_1(88F5181), 2, ddr_tags },
+ { ORION_1(88F5181), 3, ddr_tags },
+ { ORION_1(88F5181), 8, ddr_tags },
+ { ORION_1(88F5181), 9, ddr_tags },
+ { ORION_1(88F5182), 0, ddr_tags },
+ { ORION_1(88F5182), 1, ddr_tags },
+ { ORION_1(88F5182), 2, ddr_tags },
+ { ORION_1(88F6082), 0, ddr_tags },
+ { ORION_1(88F6082), 1, ddr_tags },
+ { ORION_1(88F6183), 0, ddr_tags },
+ { ORION_1(88F6183), 1, ddr_tags },
+ { ORION_1(88W8660), 0, ddr_tags },
+ { ORION_1(88W8660), 1, ddr_tags },
+
+ { ORION_2(88F1281), 0, ddr_tags },
+ { ORION_2(88F5281), 0, ddr_tags },
+ { ORION_2(88F5281), 1, ddr_tags },
+ { ORION_2(88F5281), 2, ddr_tags },
+ { ORION_2(88F5281), 3, ddr_tags },
+ { ORION_2(88F5281), 4, ddr_tags },
+#endif
+
+#if defined(KIRKWOOD)
+ { KIRKWOOD(88F6180), 2, ddr_tags },
+ { KIRKWOOD(88F6180), 3, ddr_tags },
+ { KIRKWOOD(88F6192), 0, ddr_tags },
+ { KIRKWOOD(88F6192), 2, ddr_tags },
+ { KIRKWOOD(88F6192), 3, ddr_tags },
+ { KIRKWOOD(88F6281), 0, ddr_tags },
+ { KIRKWOOD(88F6281), 2, ddr_tags },
+ { KIRKWOOD(88F6281), 3, ddr_tags },
+ { KIRKWOOD(88F6282), 0, ddr_tags },
+ { KIRKWOOD(88F6282), 1, ddr_tags },
+#endif
+
+#if defined(MV78XX0)
+ { MV78XX0(MV78100), 1, ddr_tags },
+ { MV78XX0(MV78100), 2, ddr_tags },
+ { MV78XX0(MV78200), 1, ddr_tags },
+#endif
+
+#if defined(ARMADAXP)
+ { ARMADAXP(MV78130), 1, ddr3_tags },
+ { ARMADAXP(MV78160), 1, ddr3_tags },
+ { ARMADAXP(MV78230), 1, ddr3_tags },
+ { ARMADAXP(MV78260), 1, ddr3_tags },
+ { ARMADAXP(MV78460), 1, ddr3_tags },
+ { ARMADAXP(MV78460), 2, ddr3_tags },
+
+ { ARMADA370(MV6707), 0, ddr3_tags },
+ { ARMADA370(MV6707), 1, ddr3_tags },
+ { ARMADA370(MV6710), 0, ddr3_tags },
+ { ARMADA370(MV6710), 1, ddr3_tags },
+ { ARMADA370(MV6W11), 0, ddr3_tags },
+ { ARMADA370(MV6W11), 1, ddr3_tags },
#endif
};
+
#define OFFSET_DEFAULT MVA_OFFSET_DEFAULT
#define IRQ_DEFAULT MVA_IRQ_DEFAULT
static const struct mvsoc_periph {
@@ -698,6 +792,25 @@ static const struct mvsoc_periph {
{ ARMADAXP(MV78460), mvgbec, 3, ARMADAXP_GBE3_BASE,IRQ_DEFAULT },
{ ARMADAXP(MV78460), mvcesa, 0, ARMADAXP_CESA0_BASE,ARMADAXP_IRQ_CESA0 },
{ ARMADAXP(MV78460), mvcesa, 1,
CVS commit: src/sys/arch/cesfic/cesfic
Module Name:src Committed By: tsutsui Date: Sat Mar 15 11:53:30 UTC 2014 Modified Files: src/sys/arch/cesfic/cesfic: locore.s Log Message: Use common m68k/busaddrerr.s for bus error and address error handlers. No binary changes on GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/cesfic/cesfic/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/cesfic/cesfic/locore.s diff -u src/sys/arch/cesfic/cesfic/locore.s:1.31 src/sys/arch/cesfic/cesfic/locore.s:1.32 --- src/sys/arch/cesfic/cesfic/locore.s:1.31 Sun Mar 9 16:28:43 2014 +++ src/sys/arch/cesfic/cesfic/locore.s Sat Mar 15 11:53:30 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.31 2014/03/09 16:28:43 tsutsui Exp $ */ +/* $NetBSD: locore.s,v 1.32 2014/03/15 11:53:30 tsutsui Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -387,191 +387,10 @@ Lmainreturned: */ #include m68k/m68k/trap_subr.s -#if defined(M68040) || defined(M68060) -ENTRY_NOPROFILE(addrerr4060) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - movl %sp@(FR_HW+8),%sp@- - clrl %sp@- | dummy code - movl #T_ADDRERR,%sp@- | mark address error - jra _ASM_LABEL(faultstkadj) | and deal with it -#endif - -#if defined(M68060) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - movel %sp@(FR_HW+12),%d0 | FSLW - btst #2,%d0 | branch prediction error? - jeq Lnobpe - movc %cacr,%d2 - orl #IC60_CABC,%d2 | clear all branch cache entries - movc %d2,%cacr - movl %d0,%d1 - andl #0x7ffd,%d1 - jeq _ASM_LABEL(faultstkadjnotrap2) -Lnobpe: -| we need to adjust for misaligned addresses - movl %sp@(FR_HW+8),%d1 | grab VA - btst #27,%d0 | check for mis-aligned access - jeq Lberr3 | no, skip - addl #28,%d1 | yes, get into next page - | operand case: 3, - | instruction case: 4+12+12 - andl #PG_FRAME,%d1| and truncate -Lberr3: - movl %d1,%sp@- - movl %d0,%sp@- | code is FSLW now. - andw #0x1f80,%d0 - jeq Lberr60 | it is a bus error - movl #T_MMUFLT,%sp@- | show that we are an MMU fault - jra _ASM_LABEL(faultstkadj) | and deal with it -Lberr60: - tstl _C_LABEL(nofault) | catch bus error? - jeq Lisberr | no, handle as usual - movl _C_LABEL(nofault),%sp@- | yes, - jbsr _C_LABEL(longjmp) | longjmp(nofault) - /* NOTREACHED */ -#endif -#if defined(M68040) -ENTRY_NOPROFILE(buserr40) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - movl %sp@(FR_HW+20),%d1 | get fault address - moveq #0,%d0 - movw %sp@(FR_HW+12),%d0 | get SSW - btst #11,%d0 | check for mis-aligned - jeq Lbe1stpg | no skip - addl #3,%d1 | get into next page - andl #PG_FRAME,%d1 | and truncate -Lbe1stpg: - movl %d1,%sp@- | pass fault address. - movl %d0,%sp@- | pass SSW as code - btst #10,%d0 | test ATC - jeq Lberr40 | it is a bus error - movl #T_MMUFLT,%sp@- | show that we are an MMU fault - jra _ASM_LABEL(faultstkadj) | and deal with it -Lberr40: - tstl _C_LABEL(nofault) | catch bus error? - jeq Lisberr | no, handle as usual - movl _C_LABEL(nofault),%sp@- | yes, - jbsr _C_LABEL(longjmp) | longjmp(nofault) - /* NOTREACHED */ -#endif - -#if defined(M68020) || defined(M68030) -ENTRY_NOPROFILE(busaddrerr2030) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - moveq #0,%d0 - movw %sp@(FR_HW+10),%d0 | grab SSW for fault processing - btst #12,%d0 | RB set? - jeq LbeX0 | no, test RC - bset #14,%d0 | yes, must set FB - movw %d0,%sp@(FR_HW+10) | for hardware too -LbeX0: - btst #13,%d0 | RC set? - jeq LbeX1 | no, skip - bset #15,%d0 | yes, must set FC - movw %d0,%sp@(FR_HW+10) | for hardware too -LbeX1: - btst #8,%d0 | data fault? - jeq Lbe0 | no, check for hard cases - movl %sp@(FR_HW+16),%d1 | fault address is as given in frame - jra Lbe10 | thats it -Lbe0: - btst #4,%sp@(FR_HW+6) | long (type B) stack frame? - jne Lbe4 | yes, go handle - movl %sp@(FR_HW+2),%d1 | no, can use save PC - btst #14,%d0 | FB set? - jeq Lbe3 | no, try FC - addql #4,%d1 | yes, adjust address - jra Lbe10 | done -Lbe3: - btst #15,%d0 | FC set? - jeq Lbe10 | no, done - addql #2,%d1 | yes, adjust address - jra Lbe10 | done -Lbe4: - movl %sp@(FR_HW+36),%d1 | long format, use stage B address - btst #15,%d0 | FC set? - jeq Lbe10 | no, all done - subql #2,%d1 | yes, adjust address -Lbe10: - movl %d1,%sp@- | push fault VA - movl %d0,%sp@- | and padded SSW - movw %sp@(FR_HW+8+6),%d0 | get frame format/vector offset - andw #0x0FFF,%d0 | clear out frame format - cmpw
CVS commit: src/sys/arch/mvme68k/mvme68k
Module Name:src Committed By: tsutsui Date: Sat Mar 15 12:02:28 UTC 2014 Modified Files: src/sys/arch/mvme68k/mvme68k: locore.s Log Message: Remove duplicated INTERRUPT_SAVEREG and INTERRUPT_RESTOREREG macro. They are in m68k/asm.h and now using different register format. To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/sys/arch/mvme68k/mvme68k/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/mvme68k/mvme68k/locore.s diff -u src/sys/arch/mvme68k/mvme68k/locore.s:1.112 src/sys/arch/mvme68k/mvme68k/locore.s:1.113 --- src/sys/arch/mvme68k/mvme68k/locore.s:1.112 Sun Mar 9 14:53:52 2014 +++ src/sys/arch/mvme68k/mvme68k/locore.s Sat Mar 15 12:02:28 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.112 2014/03/09 14:53:52 tsutsui Exp $ */ +/* $NetBSD: locore.s,v 1.113 2014/03/15 12:02:28 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -1114,9 +1114,6 @@ Lbrkpt3: * intrhand_vectored is the entry point for vectored interrupts. */ -#define INTERRUPT_SAVEREG moveml #0xC0C0,%sp@- -#define INTERRUPT_RESTOREREG moveml %sp@+,#0x0303 - ENTRY_NOPROFILE(intrhand_autovec) addql #1,_C_LABEL(interrupt_depth) INTERRUPT_SAVEREG
CVS commit: src/sys/arch/mvme68k/mvme68k
Module Name:src Committed By: tsutsui Date: Sat Mar 15 12:04:22 UTC 2014 Modified Files: src/sys/arch/mvme68k/mvme68k: locore.s Log Message: Use common m68k/busaddrerr.s for bus error and address error handlers. No binary changes on GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.113 -r1.114 src/sys/arch/mvme68k/mvme68k/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/mvme68k/mvme68k/locore.s diff -u src/sys/arch/mvme68k/mvme68k/locore.s:1.113 src/sys/arch/mvme68k/mvme68k/locore.s:1.114 --- src/sys/arch/mvme68k/mvme68k/locore.s:1.113 Sat Mar 15 12:02:28 2014 +++ src/sys/arch/mvme68k/mvme68k/locore.s Sat Mar 15 12:04:22 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.113 2014/03/15 12:02:28 tsutsui Exp $ */ +/* $NetBSD: locore.s,v 1.114 2014/03/15 12:04:22 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -709,174 +709,10 @@ Lmemc040berr: */ #include m68k/m68k/trap_subr.s -#if defined(M68040) || defined(M68060) -ENTRY_NOPROFILE(addrerr4060) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - movl %sp@(FR_HW+8),%sp@- - clrl %sp@- | dummy code - movl #T_ADDRERR,%sp@- | mark address error - jra _ASM_LABEL(faultstkadj) | and deal with it -#endif - -#if defined(M68060) -ENTRY_NOPROFILE(buserr60) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - movel %sp@(FR_HW+12),%d0 | FSLW - btst #2,%d0 | branch prediction error? - jeq Lnobpe - movc %cacr,%d2 - orl #IC60_CABC,%d2 | clear all branch cache entries - movc %d2,%cacr - movl %d0,%d1 - andl #0x7ffd,%d1 - jeq _ASM_LABEL(faultstkadjnotrap2) -Lnobpe: -| we need to adjust for misaligned addresses - movl %sp@(FR_HW+8),%d1 | grab VA - btst #27,%d0 | check for mis-aligned access - jeq Lberr3 | no, skip - addl #28,%d1 | yes, get into next page - | operand case: 3, - | instruction case: 4+12+12 - andl #PG_FRAME,%d1 | and truncate -Lberr3: - movl %d1,%sp@- - movl %d0,%sp@- | code is FSLW now. - andw #0x1f80,%d0 - jeq Lberr60 | it is a bus error - movl #T_MMUFLT,%sp@- | show that we are an MMU fault - jra _ASM_LABEL(faultstkadj) | and deal with it -Lberr60: - tstl _C_LABEL(nofault) | catch bus error? - jeq Lisberr | no, handle as usual - movl _C_LABEL(nofault),%sp@- | yes, - jbsr _C_LABEL(longjmp) | longjmp(nofault) - /* NOTREACHED */ -#endif -#if defined(M68040) -ENTRY_NOPROFILE(buserr40) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - movl %sp@(FR_HW+20),%d1 | get fault address - moveq #0,%d0 - movw %sp@(FR_HW+12),%d0 | get SSW - btst #11,%d0 | check for mis-aligned - jeq Lbe1stpg | no skip - addl #3,%d1 | get into next page - andl #PG_FRAME,%d1 | and truncate -Lbe1stpg: - movl %d1,%sp@- | pass fault address. - movl %d0,%sp@- | pass SSW as code - btst #10,%d0 | test ATC - jeq Lberr40 | it is a bus error - movl #T_MMUFLT,%sp@- | show that we are an MMU fault - jra _ASM_LABEL(faultstkadj) | and deal with it -Lberr40: - tstl _C_LABEL(nofault) | catch bus error? - jeq Lisberr | no, handle as usual - movl _C_LABEL(nofault),%sp@- | yes, - jbsr _C_LABEL(longjmp) | longjmp(nofault) - /* NOTREACHED */ -#endif - -#if defined(M68020) || defined(M68030) -ENTRY_NOPROFILE(busaddrerr2030) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - moveq #0,%d0 - movw %sp@(FR_HW+10),%d0 | grab SSW for fault processing - btst #12,%d0 | RB set? - jeq LbeX0 | no, test RC - bset #14,%d0 | yes, must set FB - movw %d0,%sp@(FR_HW+10) | for hardware too -LbeX0: - btst #13,%d0 | RC set? - jeq LbeX1 | no, skip - bset #15,%d0 | yes, must set FC - movw %d0,%sp@(FR_HW+10) | for hardware too -LbeX1: - btst #8,%d0 | data fault? - jeq Lbe0 | no, check for hard cases - movl %sp@(FR_HW+16),%d1 | fault address is as given in frame - jra Lbe10 | thats it -Lbe0: - btst #4,%sp@(FR_HW+6) | long (type B) stack frame? - jne Lbe4 | yes, go handle - movl %sp@(FR_HW+2),%d1 | no, can use save PC - btst #14,%d0 | FB set? - jeq Lbe3 | no, try FC - addql #4,%d1 | yes, adjust address - jra Lbe10 | done -Lbe3: - btst #15,%d0 | FC set? - jeq Lbe10 | no, done - addql #2,%d1 | yes, adjust address - jra Lbe10 | done -Lbe4: - movl %sp@(FR_HW+36),%d1 | long format, use stage B address - btst #15,%d0 | FC set? - jeq Lbe10 | no, all done - subql #2,%d1 | yes, adjust address -Lbe10: - movl %d1,%sp@- | push fault VA - movl %d0,%sp@- | and padded SSW - movw %sp@(FR_HW+8+6),%d0 | get frame format/vector offset - andw #0x0FFF,%d0 | clear
CVS commit: src/sys/arch/next68k/next68k
Module Name:src Committed By: tsutsui Date: Sat Mar 15 12:06:54 UTC 2014 Modified Files: src/sys/arch/next68k/next68k: locore.s Log Message: Use common m68k/busaddrerr.s for bus error and address error handlers. No binary changes on GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/arch/next68k/next68k/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/next68k/next68k/locore.s diff -u src/sys/arch/next68k/next68k/locore.s:1.64 src/sys/arch/next68k/next68k/locore.s:1.65 --- src/sys/arch/next68k/next68k/locore.s:1.64 Sun Mar 9 16:28:43 2014 +++ src/sys/arch/next68k/next68k/locore.s Sat Mar 15 12:06:54 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.64 2014/03/09 16:28:43 tsutsui Exp $ */ +/* $NetBSD: locore.s,v 1.65 2014/03/15 12:06:54 tsutsui Exp $ */ /* * Copyright (c) 1998 Darrin B. Jewell @@ -507,192 +507,10 @@ Lenab3: */ #include m68k/m68k/trap_subr.s -#if defined(M68040) || defined(M68060) -ENTRY_NOPROFILE(addrerr4060) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - movl %sp@(FR_HW+8),%sp@- - clrl %sp@- | dummy code - movl #T_ADDRERR,%sp@- | mark address error - jra _ASM_LABEL(faultstkadj) | and deal with it -#endif - -#if defined(M68060) -ENTRY_NOPROFILE(buserr60) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - movel %sp@(FR_HW+12),%d0 | FSLW - btst #2,%d0 | branch prediction error? - jeq Lnobpe - movc %cacr,%d2 - orl #IC60_CABC,%d2 | clear all branch cache entries - movc %d2,%cacr - movl %d0,%d1 - andl #0x7ffd,%d1 - jeq _ASM_LABEL(faultstkadjnotrap2) -Lnobpe: -| we need to adjust for misaligned addresses - movl %sp@(FR_HW+8),%d1 | grab VA - btst #27,%d0 | check for mis-aligned access - jeq Lberr3 | no, skip - addl #28,%d1 | yes, get into next page - | operand case: 3, - | instruction case: 4+12+12 - andl #PG_FRAME,%d1 | and truncate -Lberr3: - movl %d1,%sp@- - movl %d0,%sp@- | code is FSLW now. - andw #0x1f80,%d0 - jeq Lberr60 | it is a bus error - movl #T_MMUFLT,%sp@- | show that we are an MMU fault - jra _ASM_LABEL(faultstkadj) | and deal with it -Lberr60: - tstl _C_LABEL(nofault) | catch bus error? - jeq Lisberr | no, handle as usual - movl _C_LABEL(nofault),%sp@- | yes, - jbsr _C_LABEL(longjmp) | longjmp(nofault) - /* NOTREACHED */ -#endif -#if defined(M68040) -ENTRY_NOPROFILE(buserr40) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - movl %sp@(FR_HW+20),%d1 | get fault address - moveq #0,%d0 - movw %sp@(FR_HW+12),%d0 | get SSW - btst #11,%d0 | check for mis-aligned - jeq Lbe1stpg | no skip - addl #3,%d1 | get into next page - andl #PG_FRAME,%d1 | and truncate -Lbe1stpg: - movl %d1,%sp@- | pass fault address. - movl %d0,%sp@- | pass SSW as code - btst #10,%d0 | test ATC - jeq Lberr40 | it is a bus error - movl #T_MMUFLT,%sp@- | show that we are an MMU fault - jra _ASM_LABEL(faultstkadj) | and deal with it -Lberr40: - tstl _C_LABEL(nofault) | catch bus error? - jeq Lisberr | no, handle as usual - movl _C_LABEL(nofault),%sp@- | yes, - jbsr _C_LABEL(longjmp) | longjmp(nofault) - /* NOTREACHED */ -#endif - -#if defined(M68020) || defined(M68030) -ENTRY_NOPROFILE(busaddrerr2030) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - moveq #0,%d0 - movw %sp@(FR_HW+10),%d0 | grab SSW for fault processing - btst #12,%d0 | RB set? - jeq LbeX0 | no, test RC - bset #14,%d0 | yes, must set FB - movw %d0,%sp@(FR_HW+10) | for hardware too -LbeX0: - btst #13,%d0 | RC set? - jeq LbeX1 | no, skip - bset #15,%d0 | yes, must set FC - movw %d0,%sp@(FR_HW+10) | for hardware too -LbeX1: - btst #8,%d0 | data fault? - jeq Lbe0 | no, check for hard cases - movl %sp@(FR_HW+16),%d1 | fault address is as given in frame - jra Lbe10 | thats it -Lbe0: - btst #4,%sp@(FR_HW+6) | long (type B) stack frame? - jne Lbe4 | yes, go handle - movl %sp@(FR_HW+2),%d1 | no, can use save PC - btst #14,%d0 | FB set? - jeq Lbe3 | no, try FC - addql #4,%d1 | yes, adjust address - jra Lbe10 | done -Lbe3: - btst #15,%d0 | FC set? - jeq Lbe10 | no, done - addql #2,%d1 | yes, adjust address - jra Lbe10 | done -Lbe4: - movl %sp@(FR_HW+36),%d1 | long format, use stage B address - btst #15,%d0 | FC set? - jeq Lbe10 | no, all done - subql #2,%d1 | yes, adjust address -Lbe10: - movl %d1,%sp@- | push fault VA - movl %d0,%sp@- | and padded SSW - movw %sp@(FR_HW+8+6),%d0 | get frame format/vector offset - andw #0x0FFF,%d0 | clear out frame
CVS commit: src/sys/arch/mac68k/mac68k
Module Name:src Committed By: tsutsui Date: Sat Mar 15 12:11:23 UTC 2014 Modified Files: src/sys/arch/mac68k/mac68k: locore.s Log Message: Use common m68k/busaddrerr.s for bus error and address error handlers. No binary changes on GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.169 -r1.170 src/sys/arch/mac68k/mac68k/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/mac68k/mac68k/locore.s diff -u src/sys/arch/mac68k/mac68k/locore.s:1.169 src/sys/arch/mac68k/mac68k/locore.s:1.170 --- src/sys/arch/mac68k/mac68k/locore.s:1.169 Sun Mar 9 16:28:43 2014 +++ src/sys/arch/mac68k/mac68k/locore.s Sat Mar 15 12:11:23 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.169 2014/03/09 16:28:43 tsutsui Exp $ */ +/* $NetBSD: locore.s,v 1.170 2014/03/15 12:11:23 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -474,187 +474,16 @@ Lnocache0: */ #include m68k/m68k/trap_subr.s +/* + * Use common m68k bus error and address error handlers. + */ .data GLOBAL(mac68k_a2_fromfault) .long 0 GLOBAL(m68k_fault_addr) .long 0 -#if defined(M68040) || defined(M68060) -ENTRY_NOPROFILE(addrerr4060) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save %USP - movl %a0,%sp@(FR_SP) | in the savearea - movl %sp@(FR_HW+8),%sp@- - clrl %sp@- | dummy code - movl #T_ADDRERR,%sp@- | mark address error - jra _ASM_LABEL(faultstkadj) | and deal with it -#endif - -#if defined(M68060) -ENTRY_NOPROFILE(buserr60) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save %USP - movl %a0,%sp@(FR_SP) | in the savearea - movel %sp@(FR_HW+12),%d0 | FSLW - btst #2,%d0 | branch prediction error? - jeq Lnobpe - movc %cacr,%d2 - orl #IC60_CABC,%d2 | clear all branch cache entries - movc %d2,%cacr - movl %d0,%d1 - andl #0x7ffd,%d1 - jeq _ASM_LABEL(faultstkadjnotrap2) -Lnobpe: -| we need to adjust for misaligned addresses - movl %sp@(FR_HW+8),%d1 | grab VA - btst #27,%d0 | check for mis-aligned access - jeq Lberr3 | no, skip - addl #28,%d1 | yes, get into next page - | operand case: 3, - | instruction case: 4+12+12 - andl #PG_FRAME,%d1 | and truncate -Lberr3: - movl %d1,%sp@- - movl %d0,%sp@- | code is FSLW now. - andw #0x1f80,%d0 - jeq Lberr60 | it is a bus error - movl #T_MMUFLT,%sp@- | show that we are an MMU fault - jra _ASM_LABEL(faultstkadj) | and deal with it -Lberr60: - tstl _C_LABEL(nofault) | catch bus error? - jeq Lisberr | no, handle as usual - movl %a2,_C_LABEL(mac68k_a2_fromfault) | save %a2 - movl %sp@(FR_HW+8+8),_C_LABEL(m68k_fault_addr) | save fault addr - movl _C_LABEL(nofault),%sp@- | yes, - jbsr _C_LABEL(longjmp) | longjmp(nofault) - /* NOTREACHED */ -#endif -#if defined(M68040) -ENTRY_NOPROFILE(buserr40) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save %USP - movl %a0,%sp@(FR_SP) | in the savearea - movl %sp@(FR_HW+20),%d1 | get fault address - moveq #0,%d0 - movw %sp@(FR_HW+12),%d0 | get SSW - btst #11,%d0 | check for mis-aligned - jeq Lbe1stpg | no skip - addl #3,%d1 | get into next page - andl #PG_FRAME,%d1 | and truncate -Lbe1stpg: - movl %d1,%sp@- | pass fault address. - movl %d0,%sp@- | pass SSW as code - btst #10,%d0 | test ATC - jeq Lberr40 | it is a bus error - movl #T_MMUFLT,%sp@- | show that we are an MMU fault - jra _ASM_LABEL(faultstkadj) | and deal with it -Lberr40: - tstl _C_LABEL(nofault) | catch bus error? - jeq Lisberr | no, handle as usual - movl %a2,_C_LABEL(mac68k_a2_fromfault) | save %a2 - movl %sp@(FR_HW+8+20),_C_LABEL(m68k_fault_addr) | save fault addr - movl _C_LABEL(nofault),%sp@- | yes, - jbsr _C_LABEL(longjmp) | longjmp(nofault) - /* NOTREACHED */ -#endif - -ENTRY_NOPROFILE(busaddrerr2030) -#if !(defined(M68020) || defined(M68030)) - jra _C_LABEL(badtrap) -#else - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save %USP - movl %a0,%sp@(FR_SP) | in the savearea - moveq #0,%d0 - movw %sp@(FR_HW+10),%d0 | grab SSW for fault processing - btst #12,%d0 | RB set? - jeq LbeX0 | no, test RC - bset #14,%d0 | yes, must set FB - movw %d0,%sp@(FR_HW+10) | for hardware too -LbeX0: - btst #13,%d0 | RC set? - jeq LbeX1 | no, skip - bset #15,%d0 | yes, must set FC - movw %d0,%sp@(FR_HW+10) | for hardware too -LbeX1: - btst #8,%d0 | data fault? - jeq Lbe0 | no, check for hard cases - movl %sp@(FR_HW+16),%d1 | fault address is as given in frame - jra Lbe10 | thats it -Lbe0: - btst #4,%sp@(FR_HW+6) | long (type B) stack frame? - jne Lbe4 | yes, go handle - movl %sp@(FR_HW+2),%d1 | no, can use save PC - btst #14,%d0 | FB set? - jeq Lbe3 | no, try FC - addql #4,%d1 | yes, adjust address - jra Lbe10 | done -Lbe3: - btst #15,%d0 | FC set? - jeq Lbe10 | no,
CVS commit: src/lib/libm/arch/vax
Module Name:src Committed By: martin Date: Sat Mar 15 12:20:09 UTC 2014 Modified Files: src/lib/libm/arch/vax: n_support.S Log Message: Provide copysignf and copysignl To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libm/arch/vax/n_support.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libm/arch/vax/n_support.S diff -u src/lib/libm/arch/vax/n_support.S:1.7 src/lib/libm/arch/vax/n_support.S:1.8 --- src/lib/libm/arch/vax/n_support.S:1.7 Mon Feb 3 21:22:21 2014 +++ src/lib/libm/arch/vax/n_support.S Sat Mar 15 12:20:09 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: n_support.S,v 1.7 2014/02/03 21:22:21 martin Exp $ */ +/* $NetBSD: n_support.S,v 1.8 2014/03/15 12:20:09 martin Exp $ */ /* * Copyright (c) 1985, 1993 * The Regents of the University of California. All rights reserved. @@ -32,6 +32,7 @@ #include machine/asm.h WEAK_ALIAS(logbl,logb) +WEAK_ALIAS(copysignl, copysign) .text _sccsid: @@ -60,6 +61,15 @@ ENTRY(copysign, 0) bisw2 %r2,%r0 # copy the sign bit of y to x Lz: ret +ENTRY(copysignf, 0) + movw 4(%ap),%r0 # load x into %r0 + bicw3 $0x807f,%r0,%r2 # mask off the exponent of x + beql 1f # if zero or reserved op then return x + bicw3 $0x7fff,8(%ap),%r2 # copy the sign bit of y into %r2 + bicw2 $0x8000,%r0 # replace x by |x| + bisw2 %r2,%r0 # copy the sign bit of y to x +1: ret + /* * float logbf(float x); */
CVS commit: src/sys/dev/marvell
Module Name:src
Committed By: kiyohara
Date: Sat Mar 15 13:33:48 UTC 2014
Modified Files:
src/sys/dev/marvell: ehci_mv.c gtidmac.c gtidmacvar.h if_mvgbe.c
mvpex.c mvpexvar.h mvsata_mv.c mvsdio.c
Log Message:
Support Armada 370 and DDR3 tags.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/marvell/ehci_mv.c \
src/sys/dev/marvell/mvsdio.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/marvell/gtidmac.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/marvell/gtidmacvar.h
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/marvell/if_mvgbe.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/marvell/mvpex.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/marvell/mvpexvar.h
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/marvell/mvsata_mv.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/dev/marvell/ehci_mv.c
diff -u src/sys/dev/marvell/ehci_mv.c:1.4 src/sys/dev/marvell/ehci_mv.c:1.5
--- src/sys/dev/marvell/ehci_mv.c:1.4 Sun Sep 8 04:10:23 2013
+++ src/sys/dev/marvell/ehci_mv.c Sat Mar 15 13:33:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_mv.c,v 1.4 2013/09/08 04:10:23 kiyohara Exp $ */
+/* $NetBSD: ehci_mv.c,v 1.5 2014/03/15 13:33:48 kiyohara Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ehci_mv.c,v 1.4 2013/09/08 04:10:23 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: ehci_mv.c,v 1.5 2014/03/15 13:33:48 kiyohara Exp $);
#include sys/param.h
#include sys/bus.h
@@ -164,8 +164,8 @@ struct mvusb_softc {
static int mvusb_match(device_t, cfdata_t, void *);
static void mvusb_attach(device_t, device_t, void *);
-static void mvusb_init(struct mvusb_softc *);
-static void mvusb_wininit(struct mvusb_softc *);
+static void mvusb_init(struct mvusb_softc *, enum marvell_tags *);
+static void mvusb_wininit(struct mvusb_softc *, enum marvell_tags *);
static void mvusb_vendor_init(struct ehci_softc *);
static int mvusb_vendor_port_status(struct ehci_softc *, uint32_t, int);
@@ -216,7 +216,7 @@ mvusb_attach(device_t parent, device_t s
aprint_error_dev(self, can't map registers\n);
return;
}
- mvusb_init(sc);
+ mvusb_init(sc, mva-mva_tags);
/* Map I/O registers for ehci */
sc-sc.sc_size = MARVELL_USB_EHCI_SIZE;
@@ -254,7 +254,7 @@ mvusb_attach(device_t parent, device_t s
}
static void
-mvusb_init(struct mvusb_softc *sc)
+mvusb_init(struct mvusb_softc *sc, enum marvell_tags *tags)
{
uint32_t reg;
int opr_offs;
@@ -357,24 +357,16 @@ mvusb_init(struct mvusb_softc *sc)
reg);
}
- mvusb_wininit(sc);
+ mvusb_wininit(sc, tags);
}
static void
-mvusb_wininit(struct mvusb_softc *sc)
+mvusb_wininit(struct mvusb_softc *sc, enum marvell_tags *tags)
{
device_t pdev = device_parent(sc-sc.sc_dev);
uint64_t base;
uint32_t size;
int window, target, attr, rv, i;
- static int tags[] = {
- MARVELL_TAG_SDRAM_CS0,
- MARVELL_TAG_SDRAM_CS1,
- MARVELL_TAG_SDRAM_CS2,
- MARVELL_TAG_SDRAM_CS3,
-
- MARVELL_TAG_UNDEFINED,
- };
for (window = 0, i = 0;
tags[i] != MARVELL_TAG_UNDEFINED window MARVELL_USB_NWINDOW;
Index: src/sys/dev/marvell/mvsdio.c
diff -u src/sys/dev/marvell/mvsdio.c:1.4 src/sys/dev/marvell/mvsdio.c:1.5
--- src/sys/dev/marvell/mvsdio.c:1.4 Sun Feb 13 06:43:51 2011
+++ src/sys/dev/marvell/mvsdio.c Sat Mar 15 13:33:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsdio.c,v 1.4 2011/02/13 06:43:51 nonaka Exp $ */
+/* $NetBSD: mvsdio.c,v 1.5 2014/03/15 13:33:48 kiyohara Exp $ */
/*
* Copyright (c) 2010 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mvsdio.c,v 1.4 2011/02/13 06:43:51 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: mvsdio.c,v 1.5 2014/03/15 13:33:48 kiyohara Exp $);
#include opt_mvsdio.h
@@ -92,7 +92,7 @@ static void mvsdio_exec_command(sdmmc_ch
static void mvsdio_card_enable_intr(sdmmc_chipset_handle_t, int);
static void mvsdio_card_intr_ack(sdmmc_chipset_handle_t);
-static void mvsdio_wininit(struct mvsdio_softc *);
+static void mvsdio_wininit(struct mvsdio_softc *, enum marvell_tags *);
static struct sdmmc_chip_functions mvsdio_chip_functions = {
/* host controller reset */
@@ -178,7 +178,7 @@ mvsdio_attach(device_t parent, device_t
marvell_intr_establish(mva-mva_irq, IPL_SDMMC, mvsdio_intr, sc);
- mvsdio_wininit(sc);
+ mvsdio_wininit(sc, mva-mva_tags);
#if BYTE_ORDER == LITTLE_ENDIAN
bus_space_write_4(sc-sc_iot, sc-sc_ioh, MVSDIO_HC, HC_BIGENDIAN);
@@ -683,19 +683,11 @@ mvsdio_card_intr_ack(sdmmc_chipset_handl
static void
-mvsdio_wininit(struct mvsdio_softc *sc)
+mvsdio_wininit(struct mvsdio_softc *sc, enum marvell_tags *tags)
{
uint64_t base;
uint32_t size;
int window, target, attr, rv, i;
- static int tags[] = {
- MARVELL_TAG_SDRAM_CS0,
- MARVELL_TAG_SDRAM_CS1,
- MARVELL_TAG_SDRAM_CS2,
- MARVELL_TAG_SDRAM_CS3,
-
-
CVS commit: src/sys/arch/evbarm/marvell
Module Name:src
Committed By: kiyohara
Date: Sat Mar 15 13:48:45 UTC 2014
Modified Files:
src/sys/arch/evbarm/marvell: marvell_machdep.c
Log Message:
Support Armada 370.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/marvell/marvell_machdep.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/evbarm/marvell/marvell_machdep.c
diff -u src/sys/arch/evbarm/marvell/marvell_machdep.c:1.27 src/sys/arch/evbarm/marvell/marvell_machdep.c:1.28
--- src/sys/arch/evbarm/marvell/marvell_machdep.c:1.27 Wed Jan 29 04:27:26 2014
+++ src/sys/arch/evbarm/marvell/marvell_machdep.c Sat Mar 15 13:48:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: marvell_machdep.c,v 1.27 2014/01/29 04:27:26 kiyohara Exp $ */
+/* $NetBSD: marvell_machdep.c,v 1.28 2014/03/15 13:48:44 kiyohara Exp $ */
/*
* Copyright (c) 2007, 2008, 2010 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: marvell_machdep.c,v 1.27 2014/01/29 04:27:26 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: marvell_machdep.c,v 1.28 2014/03/15 13:48:44 kiyohara Exp $);
#include opt_evbarm_boardtype.h
#include opt_ddb.h
@@ -230,7 +230,7 @@ u_int
initarm(void *arg)
{
uint32_t target, attr, base, size;
- int cs, memtag = 0, iotag = 0, window;
+ int cs, cs_end, memtag = 0, iotag = 0, window;
mvsoc_bootstrap(MARVELL_INTERREGS_VBASE);
@@ -279,6 +279,9 @@ initarm(void *arg)
nwindow = ORION_MLMB_NWINDOW;
nremap = ORION_MLMB_NREMAP;
+ cs = MARVELL_TAG_SDRAM_CS0;
+ cs_end = MARVELL_TAG_SDRAM_CS3;
+
orion_getclks(MARVELL_INTERREGS_VBASE);
break;
#endif /* ORION */
@@ -297,6 +300,9 @@ initarm(void *arg)
nwindow = KIRKWOOD_MLMB_NWINDOW;
nremap = KIRKWOOD_MLMB_NREMAP;
+ cs = MARVELL_TAG_SDRAM_CS0;
+ cs_end = MARVELL_TAG_SDRAM_CS3;
+
kirkwood_getclks(MARVELL_INTERREGS_VBASE);
mvsoc_clkgating = kirkwood_clkgating;
break;
@@ -314,6 +320,9 @@ initarm(void *arg)
nwindow = MV78XX0_MLMB_NWINDOW;
nremap = MV78XX0_MLMB_NREMAP;
+ cs = MARVELL_TAG_SDRAM_CS0;
+ cs_end = MARVELL_TAG_SDRAM_CS3;
+
mv78xx0_getclks(MARVELL_INTERREGS_VBASE);
break;
#endif /* MV78XX0 */
@@ -333,6 +342,9 @@ initarm(void *arg)
nwindow = ARMADAXP_MLMB_NWINDOW;
nremap = ARMADAXP_MLMB_NREMAP;
+ cs = MARVELL_TAG_DDR3_CS0;
+ cs_end = MARVELL_TAG_DDR3_CS3;
+
extern vaddr_t misc_base;
misc_base = MARVELL_INTERREGS_VBASE + ARMADAXP_MISC_BASE;
armadaxp_getclks();
@@ -352,6 +364,41 @@ initarm(void *arg)
armadaxp_io_coherency_init();
#endif
break;
+
+ case MARVELL_ARMADA370_MV6707:
+ case MARVELL_ARMADA370_MV6710:
+ case MARVELL_ARMADA370_MV6W11:
+ cpu_reset_address = armadaxp_system_reset;
+
+ armadaxp_intr_bootstrap(MARVELL_INTERREGS_PBASE);
+
+ memtag = ARMADAXP_TAG_PEX00_MEM;
+ iotag = ARMADAXP_TAG_PEX00_IO;
+ nwindow = ARMADAXP_MLMB_NWINDOW;
+ nremap = ARMADAXP_MLMB_NREMAP;
+
+ cs = MARVELL_TAG_DDR3_CS0;
+ cs_end = MARVELL_TAG_DDR3_CS3;
+
+ extern vaddr_t misc_base;
+ misc_base = MARVELL_INTERREGS_VBASE + ARMADAXP_MISC_BASE;
+ armada370_getclks();
+ mvsoc_clkgating = armadaxp_clkgating;
+
+#ifdef L2CACHE_ENABLE
+ /* Initialize L2 Cache */
+ {
+ extern int armadaxp_l2_init(bus_addr_t);
+
+ (void)armadaxp_l2_init(MARVELL_INTERREGS_PBASE);
+ }
+#endif
+
+#ifdef AURORA_IO_CACHE_COHERENCY
+ /* Initialize cache coherency */
+ armadaxp_io_coherency_init();
+#endif
+ break;
#endif /* ARMADAXP */
default:
@@ -414,7 +461,7 @@ initarm(void *arg)
bootconfig.dramblocks = 0;
paddr_t segment_end;
segment_end = physmem = 0;
- for (cs = MARVELL_TAG_SDRAM_CS0; cs = MARVELL_TAG_SDRAM_CS3; cs++) {
+ for ( ; cs = cs_end; cs++) {
mvsoc_target(cs, target, attr, base, size);
if (size == 0)
continue;
@@ -649,6 +696,10 @@ marvell_device_register(device_t dev, vo
case MARVELL_ARMADAXP_MV78230:
case MARVELL_ARMADAXP_MV78260:
case MARVELL_ARMADAXP_MV78460:
+
+ case MARVELL_ARMADA370_MV6707:
+ case MARVELL_ARMADA370_MV6710:
+ case MARVELL_ARMADA370_MV6W11:
{
extern struct arm32_pci_chipset
arm32_mvpex2_chipset, arm32_mvpex3_chipset,
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: jakllsch Date: Sat Mar 15 13:50:01 UTC 2014 Modified Files: src/sys/arch/amd64/conf: XEN3_DOMU Log Message: Enable PCI support in amd64 XEN3_DOMU config to match i386 XEN3_DOMU config. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/arch/amd64/conf/XEN3_DOMU 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/amd64/conf/XEN3_DOMU diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.50 src/sys/arch/amd64/conf/XEN3_DOMU:1.51 --- src/sys/arch/amd64/conf/XEN3_DOMU:1.50 Sun Jun 30 21:38:55 2013 +++ src/sys/arch/amd64/conf/XEN3_DOMU Sat Mar 15 13:50:01 2014 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.50 2013/06/30 21:38:55 rmind Exp $ +# $NetBSD: XEN3_DOMU,v 1.51 2014/03/15 13:50:01 jakllsch Exp $ include arch/amd64/conf/std.xen @@ -167,8 +167,8 @@ balloon* at xenbus? # Xen balloon devic xencons* at hypervisor? # Xen virtual console # PCI pass-through support: -#xpci* at xenbus ? #Xen3 PCI front end driver -#pci* at xpci ? +xpci* at xenbus ? #Xen3 PCI front end driver +pci* at xpci ? # you then need to add your PCI devices drivers below. cinclude arch/amd64/conf/GENERIC.local
CVS commit: src/sys/arch/evbarm
Module Name:src
Committed By: kiyohara
Date: Sat Mar 15 13:56:19 UTC 2014
Modified Files:
src/sys/arch/evbarm/conf: OPENBLOCKS_AX3 files.marvell
src/sys/arch/evbarm/marvell: marvellreg.h
Log Message:
Support options MVSOC_INTERREGS_PBASE for *old* Armada {XP,370} machines.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/files.marvell
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/marvell/marvellreg.h
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/evbarm/conf/OPENBLOCKS_AX3
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.5 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.6
--- src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.5 Mon Dec 23 02:37:35 2013
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 Sat Mar 15 13:56:19 2014
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS_AX3,v 1.5 2013/12/23 02:37:35 kiyohara Exp $
+# $NetBSD: OPENBLOCKS_AX3,v 1.6 2014/03/15 13:56:19 kiyohara Exp $
#
# OPENBLOCKS_AX3 -- Plat'Home. OpenBlockS AX3 kernel
#
@@ -165,6 +165,7 @@ cpu0 at mainbus?
# Marvell MV88F78260 ARMADA XP System-on-chip
mvsoc0 at mainbus?
+options MVSOC_INTERREGS_PBASE=0xd000
options MVSOC_FIXUP_DEVID=0x7826
# On-chip Serial-ATA II Host Controller (SATAHC)
Index: src/sys/arch/evbarm/conf/files.marvell
diff -u src/sys/arch/evbarm/conf/files.marvell:1.3 src/sys/arch/evbarm/conf/files.marvell:1.4
--- src/sys/arch/evbarm/conf/files.marvell:1.3 Sat Oct 5 02:43:16 2013
+++ src/sys/arch/evbarm/conf/files.marvell Sat Mar 15 13:56:19 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.marvell,v 1.3 2013/10/05 02:43:16 kiyohara Exp $
+# $NetBSD: files.marvell,v 1.4 2014/03/15 13:56:19 kiyohara Exp $
#
# Marvell Orion, Discovery Innovation and Kirkwood NASs configuration info
#
@@ -13,4 +13,5 @@ file arch/evbarm/marvell/marvell_machdep
include arch/arm/marvell/files.marvell
# Some SoC(ARMADAXP) reports false DeviceID.
-defparam opt_mvsoc.hMVSOC_FIXUP_DEVID
+defparam opt_mvsoc.hMVSOC_INTERREGS_PBASE
+ MVSOC_FIXUP_DEVID
Index: src/sys/arch/evbarm/marvell/marvellreg.h
diff -u src/sys/arch/evbarm/marvell/marvellreg.h:1.3 src/sys/arch/evbarm/marvell/marvellreg.h:1.4
--- src/sys/arch/evbarm/marvell/marvellreg.h:1.3 Mon Sep 30 12:57:53 2013
+++ src/sys/arch/evbarm/marvell/marvellreg.h Sat Mar 15 13:56:19 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: marvellreg.h,v 1.3 2013/09/30 12:57:53 kiyohara Exp $ */
+/* $NetBSD: marvellreg.h,v 1.4 2014/03/15 13:56:19 kiyohara Exp $ */
/*
* Copyright (c) 2007 KIYOHARA Takashi
* All rights reserved.
@@ -27,6 +27,7 @@
#ifndef _EVBARM_MARVELLREG_H_
#define _EVBARM_MARVELLREG_H_
+#include opt_mvsoc.h
/*
* Logical mapping for onboard/integrated peripherals
@@ -34,12 +35,10 @@
*/
#define MARVELL_PEXMEM_PBASE 0xe000
#define MARVELL_PEXMEM_SIZE 0x0100
-#if !defined(ARMADAXP)
-#define MARVELL_INTERREGS_PBASE 0xf100
-#elif !defined(ORION) !defined(KIRKWOOD) !defined(MV78XX0)
-#define MARVELL_INTERREGS_PBASE 0xd000
+#if defined(MVSOC_INTERREGS_PBASE)
+#define MARVELL_INTERREGS_PBASE MVSOC_INTERREGS_PBASE
#else
-#define MARVELL_INTERREGS_PBASE marvell_interregs_pbase
+#define MARVELL_INTERREGS_PBASE 0xf100
#endif
#define MARVELL_INTERREGS_SIZE 0x0010
#define MARVELL_PEXIO_PBASE 0xf200
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Sat Mar 15 14:02:01 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: OPENBLOCKS_AX3 Log Message: Add comment-out-ed FPU options. Armada XP has FPU. Add comment-out-ed athn. Change ehci[01] to ehci*. Check the clock gating already supported. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 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/evbarm/conf/OPENBLOCKS_AX3 diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.6 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.7 --- src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.6 Sat Mar 15 13:56:19 2014 +++ src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 Sat Mar 15 14:02:01 2014 @@ -1,4 +1,4 @@ -# $NetBSD: OPENBLOCKS_AX3,v 1.6 2014/03/15 13:56:19 kiyohara Exp $ +# $NetBSD: OPENBLOCKS_AX3,v 1.7 2014/03/15 14:02:01 kiyohara Exp $ # # OPENBLOCKS_AX3 -- Plat'Home. OpenBlockS AX3 kernel # @@ -21,6 +21,8 @@ options L2CACHE_ENABLE #options AURORA_IO_CACHE_COHERENCY options AURORA_L2_PT_WALK options ARM_HAS_VBAR +#options FPU_VFP +#makeoptions CPUFLAGS=-march=armv7-a -mfpu=neon makeoptions CPUFLAGS=-march=armv7-a -msoft-float # Architecture options @@ -177,8 +179,7 @@ mvgbe* at mvgbec? port ? irq ? makphy* at mii? phy ? # On-chip USB 2.0 Interface -ehci0 at mvsoc? offset ? irq ? -ehci1 at mvsoc? offset ? irq ? +ehci* at mvsoc? offset ? irq ? # Serial Peripheral Interface (SPI) #mvspi* at mvsoc? offset ? irq ? @@ -214,6 +215,8 @@ options PCI_NETBSD_CONFIGURE pci* at mvpex? pchb* at pci? dev ? function ? # PCI-Host bridges +#athn* at pci? dev ? function ? # Atheros AR9k (802.11a/g/n) + # ATA (IDE) bus support atabus* at ata? #options ATADEBUG
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Sat Mar 15 14:09:09 UTC 2014 Added Files: src/sys/arch/evbarm/conf: MIRABOX Log Message: Support GlobalScale MiraBox. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/MIRABOX Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/evbarm/conf/MIRABOX diff -u /dev/null src/sys/arch/evbarm/conf/MIRABOX:1.1 --- /dev/null Sat Mar 15 14:09:09 2014 +++ src/sys/arch/evbarm/conf/MIRABOX Sat Mar 15 14:09:09 2014 @@ -0,0 +1,39 @@ +# $NetBSD: MIRABOX,v 1.1 2014/03/15 14:09:09 kiyohara Exp $ +# +# This configuration supports for generically GlobalScale MiraBox +# + +include arch/evbarm/conf/SHEEVAPLUG + +# Board Type +no makeoptions BOARDTYPE +makeoptions BOARDTYPE=mirabox +no options EVBARM_BOARDTYPE +options EVBARM_BOARDTYPE=mirabox + +# CPU options +no options CPU_SHEEVA +#no options MV_L2_CACHE_ENABLE +#no options MV_L2_CACHE_WRITE_THROUGH +no options MV_CACHE_RANGE_OPS +options CPU_PJ4B +options L2CACHE_ENABLE +#options AURORA_IO_CACHE_COHERENCY +options AURORA_L2_PT_WALK +options ARM_HAS_VBAR +#options FPU_VFP +no makeoptions CPUFLAGS +#makeoptions CPUFLAGS=-march=armv7-a -mfpu=neon +makeoptions CPUFLAGS=-march=armv7-a -msoft-float + +# Architecture options +no options KIRKWOOD +options ARMADAXP + +options PIC_MAXSOURCES=128 + +# Marvell MV6710 Armada 370 System-on-chip +mvsoc0 at mainbus? +options MVSOC_INTERREGS_PBASE=0xd000 + +options COM_16750 # : required
CVS commit: src/lib/libm/arch/vax
Module Name:src Committed By: martin Date: Sat Mar 15 14:12:56 UTC 2014 Modified Files: src/lib/libm/arch/vax: n_support.S Log Message: Need to load the full argument To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/lib/libm/arch/vax/n_support.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libm/arch/vax/n_support.S diff -u src/lib/libm/arch/vax/n_support.S:1.8 src/lib/libm/arch/vax/n_support.S:1.9 --- src/lib/libm/arch/vax/n_support.S:1.8 Sat Mar 15 12:20:09 2014 +++ src/lib/libm/arch/vax/n_support.S Sat Mar 15 14:12:56 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: n_support.S,v 1.8 2014/03/15 12:20:09 martin Exp $ */ +/* $NetBSD: n_support.S,v 1.9 2014/03/15 14:12:56 martin Exp $ */ /* * Copyright (c) 1985, 1993 * The Regents of the University of California. All rights reserved. @@ -62,7 +62,7 @@ ENTRY(copysign, 0) Lz: ret ENTRY(copysignf, 0) - movw 4(%ap),%r0 # load x into %r0 + movl 4(%ap),%r0 # load x into %r0 bicw3 $0x807f,%r0,%r2 # mask off the exponent of x beql 1f # if zero or reserved op then return x bicw3 $0x7fff,8(%ap),%r2 # copy the sign bit of y into %r2
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Sat Mar 15 15:15:27 UTC 2014
Modified Files:
src/sys/rump: Makefile.rump
src/sys/rump/include/machine: cpu.h
src/sys/rump/include/rump: rumpuser.h
src/sys/rump/librump/rumpkern: lwproc.c rump.c rump_private.h
scheduler.c threads.c
src/sys/rump/librump/rumpkern/arch/x86: rump_x86_cpu.c
Added Files:
src/sys/rump/librump/rumpkern: rump_curlwp.h rump_curlwp___thread.h
rump_curlwp_hypercall.h
Log Message:
Allow compile-time optimizations to curlwp. This can have a pretty
staggering impact on performance. When running sendto() in a loop,
the improvement is 200k more calls per second with an inlined __thread
curlwp as opposed to the default. In other words, it shaves off hundreds
of CPU cycles per call (~20%). Even just eliminating the x86_curlwp()
call in favor of an inline gives an improvement of 60k calls per second.
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/rump/Makefile.rump
cvs rdiff -u -r1.19 -r1.20 src/sys/rump/include/machine/cpu.h
cvs rdiff -u -r1.108 -r1.109 src/sys/rump/include/rump/rumpuser.h
cvs rdiff -u -r1.26 -r1.27 src/sys/rump/librump/rumpkern/lwproc.c
cvs rdiff -u -r1.289 -r1.290 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpkern/rump_curlwp.h \
src/sys/rump/librump/rumpkern/rump_curlwp___thread.h \
src/sys/rump/librump/rumpkern/rump_curlwp_hypercall.h
cvs rdiff -u -r1.79 -r1.80 src/sys/rump/librump/rumpkern/rump_private.h
cvs rdiff -u -r1.35 -r1.36 src/sys/rump/librump/rumpkern/scheduler.c
cvs rdiff -u -r1.21 -r1.22 src/sys/rump/librump/rumpkern/threads.c
cvs rdiff -u -r1.1 -r1.2 \
src/sys/rump/librump/rumpkern/arch/x86/rump_x86_cpu.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/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.91 src/sys/rump/Makefile.rump:1.92
--- src/sys/rump/Makefile.rump:1.91 Thu Mar 13 01:34:06 2014
+++ src/sys/rump/Makefile.rump Sat Mar 15 15:15:26 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.91 2014/03/13 01:34:06 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.92 2014/03/15 15:15:26 pooka Exp $
#
WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet
@@ -8,14 +8,13 @@ NOLINT= # kernel code
# Use NetBSD kernel ABI by default on x86 archs. Performance-related
# compile-time options may override this at a later date.
-.if ${MACHINE_ARCH} == i386 || \
-${MACHINE_ARCH} == x86_64
+.if (${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64)
_RUMP_NATIVEABI= yes
CPPFLAGS+= -D_RUMP_NATIVE_ABI
.else
_RUMP_NATIVEABI= no
CPPFLAGS:= -I${RUMPTOP}/include ${CPPFLAGS}
-CPPFLAGS+= -D_RUMPKERNEL
+CPPFLAGS+= -D_RUMPKERNEL -I${RUMPTOP}/librump/rumpkern
.endif
CPPFLAGS+= -DMAXUSERS=32
Index: src/sys/rump/include/machine/cpu.h
diff -u src/sys/rump/include/machine/cpu.h:1.19 src/sys/rump/include/machine/cpu.h:1.20
--- src/sys/rump/include/machine/cpu.h:1.19 Mon Mar 10 23:02:07 2014
+++ src/sys/rump/include/machine/cpu.h Sat Mar 15 15:15:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.19 2014/03/10 23:02:07 pooka Exp $ */
+/* $NetBSD: cpu.h,v 1.20 2014/03/15 15:15:26 pooka Exp $ */
/*
* Copyright (c) 2008-2011 Antti Kantee. All Rights Reserved.
@@ -38,6 +38,8 @@
#include sys/cpu_data.h
#include machine/pcb.h
+#include rump_curlwp.h
+
struct cpu_info {
struct cpu_data ci_data;
cpuid_t ci_cpuid;
@@ -73,8 +75,7 @@ static __inline void cpu_handle_ipi(void
void __syncicache(void *, size_t);
#endif /* __powerpc__ */
-struct lwp *rumpuser_curlwp(void);
-#define curlwp rumpuser_curlwp()
+#define curlwp rump_curlwp_fast()
#define curcpu() (curlwp-l_cpu)
#define cpu_number() (cpu_index(curcpu))
Index: src/sys/rump/include/rump/rumpuser.h
diff -u src/sys/rump/include/rump/rumpuser.h:1.108 src/sys/rump/include/rump/rumpuser.h:1.109
--- src/sys/rump/include/rump/rumpuser.h:1.108 Wed May 15 16:00:04 2013
+++ src/sys/rump/include/rump/rumpuser.h Sat Mar 15 15:15:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.h,v 1.108 2013/05/15 16:00:04 pooka Exp $ */
+/* $NetBSD: rumpuser.h,v 1.109 2014/03/15 15:15:26 pooka Exp $ */
/*
* Copyright (c) 2007-2013 Antti Kantee. All Rights Reserved.
@@ -175,12 +175,14 @@ int rumpuser_thread_create(void *(*f)(v
void rumpuser_thread_exit(void) __dead;
int rumpuser_thread_join(void *);
+#if defined(LIBRUMPUSER) || defined(RUMP_CURLWP_PRIVATE)
enum rumplwpop {
RUMPUSER_LWP_CREATE, RUMPUSER_LWP_DESTROY,
RUMPUSER_LWP_SET, RUMPUSER_LWP_CLEAR
};
void rumpuser_curlwpop(int, struct lwp *);
struct lwp *rumpuser_curlwp(void);
+#endif /* LIBRUMPUSER || RUMP_CURLWP_PRIVATE */
struct rumpuser_mtx;
#define RUMPUSER_MTX_SPIN 0x01
Index: src/sys/rump/librump/rumpkern/lwproc.c
diff -u src/sys/rump/librump/rumpkern/lwproc.c:1.26 src/sys/rump/librump/rumpkern/lwproc.c:1.27
---
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Sat Mar 15 15:22:42 UTC 2014
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern
Log Message:
Use uniprocessor-optimized locking in RUMP_LOCKS_UP=yes (default: no)
To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/sys/rump/librump/rumpkern/Makefile.rumpkern
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.140 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.141
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.140 Thu Mar 13 01:34:06 2014
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Sat Mar 15 15:22:42 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.140 2014/03/13 01:34:06 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.141 2014/03/15 15:22:42 pooka Exp $
#
.include ${RUMPTOP}/Makefile.rump
@@ -38,8 +38,11 @@ CPPFLAGS+= -DRUMP_KERNEL_IS_LIBC
# Multiprocessor or uniprocessor locking. TODO: select right
# locking at runtime.
+.if ${RUMP_LOCKS_UP:Uno} == yes
+SRCS+= locks_up.c
+.else
SRCS+= locks.c
-#SRCS+= locks_up.c
+.endif
MKREPRO?=no
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src
Committed By: riastradh
Date: Sat Mar 15 15:22:37 UTC 2014
Modified Files:
src/usr.sbin/npf/npfctl: npf_parse.y
Log Message:
Convert right-recursive rules to left-recursive ones.
This should obviate the need for the workaround of a large stack in
order to handle many rules.
No change in the resulting plists.
ok rmind
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/usr.sbin/npf/npfctl/npf_parse.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/npfctl/npf_parse.y
diff -u src/usr.sbin/npf/npfctl/npf_parse.y:1.34 src/usr.sbin/npf/npfctl/npf_parse.y:1.35
--- src/usr.sbin/npf/npfctl/npf_parse.y:1.34 Fri Mar 14 11:29:45 2014
+++ src/usr.sbin/npf/npfctl/npf_parse.y Sat Mar 15 15:22:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_parse.y,v 1.34 2014/03/14 11:29:45 rmind Exp $ */
+/* $NetBSD: npf_parse.y,v 1.35 2014/03/15 15:22:37 riastradh Exp $ */
/*-
* Copyright (c) 2011-2014 The NetBSD Foundation, Inc.
@@ -189,7 +189,7 @@ input
;
lines
- : line SEPLINE lines
+ : lines SEPLINE line
| line
;
@@ -235,7 +235,7 @@ list
;
list_elems
- : element COMMA list_elems
+ : list_elems COMMA element
{
npfvar_add_elements($1, $3);
}
@@ -346,7 +346,7 @@ rproc
;
procs
- : proc_call SEPLINE procs
+ : procs SEPLINE proc_call
{
$$ = npfvar_add_elements($1, $3);
}
@@ -367,7 +367,7 @@ proc_call
;
proc_param_list
- : proc_param COMMA proc_param_list
+ : proc_param_list COMMA proc_param
{
$$ = npfvar_add_elements($1, $3);
}
@@ -447,7 +447,7 @@ ruleset_block
;
ruleset_def
- : rule_group SEPLINE ruleset_def
+ : ruleset_def SEPLINE rule_group
| rule_group
;
CVS commit: src/external/intel-fw-eula/ipw2200/dist
Module Name:src Committed By: roy Date: Sat Mar 15 15:23:22 UTC 2014 Modified Files: src/external/intel-fw-eula/ipw2200/dist: ipw2200-bss.fw ipw2200-ibss.fw ipw2200-sniffer.fw Log Message: Import ipw2200-fw-3.1 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/intel-fw-eula/ipw2200/dist/ipw2200-bss.fw \ src/external/intel-fw-eula/ipw2200/dist/ipw2200-ibss.fw \ src/external/intel-fw-eula/ipw2200/dist/ipw2200-sniffer.fw Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/intel-fw-eula/ipw2200/dist/ipw2200-bss.fw Binary files are different Index: src/external/intel-fw-eula/ipw2200/dist/ipw2200-ibss.fw Binary files are different Index: src/external/intel-fw-eula/ipw2200/dist/ipw2200-sniffer.fw Binary files are different
CVS commit: src/sys/arch/arm/omap
Module Name:src Committed By: matt Date: Sat Mar 15 17:14:56 UTC 2014 Modified Files: src/sys/arch/arm/omap: obio_ohci.c Log Message: OMAP5 support To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/omap/obio_ohci.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/arm/omap/obio_ohci.c diff -u src/sys/arch/arm/omap/obio_ohci.c:1.9 src/sys/arch/arm/omap/obio_ohci.c:1.10 --- src/sys/arch/arm/omap/obio_ohci.c:1.9 Sun Jun 16 17:47:54 2013 +++ src/sys/arch/arm/omap/obio_ohci.c Sat Mar 15 17:14:56 2014 @@ -1,7 +1,7 @@ -/* $Id: obio_ohci.c,v 1.9 2013/06/16 17:47:54 matt Exp $ */ +/* $Id: obio_ohci.c,v 1.10 2014/03/15 17:14:56 matt Exp $ */ /* adapted from: */ -/* $NetBSD: obio_ohci.c,v 1.9 2013/06/16 17:47:54 matt Exp $ */ +/* $NetBSD: obio_ohci.c,v 1.10 2014/03/15 17:14:56 matt Exp $ */ /* $OpenBSD: pxa2x0_ohci.c,v 1.19 2005/04/08 02:32:54 dlg Exp $ */ /* @@ -24,7 +24,7 @@ #include locators.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: obio_ohci.c,v 1.9 2013/06/16 17:47:54 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: obio_ohci.c,v 1.10 2014/03/15 17:14:56 matt Exp $); #include sys/param.h #include sys/systm.h @@ -89,7 +89,7 @@ obioohci_match(device_t parent, cfdata_t if (obio-obio_addr != OHCI1_BASE_OMAP3) return 0; #endif -#if defined(OMAP4) +#if defined(OMAP4) || defined(OMAP5) if (obio-obio_addr != OHCI1_BASE_OMAP4) return 0; #endif
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Sat Mar 15 17:28:25 UTC 2014 Added Files: src/sys/arch/evbarm/conf: MIRABOX_INSTALL Log Message: Add install kernel for MIRABOX To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/MIRABOX_INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/evbarm/conf/MIRABOX_INSTALL diff -u /dev/null src/sys/arch/evbarm/conf/MIRABOX_INSTALL:1.1 --- /dev/null Sat Mar 15 17:28:25 2014 +++ src/sys/arch/evbarm/conf/MIRABOX_INSTALL Sat Mar 15 17:28:25 2014 @@ -0,0 +1,10 @@ +# $NetBSD: MIRABOX_INSTALL,v 1.1 2014/03/15 17:28:25 matt Exp $ +# +# MIRABOX_INSTALL -- MIRABOX kernel with installation-sized +# ramdisk +# + +include arch/evbarm/conf/MIRABOX +include arch/evbarm/conf/INSTALL + +options BOOTHOWTO=RB_SINGLE
CVS commit: src/external/bsd/bind/dist/lib/isc/unix
Module Name:src
Committed By: christos
Date: Sat Mar 15 18:28:23 UTC 2014
Modified Files:
src/external/bsd/bind/dist/lib/isc/unix: app.c
Log Message:
Since the sigwait stuff is conditional to isc_bind9, we cannot block
SIGHUP,SIGINT,SIGTERM on startup, so make those also conditional to isc_bind9.
The net effect of this was that dhclient blocked the 3 signals for both
itself and its progeny so /etc/rc.d/dhclient restart would not work.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/lib/isc/unix/app.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/lib/isc/unix/app.c
diff -u src/external/bsd/bind/dist/lib/isc/unix/app.c:1.9 src/external/bsd/bind/dist/lib/isc/unix/app.c:1.10
--- src/external/bsd/bind/dist/lib/isc/unix/app.c:1.9 Fri Feb 28 22:24:39 2014
+++ src/external/bsd/bind/dist/lib/isc/unix/app.c Sat Mar 15 14:28:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: app.c,v 1.9 2014/03/01 03:24:39 christos Exp $ */
+/* $NetBSD: app.c,v 1.10 2014/03/15 18:28:22 christos Exp $ */
/*
* Copyright (C) 2004, 2005, 2007-2009, 2013, 2014 Internet Systems Consortium, Inc. (ISC)
@@ -317,6 +317,7 @@ isc__app_ctxstart(isc_appctx_t *ctx0) {
#endif
#ifdef ISC_PLATFORM_USETHREADS
+ if (isc_bind9) {
/*
* Block SIGHUP, SIGINT, SIGTERM.
*
@@ -345,6 +346,7 @@ isc__app_ctxstart(isc_appctx_t *ctx0) {
result = ISC_R_UNEXPECTED;
goto cleanup;
}
+ }
#else /* ISC_PLATFORM_USETHREADS */
/*
* Unblock SIGHUP, SIGINT, SIGTERM.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: martin Date: Sat Mar 15 19:20:27 UTC 2014 Modified Files: src/sys/dev/usb: uchcom.c Log Message: Remove unused include To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/dev/usb/uchcom.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/dev/usb/uchcom.c diff -u src/sys/dev/usb/uchcom.c:1.12 src/sys/dev/usb/uchcom.c:1.13 --- src/sys/dev/usb/uchcom.c:1.12 Fri Dec 23 00:51:45 2011 +++ src/sys/dev/usb/uchcom.c Sat Mar 15 19:20:27 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: uchcom.c,v 1.12 2011/12/23 00:51:45 jakllsch Exp $ */ +/* $NetBSD: uchcom.c,v 1.13 2014/03/15 19:20:27 martin Exp $ */ /* * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: uchcom.c,v 1.12 2011/12/23 00:51:45 jakllsch Exp $); +__KERNEL_RCSID(0, $NetBSD: uchcom.c,v 1.13 2014/03/15 19:20:27 martin Exp $); /* * driver for WinChipHead CH341/340, the worst USB-serial chip in the world. @@ -48,7 +48,6 @@ __KERNEL_RCSID(0, $NetBSD: uchcom.c,v 1 #include sys/proc.h #include sys/device.h #include sys/poll.h -#include sys/workqueue.h #include dev/usb/usb.h #include dev/usb/usbcdc.h
CVS commit: src/external/gpl3/gcc/usr.bin/backend
Module Name:src
Committed By: mrg
Date: Sat Mar 15 20:46:38 UTC 2014
Modified Files:
src/external/gpl3/gcc/usr.bin/backend: Makefile
Log Message:
make sure we use the C compiler (not C++) for CC= when running the
configure for auto-build.h. fixes problems on linux.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/external/gpl3/gcc/usr.bin/backend/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.20 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.21
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.20 Mon Mar 10 18:57:35 2014
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile Sat Mar 15 20:46:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2014/03/10 18:57:35 mrg Exp $
+# $NetBSD: Makefile,v 1.21 2014/03/15 20:46:38 mrg Exp $
LIBISPRIVATE= yes
@@ -21,6 +21,7 @@ HOSTPROG_CXX= 1
.include bsd.lib.mk
# Force using C++ for this
+ORIGHOST_CC:= ${HOST_CC}
HOST_CC:= ${HOST_CXX}
CC:= ${CXX}
CFLAGS:= ${CXXFLAGS}
@@ -159,6 +160,8 @@ ${G_OBJS} ${G_OBJS:.o=.d}: tm_p.h # XXX
.include ../Makefile.options
# Yuck, we have to run configure to generate this one...
+# We use ORIGHOST_CC here because GCC's ./configure expects (and
+# depends upon) it.
CLEANFILES+= auto-build.h
HOST_CFLAGS+= -I${.OBJDIR}
auto-build.h: gmp.h Makefile
@@ -167,7 +170,7 @@ auto-build.h: gmp.h Makefile
mkdir .ab \
(cd .ab \
AWK=${TOOL_AWK:Q} \
- CC=${HOST_CC:Q} CFLAGS=${HOST_CFLAGS:Q} \
+ CC=${ORIGHOST_CC:Q} CFLAGS=${HOST_CFLAGS:Q} \
MAKE=${MAKE:Q} \
CONFIG_SHELL=${HOST_SH:Q} \
gcc_cv_ld=${LD} \
CVS commit: src/external/gpl3/gcc/usr.bin/common-target
Module Name:src
Committed By: mrg
Date: Sat Mar 15 23:12:58 UTC 2014
Modified Files:
src/external/gpl3/gcc/usr.bin/common-target: Makefile
Log Message:
add missing -DGENERATOR_FILE to HOST_CPPFLAGS.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/common-target/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/common-target/Makefile
diff -u src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.2 src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.3
--- src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.2 Wed Mar 5 21:37:02 2014
+++ src/external/gpl3/gcc/usr.bin/common-target/Makefile Sat Mar 15 23:12:58 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/03/05 21:37:02 tron Exp $
+# $NetBSD: Makefile,v 1.3 2014/03/15 23:12:58 mrg Exp $
LIBISPRIVATE= yes
@@ -32,6 +32,7 @@ ${G_common_out_file:T:R}.o: common/comm
DPSRCS+= options.h
HOST_CPPFLAGS+= -I${BACKENDOBJ} -I${GCCARCH} -I. -I${DIST}/include -I${DIST}/gcc
+HOST_CPPFLAGS+= -DGENERATOR_FILE
MKPIC:= no
MKPICLIB:= no
CVS commit: src/external/gpl3/gcc/usr.bin/host-libiberty
Module Name:src Committed By: uwe Date: Sun Mar 16 00:07:58 UTC 2014 Modified Files: src/external/gpl3/gcc/usr.bin/host-libiberty: Makefile Log Message: G/c extraneous TAB. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/host-libiberty/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/usr.bin/host-libiberty/Makefile diff -u src/external/gpl3/gcc/usr.bin/host-libiberty/Makefile:1.2 src/external/gpl3/gcc/usr.bin/host-libiberty/Makefile:1.3 --- src/external/gpl3/gcc/usr.bin/host-libiberty/Makefile:1.2 Sat Mar 1 10:00:52 2014 +++ src/external/gpl3/gcc/usr.bin/host-libiberty/Makefile Sun Mar 16 00:07:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/03/01 10:00:52 mrg Exp $ +# $NetBSD: Makefile,v 1.3 2014/03/16 00:07:58 uwe Exp $ libiberty/libiberty.a: [ ! -d libiberty ] mkdir libiberty || true @@ -14,5 +14,5 @@ cleandir: -rm -rf libiberty depend dependall all: libiberty/libiberty.a - + .include bsd.prog.mk
CVS commit: src/usr.bin/login
Module Name:src
Committed By: dholland
Date: Sun Mar 16 00:33:13 UTC 2014
Modified Files:
src/usr.bin/login: login.c
Log Message:
Fix gcc48 build without Kerberos.
While here, rectify related bug where if gethostname() failed, login
would null-terminate uninitialized stack trash and cheerfully pass it
on to kerberos. In this case, revert to amnesiac instead.
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/usr.bin/login/login.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/login/login.c
diff -u src/usr.bin/login/login.c:1.103 src/usr.bin/login/login.c:1.104
--- src/usr.bin/login/login.c:1.103 Sun Apr 29 01:26:56 2012
+++ src/usr.bin/login/login.c Sun Mar 16 00:33:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: login.c,v 1.103 2012/04/29 01:26:56 wiz Exp $ */
+/* $NetBSD: login.c,v 1.104 2014/03/16 00:33:13 dholland Exp $ */
/*-
* Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = @(#)login.c 8.4 (Berkeley) 4/2/94;
#endif
-__RCSID($NetBSD: login.c,v 1.103 2012/04/29 01:26:56 wiz Exp $);
+__RCSID($NetBSD: login.c,v 1.104 2014/03/16 00:33:13 dholland Exp $);
#endif /* not lint */
/*
@@ -138,11 +138,13 @@ main(int argc, char *argv[])
struct group *gr;
struct stat st;
int ask, ch, cnt, fflag, hflag, pflag, sflag, quietlog, rootlogin, rval;
- int Fflag;
uid_t uid, saved_uid;
gid_t saved_gid, saved_gids[NGROUPS_MAX];
int nsaved_gids;
- char *domain, *p, *ttyn;
+#ifdef notdef
+ char *domain;
+#endif
+ char *p, *ttyn;
const char *pwprompt;
char tbuf[MAXPATHLEN + 2], tname[sizeof(_PATH_TTY) + 10];
char localhost[MAXHOSTNAMELEN + 1];
@@ -152,6 +154,7 @@ main(int argc, char *argv[])
time_t pw_warntime = _PASSWORD_WARNDAYS * SECSPERDAY;
char *loginname = NULL;
#ifdef KERBEROS5
+ int Fflag;
krb5_error_code kerror;
#endif
#if defined(KERBEROS5)
@@ -185,16 +188,19 @@ main(int argc, char *argv[])
*server address.
* -s is used to force use of S/Key or equivalent.
*/
- domain = NULL;
- if (gethostname(localhost, sizeof(localhost)) 0)
+ if (gethostname(localhost, sizeof(localhost)) 0) {
syslog(LOG_ERR, couldn't get local hostname: %m);
- else
- domain = strchr(localhost, '.');
+ strcpy(hostname, amnesiac);
+ }
+#ifdef notdef
+ domain = strchr(localhost, '.');
+#endif
localhost[sizeof(localhost) - 1] = '\0';
- Fflag = fflag = hflag = pflag = sflag = 0;
+ fflag = hflag = pflag = sflag = 0;
have_ss = 0;
#ifdef KERBEROS5
+ Fflag = 0;
have_forward = 0;
#endif
uid = getuid();
@@ -210,7 +216,9 @@ main(int argc, char *argv[])
#endif
break;
case 'F':
+#ifdef KERBEROS5
Fflag = 1;
+#endif
/* FALLTHROUGH */
case 'f':
fflag = 1;
CVS commit: src/usr.bin/su
Module Name:src
Committed By: dholland
Date: Sun Mar 16 01:07:46 UTC 2014
Modified Files:
src/usr.bin/su: su.c
Log Message:
Fix gcc48 build. No obvious reason why nobody else has hit this...
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/usr.bin/su/su.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/su/su.c
diff -u src/usr.bin/su/su.c:1.70 src/usr.bin/su/su.c:1.71
--- src/usr.bin/su/su.c:1.70 Thu Apr 12 15:35:07 2012
+++ src/usr.bin/su/su.c Sun Mar 16 01:07:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: su.c,v 1.70 2012/04/12 15:35:07 christos Exp $ */
+/* $NetBSD: su.c,v 1.71 2014/03/16 01:07:46 dholland Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1988\
#if 0
static char sccsid[] = @(#)su.c 8.3 (Berkeley) 4/2/94;*/
#else
-__RCSID($NetBSD: su.c,v 1.70 2012/04/12 15:35:07 christos Exp $);
+__RCSID($NetBSD: su.c,v 1.71 2014/03/16 01:07:46 dholland Exp $);
#endif
#endif /* not lint */
@@ -112,7 +112,10 @@ main(int argc, char **argv)
enum { UNSET, YES, NO } iscsh = UNSET;
const char *user, *shell, *avshell;
char *username, **np;
- char *userpass, *class;
+#ifdef SU_ROOTAUTH
+ char *userpass;
+#endif
+ char *class;
char shellbuf[MAXPATHLEN], avshellbuf[MAXPATHLEN];
time_t pw_warntime = _PASSWORD_WARNDAYS * SECSPERDAY;
#ifdef LOGIN_CAP
@@ -186,7 +189,9 @@ main(int argc, char **argv)
if (pwd == NULL)
errx(EXIT_FAILURE, who are you?);
username = estrdup(pwd-pw_name);
+#ifdef SU_ROOTAUTH
userpass = estrdup(pwd-pw_passwd);
+#endif
if (asme) {
if (pwd-pw_shell *pwd-pw_shell) {
CVS commit: src/sys/ufs/ufs
Module Name:src Committed By: uwe Date: Sun Mar 16 01:21:35 UTC 2014 Modified Files: src/sys/ufs/ufs: ufs_quota2.c Log Message: Shut up -Wuninitialized on sh3 with gcc 4.8 To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/ufs/ufs/ufs_quota2.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/ufs/ufs/ufs_quota2.c diff -u src/sys/ufs/ufs/ufs_quota2.c:1.37 src/sys/ufs/ufs/ufs_quota2.c:1.38 --- src/sys/ufs/ufs/ufs_quota2.c:1.37 Wed Jan 29 20:13:04 2014 +++ src/sys/ufs/ufs/ufs_quota2.c Sun Mar 16 01:21:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_quota2.c,v 1.37 2014/01/29 20:13:04 bouyer Exp $ */ +/* $NetBSD: ufs_quota2.c,v 1.38 2014/03/16 01:21:35 uwe Exp $ */ /*- * Copyright (c) 2010 Manuel Bouyer * All rights reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ufs_quota2.c,v 1.37 2014/01/29 20:13:04 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: ufs_quota2.c,v 1.38 2014/03/16 01:21:35 uwe Exp $); #include sys/buf.h #include sys/param.h @@ -1280,7 +1280,7 @@ quota2_handle_cmd_cursorget(struct ufsmo struct q2cursor_state state; struct quota2_entry default_q2e; int idtype; - int quota2_hash_size; + int quota2_hash_size = 0; /* XXX: sh3 gcc 4.8 -Wuninitialized */ /* * Convert and validate the cursor.
CVS commit: src/external/cddl/osnet/lib/libdtrace
Module Name:src
Committed By: ozaki-r
Date: Sun Mar 16 05:11:19 UTC 2014
Modified Files:
src/external/cddl/osnet/lib/libdtrace: Makefile
Log Message:
Look up arm directory on MACHINE_ARCH=*arm*
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/lib/libdtrace/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.7 src/external/cddl/osnet/lib/libdtrace/Makefile:1.8
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.7 Fri Jun 21 19:16:01 2013
+++ src/external/cddl/osnet/lib/libdtrace/Makefile Sun Mar 16 05:11:19 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/06/21 19:16:01 christos Exp $
+# $NetBSD: Makefile,v 1.8 2014/03/16 05:11:19 ozaki-r Exp $
# $FreeBSD: src/cddl/lib/libdtrace/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
@@ -86,7 +86,7 @@ COPTS.dt_subr.c += -Wno-stack-protector
CPPFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
.elif ${MACHINE_ARCH} == sparc64
CPPFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc
-.elif ${MACHINE_ARCH} == arm
+.elif !empty(MACHINE_ARCH:M*arm*)
CPPFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/arm
.PATH: ${.CURDIR}/../../dist/lib/libdtrace/arm
SRCS+= dt_isadep.c
CVS commit: src/sys/dev/mscp
Module Name:src
Committed By: dholland
Date: Sun Mar 16 05:49:41 UTC 2014
Modified Files:
src/sys/dev/mscp: mscp_disk.c
Log Message:
typo in previous
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/mscp/mscp_disk.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/dev/mscp/mscp_disk.c
diff -u src/sys/dev/mscp/mscp_disk.c:1.78 src/sys/dev/mscp/mscp_disk.c:1.79
--- src/sys/dev/mscp/mscp_disk.c:1.78 Sun Mar 16 05:20:28 2014
+++ src/sys/dev/mscp/mscp_disk.c Sun Mar 16 05:49:41 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_disk.c,v 1.78 2014/03/16 05:20:28 dholland Exp $ */
+/* $NetBSD: mscp_disk.c,v 1.79 2014/03/16 05:49:41 dholland Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -82,7 +82,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mscp_disk.c,v 1.78 2014/03/16 05:20:28 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: mscp_disk.c,v 1.79 2014/03/16 05:49:41 dholland Exp $);
#include sys/param.h
#include sys/buf.h
@@ -159,7 +159,7 @@ dev_type_size(rasize);
const struct bdevsw ra_bdevsw = {
.d_open = raopen,
.d_close = raclose,
- .d_strateegy = rastrategy,
+ .d_strategy = rastrategy,
.d_ioctl = raioctl,
.d_dump = radump,
.d_psize = rasize,
CVS commit: src/external/cddl/osnet/dev/dtrace/arm
Module Name:src Committed By: ozaki-r Date: Sat Mar 15 07:43:01 UTC 2014 Modified Files: src/external/cddl/osnet/dev/dtrace/arm: dtrace_isa.c Log Message: Make arm/dtrace_isa.c buildable This is a band-aid for build, but it works anyway. We have to do a real fix in the future. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dev/dtrace/arm
Module Name:src Committed By: ozaki-r Date: Sat Mar 15 07:49:15 UTC 2014 Modified Files: src/external/cddl/osnet/dev/dtrace/arm: dtrace_asm.S Log Message: Enable invop handler on module load It sets a fbt handler to dtrace_invop_jump_addr on module load, which is used to call the dtrace probing function from the trap handler. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/dev/dtrace/arm/dtrace_asm.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet
Module Name:src Committed By: ozaki-r Date: Sat Mar 15 08:00:19 UTC 2014 Modified Files: src/external/cddl/osnet/dev/fbt: fbt.c src/external/cddl/osnet/dist/uts/common/sys: dtrace.h Log Message: Implement DTrace FBT provider for ARM - Finding probable functions - Replacing instructions - Emulating instructions It is tested only on ARMv7 CPUs yet, for example, -m evbarm (-a earm) kernel=BEAGLEBONE. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/cddl/osnet/dev/fbt/fbt.c cvs rdiff -u -r1.9 -r1.10 \ src/external/cddl/osnet/dist/uts/common/sys/dtrace.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src Committed By: rmind Date: Sat Mar 15 08:46:01 UTC 2014 Modified Files: src/usr.sbin/npf/npfctl: npf_bpf_comp.c Log Message: npfctl_bpf_cidr: another buf fix in handling IPv6 masks (bug found on ARM). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/npf/npfctl/npf_bpf_comp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/news68k/news68k
Module Name:src Committed By: tsutsui Date: Sat Mar 15 09:24:56 UTC 2014 Modified Files: src/sys/arch/news68k/news68k: locore.s Log Message: Use common m68k/busaddrerr.s for bus error and address error handlers. No binary changes on GENERIC, and also tested on NWS-1750. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/arch/news68k/news68k/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hp300/hp300
Module Name:src Committed By: tsutsui Date: Sat Mar 15 09:26:36 UTC 2014 Modified Files: src/sys/arch/hp300/hp300: locore.s Log Message: Use common m68k/busaddrerr.s for bus error and address error handlers. No binary changes on GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.169 -r1.170 src/sys/arch/hp300/hp300/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/luna68k/luna68k
Module Name:src Committed By: tsutsui Date: Sat Mar 15 09:30:33 UTC 2014 Modified Files: src/sys/arch/luna68k/luna68k: locore.s Log Message: Use common m68k/busaddrerr.s for bus error and address error handlers. No binary changes on GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/arch/luna68k/luna68k/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: kiyohara Date: Sat Mar 15 10:30:41 UTC 2014 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add some Armada 370 IDs. To generate a diff of this commit: cvs rdiff -u -r1.1183 -r1.1184 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: kiyohara Date: Sat Mar 15 10:32:36 UTC 2014 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.1176 -r1.1177 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1175 -r1.1176 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/marvell
Module Name:src Committed By: kiyohara Date: Sat Mar 15 10:44:10 UTC 2014 Modified Files: src/sys/arch/arm/marvell: mvsoctmr.c Log Message: Support Armada 370. tested on MiraBox. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/marvell/mvsoctmr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/marvell
Module Name:src Committed By: kiyohara Date: Sat Mar 15 10:40:39 UTC 2014 Modified Files: src/sys/dev/marvell: marvellreg.h Log Message: Add some Armada 370 IDs. And fix comment-out-ed ID for Discovery VI. (from Marvell USP) To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/dev/marvell/marvellreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/marvell
Module Name:src Committed By: kiyohara Date: Sat Mar 15 10:54:40 UTC 2014 Modified Files: src/sys/arch/arm/marvell: armadaxp.c mvsocvar.h Log Message: Add armada370_getclks(). Remove some white spaces. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/marvell/armadaxp.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/marvell/mvsocvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/marvell
Module Name:src Committed By: kiyohara Date: Sat Mar 15 11:47:43 UTC 2014 Modified Files: src/sys/dev/marvell: marvellvar.h Log Message: Add tags to marvell_attach_args. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/marvell/marvellvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/marvell
Module Name:src Committed By: kiyohara Date: Sat Mar 15 11:48:38 UTC 2014 Modified Files: src/sys/arch/arm/marvell: mvsoc.c Log Message: Support Armada 370. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/marvell/mvsoc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/cesfic/cesfic
Module Name:src Committed By: tsutsui Date: Sat Mar 15 11:53:30 UTC 2014 Modified Files: src/sys/arch/cesfic/cesfic: locore.s Log Message: Use common m68k/busaddrerr.s for bus error and address error handlers. No binary changes on GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/cesfic/cesfic/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mvme68k/mvme68k
Module Name:src Committed By: tsutsui Date: Sat Mar 15 12:02:28 UTC 2014 Modified Files: src/sys/arch/mvme68k/mvme68k: locore.s Log Message: Remove duplicated INTERRUPT_SAVEREG and INTERRUPT_RESTOREREG macro. They are in m68k/asm.h and now using different register format. To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/sys/arch/mvme68k/mvme68k/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mvme68k/mvme68k
Module Name:src Committed By: tsutsui Date: Sat Mar 15 12:04:22 UTC 2014 Modified Files: src/sys/arch/mvme68k/mvme68k: locore.s Log Message: Use common m68k/busaddrerr.s for bus error and address error handlers. No binary changes on GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.113 -r1.114 src/sys/arch/mvme68k/mvme68k/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/next68k/next68k
Module Name:src Committed By: tsutsui Date: Sat Mar 15 12:06:54 UTC 2014 Modified Files: src/sys/arch/next68k/next68k: locore.s Log Message: Use common m68k/busaddrerr.s for bus error and address error handlers. No binary changes on GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/arch/next68k/next68k/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mac68k/mac68k
Module Name:src Committed By: tsutsui Date: Sat Mar 15 12:11:23 UTC 2014 Modified Files: src/sys/arch/mac68k/mac68k: locore.s Log Message: Use common m68k/busaddrerr.s for bus error and address error handlers. No binary changes on GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.169 -r1.170 src/sys/arch/mac68k/mac68k/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libm/arch/vax
Module Name:src Committed By: martin Date: Sat Mar 15 12:20:09 UTC 2014 Modified Files: src/lib/libm/arch/vax: n_support.S Log Message: Provide copysignf and copysignl To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libm/arch/vax/n_support.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/marvell
Module Name:src Committed By: kiyohara Date: Sat Mar 15 13:33:48 UTC 2014 Modified Files: src/sys/dev/marvell: ehci_mv.c gtidmac.c gtidmacvar.h if_mvgbe.c mvpex.c mvpexvar.h mvsata_mv.c mvsdio.c Log Message: Support Armada 370 and DDR3 tags. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/marvell/ehci_mv.c \ src/sys/dev/marvell/mvsdio.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/marvell/gtidmac.c cvs rdiff -u -r1.1 -r1.2 src/sys/dev/marvell/gtidmacvar.h cvs rdiff -u -r1.37 -r1.38 src/sys/dev/marvell/if_mvgbe.c cvs rdiff -u -r1.8 -r1.9 src/sys/dev/marvell/mvpex.c cvs rdiff -u -r1.3 -r1.4 src/sys/dev/marvell/mvpexvar.h cvs rdiff -u -r1.6 -r1.7 src/sys/dev/marvell/mvsata_mv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/marvell
Module Name:src Committed By: kiyohara Date: Sat Mar 15 13:48:45 UTC 2014 Modified Files: src/sys/arch/evbarm/marvell: marvell_machdep.c Log Message: Support Armada 370. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/marvell/marvell_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: jakllsch Date: Sat Mar 15 13:50:01 UTC 2014 Modified Files: src/sys/arch/amd64/conf: XEN3_DOMU Log Message: Enable PCI support in amd64 XEN3_DOMU config to match i386 XEN3_DOMU config. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/arch/amd64/conf/XEN3_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm
Module Name:src
Committed By: kiyohara
Date: Sat Mar 15 13:56:19 UTC 2014
Modified Files:
src/sys/arch/evbarm/conf: OPENBLOCKS_AX3 files.marvell
src/sys/arch/evbarm/marvell: marvellreg.h
Log Message:
Support options MVSOC_INTERREGS_PBASE for *old* Armada {XP,370} machines.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/files.marvell
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/marvell/marvellreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Sat Mar 15 14:02:01 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: OPENBLOCKS_AX3 Log Message: Add comment-out-ed FPU options. Armada XP has FPU. Add comment-out-ed athn. Change ehci[01] to ehci*. Check the clock gating already supported. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Sat Mar 15 14:09:09 UTC 2014 Added Files: src/sys/arch/evbarm/conf: MIRABOX Log Message: Support GlobalScale MiraBox. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/MIRABOX Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libm/arch/vax
Module Name:src Committed By: martin Date: Sat Mar 15 14:12:56 UTC 2014 Modified Files: src/lib/libm/arch/vax: n_support.S Log Message: Need to load the full argument To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/lib/libm/arch/vax/n_support.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Sat Mar 15 15:15:27 UTC 2014 Modified Files: src/sys/rump: Makefile.rump src/sys/rump/include/machine: cpu.h src/sys/rump/include/rump: rumpuser.h src/sys/rump/librump/rumpkern: lwproc.c rump.c rump_private.h scheduler.c threads.c src/sys/rump/librump/rumpkern/arch/x86: rump_x86_cpu.c Added Files: src/sys/rump/librump/rumpkern: rump_curlwp.h rump_curlwp___thread.h rump_curlwp_hypercall.h Log Message: Allow compile-time optimizations to curlwp. This can have a pretty staggering impact on performance. When running sendto() in a loop, the improvement is 200k more calls per second with an inlined __thread curlwp as opposed to the default. In other words, it shaves off hundreds of CPU cycles per call (~20%). Even just eliminating the x86_curlwp() call in favor of an inline gives an improvement of 60k calls per second. To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/sys/rump/Makefile.rump cvs rdiff -u -r1.19 -r1.20 src/sys/rump/include/machine/cpu.h cvs rdiff -u -r1.108 -r1.109 src/sys/rump/include/rump/rumpuser.h cvs rdiff -u -r1.26 -r1.27 src/sys/rump/librump/rumpkern/lwproc.c cvs rdiff -u -r1.289 -r1.290 src/sys/rump/librump/rumpkern/rump.c cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpkern/rump_curlwp.h \ src/sys/rump/librump/rumpkern/rump_curlwp___thread.h \ src/sys/rump/librump/rumpkern/rump_curlwp_hypercall.h cvs rdiff -u -r1.79 -r1.80 src/sys/rump/librump/rumpkern/rump_private.h cvs rdiff -u -r1.35 -r1.36 src/sys/rump/librump/rumpkern/scheduler.c cvs rdiff -u -r1.21 -r1.22 src/sys/rump/librump/rumpkern/threads.c cvs rdiff -u -r1.1 -r1.2 \ src/sys/rump/librump/rumpkern/arch/x86/rump_x86_cpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src Committed By: riastradh Date: Sat Mar 15 15:22:37 UTC 2014 Modified Files: src/usr.sbin/npf/npfctl: npf_parse.y Log Message: Convert right-recursive rules to left-recursive ones. This should obviate the need for the workaround of a large stack in order to handle many rules. No change in the resulting plists. ok rmind To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/usr.sbin/npf/npfctl/npf_parse.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/intel-fw-eula/ipw2200/dist
Module Name:src Committed By: roy Date: Sat Mar 15 15:23:22 UTC 2014 Modified Files: src/external/intel-fw-eula/ipw2200/dist: ipw2200-bss.fw ipw2200-ibss.fw ipw2200-sniffer.fw Log Message: Import ipw2200-fw-3.1 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/intel-fw-eula/ipw2200/dist/ipw2200-bss.fw \ src/external/intel-fw-eula/ipw2200/dist/ipw2200-ibss.fw \ src/external/intel-fw-eula/ipw2200/dist/ipw2200-sniffer.fw Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/omap
Module Name:src Committed By: matt Date: Sat Mar 15 17:14:56 UTC 2014 Modified Files: src/sys/arch/arm/omap: obio_ohci.c Log Message: OMAP5 support To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/omap/obio_ohci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Sat Mar 15 17:28:25 UTC 2014 Added Files: src/sys/arch/evbarm/conf: MIRABOX_INSTALL Log Message: Add install kernel for MIRABOX To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/MIRABOX_INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/bind/dist/lib/isc/unix
Module Name:src Committed By: christos Date: Sat Mar 15 18:28:23 UTC 2014 Modified Files: src/external/bsd/bind/dist/lib/isc/unix: app.c Log Message: Since the sigwait stuff is conditional to isc_bind9, we cannot block SIGHUP,SIGINT,SIGTERM on startup, so make those also conditional to isc_bind9. The net effect of this was that dhclient blocked the 3 signals for both itself and its progeny so /etc/rc.d/dhclient restart would not work. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/lib/isc/unix/app.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: martin Date: Sat Mar 15 19:20:27 UTC 2014 Modified Files: src/sys/dev/usb: uchcom.c Log Message: Remove unused include To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/dev/usb/uchcom.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/usr.bin/backend
Module Name:src Committed By: mrg Date: Sat Mar 15 20:46:38 UTC 2014 Modified Files: src/external/gpl3/gcc/usr.bin/backend: Makefile Log Message: make sure we use the C compiler (not C++) for CC= when running the configure for auto-build.h. fixes problems on linux. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/external/gpl3/gcc/usr.bin/backend/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/usr.bin/common-target
Module Name:src Committed By: mrg Date: Sat Mar 15 23:12:58 UTC 2014 Modified Files: src/external/gpl3/gcc/usr.bin/common-target: Makefile Log Message: add missing -DGENERATOR_FILE to HOST_CPPFLAGS. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/common-target/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/usr.bin/host-libiberty
Module Name:src Committed By: uwe Date: Sun Mar 16 00:07:58 UTC 2014 Modified Files: src/external/gpl3/gcc/usr.bin/host-libiberty: Makefile Log Message: G/c extraneous TAB. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/host-libiberty/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/login
Module Name:src Committed By: dholland Date: Sun Mar 16 00:33:13 UTC 2014 Modified Files: src/usr.bin/login: login.c Log Message: Fix gcc48 build without Kerberos. While here, rectify related bug where if gethostname() failed, login would null-terminate uninitialized stack trash and cheerfully pass it on to kerberos. In this case, revert to amnesiac instead. To generate a diff of this commit: cvs rdiff -u -r1.103 -r1.104 src/usr.bin/login/login.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/su
Module Name:src Committed By: dholland Date: Sun Mar 16 01:07:46 UTC 2014 Modified Files: src/usr.bin/su: su.c Log Message: Fix gcc48 build. No obvious reason why nobody else has hit this... To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/usr.bin/su/su.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ufs/ufs
Module Name:src Committed By: uwe Date: Sun Mar 16 01:21:35 UTC 2014 Modified Files: src/sys/ufs/ufs: ufs_quota2.c Log Message: Shut up -Wuninitialized on sh3 with gcc 4.8 To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/ufs/ufs/ufs_quota2.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/lib/libdtrace
Module Name:src Committed By: ozaki-r Date: Sun Mar 16 05:11:19 UTC 2014 Modified Files: src/external/cddl/osnet/lib/libdtrace: Makefile Log Message: Look up arm directory on MACHINE_ARCH=*arm* To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/lib/libdtrace/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: dholland Date: Sun Mar 16 05:20:30 UTC 2014 Modified Files: src/sys/altq: altq_conf.c src/sys/arch/acorn26/ioc: arcpp.c src/sys/arch/acorn32/mainbus: fd.c src/sys/arch/alpha/alpha: promcons.c src/sys/arch/amiga/dev: fd.c grf.c ite.c kbd.c mfc.c ms.c msc.c par.c ser.c view.c src/sys/arch/arc/dev: opms.c pccons.c src/sys/arch/arc/jazz: fd.c src/sys/arch/arm/at91: at91dbgu.c at91usart.c src/sys/arch/arm/clps711x: clpscom.c src/sys/arch/arm/ep93xx: epcom.c src/sys/arch/arm/footbridge: footbridge_com.c src/sys/arch/arm/imx: imxuart.c src/sys/arch/arm/ixp12x0: ixp12x0_com.c src/sys/arch/arm/s3c2xx0: sscom.c src/sys/arch/arm/sa11x0: sa11x0_com.c src/sys/arch/atari/dev: clock.c fd.c grf.c hdfd.c ite.c kbd.c lpt.c ms.c ser.c view.c zs.c src/sys/arch/atari/vme: et4000.c leo.c src/sys/arch/cobalt/dev: panel.c src/sys/arch/dreamcast/dev: gdrom.c src/sys/arch/dreamcast/dev/maple: maple.c mlcd.c mmemcard.c src/sys/arch/emips/ebus: ace_ebus.c dz_ebus.c flash_ebus.c icap_ebus.c stub_ebus.c src/sys/arch/epoc32/windermere: wmcom.c src/sys/arch/evbarm/dev: plcom.c src/sys/arch/evbarm/g42xxeb: g42xxeb_lcd.c src/sys/arch/evbarm/lubbock: lubbock_lcd.c src/sys/arch/evbarm/mini2440: mini2440_lcd.c src/sys/arch/evbarm/netwalker: netwalker_lcd.c src/sys/arch/evbarm/smdk2xx0: smdk2410_lcd.c src/sys/arch/evbarm/tsarm: tslcd.c src/sys/arch/evbppc/virtex/dev: xlcom.c src/sys/arch/hp300/dev: ct.c dcm.c mt.c ppi.c rd.c src/sys/arch/hpcmips/dev: ucbsnd.c src/sys/arch/hpcmips/tx: txcom.c src/sys/arch/hpcmips/vr: flash_vrip.c vr4181aiu.c src/sys/arch/i386/isa: cmos.c src/sys/arch/landisk/dev: button.c src/sys/arch/luna68k/dev: siotty.c src/sys/arch/mac68k/dev: aed.c grf_compat.c ite_compat.c src/sys/arch/mac68k/nubus: cpi_nubus.c src/sys/arch/mac68k/obio: asc.c iwm_fd.c src/sys/arch/macppc/dev: aed.c apm.c nvram.c ofcons.c src/sys/arch/mips/adm5120/dev: uart.c src/sys/arch/mips/atheros/dev: athflash.c src/sys/arch/mips/sibyte/dev: sbjcn.c sbscn.c src/sys/arch/mipsco/obio: i82072.c src/sys/arch/news68k/news68k: romcons.c src/sys/arch/prep/pnpbus: nvram_pnpbus.c src/sys/arch/sandpoint/sandpoint: satmgr.c src/sys/arch/sgimips/dev: scn.c src/sys/arch/sh3/dev: sci.c scif.c wdog.c src/sys/arch/shark/ofw: ofrom.c src/sys/arch/shark/shark: opms.c profile.c scr.c src/sys/arch/sparc/dev: cgeight.c cgfour.c cgfourteen.c cgtwo.c fd.c kd.c tctrl.c src/sys/arch/sparc/sparc: openprom.c src/sys/arch/sparc64/dev: fdc.c kd.c pcons.c sab.c src/sys/arch/sun2/dev: kd.c pcons.c src/sys/arch/sun3/dev: bw2.c cg2.c cg4.c fb.c fd.c kd.c xd.c xy.c src/sys/arch/vax/uba: qv.c src/sys/arch/vax/vax: cfl.c crl.c crx.c ctu.c gencons.c src/sys/arch/x68k/dev: bmd.c fd.c grf.c ite.c kbd.c ms.c opmbell.c par.c sram.c src/sys/arch/xen/xen: xbd_xenbus.c xencons.c xenevt.c src/sys/coda: coda_psdev.c src/sys/compat/svr4: svr4_net.c src/sys/dev: audio.c bio.c cgd.c clockctl.c cons.c fss.c kttcp.c ld.c lockstat.c md.c midi.c mm.c nullcons_subr.c radio.c rndpseudo.c sequencer.c verified_exec.c video.c vnd.c src/sys/dev/altmem: altmem.c src/sys/dev/apm: apm.c src/sys/dev/arcbios: arcbios_tty.c src/sys/dev/ata: ata.c wd.c src/sys/dev/bluetooth: bthub.c src/sys/dev/dec: dz.c src/sys/dev/dkwedge: dk.c src/sys/dev/dmover: dmover_io.c src/sys/dev/dtv: dtv_device.c src/sys/dev/filemon: filemon.c src/sys/dev/gpib: ct.c gpib.c mt.c ppi.c rd.c src/sys/dev/gpio: gpio.c src/sys/dev/hpc: biconsdev.c btnmgr.c src/sys/dev/hpc/apm: apmdev.c src/sys/dev/i2c: at24cxx.c ds1307.c i2c.c m41st84.c m41t00.c max6900.c pcf8583.c x1226.c src/sys/dev/i2o: dpti.c iop.c src/sys/dev/ic: cd18xx.c clmpcc.c com.c dpt.c icp_ioctl.c joy.c lpt.c mfi.c mlx.c rrunner.c tpm.c z8530tty.c src/sys/dev/ieee1394: fwdev.c src/sys/dev/ir: cir.c irframe.c src/sys/dev/isa: fd.c isv.c mcd.c satlink.c spkr.c wt.c src/sys/dev/iscsi: iscsi_main.c src/sys/dev/marvell: gtmpsc.c src/sys/dev/mca: ed_mca.c src/sys/dev/mscp: mscp_disk.c mscp_tape.c src/sys/dev/mvme: lpt_mvme.c src/sys/dev/ofw: ofcons.c ofdisk.c openfirmio.c src/sys/dev/onewire: onewire.c src/sys/dev/pci: agp.c amr.c cz.c mly.c pci_usrreq.c twa.c twe.c src/sys/dev/pci/bktr: bktr_os.c
CVS commit: src/sys/dev/mscp
Module Name:src Committed By: dholland Date: Sun Mar 16 05:49:41 UTC 2014 Modified Files: src/sys/dev/mscp: mscp_disk.c Log Message: typo in previous To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 src/sys/dev/mscp/mscp_disk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
