CVS commit: src/sys/arch/sparc/sparc
Module Name:src Committed By: martin Date: Wed Jun 4 07:06:03 UTC 2014 Modified Files: src/sys/arch/sparc/sparc: cpu.c Log Message: Patch from Nobuyoshi SATO: scale secondary cpu frequency in attach message just like the primary one. To generate a diff of this commit: cvs rdiff -u -r1.246 -r1.247 src/sys/arch/sparc/sparc/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/arch/sparc/sparc/cpu.c diff -u src/sys/arch/sparc/sparc/cpu.c:1.246 src/sys/arch/sparc/sparc/cpu.c:1.247 --- src/sys/arch/sparc/sparc/cpu.c:1.246 Tue May 20 18:32:08 2014 +++ src/sys/arch/sparc/sparc/cpu.c Wed Jun 4 07:06:03 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.246 2014/05/20 18:32:08 rmind Exp $ */ +/* $NetBSD: cpu.c,v 1.247 2014/06/04 07:06:03 martin Exp $ */ /* * Copyright (c) 1996 @@ -52,7 +52,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.246 2014/05/20 18:32:08 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.247 2014/06/04 07:06:03 martin Exp $); #include opt_multiprocessor.h #include opt_lockdebug.h @@ -526,7 +526,7 @@ cpu_attach_non_boot(struct cpu_softc *sc /* Now start this CPU */ cpu_spinup(cpi); printf(: %s @ %s MHz, %s FPU\n, cpi-cpu_longname, - clockfreq(cpi-hz), cpi-fpu_name); + clockfreq(cpi-hz / 1000), cpi-fpu_name); cache_print(sc);
CVS commit: src/sys/arch/arm/samsung
Module Name:src Committed By: reinoud Date: Wed Jun 4 10:27:26 UTC 2014 Modified Files: src/sys/arch/arm/samsung: exynos4_reg.h Log Message: Remove comment about possible identification of the MCUCTL To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/samsung/exynos4_reg.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/samsung/exynos4_reg.h diff -u src/sys/arch/arm/samsung/exynos4_reg.h:1.5 src/sys/arch/arm/samsung/exynos4_reg.h:1.6 --- src/sys/arch/arm/samsung/exynos4_reg.h:1.5 Tue Jun 3 15:51:59 2014 +++ src/sys/arch/arm/samsung/exynos4_reg.h Wed Jun 4 10:27:26 2014 @@ -178,7 +178,7 @@ #define EXYNOS4_MTCADC_ISP_OFFSET 0x0215 /* (specialised?) AD Converter */ #define EXYNOS4_PWM_ISP_OFFSET 0x0216 /* PWM */ #define EXYNOS4_WDT_ISP_OFFSET 0x0217 /* Watch Dog Timer */ -#define EXYNOS4_MCUCTL_ISP_OFFSET 0x0218 /* power module control unit? */ +#define EXYNOS4_MCUCTL_ISP_OFFSET 0x0218 /* XXX unknown XXX */ #define EXYNOS4_UART_ISP_OFFSET 0x0219 /* uart base clock */ #define EXYNOS4_SPI0_ISP_OFFSET 0x021A #define EXYNOS4_SPI1_ISP_OFFSET 0x021B
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src
Committed By: riastradh
Date: Wed Jun 4 13:52:52 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_overlay.c
Log Message:
Mark variables __diagused.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.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/external/bsd/drm2/dist/drm/i915/intel_overlay.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c:1.2 Tue Mar 18 18:20:42 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c Wed Jun 4 13:52:52 2014
@@ -714,7 +714,7 @@ static int intel_overlay_do_put_image(st
int ret, tmp_width;
struct overlay_registers __iomem *regs;
bool scale_changed = false;
- struct drm_device *dev = overlay-dev;
+ struct drm_device *dev __diagused = overlay-dev;
u32 swidth, swidthsw, sheight, ostride;
BUG_ON(!mutex_is_locked(dev-struct_mutex));
@@ -819,7 +819,7 @@ out_unpin:
int intel_overlay_switch_off(struct intel_overlay *overlay)
{
struct overlay_registers __iomem *regs;
- struct drm_device *dev = overlay-dev;
+ struct drm_device *dev __diagused = overlay-dev;
int ret;
BUG_ON(!mutex_is_locked(dev-struct_mutex));
CVS commit: src/external/gpl3/gcc/dist/gcc/config/vax
Module Name:src
Committed By: matt
Date: Wed Jun 4 16:11:33 UTC 2014
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/vax: vax.c
Log Message:
Don't match an indexed address of the form val[reg].
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/dist/gcc/config/vax/vax.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/gpl3/gcc/dist/gcc/config/vax/vax.c
diff -u src/external/gpl3/gcc/dist/gcc/config/vax/vax.c:1.8 src/external/gpl3/gcc/dist/gcc/config/vax/vax.c:1.9
--- src/external/gpl3/gcc/dist/gcc/config/vax/vax.c:1.8 Tue Jun 3 22:34:28 2014
+++ src/external/gpl3/gcc/dist/gcc/config/vax/vax.c Wed Jun 4 16:11:32 2014
@@ -2354,8 +2354,10 @@ vax_decomposed_dimode_operand_p (rtx lo,
if (GET_CODE (lo) == PLUS)
{
- /* If PLUS, this must an indexed address so fail. */
- if (GET_CODE (XEXP (lo, 0)) == PLUS || !CONST_INT_P (XEXP (lo, 1)))
+ /* If PLUS or MULT, this must an indexed address so fail. */
+ if (GET_CODE (XEXP (lo, 0)) == PLUS
+ || GET_CODE (XEXP (lo, 0)) == MULT
+ || !CONST_INT_P (XEXP (lo, 1)))
return false;
lo_offset = INTVAL (XEXP (lo, 1));
lo = XEXP(lo, 0);
@@ -2363,8 +2365,10 @@ vax_decomposed_dimode_operand_p (rtx lo,
if (GET_CODE (hi) == PLUS)
{
- /* If PLUS, this must an indexed address so fail. */
- if (GET_CODE (XEXP (hi, 0)) == PLUS || !CONST_INT_P (XEXP (hi, 1)))
+ /* If PLUS or MULT, this must an indexed address so fail. */
+ if (GET_CODE (XEXP (hi, 0)) == PLUS
+ || GET_CODE (XEXP (hi, 0)) == MULT
+ || !CONST_INT_P (XEXP (hi, 1)))
return false;
hi_offset = INTVAL (XEXP (hi, 1));
hi = XEXP(hi, 0);
CVS commit: src/sys/arch/sgimips/conf
Module Name:src Committed By: macallan Date: Wed Jun 4 18:18:21 UTC 2014 Modified Files: src/sys/arch/sgimips/conf: std.sgimips64_32 Log Message: fix comments To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sgimips/conf/std.sgimips64_32 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/sgimips/conf/std.sgimips64_32 diff -u src/sys/arch/sgimips/conf/std.sgimips64_32:1.2 src/sys/arch/sgimips/conf/std.sgimips64_32:1.3 --- src/sys/arch/sgimips/conf/std.sgimips64_32:1.2 Sat May 31 16:16:52 2014 +++ src/sys/arch/sgimips/conf/std.sgimips64_32 Wed Jun 4 18:18:21 2014 @@ -1,10 +1,13 @@ -# $NetBSD: std.sgimips64_32,v 1.2 2014/05/31 16:16:52 macallan Exp $ +# $NetBSD: std.sgimips64_32,v 1.3 2014/06/04 18:18:21 macallan Exp $ # this is for building n32 kernels no makeoptions MACHINE_ARCH makeoptions MACHINE_ARCH=mips64eb makeoptions LP64=no -# we do not need or want these in a 32bit kernel +# ELF64 doesn't currently buid with 32bit kernels #options EXEC_ELF64 # exec ELF64 binaries + +# for some reason this kicks in for n32 binaries as well, causing problems +# with pkgsrc ( MACHINE_ARCH vs. uname -p mismatch ) #options COMPAT_NETBSD32
CVS commit: src/sys/arch/sgimips/conf
Module Name:src Committed By: macallan Date: Wed Jun 4 18:19:20 UTC 2014 Added Files: src/sys/arch/sgimips/conf: GENERIC64_32_IP2x Log Message: n32 kernel for IP2x To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/sgimips/conf/GENERIC64_32_IP2x 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/sgimips/conf/GENERIC64_32_IP2x diff -u /dev/null src/sys/arch/sgimips/conf/GENERIC64_32_IP2x:1.1 --- /dev/null Wed Jun 4 18:19:20 2014 +++ src/sys/arch/sgimips/conf/GENERIC64_32_IP2x Wed Jun 4 18:19:20 2014 @@ -0,0 +1,50 @@ +# $NetBSD: GENERIC64_32_IP2x,v 1.1 2014/06/04 18:19:20 macallan Exp $ +# +# GENERIC32_IP2x machine description file +# +# This machine description file is used to generate the default NetBSD +# kernel. The generic kernel does not include all options, subsystems +# and device drivers, but should be useful for most applications. +# +# The machine description file can be customised for your specific +# machine to reduce the kernel size and improve its performance. +# +# For further information on compiling NetBSD kernels, see the config(8) +# man page. +# +# For further information on hardware support for this architecture, see +# the intro(4) man page. For further information about kernel options +# for this architecture, see the options(4) man page. For an explanation +# of each device driver in this file see the section 4 man page for the +# device. +# +# +# Currently this config file supports Indigo R4k, Indigo2 and Indy +# (IP20, IP22 and IP24, respectively). +# + +include arch/sgimips/conf/GENERIC32_IP2x +include arch/sgimips/conf/std.sgimips64_32 + +no makeoptions TEXTADDR # entry point +makeoptions TEXTADDR=0x88069000 # entry point + +#ident GENERIC64-IP2x-$Revision: 1.1 $ + +no makeoptions WANT_ECOFF +makeoptions WANT_ECOFF=no # Create an ECOFF kernel in addition + # to an ELF kernel -- required for + # netbooting Indigo (IP20) and some + # Indigo2 (IP22) machines + +# Compatibility options +#options COMPAT_15 # NetBSD 1.5 +#options COMPAT_16 # NetBSD 1.6 +#options COMPAT_20 # NetBSD 2.0 +#options COMPAT_30 # NetBSD 3.0 +#options COMPAT_40 # NetBSD 4.0 compatibility. +#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. + +#options COMPAT_LINUX # binary compatibility with Linux +#options COMPAT_ULTRIX # binary compatibility with Ultrix +#options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
CVS commit: xsrc/external/mit/xf86-video-newport/dist/src
Module Name:xsrc
Committed By: macallan
Date: Wed Jun 4 18:20:44 UTC 2014
Modified Files:
xsrc/external/mit/xf86-video-newport/dist/src: newport_driver.c
Log Message:
don't bail if the video mode is something else than 1280x1024
1024x768 works fine
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c
diff -u xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c:1.9 xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c:1.10
--- xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c:1.9 Tue May 24 19:35:28 2011
+++ xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c Wed Jun 4 18:20:44 2014
@@ -799,7 +799,8 @@ NewportModeInit(ScrnInfoPtr pScrn, Displ
width = mode-HDisplay;
height = mode-VDisplay;
- if (width != 1280 || height != 1024) {
+ if ((width 1280) || (width 1024) ||
+ (height 768) || (height 1024)) {
xf86DrvMsg(pScrn-scrnIndex, X_ERROR, \
Width = %d and height = %d is not supported by by this driver\n, width, height);
return FALSE;
CVS commit: src/external/gpl3/gcc/lib/libgomp
Module Name:src
Committed By: tron
Date: Wed Jun 4 19:07:22 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libgomp: Makefile
Log Message:
Fix build with stack smash protection enabled.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gcc/lib/libgomp/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/lib/libgomp/Makefile
diff -u src/external/gpl3/gcc/lib/libgomp/Makefile:1.12 src/external/gpl3/gcc/lib/libgomp/Makefile:1.13
--- src/external/gpl3/gcc/lib/libgomp/Makefile:1.12 Sun Jun 1 19:51:01 2014
+++ src/external/gpl3/gcc/lib/libgomp/Makefile Wed Jun 4 19:07:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/06/01 19:51:01 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2014/06/04 19:07:22 tron Exp $
# build GCC's libgomp, so that -fopenmp works.
@@ -50,8 +50,6 @@ CPPFLAGS+= \
-I${ARCHDIR}
CFLAGS+=-pthread
-COPTS+= -Wno-stack-protector
-
CWARNFLAGS.clang+= -Wno-conversion
# libgomp is 1.0 is in GCC 4.5, and 1.1 in 4.8 since it added more symbols
@@ -75,4 +73,6 @@ libinstall::
.include bsd.lib.mk
+COPTS+= -Wno-stack-protector
+
.PATH: ${ARCHDIR} ${DIST}/libgomp ${DIST}/libgomp/config/posix
CVS commit: src/distrib/vax/cdroms/installcd
Module Name:src
Committed By: martin
Date: Wed Jun 4 19:31:57 UTC 2014
Modified Files:
src/distrib/vax/cdroms/installcd: Makefile
Log Message:
When uncompressing the kernel, allow overwriting of an existing one in the
cdrom content directory - this helps update builds.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/vax/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/vax/cdroms/installcd/Makefile
diff -u src/distrib/vax/cdroms/installcd/Makefile:1.6 src/distrib/vax/cdroms/installcd/Makefile:1.7
--- src/distrib/vax/cdroms/installcd/Makefile:1.6 Sat May 31 10:43:00 2014
+++ src/distrib/vax/cdroms/installcd/Makefile Wed Jun 4 19:31:57 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/05/31 10:43:00 martin Exp $
+# $NetBSD: Makefile,v 1.7 2014/06/04 19:31:57 martin Exp $
CDBASE= vaxcd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
CDKERNELS= ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz netbsd.gz
@@ -31,7 +31,7 @@ image_md_pre:
for f in ${SYSINSTDIR}/sysinstmsgs.??; do \
${INSTALL} ${COPY} $$f cdrom; \
done
- ${TOOL_GZIP} -d cdrom/netbsd.gz
+ ${TOOL_GZIP} -d -f cdrom/netbsd.gz
echo '. type=dir optional' ./fs.spec
echo './dev type=dir optional' ./fs.spec
${HOST_SH} cdrom/dev/MAKEDEV -s all | ${TOOL_SED} -e '1d' -e 's:^\./:./dev/:' ./fs.spec
CVS commit: src/sys/arch/sun3/conf
Module Name:src Committed By: abs Date: Wed Jun 4 20:21:24 UTC 2014 Modified Files: src/sys/arch/sun3/conf: DISKLESS Log Message: Sync (commented out) some of the network and filesystem related blocks from GENERIC. Only functional change is to comment out tun in DISKLESS to match GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sys/arch/sun3/conf/DISKLESS 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/sun3/conf/DISKLESS diff -u src/sys/arch/sun3/conf/DISKLESS:1.67 src/sys/arch/sun3/conf/DISKLESS:1.68 --- src/sys/arch/sun3/conf/DISKLESS:1.67 Sun Jun 30 21:38:59 2013 +++ src/sys/arch/sun3/conf/DISKLESS Wed Jun 4 20:21:24 2014 @@ -1,4 +1,4 @@ -# $NetBSD: DISKLESS,v 1.67 2013/06/30 21:38:59 rmind Exp $ +# $NetBSD: DISKLESS,v 1.68 2014/06/04 20:21:24 abs Exp $ # DISKLESS - Root and swap on NFS # Desktop machines only (3/50, 3/60, 3/110) @@ -41,9 +41,12 @@ options USERCONF # userconf(4) support #options DIAGNOSTIC # extra kernel sanity checking #options KMEMSTATS # kernel memory statistics (vmstat -m) #options PMAP_DEBUG +#options SCSIDEBUG +#options SCSIVERBOSE # Verbose SCSI errors # Compatibility options #options COMPAT_SUNOS # can run SunOS 4.1.1 executables +#options COMPAT_SVR4 # can run SVR4 executables #options COMPAT_43 # and 4.3BSD and ... #options COMPAT_10 # NetBSD 1.0 #options COMPAT_11 # NetBSD 1.1 @@ -57,7 +60,9 @@ options COMPAT_30 # NetBSD 3.0 options COMPAT_40 # NetBSD 4.0 options COMPAT_50 # NetBSD 5.0 compatibility. options COMPAT_60 # NetBSD 6.0 compatibility. +#options COMPAT_AOUT_M68K # support for NetBSD a.out executables #options COMPAT_LINUX # can run Linux/m68k executables +#options EXEC_AOUT # support for a.out executables #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. @@ -68,18 +73,27 @@ file-system NFS # Sun NFS client suppor #file-system FDESC # /dev/fd/* #file-system KERNFS # /kern #file-system NULLFS # loopback file system +#file-system OVERLAY # overlay file system #file-system PROCFS # /proc #file-system UNION # union file system #file-system MFS # memory-based filesystem #file-system PTYFS # /dev/pts/N support +#file-system TMPFS # Efficient memory file-system +#file-system UDF # experimental - OSTA UDF CD/DVD file-system #options NFSSERVER # nfs server support #options QUOTA # legacy UFS quotas #options QUOTA2 # new, in-filesystem UFS quotas #options FFS_EI # FFS Endian Independent support +#options WAPBL # File system journaling support +#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental +#options FFS_NO_SNAPSHOT # No FFS snapshot support # Networking options options INET # IP protocol stack support +#options INET6 # IPV6 +#options IPSEC # IP security +#options IPSEC_DEBUG # debug for IP security #options GATEWAY # IP packet forwarding #options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG @@ -145,11 +159,21 @@ include arch/sun3/conf/cg4.sun3 # Misc. pseudo-device loop # network loopback pseudo-device bpfilter # packet filter +#pseudo-device carp # Common Address Redundancy Protocol pseudo-device sl # CSLIP pseudo-device ppp # PPP -pseudo-device tun # network tunneling over tty +#pseudo-device pppoe # PPP over Ethernet (RFC 2516) +#pseudo-device tun # network tunneling over tty +#pseudo-device tap # virtual Ethernet #pseudo-device gre # generic L3 over IP tunnel #pseudo-device ipfilter # ip filter +#pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933) +#pseudo-device faith # IPv[46] tcp relay translation i/f +#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation +#pseudo-device vlan # IEEE 802.1q encapsulation +#pseudo-device bridge # simple inter-network bridging +#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too +#pseudo-device agr # IEEE 802.3ad link aggregation pseudo-device pty # pseudo-terminals pseudo-device clockctl # user control of clock subsystem
CVS commit: src/sys/arch/vax/conf
Module Name:src
Committed By: matt
Date: Wed Jun 4 21:24:55 UTC 2014
Modified Files:
src/sys/arch/vax/conf: Makefile.vax
Log Message:
Modify compiler HACK to be for GCC 4.1 only
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/vax/conf/Makefile.vax
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/vax/conf/Makefile.vax
diff -u src/sys/arch/vax/conf/Makefile.vax:1.81 src/sys/arch/vax/conf/Makefile.vax:1.82
--- src/sys/arch/vax/conf/Makefile.vax:1.81 Fri Jan 21 15:59:10 2011
+++ src/sys/arch/vax/conf/Makefile.vax Wed Jun 4 21:24:54 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.vax,v 1.81 2011/01/21 15:59:10 joerg Exp $
+# $NetBSD: Makefile.vax,v 1.82 2014/06/04 21:24:54 matt Exp $
# Makefile for NetBSD
#
@@ -76,7 +76,9 @@ lock_stubs.o unimpl_emul.o: assym.h
##
# XXX recent gcc4 gets ICE on this one
+.if ${HAVE_GCC} == 4
COPTS.db_command.c+= -fno-tree-ter
+.endif
##
## (8) config(8) generated machinery
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: wiz
Date: Wed Jun 4 21:42:35 UTC 2014
Modified Files:
src/sys/dev/ic: atppc.c
Log Message:
Remove set-but-unused variable.
From John D. Baker on current-users.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/ic/atppc.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/ic/atppc.c
diff -u src/sys/dev/ic/atppc.c:1.30 src/sys/dev/ic/atppc.c:1.31
--- src/sys/dev/ic/atppc.c:1.30 Thu May 26 02:37:25 2011
+++ src/sys/dev/ic/atppc.c Wed Jun 4 21:42:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc.c,v 1.30 2011/05/26 02:37:25 jakllsch Exp $ */
+/* $NetBSD: atppc.c,v 1.31 2014/06/04 21:42:35 wiz Exp $ */
/*
* Copyright (c) 2001 Alcove - Nicolas Souchu
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: atppc.c,v 1.30 2011/05/26 02:37:25 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: atppc.c,v 1.31 2014/06/04 21:42:35 wiz Exp $);
#include opt_atppc.h
@@ -1962,7 +1962,6 @@ atppc_ecp_read_error(struct atppc_softc
static void
atppc_std_write(struct atppc_softc * const atppc)
{
- unsigned int timecount;
unsigned char ctr;
ctr = atppc_r_ctr(atppc);
@@ -1997,7 +1996,6 @@ atppc_std_write(struct atppc_softc * con
atppc_barrier_w(atppc);
/* Wait for nACK for MAXBUSYWAIT */
- timecount = 0;
if (atppc-sc_use ATPPC_USE_INTR) {
atppc-sc_outerr = atppc_wait_interrupt(atppc,
atppc-sc_out_cv, ATPPC_IRQ_nACK);
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: matt
Date: Thu Jun 5 03:45:48 UTC 2014
Modified Files:
src/sys/arch/arm/arm32: pmap.c
Log Message:
Fix occupancy bug.
To generate a diff of this commit:
cvs rdiff -u -r1.292 -r1.293 src/sys/arch/arm/arm32/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.292 src/sys/arch/arm/arm32/pmap.c:1.293
--- src/sys/arch/arm/arm32/pmap.c:1.292 Wed Apr 30 21:15:06 2014
+++ src/sys/arch/arm/arm32/pmap.c Thu Jun 5 03:45:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.292 2014/04/30 21:15:06 joerg Exp $ */
+/* $NetBSD: pmap.c,v 1.293 2014/06/05 03:45:48 matt Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -216,7 +216,7 @@
#include arm/locore.h
//#include arm/arm32/katelib.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.292 2014/04/30 21:15:06 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.293 2014/06/05 03:45:48 matt Exp $);
//#define PMAP_DEBUG
#ifdef PMAP_DEBUG
@@ -6036,7 +6036,7 @@ pmap_bootstrap(vaddr_t vstart, vaddr_t v
l2idx (L2_TABLE_SIZE_REAL / sizeof(pt_entry_t));
l2idx++) {
if ((ptep[l2idx] L2_TYPE_MASK) != L2_TYPE_INV) {
-l2b-l2b_occupancy += PAGE_SIZE / L2_S_SIZE;
+l2b-l2b_occupancy++;
}
}
CVS commit: src/sys/arch/arm/mainbus
Module Name:src
Committed By: matt
Date: Thu Jun 5 03:46:26 UTC 2014
Modified Files:
src/sys/arch/arm/mainbus: cpu_mainbus.c mainbus.c
Log Message:
Cleanup a few MULTIPROCESSOR issues.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/mainbus/cpu_mainbus.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/mainbus/mainbus.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/mainbus/cpu_mainbus.c
diff -u src/sys/arch/arm/mainbus/cpu_mainbus.c:1.14 src/sys/arch/arm/mainbus/cpu_mainbus.c:1.15
--- src/sys/arch/arm/mainbus/cpu_mainbus.c:1.14 Fri Mar 28 21:43:01 2014
+++ src/sys/arch/arm/mainbus/cpu_mainbus.c Thu Jun 5 03:46:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_mainbus.c,v 1.14 2014/03/28 21:43:01 matt Exp $ */
+/* $NetBSD: cpu_mainbus.c,v 1.15 2014/06/05 03:46:26 matt Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -44,7 +44,7 @@
#include locators.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu_mainbus.c,v 1.14 2014/03/28 21:43:01 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu_mainbus.c,v 1.15 2014/06/05 03:46:26 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -79,24 +79,31 @@ cpu_mainbus_match(device_t parent, cfdat
int id = mb-mb_core;
if (id != MAINBUSCF_CORE_DEFAULT) {
- if (id = arm_cpu_max || kcpuset_isset(kcpuset_attached, id))
+ if (id == 0)
+ return cpu_info_store.ci_dev == NULL;
+ if (id = arm_cpu_max)
return 0;
- if (id == 0 cpu_info_store.ci_dev != NULL)
+#ifdef MULTIPROCESSOR
+ if (cpu_info[id] != NULL)
return 0;
+#endif
+ return 1;
+ }
+
+ if (cpu_info_store.ci_dev == NULL) {
+ mb-mb_core = 0;
return 1;
}
- for (id = 0; id arm_cpu_max; id++) {
#ifdef MULTIPROCESSOR
- if (cpu_info[id] != NULL cpu_info[id]-ci_dev != NULL)
+ for (id = 1; id arm_cpu_max; id++) {
+ if (cpu_info[id] != NULL)
continue;
-#else
- if (id != 0 || cpu_info_store.ci_dev != NULL)
- continue;
-#endif
mb-mb_core = id;
return 1;
}
+#endif
+
return 0;
}
Index: src/sys/arch/arm/mainbus/mainbus.c
diff -u src/sys/arch/arm/mainbus/mainbus.c:1.20 src/sys/arch/arm/mainbus/mainbus.c:1.21
--- src/sys/arch/arm/mainbus/mainbus.c:1.20 Wed Aug 29 23:16:35 2012
+++ src/sys/arch/arm/mainbus/mainbus.c Thu Jun 5 03:46:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.20 2012/08/29 23:16:35 matt Exp $ */
+/* $NetBSD: mainbus.c,v 1.21 2014/06/05 03:46:26 matt Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.20 2012/08/29 23:16:35 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.21 2014/06/05 03:46:26 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -151,7 +151,9 @@ mainbussearch(device_t parent, cfdata_t
tryagain = 0;
if (config_match(parent, cf, mb) 0) {
config_attach(parent, cf, mb, mainbusprint);
-/* tryagain = (cf-cf_fstate == FSTATE_STAR);*/
+#ifdef MULTIPROCESSOR
+ tryagain = (cf-cf_fstate == FSTATE_STAR);
+#endif
}
} while (tryagain);
CVS commit: src/sys/arch/arm/allwinner
Module Name:src
Committed By: matt
Date: Thu Jun 5 03:48:08 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_eth.c
Log Message:
Start of the 10/100 driver.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/allwinner/awin_eth.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/allwinner/awin_eth.c
diff -u src/sys/arch/arm/allwinner/awin_eth.c:1.3 src/sys/arch/arm/allwinner/awin_eth.c:1.4
--- src/sys/arch/arm/allwinner/awin_eth.c:1.3 Sun Sep 8 04:06:44 2013
+++ src/sys/arch/arm/allwinner/awin_eth.c Thu Jun 5 03:48:08 2014
@@ -31,12 +31,15 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: awin_eth.c,v 1.3 2013/09/08 04:06:44 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_eth.c,v 1.4 2014/06/05 03:48:08 matt Exp $);
+#include sys/param.h
#include sys/bus.h
#include sys/device.h
#include sys/intr.h
+#include sys/ioctl.h
#include sys/mutex.h
+#include sys/rnd.h
#include sys/systm.h
#include net/if.h
@@ -51,10 +54,47 @@ __KERNEL_RCSID(1, $NetBSD: awin_eth.c,v
static int awin_eth_match(device_t, cfdata_t, void *);
static void awin_eth_attach(device_t, device_t, void *);
+static int awin_eth_intr(void *);
+
static int awin_eth_miibus_read_reg(device_t, int, int);
static void awin_eth_miibus_write_reg(device_t, int, int, int);
static void awin_eth_miibus_statchg(struct ifnet *);
+static void awin_eth_ifstart(struct ifnet *);
+static int awin_eth_ifioctl(struct ifnet *, u_long, void *);
+static int awin_eth_ifinit(struct ifnet *);
+static void awin_eth_ifstop(struct ifnet *, int);
+static void awin_eth_ifwatchdog(struct ifnet *);
+static void awin_eth_ifdrain(struct ifnet *);
+
+struct awin_eth_softc;
+static void awin_eth_rx_hash(struct awin_eth_softc *);
+
+struct awin_eth_regs {
+ uint32_t reg_ctl;
+ uint32_t reg_ts_mode;
+ uint32_t reg_ts_flow;
+ uint32_t reg_ts_ctl[2];
+ uint32_t reg_ts_ins;
+ uint32_t reg_ts_pl[2];
+ uint32_t reg_ts_sta;
+ uint32_t reg_rx_ctl;
+ uint32_t reg_rx_hash[2];
+ uint32_t reg_rx_sta;
+ uint32_t reg_rx_fbc;
+ uint32_t reg_int_ctl;
+ uint32_t reg_mac_ctl0;
+ uint32_t reg_mac_ctl1;
+ uint32_t reg_mac_ipgt;
+ uint32_t reg_mac_ipgr;
+ uint32_t reg_mac_clrt;
+ uint32_t reg_mac_maxf;
+ uint32_t reg_mac_supp;
+ uint32_t reg_mac_a0;
+ uint32_t reg_mac_a1;
+ uint32_t reg_mac_a2;
+};
+
struct awin_eth_softc {
device_t sc_dev;
bus_space_tag_t sc_bst;
@@ -62,7 +102,12 @@ struct awin_eth_softc {
bus_dma_tag_t sc_dmat;
struct ethercom sc_ec;
struct mii_data sc_mii;
+ krndsource_t sc_rnd_source; /* random source */
+ kmutex_t sc_intr_lock;
kmutex_t sc_mdio_lock;
+ uint8_t sc_tx_active;
+ struct awin_eth_regs sc_reg;
+ void *sc_ih;
};
CFATTACH_DECL_NEW(awin_eth, sizeof(struct awin_eth_softc),
@@ -74,17 +119,25 @@ static const struct awin_gpio_pinset awi
};
static inline uint32_t
-awin_eth_read_4(struct awin_eth_softc *sc, bus_size_t o)
+awin_eth_read(struct awin_eth_softc *sc, bus_size_t o)
{
return bus_space_read_4(sc-sc_bst, sc-sc_bsh, o);
}
static inline void
-awin_eth_write_4(struct awin_eth_softc *sc, bus_size_t o, uint32_t v)
+awin_eth_write(struct awin_eth_softc *sc, bus_size_t o, uint32_t v)
{
return bus_space_write_4(sc-sc_bst, sc-sc_bsh, o, v);
}
+static inline void
+awin_eth_clear_set(struct awin_eth_softc *sc, bus_size_t o, uint32_t c,
+uint32_t s)
+{
+ uint32_t v = bus_space_read_4(sc-sc_bst, sc-sc_bsh, o);
+ return bus_space_write_4(sc-sc_bst, sc-sc_bsh, o, (v ~c) | s);
+}
+
static int
awin_eth_match(device_t parent, cfdata_t cf, void *aux)
{
@@ -116,11 +169,22 @@ awin_eth_attach(device_t parent, device_
awin_eth_pinsets[cf-cf_flags 1];
struct ifnet * const ifp = sc-sc_ec.ec_if;
struct mii_data * const mii = sc-sc_mii;
+ char enaddr[ETHER_ADDR_LEN];
sc-sc_dev = self;
awin_gpio_pinset_acquire(pinset);
+ awin_reg_set_clear(aio-aio_core_bst, aio-aio_ccm_bsh,
+ AWIN_AHB_GATING0_REG, AWIN_AHB_GATING0_EMAC, 0);
+ /*
+ * Give 13KB of SRAM to EMAC
+ */
+ awin_reg_set_clear(aio-aio_core_bst, aio-aio_core_bsh,
+ AWIN_SRAM_OFFSET + AWIN_SRAM_CTL1_REG,
+ __SHIFTIN(AWIN_SRAM_CTL1_A3_A4_EMAC, AWIN_SRAM_CTL1_A3_A4),
+ AWIN_SRAM_CTL1_A3_A4);
+ mutex_init(sc-sc_intr_lock, MUTEX_DEFAULT, IPL_NET);
mutex_init(sc-sc_mdio_lock, MUTEX_DEFAULT, IPL_NET);
sc-sc_bst = aio-aio_core_bst;
@@ -131,7 +195,40 @@ awin_eth_attach(device_t parent, device_
aprint_naive(\n);
aprint_normal(: 10/100 Ethernet Controller\n);
+ /*
+ * Diable and then clear all interrupts
+ */
+ awin_eth_write(sc, AWIN_EMAC_INT_CTL_REG, 0);
+ awin_eth_write(sc, AWIN_EMAC_INT_STA_REG,
+ awin_eth_read(sc, AWIN_EMAC_INT_STA_REG));
+
+ sc-sc_ih = intr_establish(loc-loc_intr, IPL_NET, IST_LEVEL,
+ awin_eth_intr, sc);
+ if (sc-sc_ih == NULL) {
+ aprint_error_dev(self, failed to establish interrupt %d\n,
+ loc-loc_intr);
+ return;
+ }
+
CVS commit: src/sys/arch/arm/allwinner
Module Name:src
Committed By: matt
Date: Thu Jun 5 03:48:32 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_tmr.c awin_var.h
Log Message:
Start to flesh out the A10 timer code.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/allwinner/awin_tmr.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/allwinner/awin_var.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/allwinner/awin_tmr.c
diff -u src/sys/arch/arm/allwinner/awin_tmr.c:1.2 src/sys/arch/arm/allwinner/awin_tmr.c:1.3
--- src/sys/arch/arm/allwinner/awin_tmr.c:1.2 Thu Feb 20 21:48:38 2014
+++ src/sys/arch/arm/allwinner/awin_tmr.c Thu Jun 5 03:48:32 2014
@@ -31,12 +31,13 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: awin_tmr.c,v 1.2 2014/02/20 21:48:38 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_tmr.c,v 1.3 2014/06/05 03:48:32 matt Exp $);
#include sys/param.h
#include sys/bus.h
#include sys/device.h
#include sys/intr.h
+#include sys/kernel.h
#include sys/systm.h
#include arm/allwinner/awin_reg.h
@@ -50,11 +51,31 @@ struct awin_tmr_softc {
bus_space_tag_t sc_bst;
bus_space_handle_t sc_bsh;
bus_dma_tag_t sc_dmat;
+ void *sc_ih;
+ /* register mirrors */
+ uint32_t sc_intv_value;
+ uint32_t sc_ctrl;
};
-CFATTACH_DECL_NEW(awin_tmr, sizeof(struct awin_tmr_softc),
+static int awin_tmr_intr(void *);
+
+static struct awin_tmr_softc awin_tmr_softc;
+
+CFATTACH_DECL_NEW(awin_tmr, 0,
awin_tmr_match, awin_tmr_attach, NULL, NULL);
+static inline uint32_t
+awin_tmr_read(struct awin_tmr_softc *sc, bus_size_t off)
+{
+ return bus_space_read_4(sc-sc_bst, sc-sc_bsh, off);
+}
+
+static inline void
+awin_tmr_write(struct awin_tmr_softc *sc, bus_size_t off, uint32_t val)
+{
+ return bus_space_write_4(sc-sc_bst, sc-sc_bsh, off, val);
+}
+
static int
awin_tmr_match(device_t parent, cfdata_t cf, void *aux)
{
@@ -62,6 +83,9 @@ awin_tmr_match(device_t parent, cfdata_t
const struct awin_locators * const loc = aio-aio_loc;
const int port = cf-cf_loc[AWINIOCF_PORT];
+ if (awin_tmr_softc.sc_dev != NULL)
+ return 0;
+
if (strcmp(cf-cf_name, loc-loc_name)
|| (port != AWINIOCF_PORT_DEFAULT port != loc-loc_port))
return 0;
@@ -74,11 +98,12 @@ awin_tmr_match(device_t parent, cfdata_t
static void
awin_tmr_attach(device_t parent, device_t self, void *aux)
{
- struct awin_tmr_softc * const sc = device_private(self);
+ struct awin_tmr_softc * const sc = awin_tmr_softc;
struct awinio_attach_args * const aio = aux;
const struct awin_locators * const loc = aio-aio_loc;
sc-sc_dev = self;
+ self-dv_private = sc;
sc-sc_bst = aio-aio_core_bst;
sc-sc_dmat = aio-aio_dmat;
@@ -87,4 +112,45 @@ awin_tmr_attach(device_t parent, device_
aprint_naive(\n);
aprint_normal(\n);
+
+ awin_tmr_write(sc, AWIN_TMR_IRQ_EN_REG, 0);
+
+ sc-sc_ih = intr_establish(loc-loc_intr, IPL_SCHED,
+ IST_LEVEL | IST_MPSAFE, awin_tmr_intr, NULL);
+ if (sc-sc_ih != NULL) {
+ aprint_normal_dev(self, interrupting on irq %d\n,
+ loc-loc_intr);
+ }
+
+ sc-sc_intv_value = AWIN_REF_FREQ / hz;
+}
+
+int
+awin_tmr_intr(void *arg)
+{
+ struct awin_tmr_softc * const sc = awin_tmr_softc;
+ struct clockframe * const cf = arg;
+
+ /* clear interrupt pending */
+ const uint32_t sts = awin_tmr_read(sc, AWIN_TMR_IRQ_STA_REG);
+ awin_tmr_write(sc, AWIN_TMR_IRQ_STA_REG, sts);
+
+ int32_t now = 0 - awin_tmr_read(sc, AWIN_TMR0_CUR_VALUE_REG);
+ int32_t slop = now % sc-sc_intv_value;
+ awin_tmr_write(sc, AWIN_TMR0_INTV_VALUE_REG,
+ sc-sc_intv_value - slop);
+ awin_tmr_write(sc, AWIN_TMR0_CTRL_REG,
+ sc-sc_ctrl | AWIN_TMR_CTRL_RELOAD);
+
+ hardclock(cf);
+ for (; now sc-sc_intv_value; now -= sc-sc_intv_value) {
+ hardclock(cf);
+ }
+
+ return 1;
+}
+
+void
+awin_tmr_cpu_init(struct cpu_info *ci)
+{
}
Index: src/sys/arch/arm/allwinner/awin_var.h
diff -u src/sys/arch/arm/allwinner/awin_var.h:1.9 src/sys/arch/arm/allwinner/awin_var.h:1.10
--- src/sys/arch/arm/allwinner/awin_var.h:1.9 Wed Feb 26 00:19:01 2014
+++ src/sys/arch/arm/allwinner/awin_var.h Thu Jun 5 03:48:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_var.h,v 1.9 2014/02/26 00:19:01 matt Exp $ */
+/* $NetBSD: awin_var.h,v 1.10 2014/06/05 03:48:32 matt Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -91,6 +91,7 @@ void awin_gpio_pinset_release(const stru
bool awin_gpio_pin_reserve(const char *, struct awin_gpio_pindata *);
void awin_wdog_reset(void);
+void awin_tmr_cpu_init(struct cpu_info *);
static inline void
awin_gpio_pindata_write(const struct awin_gpio_pindata *pd, int value)
