Re: svn commit: r259094 - head/etc/rc.d
Hi Peter, Peter Wemm wrote in <201312080555.rb85tu8w016...@svn.freebsd.org>: pe> Author: peter pe> Date: Sun Dec 8 05:55:55 2013 pe> New Revision: 259094 pe> URL: http://svnweb.freebsd.org/changeset/base/259094 pe> pe> Log: pe> Rev 256256 had an undocumented side effect of breaking existing behavior pe> for ipv6 jails. pe> pe> Among the harmful side effects included putting a route to an entire /64 pe> onto an interface even if you were in a smaller network - eg: /80. pe> This broke the freebsd.org cluster hosted at ISC which has /80 networks. pe> pe> Modified: pe> head/etc/rc.d/jail The reason why it was changed is that I think an IPv6 GUA with no prefix length information should always be interpret as a /64 because the other tools like ifconfig do so. IPv6 is designed to always use a correct prefix length and avoid using a /128 for aliases. Is there a problem with specifying a /80 address to ip6.addr if a box is on a /80 network? I know many people are using 2001:db8::1/80 + 2001:db8::2/128 on the same interface similar to 192.168.0.1/24 + 192.168.0.2/32. It certainly works, but the both should be /80 -- Hiroki pgpAdpVUzbmd5.pgp Description: PGP signature
svn commit: r259125 - head/sys/arm/ti/am335x
Author: loos Date: Mon Dec 9 11:33:45 2013 New Revision: 259125 URL: http://svnweb.freebsd.org/changeset/base/259125 Log: Fix a few typos on the scm (control module) pin mux definitions. Approved by: adrian (mentor) Modified: head/sys/arm/ti/am335x/am335x_scm_padconf.c Modified: head/sys/arm/ti/am335x/am335x_scm_padconf.c == --- head/sys/arm/ti/am335x/am335x_scm_padconf.c Mon Dec 9 08:39:33 2013 (r259124) +++ head/sys/arm/ti/am335x/am335x_scm_padconf.c Mon Dec 9 11:33:45 2013 (r259125) @@ -170,8 +170,8 @@ const struct ti_scm_padconf ti_padconf_d _PIN(0x948, "MDIO", 0, 7, "mdio_data", "timer6", "uart5_rxd", "uart3_ctsn", "mmc0_sdcd","mmc1_cmd", "mmc2_cmd","gpio0_0"), _PIN(0x94c, "MDC", 1, 7, "mdio_clk", "timer5", "uart5_txd", "uart3_rtsn", "mmc0_sdwp", "mmc1_clk", "mmc2_clk", "gpio0_1"), _PIN(0x950, "SPI0_SCLK",2, 7, "spi0_sclk", "uart2_rxd", "I2C2_SDA", "ehrpwm0A", "pr1_uart0_cts_n", "pr1_edio_sof", "EMU2", "gpio0_2"), - _PIN(0x954, "SPI0_D0", 3, 7, "spi0_d0", "uart2_txd", "i2C2_SCL", "ehrpwm0B", "pr1_uart0_rts_n", "pr1_edio_latch_in", "EMU3", "gpio0_3"), - _PIN(0x958, "SPIO_D1", 4, 7, "spi0_d1", "mmc1_sdwp", "I2C1_SDA", "ehrpwm0_tripzone_input", "pr1_uart0_rxd", "pr1_edio_data_in0", "pr1_edio_data_out0", "gpio0_4"), + _PIN(0x954, "SPI0_D0", 3, 7, "spi0_d0", "uart2_txd", "I2C2_SCL", "ehrpwm0B", "pr1_uart0_rts_n", "pr1_edio_latch_in", "EMU3", "gpio0_3"), + _PIN(0x958, "SPI0_D1", 4, 7, "spi0_d1", "mmc1_sdwp", "I2C1_SDA", "ehrpwm0_tripzone_input", "pr1_uart0_rxd", "pr1_edio_data_in0", "pr1_edio_data_out0", "gpio0_4"), _PIN(0x95c, "SPI0_CS0", 5, 7, "spi0_cs0", "mmc2_sdwp", "I2C1_SCL", "ehrpwm0_synci", "pr1_uart0_txd", "pr1_edio_data_in1", "pr1_edio_data_out1", "gpio0_5"), _PIN(0x960, "SPI0_CS1", 6, 7, "spi0_cs1", "uart3_rxd", "eCAP1_in_PWM1_out", "mcc0_pow", "xdm_event_intr2", "mmc0_sdcd", "EMU4", "gpio0_6"), _PIN(0x964, "ECAP0_IN_PWM0_OUT",7, 7, "eCAP0_in_PWM0_out", "uart3_txd", "spi1_cs1", "pr1_ecap0_ecap_capin_apwm_o", "spi1_sclk", "mmc0_sdwp", "xdma_event_intr2", "gpio0_7"), @@ -180,7 +180,7 @@ const struct ti_scm_padconf ti_padconf_d _PIN(0x970, "UART0_rxd",42, 7, "uart0_rxd", "spi1_cs0", "dcan0_tx", "I2C2_SDA", "eCAP2_in_PWM2_out", "pr1_pru1_pru_r30_14", "pr1_pru1_pru_r31_14", "gpio1_10"), _PIN(0x974, "UART0_txd",43, 7, "uart0_txd", "spi1_cs1", "dcan0_rx", "I2C2_SCL", "eCAP1_in_PWM1_out", "pr1_pru1_pru_r30_15", "pr1_pru1_pru_r31_15", "gpio1_11"), _PIN(0x978, "UART1_CTSn", 12, 7, "uart1_ctsn", "timer6_mux1", "dcan0_tx", "I2C2_SDA", "spi1_cs0", "pr1_uart0_cts_n", "pr1_edc_latch0_in", "gpio0_12"), - _PIN(0x97c, "UART1_RTSn", 13, 7, "uart1_rtsn", "timer5_mux1", "dcan0_rx", "I2C2_SCL", "spi1_cs1", "pr1_uart0_rts_n", "pr1_edc_latch1_in", "gpio0_13"), + _PIN(0x97c, "UART1_RTSn", 13, 7, "uart1_rtsn", "timer5_mux1", "dcan0_rx", "I2C2_SCL", "spi1_cs1", "pr1_uart0_rts_n", "pr1_edc_latch1_in", "gpio0_13"), _PIN(0x980, "UART1_RXD",14, 7, "uart1_rxd", "mmc1_sdwp", "dcan1_tx", "I2C1_SDA", NULL, "pr1_uart0_rxd", "pr1_pru1_pru_r31_16", "gpio0_14"), _PIN(0x984, "UART1_TXD",15, 7, "uart1_txd", "mmc2_sdwp", "dcan1_rx", "I2C1_SCL", NULL, "pr1_uart0_txd", "pr1_pru0_pru_r31_16", "gpio0_15"), _PIN(0x988, "I2C0_SDA", 101, 7, "I2C0_SDA", "timer4", "uart2_ctsn", "eCAP2_in_PWM2_out", NULL, NULL, NULL, "gpio3_5"), ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259126 - head/sys/arm/ti
Author: loos
Date: Mon Dec 9 11:51:17 2013
New Revision: 259126
URL: http://svnweb.freebsd.org/changeset/base/259126
Log:
Activate the device before attempt to access any of its registers. Without
this change we may end up with a panic (Fatal kernel mode data abort:
'External Non-Linefetch Abort (S)') as described in
http://e2e.ti.com/support/arm/sitara_arm/f/791/t/276862.aspx.
It is now possible to bring up I2C1 and I2C2 on BBB.
Approved by: adrian (mentor)
Modified:
head/sys/arm/ti/ti_i2c.c
Modified: head/sys/arm/ti/ti_i2c.c
==
--- head/sys/arm/ti/ti_i2c.cMon Dec 9 11:33:45 2013(r259125)
+++ head/sys/arm/ti/ti_i2c.cMon Dec 9 11:51:17 2013(r259126)
@@ -1076,20 +1076,20 @@ ti_i2c_attach(device_t dev)
goto out;
}
- /* XXXOMAP3: FIXME get proper revision here */
- /* First read the version number of the I2C module */
- sc->sc_rev = ti_i2c_read_2(sc, I2C_REG_REVNB_HI) & 0xff;
-
- device_printf(dev, "I2C revision %d.%d\n", sc->sc_rev >> 4,
- sc->sc_rev & 0xf);
-
- /* Activate the H/W */
+ /* First we _must_ activate the H/W */
err = ti_i2c_activate(dev);
if (err) {
device_printf(dev, "ti_i2c_activate failed\n");
goto out;
}
+ /* XXXOMAP3: FIXME get proper revision here */
+ /* Read the version number of the I2C module */
+ sc->sc_rev = ti_i2c_read_2(sc, I2C_REG_REVNB_HI) & 0xff;
+
+ device_printf(dev, "I2C revision %d.%d\n", sc->sc_rev >> 4,
+ sc->sc_rev & 0xf);
+
/* activate the interrupt */
err = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_MISC | INTR_MPSAFE,
NULL, ti_i2c_intr, sc, &sc->sc_irq_h);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259127 - head/sys/arm/broadcom/bcm2835
Author: loos
Date: Mon Dec 9 12:01:17 2013
New Revision: 259127
URL: http://svnweb.freebsd.org/changeset/base/259127
Log:
Bring the RPi I2C driver in line with ti_i2c. Make it treat any slave
address as a 7-bit address.
Approved by: adrian (mentor)
Modified:
head/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
Modified: head/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
==
--- head/sys/arm/broadcom/bcm2835/bcm2835_bsc.c Mon Dec 9 11:51:17 2013
(r259126)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_bsc.c Mon Dec 9 12:01:17 2013
(r259127)
@@ -404,7 +404,7 @@ bcm_bsc_transfer(device_t dev, struct ii
for (i = 0; i < nmsgs; i++) {
/* Write the slave address. */
- BCM_BSC_WRITE(sc, BCM_BSC_SLAVE, (msgs[i].slave >> 1) & 0x7f);
+ BCM_BSC_WRITE(sc, BCM_BSC_SLAVE, msgs[i].slave);
/* Write the data length. */
BCM_BSC_WRITE(sc, BCM_BSC_DLEN, msgs[i].len);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259129 - in head/sys/dev/vt: . font
Author: ray
Date: Mon Dec 9 15:01:34 2013
New Revision: 259129
URL: http://svnweb.freebsd.org/changeset/base/259129
Log:
Respect SC_NO_CUTPASTE option. It disable mouse cursor and cut/paste support
for vt(9). Note: /dev/sysmouse not affected.
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/dev/vt/font/vt_mouse_cursor.c
head/sys/dev/vt/vt.h
head/sys/dev/vt/vt_buf.c
head/sys/dev/vt/vt_core.c
head/sys/dev/vt/vt_sysmouse.c
Modified: head/sys/dev/vt/font/vt_mouse_cursor.c
==
--- head/sys/dev/vt/font/vt_mouse_cursor.c Mon Dec 9 13:44:07 2013
(r259128)
+++ head/sys/dev/vt/font/vt_mouse_cursor.c Mon Dec 9 15:01:34 2013
(r259129)
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
#include
+#ifndef SC_NO_CUTPASTE
struct mouse_cursor vt_default_mouse_pointer = {
.map = {
0x00, /* "__ " */
@@ -66,3 +67,4 @@ struct mouse_cursor vt_default_mouse_poi
.w = 8,
.h = 13,
};
+#endif
Modified: head/sys/dev/vt/vt.h
==
--- head/sys/dev/vt/vt.hMon Dec 9 13:44:07 2013(r259128)
+++ head/sys/dev/vt/vt.hMon Dec 9 15:01:34 2013(r259129)
@@ -181,15 +181,17 @@ void vtbuf_init(struct vt_buf *, const t
void vtbuf_grow(struct vt_buf *, const term_pos_t *, int);
void vtbuf_putchar(struct vt_buf *, const term_pos_t *, term_char_t);
void vtbuf_cursor_position(struct vt_buf *, const term_pos_t *);
-void vtbuf_mouse_cursor_position(struct vt_buf *vb, int col, int row);
-void vtbuf_cursor_visibility(struct vt_buf *, int);
void vtbuf_scroll_mode(struct vt_buf *vb, int yes);
void vtbuf_undirty(struct vt_buf *, term_rect_t *, struct vt_bufmask *);
void vtbuf_sethistory_size(struct vt_buf *, int);
-int vtbuf_set_mark(struct vt_buf *vb, int type, int col, int row);
int vtbuf_iscursor(struct vt_buf *vb, int row, int col);
+void vtbuf_cursor_visibility(struct vt_buf *, int);
+#ifndef SC_NO_CUTPASTE
+void vtbuf_mouse_cursor_position(struct vt_buf *vb, int col, int row);
+int vtbuf_set_mark(struct vt_buf *vb, int type, int col, int row);
int vtbuf_get_marked_len(struct vt_buf *vb);
void vtbuf_extract_marked(struct vt_buf *vb, term_char_t *buf, int sz);
+#endif
#defineVTB_MARK_NONE 0
#defineVTB_MARK_END1
@@ -389,12 +391,14 @@ struct vt_font {
unsigned int vf_refcount;
};
+#ifndef SC_NO_CUTPASTE
struct mouse_cursor {
uint8_t map[64 * 64 / 8];
uint8_t mask[64 * 64 / 8];
uint8_t w;
uint8_t h;
};
+#endif
const uint8_t *vtfont_lookup(const struct vt_font *vf, term_char_t c);
struct vt_font *vtfont_ref(struct vt_font *vf);
@@ -403,8 +407,10 @@ int vtfont_load(vfnt_t *f, struct vt_f
/* Sysmouse. */
void sysmouse_process_event(mouse_info_t *mi);
+#ifndef SC_NO_CUTPASTE
void vt_mouse_event(int type, int x, int y, int event, int cnt);
void vt_mouse_state(int show);
+#endif
#defineVT_MOUSE_SHOW 1
#defineVT_MOUSE_HIDE 0
Modified: head/sys/dev/vt/vt_buf.c
==
--- head/sys/dev/vt/vt_buf.cMon Dec 9 13:44:07 2013(r259128)
+++ head/sys/dev/vt/vt_buf.cMon Dec 9 15:01:34 2013(r259129)
@@ -135,6 +135,7 @@ vthistory_getpos(const struct vt_buf *vb
*offset = vb->vb_roffset;
}
+#ifndef SC_NO_CUTPASTE /* Only mouse support use it now. */
/* Translate current view row number to history row. */
static int
vtbuf_wth(struct vt_buf *vb, int row)
@@ -142,6 +143,7 @@ vtbuf_wth(struct vt_buf *vb, int row)
return ((vb->vb_roffset + row) % vb->vb_history_size);
}
+#endif
/* Translate history row to current view row number. */
static int
@@ -531,6 +533,7 @@ vtbuf_cursor_position(struct vt_buf *vb,
}
}
+#ifndef SC_NO_CUTPASTE
void
vtbuf_mouse_cursor_position(struct vt_buf *vb, int col, int row)
{
@@ -691,6 +694,7 @@ vtbuf_set_mark(struct vt_buf *vb, int ty
vtbuf_flush_mark(vb);
return (1);
}
+#endif
void
vtbuf_cursor_visibility(struct vt_buf *vb, int yes)
Modified: head/sys/dev/vt/vt_core.c
==
--- head/sys/dev/vt/vt_core.c Mon Dec 9 13:44:07 2013(r259128)
+++ head/sys/dev/vt/vt_core.c Mon Dec 9 15:01:34 2013(r259129)
@@ -127,7 +127,9 @@ extern unsigned char vt_logo_image[];
/* Font. */
extern struct vt_font vt_font_default;
+#ifndef SC_NO_CUTPASTE
extern struct mouse_cursor vt_default_mouse_pointer;
+#endif
static int signal_vt_rel(struct vt_window *);
static int signal_vt_acq(struct vt_window *);
@@ -689,12 +691,14 @@ vt_flush(struct vt_device *vd)
struct vt_window *vw = vd->vd_curwindow;
struct vt_font *vf = vw->vw_font;
struct vt_bufmask tmask;
- struct m
svn commit: r259130 - head/sys/dev/vt
Author: ray
Date: Mon Dec 9 15:28:34 2013
New Revision: 259130
URL: http://svnweb.freebsd.org/changeset/base/259130
Log:
o Compat options have to be defined before sys/ioccom.h included, so move
inclusion of right after sys/param.h.
o Only vt_core module use compat options, move it from common header to
module.
Reported by: Larry Rosenman ler at lerctr dot org
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/dev/vt/vt.h
head/sys/dev/vt/vt_core.c
Modified: head/sys/dev/vt/vt.h
==
--- head/sys/dev/vt/vt.hMon Dec 9 15:01:34 2013(r259129)
+++ head/sys/dev/vt/vt.hMon Dec 9 15:28:34 2013(r259130)
@@ -46,7 +46,6 @@
#include
#include
-#include "opt_compat.h"
#include "opt_syscons.h"
#include "opt_splash.h"
Modified: head/sys/dev/vt/vt_core.c
==
--- head/sys/dev/vt/vt_core.c Mon Dec 9 15:01:34 2013(r259129)
+++ head/sys/dev/vt/vt_core.c Mon Dec 9 15:28:34 2013(r259130)
@@ -34,6 +34,9 @@
__FBSDID("$FreeBSD$");
#include
+
+#include "opt_compat.h"
+
#include
#include
#include
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r259102 - head/sys/sparc64/sparc64
On Sun, 8 Dec 2013 15:25:19 + (UTC) Marius Strobl wrote: > Author: marius > Date: Sun Dec 8 15:25:19 2013 > New Revision: 259102 > URL: http://svnweb.freebsd.org/changeset/base/259102 > > Log: > Restore a vital comment nuked in r259016. > > Modified: > head/sys/sparc64/sparc64/machdep.c > > Modified: head/sys/sparc64/sparc64/machdep.c > == > --- head/sys/sparc64/sparc64/machdep.cSun Dec 8 14:21:54 2013 > (r259101) > +++ head/sys/sparc64/sparc64/machdep.cSun Dec 8 15:25:19 2013 > (r259102) > @@ -553,6 +553,13 @@ sparc64_init(caddr_t mdp, u_long o1, u_l >* trigger a fatal reset error or worse things further down the road. >* XXX it should be possible to use this solely instead of writing >* %tba in cpu_setregs(). Doing so causes a hang however. > + * > + * NB: the low-level console drivers require a working DELAY() and > + * some compiler optimizations may cause the curthread accesses of > + * mutex(9) to be factored out even if the latter aren't actually > + * called. Both of these require PCPU_REG to be set. However, we > + * can't set PCPU_REG without also taking over the trap table or the > + * firmware will overwrite it. >*/ > sun4u_set_traptable(tl0_base); > Oh, I'm sorry. It was old fix. Seems it here since 2009. Thanks. WBW -- Aleksandr Rybalko ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259131 - head/cddl/contrib/opensolaris/cmd/zpool
Author: delphij
Date: Mon Dec 9 18:52:21 2013
New Revision: 259131
URL: http://svnweb.freebsd.org/changeset/base/259131
Log:
Don't panic when we get ZPOOL_STATUS_NON_NATIVE_ASHIFT
while listing importable pools.
MFC after:3 days
Modified:
head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
Modified: head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==
--- head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.cMon Dec 9
15:28:34 2013(r259130)
+++ head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.cMon Dec 9
18:52:21 2013(r259131)
@@ -1702,6 +1702,12 @@ show_import(nvlist_t *config)
"resilvered.\n"));
break;
+ case ZPOOL_STATUS_NON_NATIVE_ASHIFT:
+ (void) printf(gettext("status: One or more devices were "
+ "configured to use a non-native block size.\n"
+ "\tExpect reduced performance.\n"));
+ break;
+
default:
/*
* No other status can be seen when importing pools.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259132 - head/usr.bin/sed
Author: eadler Date: Mon Dec 9 18:57:20 2013 New Revision: 259132 URL: http://svnweb.freebsd.org/changeset/base/259132 Log: Per the resolution of POSIX bug 779 (note 0002050) add support for using 'i' as a case insensitive flag. PR: standards/184641 Requested by: David A. Wheeler MFC After:1 week Modified: head/usr.bin/sed/compile.c head/usr.bin/sed/sed.1 Modified: head/usr.bin/sed/compile.c == --- head/usr.bin/sed/compile.c Mon Dec 9 18:52:21 2013(r259131) +++ head/usr.bin/sed/compile.c Mon Dec 9 18:57:20 2013(r259132) @@ -582,6 +582,7 @@ compile_flags(char *p, struct s_subst *s case 'p': s->p = 1; break; + case 'i': case 'I': s->icase = 1; break; Modified: head/usr.bin/sed/sed.1 == --- head/usr.bin/sed/sed.1 Mon Dec 9 18:52:21 2013(r259131) +++ head/usr.bin/sed/sed.1 Mon Dec 9 18:57:20 2013(r259132) @@ -31,7 +31,7 @@ .\"@(#)sed.1 8.2 (Berkeley) 12/30/93 .\" $FreeBSD$ .\" -.Dd May 24, 2009 +.Dd December 9, 2013 .Dt SED 1 .Os .Sh NAME @@ -196,7 +196,7 @@ option was specified); a context address that consists of a regular expression preceded and followed by a delimiter. The closing delimiter can also optionally be followed by the -.Dq I +.Dq i character, to indicate that the regular expression is to be matched in a case-insensitive way. .El @@ -507,7 +507,7 @@ Append the pattern space to if a replacement was made. If the replacement string is identical to that which it replaces, it is still considered to have been a replacement. -.It I +.It i or I Match the regular expression in a case-insensitive way. .El .Pp ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259133 - head/tools/regression/usr.bin/sed
Author: eadler Date: Mon Dec 9 19:13:16 2013 New Revision: 259133 URL: http://svnweb.freebsd.org/changeset/base/259133 Log: Add regression test for recently added 'i' flag in r259132. PR: standards/184641 Added: head/tools/regression/usr.bin/sed/regress.icase4.out - copied unchanged from r259132, head/tools/regression/usr.bin/sed/regress.icase2.out Modified: head/tools/regression/usr.bin/sed/regress.sh Copied: head/tools/regression/usr.bin/sed/regress.icase4.out (from r259132, head/tools/regression/usr.bin/sed/regress.icase2.out) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/sed/regress.icase4.outMon Dec 9 19:13:16 2013(r259133, copy of r259132, head/tools/regression/usr.bin/sed/regress.icase2.out) @@ -0,0 +1,4 @@ +input +data +for validation +of Foo(1) Modified: head/tools/regression/usr.bin/sed/regress.sh == --- head/tools/regression/usr.bin/sed/regress.shMon Dec 9 18:57:20 2013(r259132) +++ head/tools/regression/usr.bin/sed/regress.shMon Dec 9 19:13:16 2013(r259133) @@ -66,6 +66,7 @@ REGRESSION_TEST_FREEFORM(`inplace5', `in REGRESSION_TEST(`icase1', `sed /SED/Id < regress.in') REGRESSION_TEST(`icase2', `sed s/SED/Foo/I < regress.in') REGRESSION_TEST(`icase3', `sed s/SED/Foo/ < regress.in') +REGRESSION_TEST(`icase4', `sed s/SED/Foo/i < regress.in') REGRESSION_TEST(`hanoi', `echo ":abcd: : :" | sed -f hanoi.sed') REGRESSION_TEST(`math', `echo "4+7*3+2^7/3" | sed -f math.sed') ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259134 - in head: tools/regression/usr.sbin/etcupdate usr.sbin/etcupdate
Author: jhb
Date: Mon Dec 9 19:31:30 2013
New Revision: 259134
URL: http://svnweb.freebsd.org/changeset/base/259134
Log:
- Refresh /etc/localtime after each update using tzsetup -r.
- Regenerate /var/db/services.db when /etc/services changes.
MFC after:1 week
Added:
head/tools/regression/usr.sbin/etcupdate/tzsetup.sh (contents, props
changed)
Modified:
head/tools/regression/usr.sbin/etcupdate/preworld.sh
head/tools/regression/usr.sbin/etcupdate/tests.sh
head/usr.sbin/etcupdate/etcupdate.8
head/usr.sbin/etcupdate/etcupdate.sh
Modified: head/tools/regression/usr.sbin/etcupdate/preworld.sh
==
--- head/tools/regression/usr.sbin/etcupdate/preworld.shMon Dec 9
19:13:16 2013(r259133)
+++ head/tools/regression/usr.sbin/etcupdate/preworld.shMon Dec 9
19:31:30 2013(r259134)
@@ -66,7 +66,7 @@ TEST=$WORKDIR/test
build_trees()
{
- # Populate trees with pre-world files and an additional file
+ # Populate trees with pre-world files and additional files
# that should not be touched.
rm -rf $SRC $OLD $TEST $CONFLICTS
@@ -126,6 +126,7 @@ polkit:*:562:
haldaemon:*:560:
EOF
rm $TEST/etc/inetd.conf
+ touch $TEST/etc/localtime
# Copy the "old" source tree to the new source tree and
# make upstream modifications.
Modified: head/tools/regression/usr.sbin/etcupdate/tests.sh
==
--- head/tools/regression/usr.sbin/etcupdate/tests.sh Mon Dec 9 19:13:16
2013(r259133)
+++ head/tools/regression/usr.sbin/etcupdate/tests.sh Mon Dec 9 19:31:30
2013(r259134)
@@ -628,6 +628,24 @@ root: some...@example.com
MAILER-DAEMON: postmaster
postmaster: root
EOF
+
+ # - Verify that updating an unmodified /etc/services builds
+ # /var/db/services.db.
+ cat > $OLD/etc/services < $NEW/etc/services < $WORKDIR/correct.out <
+# 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 AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+
+# Various regression tests for the tzsetup handling in the 'update' command.
+
+WORKDIR=work
+
+usage()
+{
+ echo "Usage: tzsetup.sh [-s script] [-w workdir]"
+ exit 1
+}
+
+# Allow the user to specify an alternate work directory or script.
+COMMAND=etcupdate
+while getopts "s:w:" option; do
+ case $option in
+ s)
+ COMMAND="sh $OPTARG"
+ ;;
+ w)
+ WORKDIR=$OPTARG
+ ;;
+ *)
+ echo
+ usage
+ ;;
+ esac
+done
+shift $((OPTIND - 1))
+if [ $# -ne 0 ]; then
+ usage
+fi
+
+CONFLICTS=$WORKDIR/conflicts
+OLD=$WORKDIR/old
+NEW=$WORKDIR/current
+TEST=$WORKDIR/test
+
+build_trees()
+{
+
+ # Build the base tree, but not /etc/localtime itself
+ local i j k
+
+ rm -rf $OLD $NEW $TEST $CONFLICTS
+ mkdir -p $OLD $NEW $TEST
+ mkdir -p $TEST/etc
+ mkdir -p $TEST/var/db
+ mkdir -p $TEST/usr/share/zoneinfo
+
+ # Create a dummy timezone file
+ echo "foo" > $TEST/usr/share/zoneinfo/foo
+
+}
+
+# $1 - relative path to file that should be missing from TEST
+missing()
+{
+ if [ -e $TEST/$1 -o -L $TEST/$1 ]; then
+ echo "File $1 should be missing"
+ fi
+}
+
+# $1 - relative path to file that should be a symlink in TEST
+# $2 - optional value of the link
+link()
+{
+ local val
+
+ if ! [ -L $TEST/$1 ]; then
+ echo "File $1 should be a link"
+ elif [ $# -gt 1 ]; then
+ val=`readlink $TEST/$1`
svn commit: r259135 - head/sys/modules/iwnfw/iwn6000g2b
Author: adrian Date: Mon Dec 9 19:35:42 2013 New Revision: 259135 URL: http://svnweb.freebsd.org/changeset/base/259135 Log: Bump the g2b firmware to 18.x. Tested: * Intel 6235 Modified: head/sys/modules/iwnfw/iwn6000g2b/Makefile Modified: head/sys/modules/iwnfw/iwn6000g2b/Makefile == --- head/sys/modules/iwnfw/iwn6000g2b/Makefile Mon Dec 9 19:31:30 2013 (r259134) +++ head/sys/modules/iwnfw/iwn6000g2b/Makefile Mon Dec 9 19:35:42 2013 (r259135) @@ -1,6 +1,6 @@ # $FreeBSD$ KMOD= iwn6000g2bfw -IMG= iwlwifi-6000g2b-17.168.5.2 +IMG= iwlwifi-6000g2b-18.168.6.1 .include ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r259123 - head/sys/modules/usb
You don't have to build the whole kernel - you just need to have config run to spit out the opt_xxx files. -a On 8 December 2013 23:26, Hans Petter Selasky wrote: > Author: hselasky > Date: Mon Dec 9 07:26:55 2013 > New Revision: 259123 > URL: http://svnweb.freebsd.org/changeset/base/259123 > > Log: > Make it easier to test build the USB code having the debug flags set > without having to build the complete kernel. > > MFC after:2 weeks > > Modified: > head/sys/modules/usb/Makefile > > Modified: head/sys/modules/usb/Makefile > == > --- head/sys/modules/usb/Makefile Mon Dec 9 07:15:46 2013 > (r259122) > +++ head/sys/modules/usb/Makefile Mon Dec 9 07:26:55 2013 > (r259123) > @@ -27,6 +27,18 @@ > > .include > > +# > +# Check for common USB debug flags to pass when building the USB > +# modules in this directory: > +# > +.if defined(USB_DEBUG) > +MAKE+=" DEBUG_FLAGS+=-DUSB_DEBUG" > +.endif > + > +.if defined(USB_DEBUG) && defined(USB_REQ_DEBUG) > +MAKE+=" DEBUG_FLAGS+=-DUSB_REQ_DEBUG" > +.endif > + > # Modules that include binary-only blobs of microcode should be selectable by > # MK_SOURCELESS_UCODE option (see below). > ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259140 - in head/sys: amd64/include i386/include x86/acpica x86/include x86/x86
Author: jhb
Date: Mon Dec 9 21:08:52 2013
New Revision: 259140
URL: http://svnweb.freebsd.org/changeset/base/259140
Log:
Move constants for indices in the local APIC's local vector table from
apicvar.h to apicreg.h.
Modified:
head/sys/amd64/include/apicvar.h
head/sys/i386/include/apicvar.h
head/sys/x86/acpica/madt.c
head/sys/x86/include/apicreg.h
head/sys/x86/x86/local_apic.c
head/sys/x86/x86/mptable.c
Modified: head/sys/amd64/include/apicvar.h
==
--- head/sys/amd64/include/apicvar.hMon Dec 9 21:07:57 2013
(r259139)
+++ head/sys/amd64/include/apicvar.hMon Dec 9 21:08:52 2013
(r259140)
@@ -136,15 +136,6 @@
*/
#defineAPIC_SPURIOUS_INT 255
-#defineLVT_LINT0 0
-#defineLVT_LINT1 1
-#defineLVT_TIMER 2
-#defineLVT_ERROR 3
-#defineLVT_PMC 4
-#defineLVT_THERMAL 5
-#defineLVT_CMCI6
-#defineLVT_MAX LVT_CMCI
-
#ifndef LOCORE
#defineAPIC_IPI_DEST_SELF -1
Modified: head/sys/i386/include/apicvar.h
==
--- head/sys/i386/include/apicvar.h Mon Dec 9 21:07:57 2013
(r259139)
+++ head/sys/i386/include/apicvar.h Mon Dec 9 21:08:52 2013
(r259140)
@@ -135,15 +135,6 @@
*/
#defineAPIC_SPURIOUS_INT 255
-#defineLVT_LINT0 0
-#defineLVT_LINT1 1
-#defineLVT_TIMER 2
-#defineLVT_ERROR 3
-#defineLVT_PMC 4
-#defineLVT_THERMAL 5
-#defineLVT_CMCI6
-#defineLVT_MAX LVT_CMCI
-
#ifndef LOCORE
#defineAPIC_IPI_DEST_SELF -1
Modified: head/sys/x86/acpica/madt.c
==
--- head/sys/x86/acpica/madt.c Mon Dec 9 21:07:57 2013(r259139)
+++ head/sys/x86/acpica/madt.c Mon Dec 9 21:08:52 2013(r259140)
@@ -517,9 +517,9 @@ madt_parse_local_nmi(ACPI_MADT_LOCAL_API
return;
}
if (nmi->Lint == 0)
- pin = LVT_LINT0;
+ pin = APIC_LVT_LINT0;
else
- pin = LVT_LINT1;
+ pin = APIC_LVT_LINT1;
lapic_set_lvt_mode(apic_id, pin, APIC_LVT_DM_NMI);
if (!(nmi->IntiFlags & ACPI_MADT_TRIGGER_CONFORMS))
lapic_set_lvt_triggermode(apic_id, pin,
Modified: head/sys/x86/include/apicreg.h
==
--- head/sys/x86/include/apicreg.h Mon Dec 9 21:07:57 2013
(r259139)
+++ head/sys/x86/include/apicreg.h Mon Dec 9 21:08:52 2013
(r259140)
@@ -357,6 +357,16 @@ typedef struct IOAPIC ioapic_t;
#define APIC_TDCR_128 0x0a
#define APIC_TDCR_10x0b
+/* LVT table indices */
+#defineAPIC_LVT_LINT0 0
+#defineAPIC_LVT_LINT1 1
+#defineAPIC_LVT_TIMER 2
+#defineAPIC_LVT_ERROR 3
+#defineAPIC_LVT_PMC4
+#defineAPIC_LVT_THERMAL5
+#defineAPIC_LVT_CMCI 6
+#defineAPIC_LVT_MAXAPIC_LVT_CMCI
+
/**
* I/O APIC defines
*/
Modified: head/sys/x86/x86/local_apic.c
==
--- head/sys/x86/x86/local_apic.c Mon Dec 9 21:07:57 2013
(r259139)
+++ head/sys/x86/x86/local_apic.c Mon Dec 9 21:08:52 2013
(r259140)
@@ -111,7 +111,7 @@ struct lvt {
};
struct lapic {
- struct lvt la_lvts[LVT_MAX + 1];
+ struct lvt la_lvts[APIC_LVT_MAX + 1];
u_int la_id:8;
u_int la_cluster:4;
u_int la_cluster_id:2;
@@ -125,7 +125,7 @@ struct lapic {
} static lapics[MAX_APIC_ID + 1];
/* Global defaults for local APIC LVT entries. */
-static struct lvt lvts[LVT_MAX + 1] = {
+static struct lvt lvts[APIC_LVT_MAX + 1] = {
{ 1, 1, 1, 1, APIC_LVT_DM_EXTINT, 0 }, /* LINT0: masked ExtINT */
{ 1, 1, 0, 1, APIC_LVT_DM_NMI, 0 }, /* LINT1: NMI */
{ 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_TIMER_INT }, /* Timer */
@@ -179,7 +179,7 @@ lvt_mode(struct lapic *la, u_int pin, ui
{
struct lvt *lvt;
- KASSERT(pin <= LVT_MAX, ("%s: pin %u out of range", __func__, pin));
+ KASSERT(pin <= APIC_LVT_MAX, ("%s: pin %u out of range", __func__,
pin));
if (la->la_lvts[pin].lvt_active)
lvt = &la->la_lvts[pin];
else
@@ -300,7 +300,7 @@ lapic_create(u_int apic_id, int boot_cpu
*/
lapics[apic_id].la_present = 1;
lapics[apic_id].la_id = apic_id;
- for (i = 0; i <= LVT_MAX; i++) {
+ for (i = 0; i <= APIC_LVT_MAX; i++) {
lapics[apic_id].la_lvts[i]
Re: svn commit: r258930 - head/sys/dev/drm2
On Friday, December 06, 2013 7:07:43 pm Jean-Sébastien Pédron wrote: > Le 05/12/2013 16:05, John Baldwin a écrit : > >>> Eh, vgapci is the right place to read this. The LINK_CAP here is telling > >>> you the width of the slot you are plugged into, not the width of the card > >>> that is plugged into the slot. > >> > >> I'm sorry, my knowledge of PCI is very limited (still learning) and I > >> don't understand your comment. Could you please expand on it? > > > > [explanation] > > Thank you very much for the explanation! > > > Can you provide pciconf -lc output from your machine > > You'll find it attached. > > > and tell me what you think the function should be returning (i.e. > > are you trying to determine the speed of the slot, or the speed of > > the card?) > > The result of this function is used to initialize the card (ie. it does > more steps if speed is 5.0). The debug message is "enabling PCIE gen 2 > link speeds" in this case. I admit I don't know what the code is doing > exactly, so I haven't any expectation :) > > What I see is that now, this part of the initialization is similar to > Linux 3.8 on the same computer: in both OSes, the PCI ID of the bridge > and the linkcap/linkcap2 values are logged, and the PCI ID/values are > matching. Ok, after looking at the original version of this function in Linux, it does read the capabilities from the parent bridge of the slot, not from the card itself, so your change is correct. -- John Baldwin ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r259094 - head/etc/rc.d
On 12/9/13, 12:51 AM, Hiroki Sato wrote: > Hi Peter, > > Peter Wemm wrote > in <201312080555.rb85tu8w016...@svn.freebsd.org>: > > pe> Author: peter > pe> Date: Sun Dec 8 05:55:55 2013 > pe> New Revision: 259094 > pe> URL: http://svnweb.freebsd.org/changeset/base/259094 > pe> > pe> Log: > pe> Rev 256256 had an undocumented side effect of breaking existing behavior > pe> for ipv6 jails. > pe> > pe> Among the harmful side effects included putting a route to an entire /64 > pe> onto an interface even if you were in a smaller network - eg: /80. > pe> This broke the freebsd.org cluster hosted at ISC which has /80 networks. > pe> > pe> Modified: > pe> head/etc/rc.d/jail > > The reason why it was changed is that I think an IPv6 GUA with no > prefix length information should always be interpret as a /64 because > the other tools like ifconfig do so. IPv6 is designed to always use > a correct prefix length and avoid using a /128 for aliases. Is there > a problem with specifying a /80 address to ip6.addr if a box is on a > /80 network? I'm all for issuing warnings and advising people to correct it. However the problem is that the change silently breaks a working setup during an upgrade from 9.x to 10.x. At the ISC.org freebsd cluster site we lost the ability to talk to other services in nearby separate networks, including DNS. It had gone undetected until we tried to actually default to using IPv6 - the first reaction from some of the other admins was to revert everything back to IPv4. If breaking ipv6 jails leads to that outcome elsewhere then that would be sub-optimal for ipv6 adoption. -- Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV UTF-8: for when a ' just won\342\200\231t do. signature.asc Description: OpenPGP digital signature
svn commit: r259143 - head/usr.sbin/bsdinstall/scripts
Author: eadler
Date: Mon Dec 9 22:56:19 2013
New Revision: 259143
URL: http://svnweb.freebsd.org/changeset/base/259143
Log:
sed(1): Use /i instead of /I
the i modifier was added in r259132 since POSIX recently agreed to add
it. Switch uses of /I to /i.
Modified:
head/usr.sbin/bsdinstall/scripts/services
Modified: head/usr.sbin/bsdinstall/scripts/services
==
--- head/usr.sbin/bsdinstall/scripts/services Mon Dec 9 22:40:22 2013
(r259142)
+++ head/usr.sbin/bsdinstall/scripts/services Mon Dec 9 22:56:19 2013
(r259143)
@@ -29,7 +29,7 @@
: ${DIALOG_OK=0}
if [ -f $BSDINSTALL_TMPETC/rc.conf.services ]; then
- eval `sed -e s/YES/on/I -e s/NO/off/I
$BSDINSTALL_TMPETC/rc.conf.services`
+ eval `sed -e s/YES/on/i -e s/NO/off/i
$BSDINSTALL_TMPETC/rc.conf.services`
else
# Default service states. Everything is off if not enabled.
sshd_enable="on"
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259144 - head/usr.sbin/bsdinstall/scripts
Author: dteske Date: Mon Dec 9 22:58:26 2013 New Revision: 259144 URL: http://svnweb.freebsd.org/changeset/base/259144 Log: Fix a regression introduced by SVN r257842. Result was that after successfully installing to encrypted ZFS root, the passphrase is not accepted and a message about "incorrect key" is displayed. MFC after:3 days Modified: head/usr.sbin/bsdinstall/scripts/zfsboot Modified: head/usr.sbin/bsdinstall/scripts/zfsboot == --- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 9 22:56:19 2013 (r259143) +++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 9 22:58:26 2013 (r259144) @@ -1203,7 +1203,7 @@ zfs_create_boot() return $FAILURE f_eval_catch $funcname printf "$PRINTF_CONF" \ geli_%s_keyfile0_type \ - '"$disk$targetpart" "$disk$targetpart"' \ + '"$disk$targetpart" "$disk$targetpart:geli_keyfile0"' \ \$BSDINSTALL_TMPBOOT/loader.conf.\$disk\$targetpart || return $FAILURE f_eval_catch $funcname printf "$PRINTF_CONF" \ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r259143 - head/usr.sbin/bsdinstall/scripts
On 12/09/13 14:56, Eitan Adler wrote:
> Author: eadler
> Date: Mon Dec 9 22:56:19 2013
> New Revision: 259143
> URL: http://svnweb.freebsd.org/changeset/base/259143
>
> Log:
> sed(1): Use /i instead of /I
>
> the i modifier was added in r259132 since POSIX recently agreed to add
> it. Switch uses of /I to /i.
There doesn't seem to be any upside to this sort of change. The
downside obviously is that it won't work with older sed's that don't
understand /i.
If you are considering sweeping over the entire tree looking for sed
invocations and "fixing" them then please reconsider.
Regards,
Navdeep
>
> Modified:
> head/usr.sbin/bsdinstall/scripts/services
>
> Modified: head/usr.sbin/bsdinstall/scripts/services
> ==
> --- head/usr.sbin/bsdinstall/scripts/services Mon Dec 9 22:40:22 2013
> (r259142)
> +++ head/usr.sbin/bsdinstall/scripts/services Mon Dec 9 22:56:19 2013
> (r259143)
> @@ -29,7 +29,7 @@
> : ${DIALOG_OK=0}
>
> if [ -f $BSDINSTALL_TMPETC/rc.conf.services ]; then
> - eval `sed -e s/YES/on/I -e s/NO/off/I
> $BSDINSTALL_TMPETC/rc.conf.services`
> + eval `sed -e s/YES/on/i -e s/NO/off/i
> $BSDINSTALL_TMPETC/rc.conf.services`
> else
> # Default service states. Everything is off if not enabled.
> sshd_enable="on"
>
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r258930 - head/sys/dev/drm2
Le 09/12/2013 22:46, John Baldwin a écrit : Ok, after looking at the original version of this function in Linux, it does read the capabilities from the parent bridge of the slot, not from the card itself, so your change is correct. Thank you for the review! -- Jean-Sébastien Pédron ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r259143 - head/usr.sbin/bsdinstall/scripts
On Mon, Dec 9, 2013 at 6:05 PM, Navdeep Parhar wrote: > On 12/09/13 14:56, Eitan Adler wrote: >> Author: eadler >> Date: Mon Dec 9 22:56:19 2013 >> New Revision: 259143 >> URL: http://svnweb.freebsd.org/changeset/base/259143 >> >> Log: >> sed(1): Use /i instead of /I >> >> the i modifier was added in r259132 since POSIX recently agreed to add >> it. Switch uses of /I to /i. > > There doesn't seem to be any upside to this sort of change. The > downside obviously is that it won't work with older sed's that don't > understand /i. > > If you are considering sweeping over the entire tree looking for sed > invocations and "fixing" them then please reconsider. Understood. -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259145 - head/sys/dev/cxgbe
Author: np Date: Mon Dec 9 23:33:57 2013 New Revision: 259145 URL: http://svnweb.freebsd.org/changeset/base/259145 Log: Unstaticize t4_list and t4_uld_list. This works around a clang annoyance[1] and allows kgdb to find these symbols. [1] http://lists.freebsd.org/pipermail/freebsd-hackers/2012-November/041166.html MFC after:3 days Modified: head/sys/dev/cxgbe/t4_main.c Modified: head/sys/dev/cxgbe/t4_main.c == --- head/sys/dev/cxgbe/t4_main.cMon Dec 9 22:58:26 2013 (r259144) +++ head/sys/dev/cxgbe/t4_main.cMon Dec 9 23:33:57 2013 (r259145) @@ -161,10 +161,10 @@ MALLOC_DEFINE(M_CXGBE, "cxgbe", "Chelsio * then ADAPTER_LOCK, then t4_uld_list_lock. */ static struct sx t4_list_lock; -static SLIST_HEAD(, adapter) t4_list; +SLIST_HEAD(, adapter) t4_list; #ifdef TCP_OFFLOAD static struct sx t4_uld_list_lock; -static SLIST_HEAD(, uld_info) t4_uld_list; +SLIST_HEAD(, uld_info) t4_uld_list; #endif /* ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259148 - head/usr.sbin/bsdinstall/scripts
Author: dteske Date: Mon Dec 9 23:58:26 2013 New Revision: 259148 URL: http://svnweb.freebsd.org/changeset/base/259148 Log: Fix a regression introduced by SVN r257842; resulting in mountroot prompt after attempting to install to encrypted ZFS root (caused by a typo in a variable name -- ZFSBOOT_BOOT_FSNAME -> ZFSBOOT_BOOTFS_NAME). MFC after:3 days Modified: head/usr.sbin/bsdinstall/scripts/zfsboot Modified: head/usr.sbin/bsdinstall/scripts/zfsboot == --- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 9 23:54:48 2013 (r259147) +++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 9 23:58:26 2013 (r259148) @@ -1190,7 +1190,7 @@ zfs_create_boot() f_eval_catch $funcname echo "$ECHO_APPEND" 'geom_eli_load=\"YES\"' \ \$BSDINSTALL_TMPBOOT/loader.conf.geli || return $FAILURE f_eval_catch $funcname printf "$PRINTF_CONF" vfs.root.mountfrom \ - '"zfs:$poolname/$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOT_FSNAME"' \ + '"zfs:$poolname/$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME"' \ \$BSDINSTALL_TMPBOOT/loader.conf.root || return $FAILURE f_dprintf "$funcname: disks=[%s]" "$disks" for disk in $disks; do ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259150 - head/sys/dev/cxgbe
Author: adrian
Date: Tue Dec 10 00:07:04 2013
New Revision: 259150
URL: http://svnweb.freebsd.org/changeset/base/259150
Log:
Print out the full PCIe link negotiation during dmesg.
I found this useful when checking whether a NIC is in a PCIE 3.0 8x slot
or not.
Reviewed by: np
Sponsored by: Netflix, inc.
Modified:
head/sys/dev/cxgbe/t4_main.c
Modified: head/sys/dev/cxgbe/t4_main.c
==
--- head/sys/dev/cxgbe/t4_main.cMon Dec 9 23:59:16 2013
(r259149)
+++ head/sys/dev/cxgbe/t4_main.cTue Dec 10 00:07:04 2013
(r259150)
@@ -549,6 +549,7 @@ t4_attach(device_t dev)
#ifdef TCP_OFFLOAD
int ofld_rqidx, ofld_tqidx;
#endif
+ const char *pcie_ts;
sc = device_get_softc(dev);
sc->dev = dev;
@@ -816,9 +817,24 @@ t4_attach(device_t dev)
goto done;
}
+ switch (sc->params.pci.speed) {
+ case 0x1:
+ pcie_ts = "2.5";
+ break;
+ case 0x2:
+ pcie_ts = "5.0";
+ break;
+ case 0x3:
+ pcie_ts = "8.0";
+ break;
+ default:
+ pcie_ts = "??";
+ break;
+ }
device_printf(dev,
- "PCIe x%d, %d ports, %d %s interrupt%s, %d eq, %d iq\n",
- sc->params.pci.width, sc->params.nports, sc->intr_count,
+ "PCIe x%d (%s GTS/s) (%d), %d ports, %d %s interrupt%s, %d eq, %d
iq\n",
+ sc->params.pci.width, pcie_ts, sc->params.pci.speed,
+ sc->params.nports, sc->intr_count,
sc->intr_type == INTR_MSIX ? "MSI-X" :
(sc->intr_type == INTR_MSI ? "MSI" : "INTx"),
sc->intr_count > 1 ? "s" : "", sc->sge.neq, sc->sge.niq);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r259016 - in head/sys: conf dev/drm2 dev/drm2/i915 dev/drm2/radeon dev/fb dev/vt kern modules/drm2/i915kms modules/drm2/radeonkms sparc64/sparc64 sys teken
On Sun, 8 Dec 2013 16:36:20 +0100 Marius Strobl wrote: > On Thu, Dec 05, 2013 at 10:38:54PM +, Aleksandr Rybalko wrote: > > Author: ray > > Date: Thu Dec 5 22:38:53 2013 > > New Revision: 259016 > > URL: http://svnweb.freebsd.org/changeset/base/259016 > > > > Log: > > Merge VT(9) project (a.k.a. newcons). > > > > Reviewed by: nwhitehorn > > MFC_to_10_after: re approval > > Have you addressed any of the points raised in: > http://lists.freebsd.org/pipermail/freebsd-current/2013-October/045887.html > to get VT(9) at least en par with syscons(4) regarding being able to > use a hardware cursor, allowing different low-level console drivers > to compete for the same hardware etc. in the meantime? > > Marius > Hello Marius! Yes and No :) Lets make it as list with short items: 1. Making these drivers work as low-level console. 2. Drivers priority. 3. Using hardware acceleration. 4. Using the 12 x 22 gallant font. 5. Allowing Xorg to map the frame buffer. 6. (Part of 5) Other register banks as needed. 7. Allowing late attachment. Answers: 1. Works, I did testing on ARM board Efika MX with vt_fb_early driver. (Still have to discuss several things with arm@ guys, then commit) 2. Works. F.e. amd64 start with vt_vga driver, then vt_kms driver override it as more specific. 3. Not used at all yet. 4. I like that font. If you want more "gallant" - I will help. Thanks to Ed, newcons support any font dimensions. 5. It works, but only for those drivers which attach dev/fb/fbd, via fbd devfs node (not accessible via vt(9) ioctls yet). 6. IMO better to put it into some drm emulation. 7. Works in many combination. ( start w/ vga, load kms; (kms replace vga) start w/o driver, load kms; preload kms, start w/ vga; (kms replace vga) preload kms, start w/o driver; (kms attached after drm node initialized) ) Have to put your list on Newcons's wiki page too. As I remember such long list of requirement you provide was based on expectation that I want to replace syscons right now :) But, for now we (me and x11 team) want to see it 10.0 as disabled by default (just like in HEAD now), so peoples who want to help with debug of new xorg and drm drivers will be able to see messages after KMS-xorg starts. Oh, looks like I forget what I have to say more. :) So it will be said later, when I will less sleepy. Anyway. Thanks a lot for your comments!!! WBW -- Aleksandr Rybalko ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r259016 - in head/sys: conf dev/drm2 dev/drm2/i915 dev/drm2/radeon dev/fb dev/vt kern modules/drm2/i915kms modules/drm2/radeonkms sparc64/sparc64 sys teken
On 12/09/13 18:20, Aleksandr Rybalko wrote: On Sun, 8 Dec 2013 16:36:20 +0100 Marius Strobl wrote: On Thu, Dec 05, 2013 at 10:38:54PM +, Aleksandr Rybalko wrote: Author: ray Date: Thu Dec 5 22:38:53 2013 New Revision: 259016 URL: http://svnweb.freebsd.org/changeset/base/259016 Log: Merge VT(9) project (a.k.a. newcons). Reviewed by: nwhitehorn MFC_to_10_after: re approval Have you addressed any of the points raised in: http://lists.freebsd.org/pipermail/freebsd-current/2013-October/045887.html to get VT(9) at least en par with syscons(4) regarding being able to use a hardware cursor, allowing different low-level console drivers to compete for the same hardware etc. in the meantime? Marius Hello Marius! Yes and No :) Lets make it as list with short items: 1. Making these drivers work as low-level console. 2. Drivers priority. 3. Using hardware acceleration. 4. Using the 12 x 22 gallant font. 5. Allowing Xorg to map the frame buffer. 6. (Part of 5) Other register banks as needed. 7. Allowing late attachment. Answers: 1. Works, I did testing on ARM board Efika MX with vt_fb_early driver. (Still have to discuss several things with arm@ guys, then commit) As I mentioned in my review, this particular code is a really weird bug-filled copy of ofwfb.c, which already works as a low-level console early in the boot process. 2. Works. F.e. amd64 start with vt_vga driver, then vt_kms driver override it as more specific. I think Marius meant having early-boot drivers bid amongst each other for attachment 3. Not used at all yet. 4. I like that font. If you want more "gallant" - I will help. Thanks to Ed, newcons support any font dimensions. 5. It works, but only for those drivers which attach dev/fb/fbd, via fbd devfs node (not accessible via vt(9) ioctls yet). Could you provide more detail about how this is supposed to work? X doesn't map at offset 0 in general, and that means that 100% of X UMS drivers are currently broken with newcons. 6. IMO better to put it into some drm emulation. 7. Works in many combination. ( start w/ vga, load kms; (kms replace vga) start w/o driver, load kms; preload kms, start w/ vga; (kms replace vga) preload kms, start w/o driver; (kms attached after drm node initialized) ) Have to put your list on Newcons's wiki page too. As I remember such long list of requirement you provide was based on expectation that I want to replace syscons right now :) But, for now we (me and x11 team) want to see it 10.0 as disabled by default (just like in HEAD now), so peoples who want to help with debug of new xorg and drm drivers will be able to see messages after KMS-xorg starts. Oh, looks like I forget what I have to say more. :) So it will be said later, when I will less sleepy. Anyway. Thanks a lot for your comments!!! WBW We should come up with a sunset plan for syscons, though. -Nathan ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259152 - head/usr.bin/calendar
Author: eadler
Date: Tue Dec 10 01:39:22 2013
New Revision: 259152
URL: http://svnweb.freebsd.org/changeset/base/259152
Log:
calendar(1): Add support for #include with absolute paths
Prior to the addition of cpp support into calendar itself
#include
was a legal construction in a calendar file.
Permit this again
Modified:
head/usr.bin/calendar/calcpp.c
Modified: head/usr.bin/calendar/calcpp.c
==
--- head/usr.bin/calendar/calcpp.c Tue Dec 10 00:35:33 2013
(r259151)
+++ head/usr.bin/calendar/calcpp.c Tue Dec 10 01:39:22 2013
(r259152)
@@ -155,8 +155,11 @@ tokenscpp(char *buf, char *string)
s = p+1;
if ((p = strchr(s, '>')) != NULL)
*p = '\0';
- snprintf (string, MAXPATHLEN, "%s/%s",
- _PATH_INCLUDE, s);
+ if (*s != '/')
+ snprintf (string, MAXPATHLEN, "%s/%s",
+ _PATH_INCLUDE, s);
+ else
+ strncpy(string, s, MAXPATHLEN);
} else if (*p == '(') {
s = p+1;
if ((p = strchr(p, '>')) != NULL)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r259080 - in head/sys: dev/iicbus geom/cache geom/journal
On Sun, 8 Dec 2013, Justin Hibbits wrote:
On Sun, 8 Dec 2013 13:53:30 +1100 (EST)
Bruce Evans wrote:
On Sat, 7 Dec 2013, Justin Hibbits wrote:
[>]* [...]
Modified: head/sys/geom/cache/g_cache.c
==
--- head/sys/geom/cache/g_cache.c Sat Dec 7 19:39:38
2013(r259079) +++ head/sys/geom/cache/g_cache.c Sat
Dec 7 19:55:34 2013(r259080) @@ -67,7 +67,7 @@ static
u_int g_cache_used_hi = 20; static int
sysctl_handle_pct(SYSCTL_HANDLER_ARGS)
{
- u_int val = *(u_int *)arg1;
+ int val;
int error;
error = sysctl_handle_int(oidp, &val, 0, req);
This adds the larger non-style bug that val is used uninitialized.
Compilers should warn about this. This results in stack garbage
being copied out instead of the "old" value.
...
I just reverted these two changes in r259096. Rather than fix what I
did and change the rest of the files, I'm leaving them for another day,
and reverted my changes so they're at least back to the working order
from before.
Thanks.
Does it work to just remove the check for val < 0?
Bruce
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259156 - head/usr.sbin/mtest
Author: eadler Date: Tue Dec 10 05:01:01 2013 New Revision: 259156 URL: http://svnweb.freebsd.org/changeset/base/259156 Log: mtest(8): use correct macro in mdoc The An macros is used for authors while the Ar macro is used for arguments. AFAIK mcast-addr and ifname are not authors. PR: docs/184649 Submitted by: cnst++ MFC After:3 days Modified: head/usr.sbin/mtest/mtest.8 Modified: head/usr.sbin/mtest/mtest.8 == --- head/usr.sbin/mtest/mtest.8 Tue Dec 10 04:57:56 2013(r259155) +++ head/usr.sbin/mtest/mtest.8 Tue Dec 10 05:01:01 2013(r259156) @@ -131,9 +131,9 @@ to allow traffic from source Print .Ar n source filter entries for -.An mcast-addr +.Ar mcast-addr on interface -.An ifname . +.Ar ifname . .\" .Pp .It Ic f Ar filename ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
