svn commit: r229471 - in stable/9: sys/dev/cpuctl usr.sbin/cpucontrol
Author: fabient
Date: Wed Jan 4 08:14:05 2012
New Revision: 229471
URL: http://svn.freebsd.org/changeset/base/229471
Log:
MFC r228436:
Add VIA microde update support to cpuctl(4) and cpucontrol(8).
Added:
stable/9/usr.sbin/cpucontrol/via.c
- copied unchanged from r228436, head/usr.sbin/cpucontrol/via.c
stable/9/usr.sbin/cpucontrol/via.h
- copied unchanged from r228436, head/usr.sbin/cpucontrol/via.h
Modified:
stable/9/sys/dev/cpuctl/cpuctl.c
stable/9/usr.sbin/cpucontrol/Makefile
stable/9/usr.sbin/cpucontrol/cpucontrol.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/usr.sbin/cpucontrol/ (props changed)
Modified: stable/9/sys/dev/cpuctl/cpuctl.c
==
--- stable/9/sys/dev/cpuctl/cpuctl.cWed Jan 4 07:58:36 2012
(r229470)
+++ stable/9/sys/dev/cpuctl/cpuctl.cWed Jan 4 08:14:05 2012
(r229471)
@@ -74,6 +74,8 @@ static int cpuctl_do_update(int cpu, cpu
static int update_intel(int cpu, cpuctl_update_args_t *args,
struct thread *td);
static int update_amd(int cpu, cpuctl_update_args_t *args, struct thread *td);
+static int update_via(int cpu, cpuctl_update_args_t *args,
+struct thread *td);
static struct cdev **cpuctl_devs;
static MALLOC_DEFINE(M_CPUCTL, "cpuctl", "CPUCTL buffer");
@@ -281,8 +283,10 @@ cpuctl_do_update(int cpu, cpuctl_update_
vendor[12] = '\0';
if (strncmp(vendor, INTEL_VENDOR_ID, sizeof(INTEL_VENDOR_ID)) == 0)
ret = update_intel(cpu, data, td);
- else if(strncmp(vendor, INTEL_VENDOR_ID, sizeof(AMD_VENDOR_ID)) == 0)
+ else if(strncmp(vendor, AMD_VENDOR_ID, sizeof(AMD_VENDOR_ID)) == 0)
ret = update_amd(cpu, data, td);
+ else if(strncmp(vendor, CENTAUR_VENDOR_ID, sizeof(CENTAUR_VENDOR_ID))
== 0)
+ ret = update_via(cpu, data, td);
else
ret = ENXIO;
return (ret);
@@ -402,6 +406,81 @@ fail:
return (ret);
}
+static int
+update_via(int cpu, cpuctl_update_args_t *args, struct thread *td)
+{
+ void *ptr = NULL;
+ uint64_t rev0, rev1, res;
+ uint32_t tmp[4];
+ int is_bound = 0;
+ int oldcpu;
+ int ret;
+
+ if (args->size == 0 || args->data == NULL) {
+ DPRINTF("[cpuctl,%d]: zero-sized firmware image", __LINE__);
+ return (EINVAL);
+ }
+ if (args->size > UCODE_SIZE_MAX) {
+ DPRINTF("[cpuctl,%d]: firmware image too large", __LINE__);
+ return (EINVAL);
+ }
+
+ /*
+* 4 byte alignment required.
+*/
+ ptr = malloc(args->size + 16, M_CPUCTL, M_WAITOK);
+ ptr = (void *)(16 + ((intptr_t)ptr & ~0xf));
+ if (copyin(args->data, ptr, args->size) != 0) {
+ DPRINTF("[cpuctl,%d]: copyin %p->%p of %zd bytes failed",
+ __LINE__, args->data, ptr, args->size);
+ ret = EFAULT;
+ goto fail;
+ }
+ oldcpu = td->td_oncpu;
+ is_bound = cpu_sched_is_bound(td);
+ set_cpu(cpu, td);
+ critical_enter();
+ rdmsr_safe(MSR_BIOS_SIGN, &rev0); /* Get current micorcode revision. */
+
+ /*
+* Perform update.
+*/
+ wrmsr_safe(MSR_BIOS_UPDT_TRIG, (uintptr_t)(ptr));
+ do_cpuid(1, tmp);
+
+ /*
+* Result are in low byte of MSR FCR5:
+* 0x00: No update has been attempted since RESET.
+* 0x01: The last attempted update was successful.
+* 0x02: The last attempted update was unsuccessful due to a bad
+* environment. No update was loaded and any preexisting
+* patches are still active.
+* 0x03: The last attempted update was not applicable to this processor.
+* No update was loaded and any preexisting patches are still
+* active.
+* 0x04: The last attempted update was not successful due to an invalid
+* update data block. No update was loaded and any preexisting
+* patches are still active
+*/
+ rdmsr_safe(0x1205, &res);
+ res &= 0xff;
+ critical_exit();
+ rdmsr_safe(MSR_BIOS_SIGN, &rev1); /* Get new microcode revision. */
+ restore_cpu(oldcpu, is_bound, td);
+
+ DPRINTF("[cpu,%d]: rev0=%x rev1=%x res=%x\n", __LINE__,
+ (unsigned)(rev0 >> 32), (unsigned)(rev1 >> 32), (unsigned)res);
+
+ if (res != 0x01)
+ ret = EINVAL;
+ else
+ ret = 0;
+fail:
+ if (ptr != NULL)
+ contigfree(ptr, args->size, M_CPUCTL);
+ return (ret);
+}
+
int
cpuctl_open(struct cdev *dev, int flags, int fmt __unused, struct thread *td)
{
Modified: stable/9/usr.sbin/cpucontrol/Makefile
==
--- stable/9/usr.sbin/cpucontrol/Makefile Wed Jan 4 07:58:36 2012
(r229470)
+++ stable/9/usr
svn commit: r229472 - in stable/8: sys/dev/cpuctl usr.sbin/cpucontrol
Author: fabient
Date: Wed Jan 4 08:47:00 2012
New Revision: 229472
URL: http://svn.freebsd.org/changeset/base/229472
Log:
MFC r228436:
Add VIA microcode update support to cpuctl(4) and cpucontrol(8).
Added:
stable/8/usr.sbin/cpucontrol/via.c
- copied unchanged from r228436, head/usr.sbin/cpucontrol/via.c
stable/8/usr.sbin/cpucontrol/via.h
- copied unchanged from r228436, head/usr.sbin/cpucontrol/via.h
Modified:
stable/8/sys/dev/cpuctl/cpuctl.c
stable/8/usr.sbin/cpucontrol/Makefile
stable/8/usr.sbin/cpucontrol/cpucontrol.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/usr.sbin/cpucontrol/ (props changed)
Modified: stable/8/sys/dev/cpuctl/cpuctl.c
==
--- stable/8/sys/dev/cpuctl/cpuctl.cWed Jan 4 08:14:05 2012
(r229471)
+++ stable/8/sys/dev/cpuctl/cpuctl.cWed Jan 4 08:47:00 2012
(r229472)
@@ -74,6 +74,8 @@ static int cpuctl_do_update(int cpu, cpu
static int update_intel(int cpu, cpuctl_update_args_t *args,
struct thread *td);
static int update_amd(int cpu, cpuctl_update_args_t *args, struct thread *td);
+static int update_via(int cpu, cpuctl_update_args_t *args,
+struct thread *td);
static struct cdev **cpuctl_devs;
static MALLOC_DEFINE(M_CPUCTL, "cpuctl", "CPUCTL buffer");
@@ -281,8 +283,10 @@ cpuctl_do_update(int cpu, cpuctl_update_
vendor[12] = '\0';
if (strncmp(vendor, INTEL_VENDOR_ID, sizeof(INTEL_VENDOR_ID)) == 0)
ret = update_intel(cpu, data, td);
- else if(strncmp(vendor, INTEL_VENDOR_ID, sizeof(AMD_VENDOR_ID)) == 0)
+ else if(strncmp(vendor, AMD_VENDOR_ID, sizeof(AMD_VENDOR_ID)) == 0)
ret = update_amd(cpu, data, td);
+ else if(strncmp(vendor, CENTAUR_VENDOR_ID, sizeof(CENTAUR_VENDOR_ID))
== 0)
+ ret = update_via(cpu, data, td);
else
ret = ENXIO;
return (ret);
@@ -402,6 +406,81 @@ fail:
return (ret);
}
+static int
+update_via(int cpu, cpuctl_update_args_t *args, struct thread *td)
+{
+ void *ptr = NULL;
+ uint64_t rev0, rev1, res;
+ uint32_t tmp[4];
+ int is_bound = 0;
+ int oldcpu;
+ int ret;
+
+ if (args->size == 0 || args->data == NULL) {
+ DPRINTF("[cpuctl,%d]: zero-sized firmware image", __LINE__);
+ return (EINVAL);
+ }
+ if (args->size > UCODE_SIZE_MAX) {
+ DPRINTF("[cpuctl,%d]: firmware image too large", __LINE__);
+ return (EINVAL);
+ }
+
+ /*
+* 4 byte alignment required.
+*/
+ ptr = malloc(args->size + 16, M_CPUCTL, M_WAITOK);
+ ptr = (void *)(16 + ((intptr_t)ptr & ~0xf));
+ if (copyin(args->data, ptr, args->size) != 0) {
+ DPRINTF("[cpuctl,%d]: copyin %p->%p of %zd bytes failed",
+ __LINE__, args->data, ptr, args->size);
+ ret = EFAULT;
+ goto fail;
+ }
+ oldcpu = td->td_oncpu;
+ is_bound = cpu_sched_is_bound(td);
+ set_cpu(cpu, td);
+ critical_enter();
+ rdmsr_safe(MSR_BIOS_SIGN, &rev0); /* Get current micorcode revision. */
+
+ /*
+* Perform update.
+*/
+ wrmsr_safe(MSR_BIOS_UPDT_TRIG, (uintptr_t)(ptr));
+ do_cpuid(1, tmp);
+
+ /*
+* Result are in low byte of MSR FCR5:
+* 0x00: No update has been attempted since RESET.
+* 0x01: The last attempted update was successful.
+* 0x02: The last attempted update was unsuccessful due to a bad
+* environment. No update was loaded and any preexisting
+* patches are still active.
+* 0x03: The last attempted update was not applicable to this processor.
+* No update was loaded and any preexisting patches are still
+* active.
+* 0x04: The last attempted update was not successful due to an invalid
+* update data block. No update was loaded and any preexisting
+* patches are still active
+*/
+ rdmsr_safe(0x1205, &res);
+ res &= 0xff;
+ critical_exit();
+ rdmsr_safe(MSR_BIOS_SIGN, &rev1); /* Get new microcode revision. */
+ restore_cpu(oldcpu, is_bound, td);
+
+ DPRINTF("[cpu,%d]: rev0=%x rev1=%x res=%x\n", __LINE__,
+ (unsigned)(rev0 >> 32), (unsigned)(rev1 >> 32), (unsigned)res);
+
+ if (res != 0x01)
+ ret = EINVAL;
+ else
+ ret = 0;
+fail:
+ if (ptr != NULL)
+ contigfree(ptr, args->size, M_CPUCTL);
+ return (ret);
+}
+
int
cpuctl_open(struct cdev *dev, int flags, int fmt __unused, struct thread *td)
{
Modified: stable/8/usr.sbin/cpucontrol/Makefile
==
--- stable/8/usr.sbin/cpucontrol/Makefile Wed Jan 4 08:14:05 2012
(r229471)
+++ stable/8/u
Re: svn commit: r229430 - in head/sys: conf dev/sound/pci modules/sound/driver/emu10k1
On 03-01-2012 16:15, John Baldwin wrote: > On Tuesday, January 03, 2012 4:04:54 pm Pedro F. Giffuni wrote: > > Author: pfg > > Date: Tue Jan 3 21:04:54 2012 > > New Revision: 229430 > > URL: http://svn.freebsd.org/changeset/base/229430 > > > > Log: > > Replace a GPL'd header in the emu10k1 snd driver code. > > > > This brings in the emuxkireg.h from NetBSD (dev/pci) which > > is used for the same purpose but is smaller. The emu10k1 > > is now free from the GPL. > > Is this a common-enough chipset to enable in GENERIC now that it is safe to > do so? I think so, but I also think we should decide what to do with emu10kx (if anything) as I suspect it will remain GPL polluted. The emu10k1 and emu10kx drivers essentially support the same hardware, with a few exceptions (if memory serves me right -- I think there are a few cards that emu10kx does not support, someone should check with Yuriy). However, emu10kx has a few nice features like optional multichannel and MIDI I/O support... -- Joel ___ 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: r229430 - in head/sys: conf dev/sound/pci modules/sound/driver/emu10k1
On Wed, Jan 04, 2012 at 09:54:53AM +0100, Joel Dahl wrote: > The emu10k1 and emu10kx drivers essentially support the same hardware, with > a few exceptions (if memory serves me right -- I think there are a few cards > that emu10kx does not support, someone should check with Yuriy). However, > emu10kx has a few nice features like optional multichannel and MIDI I/O > support... How hard would it be to (re)implement missing features with emu10k1 and nuke GPL-polluted emu10kx? ./danfe ___ 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: r229473 - in stable/9/sys: boot/common boot/forth conf kern
Author: pluknet Date: Wed Jan 4 12:39:52 2012 New Revision: 229473 URL: http://svn.freebsd.org/changeset/base/229473 Log: MFC r226833,r227056: Remove the long reprecated ``/stand/sysinstall'' from the init_path. Modified: stable/9/sys/boot/common/loader.8 stable/9/sys/boot/forth/loader.conf stable/9/sys/conf/NOTES stable/9/sys/kern/init_main.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) Modified: stable/9/sys/boot/common/loader.8 == --- stable/9/sys/boot/common/loader.8 Wed Jan 4 08:47:00 2012 (r229472) +++ stable/9/sys/boot/common/loader.8 Wed Jan 4 12:39:52 2012 (r229473) @@ -443,7 +443,7 @@ Sets the list of binaries which the kern process. The first matching binary is used. The default list is -.Dq Li /sbin/init:/sbin/oinit:/sbin/init.bak:\:/rescue/init:/stand/sysinstall . +.Dq Li /sbin/init:/sbin/oinit:/sbin/init.bak:\:/rescue/init . .It Va init_script If set to a valid file name in the root file system, instructs Modified: stable/9/sys/boot/forth/loader.conf == --- stable/9/sys/boot/forth/loader.conf Wed Jan 4 08:47:00 2012 (r229472) +++ stable/9/sys/boot/forth/loader.conf Wed Jan 4 12:39:52 2012 (r229473) @@ -81,7 +81,7 @@ module_path="/boot/modules" # Set the mo #boot_serial=""# -h: Use serial console #boot_single=""# -s: Start system in single-user mode #boot_verbose="" # -v: Causes extra debugging information to be printed -#init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init:/stand/sysinstall" +#init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init" # Sets the list of init candidates #init_shell="/bin/sh" # The shell binary used by init(8). #init_script=""# Initial script to run by init(8) before chrooting. Modified: stable/9/sys/conf/NOTES == --- stable/9/sys/conf/NOTES Wed Jan 4 08:47:00 2012(r229472) +++ stable/9/sys/conf/NOTES Wed Jan 4 12:39:52 2012(r229473) @@ -2812,7 +2812,7 @@ options UBSEC_RNDTEST # enable rndtest # Embedded system options: # # An embedded system might want to run something other than init. -optionsINIT_PATH=/sbin/init:/stand/sysinstall +optionsINIT_PATH=/sbin/init:/rescue/init # Debug options optionsBUS_DEBUG # enable newbus debugging Modified: stable/9/sys/kern/init_main.c == --- stable/9/sys/kern/init_main.c Wed Jan 4 08:47:00 2012 (r229472) +++ stable/9/sys/kern/init_main.c Wed Jan 4 12:39:52 2012 (r229473) @@ -641,7 +641,7 @@ static char init_path[MAXPATHLEN] = #ifdef INIT_PATH __XSTRING(INIT_PATH); #else -"/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init:/stand/sysinstall"; +"/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init"; #endif SYSCTL_STRING(_kern, OID_AUTO, init_path, CTLFLAG_RD, init_path, 0, "Path used to search the init process"); ___ 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: r229474 - in stable/8/sys: boot/common boot/forth conf kern
Author: pluknet Date: Wed Jan 4 12:48:24 2012 New Revision: 229474 URL: http://svn.freebsd.org/changeset/base/229474 Log: MFC r226833,r227056: Remove the long reprecated ``/stand/sysinstall'' from the init_path. Modified: stable/8/sys/boot/common/loader.8 stable/8/sys/boot/forth/loader.conf stable/8/sys/conf/NOTES stable/8/sys/kern/init_main.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/conf/ldscript.mips.octeon1.32 (props changed) stable/8/sys/conf/ldscript.mips.octeon1.64 (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/boot/common/loader.8 == --- stable/8/sys/boot/common/loader.8 Wed Jan 4 12:39:52 2012 (r229473) +++ stable/8/sys/boot/common/loader.8 Wed Jan 4 12:48:24 2012 (r229474) @@ -449,7 +449,7 @@ Sets the list of binaries which the kern process. The first matching binary is used. The default list is -.Dq Li /sbin/init:/sbin/oinit:/sbin/init.bak:\:/rescue/init:/stand/sysinstall . +.Dq Li /sbin/init:/sbin/oinit:/sbin/init.bak:\:/rescue/init . .It Va init_script If set to a valid file name in the root file system, instructs Modified: stable/8/sys/boot/forth/loader.conf == --- stable/8/sys/boot/forth/loader.conf Wed Jan 4 12:39:52 2012 (r229473) +++ stable/8/sys/boot/forth/loader.conf Wed Jan 4 12:48:24 2012 (r229474) @@ -76,7 +76,7 @@ module_path="/boot/modules" # Set the mo #boot_serial=""# -h: Use serial console #boot_single=""# -s: Start system in single-user mode #boot_verbose="" # -v: Causes extra debugging information to be printed -#init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init:/stand/sysinstall" +#init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init" # Sets the list of init candidates #init_shell="/bin/sh" # The shell binary used by init(8). #init_script=""# Initial script to run by init(8) before chrooting. Modified: stable/8/sys/conf/NOTES == --- stable/8/sys/conf/NOTES Wed Jan 4 12:39:52 2012(r229473) +++ stable/8/sys/conf/NOTES Wed Jan 4 12:48:24 2012(r229474) @@ -2733,7 +2733,7 @@ options UBSEC_RNDTEST # enable rndtest # Embedded system options: # # An embedded system might want to run something other than init. -optionsINIT_PATH=/sbin/init:/stand/sysinstall +optionsINIT_PATH=/sbin/init:/rescue/init # Debug options optionsBUS_DEBUG # enable newbus debugging Modified: stable/8/sys/kern/init_main.c == --- stable/8/sys/kern/init_main.c Wed Jan 4 12:39:52 2012 (r229473) +++ stable/8/sys/kern/init_main.c Wed Jan 4 12:48:24 2012 (r229474) @@ -623,7 +623,7 @@ static char init_path[MAXPATHLEN] = #ifdef INIT_PATH __XSTRING(INIT_PATH); #else -"/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init:/stand/sysinstall"; +"/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init"; #endif SYSCTL_STRING(_kern, OID_AUTO, init_path, CTLFLAG_RD, init_path, 0, "Path used to search the init process"); ___ 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: r229475 - stable/9/sys/fs/pseudofs
Author: pho
Date: Wed Jan 4 12:54:35 2012
New Revision: 229475
URL: http://svn.freebsd.org/changeset/base/229475
Log:
MFC: r227527
Removed extra PRELE() call.
Modified:
stable/9/sys/fs/pseudofs/pseudofs_vnops.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
Modified: stable/9/sys/fs/pseudofs/pseudofs_vnops.c
==
--- stable/9/sys/fs/pseudofs/pseudofs_vnops.c Wed Jan 4 12:48:24 2012
(r229474)
+++ stable/9/sys/fs/pseudofs/pseudofs_vnops.c Wed Jan 4 12:54:35 2012
(r229475)
@@ -632,8 +632,6 @@ pfs_read(struct vop_read_args *va)
(offset = uio->uio_offset) != uio->uio_offset ||
(resid = uio->uio_resid) != uio->uio_resid ||
(buflen = offset + resid + 1) < offset || buflen > INT_MAX) {
- if (proc != NULL)
- PRELE(proc);
error = EINVAL;
goto ret;
}
___
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: r229368 - in head: lib/libc lib/libc/arm/string lib/libc/i386/string lib/libc/mips/string lib/libc/string lib/libstand sys/boot/userboot/libstand
On Tue, 3 Jan 2012, Ed Schouten wrote:
* Bruce Evans , 20120103 16:49:
This breaks the Standard C namespace. When they are in the same object
file, there is no way to get the standard name without getting the
nonstandard name. So the following C-standard-conforming C program
now gets a linkage error (multiple definition of `index'), at least with
static linkage:
#include
int index;
void foo(const char *p) { return strchr(p, '1'); }
Though I sympathize, this problem is not just limited to strchr(). There
are other portions of the C library that use index() as well. For
example, if you use , ttyslot(), one of the exec*() functions
or the NIS functions, you already get index() linked into your binary.
These are standard C or very often used parts of libc though. Your
change gives the bizarre behaviour that any use of strchr() by an
application prevents all uses of index by the application (except
calling the library index()), while the only point of of cleaning up
libraries to not use index() is to allow applications to use it for
whatever they want.
[...] and the C
standard might require memcpy and memmove to have different addresses.
I just skimmed through the standard, and if I haven't overlooked
anything, no such requirement is made. Also, I can imagine a compiler
with good support for link-time optimisation can already merge equal
pieces of code together, making it even harder to reason about
inequality of function addresses.
Still, I am willing to address the issues you raised. index() and
rindex() aren't that important nowadays and I have a patchset ready in
my home directory that converts almost all apps in the base system to
use strchr() anyway.
As I don't feel like polluting the MI strchr() implementations with
index()/rindex() support, would it be okay if I implement index() and
rindex() as simple C functions that call into strchr() and strrchr()?
Just use a weak symbol. This is good enough for hundreds or thousands
or existing aliases.
I did a quick check what gprof does with the alises. It seems to be
random. gprof reports that the symbol for open(2) is `open', irrespective
of whether I spell it `open' or _open in the source code. OTOH, gprof
reports that the symbol for vfscanf(3) is __vfscanf, irrespective of
whether I spell it vfscanf or __vfscanf in the source code. The object
code contains both symbols of course (after linking to libc). I think
gprof just picks one of the symbols semi-randomly (for these 2 pairs,
it uses the last symbol in symbol table order). To do the right thing,
the object linked object code would have to contain a hint about which
symbol the application used (which is only possible if the application
only used 1 of the aliases), and gprof would have to understand the
hint. I think there is no such hint. To do the next best thing, gprof
would have to prefer the non-weak symbol. Is this possible? nm output
doesn't distinguish the symbols.
I tried doing something using chained aliases with a weak link, and only
found lots of bugs. E.g.:
% #include
%
% /*
% * XXX __strong_alias() is unusable since it acts at the C level, but our
% * intermediate symbol only exists at the asm level.
% */
% #undef __strong_reference
% #define __strong_reference(sym, alias) \
% __asm(".global " #alias); \
% __asm(#alias " = " #sym)
%
% void xstrchr(void) {}
%
% __weak_reference(xstrchr, __xindex);
% __strong_reference(__xindex, xindex);
This reimplementation of __strong_reference() worked like I wanted (on
i386), but the chain didn't do anything interesting or fix gprof.
I copied it from the STRONG_ALIAS() that you added in i386/include/asm.h,
except STRONG_ALIAS() has the parameters reversed relative to all the macros
in cdefs.h. STRONG_ALIAS() only exists on mips and now i386.
The section that defines symbol macros in cdefs.h has lots of bugs:
- wrong conditional. Old versions of gcc don't support the attribute that
it uses, or __attribute__(()) at all.
- __strong_reference() is only defined for !__INTEL_COMPILER. It is now
used unconditionally in libc (in ptsname.c alone). Thus, icc cannot
possibly compile libc. The above reemplmentation of __strong_reference()
may be less unportable. All of these symbol definitions are unportable
and don't belong in MI cdefs.h. They assume a particular dialect of asm
and much more. But they are portable enough in practice since we only
use the gas dialect.
The rest are just style bugs:
- no space after commas in parameter lists. The !STDC or the !ELF case
may need this. Otherwise, it is just a style bug (copied from the
older !ELF code). The !STDC case has probably never been used in
FreeBSD. Both subcases of the ELF case were added in 1998 just
before K&R support started being dismantled. Some !STDC support
remains. But ELF support was removed soon after. I think it is only
the removed !ELF && !STDC case that needs to misformat the pa
Re: svn commit: r229473 - in stable/9/sys: boot/common boot/forth conf kern
On Wednesday, January 04, 2012 7:39:53 am Sergey Kandaurov wrote: > Author: pluknet > Date: Wed Jan 4 12:39:52 2012 > New Revision: 229473 > URL: http://svn.freebsd.org/changeset/base/229473 > > Log: > MFC r226833,r227056: > > Remove the long reprecated ``/stand/sysinstall'' from the init_path. I think this is premature for 9. sysinstall still exists in 9 along with src/release/Makefile.sysinstall. -- John Baldwin ___ 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: r229474 - in stable/8/sys: boot/common boot/forth conf kern
On Wednesday, January 04, 2012 7:48:24 am Sergey Kandaurov wrote: > Author: pluknet > Date: Wed Jan 4 12:48:24 2012 > New Revision: 229474 > URL: http://svn.freebsd.org/changeset/base/229474 > > Log: > MFC r226833,r227056: > > Remove the long reprecated ``/stand/sysinstall'' from the init_path. Uh, you need to revert this or 8.3 won't install. -- John Baldwin ___ 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: r229473 - in stable/9/sys: boot/common boot/forth conf kern
On 4 January 2012 16:54, John Baldwin wrote: > On Wednesday, January 04, 2012 7:39:53 am Sergey Kandaurov wrote: >> Author: pluknet >> Date: Wed Jan 4 12:39:52 2012 >> New Revision: 229473 >> URL: http://svn.freebsd.org/changeset/base/229473 >> >> Log: >> MFC r226833,r227056: >> >> Remove the long reprecated ``/stand/sysinstall'' from the init_path. > > I think this is premature for 9. sysinstall still exists in 9 along with > src/release/Makefile.sysinstall. Yes, but /stand do not (since 5.3 ?). That was the reason to merge this back. -- wbr, pluknet ___ 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: r229474 - in stable/8/sys: boot/common boot/forth conf kern
On 4 January 2012 16:54, John Baldwin wrote: > On Wednesday, January 04, 2012 7:48:24 am Sergey Kandaurov wrote: >> Author: pluknet >> Date: Wed Jan 4 12:48:24 2012 >> New Revision: 229474 >> URL: http://svn.freebsd.org/changeset/base/229474 >> >> Log: >> MFC r226833,r227056: >> >> Remove the long reprecated ``/stand/sysinstall'' from the init_path. > > Uh, you need to revert this or 8.3 won't install. So, /stand was removed exactly 5.3 timeframe. I see no reason why we still should reference it 3 major versions later. Please correct me if I'm wrong. http://www.mavetju.org/mail/view_message.php?list=freebsd-arch&id=1749748 -- wbr, pluknet ___ 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: r229473 - in stable/9/sys: boot/common boot/forth conf kern
On Wednesday, January 04, 2012 8:05:32 am Sergey Kandaurov wrote: > On 4 January 2012 16:54, John Baldwin wrote: > > On Wednesday, January 04, 2012 7:39:53 am Sergey Kandaurov wrote: > >> Author: pluknet > >> Date: Wed Jan 4 12:39:52 2012 > >> New Revision: 229473 > >> URL: http://svn.freebsd.org/changeset/base/229473 > >> > >> Log: > >> MFC r226833,r227056: > >> > >> Remove the long reprecated ``/stand/sysinstall'' from the init_path. > > > > I think this is premature for 9. sysinstall still exists in 9 along with > > src/release/Makefile.sysinstall. > > Yes, but /stand do not (since 5.3 ?). > That was the reason to merge this back. /stand exists in the MFS root used during a sysinstall-based install. That is how the install starts up (/stand/sysinstall from the MFS root is invoked as the init process by the kernel). -- John Baldwin ___ 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: r229476 - head/sys/netinet
Author: jhb
Date: Wed Jan 4 13:23:51 2012
New Revision: 229476
URL: http://svn.freebsd.org/changeset/base/229476
Log:
Fix the SIOC[DG]LIFADDR ioctls in in_lifaddr_ioctl() to work with IPv4
interface address rather than IPv6.
Submitted by: hrs
Reviewed by: bz
MFC after:1 week
Modified:
head/sys/netinet/in.c
Modified: head/sys/netinet/in.c
==
--- head/sys/netinet/in.c Wed Jan 4 12:54:35 2012(r229475)
+++ head/sys/netinet/in.c Wed Jan 4 13:23:51 2012(r229476)
@@ -735,7 +735,7 @@ in_lifaddr_ioctl(struct socket *so, u_lo
if (iflr->flags & IFLR_PREFIX)
return (EINVAL);
- /* copy args to in_aliasreq, perform ioctl(SIOCAIFADDR_IN6). */
+ /* copy args to in_aliasreq, perform ioctl(SIOCAIFADDR). */
bzero(&ifra, sizeof(ifra));
bcopy(iflr->iflr_name, ifra.ifra_name,
sizeof(ifra.ifra_name));
@@ -785,7 +785,7 @@ in_lifaddr_ioctl(struct socket *so, u_lo
}
TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
- if (ifa->ifa_addr->sa_family != AF_INET6)
+ if (ifa->ifa_addr->sa_family != AF_INET)
continue;
if (match.s_addr == 0)
break;
@@ -817,7 +817,7 @@ in_lifaddr_ioctl(struct socket *so, u_lo
} else {
struct in_aliasreq ifra;
- /* fill in_aliasreq and do ioctl(SIOCDIFADDR_IN6) */
+ /* fill in_aliasreq and do ioctl(SIOCDIFADDR) */
bzero(&ifra, sizeof(ifra));
bcopy(iflr->iflr_name, ifra.ifra_name,
sizeof(ifra.ifra_name));
___
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: r229477 - head/sys/netinet
Author: jhb
Date: Wed Jan 4 13:26:56 2012
New Revision: 229477
URL: http://svn.freebsd.org/changeset/base/229477
Log:
In the handling of the SIOC[DG]LIFADDR icotls in in_lifaddr_ioctl(), add
missing interface address list locking and grab a reference on the
matching interface address after dropping the lock while it is used to
avoid a potential use after free.
Reviewed by: bz
MFC after:1 week
Modified:
head/sys/netinet/in.c
Modified: head/sys/netinet/in.c
==
--- head/sys/netinet/in.c Wed Jan 4 13:23:51 2012(r229476)
+++ head/sys/netinet/in.c Wed Jan 4 13:26:56 2012(r229477)
@@ -784,6 +784,7 @@ in_lifaddr_ioctl(struct socket *so, u_lo
}
}
+ IF_ADDR_LOCK(ifp);
TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
if (ifa->ifa_addr->sa_family != AF_INET)
continue;
@@ -794,6 +795,9 @@ in_lifaddr_ioctl(struct socket *so, u_lo
if (candidate.s_addr == match.s_addr)
break;
}
+ if (ifa != NULL)
+ ifa_ref(ifa);
+ IF_ADDR_UNLOCK(ifp);
if (ifa == NULL)
return (EADDRNOTAVAIL);
ia = (struct in_ifaddr *)ifa;
@@ -812,6 +816,7 @@ in_lifaddr_ioctl(struct socket *so, u_lo
in_mask2len(&ia->ia_sockmask.sin_addr);
iflr->flags = 0;/*XXX*/
+ ifa_free(ifa);
return (0);
} else {
@@ -830,6 +835,7 @@ in_lifaddr_ioctl(struct socket *so, u_lo
}
bcopy(&ia->ia_sockmask, &ifra.ifra_dstaddr,
ia->ia_sockmask.sin_len);
+ ifa_free(ifa);
return (in_control(so, SIOCDIFADDR, (caddr_t)&ifra,
ifp, td));
___
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: r229478 - head/sys/netinet
Author: jhb Date: Wed Jan 4 13:29:26 2012 New Revision: 229478 URL: http://svn.freebsd.org/changeset/base/229478 Log: Use a helper variable to wrap a long line. Modified: head/sys/netinet/in.c Modified: head/sys/netinet/in.c == --- head/sys/netinet/in.c Wed Jan 4 13:26:56 2012(r229477) +++ head/sys/netinet/in.c Wed Jan 4 13:29:26 2012(r229478) @@ -790,7 +790,8 @@ in_lifaddr_ioctl(struct socket *so, u_lo continue; if (match.s_addr == 0) break; - candidate.s_addr = ((struct sockaddr_in *)&ifa->ifa_addr)->sin_addr.s_addr; + sin = (struct sockaddr_in *)&ifa->ifa_addr; + candidate.s_addr = sin->sin_addr.s_addr; candidate.s_addr &= mask.s_addr; if (candidate.s_addr == match.s_addr) break; ___ 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: r229474 - in stable/8/sys: boot/common boot/forth conf kern
On Wednesday, January 04, 2012 8:09:51 am Sergey Kandaurov wrote: > On 4 January 2012 16:54, John Baldwin wrote: > > On Wednesday, January 04, 2012 7:48:24 am Sergey Kandaurov wrote: > >> Author: pluknet > >> Date: Wed Jan 4 12:48:24 2012 > >> New Revision: 229474 > >> URL: http://svn.freebsd.org/changeset/base/229474 > >> > >> Log: > >> MFC r226833,r227056: > >> > >> Remove the long reprecated ``/stand/sysinstall'' from the init_path. > > > > Uh, you need to revert this or 8.3 won't install. > > So, /stand was removed exactly 5.3 timeframe. I see no reason > why we still should reference it 3 major versions later. > Please correct me if I'm wrong. > > http://www.mavetju.org/mail/view_message.php?list=freebsd-arch&id=1749748 That only stops making a copy of it from the MFS root onto the installed system. The entry in the init path is to allow the MFS root to boot during an install. If you go grab the mfsroot from 8.2-RELEASE and mount it via mdconfig you will find that it has no /sbin/init file. Instead, it uses /stand/sysinstall as its init. -- John Baldwin ___ 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: r229479 - head/sys/netinet6
Author: jhb
Date: Wed Jan 4 13:35:20 2012
New Revision: 229479
URL: http://svn.freebsd.org/changeset/base/229479
Log:
Use the mli_relinmhead list normally used to defer calls to
in6m_release_locked() to defer calls to mld_v1_transmit_report() until
after the IF_ADDR_LOCK is dropped. This removes a race where the lock
is dropped and reacquired while attempting to walk an interface's
address list.
Reviewed by: bz
MFC after:1 week
Modified:
head/sys/netinet6/mld6.c
Modified: head/sys/netinet6/mld6.c
==
--- head/sys/netinet6/mld6.cWed Jan 4 13:29:26 2012(r229478)
+++ head/sys/netinet6/mld6.cWed Jan 4 13:35:20 2012(r229479)
@@ -121,7 +121,8 @@ static int mld_v1_input_query(struct ifn
/*const*/ struct mld_hdr *);
static int mld_v1_input_report(struct ifnet *, const struct ip6_hdr *,
/*const*/ struct mld_hdr *);
-static voidmld_v1_process_group_timer(struct in6_multi *, const int);
+static voidmld_v1_process_group_timer(struct mld_ifinfo *,
+ struct in6_multi *);
static voidmld_v1_process_querier_timers(struct mld_ifinfo *);
static int mld_v1_transmit_report(struct in6_multi *, const int);
static voidmld_v1_update_group(struct in6_multi *, const int);
@@ -1336,8 +1337,8 @@ mld_fasttimo_vnet(void)
struct ifqueue qrq; /* Query response packets */
struct ifnet*ifp;
struct mld_ifinfo *mli;
- struct ifmultiaddr *ifma, *tifma;
- struct in6_multi*inm;
+ struct ifmultiaddr *ifma;
+ struct in6_multi*inm, *tinm;
int uri_fasthz;
uri_fasthz = 0;
@@ -1401,24 +1402,14 @@ mld_fasttimo_vnet(void)
}
IF_ADDR_LOCK(ifp);
- TAILQ_FOREACH_SAFE(ifma, &ifp->if_multiaddrs, ifma_link,
- tifma) {
+ TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family != AF_INET6 ||
ifma->ifma_protospec == NULL)
continue;
inm = (struct in6_multi *)ifma->ifma_protospec;
switch (mli->mli_version) {
case MLD_VERSION_1:
- /*
-* XXX Drop IF_ADDR lock temporarily to
-* avoid recursion caused by a potential
-* call by in6ifa_ifpforlinklocal().
-* rwlock candidate?
-*/
- IF_ADDR_UNLOCK(ifp);
- mld_v1_process_group_timer(inm,
- mli->mli_version);
- IF_ADDR_LOCK(ifp);
+ mld_v1_process_group_timer(mli, inm);
break;
case MLD_VERSION_2:
mld_v2_process_group_timers(mli, &qrq,
@@ -1428,9 +1419,25 @@ mld_fasttimo_vnet(void)
}
IF_ADDR_UNLOCK(ifp);
- if (mli->mli_version == MLD_VERSION_2) {
- struct in6_multi*tinm;
-
+ switch (mli->mli_version) {
+ case MLD_VERSION_1:
+ /*
+* Transmit reports for this lifecycle. This
+* is done while not holding IF_ADDR_LOCK
+* since this can call
+* in6ifa_ifpforlinklocal() which locks
+* IF_ADDR_LOCK internally as well as
+* ip6_output() to transmit a packet.
+*/
+ SLIST_FOREACH_SAFE(inm, &mli->mli_relinmhead,
+ in6m_nrele, tinm) {
+ SLIST_REMOVE_HEAD(&mli->mli_relinmhead,
+ in6m_nrele);
+ (void)mld_v1_transmit_report(inm,
+ MLD_LISTENER_REPORT);
+ }
+ break;
+ case MLD_VERSION_2:
mld_dispatch_queue(&qrq, 0);
mld_dispatch_queue(&scq, 0);
@@ -1444,6 +1451,7 @@ mld_fasttimo_vnet(void)
in6m_nrele);
in6m_release_locked(inm);
}
+ break;
}
}
@@ -1457,7 +1465,7 @@ out_locked:
* Will update the global pending timer flags.
*/
static void
-mld_v1_process_group_timer(struct in6_multi *inm, const int version)
+mld_v1_process_group_timer(struct mld_ifinfo *mli, struct in6_multi *inm)
{
Re: svn commit: r229474 - in stable/8/sys: boot/common boot/forth conf kern
On 4 January 2012 17:31, John Baldwin wrote: > On Wednesday, January 04, 2012 8:09:51 am Sergey Kandaurov wrote: >> On 4 January 2012 16:54, John Baldwin wrote: >> > On Wednesday, January 04, 2012 7:48:24 am Sergey Kandaurov wrote: >> >> Author: pluknet >> >> Date: Wed Jan 4 12:48:24 2012 >> >> New Revision: 229474 >> >> URL: http://svn.freebsd.org/changeset/base/229474 >> >> >> >> Log: >> >> MFC r226833,r227056: >> >> >> >> Remove the long reprecated ``/stand/sysinstall'' from the init_path. >> > >> > Uh, you need to revert this or 8.3 won't install. >> >> So, /stand was removed exactly 5.3 timeframe. I see no reason >> why we still should reference it 3 major versions later. >> Please correct me if I'm wrong. >> >> http://www.mavetju.org/mail/view_message.php?list=freebsd-arch&id=1749748 > > That only stops making a copy of it from the MFS root onto the installed > system. The entry in the init path is to allow the MFS root to boot during an > install. If you go grab the mfsroot from 8.2-RELEASE and mount it via > mdconfig you will find that it has no /sbin/init file. Instead, it uses > /stand/sysinstall as its init. Doh, indeed. I will revert it right now, sorry. -- wbr, pluknet ___ 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: r229480 - in stable/9/sys: boot/common boot/forth conf kern
Author: pluknet Date: Wed Jan 4 13:49:46 2012 New Revision: 229480 URL: http://svn.freebsd.org/changeset/base/229480 Log: Revert MFC r226833,227056. /stand exists in the MFS root used during a sysinstall-based install. Reported by: jhb Pointy hat to:pluknet Modified: stable/9/sys/boot/common/loader.8 stable/9/sys/boot/forth/loader.conf stable/9/sys/conf/NOTES stable/9/sys/kern/init_main.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) Modified: stable/9/sys/boot/common/loader.8 == --- stable/9/sys/boot/common/loader.8 Wed Jan 4 13:35:20 2012 (r229479) +++ stable/9/sys/boot/common/loader.8 Wed Jan 4 13:49:46 2012 (r229480) @@ -443,7 +443,7 @@ Sets the list of binaries which the kern process. The first matching binary is used. The default list is -.Dq Li /sbin/init:/sbin/oinit:/sbin/init.bak:\:/rescue/init . +.Dq Li /sbin/init:/sbin/oinit:/sbin/init.bak:\:/rescue/init:/stand/sysinstall . .It Va init_script If set to a valid file name in the root file system, instructs Modified: stable/9/sys/boot/forth/loader.conf == --- stable/9/sys/boot/forth/loader.conf Wed Jan 4 13:35:20 2012 (r229479) +++ stable/9/sys/boot/forth/loader.conf Wed Jan 4 13:49:46 2012 (r229480) @@ -81,7 +81,7 @@ module_path="/boot/modules" # Set the mo #boot_serial=""# -h: Use serial console #boot_single=""# -s: Start system in single-user mode #boot_verbose="" # -v: Causes extra debugging information to be printed -#init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init" +#init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init:/stand/sysinstall" # Sets the list of init candidates #init_shell="/bin/sh" # The shell binary used by init(8). #init_script=""# Initial script to run by init(8) before chrooting. Modified: stable/9/sys/conf/NOTES == --- stable/9/sys/conf/NOTES Wed Jan 4 13:35:20 2012(r229479) +++ stable/9/sys/conf/NOTES Wed Jan 4 13:49:46 2012(r229480) @@ -2812,7 +2812,7 @@ options UBSEC_RNDTEST # enable rndtest # Embedded system options: # # An embedded system might want to run something other than init. -optionsINIT_PATH=/sbin/init:/rescue/init +optionsINIT_PATH=/sbin/init:/stand/sysinstall # Debug options optionsBUS_DEBUG # enable newbus debugging Modified: stable/9/sys/kern/init_main.c == --- stable/9/sys/kern/init_main.c Wed Jan 4 13:35:20 2012 (r229479) +++ stable/9/sys/kern/init_main.c Wed Jan 4 13:49:46 2012 (r229480) @@ -641,7 +641,7 @@ static char init_path[MAXPATHLEN] = #ifdef INIT_PATH __XSTRING(INIT_PATH); #else -"/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init"; +"/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init:/stand/sysinstall"; #endif SYSCTL_STRING(_kern, OID_AUTO, init_path, CTLFLAG_RD, init_path, 0, "Path used to search the init process"); ___ 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: r229481 - in stable/8/sys: boot/common boot/forth conf kern
Author: pluknet Date: Wed Jan 4 13:53:50 2012 New Revision: 229481 URL: http://svn.freebsd.org/changeset/base/229481 Log: Revert MFC r226833,227056. /stand exists in the MFS root used during a sysinstall-based install. Reported by: jhb Pointy hat to:pluknet Modified: stable/8/sys/boot/common/loader.8 stable/8/sys/boot/forth/loader.conf stable/8/sys/conf/NOTES stable/8/sys/kern/init_main.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/conf/ldscript.mips.octeon1.32 (props changed) stable/8/sys/conf/ldscript.mips.octeon1.64 (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/boot/common/loader.8 == --- stable/8/sys/boot/common/loader.8 Wed Jan 4 13:49:46 2012 (r229480) +++ stable/8/sys/boot/common/loader.8 Wed Jan 4 13:53:50 2012 (r229481) @@ -449,7 +449,7 @@ Sets the list of binaries which the kern process. The first matching binary is used. The default list is -.Dq Li /sbin/init:/sbin/oinit:/sbin/init.bak:\:/rescue/init . +.Dq Li /sbin/init:/sbin/oinit:/sbin/init.bak:\:/rescue/init:/stand/sysinstall . .It Va init_script If set to a valid file name in the root file system, instructs Modified: stable/8/sys/boot/forth/loader.conf == --- stable/8/sys/boot/forth/loader.conf Wed Jan 4 13:49:46 2012 (r229480) +++ stable/8/sys/boot/forth/loader.conf Wed Jan 4 13:53:50 2012 (r229481) @@ -76,7 +76,7 @@ module_path="/boot/modules" # Set the mo #boot_serial=""# -h: Use serial console #boot_single=""# -s: Start system in single-user mode #boot_verbose="" # -v: Causes extra debugging information to be printed -#init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init" +#init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init:/stand/sysinstall" # Sets the list of init candidates #init_shell="/bin/sh" # The shell binary used by init(8). #init_script=""# Initial script to run by init(8) before chrooting. Modified: stable/8/sys/conf/NOTES == --- stable/8/sys/conf/NOTES Wed Jan 4 13:49:46 2012(r229480) +++ stable/8/sys/conf/NOTES Wed Jan 4 13:53:50 2012(r229481) @@ -2733,7 +2733,7 @@ options UBSEC_RNDTEST # enable rndtest # Embedded system options: # # An embedded system might want to run something other than init. -optionsINIT_PATH=/sbin/init:/rescue/init +optionsINIT_PATH=/sbin/init:/stand/sysinstall # Debug options optionsBUS_DEBUG # enable newbus debugging Modified: stable/8/sys/kern/init_main.c == --- stable/8/sys/kern/init_main.c Wed Jan 4 13:49:46 2012 (r229480) +++ stable/8/sys/kern/init_main.c Wed Jan 4 13:53:50 2012 (r229481) @@ -623,7 +623,7 @@ static char init_path[MAXPATHLEN] = #ifdef INIT_PATH __XSTRING(INIT_PATH); #else -"/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init"; +"/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init:/stand/sysinstall"; #endif SYSCTL_STRING(_kern, OID_AUTO, init_path, CTLFLAG_RD, init_path, 0, "Path used to search the init process"); ___ 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: r229430 - in head/sys: conf dev/sound/pci modules/sound/driver/emu10k1
Hello; --- Mer 4/1/12, Alexey Dokuchaev ha scritto: ... > > How hard would it be to (re)implement missing features with > emu10k1 and nuke GPL-polluted emu10kx? > The emu10kx started from the emu10k1 and is mostly BSD licensed, I did start cleaning it in kern/153901 but I didn't commit the the emu10kx part. The only issue is getting rid of the remaining (small) GPL'd headers. Alternatively this driver is already available as a port (audio/emu10kx). cheers, Pedro. ___ 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: r229482 - stable/9/sys/netinet6
Author: pluknet
Date: Wed Jan 4 14:02:00 2012
New Revision: 229482
URL: http://svn.freebsd.org/changeset/base/229482
Log:
MFC r227055:
Remove a couple of write-only variables.
Modified:
stable/9/sys/netinet6/icmp6.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
Modified: stable/9/sys/netinet6/icmp6.c
==
--- stable/9/sys/netinet6/icmp6.c Wed Jan 4 13:53:50 2012
(r229481)
+++ stable/9/sys/netinet6/icmp6.c Wed Jan 4 14:02:00 2012
(r229482)
@@ -2351,8 +2351,6 @@ icmp6_redirect_input(struct mbuf *m, int
int icmp6len = ntohs(ip6->ip6_plen);
char *lladdr = NULL;
int lladdrlen = 0;
- u_char *redirhdr = NULL;
- int redirhdrlen = 0;
struct rtentry *rt = NULL;
int is_router;
int is_onlink;
@@ -2488,11 +2486,6 @@ icmp6_redirect_input(struct mbuf *m, int
lladdrlen = ndopts.nd_opts_tgt_lladdr->nd_opt_len << 3;
}
- if (ndopts.nd_opts_rh) {
- redirhdrlen = ndopts.nd_opts_rh->nd_opt_rh_len;
- redirhdr = (u_char *)(ndopts.nd_opts_rh + 1); /* xxx */
- }
-
if (lladdr && ((ifp->if_addrlen + 2 + 7) & ~7) != lladdrlen) {
nd6log((LOG_INFO,
"icmp6_redirect_input: lladdrlen mismatch for %s "
___
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: r229483 - in stable/8/sys: conf netinet6
Author: pluknet
Date: Wed Jan 4 14:03:45 2012
New Revision: 229483
URL: http://svn.freebsd.org/changeset/base/229483
Log:
MFC r227055:
Remove a couple of write-only variables.
Modified:
stable/8/sys/netinet6/icmp6.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/conf/ldscript.mips.octeon1.32 (props changed)
stable/8/sys/conf/ldscript.mips.octeon1.64 (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/netinet6/icmp6.c
==
--- stable/8/sys/netinet6/icmp6.c Wed Jan 4 14:02:00 2012
(r229482)
+++ stable/8/sys/netinet6/icmp6.c Wed Jan 4 14:03:45 2012
(r229483)
@@ -2266,8 +2266,6 @@ icmp6_redirect_input(struct mbuf *m, int
int icmp6len = ntohs(ip6->ip6_plen);
char *lladdr = NULL;
int lladdrlen = 0;
- u_char *redirhdr = NULL;
- int redirhdrlen = 0;
struct rtentry *rt = NULL;
int is_router;
int is_onlink;
@@ -2403,11 +2401,6 @@ icmp6_redirect_input(struct mbuf *m, int
lladdrlen = ndopts.nd_opts_tgt_lladdr->nd_opt_len << 3;
}
- if (ndopts.nd_opts_rh) {
- redirhdrlen = ndopts.nd_opts_rh->nd_opt_rh_len;
- redirhdr = (u_char *)(ndopts.nd_opts_rh + 1); /* xxx */
- }
-
if (lladdr && ((ifp->if_addrlen + 2 + 7) & ~7) != lladdrlen) {
nd6log((LOG_INFO,
"icmp6_redirect_input: lladdrlen mismatch for %s "
___
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: r229484 - stable/7/sys/netinet6
Author: pluknet
Date: Wed Jan 4 14:06:17 2012
New Revision: 229484
URL: http://svn.freebsd.org/changeset/base/229484
Log:
MFC r227055:
Remove a couple of write-only variables.
Modified:
stable/7/sys/netinet6/icmp6.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/netinet6/icmp6.c
==
--- stable/7/sys/netinet6/icmp6.c Wed Jan 4 14:03:45 2012
(r229483)
+++ stable/7/sys/netinet6/icmp6.c Wed Jan 4 14:06:17 2012
(r229484)
@@ -2212,8 +2212,6 @@ icmp6_redirect_input(struct mbuf *m, int
int icmp6len = ntohs(ip6->ip6_plen);
char *lladdr = NULL;
int lladdrlen = 0;
- u_char *redirhdr = NULL;
- int redirhdrlen = 0;
struct rtentry *rt = NULL;
int is_router;
int is_onlink;
@@ -2349,11 +2347,6 @@ icmp6_redirect_input(struct mbuf *m, int
lladdrlen = ndopts.nd_opts_tgt_lladdr->nd_opt_len << 3;
}
- if (ndopts.nd_opts_rh) {
- redirhdrlen = ndopts.nd_opts_rh->nd_opt_rh_len;
- redirhdr = (u_char *)(ndopts.nd_opts_rh + 1); /* xxx */
- }
-
if (lladdr && ((ifp->if_addrlen + 2 + 7) & ~7) != lladdrlen) {
nd6log((LOG_INFO,
"icmp6_redirect_input: lladdrlen mismatch for %s "
___
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: r229430 - in head/sys: conf dev/sound/pci modules/sound/driver/emu10k1
On Wed, Jan 04, 2012 at 05:58:10AM -0800, Pedro Giffuni wrote: > --- Mer 4/1/12, Alexey Dokuchaev ha scritto: > > How hard would it be to (re)implement missing features with > > emu10k1 and nuke GPL-polluted emu10kx? > > The emu10kx started from the emu10k1 and is mostly BSD licensed, > I did start cleaning it in kern/153901 but I didn't commit the > the emu10kx part. > > The only issue is getting rid of the remaining (small) > GPL'd headers. Alternatively this driver is already available > as a port (audio/emu10kx). Yes, I am aware of the port existence. My point was to leave just one, BSD licensed, full featured emu10k driver in the base (i.e. merge emu10k1 and emu10kx into one). Good to know that you're up to this; I hope we'll get there eventually. :-) ./danfe ___ 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: r229485 - stable/9/sys/kern
Author: pluknet
Date: Wed Jan 4 14:18:47 2012
New Revision: 229485
URL: http://svn.freebsd.org/changeset/base/229485
Log:
MFC r226882:
Fix arguments list for proc:::signal-discard DTrace probe.
Reported by: Anton Yuzhaninov
Modified:
stable/9/sys/kern/kern_sig.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
Modified: stable/9/sys/kern/kern_sig.c
==
--- stable/9/sys/kern/kern_sig.cWed Jan 4 14:06:17 2012
(r229484)
+++ stable/9/sys/kern/kern_sig.cWed Jan 4 14:18:47 2012
(r229485)
@@ -2058,7 +2058,7 @@ tdsendsignal(struct proc *p, struct thre
*/
mtx_lock(&ps->ps_mtx);
if (SIGISMEMBER(ps->ps_sigignore, sig)) {
- SDT_PROBE(proc, kernel, , signal_discard, ps, td, sig, 0, 0 );
+ SDT_PROBE(proc, kernel, , signal_discard, td, p, sig, 0, 0 );
mtx_unlock(&ps->ps_mtx);
if (ksi && (ksi->ksi_flags & KSI_INS))
___
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: r229486 - in stable/8/sys: conf kern
Author: pluknet
Date: Wed Jan 4 14:21:30 2012
New Revision: 229486
URL: http://svn.freebsd.org/changeset/base/229486
Log:
MFC r226882:
Fix arguments list for proc:::signal-discard DTrace probe.
Reported by: Anton Yuzhaninov
Modified:
stable/8/sys/kern/kern_sig.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/conf/ldscript.mips.octeon1.32 (props changed)
stable/8/sys/conf/ldscript.mips.octeon1.64 (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/kern/kern_sig.c
==
--- stable/8/sys/kern/kern_sig.cWed Jan 4 14:18:47 2012
(r229485)
+++ stable/8/sys/kern/kern_sig.cWed Jan 4 14:21:30 2012
(r229486)
@@ -2058,7 +2058,7 @@ tdsignal(struct proc *p, struct thread *
*/
mtx_lock(&ps->ps_mtx);
if (SIGISMEMBER(ps->ps_sigignore, sig)) {
- SDT_PROBE(proc, kernel, , signal_discard, ps, td, sig, 0, 0 );
+ SDT_PROBE(proc, kernel, , signal_discard, td, p, sig, 0, 0 );
mtx_unlock(&ps->ps_mtx);
if (ksi && (ksi->ksi_flags & KSI_INS))
___
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: r229430 - in head/sys: conf dev/sound/pci modules/sound/driver/emu10k1
--- Mer 4/1/12, Alexey Dokuchaev ha scritto: ... > > The only issue is getting rid of the remaining > (small) > > GPL'd headers. Alternatively this driver is already > available > > as a port (audio/emu10kx). > > Yes, I am aware of the port existence. My point was > to leave just one, BSD licensed, full featured emu10k > driver in the base (i.e. merge emu10k1 and > emu10kx into one). Good to know that you're up to > this; I hope we'll get there eventually. :-) > Well, when I made the changes for emu10k1 it was easy to do them for emu10kx too but I don't have the card so I am not really up to it (sorry). I will be glad to help if someone else is interested. Pedro. ___ 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: r229487 - stable/9/sys/compat/freebsd32
Author: pluknet
Date: Wed Jan 4 14:33:54 2012
New Revision: 229487
URL: http://svn.freebsd.org/changeset/base/229487
Log:
MFC r227447:
struct timespec32: change types of tv_sec and tv_nsec fields to signed
to match native struct timespec ABI on __LP32__.
Modified:
stable/9/sys/compat/freebsd32/freebsd32.h
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
Modified: stable/9/sys/compat/freebsd32/freebsd32.h
==
--- stable/9/sys/compat/freebsd32/freebsd32.h Wed Jan 4 14:21:30 2012
(r229486)
+++ stable/9/sys/compat/freebsd32/freebsd32.h Wed Jan 4 14:33:54 2012
(r229487)
@@ -52,8 +52,8 @@ struct timeval32 {
} while (0)
struct timespec32 {
- u_int32_t tv_sec;
- u_int32_t tv_nsec;
+ int32_t tv_sec;
+ int32_t tv_nsec;
};
#define TS_CP(src,dst,fld) do {\
CP((src).fld,(dst).fld,tv_sec); \
___
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: r229488 - in stable/8/sys: compat/freebsd32 conf
Author: pluknet
Date: Wed Jan 4 14:34:45 2012
New Revision: 229488
URL: http://svn.freebsd.org/changeset/base/229488
Log:
MFC r227447:
struct timespec32: change types of tv_sec and tv_nsec fields to signed
to match native struct timespec ABI on __LP32__.
Modified:
stable/8/sys/compat/freebsd32/freebsd32.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/conf/ldscript.mips.octeon1.32 (props changed)
stable/8/sys/conf/ldscript.mips.octeon1.64 (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/compat/freebsd32/freebsd32.h
==
--- stable/8/sys/compat/freebsd32/freebsd32.h Wed Jan 4 14:33:54 2012
(r229487)
+++ stable/8/sys/compat/freebsd32/freebsd32.h Wed Jan 4 14:34:45 2012
(r229488)
@@ -52,8 +52,8 @@ struct timeval32 {
} while (0)
struct timespec32 {
- u_int32_t tv_sec;
- u_int32_t tv_nsec;
+ int32_t tv_sec;
+ int32_t tv_nsec;
};
#define TS_CP(src,dst,fld) do {\
CP((src).fld,(dst).fld,tv_sec); \
___
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: r229430 - in head/sys: conf dev/sound/pci modules/sound/driver/emu10k1
On 01/04/12 16:25, Pedro Giffuni wrote: --- Mer 4/1/12, Alexey Dokuchaev ha scritto: ... The only issue is getting rid of the remaining (small) GPL'd headers. Alternatively this driver is already available as a port (audio/emu10kx). Yes, I am aware of the port existence. My point was to leave just one, BSD licensed, full featured emu10k driver in the base (i.e. merge emu10k1 and emu10kx into one). Good to know that you're up to this; I hope we'll get there eventually. :-) Well, when I made the changes for emu10k1 it was easy to do them for emu10kx too but I don't have the card so I am not really up to it (sorry). I will be glad to help if someone else is interested. I have Audigy2ZS (model SB0350) in my table if any help with testing needed, but I've never looked into emu10k code, preferring to hack more widespread and documented HDA. -- Alexander Motin ___ 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: r229489 - stable/9/lib/libc/sys
Author: pluknet Date: Wed Jan 4 14:47:32 2012 New Revision: 229489 URL: http://svn.freebsd.org/changeset/base/229489 Log: MFC r227792: Add history for setsockopt(2). PR: docs/162719 Submitted by: Niclas Zeising Modified: stable/9/lib/libc/sys/getsockopt.2 Directory Properties: stable/9/lib/libc/ (props changed) stable/9/lib/libc/gen/ (props changed) stable/9/lib/libc/stdtime/ (props changed) Modified: stable/9/lib/libc/sys/getsockopt.2 == --- stable/9/lib/libc/sys/getsockopt.2 Wed Jan 4 14:34:45 2012 (r229488) +++ stable/9/lib/libc/sys/getsockopt.2 Wed Jan 4 14:47:32 2012 (r229489) @@ -28,7 +28,7 @@ .\" @(#)getsockopt.2 8.4 (Berkeley) 5/2/95 .\" $FreeBSD$ .\" -.Dd June 13, 2008 +.Dd November 21, 2011 .Dt GETSOCKOPT 2 .Os .Sh NAME @@ -533,7 +533,9 @@ on a non-listening socket was attempted. .Sh HISTORY The .Fn getsockopt -system call appeared in +and +.Fn setsockopt +system calls appeared in .Bx 4.2 . .Sh BUGS Several of the socket options should be handled at lower levels of the system. ___ 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: r229490 - stable/8/lib/libc/sys
Author: pluknet Date: Wed Jan 4 14:49:29 2012 New Revision: 229490 URL: http://svn.freebsd.org/changeset/base/229490 Log: MFC r227792: Add history for setsockopt(2). PR: docs/162719 Submitted by: Niclas Zeising Modified: stable/8/lib/libc/sys/getsockopt.2 Directory Properties: stable/8/lib/libc/ (props changed) stable/8/lib/libc/stdtime/ (props changed) Modified: stable/8/lib/libc/sys/getsockopt.2 == --- stable/8/lib/libc/sys/getsockopt.2 Wed Jan 4 14:47:32 2012 (r229489) +++ stable/8/lib/libc/sys/getsockopt.2 Wed Jan 4 14:49:29 2012 (r229490) @@ -28,7 +28,7 @@ .\" @(#)getsockopt.2 8.4 (Berkeley) 5/2/95 .\" $FreeBSD$ .\" -.Dd June 13, 2008 +.Dd November 21, 2011 .Dt GETSOCKOPT 2 .Os .Sh NAME @@ -515,7 +515,9 @@ on a non-listening socket was attempted. .Sh HISTORY The .Fn getsockopt -system call appeared in +and +.Fn setsockopt +system calls appeared in .Bx 4.2 . .Sh BUGS Several of the socket options should be handled at lower levels of the system. ___ 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: r229430 - in head/sys: conf dev/sound/pci modules/sound/driver/emu10k1
On Wed, Jan 4, 2012 at 6:43 AM, Alexander Motin wrote: > On 01/04/12 16:25, Pedro Giffuni wrote: >> >> --- Mer 4/1/12, Alexey Dokuchaev ha scritto: >> ... The only issue is getting rid of the remaining >>> >>> (small) GPL'd headers. Alternatively this driver is already >>> >>> available as a port (audio/emu10kx). >>> >>> >>> Yes, I am aware of the port existence. My point was >>> to leave just one, BSD licensed, full featured emu10k >>> driver in the base (i.e. merge emu10k1 and >>> emu10kx into one). Good to know that you're up to >>> this; I hope we'll get there eventually. :-) >> >> >> Well, when I made the changes for emu10k1 it was easy >> to do them for emu10kx too but I don't have the card so I >> am not really up to it (sorry). >> >> I will be glad to help if someone else is interested. > > > I have Audigy2ZS (model SB0350) in my table if any help with testing needed, > but I've never looked into emu10k code, preferring to hack more widespread > and documented HDA. I have an Audigy 4 I can slap into the machine at work. Thanks, -Garrett ___ 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: r229491 - stable/7/lib/libc/sys
Author: pluknet Date: Wed Jan 4 14:55:24 2012 New Revision: 229491 URL: http://svn.freebsd.org/changeset/base/229491 Log: MFC r227792: Add history for setsockopt(2). PR: docs/162719 Submitted by: Niclas Zeising Modified: stable/7/lib/libc/sys/getsockopt.2 Directory Properties: stable/7/lib/libc/ (props changed) stable/7/lib/libc/stdtime/ (props changed) Modified: stable/7/lib/libc/sys/getsockopt.2 == --- stable/7/lib/libc/sys/getsockopt.2 Wed Jan 4 14:49:29 2012 (r229490) +++ stable/7/lib/libc/sys/getsockopt.2 Wed Jan 4 14:55:24 2012 (r229491) @@ -28,7 +28,7 @@ .\" @(#)getsockopt.2 8.4 (Berkeley) 5/2/95 .\" $FreeBSD$ .\" -.Dd March 8, 2007 +.Dd November 21, 2011 .Dt GETSOCKOPT 2 .Os .Sh NAME @@ -479,7 +479,9 @@ on a non-listening socket was attempted. .Sh HISTORY The .Fn getsockopt -system call appeared in +and +.Fn setsockopt +system calls appeared in .Bx 4.2 . .Sh BUGS Several of the socket options should be handled at lower levels of the system. ___ 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: r229430 - in head/sys: conf dev/sound/pci modules/sound/driver/emu10k1
On Wed, Jan 04, 2012 at 06:52:17AM -0800, Garrett Cooper wrote: > On Wed, Jan 4, 2012 at 6:43 AM, Alexander Motin wrote: > > I have Audigy2ZS (model SB0350) in my table if any help with testing > > needed, but I've never looked into emu10k code, preferring to hack more > > widespread and documented HDA. > > I have an Audigy 4 I can slap into the machine at work. OK, how about this: I have an E-MU 1212m. Any takers? :-) ./danfe ___ 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: r229492 - stable/9/sys/boot/common
Author: pluknet Date: Wed Jan 4 15:58:35 2012 New Revision: 229492 URL: http://svn.freebsd.org/changeset/base/229492 Log: MFC r228916: Clean up from the 4.x era. In an example of boot command: - rename wd(4) IDE disk drives name to ad(4) for the time being. - update the used kernel path "/kernel" to the current default. Bump .Dd for this and previous changes. Modified: stable/9/sys/boot/common/loader.8 Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) Modified: stable/9/sys/boot/common/loader.8 == --- stable/9/sys/boot/common/loader.8 Wed Jan 4 14:55:24 2012 (r229491) +++ stable/9/sys/boot/common/loader.8 Wed Jan 4 15:58:35 2012 (r229492) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 15, 2009 +.Dd December 27, 2011 .Dt LOADER 8 .Os .Sh NAME @@ -926,10 +926,10 @@ autoboot 5 .Pp Set the disk unit of the root device to 2, and then boot. This would be needed in a system with two IDE disks, -with the second IDE disk hardwired to wd2 instead of wd1. +with the second IDE disk hardwired to ad2 instead of ad1. .Bd -literal -offset indent set root_disk_unit=2 -boot /kernel +boot /boot/kernel/kernel .Ed .Pp See also: ___ 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: r229493 - in stable/8/sys: boot/common conf
Author: pluknet Date: Wed Jan 4 15:59:49 2012 New Revision: 229493 URL: http://svn.freebsd.org/changeset/base/229493 Log: MFC r228916: Clean up from the 4.x era. In an example of boot command: - rename wd(4) IDE disk drives name to ad(4). - update the used kernel path "/kernel" to the current default. Bump .Dd for this and previous changes. Modified: stable/8/sys/boot/common/loader.8 Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/conf/ldscript.mips.octeon1.32 (props changed) stable/8/sys/conf/ldscript.mips.octeon1.64 (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/boot/common/loader.8 == --- stable/8/sys/boot/common/loader.8 Wed Jan 4 15:58:35 2012 (r229492) +++ stable/8/sys/boot/common/loader.8 Wed Jan 4 15:59:49 2012 (r229493) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 15, 2009 +.Dd December 27, 2011 .Dt LOADER 8 .Os .Sh NAME @@ -933,10 +933,10 @@ autoboot 5 .Pp Set the disk unit of the root device to 2, and then boot. This would be needed in a system with two IDE disks, -with the second IDE disk hardwired to wd2 instead of wd1. +with the second IDE disk hardwired to ad2 instead of ad1. .Bd -literal -offset indent set root_disk_unit=2 -boot /kernel +boot /boot/kernel/kernel .Ed .Pp See also: ___ 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: r229494 - head/sys/powerpc/include
Author: andreast Date: Wed Jan 4 16:02:52 2012 New Revision: 229494 URL: http://svn.freebsd.org/changeset/base/229494 Log: Introduce internal macros for __U/INT64_C to define the U/INT64_MAX/MIN values properly. The previous definition only worked if __STDC_LIMIT_MACROS and __STDC_CONSTANT_MACROS were defined at the same time. Modified: head/sys/powerpc/include/_stdint.h Modified: head/sys/powerpc/include/_stdint.h == --- head/sys/powerpc/include/_stdint.h Wed Jan 4 15:59:49 2012 (r229493) +++ head/sys/powerpc/include/_stdint.h Wed Jan 4 16:02:52 2012 (r229494) @@ -65,6 +65,14 @@ #if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) +#ifdef __LP64__ +#define__INT64_C(c)(c ## L) +#define__UINT64_C(c) (c ## UL) +#else +#define__INT64_C(c)(c ## LL) +#define__UINT64_C(c) (c ## ULL) +#endif + /* * ISO/IEC 9899:1999 * 7.18.2.1 Limits of exact-width integer types @@ -73,19 +81,19 @@ #defineINT8_MIN(-0x7f-1) #defineINT16_MIN (-0x7fff-1) #defineINT32_MIN (-0x7fff-1) -#defineINT64_MIN (-INT64_C(0x7fff)-1) +#defineINT64_MIN (-__INT64_C(0x7fff)-1) /* Maximum values of exact-width signed integer types. */ #defineINT8_MAX0x7f #defineINT16_MAX 0x7fff #defineINT32_MAX 0x7fff -#defineINT64_MAX INT64_C(0x7fff) +#defineINT64_MAX __INT64_C(0x7fff) /* Maximum values of exact-width unsigned integer types. */ #defineUINT8_MAX 0xff #defineUINT16_MAX 0x #defineUINT32_MAX 0x -#defineUINT64_MAX UINT64_C(0x) +#defineUINT64_MAX __UINT64_C(0x) /* * ISO/IEC 9899:1999 ___ 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: r229495 - head/sys/vm
Author: kib
Date: Wed Jan 4 16:04:20 2012
New Revision: 229495
URL: http://svn.freebsd.org/changeset/base/229495
Log:
Do not restart the scan in vm_object_page_clean() on the object
generation change if requested mode is async. The object generation is
only changed when the object is marked as OBJ_MIGHTBEDIRTY. For async
mode it is enough to write each dirty page, not to make a guarantee that
all pages are cleared after the vm_object_page_clean() returned.
Diagnosed by: truckman
Tested by:flo
Reviewed by: alc, truckman
MFC after:2 weeks
Modified:
head/sys/vm/vm_object.c
Modified: head/sys/vm/vm_object.c
==
--- head/sys/vm/vm_object.c Wed Jan 4 16:02:52 2012(r229494)
+++ head/sys/vm/vm_object.c Wed Jan 4 16:04:20 2012(r229495)
@@ -841,8 +841,12 @@ rescan:
if (p->valid == 0)
continue;
if (vm_page_sleep_if_busy(p, TRUE, "vpcwai")) {
- if (object->generation != curgeneration)
- goto rescan;
+ if (object->generation != curgeneration) {
+ if ((flags & OBJPC_SYNC) != 0)
+ goto rescan;
+ else
+ clearobjflags = 0;
+ }
np = vm_page_find_least(object, pi);
continue;
}
@@ -851,8 +855,12 @@ rescan:
n = vm_object_page_collect_flush(object, p, pagerflags,
flags, &clearobjflags);
- if (object->generation != curgeneration)
- goto rescan;
+ if (object->generation != curgeneration) {
+ if ((flags & OBJPC_SYNC) != 0)
+ goto rescan;
+ else
+ clearobjflags = 0;
+ }
/*
* If the VOP_PUTPAGES() did a truncated write, so
___
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: r229496 - head/sys/mips/include
Author: andreast Date: Wed Jan 4 16:07:16 2012 New Revision: 229496 URL: http://svn.freebsd.org/changeset/base/229496 Log: Apply the same change as in r229494. Requested by: ed Modified: head/sys/mips/include/_stdint.h Modified: head/sys/mips/include/_stdint.h == --- head/sys/mips/include/_stdint.h Wed Jan 4 16:04:20 2012 (r229495) +++ head/sys/mips/include/_stdint.h Wed Jan 4 16:07:16 2012 (r229496) @@ -66,6 +66,14 @@ #if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) +#ifdef __mips_n64 +#define __INT64_C(c) (c ## L) +#define __UINT64_C(c) (c ## UL) +#else +#define __INT64_C(c) (c ## LL) +#define __UINT64_C(c) (c ## ULL) +#endif + /* * ISO/IEC 9899:1999 * 7.18.2.1 Limits of exact-width integer types @@ -74,19 +82,19 @@ #defineINT8_MIN(-0x7f-1) #defineINT16_MIN (-0x7fff-1) #defineINT32_MIN (-0x7fff-1) -#defineINT64_MIN (-INT64_C(0x7fff)-1) +#defineINT64_MIN (-__INT64_C(0x7fff)-1) /* Maximum values of exact-width signed integer types. */ #defineINT8_MAX0x7f #defineINT16_MAX 0x7fff #defineINT32_MAX 0x7fff -#defineINT64_MAX INT64_C(0x7fff) +#defineINT64_MAX __INT64_C(0x7fff) /* Maximum values of exact-width unsigned integer types. */ #defineUINT8_MAX 0xff #defineUINT16_MAX 0x #defineUINT32_MAX 0x -#defineUINT64_MAX UINT64_C(0x) +#defineUINT64_MAX __UINT64_C(0x) /* * ISO/IEC 9899:1999 ___ 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: r229497 - in stable/8/sys: conf modules modules/ipfw netinet/ipfw
Author: jhb
Date: Wed Jan 4 16:20:55 2012
New Revision: 229497
URL: http://svn.freebsd.org/changeset/base/229497
Log:
MFC 225518,225793,227085:
Allow the ipfw.ko module built with a kernel to honor any options defined
in the kernel config. This more closely matches the behavior of other
modules which inherit configuration settings from the kernel configuration
during a kernel + modules build.
Do not try to build the module in case of no INET support but keep #error
calls for now in case we would compile it into the kernel.
While here garbage collect unneeded opt_*.h includes.
opt_ipdn.h is not used anywhere but we need to leave the DUMMYNET
entry in options for conditional inclusion in kernel so keep the
file with the same name.
Modified:
stable/8/sys/modules/Makefile
stable/8/sys/modules/ipfw/Makefile
stable/8/sys/netinet/ipfw/ip_fw2.c
stable/8/sys/netinet/ipfw/ip_fw_dynamic.c
stable/8/sys/netinet/ipfw/ip_fw_log.c
stable/8/sys/netinet/ipfw/ip_fw_pfil.c
stable/8/sys/netinet/ipfw/ip_fw_sockopt.c
stable/8/sys/netinet/ipfw/ip_fw_table.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/conf/ldscript.mips.octeon1.32 (props changed)
stable/8/sys/conf/ldscript.mips.octeon1.64 (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/modules/Makefile
==
--- stable/8/sys/modules/Makefile Wed Jan 4 16:07:16 2012
(r229496)
+++ stable/8/sys/modules/Makefile Wed Jan 4 16:20:55 2012
(r229497)
@@ -134,7 +134,7 @@ SUBDIR= ${_3dfx} \
${_io} \
ipdivert \
${_ipfilter} \
- ipfw \
+ ${_ipfw} \
ipfw_nat \
${_ipmi} \
ip_mroute_mod \
@@ -366,6 +366,10 @@ _random= random
_ipfilter= ipfilter
.endif
+.if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)
+_ipfw= ipfw
+.endif
+
.if ${MK_NETGRAPH} != "no" || defined(ALL_MODULES)
_netgraph= netgraph
.endif
Modified: stable/8/sys/modules/ipfw/Makefile
==
--- stable/8/sys/modules/ipfw/Makefile Wed Jan 4 16:07:16 2012
(r229496)
+++ stable/8/sys/modules/ipfw/Makefile Wed Jan 4 16:20:55 2012
(r229497)
@@ -8,7 +8,7 @@ KMOD= ipfw
SRCS= ip_fw2.c ip_fw_pfil.c
SRCS+= ip_fw_dynamic.c ip_fw_log.c
SRCS+= ip_fw_sockopt.c ip_fw_table.c
-SRCS+= opt_inet6.h opt_ipsec.h
+SRCS+= opt_inet.h opt_inet6.h opt_ipdivert.h opt_ipfw.h opt_ipsec.h
CFLAGS+= -DIPFIREWALL
CFLAGS+= -I${.CURDIR}/../../contrib/pf
@@ -22,6 +22,10 @@ CFLAGS+= -I${.CURDIR}/../../contrib/pf
#
.if !defined(KERNBUILDDIR)
+.if ${MK_INET_SUPPORT} != "no"
+opt_inet.h:
+ echo "#define INET 1" > ${.TARGET}
+.endif
.if ${MK_INET6_SUPPORT} != "no"
opt_inet6.h:
echo "#define INET6 1" > ${.TARGET}
Modified: stable/8/sys/netinet/ipfw/ip_fw2.c
==
--- stable/8/sys/netinet/ipfw/ip_fw2.c Wed Jan 4 16:07:16 2012
(r229496)
+++ stable/8/sys/netinet/ipfw/ip_fw2.c Wed Jan 4 16:20:55 2012
(r229497)
@@ -30,15 +30,12 @@ __FBSDID("$FreeBSD$");
* The FreeBSD IP packet firewall, main file
*/
-#if !defined(KLD_MODULE)
#include "opt_ipfw.h"
#include "opt_ipdivert.h"
-#include "opt_ipdn.h"
#include "opt_inet.h"
#ifndef INET
#error IPFIREWALL requires INET.
#endif /* INET */
-#endif
#include "opt_inet6.h"
#include "opt_ipsec.h"
Modified: stable/8/sys/netinet/ipfw/ip_fw_dynamic.c
==
--- stable/8/sys/netinet/ipfw/ip_fw_dynamic.c Wed Jan 4 16:07:16 2012
(r229496)
+++ stable/8/sys/netinet/ipfw/ip_fw_dynamic.c Wed Jan 4 16:20:55 2012
(r229497)
@@ -33,17 +33,12 @@ __FBSDID("$FreeBSD$");
* Dynamic rule support for ipfw
*/
-#if !defined(KLD_MODULE)
#include "opt_ipfw.h"
-#include "opt_ipdivert.h"
-#include "opt_ipdn.h"
#include "opt_inet.h"
#ifndef INET
#error IPFIREWALL requires INET.
#endif /* INET */
-#endif
#include "opt_inet6.h"
-#include "opt_ipsec.h"
#include
#include
Modified: stable/8/sys/netinet/ipfw/ip_fw_log.c
==
--- stable/8/sys/netinet/ipfw/ip_fw_log.c Wed Jan 4 16:07:16 2012
(r229496)
+++ stable/8/sys/netinet/ipfw/ip_fw_log.c Wed Jan 4 16:20:55 2012
(r229497)
@@ -30,17 +30,12 @@ __FBSDID("$FreeBSD$");
* Logging support for ipfw
*/
-#if !defined(KLD_MODULE)
#include "opt_ipfw.h"
-#include "opt_ipdivert.h"
-#include "opt_ipdn.h"
#include "opt_inet.h"
#ifndef INET
#error IPFIREWALL requires INET.
#endif /* INET */
-#endif
#include "opt_inet6.h"
-
svn commit: r229498 - stable/8/sys/conf
Author: jhb Date: Wed Jan 4 16:24:33 2012 New Revision: 229498 URL: http://svn.freebsd.org/changeset/base/229498 Log: Remove unnecessary mergeinfo from these two files. Modified: Directory Properties: stable/8/sys/conf/ldscript.mips.octeon1.32 (props changed) stable/8/sys/conf/ldscript.mips.octeon1.64 (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: r229499 - stable/9/sys/x86/acpica
Author: jhb
Date: Wed Jan 4 16:26:45 2012
New Revision: 229499
URL: http://svn.freebsd.org/changeset/base/229499
Log:
MFC 226039:
Ignore SRAT memory entries if the memory range does not overlap with an
existing phys_avail[] entry. If a hw.physmem setting causes a memory
domain to not be present in phys_avail[], the SRAT table will now be
ignored rather than triggering a panic when a CPU in the missing domain
tries to allocate a page.
Modified:
stable/9/sys/x86/acpica/srat.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
Modified: stable/9/sys/x86/acpica/srat.c
==
--- stable/9/sys/x86/acpica/srat.c Wed Jan 4 16:24:33 2012
(r229498)
+++ stable/9/sys/x86/acpica/srat.c Wed Jan 4 16:26:45 2012
(r229499)
@@ -59,6 +59,26 @@ static vm_paddr_t srat_physaddr;
static voidsrat_walk_table(acpi_subtable_handler *handler, void *arg);
+/*
+ * Returns true if a memory range overlaps with at least one range in
+ * phys_avail[].
+ */
+static int
+overlaps_phys_avail(vm_paddr_t start, vm_paddr_t end)
+{
+ int i;
+
+ for (i = 0; phys_avail[i] != 0 && phys_avail[i + 1] != 0; i += 2) {
+ if (phys_avail[i + 1] < start)
+ continue;
+ if (phys_avail[i] < end)
+ return (1);
+ break;
+ }
+ return (0);
+
+}
+
static void
srat_parse_entry(ACPI_SUBTABLE_HEADER *entry, void *arg)
{
@@ -111,6 +131,12 @@ srat_parse_entry(ACPI_SUBTABLE_HEADER *e
"enabled" : "disabled");
if (!(mem->Flags & ACPI_SRAT_MEM_ENABLED))
break;
+ if (!overlaps_phys_avail(mem->BaseAddress,
+ mem->BaseAddress + mem->Length)) {
+ printf("SRAT: Ignoring memory at addr %jx\n",
+ (uintmax_t)mem->BaseAddress);
+ break;
+ }
if (num_mem == VM_PHYSSEG_MAX) {
printf("SRAT: Too many memory regions\n");
*(int *)arg = ENXIO;
___
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: r229500 - stable/9/sys/compat/freebsd32
Author: jhb
Date: Wed Jan 4 16:29:45 2012
New Revision: 229500
URL: http://svn.freebsd.org/changeset/base/229500
Log:
MFC 226364:
Use PAIR32TO64() for the offset and length parameters to
freebsd32_posix_fallocate() to properly handle big-endian platforms.
Modified:
stable/9/sys/compat/freebsd32/freebsd32_misc.c
stable/9/sys/compat/freebsd32/syscalls.master
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
Modified: stable/9/sys/compat/freebsd32/freebsd32_misc.c
==
--- stable/9/sys/compat/freebsd32/freebsd32_misc.c Wed Jan 4 16:26:45
2012(r229499)
+++ stable/9/sys/compat/freebsd32/freebsd32_misc.c Wed Jan 4 16:29:45
2012(r229500)
@@ -2811,7 +2811,7 @@ freebsd32_posix_fallocate(struct thread
struct posix_fallocate_args ap;
ap.fd = uap->fd;
- ap.offset = (uap->offsetlo | ((off_t)uap->offsethi << 32));
- ap.len = (uap->lenlo | ((off_t)uap->lenhi << 32));
+ ap.offset = PAIR32TO64(off_t, uap->offset);
+ ap.len = PAIR32TO64(off_t, uap->len);
return (sys_posix_fallocate(td, &ap));
}
Modified: stable/9/sys/compat/freebsd32/syscalls.master
==
--- stable/9/sys/compat/freebsd32/syscalls.master Wed Jan 4 16:26:45
2012(r229499)
+++ stable/9/sys/compat/freebsd32/syscalls.master Wed Jan 4 16:29:45
2012(r229500)
@@ -989,6 +989,6 @@
size_t inbuflen, void *outbufp, \
size_t outbuflen); }
530AUE_NULLSTD { int freebsd32_posix_fallocate(int fd,\
-uint32_t offsetlo, uint32_t offsethi,\
-uint32_t lenlo, uint32_t lenhi); }
+ uint32_t offset1, uint32_t offset2,\
+ uint32_t len1, uint32_t len2); }
531AUE_NULLUNIMPL posix_fadvise
___
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: r229501 - in stable/9/sys/boot: i386/boot2 i386/btx/lib i386/common i386/libi386 pc98/boot2 pc98/btx/lib pc98/libpc98 pc98/loader
Author: jhb
Date: Wed Jan 4 16:39:39 2012
New Revision: 229501
URL: http://svn.freebsd.org/changeset/base/229501
Log:
MFC 226746:
Consolidate duplicate definitions of V86_CY() and V86_ZR() which check for
the carry and zero flags being set, respectively, in and use
them throughout the x86 boot code.
Modified:
stable/9/sys/boot/i386/boot2/boot2.c
stable/9/sys/boot/i386/btx/lib/btxv86.h
stable/9/sys/boot/i386/common/cons.c
stable/9/sys/boot/i386/common/drv.c
stable/9/sys/boot/i386/libi386/bioscd.c
stable/9/sys/boot/i386/libi386/biosdisk.c
stable/9/sys/boot/i386/libi386/biosmem.c
stable/9/sys/boot/i386/libi386/biospci.c
stable/9/sys/boot/i386/libi386/biossmap.c
stable/9/sys/boot/i386/libi386/vidconsole.c
stable/9/sys/boot/pc98/boot2/boot2.c
stable/9/sys/boot/pc98/btx/lib/btxv86.h
stable/9/sys/boot/pc98/libpc98/bioscd.c
stable/9/sys/boot/pc98/libpc98/vidconsole.c
stable/9/sys/boot/pc98/loader/main.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
Modified: stable/9/sys/boot/i386/boot2/boot2.c
==
--- stable/9/sys/boot/i386/boot2/boot2.cWed Jan 4 16:29:45 2012
(r229500)
+++ stable/9/sys/boot/i386/boot2/boot2.cWed Jan 4 16:39:39 2012
(r229501)
@@ -24,7 +24,6 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include
#include
@@ -84,8 +83,6 @@ __FBSDID("$FreeBSD$");
#define NDEV 3
#define MEM_BASE 0x12
#define MEM_EXT0x15
-#define V86_CY(x) ((x) & PSL_C)
-#define V86_ZR(x) ((x) & PSL_Z)
#define DRV_HARD 0x80
#define DRV_MASK 0x7f
Modified: stable/9/sys/boot/i386/btx/lib/btxv86.h
==
--- stable/9/sys/boot/i386/btx/lib/btxv86.h Wed Jan 4 16:29:45 2012
(r229500)
+++ stable/9/sys/boot/i386/btx/lib/btxv86.h Wed Jan 4 16:39:39 2012
(r229501)
@@ -21,6 +21,7 @@
#define _BTXV86_H_
#include
+#include
#define V86_ADDR 0x1 /* Segment:offset address */
#define V86_CALLF 0x2 /* Emulate far call */
@@ -57,6 +58,9 @@ extern u_int32_t __args;
#defineVTOPSEG(va) (u_int16_t)(VTOP((caddr_t)va) >> 4)
#defineVTOPOFF(va) (u_int16_t)(VTOP((caddr_t)va) & 0xf)
+#defineV86_CY(x) ((x) & PSL_C)
+#defineV86_ZR(x) ((x) & PSL_Z)
+
void __exit(int) __attribute__((__noreturn__));
void __exec(caddr_t, ...);
Modified: stable/9/sys/boot/i386/common/cons.c
==
--- stable/9/sys/boot/i386/common/cons.cWed Jan 4 16:29:45 2012
(r229500)
+++ stable/9/sys/boot/i386/common/cons.cWed Jan 4 16:39:39 2012
(r229501)
@@ -27,8 +27,6 @@ __FBSDID("$FreeBSD$");
#include "util.h"
#include "cons.h"
-#defineV86_ZR(x) ((x) & PSL_Z)
-
#define SECOND 18 /* Circa that many ticks in a second. */
uint8_t ioctrl = IO_KEYBOARD;
Modified: stable/9/sys/boot/i386/common/drv.c
==
--- stable/9/sys/boot/i386/common/drv.c Wed Jan 4 16:29:45 2012
(r229500)
+++ stable/9/sys/boot/i386/common/drv.c Wed Jan 4 16:39:39 2012
(r229501)
@@ -19,8 +19,6 @@ __FBSDID("$FreeBSD$");
#include
-#include
-
#include
#include "rbx.h"
@@ -31,9 +29,6 @@ __FBSDID("$FreeBSD$");
#include "xreadorg.h"
#endif
-#defineV86_CY(x) ((x) & PSL_C)
-#defineV86_ZR(x) ((x) & PSL_Z)
-
#ifdef GPT
static struct edd_params params;
Modified: stable/9/sys/boot/i386/libi386/bioscd.c
==
--- stable/9/sys/boot/i386/libi386/bioscd.c Wed Jan 4 16:29:45 2012
(r229500)
+++ stable/9/sys/boot/i386/libi386/bioscd.c Wed Jan 4 16:39:39 2012
(r229501)
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include
#include
@@ -334,7 +333,7 @@ bc_read(int unit, daddr_t dblk, int blks
v86.ds = VTOPSEG(&packet);
v86.esi = VTOPOFF(&packet);
v86int();
- result = (v86.efl & PSL_C);
+ result =
svn commit: r229502 - in stable/8/sys/boot: i386/boot2 i386/btx/lib i386/common i386/libi386 pc98/boot2 pc98/btx/lib pc98/libpc98 pc98/loader
Author: jhb
Date: Wed Jan 4 16:43:08 2012
New Revision: 229502
URL: http://svn.freebsd.org/changeset/base/229502
Log:
MFC 226746:
Consolidate duplicate definitions of V86_CY() and V86_ZR() which check for
the carry and zero flags being set, respectively, in and use
them throughout the x86 boot code.
Modified:
stable/8/sys/boot/i386/boot2/boot2.c
stable/8/sys/boot/i386/btx/lib/btxv86.h
stable/8/sys/boot/i386/common/cons.c
stable/8/sys/boot/i386/common/drv.c
stable/8/sys/boot/i386/libi386/bioscd.c
stable/8/sys/boot/i386/libi386/biosdisk.c
stable/8/sys/boot/i386/libi386/biosmem.c
stable/8/sys/boot/i386/libi386/biospci.c
stable/8/sys/boot/i386/libi386/biossmap.c
stable/8/sys/boot/i386/libi386/vidconsole.c
stable/8/sys/boot/pc98/boot2/boot2.c
stable/8/sys/boot/pc98/btx/lib/btxv86.h
stable/8/sys/boot/pc98/libpc98/bioscd.c
stable/8/sys/boot/pc98/libpc98/vidconsole.c
stable/8/sys/boot/pc98/loader/main.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/boot/i386/boot2/boot2.c
==
--- stable/8/sys/boot/i386/boot2/boot2.cWed Jan 4 16:39:39 2012
(r229501)
+++ stable/8/sys/boot/i386/boot2/boot2.cWed Jan 4 16:43:08 2012
(r229502)
@@ -24,7 +24,6 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include
#include
@@ -84,8 +83,6 @@ __FBSDID("$FreeBSD$");
#define NDEV 3
#define MEM_BASE 0x12
#define MEM_EXT0x15
-#define V86_CY(x) ((x) & PSL_C)
-#define V86_ZR(x) ((x) & PSL_Z)
#define DRV_HARD 0x80
#define DRV_MASK 0x7f
Modified: stable/8/sys/boot/i386/btx/lib/btxv86.h
==
--- stable/8/sys/boot/i386/btx/lib/btxv86.h Wed Jan 4 16:39:39 2012
(r229501)
+++ stable/8/sys/boot/i386/btx/lib/btxv86.h Wed Jan 4 16:43:08 2012
(r229502)
@@ -21,6 +21,7 @@
#define _BTXV86_H_
#include
+#include
#define V86_ADDR 0x1 /* Segment:offset address */
#define V86_CALLF 0x2 /* Emulate far call */
@@ -57,6 +58,9 @@ extern u_int32_t __args;
#defineVTOPSEG(va) (u_int16_t)(VTOP((caddr_t)va) >> 4)
#defineVTOPOFF(va) (u_int16_t)(VTOP((caddr_t)va) & 0xf)
+#defineV86_CY(x) ((x) & PSL_C)
+#defineV86_ZR(x) ((x) & PSL_Z)
+
void __exit(int) __attribute__((__noreturn__));
void __exec(caddr_t, ...);
Modified: stable/8/sys/boot/i386/common/cons.c
==
--- stable/8/sys/boot/i386/common/cons.cWed Jan 4 16:39:39 2012
(r229501)
+++ stable/8/sys/boot/i386/common/cons.cWed Jan 4 16:43:08 2012
(r229502)
@@ -27,8 +27,6 @@ __FBSDID("$FreeBSD$");
#include "util.h"
#include "cons.h"
-#defineV86_ZR(x) ((x) & PSL_Z)
-
#define SECOND 18 /* Circa that many ticks in a second. */
uint8_t ioctrl = IO_KEYBOARD;
Modified: stable/8/sys/boot/i386/common/drv.c
==
--- stable/8/sys/boot/i386/common/drv.c Wed Jan 4 16:39:39 2012
(r229501)
+++ stable/8/sys/boot/i386/common/drv.c Wed Jan 4 16:43:08 2012
(r229502)
@@ -19,8 +19,6 @@ __FBSDID("$FreeBSD$");
#include
-#include
-
#include
#include "rbx.h"
@@ -30,9 +28,6 @@ __FBSDID("$FreeBSD$");
#include "xreadorg.h"
#endif
-#defineV86_CY(x) ((x) & PSL_C)
-#defineV86_ZR(x) ((x) & PSL_Z)
-
#ifdef GPT
uint64_t
drvsize(struct dsk *dskp)
Modified: stable/8/sys/boot/i386/libi386/bioscd.c
==
--- stable/8/sys/boot/i386/libi386/bioscd.c Wed Jan 4 16:39:39 2012
(r229501)
+++ stable/8/sys/boot/i386/libi386/bioscd.c Wed Jan 4 16:43:08 2012
(r229502)
@@ -42,12 +42,12 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include
#include
#include
#include
+#include
#include "libi386.h"
#define BIOSCD_SECSIZE 2048
@@ -333,7 +333,7 @@ bc_read(int unit, daddr_t dblk, int blks
v86.ds = VTOPSEG(&packet);
v86.esi = VTOPOFF(&packet);
v86int();
- result = (v86.efl & PSL_C);
+ result = V86_CY(v86.efl);
if (result == 0)
break;
}
Modified: stable/8/sys/boot/i386/libi386/biosdisk.c
==
--- stable/8/sys/boot/i386/libi386/biosdisk.c Wed Jan 4 16:39:39 2012
(r22950
svn commit: r229503 - in stable/9/libexec/rtld-elf: . amd64 arm i386 ia64 mips powerpc powerpc64 sparc64
Author: kib
Date: Wed Jan 4 16:43:29 2012
New Revision: 229503
URL: http://svn.freebsd.org/changeset/base/229503
Log:
MFC r228435:
Add support for STT_GNU_IFUNC and R_MACHINE_IRELATIVE GNU extensions to
rtld on 386 and amd64.
MFC r228503:
Postpone the resolution for irelative/ifunc right before initializers
are called, and drop bind lock around calls to dispatcher. Use
initlist to iterate over the objects instead of the ->next, due to
drop of the bind lock in iteration.
For i386/reloc.c:reloc_iresolve(), fix calculation of the dispatch
function address for dso, by taking into account possible non-zero
relocbase.
MFC r228635 (by nwhitehorn):
Fix RTLD on PowerPC after r228435. Changing the order of init_pltgot()
caused the icache to be invalidated at the wrong time, resulting in
an icache full of nonsense in the PLT section.
Modified:
stable/9/libexec/rtld-elf/amd64/reloc.c
stable/9/libexec/rtld-elf/arm/reloc.c
stable/9/libexec/rtld-elf/i386/reloc.c
stable/9/libexec/rtld-elf/ia64/reloc.c
stable/9/libexec/rtld-elf/mips/reloc.c
stable/9/libexec/rtld-elf/powerpc/reloc.c
stable/9/libexec/rtld-elf/powerpc64/reloc.c
stable/9/libexec/rtld-elf/rtld.c
stable/9/libexec/rtld-elf/rtld.h
stable/9/libexec/rtld-elf/sparc64/reloc.c
Directory Properties:
stable/9/libexec/rtld-elf/ (props changed)
Modified: stable/9/libexec/rtld-elf/amd64/reloc.c
==
--- stable/9/libexec/rtld-elf/amd64/reloc.c Wed Jan 4 16:43:08 2012
(r229502)
+++ stable/9/libexec/rtld-elf/amd64/reloc.c Wed Jan 4 16:43:29 2012
(r229503)
@@ -344,11 +344,22 @@ reloc_plt(Obj_Entry *obj)
for (rela = obj->pltrela; rela < relalim; rela++) {
Elf_Addr *where;
- assert(ELF_R_TYPE(rela->r_info) == R_X86_64_JMP_SLOT);
-
- /* Relocate the GOT slot pointing into the PLT. */
- where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
- *where += (Elf_Addr)obj->relocbase;
+ switch(ELF_R_TYPE(rela->r_info)) {
+ case R_X86_64_JMP_SLOT:
+ /* Relocate the GOT slot pointing into the PLT. */
+ where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
+ *where += (Elf_Addr)obj->relocbase;
+ break;
+
+ case R_X86_64_IRELATIVE:
+ obj->irelative = true;
+ break;
+
+ default:
+ _rtld_error("Unknown relocation type %x in PLT",
+ (unsigned int)ELF_R_TYPE(rela->r_info));
+ return (-1);
+ }
}
return 0;
}
@@ -368,19 +379,98 @@ reloc_jmpslots(Obj_Entry *obj, RtldLockS
const Elf_Sym *def;
const Obj_Entry *defobj;
- assert(ELF_R_TYPE(rela->r_info) == R_X86_64_JMP_SLOT);
- where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
- def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, true, NULL,
- lockstate);
- if (def == NULL)
- return -1;
- target = (Elf_Addr)(defobj->relocbase + def->st_value + rela->r_addend);
- reloc_jmpslot(where, target, defobj, obj, (const Elf_Rel *)rela);
+ switch (ELF_R_TYPE(rela->r_info)) {
+ case R_X86_64_JMP_SLOT:
+ where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
+ def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, true, NULL,
+ lockstate);
+ if (def == NULL)
+ return (-1);
+ if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC) {
+ obj->gnu_ifunc = true;
+ continue;
+ }
+ target = (Elf_Addr)(defobj->relocbase + def->st_value +
rela->r_addend);
+ reloc_jmpslot(where, target, defobj, obj, (const Elf_Rel *)rela);
+ break;
+
+ case R_X86_64_IRELATIVE:
+ break;
+
+ default:
+ _rtld_error("Unknown relocation type %x in PLT",
+ (unsigned int)ELF_R_TYPE(rela->r_info));
+ return (-1);
+ }
}
obj->jmpslots_done = true;
return 0;
}
+int
+reloc_iresolve(Obj_Entry *obj, RtldLockState *lockstate)
+{
+const Elf_Rela *relalim;
+const Elf_Rela *rela;
+
+if (!obj->irelative)
+ return (0);
+relalim = (const Elf_Rela *)((char *)obj->pltrela + obj->pltrelasize);
+for (rela = obj->pltrela; rela < relalim; rela++) {
+ Elf_Addr *where, target, *ptr;
+
+ switch (ELF_R_TYPE(rela->r_info)) {
+ case R_X86_64_JMP_SLOT:
+ break;
+
+ case R_X86_64_IRELATIVE:
+ ptr = (Elf_Addr *)(obj->relocbase + rela->r_addend);
+ where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
+ lock_release(rtld_bind_lock, lockstate);
+ target = ((Elf_Addr (*)(void))ptr)();
+ wlock_acquire(rtld_bind_lock, lockstate);
+ *where = target;
+ break;
+ }
+}
+obj->irelative = false;
+return (0);
+}
+
+int
+reloc_gnu_ifunc(Obj_Entry *obj, RtldLockState *lockstate)
+{
+const Elf_Rela *relalim;
+const Elf
svn commit: r229504 - in stable/8/sys/boot/i386: common libi386
Author: jhb
Date: Wed Jan 4 16:45:12 2012
New Revision: 229504
URL: http://svn.freebsd.org/changeset/base/229504
Log:
MFC 226748:
- Add a new header for the x86 boot code that defines various structures
and constants related to the BIOS Enhanced Disk Drive Specification.
- Use this header instead of magic numbers and various duplicate structure
definitions for doing I/O.
- Use an actual structure for the request to fetch drive parameters in
drvsize() rather than a gross hack of a char array with some magic
size. While here, change drvsize() to only pass the 1.1 version of
the structure and not request device path information. If we want
device path information you have to set the length of the device
path information as an input (along with probably checking the actual
EDD version to see which size one should use as the device path
information is variable-length). This fixes data smashing problems
from passing an EDD 3 structure to BIOSes supporting EDD 4.
Added:
stable/8/sys/boot/i386/common/edd.h
- copied unchanged from r226748, head/sys/boot/i386/common/edd.h
Modified:
stable/8/sys/boot/i386/common/drv.c
stable/8/sys/boot/i386/libi386/Makefile
stable/8/sys/boot/i386/libi386/bioscd.c
stable/8/sys/boot/i386/libi386/biosdisk.c
stable/8/sys/boot/i386/libi386/libi386.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/boot/i386/common/drv.c
==
--- stable/8/sys/boot/i386/common/drv.c Wed Jan 4 16:43:29 2012
(r229503)
+++ stable/8/sys/boot/i386/common/drv.c Wed Jan 4 16:45:12 2012
(r229504)
@@ -24,43 +24,36 @@ __FBSDID("$FreeBSD$");
#include "rbx.h"
#include "util.h"
#include "drv.h"
+#include "edd.h"
#ifdef USE_XREAD
#include "xreadorg.h"
#endif
#ifdef GPT
+static struct edd_params params;
+
uint64_t
drvsize(struct dsk *dskp)
{
- unsigned char params[0x42];
- uint64_t sectors;
-
- *(uint32_t *)params = sizeof(params);
+ params.len = sizeof(struct edd_params);
v86.ctl = V86_FLAGS;
v86.addr = 0x13;
v86.eax = 0x4800;
v86.edx = dskp->drive;
- v86.ds = VTOPSEG(params);
- v86.esi = VTOPOFF(params);
+ v86.ds = VTOPSEG(¶ms);
+ v86.esi = VTOPOFF(¶ms);
v86int();
if (V86_CY(v86.efl)) {
printf("error %u\n", v86.eax >> 8 & 0xff);
return (0);
}
- memcpy(§ors, params + 0x10, sizeof(sectors));
- return (sectors);
+ return (params.sectors);
}
#endif /* GPT */
#ifndef USE_XREAD
-static struct {
- uint16_tlen;
- uint16_tcount;
- uint16_toff;
- uint16_tseg;
- uint64_tlba;
-} packet;
+static struct edd_packet packet;
#endif
int
@@ -71,7 +64,7 @@ drvread(struct dsk *dskp, void *buf, dad
if (!OPT_CHECK(RBX_QUIET))
printf("%c\b", c = c << 8 | c >> 24);
#ifndef USE_XREAD
- packet.len = 0x10;
+ packet.len = sizeof(struct edd_packet);
packet.count = nblk;
packet.off = VTOPOFF(buf);
packet.seg = VTOPSEG(buf);
@@ -105,7 +98,7 @@ int
drvwrite(struct dsk *dskp, void *buf, daddr_t lba, unsigned nblk)
{
- packet.len = 0x10;
+ packet.len = sizeof(struct edd_packet);
packet.count = nblk;
packet.off = VTOPOFF(buf);
packet.seg = VTOPSEG(buf);
Copied: stable/8/sys/boot/i386/common/edd.h (from r226748,
head/sys/boot/i386/common/edd.h)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/8/sys/boot/i386/common/edd.h Wed Jan 4 16:45:12 2012
(r229504, copy of r226748, head/sys/boot/i386/common/edd.h)
@@ -0,0 +1,110 @@
+/*-
+ * Copyright (c) 2011 Advanced Computing Technologies LLC
+ * Written by: John H. Baldwin
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.
svn commit: r229505 - in stable/9/sys: fs/devfs kern
Author: jhb
Date: Wed Jan 4 16:50:12 2012
New Revision: 229505
URL: http://svn.freebsd.org/changeset/base/229505
Log:
MFC 227069:
Move the cleanup of f_cdevpriv when the reference count of a devfs
file descriptor drops to zero out of _fdrop() and into devfs_close_f()
as it is only relevant for devfs file descriptors.
Modified:
stable/9/sys/fs/devfs/devfs_vnops.c
stable/9/sys/kern/kern_descrip.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
Modified: stable/9/sys/fs/devfs/devfs_vnops.c
==
--- stable/9/sys/fs/devfs/devfs_vnops.c Wed Jan 4 16:45:12 2012
(r229504)
+++ stable/9/sys/fs/devfs/devfs_vnops.c Wed Jan 4 16:50:12 2012
(r229505)
@@ -604,6 +604,13 @@ devfs_close_f(struct file *fp, struct th
td->td_fpop = fp;
error = vnops.fo_close(fp, td);
td->td_fpop = fpop;
+
+ /*
+* The f_cdevpriv cannot be assigned non-NULL value while we
+* are destroying the file.
+*/
+ if (fp->f_cdevpriv != NULL)
+ devfs_fpdrop(fp);
return (error);
}
Modified: stable/9/sys/kern/kern_descrip.c
==
--- stable/9/sys/kern/kern_descrip.cWed Jan 4 16:45:12 2012
(r229504)
+++ stable/9/sys/kern/kern_descrip.cWed Jan 4 16:50:12 2012
(r229505)
@@ -2575,12 +2575,6 @@ _fdrop(struct file *fp, struct thread *t
panic("fdrop: count %d", fp->f_count);
if (fp->f_ops != &badfileops)
error = fo_close(fp, td);
- /*
-* The f_cdevpriv cannot be assigned non-NULL value while we
-* are destroying the file.
-*/
- if (fp->f_cdevpriv != NULL)
- devfs_fpdrop(fp);
atomic_subtract_int(&openfiles, 1);
crfree(fp->f_cred);
uma_zfree(file_zone, fp);
___
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: r229506 - in stable/8/sys: fs/devfs kern
Author: jhb
Date: Wed Jan 4 16:51:04 2012
New Revision: 229506
URL: http://svn.freebsd.org/changeset/base/229506
Log:
MFC 227069:
Move the cleanup of f_cdevpriv when the reference count of a devfs
file descriptor drops to zero out of _fdrop() and into devfs_close_f()
as it is only relevant for devfs file descriptors.
Modified:
stable/8/sys/fs/devfs/devfs_vnops.c
stable/8/sys/kern/kern_descrip.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/fs/devfs/devfs_vnops.c
==
--- stable/8/sys/fs/devfs/devfs_vnops.c Wed Jan 4 16:50:12 2012
(r229505)
+++ stable/8/sys/fs/devfs/devfs_vnops.c Wed Jan 4 16:51:04 2012
(r229506)
@@ -552,6 +552,13 @@ devfs_close_f(struct file *fp, struct th
td->td_fpop = fp;
error = vnops.fo_close(fp, td);
td->td_fpop = fpop;
+
+ /*
+* The f_cdevpriv cannot be assigned non-NULL value while we
+* are destroying the file.
+*/
+ if (fp->f_cdevpriv != NULL)
+ devfs_fpdrop(fp);
return (error);
}
Modified: stable/8/sys/kern/kern_descrip.c
==
--- stable/8/sys/kern/kern_descrip.cWed Jan 4 16:50:12 2012
(r229505)
+++ stable/8/sys/kern/kern_descrip.cWed Jan 4 16:51:04 2012
(r229506)
@@ -2359,12 +2359,6 @@ _fdrop(struct file *fp, struct thread *t
panic("fdrop: count %d", fp->f_count);
if (fp->f_ops != &badfileops)
error = fo_close(fp, td);
- /*
-* The f_cdevpriv cannot be assigned non-NULL value while we
-* are destroying the file.
-*/
- if (fp->f_cdevpriv != NULL)
- devfs_fpdrop(fp);
atomic_subtract_int(&openfiles, 1);
crfree(fp->f_cred);
uma_zfree(file_zone, fp);
___
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: r229508 - head/libexec/rtld-elf
Author: kib
Date: Wed Jan 4 17:17:11 2012
New Revision: 229508
URL: http://svn.freebsd.org/changeset/base/229508
Log:
Postpone the resolution of IRELATIVE relocations and IFUNC-targeted
relocations until tls is initialized and stacks permissions correctly
set. This allows the ifunc to call malloc(3) and some other heavy
services.
Add debug banner.
MFC after:3 days
Modified:
head/libexec/rtld-elf/rtld.c
Modified: head/libexec/rtld-elf/rtld.c
==
--- head/libexec/rtld-elf/rtld.cWed Jan 4 17:01:12 2012
(r229507)
+++ head/libexec/rtld-elf/rtld.cWed Jan 4 17:17:11 2012
(r229508)
@@ -515,10 +515,6 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_
ld_bind_now != NULL && *ld_bind_now != '\0', &obj_rtld, NULL) == -1)
die();
-if (resolve_objects_ifunc(obj_main,
- ld_bind_now != NULL && *ld_bind_now != '\0', NULL) == -1)
- die();
-
dbg("doing copy relocations");
if (do_copy_relocations(obj_main) == -1)
die();
@@ -549,6 +545,11 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_
map_stacks_exec(NULL);
+dbg("resolving ifuncs");
+if (resolve_objects_ifunc(obj_main,
+ ld_bind_now != NULL && *ld_bind_now != '\0', NULL) == -1)
+ die();
+
wlock_acquire(rtld_bind_lock, &lockstate);
objlist_call_init(&initlist, &lockstate);
objlist_clear(&initlist);
___
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: r229509 - in stable/9/sbin: hastctl hastd
Author: trociny
Date: Wed Jan 4 17:22:10 2012
New Revision: 229509
URL: http://svn.freebsd.org/changeset/base/229509
Log:
MFC r225773, r225781, r225782, r225783, r225784, 225785, r225786, r225787,
r225830, r225831, r225832, r225835, r226461, r226462, r226463, r226842,
r226851, r226852, r226854, r226855, r226856, r226857, r226859, r226861,
r228542, r228542, r228543, r228544, r228695, r228696:
r225773 (pjd):
Ensure that pjdlog functions don't modify errno.
r225781 (pjd):
No need to use KEEP_ERRNO() macro around pjdlog functions, as they don't
modify errno.
r225782 (pjd):
Prefer PJDLOG_ASSERT() and PJDLOG_ABORT() over assert() and abort().
pjdlog versions will log problem to syslog when application is running in
background.
r225783 (pjd):
Correct two mistakes when converting asserts to
PJDLOG_ASSERT()/PJDLOG_ABORT().
r225784 (pjd):
- Convert some impossible conditions into assertions.
- Add missing 'if' in comment.
r225785 (pjd):
Prefer PJDLOG_ASSERT()/PJDLOG_ABORT() over assert().
r225786 (pjd):
No need to wrap pjdlog functions around with KEEP_ERRNO() macro.
r225787 (pjd):
Use PJDLOG_ASSERT() and PJDLOG_ABORT() everywhere instead of assert().
r225830 (pjd):
After every activemap change flush disk's write cache, so that write
reordering won't make the actual write to be committed before marking
the coresponding extent as dirty.
It can be disabled in configuration file.
If BIO_FLUSH is not supported by the underlying file system we log a warning
and never send BIO_FLUSH again to that GEOM provider.
r225831 (pjd):
Break a bit earlier.
r225832 (pjd):
If the underlying provider doesn't support BIO_FLUSH, log it only once
and don't bother trying in the future.
r225835 (pjd):
Correct typo.
r226461 (pjd):
When path to the configuration file is relative, obtain full path,
so we can always find the file, even after daemonizing and changing
working directory to /.
r226462 (pjd):
Remove redundant space.
r226463 (pjd):
Allow to specify pidfile in HAST configuration file.
r226842 (pjd):
Correct comments.
r226851 (pjd):
Delay resuid generation until first connection to secondary, not until first
write. This way on first connection we will synchronize only the extents that
were modified during the lifetime of primary node, not entire GEOM provider.
r226852 (pjd):
Minor cleanups.
r226854 (pjd):
- Eliminate the need for hio_nv.
- Introduce hio_clear() function for clearing hio before returning it
onto free queue.
r226855 (pjd):
Improve comment so it doesn't suggest race is possible, but that we handle
the race.
r226856 (pjd):
Reduce indentation.
r226857 (pjd):
Minor cleanups.
r226859 (pjd):
Implement 'async' mode for HAST.
r226861 (pjd):
Remove redundant space.
r228542 (pjd):
Remove redundant setting of the error variable.
Found by: Clang Static Analyzer
r228543 (pjd):
Simplify code by changing functions types from int to avoid, as the functions
always return 0.
Found by: Clang Static Analyzer
r228544 (pjd):
Remove redundant assignment.
Found by: Clang Static Analyzer
r228695 (pjd):
Don't use function name as format string.
Detected by:clang
r228696 (pjd):
Use lex's standard way of not generating unused function.
Inspired by:r228555
Modified:
stable/9/sbin/hastctl/hastctl.c
stable/9/sbin/hastd/Makefile
stable/9/sbin/hastd/activemap.c
stable/9/sbin/hastd/control.c
stable/9/sbin/hastd/ebuf.c
stable/9/sbin/hastd/event.c
stable/9/sbin/hastd/hast.conf.5
stable/9/sbin/hastd/hast.h
stable/9/sbin/hastd/hast_checksum.c
stable/9/sbin/hastd/hast_proto.c
stable/9/sbin/hastd/hastd.c
stable/9/sbin/hastd/hooks.c
stable/9/sbin/hastd/metadata.c
stable/9/sbin/hastd/nv.c
stable/9/sbin/hastd/parse.y
stable/9/sbin/hastd/pjdlog.c
stable/9/sbin/hastd/pjdlog.h
stable/9/sbin/hastd/primary.c
stable/9/sbin/hastd/proto_tcp.c
stable/9/sbin/hastd/rangelock.c
stable/9/sbin/hastd/secondary.c
stable/9/sbin/hastd/subr.c
stable/9/sbin/hastd/synch.h
stable/9/sbin/hastd/token.l
Directory Properties:
stable/9/sbin/hastctl/ (props changed)
stable/9/sbin/hastd/ (props changed)
Modified: stable/9/sbin/hastctl/hastctl.c
==
--- stable/9/sbin/hastctl/hastctl.c Wed Jan 4 17:17:11 2012
(r229508)
+++ stable/9/sbin/hastctl/hastctl.c Wed Jan 4 17:22:10 2012
(r229509)
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include
#include
#include
#include
@@ -433,19 +432,19 @@ main(int argc, char *argv[])
pjdlog_debug_set(debug);
cfg = yy_config_parse(cfgpath, true);
- assert(cfg
svn commit: r229510 - in stable/8/sbin: hastctl hastd
Author: trociny
Date: Wed Jan 4 17:25:41 2012
New Revision: 229510
URL: http://svn.freebsd.org/changeset/base/229510
Log:
MFC r219843, r225773, r225781, r225782, r225783, r225784, 225785, r225786,
r225787, r225830, r225831, r225832, r225835, r226461, r226462, r226463,
r226842, r226851, r226852, r226854, r226855, r226856, r226857, r226859,
r226861, r228542, r228542, r228543, r228544, r228695, r228696:
r219843 (pjd):
Fix typo.
r225773 (pjd):
Ensure that pjdlog functions don't modify errno.
r225781 (pjd):
No need to use KEEP_ERRNO() macro around pjdlog functions, as they don't
modify errno.
r225782 (pjd):
Prefer PJDLOG_ASSERT() and PJDLOG_ABORT() over assert() and abort().
pjdlog versions will log problem to syslog when application is running in
background.
r225783 (pjd):
Correct two mistakes when converting asserts to
PJDLOG_ASSERT()/PJDLOG_ABORT().
r225784 (pjd):
- Convert some impossible conditions into assertions.
- Add missing 'if' in comment.
r225785 (pjd):
Prefer PJDLOG_ASSERT()/PJDLOG_ABORT() over assert().
r225786 (pjd):
No need to wrap pjdlog functions around with KEEP_ERRNO() macro.
r225787 (pjd):
Use PJDLOG_ASSERT() and PJDLOG_ABORT() everywhere instead of assert().
r225830 (pjd):
After every activemap change flush disk's write cache, so that write
reordering won't make the actual write to be committed before marking
the coresponding extent as dirty.
It can be disabled in configuration file.
If BIO_FLUSH is not supported by the underlying file system we log a warning
and never send BIO_FLUSH again to that GEOM provider.
r225831 (pjd):
Break a bit earlier.
r225832 (pjd):
If the underlying provider doesn't support BIO_FLUSH, log it only once
and don't bother trying in the future.
r225835 (pjd):
Correct typo.
r226461 (pjd):
When path to the configuration file is relative, obtain full path,
so we can always find the file, even after daemonizing and changing
working directory to /.
r226462 (pjd):
Remove redundant space.
r226463 (pjd):
Allow to specify pidfile in HAST configuration file.
r226842 (pjd):
Correct comments.
r226851 (pjd):
Delay resuid generation until first connection to secondary, not until first
write. This way on first connection we will synchronize only the extents that
were modified during the lifetime of primary node, not entire GEOM provider.
r226852 (pjd):
Minor cleanups.
r226854 (pjd):
- Eliminate the need for hio_nv.
- Introduce hio_clear() function for clearing hio before returning it
onto free queue.
r226855 (pjd):
Improve comment so it doesn't suggest race is possible, but that we handle
the race.
r226856 (pjd):
Reduce indentation.
r226857 (pjd):
Minor cleanups.
r226859 (pjd):
Implement 'async' mode for HAST.
r226861 (pjd):
Remove redundant space.
r228542 (pjd):
Remove redundant setting of the error variable.
Found by: Clang Static Analyzer
r228543 (pjd):
Simplify code by changing functions types from int to avoid, as the functions
always return 0.
Found by: Clang Static Analyzer
r228544 (pjd):
Remove redundant assignment.
Found by: Clang Static Analyzer
r228695 (pjd):
Don't use function name as format string.
Detected by:clang
r228696 (pjd):
Use lex's standard way of not generating unused function.
Inspired by:r228555
Modified:
stable/8/sbin/hastctl/hastctl.c
stable/8/sbin/hastd/Makefile
stable/8/sbin/hastd/activemap.c
stable/8/sbin/hastd/control.c
stable/8/sbin/hastd/ebuf.c
stable/8/sbin/hastd/event.c
stable/8/sbin/hastd/hast.conf.5
stable/8/sbin/hastd/hast.h
stable/8/sbin/hastd/hast_checksum.c
stable/8/sbin/hastd/hast_proto.c
stable/8/sbin/hastd/hastd.c
stable/8/sbin/hastd/hooks.c
stable/8/sbin/hastd/metadata.c
stable/8/sbin/hastd/nv.c
stable/8/sbin/hastd/parse.y
stable/8/sbin/hastd/pjdlog.c
stable/8/sbin/hastd/pjdlog.h
stable/8/sbin/hastd/primary.c
stable/8/sbin/hastd/proto_tcp.c
stable/8/sbin/hastd/rangelock.c
stable/8/sbin/hastd/secondary.c
stable/8/sbin/hastd/subr.c
stable/8/sbin/hastd/synch.h
stable/8/sbin/hastd/token.l
Directory Properties:
stable/8/sbin/hastctl/ (props changed)
stable/8/sbin/hastd/ (props changed)
Modified: stable/8/sbin/hastctl/hastctl.c
==
--- stable/8/sbin/hastctl/hastctl.c Wed Jan 4 17:22:10 2012
(r229509)
+++ stable/8/sbin/hastctl/hastctl.c Wed Jan 4 17:25:41 2012
(r229510)
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include
#include
#include
#include
@@ -433,19 +432,19 @@ main(int argc, char *argv[])
pjdlog_debug_set(debug);
cfg = yy_con
svn commit: r229511 - head/release/picobsd/build
Author: luigi
Date: Wed Jan 4 19:37:25 2012
New Revision: 229511
URL: http://svn.freebsd.org/changeset/base/229511
Log:
remove some stale options (such as running without /boot/loader)
improve support for multi-arch and cross-arch builds, by adding
a suffix to the kernel config file and build_directory.
(cross builds not clean yet, a cross-built kernel boots
but fails when starting /sbin/init)
Modified:
head/release/picobsd/build/Makefile.conf
head/release/picobsd/build/picobsd
Modified: head/release/picobsd/build/Makefile.conf
==
--- head/release/picobsd/build/Makefile.confWed Jan 4 17:25:41 2012
(r229510)
+++ head/release/picobsd/build/Makefile.confWed Jan 4 19:37:25 2012
(r229511)
@@ -13,6 +13,7 @@ BINMAKE?=make
SRC?=/usr/src
CONFIG?=config
MODULES?=-DNO_MODULES # do not build them as a default
+KERNCONF ?= PICOBSD
# caller will set MODULES to empty if modules are needed.
# Indeed, it can be used to specify other Makefile options as well.
@@ -45,10 +46,10 @@ ${COMPILE}: ${CONF}/${CONFFILE}
(cd ${CONF}; ${CONFIG} -d ${COMPILE} ${CONFFILE}; \
cd ${COMPILE}; ${BINMAKE} KERNEL=kernel ${MODULES} depend )
-${CONF}/${CONFFILE}: PICOBSD
+${CONF}/${CONFFILE}: ${KERNCONF}
# -mkdir -p ${CONF} # XXX not needed yet.
cp ${.OODATE} ${.TARGET}
- if [ -f PICOBSD.hints ] ; then cp PICOBSD.hints ${CONF}/PICOBSD.hints ;
fi
+ [ -f PICOBSD.hints ] && cp PICOBSD.hints ${CONF}/
# This part creates crunch1.conf and crunch.mk from crunch.conf
${BUILDDIR}/crunch.mk: ${BUILDDIR}/crunch1.conf
Modified: head/release/picobsd/build/picobsd
==
--- head/release/picobsd/build/picobsd Wed Jan 4 17:25:41 2012
(r229510)
+++ head/release/picobsd/build/picobsd Wed Jan 4 19:37:25 2012
(r229511)
@@ -105,11 +105,6 @@ set_defaults() { # no arguments
EDITOR=${EDITOR:-vi}
fd_size=${fd_size:-1440}
-o_use_loader="yes" # use /boot/loader
- # You should not change it unless you are really short
- # of space, and your kernel is small enough that the
- # bootblocks manage to load it.
-
o_all_in_mfs="yes" # put all files in mfs so you can boot
# and run the image via diskless boot.
o_clean="" # set if you want to clean prev.builds.
@@ -179,7 +174,17 @@ create_includes_and_libraries2() { # opt
if [ -d "$1" ] ; then
cd $1 ; ${BINMAKE} ${o_par} $2 # specific target, e.g. ld-elf.so
else
- ${BINMAKE} ${o_par} _+_= $no toolchain _includes _libraries
+ # export WITH_RESCUE=yes# build crunchide
+ # ${BINMAKE} ${o_par} _+_= $no toolchain _includes _libraries
+ (
+ # eval export `cd ${SRC}; ${BINMAKE} -f Makefile.inc1 -V BMAKEENV`
+ eval "export XMAKE=\"`cd ${SRC}; make -f Makefile -V XMAKE`\""
+ ${BINMAKE} ${o_par} _+_= $no toolchain
+ )
+eval export `cd ${SRC}; ${BINMAKE} -f Makefile.inc1 -V WMAKEENV`
+ ${BINMAKE} ${o_par} _+_= $no _includes _libraries
+ [ ${o_arch} != `uname -m` ] && \
+ (cd ${l_objtree}; ln -s . ${o_arch}.${o_arch} || true )
fi
)
}
@@ -242,16 +247,19 @@ set_type() { # the_type the_site
name=""# clear in case of errors
for i in ${c_startdir}/${a} ${PICO_TREE}/${a} ; do
log "set_type: checking $i"
- [ -d $i -a -f $i/PICOBSD -a -f $i/crunch.conf ] || continue
- set -- `cat $i/PICOBSD | \
+ [ -d $i -a -f $i/crunch.conf ] || continue
+ # look for a kernel config file, privilege arch-specific
+ l_kernconf=$i/PICOBSD.${o_arch}
+ [ -f $l_kernconf ] || l_kernconf=$i/PICOBSD
+ [ -f $l_kernconf ] || continue
+ set -- `cat $l_kernconf | \
awk '/^#PicoBSD/ {print $2, $3, $4, $5, $6}'`
[ x"$1" != "x" ] || continue
- MFS_SIZE=$1 ; init_name=$2
- mfs_inodes=$3 ; fd_inodes=$4
+ MFS_SIZE=$1
name=`(cd $i ; pwd) `
name=`basename $name`
MY_TREE=$i
- BUILDDIR=${c_startdir}/build_dir-${name}
+ BUILDDIR=${c_startdir}/build_dir-${name}-${o_arch}
log "Matching file $name in $i"
return ;
done
@@ -328,10 +336,7 @@ main_dialog() {
K "edit Kernel config file" \
E "Edit crunch.conf file" \
S "MFS Size: ${MFS_SIZE}kB" \
- I "Init type: ${init_name}" \
F "Floppy size: ${fd_size}kB" \
- M "MFS bytes per inode: ${mfs_inodes}" \
- U "UFS bytes per inode: ${fd_inodes}" \
$ "Site-info: ${SITE}" \
Q "Quit" \
2> ${c_reply}
@@ -349,12 +354,6 @@ main_dialog() {
{ dialog --menu "Setup the type of configuration" 12 70 5 $l \
2> ${c_reply} && set_type "`cat ${c_reply}`" ${SITE} ; } || true
;;
-I
svn commit: r229512 - stable/9/release/scripts
Author: kensmith Date: Wed Jan 4 19:38:35 2012 New Revision: 229512 URL: http://svn.freebsd.org/changeset/base/229512 Log: The list of packages we will put on the 9.0-RELEASE DVD images was worked out a bit late so this won't make it into releng/9.0 or release/9.0.0 but it's worth committing to stable/9 for reference when 9.1-RELEASE rolls around. The new installer doesn't handle installing packages itself like sysinstall had done so in that respect packages are no longer as closely tied to doing an install. We'll provide a "disc1" image that has no packages on it at all. For the "dvd1" image there will be a /packages directory with the set of pre-built packages generated by this script (and all the dependencies of these packages...). The idea is to provide enough packages on the DVD for a user to get a minimal graphical workstation installed without needing to do a network based install if their network link is so-so... Discussed with: portmgr, re Modified: stable/9/release/scripts/package-split.py Modified: stable/9/release/scripts/package-split.py == --- stable/9/release/scripts/package-split.py Wed Jan 4 19:37:25 2012 (r229511) +++ stable/9/release/scripts/package-split.py Wed Jan 4 19:38:35 2012 (r229512) @@ -23,87 +23,32 @@ if 'PKG_VERBOSE' in os.environ: else: verbose = 0 -if 'PKG_DVD' in os.environ: -doing_dvd = 1 -else: -doing_dvd = 0 - -# List of packages for disc1. -def disc1_packages(): -pkgs = ['misc/freebsd-doc-bn', - 'misc/freebsd-doc-da', - 'misc/freebsd-doc-de', - 'misc/freebsd-doc-el', - 'misc/freebsd-doc-en', - 'misc/freebsd-doc-es', - 'misc/freebsd-doc-fr', - 'misc/freebsd-doc-hu', - 'misc/freebsd-doc-it', - 'misc/freebsd-doc-ja', - 'misc/freebsd-doc-mn', - 'misc/freebsd-doc-nl', - 'misc/freebsd-doc-pl', - 'misc/freebsd-doc-pt', - 'misc/freebsd-doc-ru', - 'misc/freebsd-doc-sr', - 'misc/freebsd-doc-tr', - 'misc/freebsd-doc-zh_cn', - 'misc/freebsd-doc-zh_tw'] - -if doing_dvd: - pkgs.extend(['archivers/unzip', - 'astro/xearth', - 'devel/gmake', - 'devel/imake', - 'editors/emacs', - 'editors/vim-lite', +# List of packages for dvd1. +def dvd1_packages(): +pkgs = ['archivers/unzip', 'emulators/linux_base-f10', - 'emulators/mtools', - 'graphics/png', - 'graphics/xv', - 'irc/xchat', - 'lang/perl5.8', - 'mail/alpine', - 'mail/exim', - 'mail/fetchmail', - 'mail/mutt', - 'mail/popd', - 'mail/postfix', - 'mail/xfmail', - 'net/cvsup-without-gui', + 'lang/perl5.12', + 'misc/freebsd-doc-all', + 'net/mpd5', 'net/rsync', - 'net/samba3', - 'news/slrn', - 'news/tin', - 'ports-mgmt/p5-FreeBSD-Portindex', 'ports-mgmt/portaudit', 'ports-mgmt/portmaster', - 'ports-mgmt/portupgrade', - 'print/a2ps-letter', - 'print/apsfilter', - 'print/ghostscript7-nox11', - 'print/psutils-letter', - 'print/gv', 'shells/bash', - 'shells/pdksh', 'shells/zsh', 'security/sudo', 'sysutils/screen', + 'www/firefox', 'www/links', - 'www/lynx', + 'x11-drivers/xf86-video-vmware', 'x11/gnome2', 'x11/kde4', - 'x11/rxvt', - 'x11/xorg', - 'x11-wm/afterstep', - 'x11-wm/fvwm2', - 'x11-wm/windowmaker']) + 'x11/xorg']; return pkgs # The list of desired packages def desired_packages(): -disc1 = disc1_packages() -return [disc1] +dvd1 = dvd1_packages() +return [dvd1] # Suck the entire INDEX file into a two different dictionaries. The first # dictionary maps port names (origins) to package names. The second ___ 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: r229513 - stable/9/sys/compat/freebsd32
Author: jhb
Date: Wed Jan 4 19:43:53 2012
New Revision: 229513
URL: http://svn.freebsd.org/changeset/base/229513
Log:
Regen.
Reminded by: kib
Modified:
stable/9/sys/compat/freebsd32/freebsd32_proto.h
stable/9/sys/compat/freebsd32/freebsd32_syscall.h
stable/9/sys/compat/freebsd32/freebsd32_syscalls.c
stable/9/sys/compat/freebsd32/freebsd32_sysent.c
stable/9/sys/compat/freebsd32/freebsd32_systrace_args.c
Modified: stable/9/sys/compat/freebsd32/freebsd32_proto.h
==
--- stable/9/sys/compat/freebsd32/freebsd32_proto.h Wed Jan 4 19:38:35
2012(r229512)
+++ stable/9/sys/compat/freebsd32/freebsd32_proto.h Wed Jan 4 19:43:53
2012(r229513)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 224066
2011-07-15 18:26:19Z jonathan
+ * created from FreeBSD: stable/9/sys/compat/freebsd32/syscalls.master 229500
2012-01-04 16:29:45Z jhb
*/
#ifndef _FREEBSD32_SYSPROTO_H_
@@ -570,10 +570,10 @@ struct freebsd32_pselect_args {
};
struct freebsd32_posix_fallocate_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
- char offsetlo_l_[PADL_(uint32_t)]; uint32_t offsetlo; char
offsetlo_r_[PADR_(uint32_t)];
- char offsethi_l_[PADL_(uint32_t)]; uint32_t offsethi; char
offsethi_r_[PADR_(uint32_t)];
- char lenlo_l_[PADL_(uint32_t)]; uint32_t lenlo; char
lenlo_r_[PADR_(uint32_t)];
- char lenhi_l_[PADL_(uint32_t)]; uint32_t lenhi; char
lenhi_r_[PADR_(uint32_t)];
+ char offset1_l_[PADL_(uint32_t)]; uint32_t offset1; char
offset1_r_[PADR_(uint32_t)];
+ char offset2_l_[PADL_(uint32_t)]; uint32_t offset2; char
offset2_r_[PADR_(uint32_t)];
+ char len1_l_[PADL_(uint32_t)]; uint32_t len1; char
len1_r_[PADR_(uint32_t)];
+ char len2_l_[PADL_(uint32_t)]; uint32_t len2; char
len2_r_[PADR_(uint32_t)];
};
#if !defined(PAD64_REQUIRED) && defined(__powerpc__)
#define PAD64_REQUIRED
Modified: stable/9/sys/compat/freebsd32/freebsd32_syscall.h
==
--- stable/9/sys/compat/freebsd32/freebsd32_syscall.h Wed Jan 4 19:38:35
2012(r229512)
+++ stable/9/sys/compat/freebsd32/freebsd32_syscall.h Wed Jan 4 19:43:53
2012(r229513)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 224066
2011-07-15 18:26:19Z jonathan
+ * created from FreeBSD: stable/9/sys/compat/freebsd32/syscalls.master 229500
2012-01-04 16:29:45Z jhb
*/
#defineFREEBSD32_SYS_syscall 0
Modified: stable/9/sys/compat/freebsd32/freebsd32_syscalls.c
==
--- stable/9/sys/compat/freebsd32/freebsd32_syscalls.c Wed Jan 4 19:38:35
2012(r229512)
+++ stable/9/sys/compat/freebsd32/freebsd32_syscalls.c Wed Jan 4 19:43:53
2012(r229513)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 224066
2011-07-15 18:26:19Z jonathan
+ * created from FreeBSD: stable/9/sys/compat/freebsd32/syscalls.master 229500
2012-01-04 16:29:45Z jhb
*/
const char *freebsd32_syscallnames[] = {
Modified: stable/9/sys/compat/freebsd32/freebsd32_sysent.c
==
--- stable/9/sys/compat/freebsd32/freebsd32_sysent.cWed Jan 4 19:38:35
2012(r229512)
+++ stable/9/sys/compat/freebsd32/freebsd32_sysent.cWed Jan 4 19:43:53
2012(r229513)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 224066
2011-07-15 18:26:19Z jonathan
+ * created from FreeBSD: stable/9/sys/compat/freebsd32/syscalls.master 229500
2012-01-04 16:29:45Z jhb
*/
#include "opt_compat.h"
Modified: stable/9/sys/compat/freebsd32/freebsd32_systrace_args.c
==
--- stable/9/sys/compat/freebsd32/freebsd32_systrace_args.c Wed Jan 4
19:38:35 2012(r229512)
+++ stable/9/sys/compat/freebsd32/freebsd32_systrace_args.c Wed Jan 4
19:43:53 2012(r229513)
@@ -3027,10 +3027,10 @@ systrace_args(int sysnum, void *params,
case 530: {
struct freebsd32_posix_fallocate_args *p = params;
iarg[0] = p->fd; /* int */
- uarg[1] = p->offsetlo; /* uint32_t */
- uarg[2] = p->offsethi; /* uint32_t */
- uarg[3] = p->lenlo; /* uint32_t */
- uarg[4] = p->lenhi; /* uint32_t */
+ uarg[1] = p->offset1; /* uint32_t */
+ uarg[2] = p->offset2; /* u
svn commit: r229514 - in stable/8: share/mk tools/build/options
Author: bz Date: Wed Jan 4 19:50:10 2012 New Revision: 229514 URL: http://svn.freebsd.org/changeset/base/229514 Log: MFC r221266: Introduce two new options MK_INET and MK_INET_SUPPORT analogically with INET6 equivalents. Added: stable/8/tools/build/options/WITHOUT_INET - copied unchanged from r221266, head/tools/build/options/WITHOUT_INET stable/8/tools/build/options/WITHOUT_INET_SUPPORT - copied unchanged from r221266, head/tools/build/options/WITHOUT_INET_SUPPORT Modified: stable/8/share/mk/bsd.own.mk Directory Properties: stable/8/share/mk/ (props changed) stable/8/tools/build/options/ (props changed) Modified: stable/8/share/mk/bsd.own.mk == --- stable/8/share/mk/bsd.own.mkWed Jan 4 19:43:53 2012 (r229513) +++ stable/8/share/mk/bsd.own.mkWed Jan 4 19:50:10 2012 (r229514) @@ -325,6 +325,7 @@ WITH_IDEA= GPIB \ GROFF \ HTML \ +INET \ INET6 \ INFO \ INSTALLLIB \ @@ -500,6 +501,7 @@ MK_GDB:=no .for var in \ BZIP2 \ GNU \ +INET \ INET6 \ IPX \ KERBEROS \ Copied: stable/8/tools/build/options/WITHOUT_INET (from r221266, head/tools/build/options/WITHOUT_INET) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/8/tools/build/options/WITHOUT_INET Wed Jan 4 19:50:10 2012 (r229514, copy of r221266, head/tools/build/options/WITHOUT_INET) @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Set to not build programs and libraries related to IPv4 networking. Copied: stable/8/tools/build/options/WITHOUT_INET_SUPPORT (from r221266, head/tools/build/options/WITHOUT_INET_SUPPORT) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/8/tools/build/options/WITHOUT_INET_SUPPORT Wed Jan 4 19:50:10 2012(r229514, copy of r221266, head/tools/build/options/WITHOUT_INET_SUPPORT) @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Set to build libraries, programs, and kernel modules without IPv4 support. ___ 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: r229515 - stable/8/share/man/man5
Author: bz
Date: Wed Jan 4 19:53:32 2012
New Revision: 229515
URL: http://svn.freebsd.org/changeset/base/229515
Log:
Regen src.conf(5) after merge of WITHOUT_INET{,_SUPPORT} in r229514.
Modified:
stable/8/share/man/man5/src.conf.5
Modified: stable/8/share/man/man5/src.conf.5
==
--- stable/8/share/man/man5/src.conf.5 Wed Jan 4 19:50:10 2012
(r229514)
+++ stable/8/share/man/man5/src.conf.5 Wed Jan 4 19:53:32 2012
(r229515)
@@ -1,7 +1,7 @@
.\" DO NOT EDIT-- this file is automatically generated.
.\" from FreeBSD: stable/8/tools/build/options/makeman 188848 2009-02-20
11:09:55Z mtm
.\" $FreeBSD$
-.Dd May 25, 2010
+.Dd January 4, 2012
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -368,6 +368,15 @@ This code is patented in the USA and man
It is
.Em "YOUR RESPONSIBILITY"
to determine if you can legally use IDEA.
+.It Va WITHOUT_INET
+.\" from FreeBSD: stable/8/tools/build/options/WITHOUT_INET 229514 2012-01-04
19:50:10Z bz
+Set to not build programs and libraries related to IPv4 networking.
+When set, it also enforces the following options:
+.Pp
+.Bl -item -compact
+.It
+.Va WITHOUT_INET_SUPPORT
+.El
.It Va WITHOUT_INET6
.\" from FreeBSD: stable/8/tools/build/options/WITHOUT_INET6 156932 2006-03-21
07:50:50Z ru
Set to not build
@@ -381,6 +390,9 @@ When set, it also enforces the following
.It Va WITHOUT_INET6_SUPPORT
.\" from FreeBSD: stable/8/tools/build/options/WITHOUT_INET6_SUPPORT 156932
2006-03-21 07:50:50Z ru
Set to build libraries, programs, and kernel modules without IPv6 support.
+.It Va WITHOUT_INET_SUPPORT
+.\" from FreeBSD: stable/8/tools/build/options/WITHOUT_INET_SUPPORT 229514
2012-01-04 19:50:10Z bz
+Set to build libraries, programs, and kernel modules without IPv4 support.
.It Va WITHOUT_INFO
.\" from FreeBSD: stable/8/tools/build/options/WITHOUT_INFO 156932 2006-03-21
07:50:50Z ru
Set to not make or install
___
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: r229516 - head/lib/libvgl
Author: pfg
Date: Wed Jan 4 20:05:38 2012
New Revision: 229516
URL: http://svn.freebsd.org/changeset/base/229516
Log:
Quiet down clang -Werror.
Reported by: Pawel Worach
Approved by: jhb (mentor)
Modified:
head/lib/libvgl/simple.c
Modified: head/lib/libvgl/simple.c
==
--- head/lib/libvgl/simple.cWed Jan 4 19:53:32 2012(r229515)
+++ head/lib/libvgl/simple.cWed Jan 4 20:05:38 2012(r229516)
@@ -242,8 +242,8 @@ VGLLine(VGLBitmap *object, int x1, int y
if (x1 > x2) { /* start from the smaller coordinate */
x = x2;
y = y2;
-x1 = x1;
-y1 = y1;
+/* x1 = x1;
+y1 = y1; */
} else {
x = x1;
y = y1;
___
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: r229517 - in stable/9/lib/clang: libllvmarminfo libllvmmipsinfo libllvmpowerpcinfo libllvmx86info
Author: dim Date: Wed Jan 4 20:14:07 2012 New Revision: 229517 URL: http://svn.freebsd.org/changeset/base/229517 Log: MFC r229183: In several llvm library Makefiles, remove extraneous slashes at the end of SRCDIR definitions. Modified: stable/9/lib/clang/libllvmarminfo/Makefile stable/9/lib/clang/libllvmmipsinfo/Makefile stable/9/lib/clang/libllvmpowerpcinfo/Makefile stable/9/lib/clang/libllvmx86info/Makefile Directory Properties: stable/9/lib/clang/ (props changed) Modified: stable/9/lib/clang/libllvmarminfo/Makefile == --- stable/9/lib/clang/libllvmarminfo/Makefile Wed Jan 4 20:05:38 2012 (r229516) +++ stable/9/lib/clang/libllvmarminfo/Makefile Wed Jan 4 20:14:07 2012 (r229517) @@ -2,7 +2,7 @@ LIB= llvmarminfo -SRCDIR=lib/Target/ARM/TargetInfo/ +SRCDIR=lib/Target/ARM/TargetInfo INCDIR=lib/Target/ARM SRCS= ARMTargetInfo.cpp Modified: stable/9/lib/clang/libllvmmipsinfo/Makefile == --- stable/9/lib/clang/libllvmmipsinfo/Makefile Wed Jan 4 20:05:38 2012 (r229516) +++ stable/9/lib/clang/libllvmmipsinfo/Makefile Wed Jan 4 20:14:07 2012 (r229517) @@ -2,7 +2,7 @@ LIB= llvmmipsinfo -SRCDIR=lib/Target/Mips/TargetInfo/ +SRCDIR=lib/Target/Mips/TargetInfo INCDIR=lib/Target/Mips SRCS= MipsTargetInfo.cpp Modified: stable/9/lib/clang/libllvmpowerpcinfo/Makefile == --- stable/9/lib/clang/libllvmpowerpcinfo/Makefile Wed Jan 4 20:05:38 2012(r229516) +++ stable/9/lib/clang/libllvmpowerpcinfo/Makefile Wed Jan 4 20:14:07 2012(r229517) @@ -2,7 +2,7 @@ LIB= llvmpowerpcinfo -SRCDIR=lib/Target/PowerPC/TargetInfo/ +SRCDIR=lib/Target/PowerPC/TargetInfo INCDIR=lib/Target/PowerPC SRCS= PowerPCTargetInfo.cpp Modified: stable/9/lib/clang/libllvmx86info/Makefile == --- stable/9/lib/clang/libllvmx86info/Makefile Wed Jan 4 20:05:38 2012 (r229516) +++ stable/9/lib/clang/libllvmx86info/Makefile Wed Jan 4 20:14:07 2012 (r229517) @@ -2,7 +2,7 @@ LIB= llvmx86info -SRCDIR=lib/Target/X86/TargetInfo/ +SRCDIR=lib/Target/X86/TargetInfo INCDIR=lib/Target/X86 SRCS= X86TargetInfo.cpp ___ 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: r229518 - head/sbin/ifconfig
Author: rwatson Date: Wed Jan 4 21:04:57 2012 New Revision: 229518 URL: http://svn.freebsd.org/changeset/base/229518 Log: Adjust the VLAN section of the ifconfig(8) man page to better reflect reality: 1. Only 12-bit VLAN Identifiers, not full 16-bit VLAN tags can be set using ifconfig vlan. 2. When we mean VLAN Identifiers, spell it that way, rather than as VLAN tag. MFC after:3 days Sponsored by: Adara Networks, Inc. Modified: head/sbin/ifconfig/ifconfig.8 Modified: head/sbin/ifconfig/ifconfig.8 == --- head/sbin/ifconfig/ifconfig.8 Wed Jan 4 20:14:07 2012 (r229517) +++ head/sbin/ifconfig/ifconfig.8 Wed Jan 4 21:04:57 2012 (r229518) @@ -28,7 +28,7 @@ .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 .\" $FreeBSD$ .\" -.Dd December 17, 2011 +.Dd January 4, 2012 .Dt IFCONFIG 8 .Os .Sh NAME @@ -2378,7 +2378,7 @@ interfaces: .It Cm vlan Ar vlan_tag Set the VLAN tag value to .Ar vlan_tag . -This value is a 16-bit number which is used to create an 802.1Q +This value is a 12-bit VLAN Identifier (VID) which is used to create an 802.1Q VLAN header for packets sent from the .Xr vlan 4 interface. @@ -2400,7 +2400,7 @@ diverted to the specified physical inter .Ar iface with 802.1Q VLAN encapsulation. Packets with 802.1Q encapsulation received -by the parent interface with the correct VLAN tag will be diverted to +by the parent interface with the correct VLAN Identifier will be diverted to the associated .Xr vlan 4 pseudo-interface. @@ -2439,7 +2439,8 @@ pseudo device, disassociate the parent i This breaks the link between the .Xr vlan 4 interface and its parent, -clears its VLAN tag, flags and its link address and shuts the interface down. +clears its VLAN Identifier, flags and its link address and shuts the interface +down. The .Ar iface argument is useless and hence deprecated. ___ 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: r229519 - head/sys/modules/kgssapi_krb5
Author: jhb
Date: Wed Jan 4 21:14:22 2012
New Revision: 229519
URL: http://svn.freebsd.org/changeset/base/229519
Log:
Fix 'make clean' for this module so it cleans up the generated gssd.h.
MFC after:1 week
Modified:
head/sys/modules/kgssapi_krb5/Makefile
Modified: head/sys/modules/kgssapi_krb5/Makefile
==
--- head/sys/modules/kgssapi_krb5/Makefile Wed Jan 4 21:04:57 2012
(r229518)
+++ head/sys/modules/kgssapi_krb5/Makefile Wed Jan 4 21:14:22 2012
(r229519)
@@ -13,6 +13,7 @@ SRCS= krb5_mech.c \
SRCS+= kgss_if.h gssd.h
MFILES=kgssapi/kgss_if.m
+CLEANFILES=gssd.h
S= ${.CURDIR}/../..
___
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: r229520 - stable/9/sys/dev/ae
Author: yongari
Date: Wed Jan 4 21:25:11 2012
New Revision: 229520
URL: http://svn.freebsd.org/changeset/base/229520
Log:
MFC r227452:
To send a frame, controller requires a prepended TX header and
the length of frame should be treated as multiple of 4. Actual
frame length is set in the TX header. The TX header position
should be aligned on 4 byte boundary and actual frame start
position should be aligned on 4 byte boundary as well. This means
we need 4(TX header length) + 3(frame length fixup) additional free
space in TX buffer in addition to actual frame length.
Make sure TX handler check these additional bytes.
ae_tx_avail_size() returns actual free space in TX buffer to ease
the calculation of available TX buffer space in caller. While I'm
here, replace magic number to appropriate sizeof operator to
enhance readability.
This change should fix controller lockup issue happened under
certain conditions but it still does not fix watchdog timeout. It
seems the watchdog timeout is side-effect of TxS and TxD
mismatches. The root cause of TxD/TxD mismatch is not known yet but
it looks like silicon bug. I guess driver may have to reinitialize
controller whenever it sees TxS and TxD mismatches but leave it as
it was at this moment.
PR: kern/145918
Modified:
stable/9/sys/dev/ae/if_ae.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
Modified: stable/9/sys/dev/ae/if_ae.c
==
--- stable/9/sys/dev/ae/if_ae.c Wed Jan 4 21:14:22 2012(r229519)
+++ stable/9/sys/dev/ae/if_ae.c Wed Jan 4 21:25:11 2012(r229520)
@@ -1431,7 +1431,7 @@ ae_tx_avail_size(ae_softc_t *sc)
else
avail = sc->txd_ack - sc->txd_cur;
- return (avail - 4); /* 4-byte header. */
+ return (avail);
}
static int
@@ -1448,7 +1448,7 @@ ae_encap(ae_softc_t *sc, struct mbuf **m
len = m0->m_pkthdr.len;
if ((sc->flags & AE_FLAG_TXAVAIL) == 0 ||
- ae_tx_avail_size(sc) < len) {
+ len + sizeof(ae_txd_t) + 3 > ae_tx_avail_size(sc)) {
#ifdef AE_DEBUG
if_printf(sc->ifp, "No free Tx available.\n");
#endif
@@ -1457,11 +1457,10 @@ ae_encap(ae_softc_t *sc, struct mbuf **m
hdr = (ae_txd_t *)(sc->txd_base + sc->txd_cur);
bzero(hdr, sizeof(*hdr));
- sc->txd_cur = (sc->txd_cur + 4) % AE_TXD_BUFSIZE_DEFAULT; /* Header
-size. */
- to_end = AE_TXD_BUFSIZE_DEFAULT - sc->txd_cur; /* Space available to
- * the end of the ring
- */
+ /* Skip header size. */
+ sc->txd_cur = (sc->txd_cur + sizeof(ae_txd_t)) % AE_TXD_BUFSIZE_DEFAULT;
+ /* Space available to the end of the ring */
+ to_end = AE_TXD_BUFSIZE_DEFAULT - sc->txd_cur;
if (to_end >= len) {
m_copydata(m0, 0, len, (caddr_t)(sc->txd_base + sc->txd_cur));
} else {
@@ -1840,8 +1839,8 @@ ae_tx_intr(ae_softc_t *sc)
/*
* Move txd ack and align on 4-byte boundary.
*/
- sc->txd_ack = ((sc->txd_ack + le16toh(txd->len) + 4 + 3) & ~3) %
- AE_TXD_BUFSIZE_DEFAULT;
+ sc->txd_ack = ((sc->txd_ack + le16toh(txd->len) +
+ sizeof(ae_txs_t) + 3) & ~3) % AE_TXD_BUFSIZE_DEFAULT;
if ((flags & AE_TXS_SUCCESS) != 0)
ifp->if_opackets++;
___
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: r229521 - head/gnu/usr.bin/gdb/kgdb
Author: rwatson
Date: Wed Jan 4 21:26:47 2012
New Revision: 229521
URL: http://svn.freebsd.org/changeset/base/229521
Log:
Add missing -w to kgdb(1)'s usage().
Sponsored by: Adara Networks, Inc.
MFC after:3 days
Modified:
head/gnu/usr.bin/gdb/kgdb/main.c
Modified: head/gnu/usr.bin/gdb/kgdb/main.c
==
--- head/gnu/usr.bin/gdb/kgdb/main.cWed Jan 4 21:25:11 2012
(r229520)
+++ head/gnu/usr.bin/gdb/kgdb/main.cWed Jan 4 21:26:47 2012
(r229521)
@@ -83,7 +83,7 @@ usage(void)
{
fprintf(stderr,
- "usage: %s [-afqv] [-d crashdir] [-c core | -n dumpnr | -r
device]\n"
+ "usage: %s [-afqvw] [-d crashdir] [-c core | -n dumpnr | -r
device]\n"
"\t[kernel [core]]\n", getprogname());
exit(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: r229522 - stable/8/sys/dev/ae
Author: yongari
Date: Wed Jan 4 21:27:03 2012
New Revision: 229522
URL: http://svn.freebsd.org/changeset/base/229522
Log:
MFC r227452:
To send a frame, controller requires a prepended TX header and
the length of frame should be treated as multiple of 4. Actual
frame length is set in the TX header. The TX header position
should be aligned on 4 byte boundary and actual frame start
position should be aligned on 4 byte boundary as well. This means
we need 4(TX header length) + 3(frame length fixup) additional free
space in TX buffer in addition to actual frame length.
Make sure TX handler check these additional bytes.
ae_tx_avail_size() returns actual free space in TX buffer to ease
the calculation of available TX buffer space in caller. While I'm
here, replace magic number to appropriate sizeof operator to
enhance readability.
This change should fix controller lockup issue happened under
certain conditions but it still does not fix watchdog timeout. It
seems the watchdog timeout is side-effect of TxS and TxD
mismatches. The root cause of TxD/TxD mismatch is not known yet but
it looks like silicon bug. I guess driver may have to reinitialize
controller whenever it sees TxS and TxD mismatches but leave it as
it was at this moment.
PR: kern/145918
Modified:
stable/8/sys/dev/ae/if_ae.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/dev/ae/if_ae.c
==
--- stable/8/sys/dev/ae/if_ae.c Wed Jan 4 21:26:47 2012(r229521)
+++ stable/8/sys/dev/ae/if_ae.c Wed Jan 4 21:27:03 2012(r229522)
@@ -1432,7 +1432,7 @@ ae_tx_avail_size(ae_softc_t *sc)
else
avail = sc->txd_ack - sc->txd_cur;
- return (avail - 4); /* 4-byte header. */
+ return (avail);
}
static int
@@ -1449,7 +1449,7 @@ ae_encap(ae_softc_t *sc, struct mbuf **m
len = m0->m_pkthdr.len;
if ((sc->flags & AE_FLAG_TXAVAIL) == 0 ||
- ae_tx_avail_size(sc) < len) {
+ len + sizeof(ae_txd_t) + 3 > ae_tx_avail_size(sc)) {
#ifdef AE_DEBUG
if_printf(sc->ifp, "No free Tx available.\n");
#endif
@@ -1458,11 +1458,10 @@ ae_encap(ae_softc_t *sc, struct mbuf **m
hdr = (ae_txd_t *)(sc->txd_base + sc->txd_cur);
bzero(hdr, sizeof(*hdr));
- sc->txd_cur = (sc->txd_cur + 4) % AE_TXD_BUFSIZE_DEFAULT; /* Header
-size. */
- to_end = AE_TXD_BUFSIZE_DEFAULT - sc->txd_cur; /* Space available to
- * the end of the ring
- */
+ /* Skip header size. */
+ sc->txd_cur = (sc->txd_cur + sizeof(ae_txd_t)) % AE_TXD_BUFSIZE_DEFAULT;
+ /* Space available to the end of the ring */
+ to_end = AE_TXD_BUFSIZE_DEFAULT - sc->txd_cur;
if (to_end >= len) {
m_copydata(m0, 0, len, (caddr_t)(sc->txd_base + sc->txd_cur));
} else {
@@ -1841,8 +1840,8 @@ ae_tx_intr(ae_softc_t *sc)
/*
* Move txd ack and align on 4-byte boundary.
*/
- sc->txd_ack = ((sc->txd_ack + le16toh(txd->len) + 4 + 3) & ~3) %
- AE_TXD_BUFSIZE_DEFAULT;
+ sc->txd_ack = ((sc->txd_ack + le16toh(txd->len) +
+ sizeof(ae_txs_t) + 3) & ~3) % AE_TXD_BUFSIZE_DEFAULT;
if ((flags & AE_TXS_SUCCESS) != 0)
ifp->if_opackets++;
___
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: r229523 - stable/7/sys/dev/ae
Author: yongari
Date: Wed Jan 4 21:28:49 2012
New Revision: 229523
URL: http://svn.freebsd.org/changeset/base/229523
Log:
MFC r227452:
To send a frame, controller requires a prepended TX header and
the length of frame should be treated as multiple of 4. Actual
frame length is set in the TX header. The TX header position
should be aligned on 4 byte boundary and actual frame start
position should be aligned on 4 byte boundary as well. This means
we need 4(TX header length) + 3(frame length fixup) additional free
space in TX buffer in addition to actual frame length.
Make sure TX handler check these additional bytes.
ae_tx_avail_size() returns actual free space in TX buffer to ease
the calculation of available TX buffer space in caller. While I'm
here, replace magic number to appropriate sizeof operator to
enhance readability.
This change should fix controller lockup issue happened under
certain conditions but it still does not fix watchdog timeout. It
seems the watchdog timeout is side-effect of TxS and TxD
mismatches. The root cause of TxD/TxD mismatch is not known yet but
it looks like silicon bug. I guess driver may have to reinitialize
controller whenever it sees TxS and TxD mismatches but leave it as
it was at this moment.
PR: kern/145918
Modified:
stable/7/sys/dev/ae/if_ae.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/dev/ae/if_ae.c
==
--- stable/7/sys/dev/ae/if_ae.c Wed Jan 4 21:27:03 2012(r229522)
+++ stable/7/sys/dev/ae/if_ae.c Wed Jan 4 21:28:49 2012(r229523)
@@ -1432,7 +1432,7 @@ ae_tx_avail_size(ae_softc_t *sc)
else
avail = sc->txd_ack - sc->txd_cur;
- return (avail - 4); /* 4-byte header. */
+ return (avail);
}
static int
@@ -1449,7 +1449,7 @@ ae_encap(ae_softc_t *sc, struct mbuf **m
len = m0->m_pkthdr.len;
if ((sc->flags & AE_FLAG_TXAVAIL) == 0 ||
- ae_tx_avail_size(sc) < len) {
+ len + sizeof(ae_txd_t) + 3 > ae_tx_avail_size(sc)) {
#ifdef AE_DEBUG
if_printf(sc->ifp, "No free Tx available.\n");
#endif
@@ -1458,11 +1458,10 @@ ae_encap(ae_softc_t *sc, struct mbuf **m
hdr = (ae_txd_t *)(sc->txd_base + sc->txd_cur);
bzero(hdr, sizeof(*hdr));
- sc->txd_cur = (sc->txd_cur + 4) % AE_TXD_BUFSIZE_DEFAULT; /* Header
-size. */
- to_end = AE_TXD_BUFSIZE_DEFAULT - sc->txd_cur; /* Space available to
- * the end of the ring
- */
+ /* Skip header size. */
+ sc->txd_cur = (sc->txd_cur + sizeof(ae_txd_t)) % AE_TXD_BUFSIZE_DEFAULT;
+ /* Space available to the end of the ring */
+ to_end = AE_TXD_BUFSIZE_DEFAULT - sc->txd_cur;
if (to_end >= len) {
m_copydata(m0, 0, len, (caddr_t)(sc->txd_base + sc->txd_cur));
} else {
@@ -1841,8 +1840,8 @@ ae_tx_intr(ae_softc_t *sc)
/*
* Move txd ack and align on 4-byte boundary.
*/
- sc->txd_ack = ((sc->txd_ack + le16toh(txd->len) + 4 + 3) & ~3) %
- AE_TXD_BUFSIZE_DEFAULT;
+ sc->txd_ack = ((sc->txd_ack + le16toh(txd->len) +
+ sizeof(ae_txs_t) + 3) & ~3) % AE_TXD_BUFSIZE_DEFAULT;
if ((flags & AE_TXS_SUCCESS) != 0)
ifp->if_opackets++;
___
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: r229524 - stable/9/sys/dev/msk
Author: yongari
Date: Wed Jan 4 21:50:59 2012
New Revision: 229524
URL: http://svn.freebsd.org/changeset/base/229524
Log:
MFC r227582:
Enable 64bit DMA addressing support for all msk(4) controllers.
Unnecessarily complex LE format used on Marvell controller was
main reason not to enable 64bit DMA addressing in driver. If high
32bit address of DMA address of TX/RX buffer is changed, driver has
to generate a new LE. In TX path, driver will keep track of lastly
used high 32bit address of DMA address and generate a new LE
whenever it sees high address change in the DMA address. In RX path,
driver will always use two LEs to specify 64bit DMA address of RX
buffer. If the high 32bit address of DMA address of RX buffer is
the same as previous DMA address of RX buffer, driver does not have
to use two LEs but driver will use two LEs for simplicity in RX
ring management.
One of draw back for switching to 64bit DMA addressing is that the
large amount of LEs are used to specify 64bit DMA address such that
number of available LEs for TX/RX buffers are considerably reduced.
To mitigate the issue, increase number of available LEs from 256 to
384 for TX and from 256 to 512 for RX. For 32bit architectures,
msk(4) does not use 64bit DMA addressing to save resources.
Modified:
stable/9/sys/dev/msk/if_msk.c
stable/9/sys/dev/msk/if_mskreg.h
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
Modified: stable/9/sys/dev/msk/if_msk.c
==
--- stable/9/sys/dev/msk/if_msk.c Wed Jan 4 21:28:49 2012
(r229523)
+++ stable/9/sys/dev/msk/if_msk.c Wed Jan 4 21:50:59 2012
(r229524)
@@ -692,7 +692,7 @@ msk_init_rx_ring(struct msk_if_softc *sc
{
struct msk_ring_data *rd;
struct msk_rxdesc *rxd;
- int i, prod;
+ int i, nbuf, prod;
MSK_IF_LOCK_ASSERT(sc_if);
@@ -702,11 +702,18 @@ msk_init_rx_ring(struct msk_if_softc *sc
rd = &sc_if->msk_rdata;
bzero(rd->msk_rx_ring, sizeof(struct msk_rx_desc) * MSK_RX_RING_CNT);
- prod = sc_if->msk_cdata.msk_rx_prod;
- i = 0;
+ for (i = prod = 0; i < MSK_RX_RING_CNT; i++) {
+ rxd = &sc_if->msk_cdata.msk_rxdesc[prod];
+ rxd->rx_m = NULL;
+ rxd->rx_le = &rd->msk_rx_ring[prod];
+ MSK_INC(prod, MSK_RX_RING_CNT);
+ }
+ nbuf = MSK_RX_BUF_CNT;
+ prod = 0;
/* Have controller know how to compute Rx checksum. */
if ((sc_if->msk_flags & MSK_FLAG_DESCV2) == 0 &&
(sc_if->msk_ifp->if_capenable & IFCAP_RXCSUM) != 0) {
+#ifdef MSK_64BIT_DMA
rxd = &sc_if->msk_cdata.msk_rxdesc[prod];
rxd->rx_m = NULL;
rxd->rx_le = &rd->msk_rx_ring[prod];
@@ -715,15 +722,21 @@ msk_init_rx_ring(struct msk_if_softc *sc
rxd->rx_le->msk_control = htole32(OP_TCPSTART | HW_OWNER);
MSK_INC(prod, MSK_RX_RING_CNT);
MSK_INC(sc_if->msk_cdata.msk_rx_cons, MSK_RX_RING_CNT);
- i++;
- }
- for (; i < MSK_RX_RING_CNT; i++) {
+#endif
rxd = &sc_if->msk_cdata.msk_rxdesc[prod];
rxd->rx_m = NULL;
rxd->rx_le = &rd->msk_rx_ring[prod];
+ rxd->rx_le->msk_addr = htole32(ETHER_HDR_LEN << 16 |
+ ETHER_HDR_LEN);
+ rxd->rx_le->msk_control = htole32(OP_TCPSTART | HW_OWNER);
+ MSK_INC(prod, MSK_RX_RING_CNT);
+ MSK_INC(sc_if->msk_cdata.msk_rx_cons, MSK_RX_RING_CNT);
+ nbuf--;
+ }
+ for (i = 0; i < nbuf; i++) {
if (msk_newbuf(sc_if, prod) != 0)
return (ENOBUFS);
- MSK_INC(prod, MSK_RX_RING_CNT);
+ MSK_RX_INC(prod, MSK_RX_RING_CNT);
}
bus_dmamap_sync(sc_if->msk_cdata.msk_rx_ring_tag,
@@ -731,10 +744,11 @@ msk_init_rx_ring(struct msk_if_softc *sc
BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
/* Update prefetch unit. */
- sc_if->msk_cdata.msk_rx_prod = MSK_RX_RING_CNT - 1;
+ sc_if->msk_cdata.msk_rx_prod = prod;
CSR_WRITE_2(sc_if->msk_softc,
Y2_PREF_Q_ADDR(sc_if->msk_rxq, PREF_UNIT_PUT_
svn commit: r229525 - stable/8/sys/dev/msk
Author: yongari
Date: Wed Jan 4 21:52:56 2012
New Revision: 229525
URL: http://svn.freebsd.org/changeset/base/229525
Log:
MFC r227582:
Enable 64bit DMA addressing support for all msk(4) controllers.
Unnecessarily complex LE format used on Marvell controller was
main reason not to enable 64bit DMA addressing in driver. If high
32bit address of DMA address of TX/RX buffer is changed, driver has
to generate a new LE. In TX path, driver will keep track of lastly
used high 32bit address of DMA address and generate a new LE
whenever it sees high address change in the DMA address. In RX path,
driver will always use two LEs to specify 64bit DMA address of RX
buffer. If the high 32bit address of DMA address of RX buffer is
the same as previous DMA address of RX buffer, driver does not have
to use two LEs but driver will use two LEs for simplicity in RX
ring management.
One of draw back for switching to 64bit DMA addressing is that the
large amount of LEs are used to specify 64bit DMA address such that
number of available LEs for TX/RX buffers are considerably reduced.
To mitigate the issue, increase number of available LEs from 256 to
384 for TX and from 256 to 512 for RX. For 32bit architectures,
msk(4) does not use 64bit DMA addressing to save resources.
Modified:
stable/8/sys/dev/msk/if_msk.c
stable/8/sys/dev/msk/if_mskreg.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/dev/msk/if_msk.c
==
--- stable/8/sys/dev/msk/if_msk.c Wed Jan 4 21:50:59 2012
(r229524)
+++ stable/8/sys/dev/msk/if_msk.c Wed Jan 4 21:52:56 2012
(r229525)
@@ -700,7 +700,7 @@ msk_init_rx_ring(struct msk_if_softc *sc
{
struct msk_ring_data *rd;
struct msk_rxdesc *rxd;
- int i, prod;
+ int i, nbuf, prod;
MSK_IF_LOCK_ASSERT(sc_if);
@@ -710,11 +710,18 @@ msk_init_rx_ring(struct msk_if_softc *sc
rd = &sc_if->msk_rdata;
bzero(rd->msk_rx_ring, sizeof(struct msk_rx_desc) * MSK_RX_RING_CNT);
- prod = sc_if->msk_cdata.msk_rx_prod;
- i = 0;
+ for (i = prod = 0; i < MSK_RX_RING_CNT; i++) {
+ rxd = &sc_if->msk_cdata.msk_rxdesc[prod];
+ rxd->rx_m = NULL;
+ rxd->rx_le = &rd->msk_rx_ring[prod];
+ MSK_INC(prod, MSK_RX_RING_CNT);
+ }
+ nbuf = MSK_RX_BUF_CNT;
+ prod = 0;
/* Have controller know how to compute Rx checksum. */
if ((sc_if->msk_flags & MSK_FLAG_DESCV2) == 0 &&
(sc_if->msk_ifp->if_capenable & IFCAP_RXCSUM) != 0) {
+#ifdef MSK_64BIT_DMA
rxd = &sc_if->msk_cdata.msk_rxdesc[prod];
rxd->rx_m = NULL;
rxd->rx_le = &rd->msk_rx_ring[prod];
@@ -723,15 +730,21 @@ msk_init_rx_ring(struct msk_if_softc *sc
rxd->rx_le->msk_control = htole32(OP_TCPSTART | HW_OWNER);
MSK_INC(prod, MSK_RX_RING_CNT);
MSK_INC(sc_if->msk_cdata.msk_rx_cons, MSK_RX_RING_CNT);
- i++;
- }
- for (; i < MSK_RX_RING_CNT; i++) {
+#endif
rxd = &sc_if->msk_cdata.msk_rxdesc[prod];
rxd->rx_m = NULL;
rxd->rx_le = &rd->msk_rx_ring[prod];
+ rxd->rx_le->msk_addr = htole32(ETHER_HDR_LEN << 16 |
+ ETHER_HDR_LEN);
+ rxd->rx_le->msk_control = htole32(OP_TCPSTART | HW_OWNER);
+ MSK_INC(prod, MSK_RX_RING_CNT);
+ MSK_INC(sc_if->msk_cdata.msk_rx_cons, MSK_RX_RING_CNT);
+ nbuf--;
+ }
+ for (i = 0; i < nbuf; i++) {
if (msk_newbuf(sc_if, prod) != 0)
return (ENOBUFS);
- MSK_INC(prod, MSK_RX_RING_CNT);
+ MSK_RX_INC(prod, MSK_RX_RING_CNT);
}
bus_dmamap_sync(sc_if->msk_cdata.msk_rx_ring_tag,
@@ -739,10 +752,11 @@ msk_init_rx_ring(struct msk_if_softc *sc
BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
/* Update prefetch unit. */
- sc_if->msk_cdata.msk_rx_prod = MSK_RX_RING_CNT - 1;
+ sc_if->msk_cdata.msk_rx_prod = prod;
CSR_WRITE_2(sc_if->msk_softc,
Y2_PREF_Q_ADDR(sc_if->msk_rxq, PREF_UNIT_PUT_IDX_REG),
- sc_if->msk_cdata.msk_rx_prod);
+ (sc_if->msk_cdata.msk_rx_prod + MSK_RX_RING_CNT - 1) %
+ MSK_RX_RING_CNT);
if (msk_rx_fill(sc_if, 0) != 0)
return (ENOBUFS);
return (0);
@@ -753,7 +767,7 @@ msk_init_jumbo_rx_ring(struct msk_if_sof
{
struct msk_ring_data *rd;
struct msk_rxdesc *rxd;
- int i, prod;
+ int i, nbuf, prod;
M
svn commit: r229526 - stable/7/sys/dev/msk
Author: yongari
Date: Wed Jan 4 21:54:20 2012
New Revision: 229526
URL: http://svn.freebsd.org/changeset/base/229526
Log:
MFC r227582:
Enable 64bit DMA addressing support for all msk(4) controllers.
Unnecessarily complex LE format used on Marvell controller was
main reason not to enable 64bit DMA addressing in driver. If high
32bit address of DMA address of TX/RX buffer is changed, driver has
to generate a new LE. In TX path, driver will keep track of lastly
used high 32bit address of DMA address and generate a new LE
whenever it sees high address change in the DMA address. In RX path,
driver will always use two LEs to specify 64bit DMA address of RX
buffer. If the high 32bit address of DMA address of RX buffer is
the same as previous DMA address of RX buffer, driver does not have
to use two LEs but driver will use two LEs for simplicity in RX
ring management.
One of draw back for switching to 64bit DMA addressing is that the
large amount of LEs are used to specify 64bit DMA address such that
number of available LEs for TX/RX buffers are considerably reduced.
To mitigate the issue, increase number of available LEs from 256 to
384 for TX and from 256 to 512 for RX. For 32bit architectures,
msk(4) does not use 64bit DMA addressing to save resources.
Modified:
stable/7/sys/dev/msk/if_msk.c
stable/7/sys/dev/msk/if_mskreg.h
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/dev/msk/if_msk.c
==
--- stable/7/sys/dev/msk/if_msk.c Wed Jan 4 21:52:56 2012
(r229525)
+++ stable/7/sys/dev/msk/if_msk.c Wed Jan 4 21:54:20 2012
(r229526)
@@ -700,7 +700,7 @@ msk_init_rx_ring(struct msk_if_softc *sc
{
struct msk_ring_data *rd;
struct msk_rxdesc *rxd;
- int i, prod;
+ int i, nbuf, prod;
MSK_IF_LOCK_ASSERT(sc_if);
@@ -710,11 +710,18 @@ msk_init_rx_ring(struct msk_if_softc *sc
rd = &sc_if->msk_rdata;
bzero(rd->msk_rx_ring, sizeof(struct msk_rx_desc) * MSK_RX_RING_CNT);
- prod = sc_if->msk_cdata.msk_rx_prod;
- i = 0;
+ for (i = prod = 0; i < MSK_RX_RING_CNT; i++) {
+ rxd = &sc_if->msk_cdata.msk_rxdesc[prod];
+ rxd->rx_m = NULL;
+ rxd->rx_le = &rd->msk_rx_ring[prod];
+ MSK_INC(prod, MSK_RX_RING_CNT);
+ }
+ nbuf = MSK_RX_BUF_CNT;
+ prod = 0;
/* Have controller know how to compute Rx checksum. */
if ((sc_if->msk_flags & MSK_FLAG_DESCV2) == 0 &&
(sc_if->msk_ifp->if_capenable & IFCAP_RXCSUM) != 0) {
+#ifdef MSK_64BIT_DMA
rxd = &sc_if->msk_cdata.msk_rxdesc[prod];
rxd->rx_m = NULL;
rxd->rx_le = &rd->msk_rx_ring[prod];
@@ -723,15 +730,21 @@ msk_init_rx_ring(struct msk_if_softc *sc
rxd->rx_le->msk_control = htole32(OP_TCPSTART | HW_OWNER);
MSK_INC(prod, MSK_RX_RING_CNT);
MSK_INC(sc_if->msk_cdata.msk_rx_cons, MSK_RX_RING_CNT);
- i++;
- }
- for (; i < MSK_RX_RING_CNT; i++) {
+#endif
rxd = &sc_if->msk_cdata.msk_rxdesc[prod];
rxd->rx_m = NULL;
rxd->rx_le = &rd->msk_rx_ring[prod];
+ rxd->rx_le->msk_addr = htole32(ETHER_HDR_LEN << 16 |
+ ETHER_HDR_LEN);
+ rxd->rx_le->msk_control = htole32(OP_TCPSTART | HW_OWNER);
+ MSK_INC(prod, MSK_RX_RING_CNT);
+ MSK_INC(sc_if->msk_cdata.msk_rx_cons, MSK_RX_RING_CNT);
+ nbuf--;
+ }
+ for (i = 0; i < nbuf; i++) {
if (msk_newbuf(sc_if, prod) != 0)
return (ENOBUFS);
- MSK_INC(prod, MSK_RX_RING_CNT);
+ MSK_RX_INC(prod, MSK_RX_RING_CNT);
}
bus_dmamap_sync(sc_if->msk_cdata.msk_rx_ring_tag,
@@ -739,10 +752,11 @@ msk_init_rx_ring(struct msk_if_softc *sc
BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
/* Update prefetch unit. */
- sc_if->msk_cdata.msk_rx_prod = MSK_RX_RING_CNT - 1;
+ sc_if->msk_cdata.msk_rx_prod = prod;
CSR_WRITE_2(sc_if->msk_softc,
Y2_PREF_Q_ADDR(sc_if->msk_rxq, PREF_UNIT_PUT_IDX_REG),
- sc_if->msk_cdata.msk_rx_prod);
+ (sc_if->msk_cdata.msk_rx_prod + MSK_RX_RING_CNT - 1) %
+ MSK_RX_RING_CNT);
if (msk_rx_fill(sc_if, 0) != 0)
return (ENOBUFS);
return (0);
@@ -753,7 +767,7 @@ msk_init_jumbo_rx_ring(struct msk_if_sof
{
struct msk_ring_data *rd;
struct msk_rxdesc *rxd;
- int i, prod;
+ int i, nbuf, prod;
MSK_IF_LOCK_ASSERT(sc_if);
@@ -764,11 +778,18 @@ ms
svn commit: r229527 - stable/9/sbin/dumpfs
Author: brueffer
Date: Wed Jan 4 21:56:47 2012
New Revision: 229527
URL: http://svn.freebsd.org/changeset/base/229527
Log:
MFC: r228898
Add missing -l flag to usage().
Modified:
stable/9/sbin/dumpfs/dumpfs.c
Directory Properties:
stable/9/sbin/dumpfs/ (props changed)
Modified: stable/9/sbin/dumpfs/dumpfs.c
==
--- stable/9/sbin/dumpfs/dumpfs.c Wed Jan 4 21:54:20 2012
(r229526)
+++ stable/9/sbin/dumpfs/dumpfs.c Wed Jan 4 21:56:47 2012
(r229527)
@@ -499,6 +499,6 @@ ufserr(const char *name)
void
usage(void)
{
- (void)fprintf(stderr, "usage: dumpfs [-fm] filesys | device\n");
+ (void)fprintf(stderr, "usage: dumpfs [-flm] filesys | device\n");
exit(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: r229528 - stable/8/sbin/dumpfs
Author: brueffer
Date: Wed Jan 4 21:57:11 2012
New Revision: 229528
URL: http://svn.freebsd.org/changeset/base/229528
Log:
MFC: r228898
Add missing -l flag to usage().
Modified:
stable/8/sbin/dumpfs/dumpfs.c
Directory Properties:
stable/8/sbin/dumpfs/ (props changed)
Modified: stable/8/sbin/dumpfs/dumpfs.c
==
--- stable/8/sbin/dumpfs/dumpfs.c Wed Jan 4 21:56:47 2012
(r229527)
+++ stable/8/sbin/dumpfs/dumpfs.c Wed Jan 4 21:57:11 2012
(r229528)
@@ -495,6 +495,6 @@ ufserr(const char *name)
void
usage(void)
{
- (void)fprintf(stderr, "usage: dumpfs [-fm] filesys | device\n");
+ (void)fprintf(stderr, "usage: dumpfs [-flm] filesys | device\n");
exit(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: r229529 - in stable/9/sys: dev/re pci
Author: yongari
Date: Wed Jan 4 22:53:18 2012
New Revision: 229529
URL: http://svn.freebsd.org/changeset/base/229529
Log:
MFC r227587,227590-227591,227593,227638-227639:
r227587:
Add preliminary support for RTL8402 PCIe FastEthernet with
integrated card reader.
r227590:
Add preliminary support for RTL8411 PCIe Gigabit ethernet with
integrated card reader.
r227591:
Add missing driver lock in SIOCSIFCAP handler.
r227593:
Disable PCIe ASPM (Active State Power Management) for all
controllers.
More and more RealTek controllers started to implement EEE feature.
Vendor driver seems to load a kind of firmware for EEE with
additional PHY fixups. It is known that the EEE feature may need
ASPM support. Unfortunately there is no documentation for EEE of
the controller so enabling ASPM may cause more problems.
r227638:
Add preliminary support for second generation RTL8105E PCIe
FastEthernet.
r227639:
Add preliminary support for RTL8168/8111F PCIe Gigabit ethernet.
Modified:
stable/9/sys/dev/re/if_re.c
stable/9/sys/pci/if_rlreg.h
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
Modified: stable/9/sys/dev/re/if_re.c
==
--- stable/9/sys/dev/re/if_re.c Wed Jan 4 21:57:11 2012(r229528)
+++ stable/9/sys/dev/re/if_re.c Wed Jan 4 22:53:18 2012(r229529)
@@ -181,7 +181,7 @@ static struct rl_type re_devs[] = {
{ RT_VENDORID, RT_DEVICEID_8101E, 0,
"RealTek 810xE PCIe 10/100baseTX" },
{ RT_VENDORID, RT_DEVICEID_8168, 0,
- "RealTek 8168/8111 B/C/CP/D/DP/E PCIe Gigabit Ethernet" },
+ "RealTek 8168/8111 B/C/CP/D/DP/E/F PCIe Gigabit Ethernet" },
{ RT_VENDORID, RT_DEVICEID_8169, 0,
"RealTek 8169/8169S/8169SB(L)/8110S/8110SB(L) Gigabit Ethernet" },
{ RT_VENDORID, RT_DEVICEID_8169SC, 0,
@@ -220,7 +220,9 @@ static struct rl_hwrev re_hwrevs[] = {
{ RL_HWREV_8102EL_SPIN1, RL_8169, "8102EL", RL_MTU },
{ RL_HWREV_8103E, RL_8169, "8103E", RL_MTU },
{ RL_HWREV_8401E, RL_8169, "8401E", RL_MTU },
+ { RL_HWREV_8402, RL_8169, "8402", RL_MTU },
{ RL_HWREV_8105E, RL_8169, "8105E", RL_MTU },
+ { RL_HWREV_8105E_SPIN1, RL_8169, "8105E", RL_MTU },
{ RL_HWREV_8168B_SPIN2, RL_8169, "8168", RL_JUMBO_MTU },
{ RL_HWREV_8168B_SPIN3, RL_8169, "8168", RL_JUMBO_MTU },
{ RL_HWREV_8168C, RL_8169, "8168C/8111C", RL_JUMBO_MTU_6K },
@@ -230,6 +232,8 @@ static struct rl_hwrev re_hwrevs[] = {
{ RL_HWREV_8168DP, RL_8169, "8168DP/8111DP", RL_JUMBO_MTU_9K },
{ RL_HWREV_8168E, RL_8169, "8168E/8111E", RL_JUMBO_MTU_9K},
{ RL_HWREV_8168E_VL, RL_8169, "8168E/8111E-VL", RL_JUMBO_MTU_6K},
+ { RL_HWREV_8168F, RL_8169, "8168F/8111F", RL_JUMBO_MTU_9K},
+ { RL_HWREV_8411, RL_8169, "8411", RL_JUMBO_MTU_9K},
{ 0, 0, NULL, 0 }
};
@@ -1180,6 +1184,7 @@ re_attach(device_t dev)
struct rl_softc *sc;
struct ifnet*ifp;
struct rl_hwrev *hw_rev;
+ u_int32_t cap, ctl;
int hwrev;
u_int16_t devid, re_did = 0;
int error = 0, i, phy, rid;
@@ -1235,8 +1240,10 @@ re_attach(device_t dev)
msic = pci_msi_count(dev);
msixc = pci_msix_count(dev);
- if (pci_find_cap(dev, PCIY_EXPRESS, ®) == 0)
+ if (pci_find_cap(dev, PCIY_EXPRESS, ®) == 0) {
sc->rl_flags |= RL_FLAG_PCIE;
+ sc->rl_expcap = reg;
+ }
if (bootverbose) {
device_printf(dev, "MSI count : %d\n", msic);
device_printf(dev, "MSI-X count : %d\n", msixc);
@@ -1328,6 +1335,23 @@ re_attach(device_t dev)
CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_OFF);
}
+ /* Disable ASPM L0S/L1. */
+ if (sc->rl_expcap != 0) {
+ cap = pci_read_config(dev, sc->rl_expcap +
+ PCIR_EXPRESS_LINK_CAP, 2);
+ if ((cap & PCIM_LINK_CAP_ASPM) != 0) {
+ ctl = pci_read_config(dev, sc->rl_expcap +
+ PCIR_EXPRESS_LINK_CTL, 2);
+ if ((ctl & 0x0003) != 0) {
+
svn commit: r229530 - in stable/8/sys: dev/re pci
Author: yongari
Date: Wed Jan 4 22:55:15 2012
New Revision: 229530
URL: http://svn.freebsd.org/changeset/base/229530
Log:
MFC r227587,227590-227591,227593,227638-227639:
r227587:
Add preliminary support for RTL8402 PCIe FastEthernet with
integrated card reader.
r227590:
Add preliminary support for RTL8411 PCIe Gigabit ethernet with
integrated card reader.
r227591:
Add missing driver lock in SIOCSIFCAP handler.
r227593:
Disable PCIe ASPM (Active State Power Management) for all
controllers.
More and more RealTek controllers started to implement EEE feature.
Vendor driver seems to load a kind of firmware for EEE with
additional PHY fixups. It is known that the EEE feature may need
ASPM support. Unfortunately there is no documentation for EEE of
the controller so enabling ASPM may cause more problems.
r227638:
Add preliminary support for second generation RTL8105E PCIe
FastEthernet.
r227639:
Add preliminary support for RTL8168/8111F PCIe Gigabit ethernet.
Modified:
stable/8/sys/dev/re/if_re.c
stable/8/sys/pci/if_rlreg.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/dev/re/if_re.c
==
--- stable/8/sys/dev/re/if_re.c Wed Jan 4 22:53:18 2012(r229529)
+++ stable/8/sys/dev/re/if_re.c Wed Jan 4 22:55:15 2012(r229530)
@@ -181,7 +181,7 @@ static struct rl_type re_devs[] = {
{ RT_VENDORID, RT_DEVICEID_8101E, 0,
"RealTek 810xE PCIe 10/100baseTX" },
{ RT_VENDORID, RT_DEVICEID_8168, 0,
- "RealTek 8168/8111 B/C/CP/D/DP/E PCIe Gigabit Ethernet" },
+ "RealTek 8168/8111 B/C/CP/D/DP/E/F PCIe Gigabit Ethernet" },
{ RT_VENDORID, RT_DEVICEID_8169, 0,
"RealTek 8169/8169S/8169SB(L)/8110S/8110SB(L) Gigabit Ethernet" },
{ RT_VENDORID, RT_DEVICEID_8169SC, 0,
@@ -220,7 +220,9 @@ static struct rl_hwrev re_hwrevs[] = {
{ RL_HWREV_8102EL_SPIN1, RL_8169, "8102EL", RL_MTU },
{ RL_HWREV_8103E, RL_8169, "8103E", RL_MTU },
{ RL_HWREV_8401E, RL_8169, "8401E", RL_MTU },
+ { RL_HWREV_8402, RL_8169, "8402", RL_MTU },
{ RL_HWREV_8105E, RL_8169, "8105E", RL_MTU },
+ { RL_HWREV_8105E_SPIN1, RL_8169, "8105E", RL_MTU },
{ RL_HWREV_8168B_SPIN2, RL_8169, "8168", RL_JUMBO_MTU },
{ RL_HWREV_8168B_SPIN3, RL_8169, "8168", RL_JUMBO_MTU },
{ RL_HWREV_8168C, RL_8169, "8168C/8111C", RL_JUMBO_MTU_6K },
@@ -230,6 +232,8 @@ static struct rl_hwrev re_hwrevs[] = {
{ RL_HWREV_8168DP, RL_8169, "8168DP/8111DP", RL_JUMBO_MTU_9K },
{ RL_HWREV_8168E, RL_8169, "8168E/8111E", RL_JUMBO_MTU_9K},
{ RL_HWREV_8168E_VL, RL_8169, "8168E/8111E-VL", RL_JUMBO_MTU_6K},
+ { RL_HWREV_8168F, RL_8169, "8168F/8111F", RL_JUMBO_MTU_9K},
+ { RL_HWREV_8411, RL_8169, "8411", RL_JUMBO_MTU_9K},
{ 0, 0, NULL, 0 }
};
@@ -1184,6 +1188,7 @@ re_attach(device_t dev)
struct rl_softc *sc;
struct ifnet*ifp;
struct rl_hwrev *hw_rev;
+ u_int32_t cap, ctl;
int hwrev;
u_int16_t devid, re_did = 0;
int error = 0, i, phy, rid;
@@ -1239,8 +1244,10 @@ re_attach(device_t dev)
msic = pci_msi_count(dev);
msixc = pci_msix_count(dev);
- if (pci_find_extcap(dev, PCIY_EXPRESS, ®) == 0)
+ if (pci_find_extcap(dev, PCIY_EXPRESS, ®) == 0) {
sc->rl_flags |= RL_FLAG_PCIE;
+ sc->rl_expcap = reg;
+ }
if (bootverbose) {
device_printf(dev, "MSI count : %d\n", msic);
device_printf(dev, "MSI-X count : %d\n", msixc);
@@ -1332,6 +1339,23 @@ re_attach(device_t dev)
CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_OFF);
}
+ /* Disable ASPM L0S/L1. */
+ if (sc->rl_expcap != 0) {
+ cap = pci_read_config(dev, sc->rl_expcap +
+ PCIR_EXPRESS_LINK_CAP, 2);
+ if ((cap & PCIM_LINK_CAP_ASPM) != 0) {
+ ctl = pci_read_config(dev, sc->rl_expcap +
+ PCIR_EXPRESS_LINK_CTL, 2);
+ if ((ctl & 0x0003) != 0) {
+ ctl &= ~0x0003;
+ pci_write_config(dev, sc->rl_expcap +
+ PCIR_EXPRESS_LINK_CTL, ctl, 2);
+ device_printf(dev, "ASPM disabled\n");
+ }
+ } else
+ device_printf(dev, "no ASPM capability\n");
+ }
+
hw_rev = re_hwrevs;
hwrev = CSR_READ_4(sc, RL_TXCF
svn commit: r229531 - in stable/7/sys: dev/re pci
Author: yongari
Date: Wed Jan 4 22:57:04 2012
New Revision: 229531
URL: http://svn.freebsd.org/changeset/base/229531
Log:
MFC r227587,227590-227591,227593,227638-227639:
r227587:
Add preliminary support for RTL8402 PCIe FastEthernet with
integrated card reader.
r227590:
Add preliminary support for RTL8411 PCIe Gigabit ethernet with
integrated card reader.
r227591:
Add missing driver lock in SIOCSIFCAP handler.
r227593:
Disable PCIe ASPM (Active State Power Management) for all
controllers.
More and more RealTek controllers started to implement EEE feature.
Vendor driver seems to load a kind of firmware for EEE with
additional PHY fixups. It is known that the EEE feature may need
ASPM support. Unfortunately there is no documentation for EEE of
the controller so enabling ASPM may cause more problems.
r227638:
Add preliminary support for second generation RTL8105E PCIe
FastEthernet.
r227639:
Add preliminary support for RTL8168/8111F PCIe Gigabit ethernet.
Modified:
stable/7/sys/dev/re/if_re.c
stable/7/sys/pci/if_rlreg.h
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/dev/re/if_re.c
==
--- stable/7/sys/dev/re/if_re.c Wed Jan 4 22:55:15 2012(r229530)
+++ stable/7/sys/dev/re/if_re.c Wed Jan 4 22:57:04 2012(r229531)
@@ -181,7 +181,7 @@ static struct rl_type re_devs[] = {
{ RT_VENDORID, RT_DEVICEID_8101E, 0,
"RealTek 810xE PCIe 10/100baseTX" },
{ RT_VENDORID, RT_DEVICEID_8168, 0,
- "RealTek 8168/8111 B/C/CP/D/DP/E PCIe Gigabit Ethernet" },
+ "RealTek 8168/8111 B/C/CP/D/DP/E/F PCIe Gigabit Ethernet" },
{ RT_VENDORID, RT_DEVICEID_8169, 0,
"RealTek 8169/8169S/8169SB(L)/8110S/8110SB(L) Gigabit Ethernet" },
{ RT_VENDORID, RT_DEVICEID_8169SC, 0,
@@ -220,7 +220,9 @@ static struct rl_hwrev re_hwrevs[] = {
{ RL_HWREV_8102EL_SPIN1, RL_8169, "8102EL", RL_MTU },
{ RL_HWREV_8103E, RL_8169, "8103E", RL_MTU },
{ RL_HWREV_8401E, RL_8169, "8401E", RL_MTU },
+ { RL_HWREV_8402, RL_8169, "8402", RL_MTU },
{ RL_HWREV_8105E, RL_8169, "8105E", RL_MTU },
+ { RL_HWREV_8105E_SPIN1, RL_8169, "8105E", RL_MTU },
{ RL_HWREV_8168B_SPIN2, RL_8169, "8168", RL_JUMBO_MTU },
{ RL_HWREV_8168B_SPIN3, RL_8169, "8168", RL_JUMBO_MTU },
{ RL_HWREV_8168C, RL_8169, "8168C/8111C", RL_JUMBO_MTU_6K },
@@ -230,6 +232,8 @@ static struct rl_hwrev re_hwrevs[] = {
{ RL_HWREV_8168DP, RL_8169, "8168DP/8111DP", RL_JUMBO_MTU_9K },
{ RL_HWREV_8168E, RL_8169, "8168E/8111E", RL_JUMBO_MTU_9K},
{ RL_HWREV_8168E_VL, RL_8169, "8168E/8111E-VL", RL_JUMBO_MTU_6K},
+ { RL_HWREV_8168F, RL_8169, "8168F/8111F", RL_JUMBO_MTU_9K},
+ { RL_HWREV_8411, RL_8169, "8411", RL_JUMBO_MTU_9K},
{ 0, 0, NULL, 0 }
};
@@ -1185,6 +1189,7 @@ re_attach(device_t dev)
struct rl_softc *sc;
struct ifnet*ifp;
struct rl_hwrev *hw_rev;
+ u_int32_t cap, ctl;
int hwrev;
u_int16_t devid, re_did = 0;
int error = 0, i, phy, rid;
@@ -1240,8 +1245,10 @@ re_attach(device_t dev)
msic = pci_msi_count(dev);
msixc = pci_msix_count(dev);
- if (pci_find_extcap(dev, PCIY_EXPRESS, ®) == 0)
+ if (pci_find_extcap(dev, PCIY_EXPRESS, ®) == 0) {
sc->rl_flags |= RL_FLAG_PCIE;
+ sc->rl_expcap = reg;
+ }
if (bootverbose) {
device_printf(dev, "MSI count : %d\n", msic);
device_printf(dev, "MSI-X count : %d\n", msixc);
@@ -1333,6 +1340,23 @@ re_attach(device_t dev)
CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_OFF);
}
+ /* Disable ASPM L0S/L1. */
+ if (sc->rl_expcap != 0) {
+ cap = pci_read_config(dev, sc->rl_expcap +
+ PCIR_EXPRESS_LINK_CAP, 2);
+ if ((cap & PCIM_LINK_CAP_ASPM) != 0) {
+ ctl = pci_read_config(dev, sc->rl_expcap +
+ PCIR_EXPRESS_LINK_CTL, 2);
+ if ((ctl & 0x0003) != 0) {
+ ctl &= ~0x0003;
+ pci_write_config(dev, sc->rl_expcap +
+ PCIR_EXPRESS_LINK_CTL, ctl, 2);
+ device_printf(dev, "ASPM disabled\n");
+ }
+ } else
+ device_printf(dev, "no ASPM capability\n");
+ }
+
hw_rev = re_hwrevs;
hwrev = CSR_READ_4(sc, RL_TXCFG);
switch (hwrev & 0x7000) {
@@ -1382,7
svn commit: r229532 - head/release/picobsd/build
Author: luigi
Date: Wed Jan 4 23:00:25 2012
New Revision: 229532
URL: http://svn.freebsd.org/changeset/base/229532
Log:
now picobsd cross builds work (tried with host amd64, target i386 ).
The fix involved adding a proper build of ld-elf.so.1 ,
and also replacing ldd with objdump (suggested by Garrett Cooper)
to build the list of shared libraries needed by the binaries
and libraries on the target.
Modified:
head/release/picobsd/build/picobsd
Modified: head/release/picobsd/build/picobsd
==
--- head/release/picobsd/build/picobsd Wed Jan 4 22:57:04 2012
(r229531)
+++ head/release/picobsd/build/picobsd Wed Jan 4 23:00:25 2012
(r229532)
@@ -161,19 +161,19 @@ set_defaults() { # no arguments
# and also to build a specific target
create_includes_and_libraries2() { # opt_dir opt_target
local no
-log "create_includes_and_libraries2() for ${SRC}"
+log "create_includes_and_libraries2() for ${SRC} $1"
if [ ${OSVERSION} -ge 60 ] ; then
no="-DNO_CLEAN -DNO_PROFILE -DNO_GAMES -DNO_LIBC_R" # WITHOUT_CDDL=1"
else
no="-DNOCLEAN -DNOPROFILE -DNOGAMES -DNOLIBC_R"
fi
-MAKEOBJDIRPREFIX=${l_objtree}
-export MAKEOBJDIRPREFIX
( cd ${SRC};
# make -DNOCLEAN -DNOPROFILE -DNOGAMES -DNOLIBC_R -DPICOBSD buildworld
if [ -d "$1" ] ; then
cd $1 ; ${BINMAKE} ${o_par} $2 # specific target, e.g. ld-elf.so
else
+ MAKEOBJDIRPREFIX=${l_objtree}
+ export MAKEOBJDIRPREFIX
# export WITH_RESCUE=yes# build crunchide
# ${BINMAKE} ${o_par} _+_= $no toolchain _includes _libraries
(
@@ -551,7 +551,7 @@ do_links() {# rootdir varname
# find_progs is a helper function to locate the named programs
# or libraries in ${o_objdir} or ${_SHLIBDIRPREFIX},
# and return the full pathnames.
-# Called as "find_progs [-L libpath] [-P binpath] prog1 prog2 ... "
+# Called as "find_progs [[-L libpath] [-P binpath]] prog1 prog2 ... "
# On return it sets ${u_progs} to the list of programs, and ${u_libs}
# to the list of shared libraries used.
#
@@ -574,24 +574,32 @@ do_links() { # rootdir varname
# }
find_progs() { # programs
- local i
- local oo=${o_objdir:-${_SHLIBDIRPREFIX}} # default objdir
- local lp=$oo/lib# default lib.prefix
- local o="" # additional objdir
+ local pass i old_libs="" tmp o=""
if [ x"$1" = "x-L" -a -d "$2" ] ; then # set lib search path
- o=$2; shift; shift
- lp="$lp:$o/lib:$o/usr/lib:$o/usr/local/lib"
- o="-P $o"
+ o="-P $2"; shift; shift
fi
- u_libs=""
- u_progs="`find_progs_helper $*`"
- log "looking for libs for <$u_progs> in $lp"
+ # Result returned in global variables
+ u_libs="" ; u_progs="`find_progs_helper $*`"
[ -z "${u_progs}" ] && return 1 # not found, error
- i="`( LD_LIBRARY_PATH=$lp ldd ${u_progs} ) | \
- grep -v '^/' | awk '{print $1}' | sort | uniq`"
- u_libs="`find_progs_helper $o $i`"
- log "--- done find_progs ---"
- return 0
+ # use objdump to find libraries. Iterate to fetch recursive
+ # dependencies.
+ tmp="${u_progs}" ; pass=1
+ while [ $pass -lt 10 ] ; do
+ pass=$(($pass + 1))
+ i="`objdump -x ${tmp} | \
+ awk '$1 == "NEEDED" { print $2 }' | sort | uniq`"
+ if [ "$old_libs" = "$i" ] ; then
+ log "libraries for: $my_progs ($u_progs) are ($i)
$u_libs"
+ log "--- done find_progs ---"
+ return 0
+ else
+ # logverbose "old--- $old_libs --- new +++ $i +++"
+ fi
+ u_libs="`find_progs_helper $o $i`"
+ old_libs="$i"
+ tmp="$tmp $u_libs"
+ done
+ log "WARNING: Too many passes, giving up"
}
find_progs_helper() { # programs
___
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: r229533 - in head/sys: conf contrib/xz-embedded/freebsd contrib/xz-embedded/linux/include/linux contrib/xz-embedded/linux/lib/xz
Author: ray
Date: Wed Jan 4 23:26:22 2012
New Revision: 229533
URL: http://svn.freebsd.org/changeset/base/229533
Log:
Update contrib/xz-embedded to build with new GEOM_UNCOMPRESS module.
Approved by: adrian (mentor)
Added:
head/sys/contrib/xz-embedded/freebsd/
head/sys/contrib/xz-embedded/freebsd/xz_config.h (contents, props changed)
head/sys/contrib/xz-embedded/freebsd/xz_malloc.c (contents, props changed)
head/sys/contrib/xz-embedded/freebsd/xz_malloc.h (contents, props changed)
Modified:
head/sys/conf/files
head/sys/contrib/xz-embedded/linux/include/linux/xz.h
head/sys/contrib/xz-embedded/linux/lib/xz/xz_private.h
Modified: head/sys/conf/files
==
--- head/sys/conf/files Wed Jan 4 23:00:25 2012(r229532)
+++ head/sys/conf/files Wed Jan 4 23:26:22 2012(r229533)
@@ -2266,6 +2266,21 @@ geom/raid3/g_raid3.c optional geom_raid
geom/raid3/g_raid3_ctl.c optional geom_raid3
geom/shsec/g_shsec.c optional geom_shsec
geom/stripe/g_stripe.c optional geom_stripe
+contrib/xz-embedded/freebsd/xz_malloc.c\
+ optional xz_embedded \
+ compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/
-I$S/contrib/xz-embedded/linux/lib/xz/
-I$S/contrib/xz-embedded/linux/include/linux/"
+contrib/xz-embedded/linux/lib/xz/xz_crc32.c \
+ optional xz_embedded \
+ compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/
-I$S/contrib/xz-embedded/linux/lib/xz/
-I$S/contrib/xz-embedded/linux/include/linux/"
+contrib/xz-embedded/linux/lib/xz/xz_dec_bcj.c \
+ optional xz_embedded \
+ compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/
-I$S/contrib/xz-embedded/linux/lib/xz/
-I$S/contrib/xz-embedded/linux/include/linux/"
+contrib/xz-embedded/linux/lib/xz/xz_dec_lzma2.c \
+ optional xz_embedded \
+ compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/
-I$S/contrib/xz-embedded/linux/lib/xz/
-I$S/contrib/xz-embedded/linux/include/linux/"
+contrib/xz-embedded/linux/lib/xz/xz_dec_stream.c \
+ optional xz_embedded \
+ compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/
-I$S/contrib/xz-embedded/linux/lib/xz/
-I$S/contrib/xz-embedded/linux/include/linux/"
geom/uzip/g_uzip.c optional geom_uzip
geom/virstor/binstream.c optional geom_virstor
geom/virstor/g_virstor.c optional geom_virstor
Added: head/sys/contrib/xz-embedded/freebsd/xz_config.h
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/contrib/xz-embedded/freebsd/xz_config.hWed Jan 4 23:26:22
2012(r229533)
@@ -0,0 +1,73 @@
+/*-
+ * Copyright (c) 2010-2012 Aleksandr Rybalko
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef __FREEBSD_XZ_CONFIG_H__
+#define __FREEBSD_XZ_CONFIG_H__
+
+#include
+#include
+#include
+#include
+
+#include
+#include "xz_malloc.h"
+
+#defineXZ_DEC_SINGLE 1
+#defineXZ_PREBOOT 1
+
+#undef XZ_EXTERN
+#defineXZ_EXTERN extern
+
+#undef STATIC
+#defineSTATIC
+
+#undef INIT
+#defineINIT
+
+#undef bool
+#undef true
+#undef false
+#defineboolint
+#definetrue1
+#definefalse 0
+
+#definekmalloc(size, flags)xz_malloc(size)
+#definekfree(ptr) xz_free(ptr)
+#definevmalloc(size) xz_malloc(size)
+#definevfree(ptr) xz_free(ptr)
+
+#definememeq(a, b, size) (memcmp((a), (b), (size)) == 0)
+#definememzero(buf, size) bzer
svn commit: r229534 - in stable/9/sys: dev/re pci
Author: yongari Date: Wed Jan 4 23:29:57 2012 New Revision: 229534 URL: http://svn.freebsd.org/changeset/base/229534 Log: MFC r227850-227851,227854,227914,227916: r227850: Writing access to RL_CFG5 register also requires EEPROM write access. While I'm here, enable WOL through magic packet but disable waking up system via unicast, multicast and broadcast frames. Otherwise, multicast or unicast frame(e.g. ICMP echo request) can wake up system which is not probably wanted behavior on most environments. This was not known as problem because RL_CFG5 register access had not effect until this change. The capability to wake up system with unicast/multicast frames are still set in driver, default off, so users who need that feature can still activate it with ifconfig(8). r227851: Perform media change after setting IFF_DRV_RUNNING flag. Without it, driver would ignore the first link state update if controller already established a link such that it would have to take additional link state handling in re_tick(). r227854: Disable accepting frames in re_stop() to put RX MAC into idle state. Because there is no reliable way to know whether RX MAC is in stopped state, rejecting all frames would be the only way to minimize possible races. Otherwise it's possible to receive frames while stop command execution is in progress and controller can DMA the frame to freed RX buffer during that period. This was observed on recent PCIe controllers(i.e. RTL8111F). While this change may not be required on old controllers it wouldn't make negative effects on old controllers. One side effect of this change is disabling receive so driver reprograms RL_RXCFG to receive WOL frames when it is put into suspend or shutdown. This should address occasional 'memory modified free' errors seen on recent RealTek controllers. r227914: Make sure to stop TX MAC before freeing queued TX frames. For RTL8111DP, check if the TX MAC is active by reading RL_GTXSTART register. For RTL8402/8168E-VL/8168F/8411, wait until TX queue is empty. r227916: To save more power, switch to 10/100Mbps link when controller is put into suspend/shutdown. Old PCI controllers performed that operation in firmware but for RTL8111C or newer controllers, it's responsibility of driver. It's not clear whether the firmware of RTL8111B still downgrades its speed to 10/100Mbps so leave it as it was. Modified: stable/9/sys/dev/re/if_re.c stable/9/sys/pci/if_rlreg.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) Modified: stable/9/sys/dev/re/if_re.c == --- stable/9/sys/dev/re/if_re.c Wed Jan 4 23:26:22 2012(r229533) +++ stable/9/sys/dev/re/if_re.c Wed Jan 4 23:29:57 2012(r229534) @@ -294,6 +294,7 @@ static void re_set_rxmode (struct rl_so static void re_reset (struct rl_softc *); static void re_setwol (struct rl_softc *); static void re_clrwol (struct rl_softc *); +static void re_set_linkspeed (struct rl_softc *); #ifdef RE_DIAG static int re_diag (struct rl_softc *); @@ -1401,13 +1402,18 @@ re_attach(device_t dev) RL_FLAG_AUTOPAD | RL_FLAG_MACSLEEP; break; case RL_HWREV_8401E: - case RL_HWREV_8402: case RL_HWREV_8105E: case RL_HWREV_8105E_SPIN1: sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PHYWAKE_PM | RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_FASTETHER | RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD; break; + case RL_HWREV_8402: + sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PHYWAKE_PM | + RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | + RL_FLAG_FASTETHER | RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD | + RL_FLAG_CMDSTOP_WAIT_TXQ; + break; case RL_HWREV_8168B_SPIN1: case RL_HWREV_8168B_SPIN2: sc->rl_flags |= RL_FLAG_WOLRXENB; @@ -1424,22 +1430,28 @@ re_attach(device_t dev) /* FALLTHROUGH */ case RL_HWREV_8168CP: case RL_HWREV_81
svn commit: r229535 - in stable/8/sys: dev/re pci
Author: yongari Date: Wed Jan 4 23:31:43 2012 New Revision: 229535 URL: http://svn.freebsd.org/changeset/base/229535 Log: MFC r227850-227851,227854,227914,227916: r227850: Writing access to RL_CFG5 register also requires EEPROM write access. While I'm here, enable WOL through magic packet but disable waking up system via unicast, multicast and broadcast frames. Otherwise, multicast or unicast frame(e.g. ICMP echo request) can wake up system which is not probably wanted behavior on most environments. This was not known as problem because RL_CFG5 register access had not effect until this change. The capability to wake up system with unicast/multicast frames are still set in driver, default off, so users who need that feature can still activate it with ifconfig(8). r227851: Perform media change after setting IFF_DRV_RUNNING flag. Without it, driver would ignore the first link state update if controller already established a link such that it would have to take additional link state handling in re_tick(). r227854: Disable accepting frames in re_stop() to put RX MAC into idle state. Because there is no reliable way to know whether RX MAC is in stopped state, rejecting all frames would be the only way to minimize possible races. Otherwise it's possible to receive frames while stop command execution is in progress and controller can DMA the frame to freed RX buffer during that period. This was observed on recent PCIe controllers(i.e. RTL8111F). While this change may not be required on old controllers it wouldn't make negative effects on old controllers. One side effect of this change is disabling receive so driver reprograms RL_RXCFG to receive WOL frames when it is put into suspend or shutdown. This should address occasional 'memory modified free' errors seen on recent RealTek controllers. r227914: Make sure to stop TX MAC before freeing queued TX frames. For RTL8111DP, check if the TX MAC is active by reading RL_GTXSTART register. For RTL8402/8168E-VL/8168F/8411, wait until TX queue is empty. r227916: To save more power, switch to 10/100Mbps link when controller is put into suspend/shutdown. Old PCI controllers performed that operation in firmware but for RTL8111C or newer controllers, it's responsibility of driver. It's not clear whether the firmware of RTL8111B still downgrades its speed to 10/100Mbps so leave it as it was. Modified: stable/8/sys/dev/re/if_re.c stable/8/sys/pci/if_rlreg.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/re/if_re.c == --- stable/8/sys/dev/re/if_re.c Wed Jan 4 23:29:57 2012(r229534) +++ stable/8/sys/dev/re/if_re.c Wed Jan 4 23:31:43 2012(r229535) @@ -294,6 +294,7 @@ static void re_set_rxmode (struct rl_so static void re_reset (struct rl_softc *); static void re_setwol (struct rl_softc *); static void re_clrwol (struct rl_softc *); +static void re_set_linkspeed (struct rl_softc *); #ifdef RE_DIAG static int re_diag (struct rl_softc *); @@ -1405,13 +1406,18 @@ re_attach(device_t dev) RL_FLAG_AUTOPAD | RL_FLAG_MACSLEEP; break; case RL_HWREV_8401E: - case RL_HWREV_8402: case RL_HWREV_8105E: case RL_HWREV_8105E_SPIN1: sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PHYWAKE_PM | RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_FASTETHER | RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD; break; + case RL_HWREV_8402: + sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PHYWAKE_PM | + RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | + RL_FLAG_FASTETHER | RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD | + RL_FLAG_CMDSTOP_WAIT_TXQ; + break; case RL_HWREV_8168B_SPIN1: case RL_HWREV_8168B_SPIN2: sc->rl_flags |= RL_FLAG_WOLRXENB; @@ -1428,22 +1434,28 @@ re_attach(device_t dev) /* FALLTHROUGH */ case RL_HWREV_8168CP: case RL_HWREV_8168D: - case RL_HWREV_8168DP: sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_CMDSTOP | - RL_FLAG_AUTOPAD | RL_FLAG_JUMBOV2; + RL_FLAG_AUTOPAD | RL_FLAG_JUMBOV2 | RL_FLAG_WOL_MANLINK; + break; + case RL_HWREV_8168DP: + sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR | +
svn commit: r229536 - in stable/7/sys: dev/re pci
Author: yongari Date: Wed Jan 4 23:32:50 2012 New Revision: 229536 URL: http://svn.freebsd.org/changeset/base/229536 Log: MFC r227850-227851,227854,227914,227916: r227850: Writing access to RL_CFG5 register also requires EEPROM write access. While I'm here, enable WOL through magic packet but disable waking up system via unicast, multicast and broadcast frames. Otherwise, multicast or unicast frame(e.g. ICMP echo request) can wake up system which is not probably wanted behavior on most environments. This was not known as problem because RL_CFG5 register access had not effect until this change. The capability to wake up system with unicast/multicast frames are still set in driver, default off, so users who need that feature can still activate it with ifconfig(8). r227851: Perform media change after setting IFF_DRV_RUNNING flag. Without it, driver would ignore the first link state update if controller already established a link such that it would have to take additional link state handling in re_tick(). r227854: Disable accepting frames in re_stop() to put RX MAC into idle state. Because there is no reliable way to know whether RX MAC is in stopped state, rejecting all frames would be the only way to minimize possible races. Otherwise it's possible to receive frames while stop command execution is in progress and controller can DMA the frame to freed RX buffer during that period. This was observed on recent PCIe controllers(i.e. RTL8111F). While this change may not be required on old controllers it wouldn't make negative effects on old controllers. One side effect of this change is disabling receive so driver reprograms RL_RXCFG to receive WOL frames when it is put into suspend or shutdown. This should address occasional 'memory modified free' errors seen on recent RealTek controllers. r227914: Make sure to stop TX MAC before freeing queued TX frames. For RTL8111DP, check if the TX MAC is active by reading RL_GTXSTART register. For RTL8402/8168E-VL/8168F/8411, wait until TX queue is empty. r227916: To save more power, switch to 10/100Mbps link when controller is put into suspend/shutdown. Old PCI controllers performed that operation in firmware but for RTL8111C or newer controllers, it's responsibility of driver. It's not clear whether the firmware of RTL8111B still downgrades its speed to 10/100Mbps so leave it as it was. Modified: stable/7/sys/dev/re/if_re.c stable/7/sys/pci/if_rlreg.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/re/if_re.c == --- stable/7/sys/dev/re/if_re.c Wed Jan 4 23:31:43 2012(r229535) +++ stable/7/sys/dev/re/if_re.c Wed Jan 4 23:32:50 2012(r229536) @@ -294,6 +294,7 @@ static void re_set_rxmode (struct rl_so static void re_reset (struct rl_softc *); static void re_setwol (struct rl_softc *); static void re_clrwol (struct rl_softc *); +static void re_set_linkspeed (struct rl_softc *); #ifdef RE_DIAG static int re_diag (struct rl_softc *); @@ -1406,13 +1407,18 @@ re_attach(device_t dev) RL_FLAG_AUTOPAD | RL_FLAG_MACSLEEP; break; case RL_HWREV_8401E: - case RL_HWREV_8402: case RL_HWREV_8105E: case RL_HWREV_8105E_SPIN1: sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PHYWAKE_PM | RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_FASTETHER | RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD; break; + case RL_HWREV_8402: + sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PHYWAKE_PM | + RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | + RL_FLAG_FASTETHER | RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD | + RL_FLAG_CMDSTOP_WAIT_TXQ; + break; case RL_HWREV_8168B_SPIN1: case RL_HWREV_8168B_SPIN2: sc->rl_flags |= RL_FLAG_WOLRXENB; @@ -1429,22 +1435,28 @@ re_attach(device_t dev) /* FALLTHROUGH */ case RL_HWREV_8168CP: case RL_HWREV_8168D: - case RL_HWREV_8168DP: sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_CMDSTOP | - RL_FLAG_AUTOPAD | RL_FLAG_JUMBOV2; + RL_FLAG_AUTOPAD | RL_FLAG_JUMBOV2 | RL_FLAG_WOL_MANLINK; + break; + case RL_HWREV_8168DP: + sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR | + RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_A
svn commit: r229537 - in head/sys: conf geom/uncompress modules/geom/geom_uncompress
Author: ray
Date: Wed Jan 4 23:39:11 2012
New Revision: 229537
URL: http://svn.freebsd.org/changeset/base/229537
Log:
GEOM_UNCOMPRESS module, can be used with uzip images and with new ulzma
images.
Approved by: adrian (mentor)
Added:
head/sys/geom/uncompress/
head/sys/geom/uncompress/g_uncompress.c (contents, props changed)
head/sys/modules/geom/geom_uncompress/
head/sys/modules/geom/geom_uncompress/Makefile (contents, props changed)
Modified:
head/sys/conf/files
head/sys/conf/options
Modified: head/sys/conf/files
==
--- head/sys/conf/files Wed Jan 4 23:32:50 2012(r229536)
+++ head/sys/conf/files Wed Jan 4 23:39:11 2012(r229537)
@@ -2266,20 +2266,21 @@ geom/raid3/g_raid3.coptional geom_raid
geom/raid3/g_raid3_ctl.c optional geom_raid3
geom/shsec/g_shsec.c optional geom_shsec
geom/stripe/g_stripe.c optional geom_stripe
+geom/uncompress/g_uncompress.c optional geom_uncompress
contrib/xz-embedded/freebsd/xz_malloc.c\
- optional xz_embedded \
+ optional xz_embedded | geom_uncompress \
compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/
-I$S/contrib/xz-embedded/linux/lib/xz/
-I$S/contrib/xz-embedded/linux/include/linux/"
contrib/xz-embedded/linux/lib/xz/xz_crc32.c \
- optional xz_embedded \
+ optional xz_embedded | geom_uncompress \
compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/
-I$S/contrib/xz-embedded/linux/lib/xz/
-I$S/contrib/xz-embedded/linux/include/linux/"
contrib/xz-embedded/linux/lib/xz/xz_dec_bcj.c \
- optional xz_embedded \
+ optional xz_embedded | geom_uncompress \
compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/
-I$S/contrib/xz-embedded/linux/lib/xz/
-I$S/contrib/xz-embedded/linux/include/linux/"
contrib/xz-embedded/linux/lib/xz/xz_dec_lzma2.c \
- optional xz_embedded \
+ optional xz_embedded | geom_uncompress \
compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/
-I$S/contrib/xz-embedded/linux/lib/xz/
-I$S/contrib/xz-embedded/linux/include/linux/"
contrib/xz-embedded/linux/lib/xz/xz_dec_stream.c \
- optional xz_embedded \
+ optional xz_embedded | geom_uncompress \
compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/
-I$S/contrib/xz-embedded/linux/lib/xz/
-I$S/contrib/xz-embedded/linux/include/linux/"
geom/uzip/g_uzip.c optional geom_uzip
geom/virstor/binstream.c optional geom_virstor
@@ -2651,7 +2652,7 @@ net/slcompress.c optional netgraph_vjc
net/vnet.c optional vimage
net/zlib.c optional crypto | geom_uzip | ipsec | \
mxge | netgraph_deflate | \
-ddb_ctf | gzio
+ddb_ctf | gzio | geom_uncompress
net80211/ieee80211.c optional wlan
net80211/ieee80211_acl.c optional wlan wlan_acl
net80211/ieee80211_action.coptional wlan
Modified: head/sys/conf/options
==
--- head/sys/conf/options Wed Jan 4 23:32:50 2012(r229536)
+++ head/sys/conf/options Wed Jan 4 23:39:11 2012(r229537)
@@ -112,6 +112,7 @@ GEOM_RAID3 opt_geom.h
GEOM_SHSEC opt_geom.h
GEOM_STRIPEopt_geom.h
GEOM_SUNLABEL opt_geom.h
+GEOM_UNCOMPRESSopt_geom.h
GEOM_UZIP opt_geom.h
GEOM_VIRSTOR opt_geom.h
GEOM_VOL opt_geom.h
Added: head/sys/geom/uncompress/g_uncompress.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/geom/uncompress/g_uncompress.c Wed Jan 4 23:39:11 2012
(r229537)
@@ -0,0 +1,670 @@
+/*-
+ * Copyright (c) 2010-2012 Aleksandr Rybalko
+ * Copyright (c) 2004 Max Khon
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT O
svn commit: r229538 - head/usr.bin/mkulzma
Author: ray
Date: Wed Jan 4 23:45:10 2012
New Revision: 229538
URL: http://svn.freebsd.org/changeset/base/229538
Log:
mkulzma used to create lzma compressed images, just like mkuzip do.
Approved by: adrian (mentor)
Added:
head/usr.bin/mkulzma/
head/usr.bin/mkulzma/Makefile (contents, props changed)
head/usr.bin/mkulzma/mkulzma.8 (contents, props changed)
head/usr.bin/mkulzma/mkulzma.c (contents, props changed)
Added: head/usr.bin/mkulzma/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/mkulzma/Makefile Wed Jan 4 23:45:10 2012
(r229538)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+PROG= mkulzma
+MAN= mkulzma.8
+DPADD= ${LIBLZMA}
+LDADD= -llzma
+
+.include
Added: head/usr.bin/mkulzma/mkulzma.8
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/mkulzma/mkulzma.8 Wed Jan 4 23:45:10 2012
(r229538)
@@ -0,0 +1,107 @@
+.\"
+.\" Derived from mkuzip.8 by Aleksandr Rybalko
+.\"
+.\" "THE BEER-WARE LICENSE" (Revision 42):
+.\" wrote this file. As long as you retain this notice
you
+.\" can do whatever you want with this stuff. If we meet some day, and you
think
+.\" this stuff is worth it, you can buy me a beer in return. Maxim
Sobolev
+.\"
+.\"
+.\" $FreeBSD$
+.\"
+.Dd March 17, 2006
+.Dt mkulzma 8
+.Os
+.Sh NAME
+.Nm mkulzma
+.Nd compress disk image for use with
+.Xr geom_uncompress 4
+class
+.Sh SYNOPSIS
+.Nm
+.Op Fl v
+.Op Fl o Ar outfile
+.Op Fl s Ar cluster_size
+.Ar infile
+.Sh DESCRIPTION
+The
+.Nm
+utility compresses a disk image file so that the
+.Xr geom_uncompress 4
+class will be able to decompress the resulting image at run-time.
+This allows for a significant reduction of size of disk image at
+the expense of some CPU time required to decompress the data each
+time it is read.
+The
+.Nm
+utility
+works in two phases:
+.Bl -enum
+.It
+An
+.Ar infile
+image is split into clusters; each cluster is compressed using liblzma.
+.It
+The resulting set of compressed clusters along with headers that allow
+locating each individual cluster is written to the output file.
+.El
+.Pp
+The options are:
+.Bl -tag -width indent
+.It Fl o Ar outfile
+Name of the output file
+.Ar outfile .
+The default is to use the input name with the suffix
+.Pa .ulzma .
+.It Fl s Ar cluster_size
+Split the image into clusters of
+.Ar cluster_size
+bytes, 16384 bytes by default.
+The
+.Ar cluster_size
+should be a multiple of 512 bytes.
+.It Fl v
+Display verbose messages.
+.El
+.Sh NOTES
+The compression ratio largely depends on the cluster size used.
+.\" The following two sentences are unclear: how can xz(1) be
+.\" used in a comparable fashion, and wouldn't a lzma-compressed
+.\" image suffer from larger cluster sizes as well?
+For large cluster sizes (16K and higher), typical compression ratios
+are only 1-2% less than those achieved with
+.Xr lzma 1 .
+However, it should be kept in mind that larger cluster
+sizes lead to higher overhead in the
+.Xr geom_uncompress 4
+class, as the class has to decompress the whole cluster even if
+only a few bytes from that cluster have to be read.
+.Pp
+The
+.Nm
+utility
+inserts a short shell script at the beginning of the generated image,
+which makes it possible to
+.Dq run
+the image just like any other shell script.
+The script tries to load the
+.Xr geom_uncompress 4
+class if it is not loaded, configure the image as an
+.Xr md 4
+disk device using
+.Xr mdconfig 8 ,
+and automatically mount it using
+.Xr mount_cd9660 8
+on the mount point provided as the first argument to the script.
+.Sh EXIT STATUS
+.Ex -std
+.Sh SEE ALSO
+.Xr lzma 1 ,
+.Xr geom 4 ,
+.Xr geom_uncompress 4 ,
+.Xr md 4 ,
+.Xr mdconfig 8 ,
+.Xr mount_cd9660 8
+.Sh AUTHORS
+.An Maxim Sobolev Aq sobo...@freebsd.org
+.An Aleksandr Rybalko Aq r...@ddteam.net
Added: head/usr.bin/mkulzma/mkulzma.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/mkulzma/mkulzma.c Wed Jan 4 23:45:10 2012
(r229538)
@@ -0,0 +1,330 @@
+/*
+ *
+ * Derived from mkuzip.c by Aleksandr Rybalko
+ *
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * wrote this file. As long as you retain this notice you
+ * can do whatever you want with this stuff. If we meet some day, and you think
+ * this stuff is worth it, you can buy me a beer in return. Maxim Sobole
svn commit: r229539 - in releng: 7.3 7.3/sys/conf 7.3/usr.sbin/freebsd-update 7.4 7.4/sys/conf 7.4/usr.sbin/freebsd-update 8.1 8.1/sys/conf 8.1/usr.sbin/freebsd-update 8.2 8.2/sys/conf 8.2/usr.sbin...
Author: cperciva
Date: Wed Jan 4 23:47:20 2012
New Revision: 229539
URL: http://svn.freebsd.org/changeset/base/229539
Log:
Extend the character set accepted by freebsd-update(8) in file
names in order to allow upgrades to FreeBSD 9.0-RELEASE.
Approved by: so (cperciva)
Errata Notice:FreeBSD-EN-12:01.freebsd-update
Modified:
releng/7.3/UPDATING
releng/7.3/sys/conf/newvers.sh
releng/7.3/usr.sbin/freebsd-update/freebsd-update.sh
releng/7.4/UPDATING
releng/7.4/sys/conf/newvers.sh
releng/7.4/usr.sbin/freebsd-update/freebsd-update.sh
releng/8.1/UPDATING
releng/8.1/sys/conf/newvers.sh
releng/8.1/usr.sbin/freebsd-update/freebsd-update.sh
releng/8.2/UPDATING
releng/8.2/sys/conf/newvers.sh
releng/8.2/usr.sbin/freebsd-update/freebsd-update.sh
Modified: releng/7.3/UPDATING
==
--- releng/7.3/UPDATING Wed Jan 4 23:45:10 2012(r229538)
+++ releng/7.3/UPDATING Wed Jan 4 23:47:20 2012(r229539)
@@ -8,6 +8,10 @@ Items affecting the ports and packages s
/usr/ports/UPDATING. Please read that file before running
portupgrade.
+20120104: p10 FreeBSD-EN-12:01.freebsd-update
+ Extend the character set accepted by freebsd-update(8) in file
+ names in order to allow upgrades to FreeBSD 9.0-RELEASE.
+
20111223: p9 FreeBSD-SA-11:06.bind, FreeBSD-SA-11:07.chroot
FreeBSD-SA-11:08.telnetd, FreeBSD-SA-11:09.pam_ssh
FreeBSD-SA-11:10.pam
Modified: releng/7.3/sys/conf/newvers.sh
==
--- releng/7.3/sys/conf/newvers.sh Wed Jan 4 23:45:10 2012
(r229538)
+++ releng/7.3/sys/conf/newvers.sh Wed Jan 4 23:47:20 2012
(r229539)
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="7.3"
-BRANCH="RELEASE-p9"
+BRANCH="RELEASE-p10"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
Modified: releng/7.3/usr.sbin/freebsd-update/freebsd-update.sh
==
--- releng/7.3/usr.sbin/freebsd-update/freebsd-update.shWed Jan 4
23:45:10 2012(r229538)
+++ releng/7.3/usr.sbin/freebsd-update/freebsd-update.shWed Jan 4
23:47:20 2012(r229539)
@@ -1110,7 +1110,7 @@ fetch_metadata_sanity () {
# Some aliases to save space later: ${P} is a character which can
# appear in a path; ${M} is the four numeric metadata fields; and
# ${H} is a sha256 hash.
- P="[-+./:=_[[:alnum:]]"
+ P="[-+./:=%@_[[:alnum:]]"
M="[0-9]+\|[0-9]+\|[0-9]+\|[0-9]+"
H="[0-9a-f]{64}"
Modified: releng/7.4/UPDATING
==
--- releng/7.4/UPDATING Wed Jan 4 23:45:10 2012(r229538)
+++ releng/7.4/UPDATING Wed Jan 4 23:47:20 2012(r229539)
@@ -8,6 +8,10 @@ Items affecting the ports and packages s
/usr/ports/UPDATING. Please read that file before running
portupgrade.
+20120104: p6 FreeBSD-EN-12:01.freebsd-update
+ Extend the character set accepted by freebsd-update(8) in file
+ names in order to allow upgrades to FreeBSD 9.0-RELEASE.
+
20111223: p5 FreeBSD-SA-11:06.bind, FreeBSD-SA-11:07.chroot
FreeBSD-SA-11:08.telnetd, FreeBSD-SA-11:09.pam_ssh
FreeBSD-SA-11:10.pam
Modified: releng/7.4/sys/conf/newvers.sh
==
--- releng/7.4/sys/conf/newvers.sh Wed Jan 4 23:45:10 2012
(r229538)
+++ releng/7.4/sys/conf/newvers.sh Wed Jan 4 23:47:20 2012
(r229539)
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="7.4"
-BRANCH="RELEASE-p5"
+BRANCH="RELEASE-p6"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
Modified: releng/7.4/usr.sbin/freebsd-update/freebsd-update.sh
==
--- releng/7.4/usr.sbin/freebsd-update/freebsd-update.shWed Jan 4
23:45:10 2012(r229538)
+++ releng/7.4/usr.sbin/freebsd-update/freebsd-update.shWed Jan 4
23:47:20 2012(r229539)
@@ -1110,7 +1110,7 @@ fetch_metadata_sanity () {
# Some aliases to save space later: ${P} is a character which can
# appear in a path; ${M} is the four numeric metadata fields; and
# ${H} is a sha256 hash.
- P="[-+./:=_[[:alnum:]]"
+ P="[-+./:=%@_[[:alnum:]]"
M="[0-9]+\|[0-9]+\|[0-9]+\|[0-9]+"
H="[0-9a-f]{64}"
Modified: releng/8.1/UPDATING
=
svn commit: r229540 - stable/9/sys/dev/vge
Author: yongari Date: Wed Jan 4 23:58:54 2012 New Revision: 229540 URL: http://svn.freebsd.org/changeset/base/229540 Log: MFC r227828,227835,227837: r227828: Always start MII auto polling before accessing any MII registers. r227835: Rework link establishment and link state detection logic. - Remove MIIBUS statchg callback and program VGE_DIAGCTL before initiating link establishment. Previously driver used to program VGE_DIAGCTL after getting a link in statchg callback. It seems the VGE_DIAGCTL register works like a kind of MII register such that it requires setting a 'to be' mode in advance rather than relying on resolved speed/duplex of established link. This means the statchg callback is not needed in driver. In addition, if there was no link at the time of media change, this was not called at all. - Introduce vge_ifmedia_upd_locked() to change current media to configured one. Actual media change is performed only after PHY reset and VGE_DIAGCTL setup. - In WOL configuration, make sure to clear forced mode such that controller can rely on auto-negotiation. - Unlike most other drivers that use miibus(4), vge(4) used controller's auto-polling feature for link state tracking via interrupt. This came from controller's inefficient mechanism to access MII registers. On link state change interrupt, vge(4) used to get current link state with series of MII register accesses. Because vge(4) already enabled auto polling, read PHY status register to resolved speed/duplex/flow control parameters. vge(4) still does not drive MII_TICK to reduce number of MII register accesses which in turn means the driver does not know the status of auto-negotiation. This was a one of long standing issue of vge(4). Probably driver may be able to implement a timer that keeps track of auto-negotiation state and restart auto-negotiation when driver couldn't establish a link within a specified period. However the controller does not provide a reliable way to detect auto-negotiation failure so I'm not sure whether it's worth to implement it in driver. Alternatively driver can completely disable MII auto-polling and let miibus(4) poll link state by driving MII_TICK. This may reduce unnecessary overhead of stopping/restarting MII auto-polling of controller. Unfortunately it was known that some variants of controller does not work correctly if MII auto-polling is disabled. r227837: Announce flow control capability to underlying PHY driver. Pause timer value is initialized to 0x. Controller allows just 4 different TX pause thresholds. The lowest possible threshold value looks too aggressive so use next available threshold value. Modified: stable/9/sys/dev/vge/if_vge.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) Modified: stable/9/sys/dev/vge/if_vge.c == --- stable/9/sys/dev/vge/if_vge.c Wed Jan 4 23:47:20 2012 (r229539) +++ stable/9/sys/dev/vge/if_vge.c Wed Jan 4 23:58:54 2012 (r229540) @@ -173,6 +173,7 @@ static __inline void static voidvge_freebufs(struct vge_softc *); static voidvge_ifmedia_sts(struct ifnet *, struct ifmediareq *); static int vge_ifmedia_upd(struct ifnet *); +static int vge_ifmedia_upd_locked(struct vge_softc *); static voidvge_init(void *); static voidvge_init_locked(struct vge_softc *); static voidvge_intr(void *); @@ -180,7 +181,6 @@ static void vge_intr_holdoff(struct vge_ static int vge_ioctl(struct ifnet *, u_long, caddr_t); static voidvge_link_statchg(void *); static int vge_miibus_readreg(device_t, int, int); -static voidvge_miibus_statchg(device_t); static int vge_miibus_writereg(device_t, int, int, int); static voidvge_miipoll_start(struct vge_softc *); static voidvge_miipoll_stop(struct vge_softc *); @@ -190,6 +190,7 @@ static void vge_reset(struct vge_softc * static int vge_rx_list_init(struct vge_softc *); static int vge_rxeof(struct vge_softc *, int); static voidvge_rxfilter(struct vge_softc *); +static voidvge_setmedia(stru
svn commit: r229541 - stable/8/sys/dev/vge
Author: yongari
Date: Thu Jan 5 00:00:30 2012
New Revision: 229541
URL: http://svn.freebsd.org/changeset/base/229541
Log:
MFC r227828,227835,227837:
r227828:
Always start MII auto polling before accessing any MII registers.
r227835:
Rework link establishment and link state detection logic.
- Remove MIIBUS statchg callback and program VGE_DIAGCTL before
initiating link establishment. Previously driver used to
program VGE_DIAGCTL after getting a link in statchg callback.
It seems the VGE_DIAGCTL register works like a kind of MII
register such that it requires setting a 'to be' mode in advance
rather than relying on resolved speed/duplex of established link.
This means the statchg callback is not needed in driver. In
addition, if there was no link at the time of media change, this
was not called at all.
- Introduce vge_ifmedia_upd_locked() to change current media to
configured one. Actual media change is performed only after PHY
reset and VGE_DIAGCTL setup.
- In WOL configuration, make sure to clear forced mode such that
controller can rely on auto-negotiation.
- Unlike most other drivers that use miibus(4), vge(4) used
controller's auto-polling feature for link state tracking via
interrupt. This came from controller's inefficient mechanism to
access MII registers. On link state change interrupt, vge(4)
used to get current link state with series of MII register
accesses. Because vge(4) already enabled auto polling, read PHY
status register to resolved speed/duplex/flow control parameters.
vge(4) still does not drive MII_TICK to reduce number of MII
register accesses which in turn means the driver does not know the
status of auto-negotiation. This was a one of long standing
issue of vge(4). Probably driver may be able to implement a timer
that keeps track of auto-negotiation state and restart
auto-negotiation when driver couldn't establish a link within a
specified period. However the controller does not provide a
reliable way to detect auto-negotiation failure so I'm not sure
whether it's worth to implement it in driver.
Alternatively driver can completely disable MII auto-polling and
let miibus(4) poll link state by driving MII_TICK. This may reduce
unnecessary overhead of stopping/restarting MII auto-polling of
controller. Unfortunately it was known that some variants of
controller does not work correctly if MII auto-polling is disabled.
r227837:
Announce flow control capability to underlying PHY driver.
Pause timer value is initialized to 0x. Controller allows just
4 different TX pause thresholds. The lowest possible threshold
value looks too aggressive so use next available threshold value.
Modified:
stable/8/sys/dev/vge/if_vge.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/dev/vge/if_vge.c
==
--- stable/8/sys/dev/vge/if_vge.c Wed Jan 4 23:58:54 2012
(r229540)
+++ stable/8/sys/dev/vge/if_vge.c Thu Jan 5 00:00:30 2012
(r229541)
@@ -173,6 +173,7 @@ static __inline void
static voidvge_freebufs(struct vge_softc *);
static voidvge_ifmedia_sts(struct ifnet *, struct ifmediareq *);
static int vge_ifmedia_upd(struct ifnet *);
+static int vge_ifmedia_upd_locked(struct vge_softc *);
static voidvge_init(void *);
static voidvge_init_locked(struct vge_softc *);
static voidvge_intr(void *);
@@ -180,7 +181,6 @@ static void vge_intr_holdoff(struct vge_
static int vge_ioctl(struct ifnet *, u_long, caddr_t);
static voidvge_link_statchg(void *);
static int vge_miibus_readreg(device_t, int, int);
-static voidvge_miibus_statchg(device_t);
static int vge_miibus_writereg(device_t, int, int, int);
static voidvge_miipoll_start(struct vge_softc *);
static voidvge_miipoll_stop(struct vge_softc *);
@@ -190,6 +190,7 @@ static void vge_reset(struct vge_softc *
static int vge_rx_list_init(struct vge_softc *);
static int vge_rxeof(struct vge_softc *, int);
static voidvge_rxfilter(struct vge_softc *);
+static voidvge_setmedia(struct vge_softc *);
static voidvge_setvlan(struct vge_softc *);
static voidvge_setwol(struct vge_softc *);
static voidvge_start(struct ifnet *);
@@ -218,7 +219,6 @@ static device_method_t vge_methods[] = {
/* MII interface */
DEVMETHOD(miibus_readreg, vge_miibus_readreg),
DEVMETHOD(miibus_writereg, vge_miibus_writereg),
- DEVMETHOD(miibus_statchg, vge_miibus_statchg),
svn commit: r229542 - stable/7/sys/dev/vge
Author: yongari
Date: Thu Jan 5 00:01:49 2012
New Revision: 229542
URL: http://svn.freebsd.org/changeset/base/229542
Log:
MFC r227828,227835,227837:
r227828:
Always start MII auto polling before accessing any MII registers.
r227835:
Rework link establishment and link state detection logic.
- Remove MIIBUS statchg callback and program VGE_DIAGCTL before
initiating link establishment. Previously driver used to
program VGE_DIAGCTL after getting a link in statchg callback.
It seems the VGE_DIAGCTL register works like a kind of MII
register such that it requires setting a 'to be' mode in advance
rather than relying on resolved speed/duplex of established link.
This means the statchg callback is not needed in driver. In
addition, if there was no link at the time of media change, this
was not called at all.
- Introduce vge_ifmedia_upd_locked() to change current media to
configured one. Actual media change is performed only after PHY
reset and VGE_DIAGCTL setup.
- In WOL configuration, make sure to clear forced mode such that
controller can rely on auto-negotiation.
- Unlike most other drivers that use miibus(4), vge(4) used
controller's auto-polling feature for link state tracking via
interrupt. This came from controller's inefficient mechanism to
access MII registers. On link state change interrupt, vge(4)
used to get current link state with series of MII register
accesses. Because vge(4) already enabled auto polling, read PHY
status register to resolved speed/duplex/flow control parameters.
vge(4) still does not drive MII_TICK to reduce number of MII
register accesses which in turn means the driver does not know the
status of auto-negotiation. This was a one of long standing
issue of vge(4). Probably driver may be able to implement a timer
that keeps track of auto-negotiation state and restart
auto-negotiation when driver couldn't establish a link within a
specified period. However the controller does not provide a
reliable way to detect auto-negotiation failure so I'm not sure
whether it's worth to implement it in driver.
Alternatively driver can completely disable MII auto-polling and
let miibus(4) poll link state by driving MII_TICK. This may reduce
unnecessary overhead of stopping/restarting MII auto-polling of
controller. Unfortunately it was known that some variants of
controller does not work correctly if MII auto-polling is disabled.
r227837:
Announce flow control capability to underlying PHY driver.
Pause timer value is initialized to 0x. Controller allows just
4 different TX pause thresholds. The lowest possible threshold
value looks too aggressive so use next available threshold value.
Modified:
stable/7/sys/dev/vge/if_vge.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/dev/vge/if_vge.c
==
--- stable/7/sys/dev/vge/if_vge.c Thu Jan 5 00:00:30 2012
(r229541)
+++ stable/7/sys/dev/vge/if_vge.c Thu Jan 5 00:01:49 2012
(r229542)
@@ -173,6 +173,7 @@ static __inline void
static voidvge_freebufs(struct vge_softc *);
static voidvge_ifmedia_sts(struct ifnet *, struct ifmediareq *);
static int vge_ifmedia_upd(struct ifnet *);
+static int vge_ifmedia_upd_locked(struct vge_softc *);
static voidvge_init(void *);
static voidvge_init_locked(struct vge_softc *);
static voidvge_intr(void *);
@@ -180,7 +181,6 @@ static void vge_intr_holdoff(struct vge_
static int vge_ioctl(struct ifnet *, u_long, caddr_t);
static voidvge_link_statchg(void *);
static int vge_miibus_readreg(device_t, int, int);
-static voidvge_miibus_statchg(device_t);
static int vge_miibus_writereg(device_t, int, int, int);
static voidvge_miipoll_start(struct vge_softc *);
static voidvge_miipoll_stop(struct vge_softc *);
@@ -190,6 +190,7 @@ static void vge_reset(struct vge_softc *
static int vge_rx_list_init(struct vge_softc *);
static int vge_rxeof(struct vge_softc *, int);
static voidvge_rxfilter(struct vge_softc *);
+static voidvge_setmedia(struct vge_softc *);
static voidvge_setvlan(struct vge_softc *);
static voidvge_setwol(struct vge_softc *);
static voidvge_start(struct ifnet *);
@@ -218,7 +219,6 @@ static device_method_t vge_methods[] = {
/* MII interface */
DEVMETHOD(miibus_readreg, vge_miibus_readreg),
DEVMETHOD(miibus_writereg, vge_miibus_writereg),
- DEVMETHOD(miibus_statchg, vge_miibus_statchg),
{ 0, 0 }
};
@@ -1102,10 +1102,11 @@ vge_atta
svn commit: r229543 - stable/9/sys/dev/mii
Author: yongari Date: Thu Jan 5 00:08:16 2012 New Revision: 229543 URL: http://svn.freebsd.org/changeset/base/229543 Log: MFC r227842: For IP1001 PHY, do not set multi-port device(MASTER). Ideally this bit should not affect link establishment process of auto-negotiation if manual configuration is not used, which is true in auto-negotiation. However it seems setting this bit interfere with IP1001 PHY's down-shifting feature such that establishing a 10/100Mbps link failed when 1000baseT link is not available during auto-negotiation process. Modified: stable/9/sys/dev/mii/ip1000phy.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) Modified: stable/9/sys/dev/mii/ip1000phy.c == --- stable/9/sys/dev/mii/ip1000phy.cThu Jan 5 00:01:49 2012 (r229542) +++ stable/9/sys/dev/mii/ip1000phy.cThu Jan 5 00:08:16 2012 (r229543) @@ -324,7 +324,8 @@ ip1000phy_mii_phy_auto(struct mii_softc PHY_WRITE(sc, IP1000PHY_MII_ANAR, reg | IP1000PHY_ANAR_CSMA); reg = IP1000PHY_1000CR_1000T | IP1000PHY_1000CR_1000T_FDX; - reg |= IP1000PHY_1000CR_MASTER; + if (sc->mii_mpd_model != MII_MODEL_xxICPLUS_IP1001) + reg |= IP1000PHY_1000CR_MASTER; PHY_WRITE(sc, IP1000PHY_MII_1000CR, reg); PHY_WRITE(sc, IP1000PHY_MII_BMCR, (IP1000PHY_BMCR_FDX | IP1000PHY_BMCR_AUTOEN | IP1000PHY_BMCR_STARTNEG)); ___ 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: r229544 - stable/8/sys/dev/mii
Author: yongari Date: Thu Jan 5 00:09:49 2012 New Revision: 229544 URL: http://svn.freebsd.org/changeset/base/229544 Log: MFC r227842: For IP1001 PHY, do not set multi-port device(MASTER). Ideally this bit should not affect link establishment process of auto-negotiation if manual configuration is not used, which is true in auto-negotiation. However it seems setting this bit interfere with IP1001 PHY's down-shifting feature such that establishing a 10/100Mbps link failed when 1000baseT link is not available during auto-negotiation process. Modified: stable/8/sys/dev/mii/ip1000phy.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/mii/ip1000phy.c == --- stable/8/sys/dev/mii/ip1000phy.cThu Jan 5 00:08:16 2012 (r229543) +++ stable/8/sys/dev/mii/ip1000phy.cThu Jan 5 00:09:49 2012 (r229544) @@ -357,7 +357,8 @@ ip1000phy_mii_phy_auto(struct mii_softc PHY_WRITE(sc, IP1000PHY_MII_ANAR, reg | IP1000PHY_ANAR_CSMA); reg = IP1000PHY_1000CR_1000T | IP1000PHY_1000CR_1000T_FDX; - reg |= IP1000PHY_1000CR_MASTER; + if (isc->model != MII_MODEL_ICPLUS_IP1001) + reg |= IP1000PHY_1000CR_MASTER; PHY_WRITE(sc, IP1000PHY_MII_1000CR, reg); PHY_WRITE(sc, IP1000PHY_MII_BMCR, (IP1000PHY_BMCR_FDX | IP1000PHY_BMCR_AUTOEN | IP1000PHY_BMCR_STARTNEG)); ___ 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: r229545 - stable/7/sys/dev/mii
Author: yongari Date: Thu Jan 5 00:11:04 2012 New Revision: 229545 URL: http://svn.freebsd.org/changeset/base/229545 Log: MFC r227842: For IP1001 PHY, do not set multi-port device(MASTER). Ideally this bit should not affect link establishment process of auto-negotiation if manual configuration is not used, which is true in auto-negotiation. However it seems setting this bit interfere with IP1001 PHY's down-shifting feature such that establishing a 10/100Mbps link failed when 1000baseT link is not available during auto-negotiation process. Modified: stable/7/sys/dev/mii/ip1000phy.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/mii/ip1000phy.c == --- stable/7/sys/dev/mii/ip1000phy.cThu Jan 5 00:09:49 2012 (r229544) +++ stable/7/sys/dev/mii/ip1000phy.cThu Jan 5 00:11:04 2012 (r229545) @@ -357,7 +357,8 @@ ip1000phy_mii_phy_auto(struct mii_softc PHY_WRITE(sc, IP1000PHY_MII_ANAR, reg | IP1000PHY_ANAR_CSMA); reg = IP1000PHY_1000CR_1000T | IP1000PHY_1000CR_1000T_FDX; - reg |= IP1000PHY_1000CR_MASTER; + if (isc->model != MII_MODEL_ICPLUS_IP1001) + reg |= IP1000PHY_1000CR_MASTER; PHY_WRITE(sc, IP1000PHY_MII_1000CR, reg); PHY_WRITE(sc, IP1000PHY_MII_BMCR, (IP1000PHY_BMCR_FDX | IP1000PHY_BMCR_AUTOEN | IP1000PHY_BMCR_STARTNEG)); ___ 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: r229546 - head/sys/netinet6
Author: bz
Date: Thu Jan 5 01:13:25 2012
New Revision: 229546
URL: http://svn.freebsd.org/changeset/base/229546
Log:
Convert an #ifdef DIAGNOSTIC if/panic to a KASSERT.
MFC after:1 week
Modified:
head/sys/netinet6/in6_ifattach.c
Modified: head/sys/netinet6/in6_ifattach.c
==
--- head/sys/netinet6/in6_ifattach.cThu Jan 5 00:11:04 2012
(r229545)
+++ head/sys/netinet6/in6_ifattach.cThu Jan 5 01:13:25 2012
(r229546)
@@ -513,12 +513,8 @@ in6_ifattach_linklocal(struct ifnet *ifp
}
ia = in6ifa_ifpforlinklocal(ifp, 0); /* ia must not be NULL */
-#ifdef DIAGNOSTIC
- if (!ia) {
- panic("ia == NULL in in6_ifattach_linklocal");
- /* NOTREACHED */
- }
-#endif
+ KASSERT(ia != NULL, ("%s: ia == NULL, ifp=%p", __func__, ifp));
+
ifa_free(&ia->ia_ifa);
/*
___
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: r229547 - head/sys/netinet6
Author: bz
Date: Thu Jan 5 01:14:35 2012
New Revision: 229547
URL: http://svn.freebsd.org/changeset/base/229547
Log:
Mark a couple of file local functions static and stop exporting them.
MFC after:1 week
Modified:
head/sys/netinet6/nd6.h
head/sys/netinet6/nd6_rtr.c
Modified: head/sys/netinet6/nd6.h
==
--- head/sys/netinet6/nd6.h Thu Jan 5 01:13:25 2012(r229546)
+++ head/sys/netinet6/nd6.h Thu Jan 5 01:14:35 2012(r229547)
@@ -434,15 +434,12 @@ void nd6_dad_duplicated __P((struct ifad
void nd6_rs_input __P((struct mbuf *, int, int));
void nd6_ra_input __P((struct mbuf *, int, int));
void prelist_del __P((struct nd_prefix *));
-void defrouter_addreq __P((struct nd_defrouter *));
void defrouter_reset __P((void));
void defrouter_select __P((void));
void defrtrlist_del __P((struct nd_defrouter *));
void prelist_remove __P((struct nd_prefix *));
int nd6_prelist_add __P((struct nd_prefixctl *, struct nd_defrouter *,
struct nd_prefix **));
-int nd6_prefix_onlink __P((struct nd_prefix *));
-int nd6_prefix_offlink __P((struct nd_prefix *));
void pfxlist_onlink_check __P((void));
struct nd_defrouter *defrouter_lookup __P((struct in6_addr *, struct ifnet *));
struct nd_prefix *nd6_prefix_lookup __P((struct nd_prefixctl *));
Modified: head/sys/netinet6/nd6_rtr.c
==
--- head/sys/netinet6/nd6_rtr.c Thu Jan 5 01:13:25 2012(r229546)
+++ head/sys/netinet6/nd6_rtr.c Thu Jan 5 01:14:35 2012(r229547)
@@ -84,6 +84,9 @@ static int in6_init_prefix_ltimes(struct
static void in6_init_address_ltimes __P((struct nd_prefix *,
struct in6_addrlifetime *));
+static int nd6_prefix_onlink(struct nd_prefix *);
+static int nd6_prefix_offlink(struct nd_prefix *);
+
static int rt6_deleteroute(struct radix_node *, void *);
VNET_DECLARE(int, nd6_recalc_reachtm_interval);
@@ -465,7 +468,7 @@ nd6_rtmsg(int cmd, struct rtentry *rt)
ifa_free(ifa);
}
-void
+static void
defrouter_addreq(struct nd_defrouter *new)
{
struct sockaddr_in6 def, mask, gate;
@@ -1537,7 +1540,7 @@ pfxlist_onlink_check()
}
}
-int
+static int
nd6_prefix_onlink(struct nd_prefix *pr)
{
struct ifaddr *ifa;
@@ -1662,7 +1665,7 @@ nd6_prefix_onlink(struct nd_prefix *pr)
return (error);
}
-int
+static int
nd6_prefix_offlink(struct nd_prefix *pr)
{
int error = 0;
___
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: r229548 - in stable/9/sys/fs: nfs nfsclient
Author: rmacklem
Date: Thu Jan 5 01:25:47 2012
New Revision: 229548
URL: http://svn.freebsd.org/changeset/base/229548
Log:
MFC: r227743
Post r223774 the NFSv4 client never uses the linked list with the
head nfsc_defunctlockowner. This patch simply removes the code that
loops through this always empty list, since the code no longer does
anything useful. It should not have any effect on the client's
behaviour.
Modified:
stable/9/sys/fs/nfs/nfsclstate.h
stable/9/sys/fs/nfsclient/nfs_clstate.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
Modified: stable/9/sys/fs/nfs/nfsclstate.h
==
--- stable/9/sys/fs/nfs/nfsclstate.hThu Jan 5 01:14:35 2012
(r229547)
+++ stable/9/sys/fs/nfs/nfsclstate.hThu Jan 5 01:25:47 2012
(r229548)
@@ -48,7 +48,6 @@ struct nfsclclient {
struct nfsclownerhead nfsc_owner;
struct nfscldeleghead nfsc_deleg;
struct nfscldeleghash nfsc_deleghash[NFSCLDELEGHASHSIZE];
- struct nfscllockownerhead nfsc_defunctlockowner;
struct nfsv4lock nfsc_lock;
struct proc *nfsc_renewthread;
struct nfsmount *nfsc_nmp;
Modified: stable/9/sys/fs/nfsclient/nfs_clstate.c
==
--- stable/9/sys/fs/nfsclient/nfs_clstate.c Thu Jan 5 01:14:35 2012
(r229547)
+++ stable/9/sys/fs/nfsclient/nfs_clstate.c Thu Jan 5 01:25:47 2012
(r229548)
@@ -699,7 +699,6 @@ nfscl_getcl(vnode_t vp, struct ucred *cr
{
struct nfsclclient *clp;
struct nfsclclient *newclp = NULL;
- struct nfscllockowner *lp, *nlp;
struct mount *mp;
struct nfsmount *nmp;
char uuid[HOSTUUIDLEN];
@@ -744,7 +743,6 @@ nfscl_getcl(vnode_t vp, struct ucred *cr
TAILQ_INIT(&clp->nfsc_deleg);
for (i = 0; i < NFSCLDELEGHASHSIZE; i++)
LIST_INIT(&clp->nfsc_deleghash[i]);
- LIST_INIT(&clp->nfsc_defunctlockowner);
clp->nfsc_flags = NFSCLFLAGS_INITED;
clp->nfsc_clientidrev = 1;
clp->nfsc_cbident = nfscl_nextcbident();
@@ -793,11 +791,6 @@ nfscl_getcl(vnode_t vp, struct ucred *cr
NFSUNLOCKCLSTATE();
return (EACCES);
}
- /* get rid of defunct lockowners */
- LIST_FOREACH_SAFE(lp, &clp->nfsc_defunctlockowner, nfsl_list,
- nlp) {
- nfscl_freelockowner(lp, 0);
- }
/*
* If RFC3530 Sec. 14.2.33 is taken literally,
* NFSERR_CLIDINUSE will be returned persistently for the
@@ -1537,13 +1530,6 @@ nfscl_cleanclient(struct nfsclclient *cl
{
struct nfsclowner *owp, *nowp;
struct nfsclopen *op, *nop;
- struct nfscllockowner *lp, *nlp;
-
-
- /* get rid of defunct lockowners */
- LIST_FOREACH_SAFE(lp, &clp->nfsc_defunctlockowner, nfsl_list, nlp) {
- nfscl_freelockowner(lp, 0);
- }
/* Now, all the OpenOwners, etc. */
LIST_FOREACH_SAFE(owp, &clp->nfsc_owner, nfsow_list, nowp) {
@@ -1717,12 +1703,6 @@ nfscl_cleanup_common(struct nfsclclient
}
owp = nowp;
}
-
- /* and check the defunct list */
- LIST_FOREACH(lp, &clp->nfsc_defunctlockowner, nfsl_list) {
- if (!NFSBCMP(lp->nfsl_owner, own, NFSV4CL_LOCKNAMELEN))
- lp->nfsl_defunct = 1;
- }
}
#if defined(APPLEKEXT) || defined(__FreeBSD__)
@@ -1735,7 +1715,6 @@ static void
nfscl_cleanupkext(struct nfsclclient *clp)
{
struct nfsclowner *owp, *nowp;
- struct nfscllockowner *lp;
NFSPROCLISTLOCK();
NFSLOCKCLSTATE();
@@ -1743,12 +1722,6 @@ nfscl_cleanupkext(struct nfsclclient *cl
if (nfscl_procdoesntexist(owp->nfsow_owner))
nfscl_cleanup_common(clp, owp->nfsow_owner);
}
-
- /* and check the defunct list */
- LIST_FOREACH(lp, &clp->nfsc_defunctlockowner, nfsl_list) {
- if (nfscl_procdoesntexist(lp->nfsl_owner))
- lp->nfsl_defunct = 1;
- }
NFSUNLOCKCLSTATE();
NFSPROCLIST
svn commit: r229549 - stable/9/sys/fs/ext2fs
Author: pfg
Date: Thu Jan 5 01:35:01 2012
New Revision: 229549
URL: http://svn.freebsd.org/changeset/base/229549
Log:
MFC: r228507, r228539, r228583
Merge ext2_readwrite.c into ext2_vnops.c as done in UFS.
Bring in reallocblk to ext2fs: new feature implemented by Zheng Liu as
GSoC 2010.
Many style fixes by jh@.
PR: 159232, 159233 and 162564
Approved by: jhb (mentor)
Deleted:
stable/9/sys/fs/ext2fs/ext2_readwrite.c
Modified:
stable/9/sys/fs/ext2fs/ext2_alloc.c
stable/9/sys/fs/ext2fs/ext2_balloc.c
stable/9/sys/fs/ext2fs/ext2_bmap.c
stable/9/sys/fs/ext2fs/ext2_extern.h
stable/9/sys/fs/ext2fs/ext2_inode.c
stable/9/sys/fs/ext2fs/ext2_lookup.c
stable/9/sys/fs/ext2fs/ext2_subr.c
stable/9/sys/fs/ext2fs/ext2_vfsops.c
stable/9/sys/fs/ext2fs/ext2_vnops.c
stable/9/sys/fs/ext2fs/ext2fs.h
stable/9/sys/fs/ext2fs/fs.h
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/fs/ext2fs/ext2_alloc.c
==
--- stable/9/sys/fs/ext2fs/ext2_alloc.c Thu Jan 5 01:25:47 2012
(r229548)
+++ stable/9/sys/fs/ext2fs/ext2_alloc.c Thu Jan 5 01:35:01 2012
(r229549)
@@ -42,6 +42,7 @@
#include
#include
#include
+#include
#include
#include
@@ -52,6 +53,7 @@
#include
static daddr_t ext2_alloccg(struct inode *, int, daddr_t, int);
+static daddr_t ext2_clusteralloc(struct inode *, int, daddr_t, int);
static u_long ext2_dirpref(struct inode *);
static voidext2_fserr(struct m_ext2fs *, uid_t, char *);
static u_long ext2_hashalloc(struct inode *, int, long, int,
@@ -59,9 +61,6 @@ static u_long ext2_hashalloc(struct inod
int));
static daddr_t ext2_nodealloccg(struct inode *, int, daddr_t, int);
static daddr_t ext2_mapsearch(struct m_ext2fs *, char *, daddr_t);
-#ifdef FANCY_REALLOC
-static int ext2_reallocblks(struct vop_reallocblks_args *);
-#endif
/*
* Allocate a block in the file system.
@@ -113,20 +112,20 @@ ext2_alloc(ip, lbn, bpref, size, cred, b
if (bpref >= fs->e2fs->e2fs_bcount)
bpref = 0;
if (bpref == 0)
-cg = ino_to_cg(fs, ip->i_number);
-else
-cg = dtog(fs, bpref);
-bno = (daddr_t)ext2_hashalloc(ip, cg, bpref, fs->e2fs_bsize,
- ext2_alloccg);
-if (bno > 0) {
+ cg = ino_to_cg(fs, ip->i_number);
+ else
+ cg = dtog(fs, bpref);
+ bno = (daddr_t)ext2_hashalloc(ip, cg, bpref, fs->e2fs_bsize,
+ ext2_alloccg);
+ if (bno > 0) {
/* set next_alloc fields as done in block_getblk */
ip->i_next_alloc_block = lbn;
ip->i_next_alloc_goal = bno;
-ip->i_blocks += btodb(fs->e2fs_bsize);
-ip->i_flag |= IN_CHANGE | IN_UPDATE;
-*bnp = bno;
-return (0);
+ ip->i_blocks += btodb(fs->e2fs_bsize);
+ ip->i_flag |= IN_CHANGE | IN_UPDATE;
+ *bnp = bno;
+ return (0);
}
nospace:
EXT2_UNLOCK(ump);
@@ -150,7 +149,6 @@ nospace:
* the previous block allocation will be used.
*/
-#ifdef FANCY_REALLOC
SYSCTL_NODE(_vfs, OID_AUTO, ext2fs, CTLFLAG_RW, 0, "EXT2FS filesystem");
static int doasyncfree = 1;
@@ -159,7 +157,6 @@ SYSCTL_INT(_vfs_ext2fs, OID_AUTO, doasyn
static int doreallocblks = 1;
SYSCTL_INT(_vfs_ext2fs, OID_AUTO, doreallocblks, CTLFLAG_RW, &doreallocblks,
0, "");
-#endif
int
ext2_reallocblks(ap)
@@ -168,11 +165,6 @@ ext2_reallocblks(ap)
struct cluster_save *a_buflist;
} */ *ap;
{
-#ifndef FANCY_REALLOC
-/* printf("ext2_reallocblks not implemented\n"); */
-return ENOSPC;
-#else
-
struct m_ext2fs *fs;
struct inode *ip;
struct vnode *vp;
@@ -184,14 +176,17 @@ return ENOSPC;
int32_t start_lbn, end_lbn, soff, newblk, blkno;
int i, len, start_lvl, end_lvl, pref, ssize;
+ if (doreallocblks == 0)
+ return (ENOSPC);
+
vp = ap->a_vp;
ip = VTOI(vp);
fs = ip->i_e2fs;
ump = ip->i_ump;
-#ifdef UNKLAR
- if (fs->fs_contigsumsize <= 0)
+
+ if (fs->e2fs_contigsumsize <= 0)
return (ENOSPC);
-#endif
+
buflist = ap->a_buflist;
len = buflist->bs_nchildren;
start_lbn = buflist->bs_children[0]->b_lblkno;
@@ -228,11 +223,6 @@ return ENOSPC;
soff = idp->in_off;
}
/*
-* Find the preferred location for the cluster.
-*/
- EXT2_LOCK(ump);
- pref = ext2_blkpref(ip, start_lbn, soff, sbap, 0);
- /*
* If the block range spans two block maps, get the second map.
*/
if (end_lvl == 0 || (idp = &end_ap[end_lvl - 1])->in_off + 1 >= len) {
@@ -243,13 +233,16 @@ return ENOSPC
svn commit: r229550 - stable/9/sbin/newfs_msdos
Author: pfg
Date: Thu Jan 5 01:40:42 2012
New Revision: 229550
URL: http://svn.freebsd.org/changeset/base/229550
Log:
MFC: r228740
Many style fixes.
Remove C99 initializers: they don't help in this case.
Set errno to 0 before strtoll() (from NetBSD).
PR: 151850
Suggested by: bde
Approved by: jhb (Mentor)
Modified:
stable/9/sbin/newfs_msdos/newfs_msdos.8
stable/9/sbin/newfs_msdos/newfs_msdos.c
Directory Properties:
stable/9/sbin/newfs_msdos/ (props changed)
Modified: stable/9/sbin/newfs_msdos/newfs_msdos.8
==
--- stable/9/sbin/newfs_msdos/newfs_msdos.8 Thu Jan 5 01:35:01 2012
(r229549)
+++ stable/9/sbin/newfs_msdos/newfs_msdos.8 Thu Jan 5 01:40:42 2012
(r229550)
@@ -180,27 +180,27 @@ For reference purposes, this structure i
below.
.Bd -literal
struct bsbpb {
-u_int16_t bps;/* [-S] bytes per sector */
-u_int8_t spc;/* [-c] sectors per cluster */
-u_int16_t res;/* [-r] reserved sectors */
-u_int8_t nft;/* [-n] number of FATs */
-u_int16_t rde;/* [-e] root directory entries */
-u_int16_t sec;/* [-s] total sectors */
-u_int8_t mid;/* [-m] media descriptor */
-u_int16_t spf;/* [-a] sectors per FAT */
-u_int16_t spt;/* [-u] sectors per track */
-u_int16_t hds;/* [-h] drive heads */
-u_int32_t hid;/* [-o] hidden sectors */
-u_int32_t bsec; /* [-s] big total sectors */
+u_int16_t bpbBytesPerSec; /* [-S] bytes per sector */
+u_int8_t bpbSecPerClust; /* [-c] sectors per cluster */
+u_int16_t bpbResSectors; /* [-r] reserved sectors */
+u_int8_t bpbFATs;/* [-n] number of FATs */
+u_int16_t bpbRootDirEnts; /* [-e] root directory entries */
+u_int16_t bpbSectors; /* [-s] total sectors */
+u_int8_t bpbMedia; /* [-m] media descriptor */
+u_int16_t bpbFATsecs; /* [-a] sectors per FAT */
+u_int16_t bpbSecPerTrack; /* [-u] sectors per track */
+u_int16_t bpbHeads; /* [-h] drive heads */
+u_int32_t bpbHiddenSecs; /* [-o] hidden sectors */
+u_int32_t bpbHugeSectors; /* [-s] big total sectors */
};
/* FAT32 extensions */
struct bsxbpb {
-u_int32_t bspf; /* [-a] big sectors per FAT */
-u_int16_t xflg; /* control flags */
-u_int16_t vers; /* file system version */
-u_int32_t rdcl; /* root directory start cluster */
-u_int16_t infs; /* [-i] file system info sector */
-u_int16_t bkbs; /* [-k] backup boot sector */
+u_int32_t bpbBigFATsecs; /* [-a] big sectors per FAT */
+u_int16_t bpbExtFlags;/* control flags */
+u_int16_t bpbFSVers; /* file system version */
+u_int32_t bpbRootClust; /* root directory start cluster */
+u_int16_t bpbFSInfo; /* [-i] file system info sector */
+u_int16_t bpbBackup; /* [-k] backup boot sector */
};
.Ed
.Sh LIMITATION
Modified: stable/9/sbin/newfs_msdos/newfs_msdos.c
==
--- stable/9/sbin/newfs_msdos/newfs_msdos.c Thu Jan 5 01:35:01 2012
(r229549)
+++ stable/9/sbin/newfs_msdos/newfs_msdos.c Thu Jan 5 01:40:42 2012
(r229550)
@@ -66,7 +66,7 @@ static const char rcsid[] =
#define MINCLS12 1U /* minimum FAT12 clusters */
#define MINCLS16 0x1000U /* minimum FAT16 clusters */
#define MINCLS32 2U /* minimum FAT32 clusters */
-#define MAXCLS12 0xfedU /* maximum FAT12 clusters */
+#define MAXCLS12 0xfedU /* maximum FAT12 clusters */
#define MAXCLS16 0xfff5U /* maximum FAT16 clusters */
#define MAXCLS32 0xff5U /* maximum FAT32 clusters */
@@ -97,7 +97,7 @@ static const char rcsid[] =
#define argtox(arg, lo, msg) argtou(arg, lo, UINT_MAX, msg)
struct bs {
-u_int8_t bsJump[3];/* bootstrap entry point */
+u_int8_t bsJump[3];/* bootstrap entry point */
u_int8_t bsOemName[8]; /* OEM name and version */
};
@@ -123,7 +123,7 @@ struct bsxbpb {
u_int8_t bpbRootClust[4]; /* root directory start cluster */
u_int8_t bpbFSInfo[2]; /* file system info sector */
u_int8_t bpbBackup[2]; /* backup boot sector */
-u_int8_t bpbReserved[12]; /* reserved */
+u_int8_t bpbReserved[12]; /* reserved */
};
struct bsx {
@@ -136,13 +136,13 @@ struct bsx {
};
struct de {
-u_int8_t deName[11]; /* name and extension */
-u_int8_t deAttributes; /* attributes */
-u_int8_t rsvd[10];
svn commit: r229551 - in stable/9/contrib/libstdc++: . config/os/aix include/bits include/ext include/tr1 libsupc++ src
Author: pfg Date: Thu Jan 5 01:48:25 2012 New Revision: 229551 URL: http://svn.freebsd.org/changeset/base/229551 Log: MFC: r228780 Update libstdc++ with small changes up to the latest rev. (135556) from the gcc 4.2 branch. The libraries in the gcc-4_2-branch remained under the LGPLv2. Reviewed by: mm Approved by: jhb (mentor) Modified: stable/9/contrib/libstdc++/ChangeLog stable/9/contrib/libstdc++/config/os/aix/os_defines.h stable/9/contrib/libstdc++/include/bits/allocator.h stable/9/contrib/libstdc++/include/bits/basic_string.h stable/9/contrib/libstdc++/include/bits/fstream.tcc stable/9/contrib/libstdc++/include/bits/locale_facets.tcc stable/9/contrib/libstdc++/include/ext/atomicity.h stable/9/contrib/libstdc++/include/ext/codecvt_specializations.h stable/9/contrib/libstdc++/include/ext/concurrence.h stable/9/contrib/libstdc++/include/ext/vstring.h stable/9/contrib/libstdc++/include/tr1/boost_shared_ptr.h stable/9/contrib/libstdc++/include/tr1/random stable/9/contrib/libstdc++/libsupc++/eh_personality.cc stable/9/contrib/libstdc++/libsupc++/typeinfo stable/9/contrib/libstdc++/src/valarray-inst.cc Directory Properties: stable/9/contrib/libstdc++/ (props changed) Modified: stable/9/contrib/libstdc++/ChangeLog == --- stable/9/contrib/libstdc++/ChangeLogThu Jan 5 01:40:42 2012 (r229550) +++ stable/9/contrib/libstdc++/ChangeLogThu Jan 5 01:48:25 2012 (r229551) @@ -1,3 +1,133 @@ +2008-05-19 Release Manager + + * GCC 4.2.4 released. + +2008-03-13 David Edelsohn + + Backport from mainline: + 2008-01-26 David Edelsohn + +PR target/34794 +* config/os/aix/os_defines.h: Define __COMPATMATH__. + +2008-02-14 Kaveh R. Ghazi + + * testsuite/27_io/fpos/14320-1.cc: Check for "long long" and + remove XFAIL. + +2008-02-01 Release Manager + + * GCC 4.2.3 released. + +2008-01-06 Ted Phelps + + PR c++/34152 + * libsupc++/eh_personality.cc (PERSONALITY_FUNCTION): Check + _GLIBCXX_HAVE_GETIPINFO instead of HAVE_GETIPINFO. + +2008-01-05 Paolo Carlini + + PR libstdc++/34680 + + Revert: + 2007-12-17 Jonathan Wakely + * include/bits/locale_facets.tcc (has_facet, use_facet): Simplify + RTTI checks. + + 2007-12-14 Benjamin Kosnik + +PR libstdc++/30127 +PR libstdc++/34449 +* include/bits/locale_facets.tcc (use_facet): Check facet hierarchy. +(has_facet): Same. +* testsuite/22_locale/global_templates/user_facet_hierarchies.cc: New. +* testsuite/22_locale/global_templates/ +standard_facet_hierarchies.cc: New. + +2007-12-17 Jonathan Wakely + + * include/bits/locale_facets.tcc (has_facet, use_facet): Simplify + RTTI checks. + +2007-12-17 Benjamin Kosnik + + * testsuite/22_locale/global_templates/ + standard_facet_hierarchies.cc: Fix for generic locale model. + +2007-12-14 Benjamin Kosnik + +PR libstdc++/30127 +PR libstdc++/34449 +* include/bits/locale_facets.tcc (use_facet): Check facet hierarchy. +(has_facet): Same. +* testsuite/22_locale/global_templates/user_facet_hierarchies.cc: New. +* testsuite/22_locale/global_templates/ +standard_facet_hierarchies.cc: New. + +2007-11-26 Paolo Carlini + + * include/bits/locale_facets.tcc (num_put<>::_M_insert_int): When + ios_base::showpos and the type is signed and the value is zero, + prepend +. + * testsuite/22_locale/num_put/put/char/12.cc: New. + * testsuite/22_locale/num_put/put/wchar_t/12.cc: Likewise. + +2007-10-20 Paolo Carlini + + * include/tr1/random + (uniform_int<>::_M_call(_UniformRandomNumberGenerator&, result_type, + result_type, true_type)): Fix small thinko. + +2007-10-19 Paolo Carlini + + PR libstdc++/33815 + * include/tr1/random + (uniform_int<>::_M_call(_UniformRandomNumberGenerator&, result_type, + result_type, true_type)): Avoid the modulo (which uses the low-order + bits). + +2007-10-18 Paolo Carlini + + PR libstdc++/33807 + * include/bits/allocator.h (operator==(const allocator<_Tp>&, + const allocator<_Tp>&), operator!=(const allocator<_Tp>&, + const allocator<_Tp>&)): Add. + * testsuite/20_util/memory/allocator/33807.cc: New. + +2007-10-14 Jonathan Wakely + + * docs/html/Makefile: Follow up to libstdc++/14991, remove target. + +2007-10-14 Jonathan Wakely + + * src/valarray-inst.cc, include/ext/atomicity.h, + include/ext/concurrence.h, include/bits/basic_string.h, + include/bits/fstream.tcc, include/ext/vstring.h: Fix comment typos. + +2007-10-14 Jonathan Wakely + + * include/tr1_impl/boost_shared_ptr.h: (__weak_ptr::lock()): Add + missing template argument. + * t
svn commit: r229552 - in stable/8/sys/fs: nfs nfsclient
Author: rmacklem
Date: Thu Jan 5 02:05:15 2012
New Revision: 229552
URL: http://svn.freebsd.org/changeset/base/229552
Log:
MFC: r227743
Post r223774 the NFSv4 client never uses the linked list with the
head nfsc_defunctlockowner. This patch simply removes the code that
loops through this always empty list, since the code no longer does
anything useful. It should not have any effect on the client's
behaviour.
Modified:
stable/8/sys/fs/nfs/nfsclstate.h
stable/8/sys/fs/nfsclient/nfs_clstate.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/fs/nfs/nfsclstate.h
==
--- stable/8/sys/fs/nfs/nfsclstate.hThu Jan 5 01:48:25 2012
(r229551)
+++ stable/8/sys/fs/nfs/nfsclstate.hThu Jan 5 02:05:15 2012
(r229552)
@@ -48,7 +48,6 @@ struct nfsclclient {
struct nfsclownerhead nfsc_owner;
struct nfscldeleghead nfsc_deleg;
struct nfscldeleghash nfsc_deleghash[NFSCLDELEGHASHSIZE];
- struct nfscllockownerhead nfsc_defunctlockowner;
struct nfsv4lock nfsc_lock;
struct proc *nfsc_renewthread;
struct nfsmount *nfsc_nmp;
Modified: stable/8/sys/fs/nfsclient/nfs_clstate.c
==
--- stable/8/sys/fs/nfsclient/nfs_clstate.c Thu Jan 5 01:48:25 2012
(r229551)
+++ stable/8/sys/fs/nfsclient/nfs_clstate.c Thu Jan 5 02:05:15 2012
(r229552)
@@ -699,7 +699,6 @@ nfscl_getcl(vnode_t vp, struct ucred *cr
{
struct nfsclclient *clp;
struct nfsclclient *newclp = NULL;
- struct nfscllockowner *lp, *nlp;
struct mount *mp;
struct nfsmount *nmp;
char uuid[HOSTUUIDLEN];
@@ -744,7 +743,6 @@ nfscl_getcl(vnode_t vp, struct ucred *cr
TAILQ_INIT(&clp->nfsc_deleg);
for (i = 0; i < NFSCLDELEGHASHSIZE; i++)
LIST_INIT(&clp->nfsc_deleghash[i]);
- LIST_INIT(&clp->nfsc_defunctlockowner);
clp->nfsc_flags = NFSCLFLAGS_INITED;
clp->nfsc_clientidrev = 1;
clp->nfsc_cbident = nfscl_nextcbident();
@@ -793,11 +791,6 @@ nfscl_getcl(vnode_t vp, struct ucred *cr
NFSUNLOCKCLSTATE();
return (EACCES);
}
- /* get rid of defunct lockowners */
- LIST_FOREACH_SAFE(lp, &clp->nfsc_defunctlockowner, nfsl_list,
- nlp) {
- nfscl_freelockowner(lp, 0);
- }
/*
* If RFC3530 Sec. 14.2.33 is taken literally,
* NFSERR_CLIDINUSE will be returned persistently for the
@@ -1537,13 +1530,6 @@ nfscl_cleanclient(struct nfsclclient *cl
{
struct nfsclowner *owp, *nowp;
struct nfsclopen *op, *nop;
- struct nfscllockowner *lp, *nlp;
-
-
- /* get rid of defunct lockowners */
- LIST_FOREACH_SAFE(lp, &clp->nfsc_defunctlockowner, nfsl_list, nlp) {
- nfscl_freelockowner(lp, 0);
- }
/* Now, all the OpenOwners, etc. */
LIST_FOREACH_SAFE(owp, &clp->nfsc_owner, nfsow_list, nowp) {
@@ -1717,12 +1703,6 @@ nfscl_cleanup_common(struct nfsclclient
}
owp = nowp;
}
-
- /* and check the defunct list */
- LIST_FOREACH(lp, &clp->nfsc_defunctlockowner, nfsl_list) {
- if (!NFSBCMP(lp->nfsl_owner, own, NFSV4CL_LOCKNAMELEN))
- lp->nfsl_defunct = 1;
- }
}
#if defined(APPLEKEXT) || defined(__FreeBSD__)
@@ -1735,7 +1715,6 @@ static void
nfscl_cleanupkext(struct nfsclclient *clp)
{
struct nfsclowner *owp, *nowp;
- struct nfscllockowner *lp;
NFSPROCLISTLOCK();
NFSLOCKCLSTATE();
@@ -1743,12 +1722,6 @@ nfscl_cleanupkext(struct nfsclclient *cl
if (nfscl_procdoesntexist(owp->nfsow_owner))
nfscl_cleanup_common(clp, owp->nfsow_owner);
}
-
- /* and check the defunct list */
- LIST_FOREACH(lp, &clp->nfsc_defunctlockowner, nfsl_list) {
- if (nfscl_procdoesntexist(lp->nfsl_owner))
- lp->nfsl_defunct = 1;
- }
NFSUNLOCKCLSTATE();
NFSPROCLISTUNLOCK();
}
@@ -1905,11 +1878,6 @@ nfscl_recover(struct nfsclclient *clp, s
NFSUNLOCKREQ();
splx(s);
- /* get rid of defunct lockowners */
- LIST_FOREACH_SAFE(lp, &clp->nfsc_defunctlockowner, nfsl_list, nlp) {
- nfscl_freelockowner(lp, 0);
- }
-
/*
* Now, mark all delegations "need reclaim".
*/
@@ -2157,7 +2125,6 @@ nfscl_recover(struct nfsclclient *clp,
svn commit: r229554 - stable/9/contrib/gcc
Author: pfg
Date: Thu Jan 5 02:36:37 2012
New Revision: 229554
URL: http://svn.freebsd.org/changeset/base/229554
Log:
MFC: r228756
Clean an inconsistency with -ffinite-math-only.
Backported from the gcc-4_3-branch, revision (118001)
under the GPLv2.
This issue was also fixed in Apple's gcc.
PR: 157025
Reviewed by: mm
Approved by: jhb (mentor)
Modified:
stable/9/contrib/gcc/ChangeLog.gcc43
stable/9/contrib/gcc/builtins.c
Directory Properties:
stable/9/contrib/gcc/ (props changed)
Modified: stable/9/contrib/gcc/ChangeLog.gcc43
==
--- stable/9/contrib/gcc/ChangeLog.gcc43Thu Jan 5 02:16:55 2012
(r229553)
+++ stable/9/contrib/gcc/ChangeLog.gcc43Thu Jan 5 02:36:37 2012
(r229554)
@@ -96,6 +96,14 @@
* doc/invoke.texi: Add entry about geode processor.
+2006-10-24 Richard Guenther
+
+ PR middle-end/28796
+ * builtins.c (fold_builtin_classify): Use HONOR_INFINITIES
+ and HONOR_NANS instead of MODE_HAS_INFINITIES and MODE_HAS_NANS
+ for deciding optimizations in consistency with fold-const.c
+ (fold_builtin_unordered_cmp): Likewise.
+
2006-10-22 H.J. Lu (r117958)
* config.gcc (i[34567]86-*-*): Add tmmintrin.h to extra_headers.
Modified: stable/9/contrib/gcc/builtins.c
==
--- stable/9/contrib/gcc/builtins.c Thu Jan 5 02:16:55 2012
(r229553)
+++ stable/9/contrib/gcc/builtins.c Thu Jan 5 02:36:37 2012
(r229554)
@@ -8720,7 +8720,7 @@ fold_builtin_classify (tree fndecl, tree
switch (builtin_index)
{
case BUILT_IN_ISINF:
- if (!MODE_HAS_INFINITIES (TYPE_MODE (TREE_TYPE (arg
+ if (!HONOR_INFINITIES (TYPE_MODE (TREE_TYPE (arg
return omit_one_operand (type, integer_zero_node, arg);
if (TREE_CODE (arg) == REAL_CST)
@@ -8736,8 +8736,8 @@ fold_builtin_classify (tree fndecl, tree
return NULL_TREE;
case BUILT_IN_FINITE:
- if (!MODE_HAS_NANS (TYPE_MODE (TREE_TYPE (arg)))
- && !MODE_HAS_INFINITIES (TYPE_MODE (TREE_TYPE (arg
+ if (!HONOR_NANS (TYPE_MODE (TREE_TYPE (arg)))
+ && !HONOR_INFINITIES (TYPE_MODE (TREE_TYPE (arg
return omit_one_operand (type, integer_zero_node, arg);
if (TREE_CODE (arg) == REAL_CST)
@@ -8750,7 +8750,7 @@ fold_builtin_classify (tree fndecl, tree
return NULL_TREE;
case BUILT_IN_ISNAN:
- if (!MODE_HAS_NANS (TYPE_MODE (TREE_TYPE (arg
+ if (!HONOR_NANS (TYPE_MODE (TREE_TYPE (arg
return omit_one_operand (type, integer_zero_node, arg);
if (TREE_CODE (arg) == REAL_CST)
@@ -8833,13 +8833,13 @@ fold_builtin_unordered_cmp (tree fndecl,
if (unordered_code == UNORDERED_EXPR)
{
- if (!MODE_HAS_NANS (TYPE_MODE (TREE_TYPE (arg0
+ if (!HONOR_NANS (TYPE_MODE (TREE_TYPE (arg0
return omit_two_operands (type, integer_zero_node, arg0, arg1);
return fold_build2 (UNORDERED_EXPR, type, arg0, arg1);
}
- code = MODE_HAS_NANS (TYPE_MODE (TREE_TYPE (arg0))) ? unordered_code
- : ordered_code;
+ code = HONOR_NANS (TYPE_MODE (TREE_TYPE (arg0))) ? unordered_code
+ : ordered_code;
return fold_build1 (TRUTH_NOT_EXPR, type,
fold_build2 (code, type, arg0, arg1));
}
___
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: r229556 - head/sys/mips/conf
Author: adrian Date: Thu Jan 5 03:38:34 2012 New Revision: 229556 URL: http://svn.freebsd.org/changeset/base/229556 Log: Use geom_uncompress now, rather than geom_uzip. This results in a much smaller rootfs image and it easily fits in the 8MB flash. Modified: head/sys/mips/conf/PB47 Modified: head/sys/mips/conf/PB47 == --- head/sys/mips/conf/PB47 Thu Jan 5 03:22:21 2012(r229555) +++ head/sys/mips/conf/PB47 Thu Jan 5 03:38:34 2012(r229556) @@ -40,12 +40,12 @@ nooptions IEEE80211_SUPPORT_TDMA #options GEOM_PART_MBR #options MSDOSFS -# uzip - to boot natively from flash -device geom_uzip -optionsGEOM_UZIP +# uncompress - to boot read-only lzma natively from flash +device geom_uncompress +optionsGEOM_UNCOMPRESS # Used for the static uboot partition map device geom_map # Boot off of the rootfs, as defined in the geom_map setup. -optionsROOTDEVNAME=\"ufs:map/rootfs.uzip\" +optionsROOTDEVNAME=\"ufs:map/rootfs.uncompress\" ___ 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: r229557 - in stable/9/lib: libc libc/gen libc/stdtime msun msun/man
Author: eadler (ports committer) Date: Thu Jan 5 04:36:57 2012 New Revision: 229557 URL: http://svn.freebsd.org/changeset/base/229557 Log: Reparent mergeinfo introduced in r229461 on lib/msun/man and lib/libc/gen to more appropriate directories. This is an intentional direct commit to the stable/9 branch. Approved by: lstewart Modified: Directory Properties: stable/9/lib/libc/ (props changed) stable/9/lib/libc/gen/ (props changed) stable/9/lib/libc/stdtime/ (props changed) stable/9/lib/msun/ (props changed) stable/9/lib/msun/man/ (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"
