CVS commit: src/sys/dev/sdmmc
Module Name:src
Committed By: jmcneill
Date: Thu Jul 23 23:52:54 UTC 2015
Modified Files:
src/sys/dev/sdmmc: sdhc.c sdhcvar.h
Log Message:
Add a SDHC_FLAG_NO_TIMEOUT quirk to handle spurious timeouts on Tegra K1
during data transfers. While here, increase the soft timeout for DMA
transfers from 1s to 3s.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/sdmmc/sdhcvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.60 src/sys/dev/sdmmc/sdhc.c:1.61
--- src/sys/dev/sdmmc/sdhc.c:1.60 Wed Jul 22 09:54:42 2015
+++ src/sys/dev/sdmmc/sdhc.c Thu Jul 23 23:52:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.60 2015/07/22 09:54:42 skrll Exp $ */
+/* $NetBSD: sdhc.c,v 1.61 2015/07/23 23:52:54 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.60 2015/07/22 09:54:42 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.61 2015/07/23 23:52:54 jmcneill Exp $);
#ifdef _KERNEL_OPT
#include opt_sdmmc.h
@@ -55,7 +55,7 @@ void sdhc_dump_regs(struct sdhc_host *);
#define SDHC_COMMAND_TIMEOUT hz
#define SDHC_BUFFER_TIMEOUT hz
#define SDHC_TRANSFER_TIMEOUT hz
-#define SDHC_DMA_TIMEOUT hz
+#define SDHC_DMA_TIMEOUT (hz*3)
struct sdhc_host {
struct sdhc_softc *sc; /* host controller device */
@@ -1119,6 +1119,17 @@ sdhc_exec_command(sdmmc_chipset_handle_t
mutex_exit(hp-intr_mtx);
}
+ if (ISSET(hp-sc-sc_flags, SDHC_FLAG_NO_TIMEOUT)) {
+ const uint16_t eintr = SDHC_CMD_TIMEOUT_ERROR;
+ if (cmd-c_data != NULL) {
+ HCLR2(hp, SDHC_EINTR_SIGNAL_EN, eintr);
+ HCLR2(hp, SDHC_EINTR_STATUS_EN, eintr);
+ } else {
+ HSET2(hp, SDHC_EINTR_SIGNAL_EN, eintr);
+ HSET2(hp, SDHC_EINTR_STATUS_EN, eintr);
+ }
+ }
+
/*
* Start the MMC command, or mark `cmd' as failed and return.
*/
@@ -1332,7 +1343,7 @@ sdhc_transfer_data(struct sdhc_host *hp,
if (hp-sc-sc_vendor_transfer_data_dma != NULL) {
error = hp-sc-sc_vendor_transfer_data_dma(sc, cmd);
if (error == 0 !sdhc_wait_intr(hp,
- SDHC_TRANSFER_COMPLETE, SDHC_TRANSFER_TIMEOUT)) {
+ SDHC_TRANSFER_COMPLETE, SDHC_DMA_TIMEOUT)) {
error = ETIMEDOUT;
}
} else {
Index: src/sys/dev/sdmmc/sdhcvar.h
diff -u src/sys/dev/sdmmc/sdhcvar.h:1.18 src/sys/dev/sdmmc/sdhcvar.h:1.19
--- src/sys/dev/sdmmc/sdhcvar.h:1.18 Sun May 3 11:46:25 2015
+++ src/sys/dev/sdmmc/sdhcvar.h Thu Jul 23 23:52:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhcvar.h,v 1.18 2015/05/03 11:46:25 jmcneill Exp $ */
+/* $NetBSD: sdhcvar.h,v 1.19 2015/07/23 23:52:54 jmcneill Exp $ */
/* $OpenBSD: sdhcvar.h,v 1.3 2007/09/06 08:01:01 jsg Exp $ */
/*
@@ -54,6 +54,7 @@ struct sdhc_softc {
#define SDHC_FLAG_EXTDMA_DMAEN 0x8000 /* ext. dma need SDHC_DMA_ENABLE */
#define SDHC_FLAG_NO_CLKBASE 0x0002 /* ignore clkbase register */
#define SDHC_FLAG_SINGLE_POWER_WRITE 0x0004
+#define SDHC_FLAG_NO_TIMEOUT 0x0008 /* ignore timeout interrupts */
uint32_t sc_clkbase;
int sc_clkmsk; /* Mask for SDCLK */
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: jmcneill
Date: Thu Jul 23 23:53:14 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: tegra_sdhc.c
Log Message:
use SDHC_FLAG_NO_TIMEOUT
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/nvidia/tegra_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/arch/arm/nvidia/tegra_sdhc.c
diff -u src/sys/arch/arm/nvidia/tegra_sdhc.c:1.7 src/sys/arch/arm/nvidia/tegra_sdhc.c:1.8
--- src/sys/arch/arm/nvidia/tegra_sdhc.c:1.7 Thu Jul 23 18:22:05 2015
+++ src/sys/arch/arm/nvidia/tegra_sdhc.c Thu Jul 23 23:53:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_sdhc.c,v 1.7 2015/07/23 18:22:05 jmcneill Exp $ */
+/* $NetBSD: tegra_sdhc.c,v 1.8 2015/07/23 23:53:14 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_sdhc.c,v 1.7 2015/07/23 18:22:05 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: tegra_sdhc.c,v 1.8 2015/07/23 23:53:14 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -93,6 +93,7 @@ tegra_sdhc_attach(device_t parent, devic
sc-sc.sc_flags = SDHC_FLAG_32BIT_ACCESS |
SDHC_FLAG_NO_PWR0 |
SDHC_FLAG_NO_CLKBASE |
+ SDHC_FLAG_NO_TIMEOUT |
SDHC_FLAG_SINGLE_POWER_WRITE |
SDHC_FLAG_USE_DMA;
if (SDMMC_8BIT_P(loc-loc_port)) {
CVS commit: src/sys/arch/arm/cortex
Module Name:src
Committed By: ryo
Date: Fri Jul 24 05:19:14 UTC 2015
Modified Files:
src/sys/arch/arm/cortex: a9tmr.c
Log Message:
- fix sc_ev_missing_ticks over-counting.
- don't use 64bit division, because it has expensive cost on gcc/arm
whether it is a constant or not.
'delta' is usually taken a value around sc_autoinc depending on timing
of read. therefore 'delta / sc-sc_autoinc' would be count too much.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/cortex/a9tmr.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/cortex/a9tmr.c
diff -u src/sys/arch/arm/cortex/a9tmr.c:1.12 src/sys/arch/arm/cortex/a9tmr.c:1.13
--- src/sys/arch/arm/cortex/a9tmr.c:1.12 Wed Mar 4 23:18:21 2015
+++ src/sys/arch/arm/cortex/a9tmr.c Fri Jul 24 05:19:13 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: a9tmr.c,v 1.12 2015/03/04 23:18:21 jmcneill Exp $ */
+/* $NetBSD: a9tmr.c,v 1.13 2015/07/24 05:19:13 ryo Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: a9tmr.c,v 1.12 2015/03/04 23:18:21 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: a9tmr.c,v 1.13 2015/07/24 05:19:13 ryo Exp $);
#include sys/param.h
#include sys/bus.h
@@ -329,7 +329,7 @@ clockhandler(void *arg)
printf(%s(%p): %s: now %#PRIx64 delta %PRIu64\n,
__func__, cf, ci-ci_data.cpu_name, now, delta);
#endif
- KASSERTMSG(delta sc-sc_autoinc / 100,
+ KASSERTMSG(delta sc-sc_autoinc / 64,
%s: interrupting too quickly (delta=%PRIu64),
ci-ci_data.cpu_name, delta);
@@ -337,20 +337,22 @@ clockhandler(void *arg)
hardclock(cf);
+ if (delta sc-sc_autoinc) {
+ u_int ticks = hz;
+ for (delta -= sc-sc_autoinc;
+ delta = sc-sc_autoinc ticks 0;
+ delta -= sc-sc_autoinc, ticks--) {
#if 0
- /*
- * Try to make up up to a seconds amount of missed clock interrupts
- */
- u_int ticks = hz;
- for (delta -= sc-sc_autoinc;
- ticks 0 delta = sc-sc_autoinc;
- delta -= sc-sc_autoinc, ticks--) {
- hardclock(cf);
- }
+ /*
+ * Try to make up up to a seconds amount of
+ * missed clock interrupts
+ */
+ hardclock(cf);
#else
- if (delta sc-sc_autoinc)
- sc-sc_ev_missing_ticks.ev_count += delta / sc-sc_autoinc;
+ sc-sc_ev_missing_ticks.ev_count++;
#endif
+ }
+ }
return 1;
}
CVS commit: src/sys/arch/arm/cortex
Module Name:src
Committed By: ryo
Date: Fri Jul 24 05:20:01 UTC 2015
Modified Files:
src/sys/arch/arm/cortex: a9tmr.c
Log Message:
KNF
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/cortex/a9tmr.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/cortex/a9tmr.c
diff -u src/sys/arch/arm/cortex/a9tmr.c:1.13 src/sys/arch/arm/cortex/a9tmr.c:1.14
--- src/sys/arch/arm/cortex/a9tmr.c:1.13 Fri Jul 24 05:19:13 2015
+++ src/sys/arch/arm/cortex/a9tmr.c Fri Jul 24 05:20:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: a9tmr.c,v 1.13 2015/07/24 05:19:13 ryo Exp $ */
+/* $NetBSD: a9tmr.c,v 1.14 2015/07/24 05:20:01 ryo Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: a9tmr.c,v 1.13 2015/07/24 05:19:13 ryo Exp $);
+__KERNEL_RCSID(0, $NetBSD: a9tmr.c,v 1.14 2015/07/24 05:20:01 ryo Exp $);
#include sys/param.h
#include sys/bus.h
@@ -116,7 +116,7 @@ a9tmr_match(device_t parent, cfdata_t cf
static void
a9tmr_attach(device_t parent, device_t self, void *aux)
{
-struct a9tmr_softc *sc = a9tmr_sc;
+ struct a9tmr_softc *sc = a9tmr_sc;
struct mpcore_attach_args * const mpcaa = aux;
prop_dictionary_t dict = device_properties(self);
char freqbuf[sizeof(XXX SHz)];
@@ -191,7 +191,8 @@ a9tmr_init_cpu_clock(struct cpu_info *ci
*/
uint32_t ctl = a9tmr_global_read(sc, TMR_GBL_CTL);
if (ctl TMR_GBL_CTL_CMP_ENABLE) {
- a9tmr_global_write(sc, TMR_GBL_CTL, ctl ~TMR_GBL_CTL_CMP_ENABLE);
+ a9tmr_global_write(sc, TMR_GBL_CTL,
+ ctl ~TMR_GBL_CTL_CMP_ENABLE);
}
/*
@@ -205,7 +206,8 @@ a9tmr_init_cpu_clock(struct cpu_info *ci
* Re-enable the comparator and now enable interrupts.
*/
a9tmr_global_write(sc, TMR_GBL_INT, 1); /* clear interrupt pending */
- ctl |= TMR_GBL_CTL_CMP_ENABLE | TMR_GBL_CTL_INT_ENABLE | TMR_GBL_CTL_AUTO_INC | TMR_CTL_ENABLE;
+ ctl |= TMR_GBL_CTL_CMP_ENABLE | TMR_GBL_CTL_INT_ENABLE |
+ TMR_GBL_CTL_AUTO_INC | TMR_CTL_ENABLE;
a9tmr_global_write(sc, TMR_GBL_CTL, ctl);
#if 0
printf(%s: %s: ctl %#x autoinc %u cmp %#x%08x now %#PRIx64\n,
@@ -242,7 +244,7 @@ void
cpu_initclocks(void)
{
struct a9tmr_softc * const sc = a9tmr_sc;
-
+
KASSERT(sc-sc_dev != NULL);
KASSERT(sc-sc_freq != 0);
@@ -290,7 +292,8 @@ a9tmr_delay(unsigned int n)
KASSERT(sc != NULL);
- uint32_t freq = sc-sc_freq ? sc-sc_freq : curcpu()-ci_data.cpu_cc_freq / 2;
+ uint32_t freq = sc-sc_freq ? sc-sc_freq :
+ curcpu()-ci_data.cpu_cc_freq / 2;
KASSERT(freq != 0);
/*
@@ -319,11 +322,11 @@ clockhandler(void *arg)
struct clockframe * const cf = arg;
struct a9tmr_softc * const sc = a9tmr_sc;
struct cpu_info * const ci = curcpu();
-
+
const uint64_t now = a9tmr_gettime(sc);
uint64_t delta = now - ci-ci_lastintr;
- a9tmr_global_write(sc, TMR_GBL_INT, 1); // Ack the interrupt
+ a9tmr_global_write(sc, TMR_GBL_INT, 1); /* Ack the interrupt */
#if 0
printf(%s(%p): %s: now %#PRIx64 delta %PRIu64\n,
CVS commit: src/sys/netinet
Module Name:src Committed By: matt Date: Fri Jul 24 04:31:21 UTC 2015 Modified Files: src/sys/netinet: tcp_input.c Log Message: Make sure that snd_win doesn't go negative. To generate a diff of this commit: cvs rdiff -u -r1.342 -r1.343 src/sys/netinet/tcp_input.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/netinet/tcp_input.c diff -u src/sys/netinet/tcp_input.c:1.342 src/sys/netinet/tcp_input.c:1.343 --- src/sys/netinet/tcp_input.c:1.342 Wed Jul 15 09:20:18 2015 +++ src/sys/netinet/tcp_input.c Fri Jul 24 04:31:20 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: tcp_input.c,v 1.342 2015/07/15 09:20:18 ozaki-r Exp $ */ +/* $NetBSD: tcp_input.c,v 1.343 2015/07/24 04:31:20 matt Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -148,7 +148,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tcp_input.c,v 1.342 2015/07/15 09:20:18 ozaki-r Exp $); +__KERNEL_RCSID(0, $NetBSD: tcp_input.c,v 1.343 2015/07/24 04:31:20 matt Exp $); #include opt_inet.h #include opt_ipsec.h @@ -2713,7 +2713,10 @@ after_listen: tp-t_lastm = NULL; sbdrop(so-so_snd, acked); tp-t_lastoff -= acked; - tp-snd_wnd -= acked; + if (tp-snd_wnd acked) +tp-snd_wnd -= acked; + else +tp-snd_wnd = 0; ourfinisacked = 0; } sowwakeup(so);
CVS commit: src/distrib/sets/lists/xserver
Module Name:src Committed By: mrg Date: Fri Jul 24 04:29:28 UTC 2015 Modified Files: src/distrib/sets/lists/xserver: md.amd64 Log Message: libdri2.a is still installed. To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/distrib/sets/lists/xserver/md.amd64 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/lists/xserver/md.amd64 diff -u src/distrib/sets/lists/xserver/md.amd64:1.81 src/distrib/sets/lists/xserver/md.amd64:1.82 --- src/distrib/sets/lists/xserver/md.amd64:1.81 Wed Jul 22 16:37:33 2015 +++ src/distrib/sets/lists/xserver/md.amd64 Fri Jul 24 04:29:27 2015 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.81 2015/07/22 16:37:33 mrg Exp $ +# $NetBSD: md.amd64,v 1.82 2015/07/24 04:29:27 mrg Exp $ ./usr/X11R6/bin/X -unknown- x11 ./usr/X11R6/bin/XFree86 -unknown- x11 ./usr/X11R6/bin/gtf -unknown- x11 @@ -515,7 +515,7 @@ ./usr/X11R7/lib/modules/extensions/libdri.so -unknown- xorg ./usr/X11R7/lib/modules/extensions/libdri.so.0 -unknown- xorg ./usr/X11R7/lib/modules/extensions/libdri_pic.a -unknown- xorg,picinstall,obsolete -./usr/X11R7/lib/modules/extensions/libdri2.a -unknown- xorg,obsolete +./usr/X11R7/lib/modules/extensions/libdri2.a -unknown- xorg ./usr/X11R7/lib/modules/extensions/libdri2.so -unknown- xorg ./usr/X11R7/lib/modules/extensions/libdri2.so.0 -unknown- xorg ./usr/X11R7/lib/modules/extensions/libdri2_pic.a -unknown- xorg,picinstall,obsolete
CVS commit: src/sys/netinet
Module Name:src
Committed By: matt
Date: Fri Jul 24 04:33:50 UTC 2015
Modified Files:
src/sys/netinet: tcp_output.c
Log Message:
If we are sending a window probe and there's unacked data in the socket, make
sure at least the persist timer is running.
To generate a diff of this commit:
cvs rdiff -u -r1.183 -r1.184 src/sys/netinet/tcp_output.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/netinet/tcp_output.c
diff -u src/sys/netinet/tcp_output.c:1.183 src/sys/netinet/tcp_output.c:1.184
--- src/sys/netinet/tcp_output.c:1.183 Sat May 16 01:15:34 2015
+++ src/sys/netinet/tcp_output.c Fri Jul 24 04:33:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_output.c,v 1.183 2015/05/16 01:15:34 kefren Exp $ */
+/* $NetBSD: tcp_output.c,v 1.184 2015/07/24 04:33:50 matt Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -135,7 +135,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tcp_output.c,v 1.183 2015/05/16 01:15:34 kefren Exp $);
+__KERNEL_RCSID(0, $NetBSD: tcp_output.c,v 1.184 2015/07/24 04:33:50 matt Exp $);
#include opt_inet.h
#include opt_ipsec.h
@@ -1533,14 +1533,24 @@ send:
* of retransmit time.
*/
timer:
- if (TCP_TIMER_ISARMED(tp, TCPT_REXMT) == 0
- ((sack_rxmit tp-snd_nxt != tp-snd_max) ||
- tp-snd_nxt != tp-snd_una)) {
- if (TCP_TIMER_ISARMED(tp, TCPT_PERSIST)) {
-TCP_TIMER_DISARM(tp, TCPT_PERSIST);
+ if (TCP_TIMER_ISARMED(tp, TCPT_REXMT) == 0) {
+ if ((sack_rxmit tp-snd_nxt != tp-snd_max)
+ || tp-snd_nxt != tp-snd_una) {
+if (TCP_TIMER_ISARMED(tp, TCPT_PERSIST)) {
+ TCP_TIMER_DISARM(tp, TCPT_PERSIST);
+ tp-t_rxtshift = 0;
+}
+TCP_TIMER_ARM(tp, TCPT_REXMT, tp-t_rxtcur);
+ } else if (len == 0 so-so_snd.sb_cc 0
+ TCP_TIMER_ISARMED(tp, TCPT_PERSIST) == 0) {
+/*
+ * If we are sending a window probe and there's
+ * unacked data in the socket, make sure at
+ * least the persist timer is running.
+ */
tp-t_rxtshift = 0;
+tcp_setpersist(tp);
}
- TCP_TIMER_ARM(tp, TCPT_REXMT, tp-t_rxtcur);
}
} else
if (SEQ_GT(tp-snd_nxt + len, tp-snd_max))
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: skrll Date: Thu Jul 23 15:08:19 UTC 2015 Modified Files: src/sys/arch/arm/nvidia: tegra_dcreg.h tegra_hdmireg.h Log Message: More defines To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nvidia/tegra_dcreg.h \ src/sys/arch/arm/nvidia/tegra_hdmireg.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_dcreg.h diff -u src/sys/arch/arm/nvidia/tegra_dcreg.h:1.2 src/sys/arch/arm/nvidia/tegra_dcreg.h:1.3 --- src/sys/arch/arm/nvidia/tegra_dcreg.h:1.2 Thu Jul 23 14:31:05 2015 +++ src/sys/arch/arm/nvidia/tegra_dcreg.h Thu Jul 23 15:08:19 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: tegra_dcreg.h,v 1.2 2015/07/23 14:31:05 jmcneill Exp $ */ +/* $NetBSD: tegra_dcreg.h,v 1.3 2015/07/23 15:08:19 skrll Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca @@ -139,12 +139,20 @@ * Display DISP registers */ #define DC_DISP_DISP_SIGNAL_OPTIONS0_REG 0x1000 +#define DC_DISP_DISP_SIGNAL_OPTIONS0_M1_ENABLE __BIT(26) +#define DC_DISP_DISP_SIGNAL_OPTIONS0_M0_ENABLE __BIT(24) +#define DC_DISP_DISP_SIGNAL_OPTIONS0_V_PULSE3_ENABLE __BIT(20) +#define DC_DISP_DISP_SIGNAL_OPTIONS0_V_PULSE2_ENABLE __BIT(19) +#define DC_DISP_DISP_SIGNAL_OPTIONS0_V_PULSE1_ENABLE __BIT(18) +#define DC_DISP_DISP_SIGNAL_OPTIONS0_V_PULSE0_ENABLE __BIT(16) #define DC_DISP_DISP_SIGNAL_OPTIONS0_H_PULSE2_ENABLE __BIT(12) +#define DC_DISP_DISP_SIGNAL_OPTIONS0_H_PULSE1_ENABLE __BIT(10) +#define DC_DISP_DISP_SIGNAL_OPTIONS0_H_PULSE0_ENABLE __BIT(8) #define DC_DISP_DISP_WIN_OPTIONS_REG 0x1008 #define DC_DISP_DISP_WIN_OPTIONS_HDMI_ENABLE __BIT(30) #define DC_DISP_DISP_WIN_OPTIONS_DSI_ENABLE __BIT(29) -#define DC_DISP_DISP_WIN_OPTIONS_SOR_ENABLE __BIT(28) +#define DC_DISP_DISP_WIN_OPTIONS_SOR_ENABLE __BIT(25) #define DC_DISP_DISP_WIN_OPTIONS_CURSOR_ENABLE __BIT(16) #define DC_DISP_DISP_TIMING_OPTIONS_REG 0x1014 Index: src/sys/arch/arm/nvidia/tegra_hdmireg.h diff -u src/sys/arch/arm/nvidia/tegra_hdmireg.h:1.2 src/sys/arch/arm/nvidia/tegra_hdmireg.h:1.3 --- src/sys/arch/arm/nvidia/tegra_hdmireg.h:1.2 Thu Jul 23 14:31:05 2015 +++ src/sys/arch/arm/nvidia/tegra_hdmireg.h Thu Jul 23 15:08:19 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: tegra_hdmireg.h,v 1.2 2015/07/23 14:31:05 jmcneill Exp $ */ +/* $NetBSD: tegra_hdmireg.h,v 1.3 2015/07/23 15:08:19 skrll Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca @@ -216,7 +216,15 @@ #define HDMI_NV_PDISP_SOR_CRCA_REG0x170 #define HDMI_NV_PDISP_SOR_CRCB_REG0x174 #define HDMI_NV_PDISP_SOR_BLANK_REG0x178 + #define HDMI_NV_PDISP_SOR_SEQ_CTL_REG0x17c +#define HDMI_NV_PDISP_SOR_SEQ_CTL_SWITCH __BIT(30) +#define HDMI_NV_PDISP_SOR_SEQ_CTL_STATUS __BIT(28) +#define HDMI_NV_PDISP_SOR_SEQ_CTL_PC__BITS(19,16) +#define HDMI_NV_PDISP_SOR_SEQ_CTL_PD_PC_ALT __BITS(15,12) +#define HDMI_NV_PDISP_SOR_SEQ_CTL_PD_PC__BITS(11,8) +#define HDMI_NV_PDISP_SOR_SEQ_CTL_PU_PC_ALT __BITS(7,4) +#define HDMI_NV_PDISP_SOR_SEQ_CTL_PU_PC__BITS(3,0) #define HDMI_NV_PDISP_SOR_SEQ_INST0_REG0x180 #define HDMI_NV_PDISP_SOR_SEQ_INST1_REG0x184
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: skrll Date: Thu Jul 23 15:07:31 UTC 2015 Modified Files: src/sys/arch/arm/nvidia: tegra_carreg.h Log Message: CAR_PLLD_BASE_REG defines To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/nvidia/tegra_carreg.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_carreg.h diff -u src/sys/arch/arm/nvidia/tegra_carreg.h:1.18 src/sys/arch/arm/nvidia/tegra_carreg.h:1.19 --- src/sys/arch/arm/nvidia/tegra_carreg.h:1.18 Sat May 30 13:25:55 2015 +++ src/sys/arch/arm/nvidia/tegra_carreg.h Thu Jul 23 15:07:31 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: tegra_carreg.h,v 1.18 2015/05/30 13:25:55 jmcneill Exp $ */ +/* $NetBSD: tegra_carreg.h,v 1.19 2015/07/23 15:07:31 skrll Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca @@ -88,6 +88,20 @@ #define CAR_PLLU_BASE_DIVN __BITS(17,8) #define CAR_PLLU_BASE_DIVM __BITS(4,0) +#define CAR_PLLD_BASE_REG 0xd0 +#define CAR_PLLD_BASE_BYPASS __BIT(31) +#define CAR_PLLD_BASE_ENABLE __BIT(30) +#define CAR_PLLD_BASE_REF_DIS __BIT(29) +#define CAR_PLLD_BASE_LOCK __BIT(27) +#define CAR_PLLD_BASE_CLKENABLE_CSI __BIT(26) +#define CAR_PLLD_BASE_DSIA_CLK_SRC __BIT(25) +#define CAR_PLLD_BASE_CSI_CLK_SRC __BIT(23) +#define CAR_PLLD_BASE_DIVP __BITS(22,20) +#define CAR_PLLD_BASE_DIVN __BITS(18,8) +#define CAR_PLLD_BASE_DIVM __BITS(4,0) + +#define CAR_PLLD_MISC_REG 0xdc + #define CAR_PLLX_BASE_REG 0xe0 #define CAR_PLLX_BASE_BYPASS __BIT(31) #define CAR_PLLX_BASE_ENABLE __BIT(30)
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: jmcneill
Date: Thu Jul 23 14:31:05 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: tegra_dc.c tegra_dcreg.h tegra_genfb.c
tegra_hdmi.c tegra_hdmireg.h
Log Message:
add Tegra124 HDMI support
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nvidia/tegra_dc.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nvidia/tegra_dcreg.h \
src/sys/arch/arm/nvidia/tegra_genfb.c \
src/sys/arch/arm/nvidia/tegra_hdmireg.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/nvidia/tegra_hdmi.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/nvidia/tegra_dc.c
diff -u src/sys/arch/arm/nvidia/tegra_dc.c:1.2 src/sys/arch/arm/nvidia/tegra_dc.c:1.3
--- src/sys/arch/arm/nvidia/tegra_dc.c:1.2 Wed Jul 8 01:23:28 2015
+++ src/sys/arch/arm/nvidia/tegra_dc.c Thu Jul 23 14:31:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_dc.c,v 1.2 2015/07/08 01:23:28 jmcneill Exp $ */
+/* $NetBSD: tegra_dc.c,v 1.3 2015/07/23 14:31:05 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.2 2015/07/08 01:23:28 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: tegra_dc.c,v 1.3 2015/07/23 14:31:05 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, $NetBSD: tegra_dc.c,v
#define TEGRA_DC_NPORTS 2
#define TEGRA_DC_DEPTH 32
-#define TEGRA_DC_FBALIGN 16
+#define TEGRA_DC_FBALIGN PAGE_SIZE
static int tegra_dc_match(device_t, cfdata_t, void *);
static void tegra_dc_attach(device_t, device_t, void *);
@@ -145,6 +145,8 @@ tegra_dc_allocmem(struct tegra_dc_softc
sc-sc_dmasize = size;
+ memset(sc-sc_dmap, 0, size);
+
return 0;
destroy:
@@ -185,6 +187,10 @@ tegra_dc_init(struct tegra_dc_softc *sc,
static void
tegra_dc_init_win(struct tegra_dc_softc *sc, const struct videomode *mode)
{
+ /* Write access control */
+ DC_WRITE(sc, DC_CMD_STATE_ACCESS_REG,
+ DC_CMD_STATE_ACCESS_WRITE_MUX | DC_CMD_STATE_ACCESS_READ_MUX);
+
/* Enable window A programming */
DC_WRITE(sc, DC_CMD_DISPLAY_WINDOW_HEADER_REG,
DC_CMD_DISPLAY_WINDOW_HEADER_WINDOW_A_SELECT);
@@ -199,6 +205,11 @@ tegra_dc_init_win(struct tegra_dc_softc
__SHIFTIN(DC_WINC_A_BYTE_SWAP_SWAP_NOSWAP,
DC_WINC_A_BYTE_SWAP_SWAP));
+ /* Initial DDA */
+ DC_WRITE(sc, DC_WINC_A_H_INITIAL_DDA_REG, 0);
+ DC_WRITE(sc, DC_WINC_A_V_INITIAL_DDA_REG, 0);
+ DC_WRITE(sc, DC_WINC_A_DDA_INCREMENT_REG, 0x10001000);
+
/* Window position, size, stride */
DC_WRITE(sc, DC_WINC_A_POSITION_REG,
__SHIFTIN(0, DC_WINC_A_POSITION_V) |
@@ -218,6 +229,10 @@ tegra_dc_init_win(struct tegra_dc_softc
DC_WRITE(sc, DC_WINBUF_A_START_ADDR_REG,
(uint32_t)sc-sc_dmamap-dm_segs[0].ds_addr);
+ /* Offsets */
+ DC_WRITE(sc, DC_WINBUF_A_ADDR_H_OFFSET_REG, 0);
+ DC_WRITE(sc, DC_WINBUF_A_ADDR_V_OFFSET_REG, 0);
+
/* Surface kind */
DC_WRITE(sc, DC_WINBUF_A_SURFACE_KIND_REG,
__SHIFTIN(DC_WINBUF_A_SURFACE_KIND_SURFACE_KIND_PITCH,
@@ -232,14 +247,35 @@ static void
tegra_dc_init_disp(struct tegra_dc_softc *sc, const struct videomode *mode)
{
const u_int hspw = mode-hsync_end - mode-hsync_start;
- const u_int hbp = mode-htotal - mode-hsync_start;
+ const u_int hbp = mode-htotal - mode-hsync_end;
const u_int hfp = mode-hsync_start - mode-hdisplay;
const u_int vspw = mode-vsync_end - mode-vsync_start;
- const u_int vbp = mode-vtotal - mode-vsync_start;
+ const u_int vbp = mode-vtotal - mode-vsync_end;
const u_int vfp = mode-vsync_start - mode-vdisplay;
+ DC_WRITE(sc, DC_DISP_DISP_TIMING_OPTIONS_REG,
+ __SHIFTIN(1, DC_DISP_DISP_TIMING_OPTIONS_VSYNC_POS));
+ DC_WRITE(sc, DC_DISP_DISP_COLOR_CONTROL_REG,
+ __SHIFTIN(DC_DISP_DISP_COLOR_CONTROL_BASE_COLOR_SIZE_888,
+ DC_DISP_DISP_COLOR_CONTROL_BASE_COLOR_SIZE));
+ DC_WRITE(sc, DC_DISP_DISP_SIGNAL_OPTIONS0_REG,
+ DC_DISP_DISP_SIGNAL_OPTIONS0_H_PULSE2_ENABLE);
+ DC_WRITE(sc, DC_DISP_H_PULSE2_CONTROL_REG,
+ __SHIFTIN(DC_DISP_H_PULSE2_CONTROL_V_QUAL_VACTIVE,
+ DC_DISP_H_PULSE2_CONTROL_V_QUAL) |
+ __SHIFTIN(DC_DISP_H_PULSE2_CONTROL_LAST_END_A,
+ DC_DISP_H_PULSE2_CONTROL_LAST));
+
+ u_int pulse_start = 1 + hspw + hbp - 10;
+ DC_WRITE(sc, DC_DISP_H_PULSE2_POSITION_A_REG,
+ __SHIFTIN(pulse_start, DC_DISP_H_PULSE2_POSITION_A_START) |
+ __SHIFTIN(pulse_start + 8, DC_DISP_H_PULSE2_POSITION_A_END));
+
/* Pixel clock */
- DC_WRITE(sc, DC_DISP_DISP_CLOCK_CONTROL_REG, 0);
+ const u_int div = (tegra_car_plld2_rate() * 2) / (mode-dot_clock * 1000) - 2;
+ DC_WRITE(sc, DC_DISP_DISP_CLOCK_CONTROL_REG,
+ __SHIFTIN(0, DC_DISP_DISP_CLOCK_CONTROL_PIXEL_CLK_DIVIDER) |
+ __SHIFTIN(div, DC_DISP_DISP_CLOCK_CONTROL_SHIFT_CLK_DIVIDER));
/* Mode timings */
DC_WRITE(sc, DC_DISP_REF_TO_SYNC_REG,
@@ -259,10 +295,9 @@
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: jmcneill
Date: Thu Jul 23 14:30:07 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: tegra_car.c
Log Message:
fix some clocks; many periph dividers are in units of 0.5x not 1x, use PLLD2
for DC, use correct pldiv value for PLLD2
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/nvidia/tegra_car.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/nvidia/tegra_car.c
diff -u src/sys/arch/arm/nvidia/tegra_car.c:1.21 src/sys/arch/arm/nvidia/tegra_car.c:1.22
--- src/sys/arch/arm/nvidia/tegra_car.c:1.21 Sat May 30 13:25:55 2015
+++ src/sys/arch/arm/nvidia/tegra_car.c Thu Jul 23 14:30:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_car.c,v 1.21 2015/05/30 13:25:55 jmcneill Exp $ */
+/* $NetBSD: tegra_car.c,v 1.22 2015/07/23 14:30:06 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.21 2015/05/30 13:25:55 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: tegra_car.c,v 1.22 2015/07/23 14:30:06 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -115,7 +115,7 @@ tegra_car_init(struct tegra_car_softc *s
tegra_reg_set_clear(bst, bsh, CAR_PLLD2_BASE_REG,
__SHIFTIN(1, CAR_PLLD2_BASE_MDIV) |
__SHIFTIN(99, CAR_PLLD2_BASE_NDIV) |
- __SHIFTIN(2, CAR_PLLD2_BASE_PLDIV),
+ __SHIFTIN(1, CAR_PLLD2_BASE_PLDIV),
CAR_PLLD2_BASE_REF_SRC_SEL |
CAR_PLLD2_BASE_PLDIV | CAR_PLLD2_BASE_NDIV | CAR_PLLD2_BASE_MDIV);
}
@@ -348,7 +348,7 @@ tegra_car_uart_rate(u_int port)
}
if (__SHIFTOUT(src, CAR_CLKSRC_UART_DIV_ENB)) {
- const u_int div = __SHIFTOUT(src, CAR_CLKSRC_UART_DIV) + 1;
+ const u_int div = (__SHIFTOUT(src, CAR_CLKSRC_UART_DIV) / 2) + 1;
return src_rate / div;
} else {
return src_rate;
@@ -374,7 +374,7 @@ tegra_car_periph_sdmmc_rate(u_int port)
const uint32_t src = bus_space_read_4(bst, bsh, src_reg);
- const u_int div = __SHIFTOUT(src, CAR_CLKSRC_SDMMC_DIV) + 1;
+ const u_int div = (__SHIFTOUT(src, CAR_CLKSRC_SDMMC_DIV) / 2) + 1;
return tegra_car_pllp0_rate() / div;
}
@@ -428,7 +428,7 @@ tegra_car_periph_sdmmc_set_div(u_int por
/* update clk div */
src = __SHIFTIN(CAR_CLKSRC_SDMMC_SRC_PLLP_OUT0,
CAR_CLKSRC_SDMMC_SRC);
- src |= __SHIFTIN(div - 1, CAR_CLKSRC_SDMMC_DIV);
+ src |= __SHIFTIN((div - 1) * 2, CAR_CLKSRC_SDMMC_DIV);
bus_space_write_4(bst, bsh, src_reg, src);
/* leave reset */
@@ -576,7 +576,7 @@ tegra_car_periph_sata_enable(void)
bus_space_write_4(bst, bsh, CAR_CLKSRC_SATA_OOB_REG,
__SHIFTIN(CAR_CLKSRC_SATA_OOB_SRC_PLLP_OUT0,
CAR_CLKSRC_SATA_OOB_SRC) |
- __SHIFTIN(sataoob_div - 1, CAR_CLKSRC_SATA_OOB_DIV));
+ __SHIFTIN((sataoob_div - 1) * 2, CAR_CLKSRC_SATA_OOB_DIV));
/* Set SATA clock source to PLLP, 102MHz */
const u_int sata_div = 4;
@@ -584,7 +584,7 @@ tegra_car_periph_sata_enable(void)
CAR_CLKSRC_SATA_AUX_CLK_ENB |
__SHIFTIN(CAR_CLKSRC_SATA_SRC_PLLP_OUT0,
CAR_CLKSRC_SATA_SRC) |
- __SHIFTIN(sata_div - 1, CAR_CLKSRC_SATA_DIV));
+ __SHIFTIN((sata_div - 1) * 2, CAR_CLKSRC_SATA_DIV));
/* Ungate SAX partition in the PMC */
tegra_pmc_power(PMC_PARTID_SAX, true);
@@ -715,10 +715,10 @@ tegra_car_hdmi_enable(u_int rate)
}
/* Set clock source to PLLD2 */
- const u_int div = howmany(tegra_car_plld2_rate(), rate);
+ const u_int div = (tegra_car_plld2_rate() * 2) / rate - 2;
bus_space_write_4(bst, bsh, CAR_CLKSRC_HDMI_REG,
__SHIFTIN(CAR_CLKSRC_HDMI_SRC_PLLD2_OUT0, CAR_CLKSRC_HDMI_SRC) |
- __SHIFTIN(div - 1, CAR_CLKSRC_HDMI_DIV));
+ __SHIFTIN(div, CAR_CLKSRC_HDMI_DIV));
/* Leave reset */
bus_space_write_4(bst, bsh, CAR_RST_DEV_H_CLR_REG, CAR_DEV_H_HDMI);
@@ -758,9 +758,9 @@ tegra_car_dc_enable(u_int port)
tegra_pmc_power(partid, true);
tegra_pmc_remove_clamping(partid);
- /* Select PLLP for clock source */
+ /* Select PLLD2 for clock source */
bus_space_write_4(bst, bsh, src_reg,
- __SHIFTIN(CAR_CLKSRC_DISP_SRC_PLLP_OUT0,
+ __SHIFTIN(CAR_CLKSRC_DISP_SRC_PLLD2_OUT0,
CAR_CLKSRC_DISP_SRC));
/* Leave reset */
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: jmcneill
Date: Thu Jul 23 15:43:06 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: tegra_hdmi.c
Log Message:
no need for exact match on tmds mode, just use the closest match
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/nvidia/tegra_hdmi.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/nvidia/tegra_hdmi.c
diff -u src/sys/arch/arm/nvidia/tegra_hdmi.c:1.4 src/sys/arch/arm/nvidia/tegra_hdmi.c:1.5
--- src/sys/arch/arm/nvidia/tegra_hdmi.c:1.4 Thu Jul 23 14:31:05 2015
+++ src/sys/arch/arm/nvidia/tegra_hdmi.c Thu Jul 23 15:43:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_hdmi.c,v 1.4 2015/07/23 14:31:05 jmcneill Exp $ */
+/* $NetBSD: tegra_hdmi.c,v 1.5 2015/07/23 15:43:06 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.4 2015/07/23 14:31:05 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: tegra_hdmi.c,v 1.5 2015/07/23 15:43:06 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -252,11 +252,15 @@ tegra_hdmi_enable(struct tegra_hdmi_soft
tegra_car_hdmi_enable(mode-dot_clock * 1000);
for (n = 0; n __arraycount(tegra_hdmi_tmds_config); n++) {
- if (tegra_hdmi_tmds_config[n].dot_clock == mode-dot_clock) {
- tmds = tegra_hdmi_tmds_config[n];
+ if (tegra_hdmi_tmds_config[n].dot_clock = mode-dot_clock) {
break;
}
}
+ if (n __arraycount(tegra_hdmi_tmds_config)) {
+ tmds = tegra_hdmi_tmds_config[n];
+ } else {
+ tmds = tegra_hdmi_tmds_config[__arraycount(tegra_hdmi_tmds_config) - 1];
+ }
if (tmds != NULL) {
HDMI_WRITE(sc, HDMI_NV_PDISP_SOR_PLL0_REG, tmds-sor_pll0);
HDMI_WRITE(sc, HDMI_NV_PDISP_SOR_PLL1_REG, tmds-sor_pll1);
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: jmcneill
Date: Thu Jul 23 18:22:05 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: tegra_car.c tegra_sdhc.c tegra_var.h
Log Message:
Support fractional dividers. This lets us use 48MHz for SDMMC HS mode
instead of 45.333MHz.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/nvidia/tegra_car.c \
src/sys/arch/arm/nvidia/tegra_var.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/nvidia/tegra_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/arch/arm/nvidia/tegra_car.c
diff -u src/sys/arch/arm/nvidia/tegra_car.c:1.22 src/sys/arch/arm/nvidia/tegra_car.c:1.23
--- src/sys/arch/arm/nvidia/tegra_car.c:1.22 Thu Jul 23 14:30:06 2015
+++ src/sys/arch/arm/nvidia/tegra_car.c Thu Jul 23 18:22:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_car.c,v 1.22 2015/07/23 14:30:06 jmcneill Exp $ */
+/* $NetBSD: tegra_car.c,v 1.23 2015/07/23 18:22:05 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.22 2015/07/23 14:30:06 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: tegra_car.c,v 1.23 2015/07/23 18:22:05 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -374,13 +374,13 @@ tegra_car_periph_sdmmc_rate(u_int port)
const uint32_t src = bus_space_read_4(bst, bsh, src_reg);
- const u_int div = (__SHIFTOUT(src, CAR_CLKSRC_SDMMC_DIV) / 2) + 1;
+ const u_int div = __SHIFTOUT(src, CAR_CLKSRC_SDMMC_DIV) + 2;
- return tegra_car_pllp0_rate() / div;
+ return (tegra_car_pllp0_rate() * 2) / div;
}
int
-tegra_car_periph_sdmmc_set_div(u_int port, u_int div)
+tegra_car_periph_sdmmc_set_rate(u_int port, u_int rate)
{
bus_space_tag_t bst;
bus_space_handle_t bsh;
@@ -388,7 +388,7 @@ tegra_car_periph_sdmmc_set_div(u_int por
u_int dev_bit;
uint32_t src;
- KASSERT(div 0);
+ KASSERT(rate 0);
tegra_car_get_bs(bst, bsh);
@@ -425,10 +425,12 @@ tegra_car_periph_sdmmc_set_div(u_int por
/* enable clk */
bus_space_write_4(bst, bsh, enb_reg, dev_bit);
+ const u_int div = howmany(tegra_car_pllp0_rate() * 2, rate) - 2;
+
/* update clk div */
src = __SHIFTIN(CAR_CLKSRC_SDMMC_SRC_PLLP_OUT0,
CAR_CLKSRC_SDMMC_SRC);
- src |= __SHIFTIN((div - 1) * 2, CAR_CLKSRC_SDMMC_DIV);
+ src |= __SHIFTIN(div, CAR_CLKSRC_SDMMC_DIV);
bus_space_write_4(bst, bsh, src_reg, src);
/* leave reset */
Index: src/sys/arch/arm/nvidia/tegra_var.h
diff -u src/sys/arch/arm/nvidia/tegra_var.h:1.22 src/sys/arch/arm/nvidia/tegra_var.h:1.23
--- src/sys/arch/arm/nvidia/tegra_var.h:1.22 Wed Jul 8 01:23:28 2015
+++ src/sys/arch/arm/nvidia/tegra_var.h Thu Jul 23 18:22:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_var.h,v 1.22 2015/07/08 01:23:28 jmcneill Exp $ */
+/* $NetBSD: tegra_var.h,v 1.23 2015/07/23 18:22:05 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -96,7 +96,7 @@ u_int tegra_car_pllp0_rate(void);
u_int tegra_car_plld2_rate(void);
u_int tegra_car_uart_rate(u_int);
u_int tegra_car_periph_sdmmc_rate(u_int);
-int tegra_car_periph_sdmmc_set_div(u_int, u_int);
+int tegra_car_periph_sdmmc_set_rate(u_int, u_int);
int tegra_car_periph_usb_enable(u_int);
void tegra_car_periph_hda_enable(void);
void tegra_car_periph_sata_enable(void);
Index: src/sys/arch/arm/nvidia/tegra_sdhc.c
diff -u src/sys/arch/arm/nvidia/tegra_sdhc.c:1.6 src/sys/arch/arm/nvidia/tegra_sdhc.c:1.7
--- src/sys/arch/arm/nvidia/tegra_sdhc.c:1.6 Sat May 30 18:53:39 2015
+++ src/sys/arch/arm/nvidia/tegra_sdhc.c Thu Jul 23 18:22:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_sdhc.c,v 1.6 2015/05/30 18:53:39 jmcneill Exp $ */
+/* $NetBSD: tegra_sdhc.c,v 1.7 2015/07/23 18:22:05 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_sdhc.c,v 1.6 2015/05/30 18:53:39 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: tegra_sdhc.c,v 1.7 2015/07/23 18:22:05 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -122,12 +122,7 @@ tegra_sdhc_attach(device_t parent, devic
if (sc-sc_pin_wp)
sc-sc.sc_vendor_write_protect = tegra_sdhc_write_protect;
-#if notyet
- tegra_car_periph_sdmmc_set_div(sc-sc_port, 1);
-#else
- const u_int div = howmany(tegra_car_pllp0_rate() / 1000, 5);
- tegra_car_periph_sdmmc_set_div(sc-sc_port, div);
-#endif
+ tegra_car_periph_sdmmc_set_rate(sc-sc_port, 5000);
sc-sc.sc_clkbase = tegra_car_periph_sdmmc_rate(sc-sc_port) / 1000;
aprint_naive(\n);
CVS commit: [netbsd-7] src
Module Name:src Committed By: snj Date: Thu Jul 23 18:45:16 UTC 2015 Modified Files: src/distrib/notes/common [netbsd-7]: main src/doc [netbsd-7]: CHANGES-7.0 src/sys/sys [netbsd-7]: param.h Log Message: Welcome to 7.0_RC2! To generate a diff of this commit: cvs rdiff -u -r1.510.4.4 -r1.510.4.5 src/distrib/notes/common/main cvs rdiff -u -r1.1.2.346 -r1.1.2.347 src/doc/CHANGES-7.0 cvs rdiff -u -r1.459.2.3 -r1.459.2.4 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.510.4.4 src/distrib/notes/common/main:1.510.4.5 --- src/distrib/notes/common/main:1.510.4.4 Fri Jun 19 02:56:02 2015 +++ src/distrib/notes/common/main Thu Jul 23 18:45:15 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: main,v 1.510.4.4 2015/06/19 02:56:02 snj Exp $ +.\ $NetBSD: main,v 1.510.4.5 2015/07/23 18:45:15 snj Exp $ .\ .\ Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -50,7 +50,7 @@ .as MACHINE_LIST sgimips shark sparc sparc64 sun2 sun3 vax x68k xen zaurus . .so \*[.CURDIR]/../common/macros . -.Dd June 19, 2015 +.Dd July 23, 2015 .Dt INSTALL 8 .Os NetBSD .Sh NAME Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.346 src/doc/CHANGES-7.0:1.1.2.347 --- src/doc/CHANGES-7.0:1.1.2.346 Thu Jul 23 17:46:39 2015 +++ src/doc/CHANGES-7.0 Thu Jul 23 18:45:15 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.346 2015/07/23 17:46:39 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.347 2015/07/23 18:45:15 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -33434,3 +33434,9 @@ xsrc/external/mit/libX11/dist/src/xkb/XK XkbNumRequiredTypes in map. [mrg, ticket #885] +distrib/notes/common/main patched by hand +sys/sys/param.h patched by hand + + Welcome to 7.0_RC2! + [snj] + Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.459.2.3 src/sys/sys/param.h:1.459.2.4 --- src/sys/sys/param.h:1.459.2.3 Fri Jun 19 02:56:02 2015 +++ src/sys/sys/param.h Thu Jul 23 18:45:16 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.459.2.3 2015/06/19 02:56:02 snj Exp $ */ +/* $NetBSD: param.h,v 1.459.2.4 2015/07/23 18:45:16 snj Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 70001 /* NetBSD 7.0_RC1 */ +#define __NetBSD_Version__ 70001 /* NetBSD 7.0_RC2 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__)
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Thu Jul 23 17:46:40 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 885 To generate a diff of this commit: cvs rdiff -u -r1.1.2.345 -r1.1.2.346 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.345 src/doc/CHANGES-7.0:1.1.2.346 --- src/doc/CHANGES-7.0:1.1.2.345 Wed Jul 22 16:56:03 2015 +++ src/doc/CHANGES-7.0 Thu Jul 23 17:46:39 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.345 2015/07/22 16:56:03 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.346 2015/07/23 17:46:39 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -33427,3 +33427,10 @@ sys/arch/i386/conf/XEN3_DOMU 1.68 Uncoment options IPSEC in Xen kernels. [bouyer, ticket #884] +xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c patch + + Bring in the upstream fix that was attempted locally in + revision 1.2: Ensure we allocate at least + XkbNumRequiredTypes in map. + [mrg, ticket #885] +
CVS commit: [netbsd-7] xsrc/external/mit/libX11/dist/src/xkb
Module Name:xsrc
Committed By: snj
Date: Thu Jul 23 17:43:41 UTC 2015
Modified Files:
xsrc/external/mit/libX11/dist/src/xkb [netbsd-7]: XKBMAlloc.c
Log Message:
Apply patch (requested by mrg in ticket #885):
Bring in the upstream fix (1e362fac92c6688fb42b195ccad16d7a337a34c1)
that was attempted locally in revision 1.2: Ensure we allocate at least
XkbNumRequiredTypes in map.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.2.1 \
xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.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/libX11/dist/src/xkb/XKBMAlloc.c
diff -u xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c:1.2 xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c:1.2.2.1
--- xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c:1.2 Sun Jul 13 16:37:45 2014
+++ xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c Thu Jul 23 17:43:41 2015
@@ -302,7 +302,7 @@ XkbAddKeyType(XkbDescPtr xkb,
}
}
}
-if ((!map) || (!map-types) || !(map-num_types XkbNumRequiredTypes)) {
+if ((!map) || (!map-types) || (map-num_types XkbNumRequiredTypes)) {
tmp = XkbNumRequiredTypes + 1;
if (XkbAllocClientMap(xkb, XkbKeyTypesMask, tmp) != Success)
return NULL;
CVS commit: src/etc/rc.d
Module Name:src
Committed By: riz
Date: Thu Jul 23 17:12:16 UTC 2015
Modified Files:
src/etc/rc.d: postfix
Log Message:
Implement status command for postfix - makes tools like ansible
happier.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/etc/rc.d/postfix
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/postfix
diff -u src/etc/rc.d/postfix:1.16 src/etc/rc.d/postfix:1.17
--- src/etc/rc.d/postfix:1.16 Wed Apr 15 22:11:32 2009
+++ src/etc/rc.d/postfix Thu Jul 23 17:12:16 2015
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postfix,v 1.16 2009/04/15 22:11:32 perry Exp $
+# $NetBSD: postfix,v 1.17 2015/07/23 17:12:16 riz Exp $
#
# PROVIDE: mail
@@ -18,7 +18,8 @@ start_precmd=postfix_precmd
start_cmd=postfix_op
stop_cmd=postfix_op
reload_cmd=postfix_op
-extra_commands=reload
+status_cmd=postfix_op
+extra_commands=reload status
spooletcdir=/var/spool/${name}/etc
postconf=/usr/sbin/postconf
required_dirs=$spooletcdir
CVS commit: xsrc/external/mit/mkcfm/dist
Module Name:xsrc Committed By: mrg Date: Thu Jul 23 07:22:32 UTC 2015 Removed Files: xsrc/external/mit/mkcfm/dist: AUTHORS COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS README aclocal.m4 compile config.guess config.h.in config.sub configure configure.ac depcomp install-sh missing mkcfm.c mkcfm.man mkinstalldirs Log Message: oops, didn't meant to import this. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/mkcfm/dist/AUTHORS \ xsrc/external/mit/mkcfm/dist/COPYING \ xsrc/external/mit/mkcfm/dist/ChangeLog \ xsrc/external/mit/mkcfm/dist/INSTALL \ xsrc/external/mit/mkcfm/dist/Makefile.am \ xsrc/external/mit/mkcfm/dist/Makefile.in \ xsrc/external/mit/mkcfm/dist/NEWS xsrc/external/mit/mkcfm/dist/README \ xsrc/external/mit/mkcfm/dist/aclocal.m4 \ xsrc/external/mit/mkcfm/dist/compile \ xsrc/external/mit/mkcfm/dist/config.guess \ xsrc/external/mit/mkcfm/dist/config.h.in \ xsrc/external/mit/mkcfm/dist/config.sub \ xsrc/external/mit/mkcfm/dist/configure \ xsrc/external/mit/mkcfm/dist/configure.ac \ xsrc/external/mit/mkcfm/dist/depcomp \ xsrc/external/mit/mkcfm/dist/install-sh \ xsrc/external/mit/mkcfm/dist/missing xsrc/external/mit/mkcfm/dist/mkcfm.c \ xsrc/external/mit/mkcfm/dist/mkcfm.man \ xsrc/external/mit/mkcfm/dist/mkinstalldirs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Thu Jul 23 07:36:33 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: ucom.c
Log Message:
Convert to usbhist
To generate a diff of this commit:
cvs rdiff -u -r1.108.2.6 -r1.108.2.7 src/sys/dev/usb/ucom.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/ucom.c
diff -u src/sys/dev/usb/ucom.c:1.108.2.6 src/sys/dev/usb/ucom.c:1.108.2.7
--- src/sys/dev/usb/ucom.c:1.108.2.6 Sat Jun 6 14:40:14 2015
+++ src/sys/dev/usb/ucom.c Thu Jul 23 07:36:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ucom.c,v 1.108.2.6 2015/06/06 14:40:14 skrll Exp $ */
+/* $NetBSD: ucom.c,v 1.108.2.7 2015/07/23 07:36:33 skrll Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ucom.c,v 1.108.2.6 2015/06/06 14:40:14 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ucom.c,v 1.108.2.7 2015/07/23 07:36:33 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -50,6 +50,7 @@ __KERNEL_RCSID(0, $NetBSD: ucom.c,v 1.1
#include sys/poll.h
#include sys/queue.h
#include sys/kauth.h
+#include sys/sysctl.h
#include sys/timepps.h
#include sys/rndsource.h
@@ -59,6 +60,7 @@ __KERNEL_RCSID(0, $NetBSD: ucom.c,v 1.1
#include dev/usb/usbdi_util.h
#include dev/usb/usbdevs.h
#include dev/usb/usb_quirks.h
+#include dev/usb/usbhist.h
#include dev/usb/ucomvar.h
@@ -68,13 +70,46 @@ __KERNEL_RCSID(0, $NetBSD: ucom.c,v 1.1
#if NUCOM 0
-#ifdef UCOM_DEBUG
-#define DPRINTFN(n, x) if (ucomdebug (n)) printf x
-int ucomdebug = 0;
+#ifdef USB_DEBUG
+#ifndef UCOM_DEBUG
+#define ucomdebug 0
#else
-#define DPRINTFN(n, x)
-#endif
-#define DPRINTF(x) DPRINTFN(0, x)
+int ucomdebug = 0;
+
+SYSCTL_SETUP(sysctl_hw_ucom_setup, sysctl hw.ucom setup)
+{
+int err;
+const struct sysctlnode *rnode;
+const struct sysctlnode *cnode;
+
+err = sysctl_createv(clog, 0, NULL, rnode,
+CTLFLAG_PERMANENT, CTLTYPE_NODE, ucom,
+SYSCTL_DESCR(ucom global controls),
+NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL);
+
+if (err)
+goto fail;
+
+/* control debugging printfs */
+err = sysctl_createv(clog, 0, rnode, cnode,
+CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT,
+debug, SYSCTL_DESCR(Enable debugging output),
+NULL, 0, ucomdebug, sizeof(ucomdebug), CTL_CREATE, CTL_EOL);
+if (err)
+goto fail;
+
+return;
+fail:
+aprint_error(%s: sysctl_createv failed (err = %d)\n, __func__, err);
+}
+
+#endif /* UCOM_DEBUG */
+#endif /* USB_DEBUG */
+
+#define DPRINTF(FMT,A,B,C,D)USBHIST_LOGN(ucomdebug,1,FMT,A,B,C,D)
+#define DPRINTFN(N,FMT,A,B,C,D) USBHIST_LOGN(ucomdebug,N,FMT,A,B,C,D)
+#define UCOMHIST_FUNC() USBHIST_FUNC()
+#define UCOMHIST_CALLED(name) USBHIST_CALLED(ucomdebug)
#define UCOMCALLUNIT_MASK TTCALLUNIT_MASK
#define UCOMUNIT_MASK TTUNIT_MASK
@@ -215,6 +250,8 @@ ucom_attach(device_t parent, device_t se
struct ucom_attach_args *uca = aux;
struct tty *tp;
+ UCOMHIST_FUNC(); UCOMHIST_CALLED();
+
if (uca-info != NULL)
aprint_normal(: %s, uca-info);
aprint_normal(\n);
@@ -249,7 +286,7 @@ ucom_attach(device_t parent, device_t se
tp-t_hwiflow = ucomhwiflow;
sc-sc_tty = tp;
- DPRINTF((ucom_attach: tty_attach %p\n, tp));
+ DPRINTF(tty_attach %p, tp, 0, 0, 0);
tty_attach(tp);
rnd_attach_source(sc-sc_rndsource, device_xname(sc-sc_dev),
@@ -268,8 +305,10 @@ ucom_detach(device_t self, int flags)
int maj, mn;
int s, i;
- DPRINTF((ucom_detach: sc=%p flags=%d tp=%p, pipe=%d,%d\n,
- sc, flags, tp, sc-sc_bulkin_no, sc-sc_bulkout_no));
+ UCOMHIST_FUNC(); UCOMHIST_CALLED();
+
+ DPRINTF(sc=%p flags=%d tp=%p, sc, flags, tp, 0);
+ DPRINTF(... pipe=%d,%d,sc-sc_bulkin_no, sc-sc_bulkout_no, 0, 0);
sc-sc_dying = 1;
pmf_device_deregister(self);
@@ -301,7 +340,7 @@ ucom_detach(device_t self, int flags)
/* Nuke the vnodes for any open instances. */
mn = device_unit(self);
- DPRINTF((ucom_detach: maj=%d mn=%d\n, maj, mn));
+ DPRINTF(maj=%d mn=%d\n, maj, mn, 0, 0);
vdevgone(maj, mn, mn, VCHR);
vdevgone(maj, mn | UCOMDIALOUT_MASK, mn | UCOMDIALOUT_MASK, VCHR);
vdevgone(maj, mn | UCOMCALLUNIT_MASK, mn | UCOMCALLUNIT_MASK, VCHR);
@@ -334,7 +373,9 @@ ucom_activate(device_t self, enum devact
{
struct ucom_softc *sc = device_private(self);
- DPRINTFN(5,(ucom_activate: %d\n, act));
+ UCOMHIST_FUNC(); UCOMHIST_CALLED();
+
+ DPRINTFN(5, %d, act, 0, 0, 0);
switch (act) {
case DVACT_DEACTIVATE:
@@ -350,7 +391,8 @@ ucom_shutdown(struct ucom_softc *sc)
{
struct tty *tp = sc-sc_tty;
- DPRINTF((ucom_shutdown\n));
+ UCOMHIST_FUNC(); UCOMHIST_CALLED();
+
/*
* Hang up if necessary. Wait a bit, so the other side has time to
* notice even if we immediately open the port again.
@@ -372,6 +414,8 @@
CVS commit: src/external/mit/xorg/tools
Module Name:src Committed By: mrg Date: Thu Jul 23 07:36:55 UTC 2015 Modified Files: src/external/mit/xorg/tools: Makefile Removed Files: src/external/mit/xorg/tools/gen_matypes: Makefile Makefile.gen_matypes Log Message: remove obsolete tools and comments. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/tools/Makefile cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/tools/gen_matypes/Makefile \ src/external/mit/xorg/tools/gen_matypes/Makefile.gen_matypes Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/tools/Makefile diff -u src/external/mit/xorg/tools/Makefile:1.6 src/external/mit/xorg/tools/Makefile:1.7 --- src/external/mit/xorg/tools/Makefile:1.6 Wed Jun 24 22:20:25 2015 +++ src/external/mit/xorg/tools/Makefile Thu Jul 23 07:36:54 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2015/06/24 22:20:25 matt Exp $ +# $NetBSD: Makefile,v 1.7 2015/07/23 07:36:54 mrg Exp $ .include bsd.own.mk @@ -9,8 +9,6 @@ # The rest of the tools can rely upon 'includes' -# XXX pswrap/gen_matypes -- missing - # makekeys is now done src/tools SUBDIR+=bdftopcf fc-cache ucs2any SUBDIR+=mkfontscale .WAIT xkbcomp
CVS commit: src
Module Name:src Committed By: mrg Date: Thu Jul 23 08:04:05 UTC 2015 Modified Files: src: BUILDING Makefile src/compat: compatsubdir.mk src/crypto/external/bsd/openssh: Makefile.inc src/distrib/sets: mkvars.mk sets.subr src/doc: BUILDING.mdoc HACKS src/etc: Makefile Makefile.params src/etc/mtree: Makefile src/external/mit: Makefile src/external/mit/xorg/bin/xedit/lisp: Makefile src/external/mit/xorg/lib/libX11: Makefile.libx11 src/external/mit/xorg/lib/libXrender: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile src/external/mit/xorg/server/xorg-server/os: Makefile src/external/mit/xorg/tools/mkfontscale: Makefile src/share/man/man5: mk.conf.5 src/share/mk: bsd.README bsd.own.mk bsd.x11.mk src/tools: Makefile Removed Files: src/etc/mtree: NetBSD.dist.XFree86 src/x11: Makefile TODO src/x11/Xserver: Makefile Makefile.common Makefile.serverlib src/x11/Xserver/GL: Makefile src/x11/Xserver/GL/GLcore: Makefile Makefile.GLcore src/x11/Xserver/GL/GLcore/module: Makefile src/x11/Xserver/GL/dri: Makefile src/x11/Xserver/GL/dri/mga_dri: Makefile shlib_version src/x11/Xserver/GL/dri/radeon_dri: Makefile shlib_version src/x11/Xserver/GL/glx: Makefile Makefile.glx src/x11/Xserver/GL/glx/module: Makefile src/x11/Xserver/Xext: Makefile Makefile.ext src/x11/Xserver/Xext/ext: Makefile src/x11/Xserver/Xext/extmod: Makefile src/x11/Xserver/Xext/exts: Makefile src/x11/Xserver/Xfont: Makefile src/x11/Xserver/Xfont/bitmap: Makefile src/x11/Xserver/Xfont/freetype: Makefile src/x11/Xserver/Xfont/speedo: Makefile src/x11/Xserver/Xfont/type1: Makefile src/x11/Xserver/Xfont/xtt: Makefile src/x11/Xserver/Xserver: Makefile Makefile.Xserver src/x11/Xserver/Xserver/X68k: Makefile X68k.c src/x11/Xserver/Xserver/XF68_FBDev: XF68_FBDev.c src/x11/Xserver/Xserver/XF68_SVGA: XF68_SVGA.c src/x11/Xserver/Xserver/XF68_W32: XF68_W32.c src/x11/Xserver/Xserver/XFree86: Makefile XFree86.c src/x11/Xserver/Xserver/XalphaNetBSD: Makefile XalphaNetBSD.c src/x11/Xserver/Xserver/Xamiga: Makefile Xamiga.c src/x11/Xserver/Xserver/Xarm32VIDC: Makefile Xarm32VIDC.c src/x11/Xserver/Xserver/XdecNetBSD: Makefile XdecNetBSD.c src/x11/Xserver/Xserver/Xdmx: Makefile Xdmx.c src/x11/Xserver/Xserver/Xdreamcast: Makefile Xdreamcast.c src/x11/Xserver/Xserver/Xews4800mips: Makefile Xews4800mips.c src/x11/Xserver/Xserver/Xhpc: Makefile Xhpc.c src/x11/Xserver/Xserver/Xmac68k: Makefile Xmac68k.c src/x11/Xserver/Xserver/Xmacppc: Makefile Xmacppc.c src/x11/Xserver/Xserver/Xnest: Makefile Xnest.c src/x11/Xserver/Xserver/Xnewsmips: Makefile Xnewsmips.c src/x11/Xserver/Xserver/Xprt: Makefile Xprt.c src/x11/Xserver/Xserver/Xsun: Makefile Xsun.c src/x11/Xserver/Xserver/Xsun24: Makefile Xsun24.c src/x11/Xserver/Xserver/XsunMono: Makefile XsunMono.c src/x11/Xserver/Xserver/Xvfb: Makefile Xvfb.c src/x11/Xserver/afb: Makefile Makefile.afb src/x11/Xserver/afb/afb: Makefile src/x11/Xserver/afb/afbmod: Makefile src/x11/Xserver/cfb: Makefile Makefile.cfb src/x11/Xserver/cfb/module: Makefile src/x11/Xserver/cfb16: Makefile src/x11/Xserver/cfb16/module: Makefile src/x11/Xserver/cfb24: Makefile src/x11/Xserver/cfb24/module: Makefile src/x11/Xserver/cfb32: Makefile src/x11/Xserver/cfb32/module: Makefile src/x11/Xserver/dbe: Makefile Makefile.dbe src/x11/Xserver/dbe/module: Makefile src/x11/Xserver/dix: Makefile src/x11/Xserver/dix/xpstubs: Makefile src/x11/Xserver/fb: Makefile Makefile.fb src/x11/Xserver/fb/module: Makefile src/x11/Xserver/fontbase: Makefile src/x11/Xserver/hw: Makefile src/x11/Xserver/hw/dmx: Makefile src/x11/Xserver/hw/dmx/bin: Makefile src/x11/Xserver/hw/dmx/bin/dmxaddinput: Makefile src/x11/Xserver/hw/dmx/bin/dmxaddscreen: Makefile src/x11/Xserver/hw/dmx/bin/dmxreconfig: Makefile src/x11/Xserver/hw/dmx/bin/dmxresize: Makefile src/x11/Xserver/hw/dmx/bin/dmxrminput: Makefile src/x11/Xserver/hw/dmx/bin/dmxrmscreen: Makefile src/x11/Xserver/hw/dmx/bin/dmxtodmx: Makefile src/x11/Xserver/hw/dmx/bin/dmxwininfo: Makefile src/x11/Xserver/hw/dmx/bin/evi: Makefile src/x11/Xserver/hw/dmx/bin/res: Makefile src/x11/Xserver/hw/dmx/bin/vdltodmx: Makefile src/x11/Xserver/hw/dmx/bin/xbell: Makefile
CVS import: xsrc/external/mit/rstart/dist
Module Name:xsrc Committed By: mrg Date: Thu Jul 23 07:10:06 UTC 2015 Update of /cvsroot/xsrc/external/mit/rstart/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1174 Log Message: initial import of rstart-1.0.5 Status: Vendor Tag: xorg Release Tags: rstart-1-0-5 N xsrc/external/mit/rstart/dist/server.os2 N xsrc/external/mit/rstart/dist/INSTALL N xsrc/external/mit/rstart/dist/config.h.in N xsrc/external/mit/rstart/dist/ChangeLog N xsrc/external/mit/rstart/dist/configure.ac N xsrc/external/mit/rstart/dist/server.c N xsrc/external/mit/rstart/dist/config.sub N xsrc/external/mit/rstart/dist/auth.c N xsrc/external/mit/rstart/dist/Makefile.in N xsrc/external/mit/rstart/dist/config.guess N xsrc/external/mit/rstart/dist/COPYING N xsrc/external/mit/rstart/dist/server.h N xsrc/external/mit/rstart/dist/Makefile.am N xsrc/external/mit/rstart/dist/aclocal.m4 N xsrc/external/mit/rstart/dist/missing N xsrc/external/mit/rstart/dist/install-sh N xsrc/external/mit/rstart/dist/depcomp N xsrc/external/mit/rstart/dist/configure N xsrc/external/mit/rstart/dist/README N xsrc/external/mit/rstart/dist/scripts/rstartd.in N xsrc/external/mit/rstart/dist/scripts/Makefile.am N xsrc/external/mit/rstart/dist/scripts/config.in N xsrc/external/mit/rstart/dist/scripts/Makefile.in N xsrc/external/mit/rstart/dist/scripts/rstart.in N xsrc/external/mit/rstart/dist/specs/Makefile.in N xsrc/external/mit/rstart/dist/specs/rstart.ms N xsrc/external/mit/rstart/dist/specs/fix.awk N xsrc/external/mit/rstart/dist/specs/tmac.rfc N xsrc/external/mit/rstart/dist/specs/Makefile.am N xsrc/external/mit/rstart/dist/specs/fix.nawk N xsrc/external/mit/rstart/dist/specs/rstartd.txt N xsrc/external/mit/rstart/dist/specs/fix.sed N xsrc/external/mit/rstart/dist/samples/Makefile.in N xsrc/external/mit/rstart/dist/samples/Makefile.am N xsrc/external/mit/rstart/dist/samples/contexts.odt1/openwindows2 N xsrc/external/mit/rstart/dist/samples/contexts.odt1/@List N xsrc/external/mit/rstart/dist/samples/contexts.odt1/openwindows3 N xsrc/external/mit/rstart/dist/samples/contexts.odt1/x11r5 N xsrc/external/mit/rstart/dist/samples/contexts.odt1/odt1 N xsrc/external/mit/rstart/dist/samples/contexts.odt1/default N xsrc/external/mit/rstart/dist/samples/contexts.odt1/@Aliases N xsrc/external/mit/rstart/dist/samples/contexts.odt1/x11r6 N xsrc/external/mit/rstart/dist/samples/commands/ListGenericCommands N xsrc/external/mit/rstart/dist/samples/commands/ListContexts N xsrc/external/mit/rstart/dist/samples/commands/@List N xsrc/external/mit/rstart/dist/samples/commands/odt1/LoadMonitor N xsrc/external/mit/rstart/dist/samples/commands/odt1/@List N xsrc/external/mit/rstart/dist/samples/commands/odt1/Terminal N xsrc/external/mit/rstart/dist/samples/commands/x11r5/LoadMonitor N xsrc/external/mit/rstart/dist/samples/commands/x11r5/@List N xsrc/external/mit/rstart/dist/samples/commands/x11r5/Terminal N xsrc/external/mit/rstart/dist/samples/commands/openwindows3/LoadMonitor N xsrc/external/mit/rstart/dist/samples/commands/openwindows3/Terminal N xsrc/external/mit/rstart/dist/samples/commands/openwindows3/@List N xsrc/external/mit/rstart/dist/samples/commands/openwindows2/LoadMonitor N xsrc/external/mit/rstart/dist/samples/commands/openwindows2/@List N xsrc/external/mit/rstart/dist/samples/commands/openwindows2/Terminal N xsrc/external/mit/rstart/dist/commands/ListContexts N xsrc/external/mit/rstart/dist/commands/@List N xsrc/external/mit/rstart/dist/commands/ListGenericCommands N xsrc/external/mit/rstart/dist/commands/Makefile.in N xsrc/external/mit/rstart/dist/commands/Makefile.am N xsrc/external/mit/rstart/dist/commands/x11r6/LoadMonitor N xsrc/external/mit/rstart/dist/commands/x11r6/Terminal N xsrc/external/mit/rstart/dist/commands/x11r6/@List N xsrc/external/mit/rstart/dist/contexts/Makefile.am N xsrc/external/mit/rstart/dist/contexts/default N xsrc/external/mit/rstart/dist/contexts/Makefile.in N xsrc/external/mit/rstart/dist/contexts/x11r6.in N xsrc/external/mit/rstart/dist/contexts/@Aliases N xsrc/external/mit/rstart/dist/contexts/@List N xsrc/external/mit/rstart/dist/man/rstartd.man N xsrc/external/mit/rstart/dist/man/Makefile.am N xsrc/external/mit/rstart/dist/man/rstart.man N xsrc/external/mit/rstart/dist/man/Makefile.in No conflicts created by this import
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Thu Jul 23 07:44:46 UTC 2015
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
add rstart and showfont.
To generate a diff of this commit:
cvs rdiff -u -r1.860 -r1.861 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.860 src/share/mk/bsd.own.mk:1.861
--- src/share/mk/bsd.own.mk:1.860 Thu Jul 23 05:44:26 2015
+++ src/share/mk/bsd.own.mk Thu Jul 23 07:44:46 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.860 2015/07/23 05:44:26 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.861 2015/07/23 07:44:46 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1286,7 +1286,8 @@ X11SRCDIR.${_proto}proto?= ${X11SRCDIRM
glu glw mesa-demos MesaGLUT MesaLib MesaLib7 \
ico iceauth listres lndir \
luit xproxymanagementprotocol mkfontdir oclock proxymngr rgb \
- setxkbmap smproxy twm viewres x11perf xauth xcalc xclipboard \
+ rstart setxkbmap showfont smproxy twm viewres \
+ x11perf xauth xcalc xclipboard \
xclock xcmsdb xconsole xditview xdpyinfo xdriinfo xdm \
xfd xf86dga xfindproxy xfontsel xfwp xgamma xgc xhost xinit \
xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xmessage \
CVS import: xsrc/external/mit/showfont/dist
Module Name:xsrc Committed By: mrg Date: Thu Jul 23 07:10:07 UTC 2015 Update of /cvsroot/xsrc/external/mit/showfont/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21823 Log Message: initial import of showfont-1.0.5 Status: Vendor Tag: xorg Release Tags: showfont-1-0-5 N xsrc/external/mit/showfont/dist/README N xsrc/external/mit/showfont/dist/config.h.in N xsrc/external/mit/showfont/dist/INSTALL N xsrc/external/mit/showfont/dist/config.guess N xsrc/external/mit/showfont/dist/config.sub N xsrc/external/mit/showfont/dist/COPYING N xsrc/external/mit/showfont/dist/configure N xsrc/external/mit/showfont/dist/Makefile.in N xsrc/external/mit/showfont/dist/compile N xsrc/external/mit/showfont/dist/ChangeLog N xsrc/external/mit/showfont/dist/aclocal.m4 N xsrc/external/mit/showfont/dist/configure.ac N xsrc/external/mit/showfont/dist/showfont.c N xsrc/external/mit/showfont/dist/install-sh N xsrc/external/mit/showfont/dist/depcomp N xsrc/external/mit/showfont/dist/missing N xsrc/external/mit/showfont/dist/Makefile.am N xsrc/external/mit/showfont/dist/man/Makefile.am N xsrc/external/mit/showfont/dist/man/Makefile.in N xsrc/external/mit/showfont/dist/man/showfont.man No conflicts created by this import
CVS import: xsrc/external/mit/mkcfm/dist
Module Name:xsrc Committed By: mrg Date: Thu Jul 23 07:10:04 UTC 2015 Update of /cvsroot/xsrc/external/mit/mkcfm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25746 Log Message: initial import of mkcfm-1.0.1 Status: Vendor Tag: xorg Release Tags: mkcfm-1-0-1 N xsrc/external/mit/mkcfm/dist/mkinstalldirs N xsrc/external/mit/mkcfm/dist/config.guess N xsrc/external/mit/mkcfm/dist/missing N xsrc/external/mit/mkcfm/dist/NEWS N xsrc/external/mit/mkcfm/dist/config.h.in N xsrc/external/mit/mkcfm/dist/README N xsrc/external/mit/mkcfm/dist/mkcfm.c N xsrc/external/mit/mkcfm/dist/COPYING N xsrc/external/mit/mkcfm/dist/Makefile.am N xsrc/external/mit/mkcfm/dist/AUTHORS N xsrc/external/mit/mkcfm/dist/compile N xsrc/external/mit/mkcfm/dist/depcomp N xsrc/external/mit/mkcfm/dist/config.sub N xsrc/external/mit/mkcfm/dist/ChangeLog N xsrc/external/mit/mkcfm/dist/install-sh N xsrc/external/mit/mkcfm/dist/INSTALL N xsrc/external/mit/mkcfm/dist/configure N xsrc/external/mit/mkcfm/dist/aclocal.m4 N xsrc/external/mit/mkcfm/dist/mkcfm.man N xsrc/external/mit/mkcfm/dist/Makefile.in N xsrc/external/mit/mkcfm/dist/configure.ac No conflicts created by this import
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Thu Jul 23 07:34:38 UTC 2015
Added Files:
src/external/mit/xorg/bin/rstart: Makefile Makefile.rstart
src/external/mit/xorg/bin/rstart/commands: Makefile
src/external/mit/xorg/bin/rstart/commands/x11r6: Makefile
src/external/mit/xorg/bin/rstart/contexts: Makefile
src/external/mit/xorg/bin/showfont: Makefile
Log Message:
copy reachovers and mostly update for modern xorg. showfont builds
but rstart doesn't quite yet...
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/rstart/Makefile \
src/external/mit/xorg/bin/rstart/Makefile.rstart
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/rstart/commands/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/bin/rstart/commands/x11r6/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/rstart/contexts/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/showfont/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/mit/xorg/bin/rstart/Makefile
diff -u /dev/null src/external/mit/xorg/bin/rstart/Makefile:1.1
--- /dev/null Thu Jul 23 07:34:38 2015
+++ src/external/mit/xorg/bin/rstart/Makefile Thu Jul 23 07:34:38 2015
@@ -0,0 +1,41 @@
+# $NetBSD: Makefile,v 1.1 2015/07/23 07:34:38 mrg Exp $
+
+.include bsd.own.mk
+
+PROG= rstartd.real
+SRCS= auth.c server.c
+RSTARTDBINDIR= ${X11ROOTDIR}/libexec
+RSTARTCONFIGDIR= ${X11ETCDIR}/rstart
+
+CPPFLAGS.server.c= -DSERVERNAME=\rstartd\ \
+ -DDEFAULT_CONFIG=\${RSTARTCONFIGDIR}/config\
+
+MAN= rstart.1 rstartd.1
+
+X11EXTRAMANDEFS+= -e 's,RSTARTCONFIGDIR,${RSTARTCONFIGDIR},g'
+
+SEDCMD= sed -e 's/@RSH@/ssh/' -e 's/@rstartdir@/${RSTARTCONFIGDIR}/'
+
+rstart: rstart.in
+ ${SEDCMD} ${.IMPSRC} ${.TARGET}
+rstartd: rstartd.in
+ ${SEDCMD} ${.IMPSRC} ${.TARGET}
+config: config.in
+ ${SEDCMD} ${.IMPSRC} ${.TARGET}
+
+SCRIPTS= rstart rstartd
+SCRIPTSDIR= ${X11BINDIR}
+CONFIGFILES= config
+FILESDIR= ${RSTARTCONFIGDIR}
+
+SUBDIR= commands contexts
+TARGETS+= configinstall
+
+.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
+.PATH: ${X11SRCDIR.${PROG}}/scripts
+
+.include bsd.x11.mk
+BINDIR= ${RSTARTDBINDIR}
+.include bsd.prog.mk
+.include bsd.subdir.mk
Index: src/external/mit/xorg/bin/rstart/Makefile.rstart
diff -u /dev/null src/external/mit/xorg/bin/rstart/Makefile.rstart:1.1
--- /dev/null Thu Jul 23 07:34:38 2015
+++ src/external/mit/xorg/bin/rstart/Makefile.rstart Thu Jul 23 07:34:38 2015
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile.rstart,v 1.1 2015/07/23 07:34:38 mrg Exp $
+
+.include bsd.own.mk
+
+.PATH: ${X11SRCDIR.rstart}/${CFDIR}
+FILESDIR= ${X11ETCDIR}/rstart/${CFDIR}
+
+.for _F in ${CFFILES}
+${_F}.sed: ${_F}
+ ${_MKTARGET_CREATE}
+ rm -f ${.TARGET}
+ ${TOOL_SED} ${CFSED} ${.ALLSRC} ${.TARGET}
+
+CONFIGFILES+= ${_F}.sed
+CLEANFILES+= ${_F}.sed
+FILESNAME_${_F}.sed= ${_F}
+.endfor
+
+TARGETS+= configinstall
+
+realall: ${CONFIGFILES}
Index: src/external/mit/xorg/bin/rstart/commands/Makefile
diff -u /dev/null src/external/mit/xorg/bin/rstart/commands/Makefile:1.1
--- /dev/null Thu Jul 23 07:34:38 2015
+++ src/external/mit/xorg/bin/rstart/commands/Makefile Thu Jul 23 07:34:38 2015
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2015/07/23 07:34:38 mrg Exp $
+
+.include bsd.own.mk
+
+CFDIR= commands
+CFFILES= @List ListContexts ListGenericCommands
+CFSED= -e 's,ENVPREFIX,RSTART,g'
+
+CONFIGSYMLINKS= x11r6 ${FILESDIR}/x \
+ x11r6 ${FILESDIR}/x11 \
+
+SUBDIR= x11r6
+
+.include ../Makefile.rstart
+
+.include bsd.x11.mk
+.include bsd.prog.mk
+.include bsd.subdir.mk
Index: src/external/mit/xorg/bin/rstart/commands/x11r6/Makefile
diff -u /dev/null src/external/mit/xorg/bin/rstart/commands/x11r6/Makefile:1.1
--- /dev/null Thu Jul 23 07:34:38 2015
+++ src/external/mit/xorg/bin/rstart/commands/x11r6/Makefile Thu Jul 23 07:34:38 2015
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2015/07/23 07:34:38 mrg Exp $
+
+.include bsd.own.mk
+
+CFDIR= commands/x11r6
+CFFILES= @List LoadMonitor Terminal
+CFSED= -e 's,ENVPREFIX,RSTART,g'
+
+.include ../../Makefile.rstart
+
+.include bsd.x11.mk
+.include bsd.prog.mk
Index: src/external/mit/xorg/bin/rstart/contexts/Makefile
diff -u /dev/null src/external/mit/xorg/bin/rstart/contexts/Makefile:1.1
--- /dev/null Thu Jul 23 07:34:38 2015
+++ src/external/mit/xorg/bin/rstart/contexts/Makefile Thu Jul 23 07:34:38 2015
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2015/07/23 07:34:38 mrg Exp $
+
+CFDIR= contexts
+CFFILES= @List default x11r6
+CFSED= -e 's,_PATH,/bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:${X11BINDIR},g' \
+ -e 's,_MANPATH,${X11MANDIR}:/usr/man,g'
+
+CONFIGSYMLINKS= x11r6 ${FILESDIR}/x \
+ x11r6 ${FILESDIR}/x11 \
+
+.include ../Makefile.rstart
+
+.include bsd.x11.mk
+.include bsd.prog.mk
Index: src/external/mit/xorg/bin/showfont/Makefile
diff -u /dev/null src/external/mit/xorg/bin/showfont/Makefile:1.1
---
CVS commit: src/external/mit/xorg/bin/missing-apps
Module Name:src Committed By: mrg Date: Thu Jul 23 07:33:34 UTC 2015 Removed Files: src/external/mit/xorg/bin/missing-apps/dpsexec: Makefile src/external/mit/xorg/bin/missing-apps/dpsinfo: Makefile src/external/mit/xorg/bin/missing-apps/gccmakedep: Makefile src/external/mit/xorg/bin/missing-apps/lndir: Makefile src/external/mit/xorg/bin/missing-apps/makepsres: Makefile src/external/mit/xorg/bin/missing-apps/mkcfm: Makefile src/external/mit/xorg/bin/missing-apps/pswrap: Makefile src/external/mit/xorg/bin/missing-apps/rman: Makefile src/external/mit/xorg/bin/missing-apps/rstart: Makefile Makefile.rstart src/external/mit/xorg/bin/missing-apps/rstart/commands: Makefile src/external/mit/xorg/bin/missing-apps/rstart/commands/x11r6: Makefile src/external/mit/xorg/bin/missing-apps/rstart/contexts: Makefile src/external/mit/xorg/bin/missing-apps/scripts: Makefile src/external/mit/xorg/bin/missing-apps/showfont: Makefile src/external/mit/xorg/bin/missing-apps/texteroids: Makefile Log Message: delete obsolete reachovers. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/dpsexec/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/dpsinfo/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/gccmakedep/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/lndir/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/makepsres/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/mkcfm/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/pswrap/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/rman/Makefile cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/bin/missing-apps/rstart/Makefile \ src/external/mit/xorg/bin/missing-apps/rstart/Makefile.rstart cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/rstart/commands/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/rstart/commands/x11r6/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/rstart/contexts/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/scripts/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/showfont/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/texteroids/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/mtree
Module Name:src Committed By: mrg Date: Thu Jul 23 07:45:44 UTC 2015 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: remove obsolete directories (that are always removed by postinstall at the end of the build.) To generate a diff of this commit: cvs rdiff -u -r1.145 -r1.146 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.145 src/etc/mtree/NetBSD.dist.base:1.146 --- src/etc/mtree/NetBSD.dist.base:1.145 Sun Jun 21 07:45:10 2015 +++ src/etc/mtree/NetBSD.dist.base Thu Jul 23 07:45:44 2015 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.145 2015/06/21 07:45:10 matt Exp $ +# $NetBSD: NetBSD.dist.base,v 1.146 2015/07/23 07:45:44 mrg Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -180,7 +180,6 @@ ./usr/include/g++/tr1 ./usr/include/g++/tr1_impl ./usr/include/g++/tr2 -./usr/include/gcc-4.1 ./usr/include/gcc-4.5 ./usr/include/gcc-4.8 ./usr/include/gssapi @@ -199,7 +198,6 @@ ./usr/include/miscfs/overlay ./usr/include/miscfs/procfs ./usr/include/miscfs/specfs -./usr/include/miscfs/syncfs ./usr/include/miscfs/umapfs ./usr/include/miscfs/union ./usr/include/msdosfs
CVS commit: src/external/mit/xorg/bin/xterm
Module Name:src
Committed By: mrg
Date: Thu Jul 23 09:38:00 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xterm: Makefile
Log Message:
remove some duplication; pointed out by pgoyette.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/bin/xterm/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/mit/xorg/bin/xterm/Makefile
diff -u src/external/mit/xorg/bin/xterm/Makefile:1.14 src/external/mit/xorg/bin/xterm/Makefile:1.15
--- src/external/mit/xorg/bin/xterm/Makefile:1.14 Thu Jul 23 05:45:09 2015
+++ src/external/mit/xorg/bin/xterm/Makefile Thu Jul 23 09:37:59 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2015/07/23 05:45:09 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2015/07/23 09:37:59 mrg Exp $
.include bsd.own.mk
@@ -31,7 +31,7 @@ BUILDSYMLINKS= XTerm-col.ad XTerm-color.
LDADD+= -lXft -lfontconfig -lfreetype -lexpat -lXrender
DPADD+= ${LIBXFT} ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBXRENDER}
-LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXinerama -lXpm -lXext -lX11 -lcurses -lterminfo -lutil
+LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXinerama
DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXINERAMA}
LDADD+= -lXpm -lXext -lX11 -lcurses -lterminfo -lutil
DPADD+= ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBCURSES} ${LIBTERMINFO} ${LIBUTIL}
CVS commit: src/sys/fs/union
Module Name:src
Committed By: hannken
Date: Thu Jul 23 09:45:21 UTC 2015
Modified Files:
src/sys/fs/union: union_vfsops.c
Log Message:
union_unmount: use vfs_vnode_iterator to count attached vnodes.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/fs/union/union_vfsops.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/union/union_vfsops.c
diff -u src/sys/fs/union/union_vfsops.c:1.74 src/sys/fs/union/union_vfsops.c:1.75
--- src/sys/fs/union/union_vfsops.c:1.74 Mon Feb 16 10:22:00 2015
+++ src/sys/fs/union/union_vfsops.c Thu Jul 23 09:45:21 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: union_vfsops.c,v 1.74 2015/02/16 10:22:00 hannken Exp $ */
+/* $NetBSD: union_vfsops.c,v 1.75 2015/07/23 09:45:21 hannken Exp $ */
/*
* Copyright (c) 1994 The Regents of the University of California.
@@ -77,7 +77,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: union_vfsops.c,v 1.74 2015/02/16 10:22:00 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: union_vfsops.c,v 1.75 2015/07/23 09:45:21 hannken Exp $);
#include sys/param.h
#include sys/systm.h
@@ -314,6 +314,15 @@ union_start(struct mount *mp, int flags)
/*
* Free reference to union layer
*/
+static bool
+union_unmount_selector(void *cl, struct vnode *vp)
+{
+ int *count = cl;
+
+ *count += 1;
+ return false;
+}
+
int
union_unmount(struct mount *mp, int mntflags)
{
@@ -335,13 +344,14 @@ union_unmount(struct mount *mp, int mntf
* in the filesystem.
*/
for (freeing = 0; (error = vflush(mp, NULL, 0)) != 0;) {
- struct vnode *vp;
+ struct vnode_iterator *marker;
int n;
/* count #vnodes held on mount list */
n = 0;
- TAILQ_FOREACH(vp, mp-mnt_vnodelist, v_mntvnodes)
- n++;
+ vfs_vnode_iterator_init(mp, marker);
+ vfs_vnode_iterator_next(marker, union_unmount_selector, n);
+ vfs_vnode_iterator_destroy(marker);
/* if this is unchanged then stop */
if (n == freeing)
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Thu Jul 23 08:29:58 UTC 2015
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Fix a bug that I21[01] NVM revision = 3.25 can't be attached.
Reported by MATSUI Yoshihiro.
To generate a diff of this commit:
cvs rdiff -u -r1.343 -r1.344 src/sys/dev/pci/if_wm.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.343 src/sys/dev/pci/if_wm.c:1.344
--- src/sys/dev/pci/if_wm.c:1.343 Thu Jul 23 08:24:07 2015
+++ src/sys/dev/pci/if_wm.c Thu Jul 23 08:29:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.343 2015/07/23 08:24:07 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.344 2015/07/23 08:29:58 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -81,7 +81,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.343 2015/07/23 08:24:07 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.344 2015/07/23 08:29:58 msaitoh Exp $);
#ifdef _KERNEL_OPT
#include opt_net_mpsafe.h
@@ -2120,11 +2120,9 @@ alloc_retry:
sc-sc_flags |= WM_F_PLL_WA_I210;
if ((sc-sc_type == WM_T_I210) wm_nvm_get_flash_presence_i210(sc)) {
/* NVM image release 3.25 has a workaround */
- if ((sc-sc_nvm_ver_major 3)
+ if ((sc-sc_nvm_ver_major 3)
|| ((sc-sc_nvm_ver_major == 3)
- (sc-sc_nvm_ver_minor = 25)))
- return;
- else {
+ (sc-sc_nvm_ver_minor 25))) {
aprint_verbose_dev(sc-sc_dev,
ROM image version %d.%d is older than 3.25\n,
sc-sc_nvm_ver_major, sc-sc_nvm_ver_minor);
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Thu Jul 23 08:24:07 UTC 2015
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
The WM_F_EEPROM_EERDEEWR is not required on iNVM device.
To generate a diff of this commit:
cvs rdiff -u -r1.342 -r1.343 src/sys/dev/pci/if_wm.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.342 src/sys/dev/pci/if_wm.c:1.343
--- src/sys/dev/pci/if_wm.c:1.342 Wed Jul 22 11:14:13 2015
+++ src/sys/dev/pci/if_wm.c Thu Jul 23 08:24:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.342 2015/07/22 11:14:13 knakahara Exp $ */
+/* $NetBSD: if_wm.c,v 1.343 2015/07/23 08:24:07 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -81,7 +81,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.342 2015/07/22 11:14:13 knakahara Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.343 2015/07/23 08:24:07 msaitoh Exp $);
#ifdef _KERNEL_OPT
#include opt_net_mpsafe.h
@@ -2036,7 +2036,7 @@ alloc_retry:
} else {
sc-sc_nvm_wordsize = INVM_SIZE;
sc-sc_flags |= WM_F_EEPROM_INVM;
- sc-sc_flags |= WM_F_EEPROM_EERDEEWR | WM_F_LOCK_SWFW;
+ sc-sc_flags |= WM_F_LOCK_SWFW;
}
break;
default:
CVS commit: src/sys/net
Module Name:src
Committed By: ozaki-r
Date: Thu Jul 23 10:52:34 UTC 2015
Modified Files:
src/sys/net: if_bridge.c
Log Message:
Fix PR 48104
So far bridge cannot receive frames via a member interface when the frames
come from another member interface. So when we assign an IP address to
a member interface, hosts connected to another member interface cannot
ping to the IP address. That behavior isn't expected. See PR 48104 for
more realistic examples of this issue.
The change does:
- drop M_PROMISC before ether_input, which allows a bridge member interface
to receive a frame coming from another bridge member interface
- receive broadcast/multicast frames via all bridge member interfaces,
which is required to receive IPv6 multicast packets destined to a
multicast group belonging to a bridge member interface that is different
from a packet arrival interface
roy@ helped testing of the fix, thanks!
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/net/if_bridge.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/net/if_bridge.c
diff -u src/sys/net/if_bridge.c:1.99 src/sys/net/if_bridge.c:1.100
--- src/sys/net/if_bridge.c:1.99 Mon Jun 1 06:14:43 2015
+++ src/sys/net/if_bridge.c Thu Jul 23 10:52:34 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridge.c,v 1.99 2015/06/01 06:14:43 matt Exp $ */
+/* $NetBSD: if_bridge.c,v 1.100 2015/07/23 10:52:34 ozaki-r Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_bridge.c,v 1.99 2015/06/01 06:14:43 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_bridge.c,v 1.100 2015/07/23 10:52:34 ozaki-r Exp $);
#ifdef _KERNEL_OPT
#include opt_bridge_ipf.h
@@ -1942,9 +1942,10 @@ out:
if (_bif != NULL) {
bridge_release_member(sc, bif);
- if (_ifp != NULL)
+ if (_ifp != NULL) {
+m-m_flags = ~M_PROMISC;
ether_input(_ifp, m);
- else
+ } else
m_freem(m);
return;
}
@@ -1989,10 +1990,10 @@ bridge_broadcast(struct bridge_softc *sc
struct bridge_iflist *bif;
struct mbuf *mc;
struct ifnet *dst_if;
- bool used, bmcast;
+ bool bmcast;
int s;
- used = bmcast = m-m_flags (M_BCAST|M_MCAST);
+ bmcast = m-m_flags (M_BCAST|M_MCAST);
BRIDGE_PSZ_RENTER(s);
LIST_FOREACH(bif, sc-sc_iflist, bif_next) {
@@ -2002,8 +2003,6 @@ bridge_broadcast(struct bridge_softc *sc
BRIDGE_PSZ_REXIT(s);
dst_if = bif-bif_ifp;
- if (dst_if == src_if)
- goto next;
if (bif-bif_flags IFBIF_STP) {
switch (bif-bif_state) {
@@ -2019,28 +2018,33 @@ bridge_broadcast(struct bridge_softc *sc
if ((dst_if-if_flags IFF_RUNNING) == 0)
goto next;
- if (!used LIST_NEXT(bif, bif_next) == NULL) {
- mc = m;
- used = true;
- } else {
+ if (dst_if != src_if) {
mc = m_copym(m, 0, M_COPYALL, M_DONTWAIT);
if (mc == NULL) {
sc-sc_if.if_oerrors++;
goto next;
}
+ bridge_enqueue(sc, dst_if, mc, 1);
}
- bridge_enqueue(sc, dst_if, mc, 1);
+ if (bmcast) {
+ mc = m_copym(m, 0, M_COPYALL, M_DONTWAIT);
+ if (mc == NULL) {
+sc-sc_if.if_oerrors++;
+goto next;
+ }
+
+ mc-m_pkthdr.rcvif = dst_if;
+ mc-m_flags = ~M_PROMISC;
+ ether_input(dst_if, mc);
+ }
next:
bridge_release_member(sc, bif);
BRIDGE_PSZ_RENTER(s);
}
BRIDGE_PSZ_REXIT(s);
- if (bmcast)
- ether_input(src_if, m);
- else if (!used)
- m_freem(m);
+ m_freem(m);
}
static int
CVS commit: src/tests/net/if_bridge
Module Name:src Committed By: ozaki-r Date: Thu Jul 23 11:05:34 UTC 2015 Modified Files: src/tests/net/if_bridge: t_bridge.sh Log Message: Reflect a fix for bridge Due to PR 48104, some tests of ping/ping6 were failed but the tests now should be successful. So reverse atf_check. Bonus: the fix for PR 48104 also fixes another uknown failure. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/tests/net/if_bridge/t_bridge.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/net/if_bridge/t_bridge.sh diff -u src/tests/net/if_bridge/t_bridge.sh:1.9 src/tests/net/if_bridge/t_bridge.sh:1.10 --- src/tests/net/if_bridge/t_bridge.sh:1.9 Wed Jun 10 03:29:37 2015 +++ src/tests/net/if_bridge/t_bridge.sh Thu Jul 23 11:05:34 2015 @@ -1,4 +1,4 @@ -# $NetBSD: t_bridge.sh,v 1.9 2015/06/10 03:29:37 ozaki-r Exp $ +# $NetBSD: t_bridge.sh,v 1.10 2015/07/23 11:05:34 ozaki-r Exp $ # # Copyright (c) 2014 The NetBSD Foundation, Inc. # All rights reserved. @@ -319,14 +319,14 @@ test_ping_member() rump.ifconfig -v shmif0 atf_check -s exit:0 -o ignore rump.ping -q -n -w $TIMEOUT -c 1 $IPBR1 rump.ifconfig -v shmif0 - # It's known to fail. See PR#48104 - atf_check -s not-exit:0 -o ignore rump.ping -q -n -w $TIMEOUT -c 1 $IPBR2 + # Test for PR#48104 + atf_check -s exit:0 -o ignore rump.ping -q -n -w $TIMEOUT -c 1 $IPBR2 rump.ifconfig -v shmif0 export RUMP_SERVER=$SOCK3 rump.ifconfig -v shmif0 - # It's known to fail. See PR#48104 - atf_check -s not-exit:0 -o ignore rump.ping -q -n -w $TIMEOUT -c 1 $IPBR1 + # Test for PR#48104 + atf_check -s exit:0 -o ignore rump.ping -q -n -w $TIMEOUT -c 1 $IPBR1 rump.ifconfig -v shmif0 atf_check -s exit:0 -o ignore rump.ping -q -n -w $TIMEOUT -c 1 $IPBR2 rump.ifconfig -v shmif0 @@ -340,16 +340,15 @@ test_ping6_member() rump.ifconfig -v shmif0 atf_check -s exit:0 -o ignore ping6 -q -n -X $TIMEOUT -c 1 $IP6BR1 rump.ifconfig -v shmif0 - # It's known to fail. See PR#48104 - atf_check -s not-exit:0 -o ignore ping6 -q -n -X $TIMEOUT -c 1 $IP6BR2 + # Test for PR#48104 + atf_check -s exit:0 -o ignore ping6 -q -n -X $TIMEOUT -c 1 $IP6BR2 rump.ifconfig -v shmif0 export RUMP_SERVER=$SOCK3 rump.ifconfig -v shmif0 - # It's known to fail. See PR#48104 - atf_check -s not-exit:0 -o ignore ping6 -q -n -X $TIMEOUT -c 1 $IP6BR1 + # Test for PR#48104 + atf_check -s exit:0 -o ignore ping6 -q -n -X $TIMEOUT -c 1 $IP6BR1 rump.ifconfig -v shmif0 - # FIXME: it doesn't work for some reason atf_check -s exit:0 -o ignore ping6 -q -n -X $TIMEOUT -c 1 $IP6BR2 rump.ifconfig -v shmif0
