CVS commit: src/sys/arch/arm/broadcom
Module Name:src
Committed By: skrll
Date: Sat Aug 1 14:18:00 UTC 2015
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_intr.c
Log Message:
Call the correct ipi handlers for IPI_AST and IPI_KPREEMPT
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/broadcom/bcm2835_intr.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/broadcom/bcm2835_intr.c
diff -u src/sys/arch/arm/broadcom/bcm2835_intr.c:1.10 src/sys/arch/arm/broadcom/bcm2835_intr.c:1.11
--- src/sys/arch/arm/broadcom/bcm2835_intr.c:1.10 Sat Jul 25 08:43:41 2015
+++ src/sys/arch/arm/broadcom/bcm2835_intr.c Sat Aug 1 14:18:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_intr.c,v 1.10 2015/07/25 08:43:41 skrll Exp $ */
+/* $NetBSD: bcm2835_intr.c,v 1.11 2015/08/01 14:18:00 skrll Exp $ */
/*-
* Copyright (c) 2012, 2015 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bcm2835_intr.c,v 1.10 2015/07/25 08:43:41 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: bcm2835_intr.c,v 1.11 2015/08/01 14:18:00 skrll Exp $);
#define _INTR_PRIVATE
@@ -492,12 +492,16 @@ bcm2836mp_ipi_handler(void *priv)
const u_int ipi = bit - 1;
switch (ipi) {
case IPI_AST:
+ pic_ipi_ast(priv);
+ break;
case IPI_NOP:
+ pic_ipi_nop(priv);
+ break;
#ifdef __HAVE_PREEMPTION
case IPI_KPREEMPT:
-#endif
- pic_ipi_nop(priv);
+ pic_ipi_kpreempt(priv);
break;
+#endif
case IPI_XCALL:
pic_ipi_xcall(priv);
break;
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src Committed By: skrll Date: Sat Aug 1 16:18:47 UTC 2015 Modified Files: src/sys/arch/evbarm/rpi: rpi_machdep.c Log Message: Re-enable cpus [123] now that bcm2835_intr.c is fixed with rev 1.11/ To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/arch/evbarm/rpi/rpi_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/rpi/rpi_machdep.c diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.66 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.67 --- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.66 Sun May 31 08:13:18 2015 +++ src/sys/arch/evbarm/rpi/rpi_machdep.c Sat Aug 1 16:18:47 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rpi_machdep.c,v 1.66 2015/05/31 08:13:18 skrll Exp $ */ +/* $NetBSD: rpi_machdep.c,v 1.67 2015/08/01 16:18:47 skrll Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.66 2015/05/31 08:13:18 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.67 2015/08/01 16:18:47 skrll Exp $); #include opt_arm_debug.h #include opt_bcm283x.h @@ -534,11 +534,6 @@ rpi_bootstrap(void) __func__, i); } } - - /* - * XXXNH: Disable non-boot CPUs for now - */ - arm_cpu_hatched = 0; #endif }
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src
Committed By: tsutsui
Date: Sat Aug 1 13:42:32 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem.c
Log Message:
Pull upstream fix to avoid kernel panic on starting X on Intel 855GM machines.
Reported in PR kern/49875, and ok'ed to commit by riastradh@.
Should be pulled up to netbsd-7.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.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/i915_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.31 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.32
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.31 Thu Jun 25 16:01:20 2015
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c Sat Aug 1 13:42:32 2015
@@ -4390,6 +4390,15 @@ unlock:
static bool is_pin_display(struct drm_i915_gem_object *obj)
{
+ struct i915_vma *vma;
+
+ if (list_empty(obj-vma_list))
+ return false;
+
+ vma = i915_gem_obj_to_ggtt(obj);
+ if (!vma)
+ return false;
+
/* There are 3 sources that pin objects:
* 1. The display engine (scanouts, sprites, cursors);
* 2. Reservations for execbuffer;
@@ -4401,7 +4410,7 @@ static bool is_pin_display(struct drm_i9
* subtracting the potential reference by the user, any pin_count
* remains, it must be due to another use by the display engine.
*/
- return i915_gem_obj_to_ggtt(obj)-pin_count - !!obj-user_pin_count;
+ return vma-pin_count - !!obj-user_pin_count;
}
/*
@@ -4415,6 +4424,7 @@ i915_gem_object_pin_to_display_plane(str
struct intel_ring_buffer *pipelined)
{
u32 old_read_domains, old_write_domain;
+ bool was_pin_display;
int ret;
if (pipelined != obj-ring) {
@@ -4426,6 +4436,7 @@ i915_gem_object_pin_to_display_plane(str
/* Mark the pin_display early so that we account for the
* display coherency whilst setting up the cache domains.
*/
+ was_pin_display = obj-pin_display;
obj-pin_display = true;
/* The display engine is not coherent with the LLC cache on gen6. As
@@ -4468,7 +4479,8 @@ i915_gem_object_pin_to_display_plane(str
return 0;
err_unpin_display:
- obj-pin_display = is_pin_display(obj);
+ WARN_ON(was_pin_display != is_pin_display(obj));
+ obj-pin_display = was_pin_display;
return ret;
}
@@ -5684,6 +5696,9 @@ struct i915_vma *i915_gem_obj_to_ggtt(st
{
struct i915_vma *vma;
+ /* This WARN has probably outlived its usefulness (callers already
+ * WARN if they don't find the GGTT vma they expect). When removing,
+ * remember to remove the pre-check in is_pin_display() as well */
if (WARN_ON(list_empty(obj-vma_list)))
return NULL;
CVS commit: src/sys/kern
Module Name:src
Committed By: manu
Date: Sun Aug 2 03:29:22 UTC 2015
Modified Files:
src/sys/kern: vfs_mount.c
Log Message:
Do not VFS_SYNC before VFS_UNMOUNT on force unmount
VFS_SYNC does not consider whether we are performing a force unmount or not,
and therefore it can wait for a while if the filesytstem is misbehaving.
Removing VFS_SYNC before VFS_UNMOUNT on forced unmount fixes the problem.
This should not cause harm as the VFS_SYNC seems just useless.
As noted by Chuck Silvers in
http://mail-index.netbsd.org/tech-kern/2015/07/13/msg019156.html
- Nothing seems to prevent vnodes from getting dirty again after VFS_SYNC call.
- Filesystems do flush data through vflush() in VFS_UNMOUNT anyway.
As a consequence, the VFS_SYNC call in do_unmount() could probably be
completely removed. But since such a change is quite dangerous, we just
remove it in the case of forced unmounts, which are situations where
the risk of data loss is known to the operator.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/kern/vfs_mount.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/vfs_mount.c
diff -u src/sys/kern/vfs_mount.c:1.35 src/sys/kern/vfs_mount.c:1.36
--- src/sys/kern/vfs_mount.c:1.35 Wed May 6 15:57:08 2015
+++ src/sys/kern/vfs_mount.c Sun Aug 2 03:29:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_mount.c,v 1.35 2015/05/06 15:57:08 hannken Exp $ */
+/* $NetBSD: vfs_mount.c,v 1.36 2015/08/02 03:29:22 manu Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_mount.c,v 1.35 2015/05/06 15:57:08 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_mount.c,v 1.36 2015/08/02 03:29:22 manu Exp $);
#define _VFS_VNODE_PRIVATE
@@ -824,7 +824,7 @@ dounmount(struct mount *mp, int flags, s
if (used_syncer)
vfs_syncer_remove_from_worklist(mp);
error = 0;
- if ((mp-mnt_flag MNT_RDONLY) == 0) {
+ if (((mp-mnt_flag MNT_RDONLY) == 0) ((flags MNT_FORCE) == 0)) {
error = VFS_SYNC(mp, MNT_WAIT, l-l_cred);
}
if (error == 0 || (flags MNT_FORCE)) {
CVS commit: src/usr.bin/patch
Module Name:src Committed By: christos Date: Sun Aug 2 03:19:02 UTC 2015 Modified Files: src/usr.bin/patch: patch.1 Log Message: remove reference to SCCS which is not supported anymore. XXX: pullup-7 To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.bin/patch/patch.1 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/patch/patch.1 diff -u src/usr.bin/patch/patch.1:1.17 src/usr.bin/patch/patch.1:1.18 --- src/usr.bin/patch/patch.1:1.17 Fri Apr 11 13:41:09 2014 +++ src/usr.bin/patch/patch.1 Sat Aug 1 23:19:02 2015 @@ -1,6 +1,6 @@ .\ $OpenBSD: patch.1,v 1.22 2008/06/06 20:44:00 jmc Exp $ .\ $DragonFly: src/usr.bin/patch/patch.1,v 1.10 2008/08/18 19:15:55 joerg Exp $ -.\ $NetBSD: patch.1,v 1.17 2014/04/11 17:41:09 christos Exp $ +.\ $NetBSD: patch.1,v 1.18 2015/08/02 03:19:02 christos Exp $ .\ Copyright 1986, Larry Wall .\ .\ Redistribution and use in source and binary forms, with or without @@ -21,7 +21,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd April 11, 2014 +.Dd Auguest 2, 2015 .Dt PATCH 1 .Os .Sh NAME @@ -445,9 +445,8 @@ the shortest basename, and the shortest .It If no file exists, .Nm -checks for the existence of the files in an SCCS or RCS directory -(using the appropriate prefix or suffix) using the criteria specified -above. +checks for the existence of the files in an RCS directory sing the criteria +specified above. If found, .Nm will attempt to get or check out the file.
CVS commit: src/etc
Module Name:src
Committed By: jmcneill
Date: Sat Aug 1 21:30:09 UTC 2015
Modified Files:
src/etc: MAKEDEV.tmpl
Log Message:
add hdmicec
To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.174 src/etc/MAKEDEV.tmpl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/MAKEDEV.tmpl
diff -u src/etc/MAKEDEV.tmpl:1.173 src/etc/MAKEDEV.tmpl:1.174
--- src/etc/MAKEDEV.tmpl:1.173 Fri Sep 19 09:00:23 2014
+++ src/etc/MAKEDEV.tmpl Sat Aug 1 21:30:09 2015
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: MAKEDEV.tmpl,v 1.173 2014/09/19 09:00:23 matt Exp $
+# $NetBSD: MAKEDEV.tmpl,v 1.174 2015/08/01 21:30:09 jmcneill Exp $
#
# Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -244,6 +244,7 @@
# fd file descriptors
# grf* graphics frame buffer device
# hdaudio* High Definition audio control device
+# hdmicec* HDMI CEC devices
# hil HP300 HIL input devices
# icp ICP-Vortex/Intel RAID control interface
# iic* IIC bus device
@@ -839,6 +840,7 @@ all)
makedev altmem
makedev zfs
makedev lua
+ makedev hdmicec0
makedev local # do this last
;;
@@ -1466,6 +1468,11 @@ hdaudio[0-9]*)
mkdev hdaudio$unit c %hdaudio_chr% $unit 644
;;
+hdmicec[0-9]*)
+ uint=${i#hdmicec}
+ mkdev hdmicec$unit c %hdmicec_chr% $unit 644
+ ;;
+
gpio[0-9]*)
unit=${i#gpio}
mkdev gpio$unit c %gpio_chr% $unit 664 $g_gpio
CVS commit: src/sys/dev/sdmmc
Module Name:src
Committed By: jmcneill
Date: Sun Aug 2 00:24:24 UTC 2015
Modified Files:
src/sys/dev/sdmmc: sdhc.c
Log Message:
return MMC_OCR_HCS bit from host_ocr if the controller supports high-speed mode
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/sdmmc/sdhc.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/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.65 src/sys/dev/sdmmc/sdhc.c:1.66
--- src/sys/dev/sdmmc/sdhc.c:1.65 Fri Jul 31 15:00:08 2015
+++ src/sys/dev/sdmmc/sdhc.c Sun Aug 2 00:24:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.65 2015/07/31 15:00:08 jmcneill Exp $ */
+/* $NetBSD: sdhc.c,v 1.66 2015/08/02 00:24:24 jmcneill Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.65 2015/07/31 15:00:08 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.66 2015/08/02 00:24:24 jmcneill Exp $);
#ifdef _KERNEL_OPT
#include opt_sdmmc.h
@@ -400,6 +400,10 @@ sdhc_host_found(struct sdhc_softc *sc, b
* Determine SD bus voltage levels supported by the controller.
*/
aprint_normal(,);
+ if (ISSET(caps, SDHC_HIGH_SPEED_SUPP)) {
+ SET(hp-ocr, MMC_OCR_HCS);
+ aprint_normal( High-Speed);
+ }
if (ISSET(caps, SDHC_VOLTAGE_SUPP_1_8V)
(hp-specver SDHC_SPEC_VERS_300 ||
ISSET(caps, SDHC_EMBEDDED_SLOT))) {
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sun Aug 2 00:24:45 UTC 2015 Modified Files: src/sys/arch/evbarm/conf: JETSONTK1 Log Message: enable eMMC To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbarm/conf/JETSONTK1 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/JETSONTK1 diff -u src/sys/arch/evbarm/conf/JETSONTK1:1.30 src/sys/arch/evbarm/conf/JETSONTK1:1.31 --- src/sys/arch/evbarm/conf/JETSONTK1:1.30 Sat Aug 1 21:20:46 2015 +++ src/sys/arch/evbarm/conf/JETSONTK1 Sun Aug 2 00:24:45 2015 @@ -1,5 +1,5 @@ # -# $NetBSD: JETSONTK1,v 1.30 2015/08/01 21:20:46 jmcneill Exp $ +# $NetBSD: JETSONTK1,v 1.31 2015/08/02 00:24:45 jmcneill Exp $ # # NVIDIA Jetson TK1 - Tegra K1 development kit # https://developer.nvidia.com/jetson-tk1 @@ -100,10 +100,10 @@ tegrartc0 at tegraio? # RTC # SDMMC sdhc2 at tegraio? port 2 # SDMMC3 (SD card) sdmmc2 at sdhc2 -#sdhc3 at tegraio? port 3 # SDMMC4 (eMMC) -#sdmmc3 at sdhc3 +sdhc3 at tegraio? port 3 # SDMMC4 (eMMC) +sdmmc3 at sdhc3 -#ld0 at sdmmc3 # eMMC +ld0 at sdmmc3 # eMMC ld1 at sdmmc2 # SD card # SATA
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: jmcneill
Date: Sat Aug 1 21:20:11 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: files.tegra tegra_car.c tegra_intr.h
tegra_io.c tegra_reg.h tegra_var.h
Added Files:
src/sys/arch/arm/nvidia: tegra_cec.c tegra_cecreg.h
Log Message:
Add driver for Tegra HDMI CEC controller.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/nvidia/files.tegra
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/nvidia/tegra_car.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/nvidia/tegra_cec.c \
src/sys/arch/arm/nvidia/tegra_cecreg.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/nvidia/tegra_intr.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/nvidia/tegra_io.c \
src/sys/arch/arm/nvidia/tegra_reg.h
cvs rdiff -u -r1.23 -r1.24 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/files.tegra
diff -u src/sys/arch/arm/nvidia/files.tegra:1.14 src/sys/arch/arm/nvidia/files.tegra:1.15
--- src/sys/arch/arm/nvidia/files.tegra:1.14 Sat May 30 13:25:55 2015
+++ src/sys/arch/arm/nvidia/files.tegra Sat Aug 1 21:20:11 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.tegra,v 1.14 2015/05/30 13:25:55 jmcneill Exp $
+# $NetBSD: files.tegra,v 1.15 2015/08/01 21:20:11 jmcneill Exp $
#
# Configuration info for NVIDIA Tegra ARM Peripherals
#
@@ -111,6 +111,11 @@ device tegrahdmi: edid, ddc_read_edid, v
attach tegrahdmi at tegraio with tegra_hdmi
file arch/arm/nvidia/tegra_hdmi.c tegra_hdmi
+# HDMI CEC
+device tegracec: hdmicecbus
+attach tegracec at tegraio with tegra_cec
+file arch/arm/nvidia/tegra_cec.c tegra_cec
+
# Console parameters
defparam opt_tegra.h CONADDR
defparam opt_tegra.h CONSPEED
Index: src/sys/arch/arm/nvidia/tegra_car.c
diff -u src/sys/arch/arm/nvidia/tegra_car.c:1.25 src/sys/arch/arm/nvidia/tegra_car.c:1.26
--- src/sys/arch/arm/nvidia/tegra_car.c:1.25 Wed Jul 29 14:30:18 2015
+++ src/sys/arch/arm/nvidia/tegra_car.c Sat Aug 1 21:20:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_car.c,v 1.25 2015/07/29 14:30:18 jmcneill Exp $ */
+/* $NetBSD: tegra_car.c,v 1.26 2015/08/01 21:20:11 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_car.c,v 1.25 2015/07/29 14:30:18 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: tegra_car.c,v 1.26 2015/08/01 21:20:11 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -685,6 +685,18 @@ tegra_car_periph_i2c_enable(u_int port,
}
void
+tegra_car_periph_cec_enable(void)
+{
+ bus_space_tag_t bst;
+ bus_space_handle_t bsh;
+
+ tegra_car_get_bs(bst, bsh);
+
+ bus_space_write_4(bst, bsh, CAR_CLK_ENB_W_SET_REG, CAR_DEV_W_CEC);
+ bus_space_write_4(bst, bsh, CAR_RST_DEV_W_CLR_REG, CAR_DEV_W_CEC);
+}
+
+void
tegra_car_hdmi_enable(u_int rate)
{
bus_space_tag_t bst;
Index: src/sys/arch/arm/nvidia/tegra_intr.h
diff -u src/sys/arch/arm/nvidia/tegra_intr.h:1.6 src/sys/arch/arm/nvidia/tegra_intr.h:1.7
--- src/sys/arch/arm/nvidia/tegra_intr.h:1.6 Sat May 30 13:25:55 2015
+++ src/sys/arch/arm/nvidia/tegra_intr.h Sat Aug 1 21:20:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_intr.h,v 1.6 2015/05/30 13:25:55 jmcneill Exp $ */
+/* $NetBSD: tegra_intr.h,v 1.7 2015/08/01 21:20:11 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -39,6 +39,7 @@
#define TEGRA_INTR_TMR1 TEGRA_INTR(0)
#define TEGRA_INTR_TMR2 TEGRA_INTR(1)
+#define TEGRA_INTR_CEC TEGRA_INTR(3)
#define TEGRA_INTR_SDMMC1 TEGRA_INTR(14)
#define TEGRA_INTR_SDMMC2 TEGRA_INTR(15)
#define TEGRA_INTR_SDMMC3 TEGRA_INTR(19)
Index: src/sys/arch/arm/nvidia/tegra_io.c
diff -u src/sys/arch/arm/nvidia/tegra_io.c:1.12 src/sys/arch/arm/nvidia/tegra_io.c:1.13
--- src/sys/arch/arm/nvidia/tegra_io.c:1.12 Sat May 30 13:25:55 2015
+++ src/sys/arch/arm/nvidia/tegra_io.c Sat Aug 1 21:20:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_io.c,v 1.12 2015/05/30 13:25:55 jmcneill Exp $ */
+/* $NetBSD: tegra_io.c,v 1.13 2015/08/01 21:20:11 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
#include opt_tegra.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tegra_io.c,v 1.12 2015/05/30 13:25:55 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: tegra_io.c,v 1.13 2015/08/01 21:20:11 jmcneill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -113,6 +113,8 @@ static const struct tegra_locators tegra
TEGRA_SATA_OFFSET, TEGRA_SATA_SIZE, NOPORT, TEGRA_INTR_SATA },
{ hdaudio,
TEGRA_HDA_OFFSET, TEGRA_HDA_SIZE, NOPORT, TEGRA_INTR_HDA },
+ { tegracec,
+TEGRA_CEC_OFFSET, TEGRA_CEC_SIZE, NOPORT, TEGRA_INTR_CEC },
};
static const struct tegra_locators tegra_ahb_a2_locators[] = {
Index: src/sys/arch/arm/nvidia/tegra_reg.h
diff -u src/sys/arch/arm/nvidia/tegra_reg.h:1.12
CVS commit: src/sys
Module Name:src
Committed By: jmcneill
Date: Sat Aug 1 21:19:24 UTC 2015
Modified Files:
src/sys/conf: files majors
Added Files:
src/sys/dev/hdmicec: files.hdmicec hdmicec.c hdmicec_if.h hdmicecio.h
Log Message:
Add an API for HDMI CEC devices. HDMI Consumer Electronics Control (CEC) is
a protocol that provides high-level control functions between CEC-capable
connected devices.
To generate a diff of this commit:
cvs rdiff -u -r1.1129 -r1.1130 src/sys/conf/files
cvs rdiff -u -r1.69 -r1.70 src/sys/conf/majors
cvs rdiff -u -r0 -r1.1 src/sys/dev/hdmicec/files.hdmicec \
src/sys/dev/hdmicec/hdmicec.c src/sys/dev/hdmicec/hdmicec_if.h \
src/sys/dev/hdmicec/hdmicecio.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/conf/files
diff -u src/sys/conf/files:1.1129 src/sys/conf/files:1.1130
--- src/sys/conf/files:1.1129 Sat Mar 28 14:09:58 2015
+++ src/sys/conf/files Sat Aug 1 21:19:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1129 2015/03/28 14:09:58 jmcneill Exp $
+# $NetBSD: files,v 1.1130 2015/08/01 21:19:24 jmcneill Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20141030
@@ -334,6 +334,10 @@ attach video at videobus
#
include dev/dtv/files.dtv
+# HDMI CEC
+#
+include dev/hdmicec/files.hdmicec
+
# National Semiconductor LM7[89]
#
# (included here so files.i2c can define an attachment)
Index: src/sys/conf/majors
diff -u src/sys/conf/majors:1.69 src/sys/conf/majors:1.70
--- src/sys/conf/majors:1.69 Fri Sep 19 17:46:28 2014
+++ src/sys/conf/majors Sat Aug 1 21:19:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: majors,v 1.69 2014/09/19 17:46:28 matt Exp $
+# $NetBSD: majors,v 1.70 2015/08/01 21:19:24 jmcneill Exp $
#
# Device majors for Machine-Independent drivers.
#
@@ -59,3 +59,5 @@ device-major lua char 209
# 210-219 reserved for MI ws devices
# 220-239 reserved for MI usb devices
# 240-259 reserved for MI std devices
+
+device-major hdmicec char 260hdmicec
Added files:
Index: src/sys/dev/hdmicec/files.hdmicec
diff -u /dev/null src/sys/dev/hdmicec/files.hdmicec:1.1
--- /dev/null Sat Aug 1 21:19:24 2015
+++ src/sys/dev/hdmicec/files.hdmicec Sat Aug 1 21:19:24 2015
@@ -0,0 +1,7 @@
+# $NetBSD: files.hdmicec,v 1.1 2015/08/01 21:19:24 jmcneill Exp $
+
+define hdmicecbus { }
+
+device hdmicec
+attach hdmicec at hdmicecbus
+file dev/hdmicec/hdmicec.c hdmicec
Index: src/sys/dev/hdmicec/hdmicec.c
diff -u /dev/null src/sys/dev/hdmicec/hdmicec.c:1.1
--- /dev/null Sat Aug 1 21:19:24 2015
+++ src/sys/dev/hdmicec/hdmicec.c Sat Aug 1 21:19:24 2015
@@ -0,0 +1,198 @@
+/* $NetBSD: hdmicec.c,v 1.1 2015/08/01 21:19:24 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: hdmicec.c,v 1.1 2015/08/01 21:19:24 jmcneill Exp $);
+
+#include sys/param.h
+#include sys/types.h
+#include sys/device.h
+#include sys/conf.h
+#include sys/ioctl.h
+#include sys/select.h
+#include sys/atomic.h
+
+#include dev/hdmicec/hdmicec_if.h
+#include dev/hdmicec/hdmicecio.h
+
+#define CEC_MAX_FRAMESIZE 16
+
+struct hdmicec_softc {
+ device_t sc_dev;
+
+ void * sc_priv;
+ const struct hdmicec_hw_if *sc_hwif;
+
+ u_int sc_busy;
+};
+
+static dev_type_open(hdmicec_open);
+static dev_type_close(hdmicec_close);
+static dev_type_read(hdmicec_read);
+static dev_type_write(hdmicec_write);
+static dev_type_ioctl(hdmicec_ioctl);
+static dev_type_poll(hdmicec_poll);
+
+static int hdmicec_match(device_t, cfdata_t, void *);
+static void hdmicec_attach(device_t, device_t, void *);
+
+const struct cdevsw hdmicec_cdevsw
CVS commit: src/sys/arch/evbarm
Module Name:src
Committed By: jmcneill
Date: Sat Aug 1 21:20:47 UTC 2015
Modified Files:
src/sys/arch/evbarm/conf: JETSONTK1
src/sys/arch/evbarm/tegra: tegra_machdep.c
Log Message:
Enable tegracec and hdmicec
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/conf/JETSONTK1
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/tegra/tegra_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/conf/JETSONTK1
diff -u src/sys/arch/evbarm/conf/JETSONTK1:1.29 src/sys/arch/evbarm/conf/JETSONTK1:1.30
--- src/sys/arch/evbarm/conf/JETSONTK1:1.29 Sun Jul 26 10:09:53 2015
+++ src/sys/arch/evbarm/conf/JETSONTK1 Sat Aug 1 21:20:46 2015
@@ -1,5 +1,5 @@
#
-# $NetBSD: JETSONTK1,v 1.29 2015/07/26 10:09:53 jmcneill Exp $
+# $NetBSD: JETSONTK1,v 1.30 2015/08/01 21:20:46 jmcneill Exp $
#
# NVIDIA Jetson TK1 - Tegra K1 development kit
# https://developer.nvidia.com/jetson-tk1
@@ -146,6 +146,8 @@ pseudo-device wsfont
# HDMI
tegrahdmi0 at tegraio? # HDMI
+tegracec0 at tegraio? # HDMI CEC
+hdmicec* at hdmicecbus?
# USB 2.0
ehci0 at tegraio? port 0 # USB1
Index: src/sys/arch/evbarm/tegra/tegra_machdep.c
diff -u src/sys/arch/evbarm/tegra/tegra_machdep.c:1.17 src/sys/arch/evbarm/tegra/tegra_machdep.c:1.18
--- src/sys/arch/evbarm/tegra/tegra_machdep.c:1.17 Sat May 30 23:17:37 2015
+++ src/sys/arch/evbarm/tegra/tegra_machdep.c Sat Aug 1 21:20:47 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_machdep.c,v 1.17 2015/05/30 23:17:37 matt Exp $ */
+/* $NetBSD: tegra_machdep.c,v 1.18 2015/08/01 21:20:47 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tegra_machdep.c,v 1.17 2015/05/30 23:17:37 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: tegra_machdep.c,v 1.18 2015/08/01 21:20:47 jmcneill Exp $);
#include opt_tegra.h
#include opt_machdep.h
@@ -395,6 +395,10 @@ tegra_device_register(device_t self, voi
#endif
}
+ if (device_is_a(self, tegracec)) {
+ prop_dictionary_set_cstring(dict, hdmi-device, tegrahdmi0);
+ }
+
#ifdef BOARD_JETSONTK1
if (device_is_a(self, sdhc)
device_is_a(device_parent(self), tegraio)) {
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sat Aug 1 10:04:50 UTC 2015
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
mount root partition with noatime
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/distrib/utils/embedded/conf/evbarm.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.23 src/distrib/utils/embedded/conf/evbarm.conf:1.24
--- src/distrib/utils/embedded/conf/evbarm.conf:1.23 Sat Aug 1 10:04:06 2015
+++ src/distrib/utils/embedded/conf/evbarm.conf Sat Aug 1 10:04:50 2015
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.23 2015/08/01 10:04:06 jmcneill Exp $
+# $NetBSD: evbarm.conf,v 1.24 2015/08/01 10:04:50 jmcneill Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -68,7 +68,7 @@ make_fstab_evbarm_normal() {
cat ${mnt}/etc/fstab EOF
# NetBSD /etc/fstab
# See /usr/share/examples/fstab/ for more examples.
-/dev/ld0a / ffs rw 1 1
+/dev/ld0a / ffs rw,noatime 1 1
/dev/ld0b none swap sw 0 0
/dev/ld0e /boot msdos rw 1 1
kernfs /kern kernfs rw
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sat Aug 1 10:04:06 UTC 2015
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
Align partitions to 64MB for the benefit of SD cards 32GB
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/distrib/utils/embedded/conf/evbarm.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.22 src/distrib/utils/embedded/conf/evbarm.conf:1.23
--- src/distrib/utils/embedded/conf/evbarm.conf:1.22 Mon Apr 6 22:44:46 2015
+++ src/distrib/utils/embedded/conf/evbarm.conf Sat Aug 1 10:04:06 2015
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.22 2015/04/06 22:44:46 jmcneill Exp $
+# $NetBSD: evbarm.conf,v 1.23 2015/08/01 10:04:06 jmcneill Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -7,7 +7,7 @@ MACHINE=evbarm
swap=256
extra=48 # spare space
-boot=112
+boot=120
init=8
ffsoffset=$(( (${init} + ${boot} + ${swap}) / 2 ))m
CVS commit: src/distrib/utils/embedded
Module Name:src
Committed By: jmcneill
Date: Sat Aug 1 10:05:51 UTC 2015
Modified Files:
src/distrib/utils/embedded: mkimage
Log Message:
use a larger (64KB) block size, this helps SD card performance
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/distrib/utils/embedded/mkimage
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/mkimage
diff -u src/distrib/utils/embedded/mkimage:1.60 src/distrib/utils/embedded/mkimage:1.61
--- src/distrib/utils/embedded/mkimage:1.60 Wed Jul 15 11:27:13 2015
+++ src/distrib/utils/embedded/mkimage Sat Aug 1 10:05:51 2015
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mkimage,v 1.60 2015/07/15 11:27:13 martin Exp $
+# $NetBSD: mkimage,v 1.61 2015/08/01 10:05:51 jmcneill Exp $
#
# Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -197,7 +197,7 @@ if [ -z ${bootonly} ]; then
echo ${bar} Populating ffs filesystem ${bar}
${MAKEFS} -rx ${endian} -N ${release}/etc -t ffs \
-O ${ffsoffset} \
- -o d=4096,f=2048,b=16384 -b $((${extra}))m \
+ -o d=4096,f=8192,b=65536 -b $((${extra}))m \
-F $tmp/selected_sets ${image} ${release} ${mnt}
fi
