CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: macallan Date: Tue Jul 7 15:41:46 UTC 2015 Modified Files: src/sys/arch/powerpc/include/oea: spr.h Log Message: add instruction cache throttling SPR found on 750 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/include/oea/spr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: xsrc/external/mit/xf86-video-r128/dist/src
Hello, On Tue, 7 Jul 2015 14:46:27 + (UTC) chris...@astron.com (Christos Zoulas) wrote: In article 20150707005552.d4a8...@cvs.netbsd.org, Michael Lorenz source-changes-d@NetBSD.org wrote: -=-=-=-=-=- Modified files: Index: xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c diff -u xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.9 xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.10 --- xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.9 Wed Mar 19 23:56:47 2014 +++ xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c Tue Jul 7 00:55:52 2015 @@ -1625,6 +1625,8 @@ static int R128ValidateFPModes(ScrnInfoP pScrn-display-modes[0] = xnfalloc(16); sprintf(pScrn-display-modes[0], %dx%d, info-PanelXRes, info-PanelYRes); +/* don't forget to NULL terminate */ +pScrn-display-modes[1] = NULL; Pick up a magic number 16, and then use sprintf instead of snprintf - Welcome to the wonderful world of buffer overflow... I didn't even look at that, I bet lots more Xorg drivers are full of stuff like that. have fun Michael
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: macallan Date: Tue Jul 7 15:41:46 UTC 2015 Modified Files: src/sys/arch/powerpc/include/oea: spr.h Log Message: add instruction cache throttling SPR found on 750 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/include/oea/spr.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/powerpc/include/oea/spr.h diff -u src/sys/arch/powerpc/include/oea/spr.h:1.2 src/sys/arch/powerpc/include/oea/spr.h:1.3 --- src/sys/arch/powerpc/include/oea/spr.h:1.2 Wed Feb 1 05:25:57 2012 +++ src/sys/arch/powerpc/include/oea/spr.h Tue Jul 7 15:41:46 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: spr.h,v 1.2 2012/02/01 05:25:57 matt Exp $ */ +/* $NetBSD: spr.h,v 1.3 2015/07/07 15:41:46 macallan Exp $ */ #ifndef _POWERPC_OEA_SPR_H_ #define _POWERPC_OEA_SPR_H_ @@ -262,6 +262,9 @@ #define L3CR_L3DO 0x0040 /* 25: L3 data-only mode */ #define L3CR_PMEN 0x0004 /* 29: Private memory enable */ #define L3CR_PMSIZ 0x0004 /* 31: Private memory size (0=1MB, 1=2MB) */ +#define SPR_ICTC 0x3fb /* ..6. instruction cache throttling */ +#define ICTC_ENABLE 0x0001 /* enable throttling */ +#define ICTC_COUNT_M 0x01fe /* number of waits to insert */ #define SPR_THRM1 0x3fc /* ..6. Thermal Management Register */ #define SPR_THRM2 0x3fd /* ..6. Thermal Management Register */ #define SPR_THRM_TIN 0x8000 /* Thermal interrupt bit (RO) */
Re: CVS commit: src/sys/arch/amd64/amd64
On Wed, Jul 01, 2015 at 02:04:43AM +, Christos Zoulas wrote: In article 20150630233112.ga8...@britannica.bec.de, Joerg Sonnenberger jo...@britannica.bec.de wrote: On Tue, Jun 30, 2015 at 05:08:24PM -0400, Christos Zoulas wrote: Module Name: src Committed By: christos Date: Tue Jun 30 21:08:24 UTC 2015 Modified Files: src/sys/arch/amd64/amd64: cpu_in_cksum.S Log Message: handle PIC compilation (if we are building a PIE system; this is used by tests) Isn't the leaq generally preferable as smaller? I believe leaq is 7 bytes, and movq is 5. But I am not sure which takes more cycles. 'leaq' with %rip will have to be a long encoding since rip relative isn't a 386 addressing mode. My guess is that both take the same number of cycles on current cpus. Some old brain cells recall 'lea' using different hardware from the ALU (for adds) so happening at a different stage in the pipeline and having different result delay and/or concurrency rules - but I can't remember which particular cpu that applied to. David -- David Laight: da...@l8s.co.uk
CVS commit: src/lib/libc/arch/aarch64/gen
Module Name:src
Committed By: matt
Date: Tue Jul 7 21:40:19 UTC 2015
Modified Files:
src/lib/libc/arch/aarch64/gen: Makefile.inc
Added Files:
src/lib/libc/arch/aarch64/gen: fpsetmask.c fpsetround.c fpsetsticky.c
Log Message:
Add the fpset* routines for tests
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/aarch64/gen/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/lib/libc/arch/aarch64/gen/fpsetmask.c \
src/lib/libc/arch/aarch64/gen/fpsetround.c \
src/lib/libc/arch/aarch64/gen/fpsetsticky.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/aarch64/gen/Makefile.inc
diff -u src/lib/libc/arch/aarch64/gen/Makefile.inc:1.1 src/lib/libc/arch/aarch64/gen/Makefile.inc:1.2
--- src/lib/libc/arch/aarch64/gen/Makefile.inc:1.1 Sun Aug 10 05:47:36 2014
+++ src/lib/libc/arch/aarch64/gen/Makefile.inc Tue Jul 7 21:40:19 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2014/08/10 05:47:36 matt Exp $
+# $NetBSD: Makefile.inc,v 1.2 2015/07/07 21:40:19 matt Exp $
SRCS+= byte_swap_2.S byte_swap_4.S byte_swap_8.S
SRCS+= flt_rounds.c
@@ -6,6 +6,8 @@ SRCS+= flt_rounds.c
# Common ieee754 constants and functions
SRCS+= infinityf_ieee754.c infinity_ieee754.c infinityl_ieee754.c
SRCS+= fpclassifyf_ieee754.c fpclassifyd_ieee754.c fpclassifyl_ieee754.c
+SRCS+= fpgetmask.c fpgetround.c fpgetsticky.c
+SRCS+= fpsetmask.c fpsetround.c fpsetsticky.c
SRCS+= isfinitef_ieee754.c isfinited_ieee754.c isfinitel_ieee754.c
SRCS+= isinff_ieee754.c isinfd_ieee754.c isinfl_ieee754.c
SRCS+= isnanf_ieee754.c isnand_ieee754.c isnanl_ieee754.c
Added files:
Index: src/lib/libc/arch/aarch64/gen/fpsetmask.c
diff -u /dev/null src/lib/libc/arch/aarch64/gen/fpsetmask.c:1.1
--- /dev/null Tue Jul 7 21:40:19 2015
+++ src/lib/libc/arch/aarch64/gen/fpsetmask.c Tue Jul 7 21:40:19 2015
@@ -0,0 +1,54 @@
+/*-
+ * Copyright (c) 2015 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+#include sys/cdefs.h
+
+__RCSID($NetBSD: fpsetmask.c,v 1.1 2015/07/07 21:40:19 matt Exp $);
+
+#include sys/param.h
+#include sys/systm.h
+#include sys/bitops.h
+
+#include namespace.h
+
+#include ieeefp.h
+
+#include aarch64/armreg.h
+
+__weak_alias(fpsetmask,_fpsetmask);
+
+fp_except_t
+fpsetmask(fp_except_t mask)
+{
+ const uint32_t old_fpcr = reg_fpcr_read();
+ const uint32_t new_fpcr = (old_fpcr ~FPCR_ESUM)
+ | __SHIFTIN(mask, FPCR_ESUM);
+ reg_fpcr_write(new_fpcr);
+ return __SHIFTOUT(old_fpcr, FPCR_ESUM);
+}
Index: src/lib/libc/arch/aarch64/gen/fpsetround.c
diff -u /dev/null src/lib/libc/arch/aarch64/gen/fpsetround.c:1.1
--- /dev/null Tue Jul 7 21:40:19 2015
+++ src/lib/libc/arch/aarch64/gen/fpsetround.c Tue Jul 7 21:40:19 2015
@@ -0,0 +1,54 @@
+/*-
+ * Copyright (c) 2015 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * 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.
CVS commit: src/lib/libc/arch/aarch64/gen
Module Name:src Committed By: matt Date: Tue Jul 7 21:40:19 UTC 2015 Modified Files: src/lib/libc/arch/aarch64/gen: Makefile.inc Added Files: src/lib/libc/arch/aarch64/gen: fpsetmask.c fpsetround.c fpsetsticky.c Log Message: Add the fpset* routines for tests To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/aarch64/gen/Makefile.inc cvs rdiff -u -r0 -r1.1 src/lib/libc/arch/aarch64/gen/fpsetmask.c \ src/lib/libc/arch/aarch64/gen/fpsetround.c \ src/lib/libc/arch/aarch64/gen/fpsetsticky.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/arm/pic
Module Name:src Committed By: matt Date: Tue Jul 7 21:43:46 UTC 2015 Modified Files: src/sys/arch/arm/pic: picvar.h Log Message: Protect #include opt_multiprocessor.h with _KERNEL_OPT To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/pic/picvar.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/pic
Module Name:src Committed By: matt Date: Tue Jul 7 21:43:46 UTC 2015 Modified Files: src/sys/arch/arm/pic: picvar.h Log Message: Protect #include opt_multiprocessor.h with _KERNEL_OPT To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/pic/picvar.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/pic/picvar.h diff -u src/sys/arch/arm/pic/picvar.h:1.15 src/sys/arch/arm/pic/picvar.h:1.16 --- src/sys/arch/arm/pic/picvar.h:1.15 Wed Apr 15 15:45:06 2015 +++ src/sys/arch/arm/pic/picvar.h Tue Jul 7 21:43:46 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: picvar.h,v 1.15 2015/04/15 15:45:06 matt Exp $ */ +/* $NetBSD: picvar.h,v 1.16 2015/07/07 21:43:46 matt Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. * All rights reserved. @@ -30,7 +30,9 @@ #ifndef _ARM_PIC_PICVAR_H_ #define _ARM_PIC_PICVAR_H_ +#ifdef _KERNEL_OPT #include opt_multiprocessor.h +#endif #ifdef MULTIPROCESSOR #include sys/kcpuset.h
CVS commit: src/games/tetris
Module Name:src
Committed By: nat
Date: Tue Jul 7 22:53:25 UTC 2015
Modified Files:
src/games/tetris: screen.c
Log Message:
Fixes color scheme white on black and black on white.
This commit was approved by christos@
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/games/tetris/screen.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/tetris/screen.c
diff -u src/games/tetris/screen.c:1.29 src/games/tetris/screen.c:1.30
--- src/games/tetris/screen.c:1.29 Sun Jul 13 16:23:55 2014
+++ src/games/tetris/screen.c Tue Jul 7 22:53:25 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: screen.c,v 1.29 2014/07/13 16:23:55 pgoyette Exp $ */
+/* $NetBSD: screen.c,v 1.30 2015/07/07 22:53:25 nat Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -98,12 +98,16 @@ static void
setcolor(int c)
{
char *buf;
+ char monochrome[] = \033[0m;
if (nocolor == 1)
return;
if (set_a_foreground == NULL)
return;
- buf = tiparm(set_a_foreground, c == 7 ? 0 : c);
+ if (c == 0 || c == 7)
+ buf = monochrome;
+ else
+ buf = tiparm(set_a_foreground, c);
if (buf != NULL)
putpad(buf);
}
@@ -303,6 +307,7 @@ scr_update(void)
putpad(cursor_home);
else
moveto(0, 0);
+ setcolor(0);
(void) printf(Score: %d, score);
curscore = score;
}
@@ -359,12 +364,12 @@ scr_update(void)
}
if (enter_standout_mode) {
if (so != cur_so) {
+ setcolor(so);
putpad(so ?
enter_standout_mode :
exit_standout_mode);
cur_so = so;
}
-setcolor(so);
#ifdef DEBUG
char buf[3];
snprintf(buf, sizeof(buf), %d%d, so, so);
CVS commit: src/games/tetris
Module Name:src Committed By: nat Date: Tue Jul 7 22:53:25 UTC 2015 Modified Files: src/games/tetris: screen.c Log Message: Fixes color scheme white on black and black on white. This commit was approved by christos@ To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/games/tetris/screen.c 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: justin Date: Tue Jul 7 12:40:13 UTC 2015 Modified Files: src/sys/rump: listsrcdirs Log Message: Add uname to rump sources To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/rump/listsrcdirs 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/listsrcdirs diff -u src/sys/rump/listsrcdirs:1.33 src/sys/rump/listsrcdirs:1.34 --- src/sys/rump/listsrcdirs:1.33 Mon Jun 29 08:40:52 2015 +++ src/sys/rump/listsrcdirs Tue Jul 7 12:40:13 2015 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: listsrcdirs,v 1.33 2015/06/29 08:40:52 pooka Exp $ +# $NetBSD: listsrcdirs,v 1.34 2015/07/07 12:40:13 justin Exp $ # # @@ -79,7 +79,7 @@ lsrc sys /bin/ cat lsrc sys /usr.bin/ make xinstall config mktemp sed tsort lsrc sys /usr.bin/ lorder join cksum m4 mkdep Makefile.inc lsrc sys /usr.bin/ rpcgen rump_wmd -lsrc sys /usr.bin/ genassym stat +lsrc sys /usr.bin/ genassym stat uname lsrc sys /usr.sbin/ mtree # sources hosted in the NetBSD tree that are required/useful
CVS commit: src/sys
Module Name:src Committed By: justin Date: Tue Jul 7 12:38:02 UTC 2015 Modified Files: src/sys/kern: init_sysctl.c init_sysctl_base.c src/sys/rump/librump/rumpkern: rump.c Log Message: Move hw.machine and hw.machine_arch sysctls to base so rump can use them This allows uname(3) and uname(1) to work on rump kernels. To generate a diff of this commit: cvs rdiff -u -r1.207 -r1.208 src/sys/kern/init_sysctl.c cvs rdiff -u -r1.3 -r1.4 src/sys/kern/init_sysctl_base.c cvs rdiff -u -r1.321 -r1.322 src/sys/rump/librump/rumpkern/rump.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/kern/init_sysctl.c diff -u src/sys/kern/init_sysctl.c:1.207 src/sys/kern/init_sysctl.c:1.208 --- src/sys/kern/init_sysctl.c:1.207 Wed May 20 11:17:24 2015 +++ src/sys/kern/init_sysctl.c Tue Jul 7 12:38:02 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: init_sysctl.c,v 1.207 2015/05/20 11:17:24 pooka Exp $ */ +/* $NetBSD: init_sysctl.c,v 1.208 2015/07/07 12:38:02 justin Exp $ */ /*- * Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: init_sysctl.c,v 1.207 2015/05/20 11:17:24 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: init_sysctl.c,v 1.208 2015/07/07 12:38:02 justin Exp $); #include opt_sysv.h #include opt_compat_netbsd.h @@ -615,12 +615,6 @@ SYSCTL_SETUP(sysctl_hw_setup, sysctl hw sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_STRING, machine, - SYSCTL_DESCR(Machine class), - NULL, 0, machine, 0, - CTL_HW, HW_MACHINE, CTL_EOL); - sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT, CTLTYPE_STRING, model, SYSCTL_DESCR(Machine model), NULL, 0, __UNCONST(model), 0, @@ -658,12 +652,6 @@ SYSCTL_SETUP(sysctl_hw_setup, sysctl hw NULL, PAGE_SIZE, NULL, 0, CTL_HW, HW_PAGESIZE, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT, - CTLTYPE_STRING, machine_arch, - SYSCTL_DESCR(Machine CPU class), - NULL, 0, machine_arch, 0, - CTL_HW, HW_MACHINE_ARCH, CTL_EOL); - sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE, CTLTYPE_INT, alignbytes, SYSCTL_DESCR(Alignment constraint for all possible Index: src/sys/kern/init_sysctl_base.c diff -u src/sys/kern/init_sysctl_base.c:1.3 src/sys/kern/init_sysctl_base.c:1.4 --- src/sys/kern/init_sysctl_base.c:1.3 Tue Feb 25 18:30:11 2014 +++ src/sys/kern/init_sysctl_base.c Tue Jul 7 12:38:02 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: init_sysctl_base.c,v 1.3 2014/02/25 18:30:11 pooka Exp $ */ +/* $NetBSD: init_sysctl_base.c,v 1.4 2015/07/07 12:38:02 justin Exp $ */ /*- * Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -30,8 +30,9 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: init_sysctl_base.c,v 1.3 2014/02/25 18:30:11 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: init_sysctl_base.c,v 1.4 2015/07/07 12:38:02 justin Exp $); +#include sys/cpu.h #include sys/param.h #include sys/sysctl.h #include sys/kernel.h @@ -179,6 +180,18 @@ SYSCTL_SETUP(sysctl_kernbase_setup, sys SYSCTL_DESCR(Raw partition of a disk), NULL, RAW_PART, NULL, 0, CTL_KERN, KERN_RAWPARTITION, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_STRING, machine, + SYSCTL_DESCR(Machine class), + NULL, 0, machine, 0, + CTL_HW, HW_MACHINE, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_STRING, machine_arch, + SYSCTL_DESCR(Machine CPU class), + NULL, 0, machine_arch, 0, + CTL_HW, HW_MACHINE_ARCH, CTL_EOL); } /* Index: src/sys/rump/librump/rumpkern/rump.c diff -u src/sys/rump/librump/rumpkern/rump.c:1.321 src/sys/rump/librump/rumpkern/rump.c:1.322 --- src/sys/rump/librump/rumpkern/rump.c:1.321 Mon Jun 8 12:16:47 2015 +++ src/sys/rump/librump/rumpkern/rump.c Tue Jul 7 12:38:02 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.c,v 1.321 2015/06/08 12:16:47 pooka Exp $ */ +/* $NetBSD: rump.c,v 1.322 2015/07/07 12:38:02 justin Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.321 2015/06/08 12:16:47 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.322 2015/07/07 12:38:02 justin Exp $); #include sys/systm.h #define ELFSIZE ARCH_ELFSIZE @@ -89,6 +89,7 @@ __KERNEL_RCSID(0, $NetBSD: rump.c,v 1.3 #include rump_dev_private.h char machine[] = MACHINE; +char machine_arch[] = MACHINE_ARCH; struct proc *initproc;
CVS commit: src/sys
Module Name:src Committed By: justin Date: Tue Jul 7 12:38:02 UTC 2015 Modified Files: src/sys/kern: init_sysctl.c init_sysctl_base.c src/sys/rump/librump/rumpkern: rump.c Log Message: Move hw.machine and hw.machine_arch sysctls to base so rump can use them This allows uname(3) and uname(1) to work on rump kernels. To generate a diff of this commit: cvs rdiff -u -r1.207 -r1.208 src/sys/kern/init_sysctl.c cvs rdiff -u -r1.3 -r1.4 src/sys/kern/init_sysctl_base.c cvs rdiff -u -r1.321 -r1.322 src/sys/rump/librump/rumpkern/rump.c 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: justin Date: Tue Jul 7 12:40:13 UTC 2015 Modified Files: src/sys/rump: listsrcdirs Log Message: Add uname to rump sources To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/rump/listsrcdirs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/tmpfs
Module Name:src Committed By: justin Date: Tue Jul 7 09:30:24 UTC 2015 Modified Files: src/sys/fs/tmpfs: tmpfs_subr.c Log Message: This enum is likely to be made unsigned by the compiler, so the assertion will not work and clang objects with -Wtautological-constant-out-of-range-compare To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/sys/fs/tmpfs/tmpfs_subr.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/fs/tmpfs/tmpfs_subr.c diff -u src/sys/fs/tmpfs/tmpfs_subr.c:1.99 src/sys/fs/tmpfs/tmpfs_subr.c:1.100 --- src/sys/fs/tmpfs/tmpfs_subr.c:1.99 Mon Jul 6 10:07:12 2015 +++ src/sys/fs/tmpfs/tmpfs_subr.c Tue Jul 7 09:30:24 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: tmpfs_subr.c,v 1.99 2015/07/06 10:07:12 hannken Exp $ */ +/* $NetBSD: tmpfs_subr.c,v 1.100 2015/07/07 09:30:24 justin Exp $ */ /* * Copyright (c) 2005-2013 The NetBSD Foundation, Inc. @@ -73,7 +73,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tmpfs_subr.c,v 1.99 2015/07/06 10:07:12 hannken Exp $); +__KERNEL_RCSID(0, $NetBSD: tmpfs_subr.c,v 1.100 2015/07/07 09:30:24 justin Exp $); #include sys/param.h #include sys/cprng.h @@ -222,7 +222,7 @@ tmpfs_newvnode(struct mount *mp, struct } while (node-tn_gen == 0); /* Generic initialization. */ - KASSERT(vap-va_type != VNOVAL); + KASSERT((int)vap-va_type != VNOVAL); node-tn_type = vap-va_type; node-tn_size = 0; node-tn_flags = 0;
CVS commit: src/sys/fs/tmpfs
Module Name:src Committed By: justin Date: Tue Jul 7 09:30:24 UTC 2015 Modified Files: src/sys/fs/tmpfs: tmpfs_subr.c Log Message: This enum is likely to be made unsigned by the compiler, so the assertion will not work and clang objects with -Wtautological-constant-out-of-range-compare To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/sys/fs/tmpfs/tmpfs_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets
Module Name:src Committed By: matt Date: Wed Jul 8 01:06:01 UTC 2015 Modified Files: src/distrib/sets: mkvars.mk Log Message: Add g to sed commands so it can deal with more than 2 archdirs. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/mkvars.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: matt Date: Wed Jul 8 01:06:40 UTC 2015 Modified Files: src/distrib/sets/lists/base: ad.aarch64 src/distrib/sets/lists/comp: ad.aarch64 src/distrib/sets/lists/debug: ad.aarch64 Removed Files: src/distrib/sets/lists/tests: ad.aarch64 Log Message: Remove redundant entries due to compatdir/compatfile. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/base/ad.aarch64 cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/comp/ad.aarch64 cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/debug/ad.aarch64 cvs rdiff -u -r1.1 -r0 src/distrib/sets/lists/tests/ad.aarch64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets
Module Name:src
Committed By: matt
Date: Wed Jul 8 01:06:01 UTC 2015
Modified Files:
src/distrib/sets: mkvars.mk
Log Message:
Add g to sed commands so it can deal with more than 2 archdirs.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/mkvars.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.22 src/distrib/sets/mkvars.mk:1.23
--- src/distrib/sets/mkvars.mk:1.22 Mon Jun 22 19:04:21 2015
+++ src/distrib/sets/mkvars.mk Wed Jul 8 01:06:01 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.22 2015/06/22 19:04:21 matt Exp $
+# $NetBSD: mkvars.mk,v 1.23 2015/07/08 01:06:01 matt Exp $
MKEXTRAVARS= \
MACHINE \
@@ -95,12 +95,12 @@ mkextravars: .PHONY
@echo $i=${$i}
.endfor
.if ${MKCOMPAT} != no
- @echo COMPATARCHDIRS=${COMPATARCHDIRS} | ${TOOL_SED} -e's/ /,/'
+ @echo COMPATARCHDIRS=${COMPATARCHDIRS} | ${TOOL_SED} -e's/ /,/g'
.else
@echo COMPATARCHDIRS=
.endif
.if ${MKKMOD} != no ${MKCOMPATMODULES} != no
- @echo KMODARCHDIRS=${KMODARCHDIRS} | ${TOOL_SED} -e's/ /,/'
+ @echo KMODARCHDIRS=${KMODARCHDIRS} | ${TOOL_SED} -e's/ /,/g'
.else
@echo KMODARCHDIRS=
.endif
CVS commit: src/usr.sbin/sysinst/arch/evbarm64
Module Name:src
Committed By: matt
Date: Wed Jul 8 01:12:48 UTC 2015
Modified Files:
src/usr.sbin/sysinst/arch/evbarm64: Makefile md.c md.h
Added Files:
src/usr.sbin/sysinst/arch/evbarm64: msg.md.en
Log Message:
Stub out enough so this builds for evbarm64
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/evbarm64/Makefile \
src/usr.sbin/sysinst/arch/evbarm64/md.h
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/evbarm64/md.c
cvs rdiff -u -r0 -r1.1 src/usr.sbin/sysinst/arch/evbarm64/msg.md.en
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/sysinst/arch/evbarm64/Makefile
diff -u src/usr.sbin/sysinst/arch/evbarm64/Makefile:1.1 src/usr.sbin/sysinst/arch/evbarm64/Makefile:1.2
--- src/usr.sbin/sysinst/arch/evbarm64/Makefile:1.1 Sun Dec 28 11:51:11 2014
+++ src/usr.sbin/sysinst/arch/evbarm64/Makefile Wed Jul 8 01:12:48 2015
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2014/12/28 11:51:11 martin Exp $
+# $NetBSD: Makefile,v 1.2 2015/07/08 01:12:48 matt Exp $
#
# Makefile for evbarm64
#
-#MENUS_MD= menus.md.${SYSINSTLANG} menus.mbr
-#MSG_MD= msg.md.${SYSINSTLANG} msg.mbr.${SYSINSTLANG}
-#MD_OPTIONS= AOUT2ELF
+MENUS_MD=
+MENUS_MD+= menus.mbr
+MSG_MD= msg.md.${SYSINSTLANG} msg.mbr.${SYSINSTLANG}
+LANGUAGES=en
.include ../../Makefile.inc
Index: src/usr.sbin/sysinst/arch/evbarm64/md.h
diff -u src/usr.sbin/sysinst/arch/evbarm64/md.h:1.1 src/usr.sbin/sysinst/arch/evbarm64/md.h:1.2
--- src/usr.sbin/sysinst/arch/evbarm64/md.h:1.1 Sun Dec 28 11:51:11 2014
+++ src/usr.sbin/sysinst/arch/evbarm64/md.h Wed Jul 8 01:12:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.1 2014/12/28 11:51:11 martin Exp $ */
+/* $NetBSD: md.h,v 1.2 2015/07/08 01:12:48 matt Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -40,8 +40,6 @@
/* Constants and defines */
#define PART_BOOT PART_E
#define PART_BOOT_MSDOS PART_BOOT
-#define PART_BOOT_PI_MOUNT /boot
-#define PART_BOOT_PI_FLAGS PIF_MOUNT
/* Megs required for a full X installation. */
#define XNEEDMB 60
@@ -53,19 +51,12 @@
* or upgrade. The standard sets are:
* base etc comp games man misc tests text xbase xcomp xetc xfont xserver
*/
-#define SET_KERNEL_1_NAME kern-ADI_BRH
-#define SET_KERNEL_2_NAME kern-INTEGRATOR
-#define SET_KERNEL_3_NAME kern-IQ80310
-#define SET_KERNEL_4_NAME kern-IQ80321
-#define SET_KERNEL_5_NAME kern-MINI2440
-#define SET_KERNEL_6_NAME kern-TEAMASA_NPWR
-#define SET_KERNEL_7_NAME kern-TS7200
-#define SET_KERNEL_8_NAME kern-RPI
-#define SET_KERNEL_9_NAME kern-KUROBOX_PRO
-#define SET_KERNEL_RPI SET_KERNEL_8
+#define SET_KERNEL_1_NAME kern-A64EMUL
#define MD_SETS_SELECTED SET_SYSTEM
+#define md_may_remove_boot_medium() 0
+
/*
* Machine-specific command to write a new label to a disk.
* For example, shark uses /sbin/disklabel -w -r.
@@ -78,5 +69,4 @@
/* Special board type routines need a switch */
#define BOARD_TYPE_NORMAL 0
-#define BOARD_TYPE_RPI 1
int boardtype;
Index: src/usr.sbin/sysinst/arch/evbarm64/md.c
diff -u src/usr.sbin/sysinst/arch/evbarm64/md.c:1.2 src/usr.sbin/sysinst/arch/evbarm64/md.c:1.3
--- src/usr.sbin/sysinst/arch/evbarm64/md.c:1.2 Sun May 10 10:14:02 2015
+++ src/usr.sbin/sysinst/arch/evbarm64/md.c Wed Jul 8 01:12:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.2 2015/05/10 10:14:02 martin Exp $ */
+/* $NetBSD: md.c,v 1.3 2015/07/08 01:12:48 matt Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -49,13 +49,9 @@
#include msg_defs.h
#include menu_defs.h
-int boardtype = 0, rpi_bootpart = PART_A;
-
void
md_prelim_menu(void)
{
- /* get the boardtype from the user */
- process_menu(MENU_prelim, NULL);
}
void
@@ -66,8 +62,6 @@ md_init(void)
void
md_init_set_status(int flags)
{
- if (boardtype == BOARD_TYPE_RPI)
- set_kernel_set(SET_KERNEL_RPI);
}
int
@@ -77,24 +71,21 @@ md_get_info(void)
int fd;
char dev_name[100];
- if (boardtype == BOARD_TYPE_RPI)
- return set_bios_geom_with_mbr_guess();
-
- if (no_mbr)
+ if (pm-no_mbr)
return 1;
- if (read_mbr(diskdev, mbr) 0)
+ if (read_mbr(pm-diskdev, mbr) 0)
memset(mbr.mbr, 0, sizeof(mbr.mbr)-2);
if (edit_mbr(mbr) == 0)
return 0;
- if (strncmp(diskdev, wd, 2) == 0)
- disktype = ST506;
+ if (strncmp(pm-diskdev, wd, 2) == 0)
+ pm-disktype = ST506;
else
- disktype = SCSI;
+ pm-disktype = SCSI;
- snprintf(dev_name, 100, /dev/r%sc, diskdev);
+ snprintf(dev_name, sizeof(dev_name), /dev/r%sc, pm-diskdev);
fd = open(dev_name, O_RDONLY, 0);
if (fd 0) {
@@ -110,11 +101,11 @@ md_get_info(void)
}
close(fd);
- dlcyl = disklabel.d_ncylinders;
- dlhead = disklabel.d_ntracks;
- dlsec = disklabel.d_nsectors;
- sectorsize = disklabel.d_secsize;
- dlcylsize = disklabel.d_secpercyl;
+ pm-dlcyl = disklabel.d_ncylinders;
+ pm-dlhead = disklabel.d_ntracks;
+ pm-dlsec = disklabel.d_nsectors;
+ pm-sectorsize =
CVS commit: src/usr.sbin/sysinst/arch/evbarm64
Module Name:src Committed By: matt Date: Wed Jul 8 01:12:48 UTC 2015 Modified Files: src/usr.sbin/sysinst/arch/evbarm64: Makefile md.c md.h Added Files: src/usr.sbin/sysinst/arch/evbarm64: msg.md.en Log Message: Stub out enough so this builds for evbarm64 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/evbarm64/Makefile \ src/usr.sbin/sysinst/arch/evbarm64/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/evbarm64/md.c cvs rdiff -u -r0 -r1.1 src/usr.sbin/sysinst/arch/evbarm64/msg.md.en Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib
Module Name:src
Committed By: matt
Date: Wed Jul 8 01:08:24 UTC 2015
Modified Files:
src/lib: Makefile
src/lib/libc_vfp: Makefile
Log Message:
Possibly build libc_vfp if MACHINE_CPU is aarch64 too.
Use AFLAGS to pass -mfpu=vfp
To generate a diff of this commit:
cvs rdiff -u -r1.225 -r1.226 src/lib/Makefile
cvs rdiff -u -r1.3 -r1.4 src/lib/libc_vfp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.225 src/lib/Makefile:1.226
--- src/lib/Makefile:1.225 Tue Jun 23 16:33:21 2015
+++ src/lib/Makefile Wed Jul 8 01:08:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.225 2015/06/23 16:33:21 matt Exp $
+# $NetBSD: Makefile,v 1.226 2015/07/08 01:08:24 matt Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include bsd.own.mk
@@ -33,7 +33,7 @@ SUBDIR+= libarch \
SUBDIR+= libkern
.endif
-.if (${MACHINE_CPU} == arm)
+.if (${MACHINE_CPU} == arm || ${MACHINE_CPU} == aarch64)
LIBC_MACHINE_ARCH?=${MACHINE_ARCH}
.if empty(LIBC_MACHINE_ARCH:M*hf*)
SUBDIR+= libc_vfp
Index: src/lib/libc_vfp/Makefile
diff -u src/lib/libc_vfp/Makefile:1.3 src/lib/libc_vfp/Makefile:1.4
--- src/lib/libc_vfp/Makefile:1.3 Mon Aug 19 22:22:23 2013
+++ src/lib/libc_vfp/Makefile Wed Jul 8 01:08:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/08/19 22:22:23 matt Exp $
+# $NetBSD: Makefile,v 1.4 2015/07/08 01:08:24 matt Exp $
#
LIB= c_vfp
@@ -10,5 +10,7 @@ USE_SHLIBDIR= yes
CPUFLAGS+= -mfpu=vfp -marm
SRCS= vfpsf.S vfpdf.S
+AFLAGS.vfpsf.S+= -mfpu=vfp
+AFLAGS.vfpdf.S+= -mfpu=vfp
.include bsd.lib.mk
CVS commit: src/lib
Module Name:src Committed By: matt Date: Wed Jul 8 01:08:24 UTC 2015 Modified Files: src/lib: Makefile src/lib/libc_vfp: Makefile Log Message: Possibly build libc_vfp if MACHINE_CPU is aarch64 too. Use AFLAGS to pass -mfpu=vfp To generate a diff of this commit: cvs rdiff -u -r1.225 -r1.226 src/lib/Makefile cvs rdiff -u -r1.3 -r1.4 src/lib/libc_vfp/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/gen
Module Name:src
Committed By: matt
Date: Wed Jul 8 01:09:25 UTC 2015
Modified Files:
src/tests/lib/libc/gen: Makefile
Log Message:
Build t_fpgetmask/t_fpgetround for aarch64 since they are now in libc
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/tests/lib/libc/gen/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/gen/Makefile
diff -u src/tests/lib/libc/gen/Makefile:1.44 src/tests/lib/libc/gen/Makefile:1.45
--- src/tests/lib/libc/gen/Makefile:1.44 Sat Dec 27 18:00:13 2014
+++ src/tests/lib/libc/gen/Makefile Wed Jul 8 01:09:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2014/12/27 18:00:13 martin Exp $
+# $NetBSD: Makefile,v 1.45 2015/07/08 01:09:25 matt Exp $
.include bsd.own.mk
@@ -17,10 +17,8 @@ TESTS_C+= t_floatunditf
TESTS_C+= t_fmtcheck
TESTS_C+= t_fnmatch
TESTS_C+= t_fpclassify
-.if ${MACHINE_CPU} != aarch64
TESTS_C+= t_fpsetmask
TESTS_C+= t_fpsetround
-.endif
TESTS_C+= t_ftok
TESTS_C+= t_getcwd
TESTS_C+= t_getgrent
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: jmcneill
Date: Wed Jul 8 01:23:28 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: tegra_dc.c tegra_hdmi.c tegra_var.h
Log Message:
expose EDID to userland
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nvidia/tegra_dc.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nvidia/tegra_hdmi.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/nvidia/tegra_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/nvidia/tegra_dc.c
diff -u src/sys/arch/arm/nvidia/tegra_dc.c:1.1 src/sys/arch/arm/nvidia/tegra_dc.c:1.2
--- src/sys/arch/arm/nvidia/tegra_dc.c:1.1 Mon May 18 19:32:48 2015
+++ src/sys/arch/arm/nvidia/tegra_dc.c Wed Jul 8 01:23:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_dc.c,v 1.1 2015/05/18 19:32:48 jmcneill Exp $ */
+/* $NetBSD: tegra_dc.c,v 1.2 2015/07/08 01:23:28 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
#include locators.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tegra_dc.c,v 1.1 2015/05/18 19:32:48 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: tegra_dc.c,v 1.2 2015/07/08 01:23:28 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -296,7 +296,7 @@ tegra_dc_port(device_t dev)
int
tegra_dc_enable(device_t dev, device_t outputdev,
-const struct videomode *mode)
+const struct videomode *mode, const uint8_t *edid)
{
struct tegra_dc_softc * const sc = device_private(dev);
prop_dictionary_t prop = device_properties(dev);
@@ -339,6 +339,13 @@ tegra_dc_enable(device_t dev, device_t o
sc-sc_fbdev = config_found(sc-sc_dev, tfb, tegra_dc_print);
+ if (sc-sc_fbdev != NULL edid != NULL) {
+ prop_data_t data = prop_data_create_data(edid, 128);
+ prop_dictionary_set(device_properties(sc-sc_fbdev),
+ EDID, data);
+ prop_object_release(data);
+ }
+
return 0;
}
Index: src/sys/arch/arm/nvidia/tegra_hdmi.c
diff -u src/sys/arch/arm/nvidia/tegra_hdmi.c:1.2 src/sys/arch/arm/nvidia/tegra_hdmi.c:1.3
--- src/sys/arch/arm/nvidia/tegra_hdmi.c:1.2 Mon May 18 21:03:36 2015
+++ src/sys/arch/arm/nvidia/tegra_hdmi.c Wed Jul 8 01:23:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_hdmi.c,v 1.2 2015/05/18 21:03:36 jmcneill Exp $ */
+/* $NetBSD: tegra_hdmi.c,v 1.3 2015/07/08 01:23:28 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
#include locators.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tegra_hdmi.c,v 1.2 2015/05/18 21:03:36 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: tegra_hdmi.c,v 1.3 2015/07/08 01:23:28 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -92,7 +92,7 @@ struct tegra_hdmi_softc {
static void tegra_hdmi_hpd(struct tegra_hdmi_softc *);
static void tegra_hdmi_connect(struct tegra_hdmi_softc *);
static void tegra_hdmi_disconnect(struct tegra_hdmi_softc *);
-static void tegra_hdmi_enable(struct tegra_hdmi_softc *);
+static void tegra_hdmi_enable(struct tegra_hdmi_softc *, const uint8_t *);
static int tegra_hdmi_sor_start(struct tegra_hdmi_softc *);
CFATTACH_DECL_NEW(tegra_hdmi, sizeof(struct tegra_hdmi_softc),
@@ -190,13 +190,14 @@ static void
tegra_hdmi_connect(struct tegra_hdmi_softc *sc)
{
const struct videomode *mode;
- char edid[128];
+ char edid[128], *pedid = NULL;
struct edid_info ei;
int retry = 4, error;
+ memset(ei, 0, sizeof(ei));
+
if (sc-sc_ddcdev) {
memset(edid, 0, sizeof(edid));
- memset(ei, 0, sizeof(ei));
while (--retry 0) {
error = ddc_dev_read_edid(sc-sc_ddcdev, edid,
@@ -212,10 +213,11 @@ tegra_hdmi_connect(struct tegra_hdmi_sof
if (edid_parse(edid, ei) != 0) {
device_printf(sc-sc_dev,
failed to parse EDID\n);
-#ifdef TEGRA_HDMI_DEBUG
} else {
+#ifdef TEGRA_HDMI_DEBUG
edid_print(ei);
#endif
+pedid = edid;
}
}
}
@@ -226,7 +228,7 @@ tegra_hdmi_connect(struct tegra_hdmi_sof
}
sc-sc_curmode = mode;
- tegra_hdmi_enable(sc);
+ tegra_hdmi_enable(sc, pedid);
}
static void
@@ -235,7 +237,7 @@ tegra_hdmi_disconnect(struct tegra_hdmi_
}
static void
-tegra_hdmi_enable(struct tegra_hdmi_softc *sc)
+tegra_hdmi_enable(struct tegra_hdmi_softc *sc, const uint8_t *edid)
{
const struct tegra_hdmi_tmds_config *tmds = NULL;
const struct videomode *mode = sc-sc_curmode;
@@ -266,7 +268,7 @@ tegra_hdmi_enable(struct tegra_hdmi_soft
tmds-sor_pad_ctls0);
}
- tegra_dc_enable(sc-sc_displaydev, sc-sc_dev, mode);
+ tegra_dc_enable(sc-sc_displaydev, sc-sc_dev, mode, edid);
const u_int div = (mode-dot_clock / 1000) * 4;
HDMI_WRITE(sc, HDMI_NV_PDISP_SOR_REFCLK_REG,
Index: src/sys/arch/arm/nvidia/tegra_var.h
diff -u src/sys/arch/arm/nvidia/tegra_var.h:1.21 src/sys/arch/arm/nvidia/tegra_var.h:1.22
--- src/sys/arch/arm/nvidia/tegra_var.h:1.21 Sun May 31 14:41:59 2015
+++ src/sys/arch/arm/nvidia/tegra_var.h Wed Jul 8 01:23:28 2015
@@ -1,4 +1,4 @@
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: jmcneill Date: Wed Jul 8 01:23:28 UTC 2015 Modified Files: src/sys/arch/arm/nvidia: tegra_dc.c tegra_hdmi.c tegra_var.h Log Message: expose EDID to userland To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nvidia/tegra_dc.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nvidia/tegra_hdmi.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/nvidia/tegra_var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/gen
Module Name:src Committed By: matt Date: Wed Jul 8 01:09:25 UTC 2015 Modified Files: src/tests/lib/libc/gen: Makefile Log Message: Build t_fpgetmask/t_fpgetround for aarch64 since they are now in libc To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/tests/lib/libc/gen/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: justin Date: Tue Jul 7 13:07:10 UTC 2015 Modified Files: src/sys/kern: init_sysctl_base.c Log Message: Missing includes for some architectures To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/kern/init_sysctl_base.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/kern/init_sysctl_base.c diff -u src/sys/kern/init_sysctl_base.c:1.4 src/sys/kern/init_sysctl_base.c:1.5 --- src/sys/kern/init_sysctl_base.c:1.4 Tue Jul 7 12:38:02 2015 +++ src/sys/kern/init_sysctl_base.c Tue Jul 7 13:07:10 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: init_sysctl_base.c,v 1.4 2015/07/07 12:38:02 justin Exp $ */ +/* $NetBSD: init_sysctl_base.c,v 1.5 2015/07/07 13:07:10 justin Exp $ */ /*- * Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -30,11 +30,12 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: init_sysctl_base.c,v 1.4 2015/07/07 12:38:02 justin Exp $); +__KERNEL_RCSID(0, $NetBSD: init_sysctl_base.c,v 1.5 2015/07/07 13:07:10 justin Exp $); -#include sys/cpu.h +#include sys/types.h #include sys/param.h #include sys/sysctl.h +#include sys/cpu.h #include sys/kernel.h #include sys/disklabel.h
CVS commit: src/sys/kern
Module Name:src Committed By: justin Date: Tue Jul 7 13:07:10 UTC 2015 Modified Files: src/sys/kern: init_sysctl_base.c Log Message: Missing includes for some architectures To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/kern/init_sysctl_base.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/postinstall
Module Name:src
Committed By: jnemeth
Date: Wed Jul 8 05:00:15 UTC 2015
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
Check for an out of date /etc/fonts/fonts.conf and if so, forcibly
update it (it is not intended to be user editable). This is
primarily intended so that pkgsrc fonts installed in the new location
can be found.
To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.197 src/usr.sbin/postinstall/postinstall
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/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.196 src/usr.sbin/postinstall/postinstall:1.197
--- src/usr.sbin/postinstall/postinstall:1.196 Thu Jul 2 09:53:12 2015
+++ src/usr.sbin/postinstall/postinstall Wed Jul 8 05:00:15 2015
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.196 2015/07/02 09:53:12 martin Exp $
+# $NetBSD: postinstall,v 1.197 2015/07/08 05:00:15 jnemeth Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -991,7 +991,17 @@ do_fontconfig()
80-delicious.conf \
90-synthetic.conf
failed=$(( ${failed} + $? ))
+
+ if ! $SOURCEMODE; then
+ FONTS_DIR=${SRC_DIR}/etc/fonts
+ else
+ FONTS_DIR=${SRC_DIR}/external/mit/xorg/lib/fontconfig/etc
+ fi
+ populate_dir $op false ${FONTS_DIR} ${DEST_DIR}/etc/fonts 444 \
+ fonts.conf
+ failed=$(( ${failed} + $? ))
+
# We can't modify conf.d easily; someone might have removed a file.
conf_d_failed=0
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: jnemeth Date: Wed Jul 8 05:00:15 UTC 2015 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Check for an out of date /etc/fonts/fonts.conf and if so, forcibly update it (it is not intended to be user editable). This is primarily intended so that pkgsrc fonts installed in the new location can be found. To generate a diff of this commit: cvs rdiff -u -r1.196 -r1.197 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: xsrc/external/mit/xf86-video-r128/dist/src
In article 20150707005552.d4a8...@cvs.netbsd.org, Michael Lorenz source-changes-d@NetBSD.org wrote: -=-=-=-=-=- Modified files: Index: xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c diff -u xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.9 xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.10 --- xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.9 Wed Mar 19 23:56:47 2014 +++ xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c Tue Jul 7 00:55:52 2015 @@ -1625,6 +1625,8 @@ static int R128ValidateFPModes(ScrnInfoP pScrn-display-modes[0] = xnfalloc(16); sprintf(pScrn-display-modes[0], %dx%d, info-PanelXRes, info-PanelYRes); +/* don't forget to NULL terminate */ +pScrn-display-modes[1] = NULL; Pick up a magic number 16, and then use sprintf instead of snprintf - Welcome to the wonderful world of buffer overflow... If PanelXRes == PanelYRes == 0x7fff then we get: 2147483647x2147483647 that needs 21 chars to print. christos
