Re: svn commit: r225201 - in head/sys: amd64/conf i386/conf
On Fri, Aug 26, 2011 at 05:34:26PM -0700, Doug Barton wrote: > Sorry, I am not parsing this. Are you saying that the module is broken? Yes, from FreeBSD 6.x puc.ko don't work. Only in-kernel version work. > > On 08/26/2011 14:22, John Baldwin wrote: > > Author: jhb > > Date: Fri Aug 26 21:22:34 2011 > > New Revision: 225201 > > URL: http://svn.freebsd.org/changeset/base/225201 > > > > Log: > > Enable the puc(4) driver on amd64 and i386 in GENERIC. This allows > > devices supported by puc(4) to work "out of the box" since puc.ko does > > not work "out of the box". > > > > Reviewed by: marcel > > Approved by: re (kib) > > MFC after:1 week > > > > Modified: > > head/sys/amd64/conf/GENERIC > > head/sys/i386/conf/GENERIC > > > > Modified: head/sys/amd64/conf/GENERIC > > == > > --- head/sys/amd64/conf/GENERIC Fri Aug 26 19:44:39 2011 > > (r225200) > > +++ head/sys/amd64/conf/GENERIC Fri Aug 26 21:22:34 2011 > > (r225201) > > @@ -186,10 +186,7 @@ device plip# TCP/IP over parallel > > device ppi # Parallel port interface device > > #devicevpo # Requires scbus and da > > > > -# If you've got a "dumb" serial or parallel PCI card that is > > -# supported by the puc(4) glue driver, uncomment the following > > -# line to enable it (connects to sio, uart and/or ppc drivers): > > -#devicepuc > > +device puc # Multi I/O cards and multi-channel > > UARTs > > > > # PCI Ethernet NICs. > > device bxe # Broadcom BCM57710/BCM57711/BCM57711E > > 10Gb Ethernet > > > > Modified: head/sys/i386/conf/GENERIC > > == > > --- head/sys/i386/conf/GENERIC Fri Aug 26 19:44:39 2011 > > (r225200) > > +++ head/sys/i386/conf/GENERIC Fri Aug 26 21:22:34 2011 > > (r225201) > > @@ -196,10 +196,7 @@ device plip# TCP/IP over parallel > > device ppi # Parallel port interface device > > #devicevpo # Requires scbus and da > > > > -# If you've got a "dumb" serial or parallel PCI card that is > > -# supported by the puc(4) glue driver, uncomment the following > > -# line to enable it (connects to sio, uart and/or ppc drivers): > > -#devicepuc > > +device puc # Multi I/O cards and multi-channel > > UARTs > > > > # PCI Ethernet NICs. > > device bxe # Broadcom BCM57710/BCM57711/BCM57711E > > 10Gb Ethernet > > > > > > -- > > Nothin' ever doesn't change, but nothin' changes much. > -- OK Go > > Breadth of IT experience, and depth of knowledge in the DNS. > Yours for the right price. :) http://SupersetSolutions.com/ > > ___ > svn-src-...@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org" ___ 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: r225203 - in head/sys: dev/cfe dev/dcons dev/ofw dev/sio dev/syscons dev/uart kern pc98/cbus powerpc/mambo sys
On Fri, Aug 26, 2011 at 2:46 PM, Robert Watson wrote: > Author: rwatson > Date: Fri Aug 26 21:46:36 2011 > New Revision: 225203 > URL: http://svn.freebsd.org/changeset/base/225203 > > Log: > Attempt to make break-to-debugger and alternative break-to-debugger more > accessible: > > (1) Always compile in support for breaking into the debugger if options > KDB is present in the kernel. > > (2) Disable both by default, but allow them to be enabled via tunables > and sysctls debug.kdb.break_to_debugger and > debug.kdb.alt_break_to_debugger. > > (3) options BREAK_TO_DEBUGGER and options ALT_BREAK_TO_DEBUGGER continue > to behave as before -- only now instead of compiling in > break-to-debugger support, they change the default values of the > above sysctls to enable those features by default. Current kernel > configurations should, therefore, continue to behave as expected. Shouldn't opt_comconsole.h be included in subr_kdb.c for this part to actually work? Navdeep ___ 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: r225209 - head/sys/net
Author: bz Date: Sat Aug 27 08:49:55 2011 New Revision: 225209 URL: http://svn.freebsd.org/changeset/base/225209 Log: When adding IPv6 fwd support to ipfw in r225044 these two files were not committed. Initialize next_hop6 to align with the IPv4 code. PR: bin/117214 MFC after:3 weeks X-MFC with: r225044 Approved by: re (kib) Modified: head/sys/net/if_bridge.c head/sys/net/if_ethersubr.c Modified: head/sys/net/if_bridge.c == --- head/sys/net/if_bridge.cSat Aug 27 06:54:08 2011(r225208) +++ head/sys/net/if_bridge.cSat Aug 27 08:49:55 2011(r225209) @@ -3083,6 +3083,7 @@ bridge_pfil(struct mbuf **mp, struct ifn args.m = *mp; args.oif = ifp; args.next_hop = NULL; + args.next_hop6 = NULL; args.eh = &eh2; args.inp = NULL;/* used by ipfw uid/gid/jail rules */ i = V_ip_fw_chk_ptr(&args); Modified: head/sys/net/if_ethersubr.c == --- head/sys/net/if_ethersubr.c Sat Aug 27 06:54:08 2011(r225208) +++ head/sys/net/if_ethersubr.c Sat Aug 27 08:49:55 2011(r225209) @@ -499,6 +499,7 @@ ether_ipfw_chk(struct mbuf **m0, struct args.m = m; /* the packet we are looking at */ args.oif = dst; /* destination, if any */ args.next_hop = NULL; /* we do not support forward yet*/ + args.next_hop6 = NULL; /* we do not support forward yet*/ args.eh = &save_eh; /* MAC header for bridged/MAC packets */ args.inp = NULL;/* used by ipfw uid/gid/jail rules */ i = V_ip_fw_chk_ptr(&args); ___ 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: r225201 - in head/sys: amd64/conf i386/conf
Slawa Olhovchenkov writes: Hello, > Yes, from FreeBSD 6.x puc.ko don't work. Only in-kernel version work. Nope puc.ko module can't attach drivers compiled in kernel, but if both puc & uart are loaded as modules, they work fine : emss@srvbsdfenssv:~> uname -mr 8.2-RELEASE-p2 amd64 emss@srvbsdfenssv:~> kldstat Id Refs AddressSize Name 1 149 0x8010 777090 kernel 22 0x80878000 8580 procfs.ko 33 0x80881000 94e0 pseudofs.ko 41 0x8088b000 bc28 geom_label.ko 52 0x80897000 4d110pf.ko 61 0x808e5000 fef8 if_nfe.ko 72 0x808f5000 3dc80miibus.ko 81 0x80933000 24d78snd_hda.ko 92 0x80958000 757c8sound.ko 101 0x809ce000 8ce8 umass.ko 117 0x809d7000 356f0usb.ko 123 0x80a0d000 820c8cam.ko 131 0x80a9 f060 aio.ko 141 0x80aa 15e0 accf_http.ko 151 0x80aa2000 a6a8 puc.ko 161 0x80aad000 27d0 amdtemp.ko 171 0x80ab 10078ahci.ko 181 0x80ac1000 18510uart.ko 191 0x80ada000 8c70 ppc.ko 203 0x80ae3000 9948 ppbus.ko 211 0x80aed000 47e0 lpt.ko 221 0x80af2000 9ff8 ohci.ko 231 0x80afc000 d288 ehci.ko 241 0x80b0a000 38a8 uftdi.ko 252 0x80b0e000 5688 ucom.ko 261 0x80b14000 2450 pflog.ko 271 0x80b17000 4a30 cryptodev.ko 282 0x80b1c000 2fb70crypto.ko 293 0x80b4c000 dc00 zlib.ko 301 0x80b5a000 4cc0 nfsmb.ko 313 0x80b5f000 24c0 smbus.ko 321 0x80b62000 2d28 smb.ko 331 0x80b65000 82e8 ng_ubt.ko 343 0x80b6e000 14de8netgraph.ko 352 0x80b83000 12fc0ng_hci.ko 362 0x80b96000 2da0 ng_bluetooth.ko 371 0x80c22000 3e80 linprocfs.ko 381 0x80c26000 1cf64linux.ko emss@srvbsdfenssv:~> dmesg | grep puc puc0: port 0xd480-0xd49f,0xd400-0xd41f mem 0xfcffe000-0xfcffefff,0xfcffd000-0xfcffdfff irq 18 at device 7.0 on pci1 puc0: [FILTER] uart2: <16550 or compatible> on puc0 uart3: <16550 or compatible> on puc0 uart4: <16550 or compatible> on puc0 uart5: <16550 or compatible> on puc0 So including puc in GENERIC is the only solution as uart & ppc are already in. The other way could be to ship a stripped down GENERIC kernel and load modules manually or automagically (devd ?) Regards Éric Masson -- > Subject: pb fvwm95-2 comment l'installer le compiler??? > Merci d'avance je te conseille d'être un peu plus précis dans l'exposé de ton pb... -+- EJ in guide du linuxien pervers :"Les modéros sont sympas !" -+- ___ 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: r225203 - in head/sys: dev/cfe dev/dcons dev/ofw dev/sio dev/syscons dev/uart kern pc98/cbus powerpc/mambo sys
On 27 Aug 2011, at 09:21, Navdeep Parhar wrote: >> (3) options BREAK_TO_DEBUGGER and options ALT_BREAK_TO_DEBUGGER continue >> to behave as before -- only now instead of compiling in >> break-to-debugger support, they change the default values of the >> above sysctls to enable those features by default. Current kernel >> configurations should, therefore, continue to behave as expected. > > Shouldn't opt_comconsole.h be included in subr_kdb.c for this part to > actually work? Yes, you're right. We should almost certainly garbage collect opt_comconsole.h entirely at this point, moving the break options into opt_kdb.h as well. It also looks like I missed one of the ARM uart implementations during my walk of the tree as well. I'll send a follow-up patch to re@ today to refine this change further. (The dcons Makefile also does something odd, in that it sets #define KDB in its own opt_kdb.h when built independently of the kernel, but actually, that's now #define KDB goes for the base kernel -- it goes in opt_global.h. I'll need to ponder what the right thing to do there is, and whether it's worth fixing at this point.) Robert___ 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: r225201 - in head/sys: amd64/conf i386/conf
On Sat, Aug 27, 2011 at 10:35:16AM +0200, Eric Masson wrote: > Slawa Olhovchenkov writes: > > Hello, > > > Yes, from FreeBSD 6.x puc.ko don't work. Only in-kernel version work. > > Nope puc.ko module can't attach drivers compiled in kernel, but if both > puc & uart are loaded as modules, they work fine : > The other way could be to ship a stripped down GENERIC kernel and load > modules manually or automagically (devd ?) > Regards May be for fist step: w/o devd, simle remove all posible from GENERIC and include all removed drivers in /boot/loader.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: r225201 - in head/sys: amd64/conf i386/conf
On 8/27/2011 3:53 AM, Slawa Olhovchenkov wrote: > On Sat, Aug 27, 2011 at 10:35:16AM +0200, Eric Masson wrote: > >> Slawa Olhovchenkov writes: >> >> Hello, >> >>> Yes, from FreeBSD 6.x puc.ko don't work. Only in-kernel version work. >> >> Nope puc.ko module can't attach drivers compiled in kernel, but if both >> puc & uart are loaded as modules, they work fine : > > >> The other way could be to ship a stripped down GENERIC kernel and load >> modules manually or automagically (devd ?) >> Regards > > May be for fist step: w/o devd, simle remove all posible from GENERIC and > include all removed > drivers in /boot/loader.conf? You're better off using kld_list in rc.conf for anything that doesn't absolutely have to be loaded with the kernel. -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ ___ 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: r225201 - in head/sys: amd64/conf i386/conf
On Sat, Aug 27, 2011 at 04:45:44AM -0700, Doug Barton wrote: > On 8/27/2011 3:53 AM, Slawa Olhovchenkov wrote: > > On Sat, Aug 27, 2011 at 10:35:16AM +0200, Eric Masson wrote: > > > >> Slawa Olhovchenkov writes: > >> > >> Hello, > >> > >>> Yes, from FreeBSD 6.x puc.ko don't work. Only in-kernel version work. > >> > >> Nope puc.ko module can't attach drivers compiled in kernel, but if both > >> puc & uart are loaded as modules, they work fine : > > > > > >> The other way could be to ship a stripped down GENERIC kernel and load > >> modules manually or automagically (devd ?) > >> Regards > > > > May be for fist step: w/o devd, simle remove all posible from GENERIC and > > include all removed > > drivers in /boot/loader.conf? > > You're better off using kld_list in rc.conf for anything that doesn't > absolutely have to be loaded with the kernel. What drivers in GENERIC don't need to boot from disk or network? sound only? ___ 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: r225214 - in head/sys: arm/at91 conf ddb dev/cfe dev/dcons dev/ofw dev/sio dev/uart modules/dcons modules/sio pc98/cbus powerpc/mambo
Author: rwatson
Date: Sat Aug 27 14:24:27 2011
New Revision: 225214
URL: http://svn.freebsd.org/changeset/base/225214
Log:
Follow up to r225203 refining break-to-debugger run-time configuration
improvements:
(1) Implement new model in previously missed at91 UART driver
(2) Move BREAK_TO_DEBUGGER and ALT_BREAK_TO_DEBUGGER from opt_comconsole.h
to opt_kdb.h (spotted by np)
(3) Garbage collect now-unused opt_comconsole.h
MFC after:3 weeks
Approved by: re (bz)
Modified:
head/sys/arm/at91/uart_dev_at91usart.c
head/sys/conf/options
head/sys/ddb/db_break.c
head/sys/dev/cfe/cfe_console.c
head/sys/dev/dcons/dcons_os.c
head/sys/dev/ofw/ofw_console.c
head/sys/dev/sio/sio.c
head/sys/dev/uart/uart_core.c
head/sys/modules/dcons/Makefile
head/sys/modules/sio/Makefile
head/sys/pc98/cbus/sio.c
head/sys/powerpc/mambo/mambo_console.c
Modified: head/sys/arm/at91/uart_dev_at91usart.c
==
--- head/sys/arm/at91/uart_dev_at91usart.c Sat Aug 27 14:03:27 2011
(r225213)
+++ head/sys/arm/at91/uart_dev_at91usart.c Sat Aug 27 14:24:27 2011
(r225214)
@@ -29,8 +29,6 @@
#include
__FBSDID("$FreeBSD$");
-#include "opt_comconsole.h"
-
#include
#include
#include
@@ -485,25 +483,10 @@ at91_usart_bus_param(struct uart_softc *
static __inline void
at91_rx_put(struct uart_softc *sc, int key)
{
-#if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER)
- int kdb_brk;
- if (sc->sc_sysdev != NULL && sc->sc_sysdev->type == UART_DEV_CONSOLE) {
- if ((kdb_brk = kdb_alt_break(key, &sc->sc_altbrk)) != 0) {
- switch (kdb_brk) {
- case KDB_REQ_DEBUGGER:
- kdb_enter(KDB_WHY_BREAK,
- "Break sequence on console");
- break;
- case KDB_REQ_PANIC:
- kdb_panic("Panic sequence on console");
- break;
- case KDB_REQ_REBOOT:
- kdb_reboot();
- break;
- }
- }
- }
+#if defined(KDB)
+ if (sc->sc_sysdev != NULL && sc->sc_sysdev->type == UART_DEV_CONSOLE)
+ kdb_alt_break(key, &sc->sc_altbrk);
#endif
uart_rx_put(sc, key);
}
Modified: head/sys/conf/options
==
--- head/sys/conf/options Sat Aug 27 14:03:27 2011(r225213)
+++ head/sys/conf/options Sat Aug 27 14:24:27 2011(r225214)
@@ -47,6 +47,8 @@ TWA_DEBUG opt_twa.h
TWA_FLASH_FIRMWARE opt_twa.h
# Debugging options.
+ALT_BREAK_TO_DEBUGGER opt_kdb.h
+BREAK_TO_DEBUGGER opt_kdb.h
DDB
DDB_BUFR_SIZE opt_ddb.h
DDB_CAPTURE_DEFAULTBUFSIZE opt_ddb.h
@@ -637,9 +639,6 @@ BKTR_SIS_VIA_MODE opt_bktr.h
BKTR_USE_FREEBSD_SMBUS opt_bktr.h
BKTR_NEW_MSP34XX_DRIVERopt_bktr.h
-BREAK_TO_DEBUGGER opt_comconsole.h
-ALT_BREAK_TO_DEBUGGER opt_comconsole.h
-
# Options to support PPS
UART_PPS_ON_CTSopt_uart.h
Modified: head/sys/ddb/db_break.c
==
--- head/sys/ddb/db_break.c Sat Aug 27 14:03:27 2011(r225213)
+++ head/sys/ddb/db_break.c Sat Aug 27 14:24:27 2011(r225214)
@@ -35,8 +35,6 @@
#include
__FBSDID("$FreeBSD$");
-#include "opt_comconsole.h"
-
#include
#include
Modified: head/sys/dev/cfe/cfe_console.c
==
--- head/sys/dev/cfe/cfe_console.c Sat Aug 27 14:03:27 2011
(r225213)
+++ head/sys/dev/cfe/cfe_console.c Sat Aug 27 14:24:27 2011
(r225214)
@@ -27,8 +27,6 @@
#include
__FBSDID("$FreeBSD$");
-#include "opt_comconsole.h"
-
#include
#include
#include
Modified: head/sys/dev/dcons/dcons_os.c
==
--- head/sys/dev/dcons/dcons_os.c Sat Aug 27 14:03:27 2011
(r225213)
+++ head/sys/dev/dcons/dcons_os.c Sat Aug 27 14:24:27 2011
(r225214)
@@ -64,7 +64,6 @@
#include
#include
-#include "opt_comconsole.h"
#include "opt_dcons.h"
#include "opt_kdb.h"
#include "opt_gdb.h"
Modified: head/sys/dev/ofw/ofw_console.c
==
--- head/sys/dev/ofw/ofw_console.c Sat Aug 27 14:03:27 2011
(r225213)
+++ head/sys/dev/ofw/ofw_console.c Sat Aug 27 14:24:27 2011
(r225214)
@@ -26,7 +26,6 @@
#include
__FBSDID("$FreeBSD$");
-#include "opt_comconsole.h"
#include "opt_ofw.h"
#include
Modified: head/sys/dev/sio/sio.c
=
svn commit: r225215 - head/bin/ed
Author: brueffer
Date: Sat Aug 27 15:28:57 2011
New Revision: 225215
URL: http://svn.freebsd.org/changeset/base/225215
Log:
Fix memory leaks in error cases.
PR: 159011
Submitted by: Henning Petersen
Approved by: re (kib)
MFC after:1 week
Modified:
head/bin/ed/buf.c
Modified: head/bin/ed/buf.c
==
--- head/bin/ed/buf.c Sat Aug 27 14:24:27 2011(r225214)
+++ head/bin/ed/buf.c Sat Aug 27 15:28:57 2011(r225215)
@@ -94,6 +94,7 @@ put_sbuf_line(const char *cs)
;
if (s - cs >= LINECHARS) {
errmsg = "line too long";
+ free(lp);
return NULL;
}
len = s - cs;
@@ -102,6 +103,7 @@ put_sbuf_line(const char *cs)
if (fseeko(sfp, (off_t)0, SEEK_END) < 0) {
fprintf(stderr, "%s\n", strerror(errno));
errmsg = "cannot seek temp file";
+ free(lp);
return NULL;
}
sfseek = ftello(sfp);
@@ -112,6 +114,7 @@ put_sbuf_line(const char *cs)
sfseek = -1;
fprintf(stderr, "%s\n", strerror(errno));
errmsg = "cannot write temp file";
+ free(lp);
return NULL;
}
lp->len = 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"
Re: svn commit: r225201 - in head/sys: amd64/conf i386/conf
On 08/27/2011 05:44, Slawa Olhovchenkov wrote: > On Sat, Aug 27, 2011 at 04:45:44AM -0700, Doug Barton wrote: > >> On 8/27/2011 3:53 AM, Slawa Olhovchenkov wrote: >>> On Sat, Aug 27, 2011 at 10:35:16AM +0200, Eric Masson wrote: >>> Slawa Olhovchenkov writes: Hello, > Yes, from FreeBSD 6.x puc.ko don't work. Only in-kernel version work. Nope puc.ko module can't attach drivers compiled in kernel, but if both puc & uart are loaded as modules, they work fine : >>> >>> The other way could be to ship a stripped down GENERIC kernel and load modules manually or automagically (devd ?) Regards >>> >>> May be for fist step: w/o devd, simle remove all posible from GENERIC and >>> include all removed >>> drivers in /boot/loader.conf? >> >> You're better off using kld_list in rc.conf for anything that doesn't >> absolutely have to be loaded with the kernel. > > What drivers in GENERIC don't need to boot from disk or network? > sound only? man rc.conf, search for kld_list. -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ ___ 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: r225201 - in head/sys: amd64/conf i386/conf
On Sat, Aug 27, 2011 at 01:32:07PM -0700, Doug Barton wrote: > On 08/27/2011 05:44, Slawa Olhovchenkov wrote: > > On Sat, Aug 27, 2011 at 04:45:44AM -0700, Doug Barton wrote: > > > >> On 8/27/2011 3:53 AM, Slawa Olhovchenkov wrote: > >>> On Sat, Aug 27, 2011 at 10:35:16AM +0200, Eric Masson wrote: > >>> > Slawa Olhovchenkov writes: > > Hello, > > > Yes, from FreeBSD 6.x puc.ko don't work. Only in-kernel version work. > > Nope puc.ko module can't attach drivers compiled in kernel, but if both > puc & uart are loaded as modules, they work fine : > >>> > >>> > The other way could be to ship a stripped down GENERIC kernel and load > modules manually or automagically (devd ?) > Regards > >>> > >>> May be for fist step: w/o devd, simle remove all posible from GENERIC and > >>> include all removed > >>> drivers in /boot/loader.conf? > >> > >> You're better off using kld_list in rc.conf for anything that doesn't > >> absolutely have to be loaded with the kernel. > > > > What drivers in GENERIC don't need to boot from disk or network? > > sound only? > > man rc.conf, search for kld_list. Sorry for bad english. What drivers (from current GENERIC) don't need for network or disk boot and can be moved to kld_list? I see only sound and agp. ___ 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: r225201 - in head/sys: amd64/conf i386/conf
On Sat, Aug 27, 2011 at 2:04 PM, Slawa Olhovchenkov wrote: > On Sat, Aug 27, 2011 at 01:32:07PM -0700, Doug Barton wrote: > >> On 08/27/2011 05:44, Slawa Olhovchenkov wrote: >> > On Sat, Aug 27, 2011 at 04:45:44AM -0700, Doug Barton wrote: >> > >> >> On 8/27/2011 3:53 AM, Slawa Olhovchenkov wrote: >> >>> On Sat, Aug 27, 2011 at 10:35:16AM +0200, Eric Masson wrote: >> >>> >> Slawa Olhovchenkov writes: >> >> Hello, >> >> > Yes, from FreeBSD 6.x puc.ko don't work. Only in-kernel version work. >> >> Nope puc.ko module can't attach drivers compiled in kernel, but if both >> puc & uart are loaded as modules, they work fine : >> >>> >> >>> >> The other way could be to ship a stripped down GENERIC kernel and load >> modules manually or automagically (devd ?) >> Regards >> >>> >> >>> May be for fist step: w/o devd, simle remove all posible from GENERIC >> >>> and include all removed >> >>> drivers in /boot/loader.conf? >> >> >> >> You're better off using kld_list in rc.conf for anything that doesn't >> >> absolutely have to be loaded with the kernel. >> > >> > What drivers in GENERIC don't need to boot from disk or network? >> > sound only? >> >> man rc.conf, search for kld_list. > > Sorry for bad english. > What drivers (from current GENERIC) don't need for network or disk > boot and can be moved to kld_list? > > I see only sound and agp. The answer varies based on your deployment mechanism and requirements. For example: some modules like the kqemu, nvidia, vboxdrv, etc, etc don't need to be loaded until later on in the boot process. That being said, if I'm netbooting I don't need to load storage drivers and the like until later on (unless I want to do some sort of mountroot manipulation, need to have a working kernel dumpable device at boot, etc). -Garrett ___ 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: r225201 - in head/sys: amd64/conf i386/conf
On 08/27/2011 14:04, Slawa Olhovchenkov wrote: > On Sat, Aug 27, 2011 at 01:32:07PM -0700, Doug Barton wrote: > >> On 08/27/2011 05:44, Slawa Olhovchenkov wrote: >>> On Sat, Aug 27, 2011 at 04:45:44AM -0700, Doug Barton wrote: >>> On 8/27/2011 3:53 AM, Slawa Olhovchenkov wrote: > On Sat, Aug 27, 2011 at 10:35:16AM +0200, Eric Masson wrote: > >> Slawa Olhovchenkov writes: >> >> Hello, >> >>> Yes, from FreeBSD 6.x puc.ko don't work. Only in-kernel version work. >> >> Nope puc.ko module can't attach drivers compiled in kernel, but if both >> puc & uart are loaded as modules, they work fine : > > >> The other way could be to ship a stripped down GENERIC kernel and load >> modules manually or automagically (devd ?) >> Regards > > May be for fist step: w/o devd, simle remove all posible from GENERIC and > include all removed > drivers in /boot/loader.conf? You're better off using kld_list in rc.conf for anything that doesn't absolutely have to be loaded with the kernel. >>> >>> What drivers in GENERIC don't need to boot from disk or network? >>> sound only? >> >> man rc.conf, search for kld_list. > > Sorry for bad english. > What drivers (from current GENERIC) don't need for network or disk > boot and can be moved to kld_list? > > I see only sound and agp. I'm not going to do your homework for you. :) Try it and find out for yourself. I will tell you that given that rc.d/kld runs right after the disks are mounted means that (unless you are netbooting) you can put just about everything that isn't directly related to mounting your disks in kld_list. Beyond that, you just need to experiment on your own. Good luck, Doug -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ ___ 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: r225201 - in head/sys: amd64/conf i386/conf
On Sat, Aug 27, 2011 at 02:09:36PM -0700, Garrett Cooper wrote: > >> > What drivers in GENERIC don't need to boot from disk or network? > >> > sound only? > >> > >> man rc.conf, search for kld_list. > > > > Sorry for bad english. > > What drivers (from current GENERIC) don't need for network or disk > > boot and can be moved to kld_list? > > > > I see only sound and agp. > > The answer varies based on your deployment mechanism and > requirements. For example: some modules like the kqemu, nvidia, > vboxdrv, etc, etc don't need to be loaded until later on in the boot > process. That being said, if I'm netbooting I don't need to load > storage drivers and the like until later on (unless I want to do some > sort of mountroot manipulation, need to have a working kernel dumpable > device at boot, etc). > -Garrett No-no-no. GENERIC placed on instalation CD/DVD and updated by freebsd-update. So GENERIC (and modules loaded in /boot/loader.conf from instalation image and in default install) must be enought to install in widest environment. If drivers moved from GENERIC to /boot/loader.conf it allow preserve wide range of installation environment and give light way to reduce count of loaded devices (by edit /boot/loader.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: r225201 - in head/sys: amd64/conf i386/conf
On Sat, Aug 27, 2011 at 02:16:56PM -0700, Doug Barton wrote: > >>> What drivers in GENERIC don't need to boot from disk or network? > >>> sound only? > >> > >> man rc.conf, search for kld_list. > > > > Sorry for bad english. > > What drivers (from current GENERIC) don't need for network or disk > > boot and can be moved to kld_list? > > > > I see only sound and agp. > > I'm not going to do your homework for you. :) Try it and find out for > yourself. I will tell you that given that rc.d/kld runs right after the > disks are mounted means that (unless you are netbooting) you can put > just about everything that isn't directly related to mounting your disks > in kld_list. Beyond that, you just need to experiment on your own. GENERIC need not for me, GENERIC need for everyone: this is kernel on installation image and kernel for first boot after install. ___ 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: r225203 - in head/sys: dev/cfe dev/dcons dev/ofw dev/sio dev/syscons dev/uart kern pc98/cbus powerpc/mambo sys
On 27 Aug 2011, at 09:21, Navdeep Parhar wrote: > Shouldn't opt_comconsole.h be included in subr_kdb.c for this part to > actually work? Should now be fixed; do let me know if not! Robert ___ 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: r225201 - in head/sys: amd64/conf i386/conf
On Sat, Aug 27, 2011 at 2:21 PM, Slawa Olhovchenkov wrote: > On Sat, Aug 27, 2011 at 02:09:36PM -0700, Garrett Cooper wrote: > >> >> > What drivers in GENERIC don't need to boot from disk or network? >> >> > sound only? >> >> >> >> man rc.conf, search for kld_list. >> > >> > Sorry for bad english. >> > What drivers (from current GENERIC) don't need for network or disk >> > boot and can be moved to kld_list? >> > >> > I see only sound and agp. >> >> The answer varies based on your deployment mechanism and >> requirements. For example: some modules like the kqemu, nvidia, >> vboxdrv, etc, etc don't need to be loaded until later on in the boot >> process. That being said, if I'm netbooting I don't need to load >> storage drivers and the like until later on (unless I want to do some >> sort of mountroot manipulation, need to have a working kernel dumpable >> device at boot, etc). >> -Garrett > > No-no-no. > GENERIC placed on instalation CD/DVD and updated by freebsd-update. > So GENERIC (and modules loaded in /boot/loader.conf from instalation > image and in default install) must be enought to install in widest > environment. This method is for customizers more than generalists today. but should potentially be extended to generalists tomorrow (this method is similar to what I would refer to as "pimp my PC"). > If drivers moved from GENERIC to /boot/loader.conf it allow preserve > wide range of installation environment and give light way to reduce > count of loaded devices (by edit /boot/loader.conf). /boot/loader.conf is empty by default. GENERIC for the most part is a complete, monolithic kernel. I'm not sure what the issue is here, because this is for more advanced usage (i.e. you do linux_load="YES" in /boot/loader.conf, etc). Thanks, -Garrett ___ 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: r225201 - in head/sys: amd64/conf i386/conf
On Sat, Aug 27, 2011 at 2:16 PM, Doug Barton wrote: > On 08/27/2011 14:04, Slawa Olhovchenkov wrote: >> On Sat, Aug 27, 2011 at 01:32:07PM -0700, Doug Barton wrote: >> >>> On 08/27/2011 05:44, Slawa Olhovchenkov wrote: On Sat, Aug 27, 2011 at 04:45:44AM -0700, Doug Barton wrote: > On 8/27/2011 3:53 AM, Slawa Olhovchenkov wrote: >> On Sat, Aug 27, 2011 at 10:35:16AM +0200, Eric Masson wrote: >> >>> Slawa Olhovchenkov writes: >>> >>> Hello, >>> Yes, from FreeBSD 6.x puc.ko don't work. Only in-kernel version work. >>> >>> Nope puc.ko module can't attach drivers compiled in kernel, but if both >>> puc & uart are loaded as modules, they work fine : >> >> >>> The other way could be to ship a stripped down GENERIC kernel and load >>> modules manually or automagically (devd ?) >>> Regards >> >> May be for fist step: w/o devd, simle remove all posible from GENERIC >> and include all removed >> drivers in /boot/loader.conf? > > You're better off using kld_list in rc.conf for anything that doesn't > absolutely have to be loaded with the kernel. What drivers in GENERIC don't need to boot from disk or network? sound only? >>> >>> man rc.conf, search for kld_list. >> >> Sorry for bad english. >> What drivers (from current GENERIC) don't need for network or disk >> boot and can be moved to kld_list? >> >> I see only sound and agp. > > I'm not going to do your homework for you. :) Try it and find out for > yourself. I will tell you that given that rc.d/kld runs right after the > disks are mounted means that (unless you are netbooting) you can put > just about everything that isn't directly related to mounting your disks > in kld_list. Beyond that, you just need to experiment on your own. A certain set of quick guidelines (< 1 page should suffice) for kld_list should be devised though. It would at least make quick booting more feasible for the masses. Thanks, -Garrett ___ 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: r225201 - in head/sys: amd64/conf i386/conf
On Sat, Aug 27, 2011 at 02:37:34PM -0700, Garrett Cooper wrote: > > If drivers moved from GENERIC to /boot/loader.conf it allow preserve > > wide range of installation environment and give light way to reduce > > count of loaded devices (by edit /boot/loader.conf). > > /boot/loader.conf is empty by default. GENERIC for the most part > is a complete, monolithic kernel. I'm not sure what the issue is here, > because this is for more advanced usage (i.e. you do linux_load="YES" > in /boot/loader.conf, etc). Yes, I can do linux_load="YES". I can't do NFSSERVER_unload="YES" and remove part of monolithic kernel. I can't applay binary update for part of monolithic kernel and do kldunload module_abc kldload module_abc ___ 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: r225220 - in head: . share/man/man9
Author: brueffer Date: Sat Aug 27 22:08:01 2011 New Revision: 225220 URL: http://svn.freebsd.org/changeset/base/225220 Log: Remove information and MLINK for MULTI_DRIVER_MODULE(). The macro was removed in r121129 almost 8 years ago. PR: 150244 Submitted by: Gireesh Nagabhushana Approved by: re (kib) Modified: head/ObsoleteFiles.inc head/share/man/man9/DRIVER_MODULE.9 head/share/man/man9/Makefile Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Sat Aug 27 21:23:21 2011(r225219) +++ head/ObsoleteFiles.inc Sat Aug 27 22:08:01 2011(r225220) @@ -2293,6 +2293,8 @@ OLD_FILES+=lib/libz.so OLD_FILES+=bin/cxconfig OLD_FILES+=sbin/cxconfig OLD_FILES+=usr/share/man/man8/cxconfig.8.gz +# 20031016: MULTI_DRIVER_MODULE macro removed +OLD_FILES+=usr/share/man/man9/MULTI_DRIVER_MODULE.9.gz # 200309XX OLD_FILES+=usr/bin/symorder OLD_FILES+=usr/share/man/man1/symorder.1.gz Modified: head/share/man/man9/DRIVER_MODULE.9 == --- head/share/man/man9/DRIVER_MODULE.9 Sat Aug 27 21:23:21 2011 (r225219) +++ head/share/man/man9/DRIVER_MODULE.9 Sat Aug 27 22:08:01 2011 (r225220) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 16, 2000 +.Dd August 27, 2011 .Dt DRIVER_MODULE 9 .Os .Sh NAME @@ -40,7 +40,6 @@ .In sys/bus.h .In sys/module.h .Fn DRIVER_MODULE name busname "driver_t driver" "devclass_t devclass" "modeventhand_t evh" "void *arg" -.Fn MULTI_DRIVER_MODULE name busname "driver_t drivers[]" "devclass_t devclass" "modeventhand_t evh" "void *arg" .Sh DESCRIPTION The .Fn DRIVER_MODULE @@ -96,11 +95,6 @@ The is unused at this time and should be a .Dv NULL pointer. -.Pp -.Fn MULTI_DRIVER_MODULE -is a special version of -.Fn DRIVER_MODULE , -which takes a list of drivers instead of a single driver instance. .Sh SEE ALSO .Xr device 9 , .Xr driver 9 , Modified: head/share/man/man9/Makefile == --- head/share/man/man9/MakefileSat Aug 27 21:23:21 2011 (r225219) +++ head/share/man/man9/MakefileSat Aug 27 22:08:01 2011 (r225220) @@ -605,7 +605,6 @@ MLINKS+=domain.9 DOMAIN_SET.9 \ domain.9 pfctlinput2.9 \ domain.9 pffindproto.9 \ domain.9 pffindtype.9 -MLINKS+=DRIVER_MODULE.9 MULTI_DRIVER_MODULE.9 MLINKS+=EVENTHANDLER.9 EVENTHANDLER_DECLARE.9 \ EVENTHANDLER.9 EVENTHANDLER_DEREGISTER.9 \ EVENTHANDLER.9 eventhandler_deregister.9 \ ___ 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: r225221 - head/sys/dev/syscons
Author: rwatson
Date: Sat Aug 27 22:10:45 2011
New Revision: 225221
URL: http://svn.freebsd.org/changeset/base/225221
Log:
Add support for alternative break-to-debugger to syscons(4). While most
keyboards allow console break sequences (such as ctrl-alt-esc) to be
entered, alternative break can prove useful under virtualisation and
remote console systems where entering control sequences can be
difficult or unreliable.
MFC after:3 weeks
Approved by: re (bz)
Modified:
head/sys/dev/syscons/syscons.c
head/sys/dev/syscons/syscons.h
Modified: head/sys/dev/syscons/syscons.c
==
--- head/sys/dev/syscons/syscons.c Sat Aug 27 22:08:01 2011
(r225220)
+++ head/sys/dev/syscons/syscons.c Sat Aug 27 22:10:45 2011
(r225221)
@@ -3562,6 +3562,10 @@ next_code:
/* goto next_code */
} else {
/* regular keys (maybe MKEY is set) */
+#if !defined(SC_DISABLE_KDBKEY) && defined(KDB)
+ if (enable_kdbkey)
+ kdb_alt_break(c, &sc->sc_altbrk);
+#endif
if (!(sc->flags & SC_SCRN_BLANKED))
return c;
}
Modified: head/sys/dev/syscons/syscons.h
==
--- head/sys/dev/syscons/syscons.h Sat Aug 27 22:08:01 2011
(r225220)
+++ head/sys/dev/syscons/syscons.h Sat Aug 27 22:10:45 2011
(r225221)
@@ -266,6 +266,9 @@ typedef struct sc_softc {
u_char cursor_char;
u_char mouse_char;
+#ifdef KDB
+ int sc_altbrk;
+#endif
} sc_softc_t;
/* virtual screen */
___
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: r225222 - head
Author: brueffer Date: Sat Aug 27 22:10:53 2011 New Revision: 225222 URL: http://svn.freebsd.org/changeset/base/225222 Log: Correct some old manpage removal entries. Approved by: re (kib) Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Sat Aug 27 22:10:45 2011(r225221) +++ head/ObsoleteFiles.inc Sat Aug 27 22:10:53 2011(r225222) @@ -2043,9 +2043,9 @@ OLD_FILES+=usr/share/man/man5/ipsend.5.g OLD_FILES+=usr/bin/gtar OLD_FILES+=usr/share/man/man1/gtar.1.gz # 200503XX -OLD_FILES+=share/man/man3/exp10.3.gz -OLD_FILES+=share/man/man3/exp10f.3.gz -OLD_FILES+=share/man/man3/fpsetsticky.3.gz +OLD_FILES+=usr/share/man/man3/exp10.3.gz +OLD_FILES+=usr/share/man/man3/exp10f.3.gz +OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz # 20050324: updated release infrastructure OLD_FILES+=usr/share/man/man5/drivers.conf.5.gz # 20050317: removed from BIND 9 distribution ___ 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: r221233 - head/sbin/fsck_ffs
On 2011-Apr-29 23:00:23 +, Dag-Erling Smorgrav wrote: >Log: > Add an -E option to mirror newfs's. The idea is that if you have a system ... > MFC after: 3 weeks It's now nearly 4 months later. Was there a technical issue why this wasn't MFC'd or was it just lack of time or oversight? -- Peter Jeremy pgpgEsUmew6wj.pgp Description: PGP signature
Re: svn commit: r225201 - in head/sys: amd64/conf i386/conf
On 08/27/2011 14:39, Garrett Cooper wrote: > A certain set of quick guidelines (< 1 page should suffice) for > kld_list should be devised though. I look forward to reviewing your draft of that. :) -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ ___ 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: r225201 - in head/sys: amd64/conf i386/conf
On 08/27/2011 14:23, Slawa Olhovchenkov wrote: > GENERIC need not for me, GENERIC need for everyone: this is kernel on > installation image and kernel for first boot after install. We covered this a few weeks ago. The mechanism used to load modules by loader.conf is vrryyy sllow. Many times slower than loading the modules from disk after the system has booted. As a result doing what you're suggesting would not be appropriate. Doug -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ ___ 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: r225223 - head/sys/netinet
Author: qingli Date: Sun Aug 28 00:14:40 2011 New Revision: 225223 URL: http://svn.freebsd.org/changeset/base/225223 Log: When an interface address route is removed from the system, another route with the same prefix is searched for as a replacement. The current code did not bypass routes that have non-operational interfaces. This patch fixes that bug and will find a replacement route with an active interface. PR: kern/159603 Submitted by: pluknet, ambrisko at ambrisko dot com Reviewed by: discussed on net@ Approved by: re (bz) MFC after:3 days Modified: head/sys/netinet/in.c Modified: head/sys/netinet/in.c == --- head/sys/netinet/in.c Sat Aug 27 22:10:53 2011(r225222) +++ head/sys/netinet/in.c Sun Aug 28 00:14:40 2011(r225223) @@ -1163,7 +1163,8 @@ in_scrubprefix(struct in_ifaddr *target, p.s_addr &= ia->ia_sockmask.sin_addr.s_addr; } - if (prefix.s_addr != p.s_addr) + if ((prefix.s_addr != p.s_addr) || + !(ia->ia_ifp->if_flags & IFF_UP)) continue; /* ___ 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"
