svn commit: r245839 - head/usr.bin/dtc
Author: theraven
Date: Wed Jan 23 08:54:34 2013
New Revision: 245839
URL: http://svnweb.freebsd.org/changeset/base/245839
Log:
Explicitly include headers that are implicitly included by libstdc++. Fixes
building dtc with libc++.
Modified:
head/usr.bin/dtc/checking.cc
head/usr.bin/dtc/dtb.cc
head/usr.bin/dtc/dtc.cc
head/usr.bin/dtc/fdt.cc
head/usr.bin/dtc/input_buffer.cc
head/usr.bin/dtc/string.cc
Modified: head/usr.bin/dtc/checking.cc
==
--- head/usr.bin/dtc/checking.ccWed Jan 23 07:27:38 2013
(r245838)
+++ head/usr.bin/dtc/checking.ccWed Jan 23 08:54:34 2013
(r245839)
@@ -31,6 +31,7 @@
*/
#include checking.hh
+#include stdio.h
namespace dtc
{
Modified: head/usr.bin/dtc/dtb.cc
==
--- head/usr.bin/dtc/dtb.cc Wed Jan 23 07:27:38 2013(r245838)
+++ head/usr.bin/dtc/dtb.cc Wed Jan 23 08:54:34 2013(r245839)
@@ -31,7 +31,11 @@
*/
#include dtb.hh
+#include sys/types.h
#include inttypes.h
+#include stdio.h
+#include unistd.h
+
namespace dtc
{
Modified: head/usr.bin/dtc/dtc.cc
==
--- head/usr.bin/dtc/dtc.cc Wed Jan 23 07:27:38 2013(r245838)
+++ head/usr.bin/dtc/dtc.cc Wed Jan 23 08:54:34 2013(r245839)
@@ -31,10 +31,14 @@
*/
#include sys/resource.h
-#include time.h
-#include stdio.h
#include fcntl.h
#include libgen.h
+#include limits.h
+#include stdio.h
+#include stdlib.h
+#include time.h
+#include unistd.h
+
#include fdt.hh
#include checking.hh
Modified: head/usr.bin/dtc/fdt.cc
==
--- head/usr.bin/dtc/fdt.cc Wed Jan 23 07:27:38 2013(r245838)
+++ head/usr.bin/dtc/fdt.cc Wed Jan 23 08:54:34 2013(r245839)
@@ -33,9 +33,13 @@
#include fdt.hh
#include algorithm
-#include inttypes.h
+#include ctype.h
#include fcntl.h
+#include inttypes.h
#include libgen.h
+#include stdio.h
+#include stdlib.h
+#include unistd.h
#include dtb.hh
namespace dtc
Modified: head/usr.bin/dtc/input_buffer.cc
==
--- head/usr.bin/dtc/input_buffer.ccWed Jan 23 07:27:38 2013
(r245838)
+++ head/usr.bin/dtc/input_buffer.ccWed Jan 23 08:54:34 2013
(r245839)
@@ -31,8 +31,13 @@
*/
#include input_buffer.hh
-#include string.h
+#include ctype.h
+#include limits.h
#include stdint.h
+#include stdio.h
+#include stdlib.h
+#include string.h
+
#include sys/stat.h
#include sys/mman.h
Modified: head/usr.bin/dtc/string.cc
==
--- head/usr.bin/dtc/string.cc Wed Jan 23 07:27:38 2013(r245838)
+++ head/usr.bin/dtc/string.cc Wed Jan 23 08:54:34 2013(r245839)
@@ -31,6 +31,8 @@
*/
#include string.hh
+#include ctype.h
+#include stdio.h
namespace
{
___
svn-src-all@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 commit: r245840 - head/sys/libkern
Author: andrew
Date: Wed Jan 23 09:18:18 2013
New Revision: 245840
URL: http://svnweb.freebsd.org/changeset/base/245840
Log:
Add __aeabi_ulcmp to allow building of the LINT kernel.
Modified:
head/sys/libkern/quad.h
head/sys/libkern/ucmpdi2.c
Modified: head/sys/libkern/quad.h
==
--- head/sys/libkern/quad.h Wed Jan 23 08:54:34 2013(r245839)
+++ head/sys/libkern/quad.h Wed Jan 23 09:18:18 2013(r245840)
@@ -110,4 +110,9 @@ u_quad_t__udivdi3(u_quad_t a, u_quad_t
u_quad_t __umoddi3(u_quad_t a, u_quad_t b);
int__ucmpdi2(u_quad_t a, u_quad_t b);
+/* ARM EABI support functions. */
+#ifdef __ARM_EABI__
+int__aeabi_ulcmp(unsigned long long, unsigned long long);
+#endif
+
#endif /* !_LIBKERN_QUAD_H_ */
Modified: head/sys/libkern/ucmpdi2.c
==
--- head/sys/libkern/ucmpdi2.c Wed Jan 23 08:54:34 2013(r245839)
+++ head/sys/libkern/ucmpdi2.c Wed Jan 23 09:18:18 2013(r245840)
@@ -51,3 +51,15 @@ __ucmpdi2(a, b)
return (aa.ul[H] bb.ul[H] ? 0 : aa.ul[H] bb.ul[H] ? 2 :
aa.ul[L] bb.ul[L] ? 0 : aa.ul[L] bb.ul[L] ? 2 : 1);
}
+
+#ifdef __ARM_EABI__
+/*
+ * Return -1, 0 or 1 as a , =, b respectively.
+ */
+int
+__aeabi_ulcmp(unsigned long long a, unsigned long long b)
+{
+ return __ucmpdi2(a, b) - 1;
+}
+#endif
+
___
svn-src-all@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 commit: r245841 - head/lib/libc/sys
Author: glebius Date: Wed Jan 23 10:50:52 2013 New Revision: 245841 URL: http://svnweb.freebsd.org/changeset/base/245841 Log: posix_fadvise(2) first appeared in FreeBSD 9.1 Modified: head/lib/libc/sys/posix_fadvise.2 Modified: head/lib/libc/sys/posix_fadvise.2 == --- head/lib/libc/sys/posix_fadvise.2 Wed Jan 23 09:18:18 2013 (r245840) +++ head/lib/libc/sys/posix_fadvise.2 Wed Jan 23 10:50:52 2013 (r245841) @@ -134,4 +134,4 @@ interface conforms to The .Fn posix_fadvise system call first appeared in -.Fx 10.0 . +.Fx 9.1 . ___ svn-src-all@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 commit: r245842 - stable/9/lib/libc/sys
Author: glebius Date: Wed Jan 23 10:52:36 2013 New Revision: 245842 URL: http://svnweb.freebsd.org/changeset/base/245842 Log: Merge r245841: posix_fadvise(2) first appeared in FreeBSD 9.1 Modified: stable/9/lib/libc/sys/posix_fadvise.2 Directory Properties: stable/9/lib/libc/ (props changed) stable/9/lib/libc/sys/ (props changed) Modified: stable/9/lib/libc/sys/posix_fadvise.2 == --- stable/9/lib/libc/sys/posix_fadvise.2 Wed Jan 23 10:50:52 2013 (r245841) +++ stable/9/lib/libc/sys/posix_fadvise.2 Wed Jan 23 10:52:36 2013 (r245842) @@ -135,4 +135,4 @@ interface conforms to The .Fn posix_fadvise system call first appeared in -.Fx 10.0 . +.Fx 9.1 . ___ svn-src-all@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
Re: svn commit: r245837 - head/usr.sbin/pkg_install/lib
On Wed, Jan 23, 2013 at 07:22:33AM +, Jason Evans wrote:
Author: jasone
Date: Wed Jan 23 07:22:33 2013
New Revision: 245837
URL: http://svnweb.freebsd.org/changeset/base/245837
Log:
Fix compilation errors.
Modified:
head/usr.sbin/pkg_install/lib/pkgng.c
Modified: head/usr.sbin/pkg_install/lib/pkgng.c
==
--- head/usr.sbin/pkg_install/lib/pkgng.c Wed Jan 23 05:37:45 2013
(r245836)
+++ head/usr.sbin/pkg_install/lib/pkgng.c Wed Jan 23 07:22:33 2013
(r245837)
@@ -50,8 +50,8 @@ void warnpkgng(void)
if (pkgngdir == NULL)
pkgngdir = /var/db/pkg;
- rc = snprintf(pkgngpath, sizeof(pkgngpath) %s/local.sqlite, pkgngdir);
- if (rc = sizeof(pkgngpath)) {
+ rc = snprintf(pkgngpath, sizeof(pkgngpath), %s/local.sqlite,
pkgngdir);
+ if ((size_t)rc = sizeof(pkgngpath)) {
warnx(path too long: %s/local.sqlite, pkgngdir);
return;
}
___
svn-src-all@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
thanks and sorry about that
regards,
Bapt
pgpqbvwo7mWJD.pgp
Description: PGP signature
Re: svn commit: r245700 - head/usr.sbin/bsdinstall/partedit
On Sun, 2013-01-20 at 22:25:59 +, Nathan Whitehorn wrote:
Author: nwhitehorn
Date: Sun Jan 20 22:25:58 2013
New Revision: 245700
URL: http://svnweb.freebsd.org/changeset/base/245700
Log:
Add a simple scripted partitioner. Documentation and more scripting support
will come soon. This lets the install process have a line like:
bsdinstall scriptedpart 'ada0 GPT {1.5G freebsd-ufs /, 10G freebsd-swap,
auto freebsd-ufs /usr}'
to set up a system with a 1.5GB /, some swap space, and a /usr using the
rest of ada0.
What will be the alignment/offset for these? (and also for the fully
automated case?)
We should make sure the first partition starts at 1MB all the time,
unless the user points the gun at his feet ...
Thanks
Uli
___
svn-src-all@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
Re: svn commit: r245700 - head/usr.sbin/bsdinstall/partedit
On 01/23/13 05:53, Ulrich Spörlein wrote:
On Sun, 2013-01-20 at 22:25:59 +, Nathan Whitehorn wrote:
Author: nwhitehorn
Date: Sun Jan 20 22:25:58 2013
New Revision: 245700
URL: http://svnweb.freebsd.org/changeset/base/245700
Log:
Add a simple scripted partitioner. Documentation and more scripting support
will come soon. This lets the install process have a line like:
bsdinstall scriptedpart 'ada0 GPT {1.5G freebsd-ufs /, 10G freebsd-swap,
auto freebsd-ufs /usr}'
to set up a system with a 1.5GB /, some swap space, and a /usr using the
rest of ada0.
What will be the alignment/offset for these? (and also for the fully
automated case?)
We should make sure the first partition starts at 1MB all the time,
unless the user points the gun at his feet ...
Thanks
Uli
The partition alignment always follows the stripesize parameter of the
backing GEOM. If that gives wrong alignment (which it never or nearly
never seems to, in practice), it needs to be fixed there so that file
systems can also plan appropriately.
-Nathan
___
svn-src-all@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 commit: r245844 - head/sys/fs/ext2fs
Author: pfg Date: Wed Jan 23 14:29:29 2013 New Revision: 245844 URL: http://svnweb.freebsd.org/changeset/base/245844 Log: ext2fs: fix a check for negative block numbers. The previous change accidentally left the substraction we were trying to avoid in case that i_blocks could become negative. Reported by: bde MFC after:4 days Modified: head/sys/fs/ext2fs/ext2_inode.c Modified: head/sys/fs/ext2fs/ext2_inode.c == --- head/sys/fs/ext2fs/ext2_inode.c Wed Jan 23 14:14:13 2013 (r245843) +++ head/sys/fs/ext2fs/ext2_inode.c Wed Jan 23 14:29:29 2013 (r245844) @@ -341,10 +341,9 @@ done: * Put back the real size. */ oip-i_size = length; - oip-i_blocks -= blocksreleased; if (oip-i_blocks blocksreleased) oip-i_blocks -= blocksreleased; - else/* sanity */ + else/* sanity */ oip-i_blocks = 0; oip-i_flag |= IN_CHANGE; vnode_pager_setsize(ovp, length); ___ svn-src-all@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 commit: r245845 - head/sys/kern
Author: jhb Date: Wed Jan 23 14:37:05 2013 New Revision: 245845 URL: http://svnweb.freebsd.org/changeset/base/245845 Log: Fix a typo. Modified: head/sys/kern/subr_bus.c Modified: head/sys/kern/subr_bus.c == --- head/sys/kern/subr_bus.cWed Jan 23 14:29:29 2013(r245844) +++ head/sys/kern/subr_bus.cWed Jan 23 14:37:05 2013(r245845) @@ -3318,7 +3318,7 @@ resource_list_release(struct resource_li /** * @brief Fully release a reserved resource * - * Fully releases a resouce reserved via resource_list_reserve(). + * Fully releases a resource reserved via resource_list_reserve(). * * @param rl the resource list which was allocated from * @param bus the parent device of @p child ___ svn-src-all@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 commit: r245847 - stable/8/sys/boot/i386/libi386
Author: jhb
Date: Wed Jan 23 18:19:50 2013
New Revision: 245847
URL: http://svnweb.freebsd.org/changeset/base/245847
Log:
MFC 229435:
Add special loader environment variables 'comconsole_port' and
'comconsole_pcidev'. The former allows to set the base address of the
serial console i/o port. The later takes the string of the format
'bus:device:function:[bar]' as a value and uses the serial port attached
as PCI device at the specified location for console.
Both variants pass 'hw.uart.console' variable to the uart driver to
properly hand-over the kernel console.
Change allows to use ISA serial ports other than COM1 for the
loader/kernel console without loader recompilation. Also, you can use
PCI-attached port as the console, e.g. Intel AMT serial pseudo-port on
some motherboards based on Q67 chipset.
Modified:
stable/8/sys/boot/i386/libi386/biospci.c
stable/8/sys/boot/i386/libi386/comconsole.c
stable/8/sys/boot/i386/libi386/libi386.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/boot/ (props changed)
Modified: stable/8/sys/boot/i386/libi386/biospci.c
==
--- stable/8/sys/boot/i386/libi386/biospci.cWed Jan 23 16:28:34 2013
(r245846)
+++ stable/8/sys/boot/i386/libi386/biospci.cWed Jan 23 18:19:50 2013
(r245847)
@@ -342,3 +342,9 @@ biospci_read_config(uint32_t locator, in
return (0);
}
+uint32_t
+biospci_locator(int8_t bus, uint8_t device, uint8_t function)
+{
+
+ return ((bus 8) | ((device 0x1f) 3) | (function 0x7));
+}
Modified: stable/8/sys/boot/i386/libi386/comconsole.c
==
--- stable/8/sys/boot/i386/libi386/comconsole.c Wed Jan 23 16:28:34 2013
(r245846)
+++ stable/8/sys/boot/i386/libi386/comconsole.c Wed Jan 23 18:19:50 2013
(r245847)
@@ -30,6 +30,7 @@ __FBSDID($FreeBSD$);
#include bootstrap.h
#include machine/cpufunc.h
#include dev/ic/ns16550.h
+#include dev/pci/pcireg.h
#include libi386.h
#define COMC_FMT 0x3 /* 8N1 */
@@ -49,14 +50,23 @@ static int comc_init(int arg);
static voidcomc_putchar(int c);
static int comc_getchar(void);
static int comc_getspeed(void);
+static voidset_hw_console_hint(void);
static int comc_ischar(void);
-static int comc_parsespeed(const char *string);
-static voidcomc_setup(int speed);
+static int comc_parseint(const char *string);
+static uint32_t comc_parse_pcidev(const char *string);
+static int comc_pcidev_set(struct env_var *ev, int flags,
+ const void *value);
+static int comc_pcidev_handle(uint32_t locator);
+static int comc_port_set(struct env_var *ev, int flags,
+ const void *value);
+static voidcomc_setup(int speed, int port);
static int comc_speed_set(struct env_var *ev, int flags,
const void *value);
static int comc_started;
static int comc_curspeed;
+static int comc_port = COMPORT;
+static uint32_tcomc_locator;
struct console comconsole = {
comconsole,
@@ -72,9 +82,10 @@ struct console comconsole = {
static void
comc_probe(struct console *cp)
{
-char speedbuf[16];
-char *cons, *speedenv;
-int speed;
+char intbuf[16];
+char *cons, *env;
+int speed, port;
+uint32_t locator;
/* XXX check the BIOS equipment list? */
cp-c_flags |= (C_PRESENTIN | C_PRESENTOUT);
@@ -90,16 +101,40 @@ comc_probe(struct console *cp)
getenv(boot_multicons) != NULL) {
comc_curspeed = comc_getspeed();
}
- speedenv = getenv(comconsole_speed);
- if (speedenv != NULL) {
- speed = comc_parsespeed(speedenv);
+
+ env = getenv(comconsole_speed);
+ if (env != NULL) {
+ speed = comc_parseint(env);
if (speed 0)
comc_curspeed = speed;
}
- sprintf(speedbuf, %d, comc_curspeed);
+ sprintf(intbuf, %d, comc_curspeed);
unsetenv(comconsole_speed);
- env_setenv(comconsole_speed, EV_VOLATILE, speedbuf, comc_speed_set,
+ env_setenv(comconsole_speed, EV_VOLATILE, intbuf, comc_speed_set,
+ env_nounset);
+
+ env = getenv(comconsole_port);
+ if (env != NULL) {
+ port = comc_parseint(env);
+ if (port 0)
+ comc_port = port;
+ }
+
+ sprintf(intbuf, %d, comc_port);
+ unsetenv(comconsole_port);
+ env_setenv(comconsole_port, EV_VOLATILE, intbuf, comc_port_set,
+ env_nounset);
+
+ env = getenv(comconsole_pcidev);
+ if (env != NULL) {
+ locator = comc_parse_pcidev(env);
+ if (locator != 0)
+ comc_pcidev_handle(locator);
+ }
+
+ unsetenv(comconsole_pcidev);
+ env_setenv(comconsole_pcidev, EV_VOLATILE, env, comc_pcidev_set,
svn commit: r245848 - head/sys/boot/i386/libi386
Author: jhb
Date: Wed Jan 23 18:34:21 2013
New Revision: 245848
URL: http://svnweb.freebsd.org/changeset/base/245848
Log:
Always update the hw.uart.console hint anytime a change is made to the
comconsole setup. Previously the hint would be set when if you set a
custom port, but it would not be updated if you later set a custom speed.
Also, leave the hw.uart.console hint mutable so it can be overridden or
unset by the user if needed.
Reviewed by: kib (earlier version)
MFC after:1 week
Modified:
head/sys/boot/i386/libi386/comconsole.c
Modified: head/sys/boot/i386/libi386/comconsole.c
==
--- head/sys/boot/i386/libi386/comconsole.c Wed Jan 23 18:19:50 2013
(r245847)
+++ head/sys/boot/i386/libi386/comconsole.c Wed Jan 23 18:34:21 2013
(r245848)
@@ -50,7 +50,6 @@ static intcomc_init(int arg);
static voidcomc_putchar(int c);
static int comc_getchar(void);
static int comc_getspeed(void);
-static voidset_hw_console_hint(void);
static int comc_ischar(void);
static int comc_parseint(const char *string);
static uint32_t comc_parse_pcidev(const char *string);
@@ -202,27 +201,14 @@ comc_port_set(struct env_var *ev, int fl
}
if ((comconsole.c_flags (C_ACTIVEIN | C_ACTIVEOUT)) != 0
- comc_port != port) {
+ comc_port != port)
comc_setup(comc_curspeed, port);
- set_hw_console_hint();
-}
env_setenv(ev-ev_name, flags | EV_NOHOOK, value, NULL, NULL);
return (CMD_OK);
}
-static void
-set_hw_console_hint(void)
-{
- char intbuf[64];
-
- unsetenv(hw.uart.console);
- sprintf(intbuf, io:%d,br:%d, comc_port, comc_curspeed);
- env_setenv(hw.uart.console, EV_VOLATILE, intbuf,
- env_noset, env_nounset);
-}
-
/*
* Input: bus:dev:func[:bar]. If bar is not specified, it is 0x10.
* Output: bar[24:16] bus[15:8] dev[7:3] func[2:0]
@@ -288,7 +274,6 @@ comc_pcidev_handle(uint32_t locator)
comc_port_set, env_nounset);
comc_setup(comc_curspeed, port);
- set_hw_console_hint();
comc_locator = locator;
return (CMD_OK);
@@ -318,8 +303,10 @@ static void
comc_setup(int speed, int port)
{
static int TRY_COUNT = 100;
+char intbuf[64];
int tries;
+unsetenv(hw.uart.console);
comc_curspeed = speed;
comc_port = port;
@@ -334,9 +321,11 @@ comc_setup(int speed, int port)
inb(comc_port + com_data);
while (inb(comc_port + com_lsr) LSR_RXRDY ++tries TRY_COUNT);
-if (tries TRY_COUNT)
+if (tries TRY_COUNT) {
comconsole.c_flags |= (C_PRESENTIN | C_PRESENTOUT);
-else
+ sprintf(intbuf, io:%d,br:%d, comc_port, comc_curspeed);
+ env_setenv(hw.uart.console, EV_VOLATILE, intbuf, NULL, NULL);
+} else
comconsole.c_flags = ~(C_PRESENTIN | C_PRESENTOUT);
}
___
svn-src-all@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 commit: r245849 - in head/sys: amd64/linux32 compat/linux i386/linux
Author: jhb
Date: Wed Jan 23 21:44:48 2013
New Revision: 245849
URL: http://svnweb.freebsd.org/changeset/base/245849
Log:
Don't assume that all Linux TCP-level socket options are identical to
FreeBSD TCP-level socket options (only the first two are). Instead,
using a mapping function and fail unsupported options as we do for other
socket option levels.
MFC after:2 weeks
Modified:
head/sys/amd64/linux32/linux.h
head/sys/compat/linux/linux_socket.c
head/sys/i386/linux/linux.h
Modified: head/sys/amd64/linux32/linux.h
==
--- head/sys/amd64/linux32/linux.h Wed Jan 23 18:34:21 2013
(r245848)
+++ head/sys/amd64/linux32/linux.h Wed Jan 23 21:44:48 2013
(r245849)
@@ -725,6 +725,13 @@ union l_semun {
#defineLINUX_IP_ADD_MEMBERSHIP 35
#defineLINUX_IP_DROP_MEMBERSHIP36
+#defineLINUX_TCP_NODELAY 1
+#defineLINUX_TCP_MAXSEG2
+#defineLINUX_TCP_KEEPIDLE 4
+#defineLINUX_TCP_KEEPINTVL 5
+#defineLINUX_TCP_KEEPCNT 6
+#defineLINUX_TCP_MD5SIG14
+
struct l_sockaddr {
l_ushortsa_family;
charsa_data[14];
Modified: head/sys/compat/linux/linux_socket.c
==
--- head/sys/compat/linux/linux_socket.cWed Jan 23 18:34:21 2013
(r245848)
+++ head/sys/compat/linux/linux_socket.cWed Jan 23 21:44:48 2013
(r245849)
@@ -56,6 +56,7 @@ __FBSDID($FreeBSD$);
#include netinet/in.h
#include netinet/in_systm.h
#include netinet/ip.h
+#include netinet/tcp.h
#ifdef INET6
#include netinet/ip6.h
#include netinet6/ip6_var.h
@@ -326,6 +327,27 @@ linux_to_bsd_so_sockopt(int opt)
}
static int
+linux_to_bsd_tcp_sockopt(int opt)
+{
+
+ switch (opt) {
+ case LINUX_TCP_NODELAY:
+ return (TCP_NODELAY);
+ case LINUX_TCP_MAXSEG:
+ return (TCP_MAXSEG);
+ case LINUX_TCP_KEEPIDLE:
+ return (TCP_KEEPIDLE);
+ case LINUX_TCP_KEEPINTVL:
+ return (TCP_KEEPINTVL);
+ case LINUX_TCP_KEEPCNT:
+ return (TCP_KEEPCNT);
+ case LINUX_TCP_MD5SIG:
+ return (TCP_MD5SIG);
+ }
+ return (-1);
+}
+
+static int
linux_to_bsd_msg_flags(int flags)
{
int ret_flags = 0;
@@ -1496,8 +1518,7 @@ linux_setsockopt(struct thread *td, stru
name = linux_to_bsd_ip_sockopt(args-optname);
break;
case IPPROTO_TCP:
- /* Linux TCP option values match BSD's */
- name = args-optname;
+ name = linux_to_bsd_tcp_sockopt(args-optname);
break;
default:
name = -1;
@@ -1591,8 +1612,7 @@ linux_getsockopt(struct thread *td, stru
name = linux_to_bsd_ip_sockopt(args-optname);
break;
case IPPROTO_TCP:
- /* Linux TCP option values match BSD's */
- name = args-optname;
+ name = linux_to_bsd_tcp_sockopt(args-optname);
break;
default:
name = -1;
Modified: head/sys/i386/linux/linux.h
==
--- head/sys/i386/linux/linux.h Wed Jan 23 18:34:21 2013(r245848)
+++ head/sys/i386/linux/linux.h Wed Jan 23 21:44:48 2013(r245849)
@@ -701,6 +701,13 @@ union l_semun {
#defineLINUX_IP_ADD_MEMBERSHIP 35
#defineLINUX_IP_DROP_MEMBERSHIP36
+#defineLINUX_TCP_NODELAY 1
+#defineLINUX_TCP_MAXSEG2
+#defineLINUX_TCP_KEEPIDLE 4
+#defineLINUX_TCP_KEEPINTVL 5
+#defineLINUX_TCP_KEEPCNT 6
+#defineLINUX_TCP_MD5SIG14
+
struct l_sockaddr {
l_ushortsa_family;
charsa_data[14];
___
svn-src-all@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 commit: r245850 - in head/sys/sparc64: include sparc64
Author: marius
Date: Wed Jan 23 22:52:20 2013
New Revision: 245850
URL: http://svnweb.freebsd.org/changeset/base/245850
Log:
Revert the part of r239864 which removed obtaining the SMP mutex around
reading registers from other CPUs. As it turns out, the hardware doesn't
really like concurrent IPI'ing causing adverse effects. Also the thought
deadlock when using this spin lock here and the targeted CPU(s) are also
holding or in case of nested locks can't actually happen. This is due to
the fact that on sparc64, spinlock_enter() only raises the PIL but doesn't
disable interrupts completely. Thus direct cross calls as used for the
register reading (and all other MD IPI needs) still will be executed by
the targeted CPU(s) in that case.
MFC after:3 days
Modified:
head/sys/sparc64/include/smp.h
head/sys/sparc64/sparc64/tick.c
Modified: head/sys/sparc64/include/smp.h
==
--- head/sys/sparc64/include/smp.h Wed Jan 23 21:44:48 2013
(r245849)
+++ head/sys/sparc64/include/smp.h Wed Jan 23 22:52:20 2013
(r245850)
@@ -42,6 +42,7 @@
#include sys/cpuset.h
#include sys/proc.h
#include sys/sched.h
+#include sys/smp.h
#include machine/intr_machdep.h
#include machine/pcb.h
@@ -202,6 +203,7 @@ ipi_rd(u_int cpu, void *func, u_long *va
return (NULL);
sched_pin();
ira = ipi_rd_args;
+ mtx_lock_spin(smp_ipi_mtx);
CPU_SETOF(cpu, ira-ira_mask);
ira-ira_val = val;
cpu_ipi_single(cpu, 0, (u_long)func, (u_long)ira);
@@ -298,18 +300,6 @@ ipi_wait(void *cookie)
}
}
-static __inline void
-ipi_wait_unlocked(void *cookie)
-{
- volatile cpuset_t *mask;
-
- if ((mask = cookie) != NULL) {
- while (!CPU_EMPTY(mask))
- ;
- sched_unpin();
- }
-}
-
#endif /* _MACHINE_PMAP_H_ _SYS_MUTEX_H_ */
#endif /* !LOCORE */
@@ -368,12 +358,6 @@ ipi_wait(void *cookie __unused)
}
static __inline void
-ipi_wait_unlocked(void *cookie __unused)
-{
-
-}
-
-static __inline void
tl_ipi_cheetah_dcache_page_inval(void)
{
Modified: head/sys/sparc64/sparc64/tick.c
==
--- head/sys/sparc64/sparc64/tick.c Wed Jan 23 21:44:48 2013
(r245849)
+++ head/sys/sparc64/sparc64/tick.c Wed Jan 23 22:52:20 2013
(r245850)
@@ -334,7 +334,7 @@ stick_get_timecount_mp(struct timecounte
if (curcpu == 0)
stick = rdstick();
else
- ipi_wait_unlocked(ipi_rd(0, tl_ipi_stick_rd, stick));
+ ipi_wait(ipi_rd(0, tl_ipi_stick_rd, stick));
sched_unpin();
return (stick);
}
@@ -348,7 +348,7 @@ tick_get_timecount_mp(struct timecounter
if (curcpu == 0)
tick = rd(tick);
else
- ipi_wait_unlocked(ipi_rd(0, tl_ipi_tick_rd, tick));
+ ipi_wait(ipi_rd(0, tl_ipi_tick_rd, tick));
sched_unpin();
return (tick);
}
___
svn-src-all@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 commit: r245851 - stable/9/sys/geom
Author: scottl
Date: Wed Jan 23 22:56:03 2013
New Revision: 245851
URL: http://svnweb.freebsd.org/changeset/base/245851
Log:
MFC r239132:
Clone BIO_ORDERED flag, for disk drivers (namely CAM) that try to
consume it.
Modified:
stable/9/sys/geom/geom_io.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/geom/geom_io.c
==
--- stable/9/sys/geom/geom_io.c Wed Jan 23 22:52:20 2013(r245850)
+++ stable/9/sys/geom/geom_io.c Wed Jan 23 22:56:03 2013(r245851)
@@ -177,6 +177,12 @@ g_clone_bio(struct bio *bp)
if (bp2 != NULL) {
bp2-bio_parent = bp;
bp2-bio_cmd = bp-bio_cmd;
+ /*
+* BIO_ORDERED flag may be used by disk drivers to enforce
+* ordering restrictions, so this flag needs to be cloned.
+* Other bio flags are not suitable for cloning.
+*/
+ bp2-bio_flags = bp-bio_flags BIO_ORDERED;
bp2-bio_length = bp-bio_length;
bp2-bio_offset = bp-bio_offset;
bp2-bio_data = bp-bio_data;
___
svn-src-all@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 commit: r245852 - head/kerberos5/lib/libkrb5
Author: brooks Date: Wed Jan 23 23:49:35 2013 New Revision: 245852 URL: http://svnweb.freebsd.org/changeset/base/245852 Log: Only try to install one link at each path. Don't install verify_krb5_conf.8. It is installed in kerberos5/usr.bin/verify_krb5_conf. Modified: head/kerberos5/lib/libkrb5/Makefile Modified: head/kerberos5/lib/libkrb5/Makefile == --- head/kerberos5/lib/libkrb5/Makefile Wed Jan 23 22:56:03 2013 (r245851) +++ head/kerberos5/lib/libkrb5/Makefile Wed Jan 23 23:49:35 2013 (r245852) @@ -82,8 +82,7 @@ MAN= krb5.3 \ krb5_timeofday.3 \ krb5_v4compat.3 \ krb5_verify_init_creds.3 \ - krb5_verify_user.3 \ - verify_krb5_conf.8 + krb5_verify_user.3 MAN+= krb5.conf.5 MAN+= kerberos.8 @@ -107,7 +106,6 @@ MLINKS= krb5.3 krb5_add_et_list.3 \ krb5.3 krb5_data_realloc.3 \ krb5.3 krb5_data_zero.3 \ krb5.3 krb5_free_config_files.3 \ - krb5.3 krb5_free_context.3 \ krb5.3 krb5_free_cred_contents.3 \ krb5.3 krb5_free_creds.3 \ krb5.3 krb5_free_data.3 \ @@ -123,7 +121,6 @@ MLINKS= krb5.3 krb5_add_et_list.3 \ krb5.3 krb5_get_use_admin_kdc.3 \ krb5.3 krb5_init_ets.3 \ krb5.3 krb5_kerberos_enctypes.3 \ - krb5.3 krb5_krbhst_get_addrinfo.3 \ krb5.3 krb5_prepend_config_files_default.3 \ krb5.3 krb5_set_config_files.3 \ krb5.3 krb5_set_default_in_tkt_etypes.3 \ @@ -195,7 +192,6 @@ MLINKS= krb5.3 krb5_add_et_list.3 \ krb5_auth_context.3 krb5_auth_getcksumtype.3 \ krb5_auth_context.3 krb5_auth_getkeytype.3 \ krb5_auth_context.3 krb5_auth_getlocalseqnumber.3 \ - krb5_auth_context.3 krb5_auth_getremoteseqnumber.3 \ krb5_auth_context.3 krb5_auth_setcksumtype.3 \ krb5_auth_context.3 krb5_auth_setkeytype.3 \ krb5_auth_context.3 krb5_auth_setlocalseqnumber.3 \ @@ -383,11 +379,8 @@ MLINKS=krb5.3 krb5_add_et_list.3 \ krb5_principal.3 krb5_free_principal.3 \ krb5_principal.3 krb5_get_default_principal.3 \ krb5_principal.3 krb5_make_principal.3 \ - krb5_principal.3 krb5_parse_name.3 \ krb5_principal.3 krb5_parse_name_flags.3 \ krb5_principal.3 krb5_parse_nametype.3 \ - krb5_principal.3 krb5_princ_realm.3 \ - krb5_principal.3 krb5_princ_set_realm.3 \ krb5_principal.3 krb5_principal_compare.3 \ krb5_principal.3 krb5_principal_compare_any_realm.3 \ krb5_principal.3 krb5_principal_get_comp_string.3 \ @@ -486,7 +479,6 @@ MLINKS= krb5.3 krb5_add_et_list.3 \ krb5_support.3 krb5_config_vget_time_default.3 \ krb5_support.3 krb5_expand_hostname.3 \ krb5_support.3 krb5_expand_hostname_realms.3 \ - krb5_support.3 krb5_free_host_realm.3 \ krb5_support.3 krb5_kuserok.3 \ krb5_support.3 krb5_plugin_register.3 \ krb5_ticket.3 krb5_ticket_get_flags.3 \ ___ svn-src-all@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 commit: r245853 - head/usr.sbin
Author: brooks Date: Wed Jan 23 23:51:44 2013 New Revision: 245853 URL: http://svnweb.freebsd.org/changeset/base/245853 Log: manctl is conditionally added to SUBDIRS later on. Don't unconditionally include in the main list. Modified: head/usr.sbin/Makefile Modified: head/usr.sbin/Makefile == --- head/usr.sbin/Makefile Wed Jan 23 23:49:35 2013(r245852) +++ head/usr.sbin/Makefile Wed Jan 23 23:51:44 2013(r245853) @@ -39,7 +39,6 @@ SUBDIR= adduser \ kldxref \ mailwrapper \ makefs \ - manctl \ memcontrol \ mergemaster \ mfiutil \ ___ svn-src-all@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 commit: r245854 - head/lib/libarchive
Author: brooks Date: Wed Jan 23 23:53:26 2013 New Revision: 245854 URL: http://svnweb.freebsd.org/changeset/base/245854 Log: Remove several MLINKS that were listed twice. Modified: head/lib/libarchive/Makefile Modified: head/lib/libarchive/Makefile == --- head/lib/libarchive/MakefileWed Jan 23 23:51:44 2013 (r245853) +++ head/lib/libarchive/MakefileWed Jan 23 23:53:26 2013 (r245854) @@ -231,9 +231,6 @@ MLINKS+=archive_entry_perms.3 archive_e MLINKS+= archive_entry_perms.3 archive_entry_set_gid.3 MLINKS+= archive_entry_perms.3 archive_entry_set_gname.3 MLINKS+= archive_entry_perms.3 archive_entry_perm.3 -MLINKS+= archive_entry_perms.3 archive_entry_set_fflags.3 -MLINKS+= archive_entry_perms.3 archive_entry_set_gid.3 -MLINKS+= archive_entry_perms.3 archive_entry_set_gname.3 MLINKS+= archive_entry_perms.3 archive_entry_set_perm.3 MLINKS+= archive_entry_perms.3 archive_entry_set_uid.3 MLINKS+= archive_entry_perms.3 archive_entry_set_uname.3 @@ -264,10 +261,6 @@ MLINKS+= archive_entry_stat.3 archive_en MLINKS+= archive_entry_stat.3 archive_entry_set_ino.3 MLINKS+= archive_entry_stat.3 archive_entry_set_ino64.3 MLINKS+= archive_entry_stat.3 archive_entry_set_mode.3 -MLINKS+= archive_entry_stat.3 archive_entry_set_rdev.3 -MLINKS+= archive_entry_stat.3 archive_entry_set_rdevmajor.3 -MLINKS+= archive_entry_stat.3 archive_entry_set_rdevminor.3 -MLINKS+= archive_entry_stat.3 archive_entry_set_size.3 MLINKS+= archive_entry_stat.3 archive_entry_set_nlink.3 MLINKS+= archive_entry_stat.3 archive_entry_set_rdev.3 MLINKS+= archive_entry_stat.3 archive_entry_set_rdevmajor.3 ___ svn-src-all@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
Re: svn commit: r240545 - in stable/9/share/examples: . cvsup etc
FYI, this commit entirely missed the merge to make.conf.5 ... Glen On Sun, Sep 16, 2012 at 12:35:09AM +, Eitan Adler wrote: Author: eadler Date: Sun Sep 16 00:35:09 2012 New Revision: 240545 URL: http://svn.freebsd.org/changeset/base/240545 Log: MFC r240252,r240253: Remove documentation and www cvsup files as they are no longer useful with the switch to subversion. Specifically document that an incomplete ports tree is not supported. Remove useless comment about sendmail. Approved by:cperciva (implicit) Deleted: stable/9/share/examples/cvsup/doc-supfile stable/9/share/examples/cvsup/www-supfile Modified: stable/9/share/examples/Makefile stable/9/share/examples/cvsup/cvs-supfile stable/9/share/examples/cvsup/refuse stable/9/share/examples/cvsup/refuse.README stable/9/share/examples/cvsup/stable-supfile stable/9/share/examples/etc/make.conf Directory Properties: stable/9/share/examples/ (props changed) stable/9/share/examples/cvsup/ (props changed) stable/9/share/examples/etc/ (props changed) stable/9/share/man/man5/ (props changed) Modified: stable/9/share/examples/Makefile == --- stable/9/share/examples/Makefile Sun Sep 16 00:35:09 2012 (r240544) +++ stable/9/share/examples/Makefile Sun Sep 16 00:35:09 2012 (r240545) @@ -53,14 +53,12 @@ XFILES= BSD_daemon/FreeBSD.pfa \ csh/dot.cshrc \ cvsup/README \ cvsup/cvs-supfile \ - cvsup/doc-supfile \ cvsup/gnats-supfile \ cvsup/ports-supfile \ cvsup/refuse \ cvsup/refuse.README \ cvsup/stable-supfile \ cvsup/standard-supfile \ - cvsup/www-supfile \ diskless/ME \ diskless/README.BOOTP \ diskless/README.TEMPLATING \ Modified: stable/9/share/examples/cvsup/cvs-supfile == --- stable/9/share/examples/cvsup/cvs-supfile Sun Sep 16 00:35:09 2012 (r240544) +++ stable/9/share/examples/cvsup/cvs-supfile Sun Sep 16 00:35:09 2012 (r240545) @@ -169,19 +169,6 @@ ports-all #ports-x11-toolkits #ports-x11-wm -## Documentation -# -# The easiest way to get the doc tree is to use the doc-all -# mega-collection. It includes all of the individual doc-* -# collections, -doc-all - -## Website -# -# This collection retrieves the www tree of the FreeBSD -# repository -www - ## Projects # # This collection retrieves the projects tree of the FreeBSD @@ -200,4 +187,3 @@ cvsroot-all #cvsroot-common #cvsroot-src #cvsroot-ports -#cvsroot-doc Modified: stable/9/share/examples/cvsup/refuse == --- stable/9/share/examples/cvsup/refuse Sun Sep 16 00:35:09 2012 (r240544) +++ stable/9/share/examples/cvsup/refuse Sun Sep 16 00:35:09 2012 (r240545) @@ -1,23 +1,3 @@ -doc/bn_* -doc/da_* -doc/de_* -doc/el_* -doc/es_* -doc/fr_* -doc/hu_* -doc/id_* -doc/it_* -doc/ja_* -doc/mn_* -doc/nl_* -doc/no_* -doc/pl_* -doc/pt_* -doc/ro_* -doc/ru_* -doc/sr_* -doc/tr_* -doc/zh_* ports/arabic ports/chinese ports/french Modified: stable/9/share/examples/cvsup/refuse.README == --- stable/9/share/examples/cvsup/refuse.README Sun Sep 16 00:35:09 2012(r240544) +++ stable/9/share/examples/cvsup/refuse.README Sun Sep 16 00:35:09 2012(r240545) @@ -16,33 +16,9 @@ CVSup's base directory to /var/db. Th directory; i.e., it is /var/db/sup. If you have changed your base directory, your sup directory is /path/to/base/sup. -This file used to contain /usr/src/etc/sendmail/freebsd.mc in case -you modified that file. However, this was removed as it can break -buildworld. Modify /etc/mail/`hostname`.mc instead. - If you are an English speaker and don't wish to receive the -foreign-language documentation or ports, use the following patterns: +non-English ports, use the following patterns: -doc/bn_* -doc/da_* -doc/de_* -doc/el_* -doc/es_* -doc/fr_* -doc/hu_* -doc/id_* -doc/it_* -doc/ja_* -doc/mn_* -doc/nl_* -doc/no_* -doc/pl_* -doc/pt_* -doc/ro_* -doc/ru_* -doc/sr_* -doc/tr_* -doc/zh_* ports/arabic ports/chinese ports/french @@ -57,6 +33,9 @@ foreign-language documentation or ports, ports/ukrainian ports/vietnamese +Note that this is *not* a supported configuration and may result +in ports builds breaking. + Use refuse files with care. Some parts of the src distribution depend on files in completely different parts. Modified: stable/9/share/examples/cvsup/stable-supfile
svn commit: r245855 - stable/9/share/man/man5
Author: gjb (doc,ports committer) Date: Thu Jan 24 00:45:53 2013 New Revision: 245855 URL: http://svnweb.freebsd.org/changeset/base/245855 Log: Remove bogus mergeinfo introduced with r240545. Modified: Directory Properties: stable/9/share/man/man5/ (props changed) ___ svn-src-all@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 commit: r245856 - stable/8/share/man/man5
Author: gjb (doc,ports committer) Date: Thu Jan 24 00:46:49 2013 New Revision: 245856 URL: http://svnweb.freebsd.org/changeset/base/245856 Log: Remove bogus mergeinfo introduced in r240544. Modified: Directory Properties: stable/8/share/man/man5/ (props changed) ___ svn-src-all@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 commit: r245857 - stable/9/sys/pci
Author: yongari
Date: Thu Jan 24 01:07:34 2013
New Revision: 245857
URL: http://svnweb.freebsd.org/changeset/base/245857
Log:
MFC r245485:
Add D-Link DFE-520TX rev C1.
Modified:
stable/9/sys/pci/if_rl.c
stable/9/sys/pci/if_rlreg.h
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/pci/if_rl.c
==
--- stable/9/sys/pci/if_rl.cThu Jan 24 00:46:49 2013(r245856)
+++ stable/9/sys/pci/if_rl.cThu Jan 24 01:07:34 2013(r245857)
@@ -148,6 +148,8 @@ static const struct rl_type rl_devs[] =
Delta Electronics 8139 10/100BaseTX },
{ ADDTRON_VENDORID, ADDTRON_DEVICEID_8139, RL_8139,
Addtron Technology 8139 10/100BaseTX },
+ { DLINK_VENDORID, DLINK_DEVICEID_520TX_REVC1, RL_8139,
+ D-Link DFE-520TX (rev. C1) 10/100BaseTX },
{ DLINK_VENDORID, DLINK_DEVICEID_530TXPLUS, RL_8139,
D-Link DFE-530TX+ 10/100BaseTX },
{ DLINK_VENDORID, DLINK_DEVICEID_690TXD, RL_8139,
Modified: stable/9/sys/pci/if_rlreg.h
==
--- stable/9/sys/pci/if_rlreg.h Thu Jan 24 00:46:49 2013(r245856)
+++ stable/9/sys/pci/if_rlreg.h Thu Jan 24 01:07:34 2013(r245857)
@@ -1048,6 +1048,11 @@ struct rl_softc {
#defineDLINK_DEVICEID_530TXPLUS0x1300
/*
+ * D-Link DFE-520TX rev. C1 device ID
+ */
+#defineDLINK_DEVICEID_520TX_REVC1 0x4200
+
+/*
* D-Link DFE-5280T device ID
*/
#defineDLINK_DEVICEID_528T 0x4300
___
svn-src-all@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 commit: r245858 - stable/8/sys/pci
Author: yongari
Date: Thu Jan 24 01:10:15 2013
New Revision: 245858
URL: http://svnweb.freebsd.org/changeset/base/245858
Log:
MFC r245485:
Add D-Link DFE-520TX rev C1.
Modified:
stable/8/sys/pci/if_rl.c
stable/8/sys/pci/if_rlreg.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/pci/ (props changed)
Modified: stable/8/sys/pci/if_rl.c
==
--- stable/8/sys/pci/if_rl.cThu Jan 24 01:07:34 2013(r245857)
+++ stable/8/sys/pci/if_rl.cThu Jan 24 01:10:15 2013(r245858)
@@ -148,6 +148,8 @@ static const struct rl_type rl_devs[] =
Delta Electronics 8139 10/100BaseTX },
{ ADDTRON_VENDORID, ADDTRON_DEVICEID_8139, RL_8139,
Addtron Technology 8139 10/100BaseTX },
+ { DLINK_VENDORID, DLINK_DEVICEID_520TX_REVC1, RL_8139,
+ D-Link DFE-520TX (rev. C1) 10/100BaseTX },
{ DLINK_VENDORID, DLINK_DEVICEID_530TXPLUS, RL_8139,
D-Link DFE-530TX+ 10/100BaseTX },
{ DLINK_VENDORID, DLINK_DEVICEID_690TXD, RL_8139,
Modified: stable/8/sys/pci/if_rlreg.h
==
--- stable/8/sys/pci/if_rlreg.h Thu Jan 24 01:07:34 2013(r245857)
+++ stable/8/sys/pci/if_rlreg.h Thu Jan 24 01:10:15 2013(r245858)
@@ -1048,6 +1048,11 @@ struct rl_softc {
#defineDLINK_DEVICEID_530TXPLUS0x1300
/*
+ * D-Link DFE-520TX rev. C1 device ID
+ */
+#defineDLINK_DEVICEID_520TX_REVC1 0x4200
+
+/*
* D-Link DFE-5280T device ID
*/
#defineDLINK_DEVICEID_528T 0x4300
___
svn-src-all@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 commit: r245859 - stable/9/share/man/man4
Author: yongari Date: Thu Jan 24 01:12:55 2013 New Revision: 245859 URL: http://svnweb.freebsd.org/changeset/base/245859 Log: MFC r245487: Add D-Link DFE-520TX (rev. C1) to HARDWARE section. Modified: stable/9/share/man/man4/rl.4 Directory Properties: stable/9/share/man/man4/ (props changed) Modified: stable/9/share/man/man4/rl.4 == --- stable/9/share/man/man4/rl.4Thu Jan 24 01:10:15 2013 (r245858) +++ stable/9/share/man/man4/rl.4Thu Jan 24 01:12:55 2013 (r245859) @@ -30,7 +30,7 @@ .\ .\ $FreeBSD$ .\ -.Dd August 22, 2010 +.Dd January 16, 2013 .Dt RL 4 .Os .Sh NAME @@ -155,6 +155,8 @@ Corega FEther CB-TXD .It Corega FEtherII CB-TXD .It +D-Link DFE-520TX (rev. C1) +.It D-Link DFE-528TX .It D-Link DFE-530TX+ ___ svn-src-all@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 commit: r245860 - stable/8/share/man/man4
Author: yongari Date: Thu Jan 24 01:13:13 2013 New Revision: 245860 URL: http://svnweb.freebsd.org/changeset/base/245860 Log: MFC r245487: Add D-Link DFE-520TX (rev. C1) to HARDWARE section. Modified: stable/8/share/man/man4/rl.4 Directory Properties: stable/8/share/man/man4/ (props changed) Modified: stable/8/share/man/man4/rl.4 == --- stable/8/share/man/man4/rl.4Thu Jan 24 01:12:55 2013 (r245859) +++ stable/8/share/man/man4/rl.4Thu Jan 24 01:13:13 2013 (r245860) @@ -30,7 +30,7 @@ .\ .\ $FreeBSD$ .\ -.Dd August 22, 2010 +.Dd January 16, 2013 .Dt RL 4 .Os .Sh NAME @@ -157,6 +157,8 @@ Corega FEther CB-TXD .It Corega FEtherII CB-TXD .It +D-Link DFE-520TX (rev. C1) +.It D-Link DFE-528TX .It D-Link DFE-530TX+ ___ svn-src-all@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 commit: r245861 - stable/9/sys/dev/mii
Author: yongari
Date: Thu Jan 24 01:31:22 2013
New Revision: 245861
URL: http://svnweb.freebsd.org/changeset/base/245861
Log:
MFC r244481:
For fiber PHYs, BRGPHY_MII_1000CTL register is not defined at all
so do not touch it.
Modified:
stable/9/sys/dev/mii/brgphy.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/mii/brgphy.c
==
--- stable/9/sys/dev/mii/brgphy.c Thu Jan 24 01:13:13 2013
(r245860)
+++ stable/9/sys/dev/mii/brgphy.c Thu Jan 24 01:31:22 2013
(r245861)
@@ -608,6 +608,11 @@ brgphy_mii_phy_auto(struct mii_softc *sc
(sc-mii_flags MIIF_FORCEPAUSE) != 0)
anar |= BRGPHY_ANAR_PC | BRGPHY_ANAR_ASP;
PHY_WRITE(sc, BRGPHY_MII_ANAR, anar);
+ ktcr = BRGPHY_1000CTL_AFD | BRGPHY_1000CTL_AHD;
+ if (sc-mii_mpd_model == MII_MODEL_BROADCOM_BCM5701)
+ ktcr |= BRGPHY_1000CTL_MSE | BRGPHY_1000CTL_MSC;
+ PHY_WRITE(sc, BRGPHY_MII_1000CTL, ktcr);
+ PHY_READ(sc, BRGPHY_MII_1000CTL);
} else {
anar = BRGPHY_SERDES_ANAR_FDX | BRGPHY_SERDES_ANAR_HDX;
if ((media IFM_FLOW) != 0 ||
@@ -616,12 +621,6 @@ brgphy_mii_phy_auto(struct mii_softc *sc
PHY_WRITE(sc, BRGPHY_SERDES_ANAR, anar);
}
- ktcr = BRGPHY_1000CTL_AFD | BRGPHY_1000CTL_AHD;
- if (sc-mii_mpd_model == MII_MODEL_BROADCOM_BCM5701)
- ktcr |= BRGPHY_1000CTL_MSE | BRGPHY_1000CTL_MSC;
- PHY_WRITE(sc, BRGPHY_MII_1000CTL, ktcr);
- ktcr = PHY_READ(sc, BRGPHY_MII_1000CTL);
-
PHY_WRITE(sc, BRGPHY_MII_BMCR, BRGPHY_BMCR_AUTOEN |
BRGPHY_BMCR_STARTNEG);
PHY_WRITE(sc, BRGPHY_MII_IMR, 0xFF00);
___
svn-src-all@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 commit: r245862 - stable/8/sys/dev/mii
Author: yongari
Date: Thu Jan 24 01:32:17 2013
New Revision: 245862
URL: http://svnweb.freebsd.org/changeset/base/245862
Log:
MFC r244481:
For fiber PHYs, BRGPHY_MII_1000CTL register is not defined at all
so do not touch it.
Modified:
stable/8/sys/dev/mii/brgphy.c
Directory Properties:
stable/8/sys/ (props changed)
Modified: stable/8/sys/dev/mii/brgphy.c
==
--- stable/8/sys/dev/mii/brgphy.c Thu Jan 24 01:31:22 2013
(r245861)
+++ stable/8/sys/dev/mii/brgphy.c Thu Jan 24 01:32:17 2013
(r245862)
@@ -628,6 +628,11 @@ brgphy_mii_phy_auto(struct mii_softc *sc
(sc-mii_flags MIIF_FORCEPAUSE) != 0)
anar |= BRGPHY_ANAR_PC | BRGPHY_ANAR_ASP;
PHY_WRITE(sc, BRGPHY_MII_ANAR, anar);
+ ktcr = BRGPHY_1000CTL_AFD | BRGPHY_1000CTL_AHD;
+ if (bsc-mii_model == MII_MODEL_xxBROADCOM_BCM5701)
+ ktcr |= BRGPHY_1000CTL_MSE | BRGPHY_1000CTL_MSC;
+ PHY_WRITE(sc, BRGPHY_MII_1000CTL, ktcr);
+ PHY_READ(sc, BRGPHY_MII_1000CTL);
} else {
anar = BRGPHY_SERDES_ANAR_FDX | BRGPHY_SERDES_ANAR_HDX;
if ((media IFM_FLOW) != 0 ||
@@ -636,12 +641,6 @@ brgphy_mii_phy_auto(struct mii_softc *sc
PHY_WRITE(sc, BRGPHY_SERDES_ANAR, anar);
}
- ktcr = BRGPHY_1000CTL_AFD | BRGPHY_1000CTL_AHD;
- if (bsc-mii_model == MII_MODEL_xxBROADCOM_BCM5701)
- ktcr |= BRGPHY_1000CTL_MSE | BRGPHY_1000CTL_MSC;
- PHY_WRITE(sc, BRGPHY_MII_1000CTL, ktcr);
- ktcr = PHY_READ(sc, BRGPHY_MII_1000CTL);
-
PHY_WRITE(sc, BRGPHY_MII_BMCR, BRGPHY_BMCR_AUTOEN |
BRGPHY_BMCR_STARTNEG);
PHY_WRITE(sc, BRGPHY_MII_IMR, 0xFF00);
___
svn-src-all@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 commit: r245863 - stable/9/share/man/man5
Author: gjb (doc,ports committer) Date: Thu Jan 24 01:40:47 2013 New Revision: 245863 URL: http://svnweb.freebsd.org/changeset/base/245863 Log: MFC r240252, r241541, r241543, r245756: r240252: (eadler) - Remove documentation and www cvsup files as they are no longer useful with the switch to subversion. r241541: (joel) - Minor mdoc improvements. Also remove unnecessary csup reference. r241543: (eadler) - Bump .Dd r245756: - Mark SUP_UPDATE as deprecated in make.conf(5), providing instructions to use SVN_UPDATE or freebsd-update(8). - While here, remove bogus NO_WWWUPDATE. Modified: stable/9/share/man/man5/make.conf.5 stable/9/share/man/man5/portindex.5 Directory Properties: stable/9/share/man/man5/ (props changed) Modified: stable/9/share/man/man5/make.conf.5 == --- stable/9/share/man/man5/make.conf.5 Thu Jan 24 01:32:17 2013 (r245862) +++ stable/9/share/man/man5/make.conf.5 Thu Jan 24 01:40:47 2013 (r245863) @@ -24,7 +24,7 @@ .\ .\ $FreeBSD$ .\ -.Dd May 02, 2012 +.Dd January 21, 2013 .Dt MAKE.CONF 5 .Os .Sh NAME @@ -200,14 +200,6 @@ value, use .Dq Li += instead of .Dq Li = . -.It Va DOCSUPFILE -.Pq Vt str -The documentation -.Ar supfile -to use when doing a -.Dq Li make update . -For example, -.Pa /usr/share/examples/cvsup/doc-supfile . .It Va INSTALL .Pq Vt str the default install command. @@ -263,10 +255,6 @@ Set this to not update the doc tree duri .Pq Vt bool Set this to not update the ports tree during .Dq Li make update . -.It Va NO_WWWUPDATE -.Pq Vt bool -Set this to not update the www tree during -.Dq Li make update . .It Va SUP .Pq Vt str The location of the @@ -312,11 +300,16 @@ The hostname of the sup server to use wh Set this to use .Xr csup 1 to update your -.Pa src , ports , doc +.Pa src , and -.Pa www +.Pa ports trees with .Dq Li make update . +This option is deprecated. +Please use +.Va SVN_UPDATE +or +.Xr freebsd-update 8 . .It Va SVN_UPDATE .Pq Vt bool Set this to use @@ -331,14 +324,6 @@ you will need to set to the full path of a .Xr svn 1 binary. -.It Va WWWSUPFILE -.Pq Vt str -The www -.Ar supfile -to use when doing a -.Dq Li make update . -For example, -.Pa /usr/share/examples/cvsup/www-supfile . .El .Ss BUILDING THE KERNEL The following list provides a name and short description for variables Modified: stable/9/share/man/man5/portindex.5 == --- stable/9/share/man/man5/portindex.5 Thu Jan 24 01:32:17 2013 (r245862) +++ stable/9/share/man/man5/portindex.5 Thu Jan 24 01:40:47 2013 (r245863) @@ -26,7 +26,7 @@ .\ .\ $FreeBSD$ .\ -.Dd February 8, 2012 +.Dd October 14, 2012 .Dt PORTINDEX 5 .Os .Sh NAME @@ -48,7 +48,7 @@ branch, i.e.: .Pa INDEX-7 , or .Pa INDEX-8 . -.Bl -tag -compact -width indent +.Bl -tag -width XX .It Cm \name The name of the package. .It Cm \path @@ -77,7 +77,7 @@ Ports that may be required to patch this Ports that may be required to fetch this port. .El .Sh FILES -.Bl -tag -width /usr/ports/INDEX-8 +.Bl -tag -width /usr/ports/INDEX-8XX .It Pa /usr/ports/INDEX- Ns Ar N where .Ar N @@ -91,7 +91,6 @@ vim-6.3.15|/usr/ports/editors/vim|/usr/l .Ed .Sh SEE ALSO .Xr build 7 , -.Xr csup 1 , .Xr ports 7 .Sh AUTHORS .An -nosplit ___ svn-src-all@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 commit: r245864 - stable/8/share/man/man5
Author: gjb (doc,ports committer) Date: Thu Jan 24 01:41:11 2013 New Revision: 245864 URL: http://svnweb.freebsd.org/changeset/base/245864 Log: MFC r223148, r240252, r241541, r241543, r245756: r223148: (ru) - Document all trees that support CVS_UPDATE. - Document all trees that support SUP_UPDATE. - Document SVN_UPDATE. - Document NO_WWWUPDATE. - make.conf(5) mistakenly said that *SUPFILE* had defaults. - Add an example entry for WWWSUPFILE. r240252: (eadler) - Remove documentation and www cvsup files as they are no longer useful with the switch to subversion. r241541: (joel) - Minor mdoc improvements. Also remove unnecessary csup reference. r241543: (eadler) - Bump .Dd r245756: - Mark SUP_UPDATE as deprecated in make.conf(5), providing instructions to use SVN_UPDATE or freebsd-update(8). - While here, remove bogus NO_WWWUPDATE. Modified: stable/8/share/man/man5/make.conf.5 stable/8/share/man/man5/portindex.5 Directory Properties: stable/8/share/man/man5/ (props changed) Modified: stable/8/share/man/man5/make.conf.5 == --- stable/8/share/man/man5/make.conf.5 Thu Jan 24 01:40:47 2013 (r245863) +++ stable/8/share/man/man5/make.conf.5 Thu Jan 24 01:41:11 2013 (r245864) @@ -24,7 +24,7 @@ .\ .\ $FreeBSD$ .\ -.Dd December 15, 2009 +.Dd January 21, 2013 .Dt MAKE.CONF 5 .Os .Sh NAME @@ -182,7 +182,11 @@ options. .Pq Vt bool Set this to use .Xr cvs 1 -to update your ports with +to update your +.Pa src , ports +and +.Pa doc +trees with .Dq Li make update . .It Va CXXFLAGS .Pq Vt str @@ -197,14 +201,6 @@ value, use .Dq Li += instead of .Dq Li = . -.It Va DOCSUPFILE -.Pq Vt str -The documentation -.Ar supfile -to use when doing a -.Dq Li make update . -This defaults to -.Pa /usr/share/examples/cvsup/doc\-supfile . .It Va INSTALL .Pq Vt str the default install command. @@ -266,8 +262,8 @@ The ports .Ar supfile to use when doing a .Dq Li make update . -This defaults to -.Pa /usr/share/examples/cvsup/ports\-supfile . +For example, +.Pa /usr/share/examples/cvsup/ports-supfile . .It Va SUP .Pq Vt str The location of the @@ -282,24 +278,20 @@ The first .Ar supfile to use when doing a .Dq Li make update . -This defaults to -.Pa /usr/share/examples/cvsup/standard\-supfile . +For example, +.Pa /usr/share/examples/cvsup/standard-supfile . .It Va SUPFILE1 .Pq Vt str The second .Ar supfile to use when doing a .Dq Li make update . -This defaults to -.Pa /usr/share/examples/cvsup/secure\-supfile . .It Va SUPFILE2 .Pq Vt str The third .Ar supfile to use when doing a .Dq Li make update . -This defaults to -.Pa /usr/share/examples/cvsup/secure\-supfile . .It Va SUPFLAGS .Pq Vt str The flag for the @@ -316,16 +308,25 @@ The hostname of the sup server to use wh .Pq Vt bool Set this to use .Xr cvsup 1 -to update your ports with +to update your +.Pa src , +and +.Pa ports +trees with +.Dq Li make update . +This option is deprecated. +Please use +.Va SVN_UPDATE +or +.Xr freebsd-update 8 . +.It Va SVN_UPDATE +.Pq Vt bool +Set this to use +.Xr svn 1 +to update your +.Pa src +tree with .Dq Li make update . -.It Va WWWSUPFILE -.Pq Vt str -The www -.Ar supfile -to use when doing a -.Dq Li make update -This defaults to -.Pa /usr/share/examples/cvsup/www\-supfile . .El .Ss BUILDING THE KERNEL The following list provides a name and short description for variables @@ -731,6 +732,7 @@ filter, or both. .Bl -tag -width .Pa /usr/share/examples/etc/make.conf -compact .It Pa /etc/make.conf .It Pa /usr/doc/Makefile +.It Pa /usr/ports/Makefile .It Pa /usr/share/examples/etc/make.conf .It Pa /usr/share/mk/sys.mk .It Pa /usr/src/Makefile Modified: stable/8/share/man/man5/portindex.5 == --- stable/8/share/man/man5/portindex.5 Thu Jan 24 01:40:47 2013 (r245863) +++ stable/8/share/man/man5/portindex.5 Thu Jan 24 01:41:11 2013 (r245864) @@ -26,7 +26,7 @@ .\ .\ $FreeBSD$ .\ -.Dd February 8, 2012 +.Dd October 14, 2012 .Dt PORTINDEX 5 .Os .Sh NAME @@ -48,7 +48,7 @@ branch, i.e.: .Pa INDEX-7 , or .Pa INDEX-8 . -.Bl -tag -compact -width indent +.Bl -tag -width XX .It Cm \name The name of the package. .It Cm \path @@ -77,7 +77,7 @@ Ports that may be required to patch this Ports that may be required to fetch this port. .El .Sh FILES -.Bl -tag -width /usr/ports/INDEX-8 +.Bl -tag -width /usr/ports/INDEX-8XX .It Pa /usr/ports/INDEX- Ns Ar N where .Ar N @@ -91,7 +91,6 @@ vim-6.3.15|/usr/ports/editors/vim|/usr/l .Ed .Sh SEE ALSO .Xr build 7 , -.Xr csup 1 , .Xr ports 7 .Sh AUTHORS .An -nosplit ___ svn-src-all@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 commit: r245865 - stable/9/sys/dev/mii
Author: yongari
Date: Thu Jan 24 02:19:38 2013
New Revision: 245865
URL: http://svnweb.freebsd.org/changeset/base/245865
Log:
MFC r244482:
Recognize 5720S PHY and treat it as 5708S PHY.
Unfortunately 5720S uses 5709S PHY id so add a hack to detect 5720S
PHY by checking parent device name. 5720S PHY does not support 2500SX.
Modified:
stable/9/sys/dev/mii/brgphy.c
stable/9/sys/dev/mii/miidevs
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/mii/brgphy.c
==
--- stable/9/sys/dev/mii/brgphy.c Thu Jan 24 01:41:11 2013
(r245864)
+++ stable/9/sys/dev/mii/brgphy.c Thu Jan 24 02:19:38 2013
(r245865)
@@ -204,6 +204,13 @@ brgphy_attach(device_t dev)
brgphy_funcs, 0);
bsc-serdes_flags = 0;
+ ifp = sc-mii_pdata-mii_ifp;
+
+ /* Find the MAC driver associated with this PHY. */
+ if (strcmp(ifp-if_dname, bge) == 0)
+ bge_sc = ifp-if_softc;
+ else if (strcmp(ifp-if_dname, bce) == 0)
+ bce_sc = ifp-if_softc;
/* Handle any special cases based on the PHY ID */
switch (sc-mii_mpd_oui) {
@@ -235,22 +242,21 @@ brgphy_attach(device_t dev)
sc-mii_flags |= MIIF_HAVEFIBER;
break;
case MII_MODEL_BROADCOM2_BCM5709S:
- bsc-serdes_flags |= BRGPHY_5709S;
+ /*
+* XXX
+* 5720S and 5709S shares the same PHY id.
+* Assume 5720S PHY if parent device is bge(4).
+*/
+ if (bge_sc != NULL)
+ bsc-serdes_flags |= BRGPHY_5708S;
+ else
+ bsc-serdes_flags |= BRGPHY_5709S;
sc-mii_flags |= MIIF_HAVEFIBER;
break;
}
break;
}
- ifp = sc-mii_pdata-mii_ifp;
-
- /* Find the MAC driver associated with this PHY. */
- if (strcmp(ifp-if_dname, bge) == 0) {
- bge_sc = ifp-if_softc;
- } else if (strcmp(ifp-if_dname, bce) == 0) {
- bce_sc = ifp-if_softc;
- }
-
PHY_RESET(sc);
/* Read the PHY's capabilities. */
Modified: stable/9/sys/dev/mii/miidevs
==
--- stable/9/sys/dev/mii/miidevsThu Jan 24 01:41:11 2013
(r245864)
+++ stable/9/sys/dev/mii/miidevsThu Jan 24 02:19:38 2013
(r245865)
@@ -178,7 +178,7 @@ model BROADCOM2 BCM5722 0x002d BCM5722
model BROADCOM2 BCM57840x003a BCM5784 10/100/1000baseT PHY
model BROADCOM2 BCM5709C 0x003c BCM5709 10/100/1000baseT PHY
model BROADCOM2 BCM57610x003d BCM5761 10/100/1000baseT PHY
-model BROADCOM2 BCM5709S 0x003f BCM5709S 1000/2500baseSX PHY
+model BROADCOM2 BCM5709S 0x003f BCM5709S/5720S 1000/2500baseSX PHY
model BROADCOM3 BCM57780 0x0019 BCM57780 1000BASE-T media interface
model BROADCOM3 BCM5717C 0x0020 BCM5717C 1000BASE-T media interface
model BROADCOM3 BCM5719C 0x0022 BCM5719C 1000BASE-T media interface
___
svn-src-all@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 commit: r245866 - stable/8/sys/dev/mii
Author: yongari
Date: Thu Jan 24 02:20:25 2013
New Revision: 245866
URL: http://svnweb.freebsd.org/changeset/base/245866
Log:
MFC r244482:
Recognize 5720S PHY and treat it as 5708S PHY.
Unfortunately 5720S uses 5709S PHY id so add a hack to detect 5720S
PHY by checking parent device name. 5720S PHY does not support 2500SX.
Modified:
stable/8/sys/dev/mii/brgphy.c
stable/8/sys/dev/mii/miidevs
Directory Properties:
stable/8/sys/ (props changed)
Modified: stable/8/sys/dev/mii/brgphy.c
==
--- stable/8/sys/dev/mii/brgphy.c Thu Jan 24 02:19:38 2013
(r245865)
+++ stable/8/sys/dev/mii/brgphy.c Thu Jan 24 02:20:25 2013
(r245866)
@@ -217,11 +217,18 @@ brgphy_attach(device_t dev)
bsc-mii_model = MII_MODEL(ma-mii_id2);
bsc-mii_rev = MII_REV(ma-mii_id2);
bsc-serdes_flags = 0;
+ ifp = sc-mii_pdata-mii_ifp;
if (bootverbose)
device_printf(dev, OUI 0x%06x, model 0x%04x, rev. %d\n,
bsc-mii_oui, bsc-mii_model, bsc-mii_rev);
+ /* Find the MAC driver associated with this PHY. */
+ if (strcmp(ifp-if_dname, bge) == 0)
+ bge_sc = ifp-if_softc;
+ else if (strcmp(ifp-if_dname, bce) == 0)
+ bce_sc = ifp-if_softc;
+
/* Handle any special cases based on the PHY ID */
switch (bsc-mii_oui) {
case MII_OUI_xxBROADCOM:
@@ -252,22 +259,21 @@ brgphy_attach(device_t dev)
sc-mii_flags |= MIIF_HAVEFIBER;
break;
case MII_MODEL_xxBROADCOM_ALT1_BCM5709S:
- bsc-serdes_flags |= BRGPHY_5709S;
+ /*
+* XXX
+* 5720S and 5709S shares the same PHY id.
+* Assume 5720S PHY if parent device is bge(4).
+*/
+ if (bge_sc != NULL)
+ bsc-serdes_flags |= BRGPHY_5708S;
+ else
+ bsc-serdes_flags |= BRGPHY_5709S;
sc-mii_flags |= MIIF_HAVEFIBER;
break;
}
break;
}
- ifp = sc-mii_pdata-mii_ifp;
-
- /* Find the MAC driver associated with this PHY. */
- if (strcmp(ifp-if_dname, bge) == 0) {
- bge_sc = ifp-if_softc;
- } else if (strcmp(ifp-if_dname, bce) == 0) {
- bce_sc = ifp-if_softc;
- }
-
brgphy_reset(sc);
/* Read the PHY's capabilities. */
Modified: stable/8/sys/dev/mii/miidevs
==
--- stable/8/sys/dev/mii/miidevsThu Jan 24 02:19:38 2013
(r245865)
+++ stable/8/sys/dev/mii/miidevsThu Jan 24 02:20:25 2013
(r245866)
@@ -156,7 +156,7 @@ model xxBROADCOM_ALT1 BCM5722 0x002d BCM
model xxBROADCOM_ALT1 BCM5784 0x003a BCM5784 10/100/1000baseTX PHY
model xxBROADCOM_ALT1 BCM5709C 0x003c BCM5709C 10/100/1000baseTX PHY
model xxBROADCOM_ALT1 BCM5761 0x003d BCM5761 10/100/1000baseTX PHY
-model xxBROADCOM_ALT1 BCM5709S 0x003f BCM5709S 1000/2500baseSX PHY
+model xxBROADCOM_ALT1 BCM5709S 0x003f BCM5709S/5720S 1000/2500baseSX PHY
model xxBROADCOM_ALT2 BCM57780 0x0019 BCM57780 1000BASE-T media interface
model xxBROADCOM_ALT2 BCM5717C 0x0020 BCM5717C 10/100/1000baseTX PHY
model xxBROADCOM_ALT2 BCM5719C 0x0022 BCM5719C 10/100/1000baseTX PHY
___
svn-src-all@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 commit: r245867 - head/sys/dev/bge
Author: yongari Date: Thu Jan 24 02:25:43 2013 New Revision: 245867 URL: http://svnweb.freebsd.org/changeset/base/245867 Log: For 57765 class controllers, set low watermark max receive frames to 1. Modified: head/sys/dev/bge/if_bge.c Modified: head/sys/dev/bge/if_bge.c == --- head/sys/dev/bge/if_bge.c Thu Jan 24 02:20:25 2013(r245866) +++ head/sys/dev/bge/if_bge.c Thu Jan 24 02:25:43 2013(r245867) @@ -5427,7 +5427,7 @@ bge_init_locked(struct bge_softc *sc) * this number of frames, it will drop subsequent incoming * frames until the MBUF High Watermark is reached. */ - if (sc-bge_asicrev == BGE_ASICREV_BCM57765) + if (BGE_IS_57765_PLUS(sc)) CSR_WRITE_4(sc, BGE_MAX_RX_FRAME_LOWAT, 1); else CSR_WRITE_4(sc, BGE_MAX_RX_FRAME_LOWAT, 2); ___ svn-src-all@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 commit: r245868 - in head/contrib/jemalloc: . doc include/jemalloc include/jemalloc/internal src
Author: jasone Date: Thu Jan 24 03:08:37 2013 New Revision: 245868 URL: http://svnweb.freebsd.org/changeset/base/245868 Log: Import jemalloc 3.3.0. This reduces zeroed memory validation overhead for non-MALLOC_PRODUCTION builds. Modified: head/contrib/jemalloc/COPYING head/contrib/jemalloc/ChangeLog head/contrib/jemalloc/FREEBSD-diffs head/contrib/jemalloc/VERSION head/contrib/jemalloc/doc/jemalloc.3 head/contrib/jemalloc/include/jemalloc/internal/arena.h head/contrib/jemalloc/include/jemalloc/internal/ckh.h head/contrib/jemalloc/include/jemalloc/internal/hash.h head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h head/contrib/jemalloc/include/jemalloc/internal/private_namespace.h head/contrib/jemalloc/include/jemalloc/internal/tcache.h head/contrib/jemalloc/include/jemalloc/jemalloc.h head/contrib/jemalloc/include/jemalloc/jemalloc_defs.h head/contrib/jemalloc/src/arena.c head/contrib/jemalloc/src/chunk.c head/contrib/jemalloc/src/chunk_dss.c head/contrib/jemalloc/src/ckh.c head/contrib/jemalloc/src/ctl.c head/contrib/jemalloc/src/jemalloc.c head/contrib/jemalloc/src/prof.c head/contrib/jemalloc/src/tcache.c Modified: head/contrib/jemalloc/COPYING == --- head/contrib/jemalloc/COPYING Thu Jan 24 02:25:43 2013 (r245867) +++ head/contrib/jemalloc/COPYING Thu Jan 24 03:08:37 2013 (r245868) @@ -1,10 +1,10 @@ Unless otherwise specified, files in the jemalloc source distribution are subject to the following license: -Copyright (C) 2002-2012 Jason Evans jas...@canonware.com. +Copyright (C) 2002-2013 Jason Evans jas...@canonware.com. All rights reserved. Copyright (C) 2007-2012 Mozilla Foundation. All rights reserved. -Copyright (C) 2009-2012 Facebook, Inc. All rights reserved. +Copyright (C) 2009-2013 Facebook, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: Modified: head/contrib/jemalloc/ChangeLog == --- head/contrib/jemalloc/ChangeLog Thu Jan 24 02:25:43 2013 (r245867) +++ head/contrib/jemalloc/ChangeLog Thu Jan 24 03:08:37 2013 (r245868) @@ -6,6 +6,23 @@ found in the git revision history: http://www.canonware.com/cgi-bin/gitweb.cgi?p=jemalloc.git git://canonware.com/jemalloc.git +* 3.3.0 (January 23, 2013) + + This version includes a few minor performance improvements in addition to the + listed new features and bug fixes. + + New features: + - Add clipping support to lg_chunk option processing. + - Add the --enable-ivsalloc option. + - Add the --without-export option. + - Add the --disable-zone-allocator option. + + Bug fixes: + - Fix arenas.extend mallctl to output the number of arenas. + - Fix chunk_recycyle() to unconditionally inform Valgrind that returned memory +is undefined. + - Fix build break on FreeBSD related to alloca.h. + * 3.2.0 (November 9, 2012) In addition to a couple of bug fixes, this version modifies page run Modified: head/contrib/jemalloc/FREEBSD-diffs == --- head/contrib/jemalloc/FREEBSD-diffs Thu Jan 24 02:25:43 2013 (r245867) +++ head/contrib/jemalloc/FREEBSD-diffs Thu Jan 24 03:08:37 2013 (r245868) @@ -1,5 +1,5 @@ diff --git a/doc/jemalloc.xml.in b/doc/jemalloc.xml.in -index 54b8747..91c4a4e 100644 +index 0930580..d45fa3d 100644 --- a/doc/jemalloc.xml.in +++ b/doc/jemalloc.xml.in @@ -51,12 +51,23 @@ @@ -27,7 +27,7 @@ index 54b8747..91c4a4e 100644 refsect2 titleStandard API/title funcprototype -@@ -2170,4 +2181,16 @@ malloc_conf = lg_chunk:24;]]/programlisting/para +@@ -2173,4 +2184,16 @@ malloc_conf = lg_chunk:24;]]/programlisting/para paraThe functionposix_memalignparameter//function function conforms to IEEE Std 1003.1-2001 (ldquo;POSIX.1rdquo;)./para /refsect1 @@ -45,7 +45,7 @@ index 54b8747..91c4a4e 100644 + /refsect1 /refentry diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in -index 475821a..73306ac 100644 +index c606c12..0d46d9d 100644 --- a/include/jemalloc/internal/jemalloc_internal.h.in +++ b/include/jemalloc/internal/jemalloc_internal.h.in @@ -1,5 +1,8 @@ @@ -97,10 +97,10 @@ index de44e14..564d604 100644 bool malloc_mutex_init(malloc_mutex_t *mutex); diff --git a/include/jemalloc/internal/private_namespace.h b/include/jemalloc/internal/private_namespace.h -index 06241cd..7b19906 100644 +index 903fb4d..d6638df 100644 --- a/include/jemalloc/internal/private_namespace.h +++ b/include/jemalloc/internal/private_namespace.h -@@ -204,7 +204,6 @@ +@@
svn commit: r245869 - head/contrib/jemalloc
Author: jasone Date: Thu Jan 24 03:33:15 2013 New Revision: 245869 URL: http://svnweb.freebsd.org/changeset/base/245869 Log: Update list of ports required for importing jemalloc. Modified: head/contrib/jemalloc/FREEBSD-upgrade Modified: head/contrib/jemalloc/FREEBSD-upgrade == --- head/contrib/jemalloc/FREEBSD-upgrade Thu Jan 24 03:08:37 2013 (r245868) +++ head/contrib/jemalloc/FREEBSD-upgrade Thu Jan 24 03:33:15 2013 (r245869) @@ -9,6 +9,7 @@ # - devel/git # - devel/gmake # - textproc/docbook-xsl +# - textproc/libxslt # # The normal workflow for importing a new release is: # ___ svn-src-all@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 commit: r245870 - head/sys/dev/bge
Author: yongari
Date: Thu Jan 24 04:54:53 2013
New Revision: 245870
URL: http://svnweb.freebsd.org/changeset/base/245870
Log:
bge_attach() can fail before attaching mii(4). So make sure to check
bge_miibus before detaching mii(4).
Modified:
head/sys/dev/bge/if_bge.c
Modified: head/sys/dev/bge/if_bge.c
==
--- head/sys/dev/bge/if_bge.c Thu Jan 24 03:33:15 2013(r245869)
+++ head/sys/dev/bge/if_bge.c Thu Jan 24 04:54:53 2013(r245870)
@@ -3899,9 +3899,9 @@ bge_detach(device_t dev)
if (sc-bge_tq)
taskqueue_drain(sc-bge_tq, sc-bge_intr_task);
- if (sc-bge_flags BGE_FLAG_TBI) {
+ if (sc-bge_flags BGE_FLAG_TBI)
ifmedia_removeall(sc-bge_ifmedia);
- } else {
+ else if (sc-bge_miibus != NULL) {
bus_generic_detach(dev);
device_delete_child(dev, sc-bge_miibus);
}
___
svn-src-all@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 commit: r245871 - head/bin/df
Author: delphij
Date: Thu Jan 24 05:36:37 2013
New Revision: 245871
URL: http://svnweb.freebsd.org/changeset/base/245871
Log:
- Wrap long line;
- Add -, to SYNOPSIS section.
MFC after:2 weeks
Modified:
head/bin/df/df.1
head/bin/df/df.c
Modified: head/bin/df/df.1
==
--- head/bin/df/df.1Thu Jan 24 04:54:53 2013(r245870)
+++ head/bin/df/df.1Thu Jan 24 05:36:37 2013(r245871)
@@ -29,7 +29,7 @@
.\ @(#)df.1 8.3 (Berkeley) 5/8/95
.\ $FreeBSD$
.\
-.Dd November 16, 2012
+.Dd January 24, 2012
.Dt DF 1
.Os
.Sh NAME
@@ -39,6 +39,7 @@
.Nm
.Op Fl b | g | H | h | k | m | P
.Op Fl acilnT
+.Op Fl \,
.Op Fl t Ar type
.Op Ar file | filesystem ...
.Sh DESCRIPTION
Modified: head/bin/df/df.c
==
--- head/bin/df/df.cThu Jan 24 04:54:53 2013(r245870)
+++ head/bin/df/df.cThu Jan 24 05:36:37 2013(r245871)
@@ -564,7 +564,8 @@ usage(void)
{
(void)fprintf(stderr,
-usage: df [-b | -g | -H | -h | -k | -m | -P] [-acilnT] [-t type] [-,] [file |
filesystem ...]\n);
+usage: df [-b | -g | -H | -h | -k | -m | -P] [-acilnT] [-t type] [-,]\n
+ [file | filesystem ...]\n);
exit(EX_USAGE);
}
___
svn-src-all@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 commit: r245872 - head/share/man/man4
Author: eadler Date: Thu Jan 24 06:30:56 2013 New Revision: 245872 URL: http://svnweb.freebsd.org/changeset/base/245872 Log: Indicate a bunch of new hardware support. PR: docs/173893 Submitted by: Mathieu Simon mathieu@gmail.com Approved by: bcr (mentor) Modified: head/share/man/man4/mfi.4 Modified: head/share/man/man4/mfi.4 == --- head/share/man/man4/mfi.4 Thu Jan 24 05:36:37 2013(r245871) +++ head/share/man/man4/mfi.4 Thu Jan 24 06:30:56 2013(r245872) @@ -24,7 +24,7 @@ .\ .\ $FreeBSD$ .\ -.Dd May 12, 2010 +.Dd January 24, 2013 .Dt MFI 4 .Os .Sh NAME @@ -85,16 +85,24 @@ LSI MegaRAID SAS 8408E .It LSI MegaRAID SAS 8480E .It +LSI MegaRAID SAS 9240 +.It LSI MegaRAID SAS 9260 .It Dell PERC5 .It Dell PERC6 .It +IBM ServeRAID M1015 SAS/SATA +.It +IBM ServeRAID M1115 SAS/SATA +.It IBM ServeRAID M5015 SAS/SATA .It IBM ServeRAID-MR10i .It +Intel RAID Controller SRCSAS18E +.It Intel RAID Controller SROMBSAS18E .El .Sh FILES ___ svn-src-all@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
