Re: svn commit: r204309 - in head/sys: amd64/amd64 amd64/isa conf i386/bios i386/cpufreq i386/i386 i386/isa i386/xen isa modules/bios/smbios modules/bios/vpd modules/cpufreq pc98/pc98 x86 x86/bios x86
On 2010-Feb-28 16:07:32 -0700, "M. Warner Losh" wrote: >In message: <4b8af55c.6040...@freebsd.org> >Nathan Whitehorn writes: >: M. Warner Losh wrote: >: > In message: <20100228195041.ga68...@server.vk2pj.dyndns.org> >: > Peter Jeremy writes: >: > : On 2010-Feb-26 14:57:36 +0100, Attilio Rao >: > wrote: >: > : >For the future, however, probabilly we would need to do something >: > like >: > : >pc98 already does wrt i386 (i386/include/ pc98/include/ >: > amd64/include/ >: > : >just have files wrappers to the generic one under x86/include/ when >: > : >necessary). >: > : : Not that something like this is also critical for getting >: > i386/amd64 >: > : cross compilation to work - one of the blocking issues is that the >: > : correct machine/ includes are not available in cross-compilatio >: > mode. >: > >: > Huh? >: > >: > I cross build all the time, and the machine/ includes are always >: > right, with or without this patch. Maybe you could explain what you >: > mean here... >: > >: I'm guessing what was meant is that one benefit of a merged tree (like >: we will have with powerpc) is that you can do cc -m32 on a 64-bit host >: to get a 32-bit binary, which is less than trivial now. Yep. >True enough. But we don't have anywhere close to a merged tree on >x86, and won't for the foreseeable future. I don't really want to see >an include32, when all the cross building tools exist in the tree >already (see XDEV in Makefile.inc1)... I agree that we don't want an include32 - all that we need is the machine-dependent directory (i386, amd64, ...). > If you are cross building, you >really need a full cross building environment. The -m32 hacks we have >now are, as you describe, insufficient to the task... For building i386 executables in an amd64 world, we already have almost everything needed - the toolchain is present, the libraries are present, most of the headers are present. The only parts of the environment that aren't installed in default are the machine-dependent headers (and some glue to include the appropriate architecture). I'm not saying that installing the i386 headers will magically make '-m32' work but it's a necessary prerequisite. -- Peter Jeremy pgpWeopYVNpfz.pgp Description: PGP signature
svn commit: r204511 - head/lib/libkvm
Author: rwatson
Date: Mon Mar 1 09:46:27 2010
New Revision: 204511
URL: http://svn.freebsd.org/changeset/base/204511
Log:
Not all programs including kvm.h include the necessary headers to use
u_int, so prefer unsigned int.
MFC after:6 days
Pointed out by: bz, kib, Mr Tinderbox
Modified:
head/lib/libkvm/kvm.h
Modified: head/lib/libkvm/kvm.h
==
--- head/lib/libkvm/kvm.h Mon Mar 1 09:39:14 2010(r204510)
+++ head/lib/libkvm/kvm.h Mon Mar 1 09:46:27 2010(r204511)
@@ -69,7 +69,7 @@ struct kvm_swap {
__BEGIN_DECLS
int kvm_close(kvm_t *);
-int kvm_dpcpu_setcpu(kvm_t *, u_int);
+int kvm_dpcpu_setcpu(kvm_t *, unsigned int);
char **kvm_getargv(kvm_t *, const struct kinfo_proc *, int);
int kvm_getcptime(kvm_t *, long *);
char **kvm_getenvv(kvm_t *, const struct kinfo_proc *, int);
___
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: r204514 - stable/8/sys/dev/mpt
Author: mav
Date: Mon Mar 1 11:33:09 2010
New Revision: 204514
URL: http://svn.freebsd.org/changeset/base/204514
Log:
MFC r204356:
Store path for rescan to the right place. This should fix panic on boot,
introduced by r203108.
Modified:
stable/8/sys/dev/mpt/mpt_raid.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)
stable/8/sys/dev/xen/xenpci/ (props changed)
stable/8/sys/netinet/ (props changed)
Modified: stable/8/sys/dev/mpt/mpt_raid.c
==
--- stable/8/sys/dev/mpt/mpt_raid.c Mon Mar 1 10:43:12 2010
(r204513)
+++ stable/8/sys/dev/mpt/mpt_raid.c Mon Mar 1 11:33:09 2010
(r204514)
@@ -690,7 +690,6 @@ mpt_raid_thread(void *arg)
if (mpt->raid_rescan != 0) {
union ccb *ccb;
- struct cam_path *path;
int error;
mpt->raid_rescan = 0;
@@ -699,7 +698,7 @@ mpt_raid_thread(void *arg)
ccb = xpt_alloc_ccb();
MPT_LOCK(mpt);
- error = xpt_create_path(&path, xpt_periph,
+ error = xpt_create_path(&ccb->ccb_h.path, xpt_periph,
cam_sim_path(mpt->phydisk_sim),
CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD);
if (error != CAM_REQ_CMP) {
___
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: r204515 - head/usr.bin/netstat
Author: rwatson
Date: Mon Mar 1 12:11:37 2010
New Revision: 204515
URL: http://svn.freebsd.org/changeset/base/204515
Log:
Prefer vocabulary of 'Current' and 'Limit' to 'Value' and 'Maximum' in
netstat -Q.
MFC after:6 days
Sponsored by: Juniper Networks
Modified:
head/usr.bin/netstat/netisr.c
Modified: head/usr.bin/netstat/netisr.c
==
--- head/usr.bin/netstat/netisr.c Mon Mar 1 11:33:09 2010
(r204514)
+++ head/usr.bin/netstat/netisr.c Mon Mar 1 12:11:37 2010
(r204515)
@@ -485,7 +485,7 @@ netisr_stats(void *kvmd)
}
printf("Configuration:\n");
- printf("%-25s %12s %12s\n", "Setting", "Value", "Maximum");
+ printf("%-25s %12s %12s\n", "Setting", "Current", "Limit");
printf("%-25s %12u %12u\n", "Thread count", numthreads, maxthreads);
printf("%-25s %12u %12u\n", "Default queue limit", defaultqlimit,
maxqlimit);
___
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: r204309 - in head/sys: amd64/amd64 amd64/isa conf i386/bios i386/cpufreq i386/i386 i386/isa i386/xen isa modules/bios/smbios modules/bios/vpd modules/cpufreq pc98/pc98 x86 x86/bios x86
On Sun, Feb 28, 2010 at 04:07:32PM -0700, M. Warner Losh wrote: > In message: <4b8af55c.6040...@freebsd.org> > Nathan Whitehorn writes: > : M. Warner Losh wrote: > : > In message: <20100228195041.ga68...@server.vk2pj.dyndns.org> > : > Peter Jeremy writes: > : > : On 2010-Feb-26 14:57:36 +0100, Attilio Rao > : > wrote: > : > : >For the future, however, probabilly we would need to do something > : > like > : > : >pc98 already does wrt i386 (i386/include/ pc98/include/ > : > amd64/include/ > : > : >just have files wrappers to the generic one under x86/include/ when > : > : >necessary). > : > : : Not that something like this is also critical for getting > : > i386/amd64 > : > : cross compilation to work - one of the blocking issues is that the > : > : correct machine/ includes are not available in cross-compilatio > : > mode. > : > > : > Huh? > : > > : > I cross build all the time, and the machine/ includes are always > : > right, with or without this patch. Maybe you could explain what you > : > mean here... > : > > : > The issue is that old code has > : > > : > #include > : > > : > or whatever in it, and we need to have an i386/isa.h that's just > : > #include > : > > : > Warner > : > > : I'm guessing what was meant is that one benefit of a merged tree (like > : we will have with powerpc) is that you can do cc -m32 on a 64-bit host > : to get a 32-bit binary, which is less than trivial now. > > True enough. But we don't have anywhere close to a merged tree on > x86, and won't for the foreseeable future. I don't really want to see > an include32, when all the cross building tools exist in the tree > already (see XDEV in Makefile.inc1)... If you are cross building, you > really need a full cross building environment. The -m32 hacks we have > now are, as you describe, insufficient to the task... -m32 is not a hack, it is a standard feature on Linux and Solaris, allowing to build both 32 and 64 bit binaries in the host environment, not going to cross-compilation or chroot. It is very much missing on the FreeBSD. Merged x86 tree is ortoghonal to this feature. pgprNKQcJVyE2.pgp Description: PGP signature
svn commit: r204518 - in head/sys: amd64/amd64 i386/i386
Author: jhb
Date: Mon Mar 1 13:56:15 2010
New Revision: 204518
URL: http://svn.freebsd.org/changeset/base/204518
Log:
Print the contents of the miscellaneous (MISC) register to the console if
it is valid along with the other register values when a machine check is
encountered.
MFC after:1 week
Modified:
head/sys/amd64/amd64/mca.c
head/sys/i386/i386/mca.c
Modified: head/sys/amd64/amd64/mca.c
==
--- head/sys/amd64/amd64/mca.c Mon Mar 1 13:55:28 2010(r204517)
+++ head/sys/amd64/amd64/mca.c Mon Mar 1 13:56:15 2010(r204518)
@@ -288,6 +288,8 @@ mca_log(const struct mca_record *rec)
printf("\n");
if (rec->mr_status & MC_STATUS_ADDRV)
printf("MCA: Address 0x%llx\n", (long long)rec->mr_addr);
+ if (rec->mr_status & MC_STATUS_MISCV)
+ printf("MCA: Misc 0x%llx\n", (long long)rec->mr_misc);
}
static int __nonnull(2)
Modified: head/sys/i386/i386/mca.c
==
--- head/sys/i386/i386/mca.cMon Mar 1 13:55:28 2010(r204517)
+++ head/sys/i386/i386/mca.cMon Mar 1 13:56:15 2010(r204518)
@@ -288,6 +288,8 @@ mca_log(const struct mca_record *rec)
printf("\n");
if (rec->mr_status & MC_STATUS_ADDRV)
printf("MCA: Address 0x%llx\n", (long long)rec->mr_addr);
+ if (rec->mr_status & MC_STATUS_MISCV)
+ printf("MCA: Misc 0x%llx\n", (long long)rec->mr_misc);
}
static int __nonnull(2)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r204519 - head/sys/kern
Author: bruno
Date: Mon Mar 1 14:27:16 2010
New Revision: 204519
URL: http://svn.freebsd.org/changeset/base/204519
Log:
Deliver siginfo when signal is generated by thr_kill(2) (SI_USER with properly
filled si_uid and si_pid).
Reported by: Joel Bertrand
PR: 141956
Reviewed by: kib
MFC after:2 weeks
Modified:
head/sys/kern/kern_thr.c
Modified: head/sys/kern/kern_thr.c
==
--- head/sys/kern/kern_thr.cMon Mar 1 13:56:15 2010(r204518)
+++ head/sys/kern/kern_thr.cMon Mar 1 14:27:16 2010(r204519)
@@ -303,12 +303,18 @@ int
thr_kill(struct thread *td, struct thr_kill_args *uap)
/* long id, int sig */
{
+ ksiginfo_t ksi;
struct thread *ttd;
struct proc *p;
int error;
p = td->td_proc;
error = 0;
+ ksiginfo_init(&ksi);
+ ksi.ksi_signo = uap->sig;
+ ksi.ksi_code = SI_USER;
+ ksi.ksi_pid = p->p_pid;
+ ksi.ksi_uid = td->td_ucred->cr_ruid;
PROC_LOCK(p);
if (uap->id == -1) {
if (uap->sig != 0 && !_SIG_VALID(uap->sig)) {
@@ -320,7 +326,7 @@ thr_kill(struct thread *td, struct thr_k
error = 0;
if (uap->sig == 0)
break;
- tdsignal(p, ttd, uap->sig, NULL);
+ tdsignal(p, ttd, uap->sig, &ksi);
}
}
}
@@ -336,7 +342,7 @@ thr_kill(struct thread *td, struct thr_k
else if (!_SIG_VALID(uap->sig))
error = EINVAL;
else
- tdsignal(p, ttd, uap->sig, NULL);
+ tdsignal(p, ttd, uap->sig, &ksi);
}
PROC_UNLOCK(p);
return (error);
@@ -346,6 +352,7 @@ int
thr_kill2(struct thread *td, struct thr_kill2_args *uap)
/* pid_t pid, long id, int sig */
{
+ ksiginfo_t ksi;
struct thread *ttd;
struct proc *p;
int error;
@@ -362,6 +369,11 @@ thr_kill2(struct thread *td, struct thr_
error = p_cansignal(td, p, uap->sig);
if (error == 0) {
+ ksiginfo_init(&ksi);
+ ksi.ksi_signo = uap->sig;
+ ksi.ksi_code = SI_USER;
+ ksi.ksi_pid = td->td_proc->p_pid;
+ ksi.ksi_uid = td->td_ucred->cr_ruid;
if (uap->id == -1) {
if (uap->sig != 0 && !_SIG_VALID(uap->sig)) {
error = EINVAL;
@@ -372,7 +384,8 @@ thr_kill2(struct thread *td, struct thr_
error = 0;
if (uap->sig == 0)
break;
- tdsignal(p, ttd, uap->sig,
NULL);
+ tdsignal(p, ttd, uap->sig,
+ &ksi);
}
}
}
@@ -388,7 +401,7 @@ thr_kill2(struct thread *td, struct thr_
else if (!_SIG_VALID(uap->sig))
error = EINVAL;
else
- tdsignal(p, ttd, uap->sig, NULL);
+ tdsignal(p, ttd, uap->sig, &ksi);
}
}
PROC_UNLOCK(p);
___
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: r204309 - in head/sys: amd64/amd64 amd64/isa conf i386/bios i386/cpufreq i386/i386 i386/isa i386/xen isa modules/bios/smbios modules/bios/vpd modules/cpufreq pc98/pc98 x86 x86/bios x86
In message: <20100301092144.gs2...@deviant.kiev.zoral.com.ua> Kostik Belousov writes: : On Sun, Feb 28, 2010 at 04:07:32PM -0700, M. Warner Losh wrote: : > In message: <4b8af55c.6040...@freebsd.org> : > Nathan Whitehorn writes: : > : M. Warner Losh wrote: : > : > In message: <20100228195041.ga68...@server.vk2pj.dyndns.org> : > : > Peter Jeremy writes: : > : > : On 2010-Feb-26 14:57:36 +0100, Attilio Rao : > : > wrote: : > : > : >For the future, however, probabilly we would need to do something : > : > like : > : > : >pc98 already does wrt i386 (i386/include/ pc98/include/ : > : > amd64/include/ : > : > : >just have files wrappers to the generic one under x86/include/ when : > : > : >necessary). : > : > : : Not that something like this is also critical for getting : > : > i386/amd64 : > : > : cross compilation to work - one of the blocking issues is that the : > : > : correct machine/ includes are not available in cross-compilatio : > : > mode. : > : > : > : > Huh? : > : > : > : > I cross build all the time, and the machine/ includes are always : > : > right, with or without this patch. Maybe you could explain what you : > : > mean here... : > : > : > : > The issue is that old code has : > : > : > : > #include : > : > : > : > or whatever in it, and we need to have an i386/isa.h that's just : > : > #include : > : > : > : > Warner : > : > : > : I'm guessing what was meant is that one benefit of a merged tree (like : > : we will have with powerpc) is that you can do cc -m32 on a 64-bit host : > : to get a 32-bit binary, which is less than trivial now. : > : > True enough. But we don't have anywhere close to a merged tree on : > x86, and won't for the foreseeable future. I don't really want to see : > an include32, when all the cross building tools exist in the tree : > already (see XDEV in Makefile.inc1)... If you are cross building, you : > really need a full cross building environment. The -m32 hacks we have : > now are, as you describe, insufficient to the task... : : -m32 is not a hack, it is a standard feature on Linux and Solaris, : allowing to build both 32 and 64 bit binaries in the host environment, : not going to cross-compilation or chroot. It is very much missing on : the FreeBSD. : : Merged x86 tree is ortoghonal to this feature. I guess what I'm saying is that -m32, as it is implemented today, is a hack. Mostly because it is missing all the pieces it needs to make it work. Warner ___ 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: r204309 - in head/sys: amd64/amd64 amd64/isa conf i386/bios i386/cpufreq i386/i386 i386/isa i386/xen isa modules/bios/smbios modules/bios/vpd modules/cpufreq pc98/pc98 x86 x86/bios x86
In message: <20100301091756.ga73...@server.vk2pj.dyndns.org> Peter Jeremy writes: : On 2010-Feb-28 16:07:32 -0700, "M. Warner Losh" wrote: : >In message: <4b8af55c.6040...@freebsd.org> : >Nathan Whitehorn writes: : >: M. Warner Losh wrote: : >: > In message: <20100228195041.ga68...@server.vk2pj.dyndns.org> : >: > Peter Jeremy writes: : >: > : On 2010-Feb-26 14:57:36 +0100, Attilio Rao : >: > wrote: : >: > : >For the future, however, probabilly we would need to do something : >: > like : >: > : >pc98 already does wrt i386 (i386/include/ pc98/include/ : >: > amd64/include/ : >: > : >just have files wrappers to the generic one under x86/include/ when : >: > : >necessary). : >: > : : Not that something like this is also critical for getting : >: > i386/amd64 : >: > : cross compilation to work - one of the blocking issues is that the : >: > : correct machine/ includes are not available in cross-compilatio : >: > mode. : >: > : >: > Huh? : >: > : >: > I cross build all the time, and the machine/ includes are always : >: > right, with or without this patch. Maybe you could explain what you : >: > mean here... : >: > : >: I'm guessing what was meant is that one benefit of a merged tree (like : >: we will have with powerpc) is that you can do cc -m32 on a 64-bit host : >: to get a 32-bit binary, which is less than trivial now. : : Yep. : : >True enough. But we don't have anywhere close to a merged tree on : >x86, and won't for the foreseeable future. I don't really want to see : >an include32, when all the cross building tools exist in the tree : >already (see XDEV in Makefile.inc1)... : : I agree that we don't want an include32 - all that we need is the : machine-dependent directory (i386, amd64, ...). No. We need a merged tree to make it actually work, otherwise machine/foo.h won't work right. simply having both i386/foo.h and amd64/foo.h is not sufficient. : > If you are cross building, you : >really need a full cross building environment. The -m32 hacks we have : >now are, as you describe, insufficient to the task... : : For building i386 executables in an amd64 world, we already have : almost everything needed - the toolchain is present, the libraries are : present, most of the headers are present. The only parts of the : environment that aren't installed in default are the machine-dependent : headers (and some glue to include the appropriate architecture). : : I'm not saying that installing the i386 headers will magically make : '-m32' work but it's a necessary prerequisite. We need merged support for both out of one tree, and we're nowhere near that. The toolchain also is only mostly present, last time I looked there were small bits and pieces missing here and there. Also, -m32 is a bit of a hack, since it isn't as useful as you'd like once you start to compile ports. Too many of them don't like it when you pass in a cc that has args with it, or they don't religiously use $CC, which means you get some 64-bit and some 32-bit goo. We have the same problem with MIPS... Warner ___ 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: r204309 - in head/sys: amd64/amd64 amd64/isa conf i386/bios i386/cpufreq i386/i386 i386/isa i386/xen isa modules/bios/smbios modules/bios/vpd modules/cpufreq pc98/pc98 x86 x86/bios x86
In message: <20100301092144.gs2...@deviant.kiev.zoral.com.ua> Kostik Belousov writes: : -m32 is not a hack, it is a standard feature on Linux and Solaris, : allowing to build both 32 and 64 bit binaries in the host environment, : not going to cross-compilation or chroot. It is very much missing on : the FreeBSD. Having thought about it, I can see how we can make it work, so I withdraw my 'hack' statement. You're right. On Solaris and Linux, how well does autoconf cope with using CC="cc -m32"? I've had issues with similar constructs on MIPS to select diffrent word sizes or ABIs. : Merged x86 tree is ortoghonal to this feature. Yes, that's a much better way of saying what I was trying to say. Warner ___ 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: r204520 - in head/sys/dev: cm ofw stge
Author: joel (doc committer)
Date: Mon Mar 1 16:52:11 2010
New Revision: 204520
URL: http://svn.freebsd.org/changeset/base/204520
Log:
The NetBSD Foundation has granted permission to remove clause 3 and 4 from
their software.
Obtained from:NetBSD
Modified:
head/sys/dev/cm/if_cm_isa.c
head/sys/dev/cm/smc90cx6.c
head/sys/dev/cm/smc90cx6reg.h
head/sys/dev/cm/smc90cx6var.h
head/sys/dev/ofw/ofw_pci.h
head/sys/dev/stge/if_stge.c
head/sys/dev/stge/if_stgereg.h
Modified: head/sys/dev/cm/if_cm_isa.c
==
--- head/sys/dev/cm/if_cm_isa.c Mon Mar 1 14:27:16 2010(r204519)
+++ head/sys/dev/cm/if_cm_isa.c Mon Mar 1 16:52:11 2010(r204520)
@@ -18,13 +18,6 @@ __FBSDID("$FreeBSD$");
* 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.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *This product includes software developed by the NetBSD
- *Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *contributors may be used to endorse or promote products derived
- *from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Modified: head/sys/dev/cm/smc90cx6.c
==
--- head/sys/dev/cm/smc90cx6.c Mon Mar 1 14:27:16 2010(r204519)
+++ head/sys/dev/cm/smc90cx6.c Mon Mar 1 16:52:11 2010(r204520)
@@ -18,13 +18,6 @@ __FBSDID("$FreeBSD$");
* 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.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *This product includes software developed by the NetBSD
- *Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *contributors may be used to endorse or promote products derived
- *from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Modified: head/sys/dev/cm/smc90cx6reg.h
==
--- head/sys/dev/cm/smc90cx6reg.h Mon Mar 1 14:27:16 2010
(r204519)
+++ head/sys/dev/cm/smc90cx6reg.h Mon Mar 1 16:52:11 2010
(r204520)
@@ -16,13 +16,6 @@
* 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.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *This product includes software developed by the NetBSD
- *Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *contributors may be used to endorse or promote products derived
- *from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Modified: head/sys/dev/cm/smc90cx6var.h
==
--- head/sys/dev/cm/smc90cx6var.h Mon Mar 1 14:27:16 2010
(r204519)
+++ head/sys/dev/cm/smc90cx6var.h Mon Mar 1 16:52:11 2010
(r204520)
@@ -16,13 +16,6 @@
* 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.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *This product includes software developed by the NetBSD
- *Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *contributors may be used to endorse or promote products derived
- *from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
svn commit: r204521 - in head/sys/dev/ath/ath_hal: . ar5212 ar5416
Author: rpaulo
Date: Mon Mar 1 17:04:19 2010
New Revision: 204521
URL: http://svn.freebsd.org/changeset/base/204521
Log:
Properly setup the TX FIFO threshold for AR5416 based chipsets,
including the AR9285. This seems to fix some users's problems.
Submitted by: Jorge Boncompte [DTI2]
Modified:
head/sys/dev/ath/ath_hal/ah_internal.h
head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
head/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c
head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
head/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c
head/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c
Modified: head/sys/dev/ath/ath_hal/ah_internal.h
==
--- head/sys/dev/ath/ath_hal/ah_internal.h Mon Mar 1 16:52:11 2010
(r204520)
+++ head/sys/dev/ath/ath_hal/ah_internal.h Mon Mar 1 17:04:19 2010
(r204521)
@@ -281,6 +281,8 @@ struct ath_hal_private {
uint16_tah_maxPowerLevel; /* calculated max tx power */
u_int ah_tpScale; /* tx power scale factor */
uint32_tah_11nCompat; /* 11n compat controls */
+ uint8_t ah_txtrig_level;/* current Tx trigger level */
+ uint8_t ah_max_txtrig_level;/* max tx trigger level */
/*
* State for regulatory domain handling.
Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
==
--- head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c Mon Mar 1 16:52:11
2010(r204520)
+++ head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c Mon Mar 1 17:04:19
2010(r204521)
@@ -149,6 +149,9 @@ static const struct ath_hal_private ar52
.ah_getInterrupts = ar5212GetInterrupts,
.ah_setInterrupts = ar5212SetInterrupts },
+ .ah_txtrig_level= INIT_TX_FIFO_THRESHOLD,
+ .ah_max_txtrig_level= MAX_TX_FIFO_THRESHOLD,
+
.ah_getChannelEdges = ar5212GetChannelEdges,
.ah_getWirelessModes= ar5212GetWirelessModes,
.ah_eepromRead = ar5212EepromRead,
Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c
==
--- head/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c Mon Mar 1 16:52:11
2010(r204520)
+++ head/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c Mon Mar 1 17:04:19
2010(r204521)
@@ -48,16 +48,20 @@ ar5212UpdateTxTrigLevel(struct ath_hal *
uint32_t txcfg, curLevel, newLevel;
HAL_INT omask;
+ if (AH_PRIVATE(ah)->ah_txtrig_level >=
+ AH_PRIVATE(ah)->ah_max_txtrig_level)
+ return AH_FALSE;
+
/*
* Disable interrupts while futzing with the fifo level.
*/
- omask = ar5212SetInterrupts(ah, ahp->ah_maskReg &~ HAL_INT_GLOBAL);
+ omask = ah->ah_setInterrupts(ah, ahp->ah_maskReg &~ HAL_INT_GLOBAL);
txcfg = OS_REG_READ(ah, AR_TXCFG);
curLevel = MS(txcfg, AR_FTRIG);
newLevel = curLevel;
if (bIncTrigLevel) {/* increase the trigger level */
- if (curLevel < MAX_TX_FIFO_THRESHOLD)
+ if (curLevel < AH_PRIVATE(ah)->ah_max_txtrig_level)
newLevel++;
} else if (curLevel > MIN_TX_FIFO_THRESHOLD)
newLevel--;
@@ -66,8 +70,10 @@ ar5212UpdateTxTrigLevel(struct ath_hal *
OS_REG_WRITE(ah, AR_TXCFG,
(txcfg &~ AR_FTRIG) | SM(newLevel, AR_FTRIG));
+ AH_PRIVATE(ah)->ah_txtrig_level = newLevel;
+
/* re-enable chip interrupts */
- ar5212SetInterrupts(ah, omask);
+ ah->ah_setInterrupts(ah, omask);
return (newLevel != curLevel);
}
Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
==
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Mon Mar 1 16:52:11
2010(r204520)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Mon Mar 1 17:04:19
2010(r204521)
@@ -454,7 +454,10 @@ ar5416InitDMA(struct ath_hal *ah)
OS_REG_WRITE(ah, AR_RXCFG,
(OS_REG_READ(ah, AR_RXCFG) & ~AR_RXCFG_DMASZ_MASK) |
AR_RXCFG_DMASZ_128B);
- /* XXX restore TX trigger level */
+ /* restore TX trigger level */
+ OS_REG_WRITE(ah, AR_TXCFG,
+ (OS_REG_READ(ah, AR_TXCFG) &~ AR_FTRIG) |
+ SM(AH_PRIVATE(ah)->ah_txtrig_level, AR_FTRIG));
/*
* Setup receive FIFO threshold to hold off TX activities
Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c
==
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c Mon Mar 1 16:52:11
2010(r204520)
+++ head/sys/dev/ath
svn commit: r204522 - in head/sys: net netinet
Author: joel (doc committer) Date: Mon Mar 1 17:05:46 2010 New Revision: 204522 URL: http://svn.freebsd.org/changeset/base/204522 Log: The NetBSD Foundation has granted permission to remove clause 3 and 4 from their software. Obtained from:NetBSD Modified: head/sys/net/if_gre.c head/sys/net/if_gre.h head/sys/netinet/ip_gre.c head/sys/netinet/ip_gre.h Modified: head/sys/net/if_gre.c == --- head/sys/net/if_gre.c Mon Mar 1 17:04:19 2010(r204521) +++ head/sys/net/if_gre.c Mon Mar 1 17:05:46 2010(r204522) @@ -18,13 +18,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - *This product includes software developed by the NetBSD - *Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - *contributors may be used to endorse or promote products derived - *from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: head/sys/net/if_gre.h == --- head/sys/net/if_gre.h Mon Mar 1 17:04:19 2010(r204521) +++ head/sys/net/if_gre.h Mon Mar 1 17:05:46 2010(r204522) @@ -16,13 +16,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - *This product includes software developed by the NetBSD - *Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - *contributors may be used to endorse or promote products derived - *from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: head/sys/netinet/ip_gre.c == --- head/sys/netinet/ip_gre.c Mon Mar 1 17:04:19 2010(r204521) +++ head/sys/netinet/ip_gre.c Mon Mar 1 17:05:46 2010(r204522) @@ -17,13 +17,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - *This product includes software developed by the NetBSD - *Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - *contributors may be used to endorse or promote products derived - *from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: head/sys/netinet/ip_gre.h == --- head/sys/netinet/ip_gre.h Mon Mar 1 17:04:19 2010(r204521) +++ head/sys/netinet/ip_gre.h Mon Mar 1 17:05:46 2010(r204522) @@ -16,13 +16,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - *This product includes software developed by the NetBSD - *Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - *contributors may be used to endorse or promote products derived - *from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src
Re: svn commit: r204309 - in head/sys: amd64/amd64 amd64/isa conf i386/bios i386/cpufreq i386/i386 i386/isa i386/xen isa modules/bios/smbios modules/bios/vpd modules/cpufreq pc98/pc98 x86 x86/bios x86
[Stripped Cc: list] On Mon, Mar 01, 2010 at 08:53:14AM -0700, M. Warner Losh wrote: > In message: <20100301092144.gs2...@deviant.kiev.zoral.com.ua> > Kostik Belousov writes: > : -m32 is not a hack, it is a standard feature on Linux and Solaris, > : allowing to build both 32 and 64 bit binaries in the host environment, > : not going to cross-compilation or chroot. It is very much missing on > : the FreeBSD. > > Having thought about it, I can see how we can make it work, so I > withdraw my 'hack' statement. You're right. > > On Solaris and Linux, how well does autoconf cope with using CC="cc > -m32"? I've had issues with similar constructs on MIPS to select > diffrent word sizes or ABIs. On Solaris, -m32 is a default for the SunPRO compilers. Both -m32 and -m64 worked quite good for me. They are very careful to provide both 32 and 64 bit versions of all libraries with the system, and system includes a lot of things, like X/Gnome etc. I never did used -m32 on Linux (knocking on the wood). > > : Merged x86 tree is ortoghonal to this feature. > > Yes, that's a much better way of saying what I was trying to say. > > Warner pgpKMV0jXOADV.pgp Description: PGP signature
svn commit: r204523 - head/sys/compat/linux
Author: joel (doc committer) Date: Mon Mar 1 17:20:04 2010 New Revision: 204523 URL: http://svn.freebsd.org/changeset/base/204523 Log: The NetBSD Foundation has granted permission to remove clause 3 and 4 from their software. Obtained from:NetBSD Modified: head/sys/compat/linux/linux_getcwd.c head/sys/compat/linux/linux_time.c Modified: head/sys/compat/linux/linux_getcwd.c == --- head/sys/compat/linux/linux_getcwd.cMon Mar 1 17:05:46 2010 (r204522) +++ head/sys/compat/linux/linux_getcwd.cMon Mar 1 17:20:04 2010 (r204523) @@ -15,13 +15,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - *This product includes software developed by the NetBSD - *Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - *contributors may be used to endorse or promote products derived - *from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: head/sys/compat/linux/linux_time.c == --- head/sys/compat/linux/linux_time.c Mon Mar 1 17:05:46 2010 (r204522) +++ head/sys/compat/linux/linux_time.c Mon Mar 1 17:20:04 2010 (r204523) @@ -15,13 +15,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - *contributors may be used to endorse or promote products derived - *from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED ___ 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: r204524 - stable/8/sys/dev/isp
Author: mjacob
Date: Mon Mar 1 17:36:45 2010
New Revision: 204524
URL: http://svn.freebsd.org/changeset/base/204524
Log:
MFC of 204397: fix problems with fast posting handles
Modified:
stable/8/sys/dev/isp/isp.c
stable/8/sys/dev/isp/isp_freebsd.c
stable/8/sys/dev/isp/isp_library.c
stable/8/sys/dev/isp/isp_library.h
stable/8/sys/dev/isp/isp_pci.c
stable/8/sys/dev/isp/isp_target.c
stable/8/sys/dev/isp/ispmbox.h
stable/8/sys/dev/isp/ispreg.h
Modified: stable/8/sys/dev/isp/isp.c
==
--- stable/8/sys/dev/isp/isp.c Mon Mar 1 17:20:04 2010(r204523)
+++ stable/8/sys/dev/isp/isp.c Mon Mar 1 17:36:45 2010(r204524)
@@ -108,10 +108,11 @@ static const uint8_t alpa_map[] = {
* Local function prototypes.
*/
static int isp_parse_async(ispsoftc_t *, uint16_t);
+static int isp_parse_async_fc(ispsoftc_t *, uint16_t);
static int isp_handle_other_response(ispsoftc_t *, int, isphdr_t *, uint32_t
*);
static void isp_parse_status(ispsoftc_t *, ispstatusreq_t *, XS_T *, long *);
static void
isp_parse_status_24xx(ispsoftc_t *, isp24xx_statusreq_t *, XS_T *, long *);
-static void isp_fastpost_complete(ispsoftc_t *, uint16_t);
+static void isp_fastpost_complete(ispsoftc_t *, uint32_t);
static int isp_mbox_continue(ispsoftc_t *);
static void isp_scsi_init(ispsoftc_t *);
static void isp_scsi_channel_init(ispsoftc_t *, int);
@@ -1334,23 +1335,24 @@ isp_scsi_init(ispsoftc_t *isp)
}
/*
-* Turn on Fast Posting, LVD transitions
+* Turn on LVD transitions for ULTRA2 or better and other features
*
-* Ultra2 F/W always has had fast posting (and LVD transitions)
-*
-* Ultra and older (i.e., SBus) cards may not. It's just safer
-* to assume not for them.
+* Now that we have 32 bit handles, don't do any fast posting
+* any more. For Ultra2/Ultra3 cards, we can turn on 32 bit RIO
+* operation or use fast posting. To be conservative, we'll only
+* do this for Ultra3 cards now because the other cards are so
+* rare for this author to find and test with.
*/
MBSINIT(&mbs, MBOX_SET_FW_FEATURES, MBLOGALL, 0);
if (IS_ULTRA2(isp))
mbs.param[1] |= FW_FEATURE_LVD_NOTIFY;
-#ifndefISP_NO_RIO
- if (IS_ULTRA2(isp) || IS_1240(isp))
- mbs.param[1] |= FW_FEATURE_RIO_16BIT;
-#else
- if (IS_ULTRA2(isp) || IS_1240(isp))
+#ifdef ISP_NO_RIO
+ if (IS_ULTRA3(isp))
mbs.param[1] |= FW_FEATURE_FAST_POST;
+#else
+ if (IS_ULTRA3(isp))
+ mbs.param[1] |= FW_FEATURE_RIO_32BIT;
#endif
if (mbs.param[1] != 0) {
uint16_t sfeat = mbs.param[1];
@@ -1604,25 +1606,15 @@ isp_fibre_init(ispsoftc_t *isp)
}
if (IS_2200(isp)) {
/*
-* There seems to just be too much breakage here
-* with RIO and Fast Posting- it probably actually
-* works okay but this driver is messing it up.
-* This card is really ancient by now, so let's
-* just opt for safety and not use the feature.
+* We can't have Fast Posting any more- we now
+* have 32 bit handles.
+*
+* RIO seemed to have to much breakage.
+*
+* Just opt for safety.
*/
-#if0
- if (ISP_FW_NEWER_THAN(isp, 1, 17, 0)) {
- icbp->icb_xfwoptions |= ICBXOPT_RIO_16BIT;
- icbp->icb_fwoptions &= ~ICBOPT_FAST_POST;
- icbp->icb_racctimer = 4;
- icbp->icb_idelaytimer = 8;
- } else {
- icbp->icb_fwoptions |= ICBOPT_FAST_POST;
- }
-#else
icbp->icb_xfwoptions &= ~ICBXOPT_RIO_16BIT;
icbp->icb_fwoptions &= ~ICBOPT_FAST_POST;
-#endif
} else {
/*
* QLogic recommends that FAST Posting be turned
@@ -4860,7 +4852,7 @@ again:
*/
if (sema) {
fmbox:
- if (mbox & 0x4000) {
+ if (mbox & MBOX_COMMAND_COMPLETE) {
isp->isp_intmboxc++;
if (isp->isp_mboxbsy) {
int obits = isp->isp_obits;
@@ -4880,10 +4872,13 @@ again:
} else {
isp_prt(isp, ISP_LOGWARN, "mailbox cmd (0x%x)
with no waiters", mbox);
}
- } else if (isp_parse_async(isp, mbox) < 0) {
- return;
+ } else {
+
svn commit: r204525 - stable/7/sys/dev/isp
Author: mjacob
Date: Mon Mar 1 17:42:06 2010
New Revision: 204525
URL: http://svn.freebsd.org/changeset/base/204525
Log:
MFC of 204397: fix problems with fast posting handles
Modified:
stable/7/sys/dev/isp/isp.c
stable/7/sys/dev/isp/isp_freebsd.c
stable/7/sys/dev/isp/isp_library.c
stable/7/sys/dev/isp/isp_library.h
stable/7/sys/dev/isp/isp_pci.c
stable/7/sys/dev/isp/isp_target.c
stable/7/sys/dev/isp/ispmbox.h
stable/7/sys/dev/isp/ispreg.h
Modified: stable/7/sys/dev/isp/isp.c
==
--- stable/7/sys/dev/isp/isp.c Mon Mar 1 17:36:45 2010(r204524)
+++ stable/7/sys/dev/isp/isp.c Mon Mar 1 17:42:06 2010(r204525)
@@ -108,10 +108,11 @@ static const uint8_t alpa_map[] = {
* Local function prototypes.
*/
static int isp_parse_async(ispsoftc_t *, uint16_t);
+static int isp_parse_async_fc(ispsoftc_t *, uint16_t);
static int isp_handle_other_response(ispsoftc_t *, int, isphdr_t *, uint32_t
*);
static void isp_parse_status(ispsoftc_t *, ispstatusreq_t *, XS_T *, long *);
static void
isp_parse_status_24xx(ispsoftc_t *, isp24xx_statusreq_t *, XS_T *, long *);
-static void isp_fastpost_complete(ispsoftc_t *, uint16_t);
+static void isp_fastpost_complete(ispsoftc_t *, uint32_t);
static int isp_mbox_continue(ispsoftc_t *);
static void isp_scsi_init(ispsoftc_t *);
static void isp_scsi_channel_init(ispsoftc_t *, int);
@@ -1334,23 +1335,24 @@ isp_scsi_init(ispsoftc_t *isp)
}
/*
-* Turn on Fast Posting, LVD transitions
+* Turn on LVD transitions for ULTRA2 or better and other features
*
-* Ultra2 F/W always has had fast posting (and LVD transitions)
-*
-* Ultra and older (i.e., SBus) cards may not. It's just safer
-* to assume not for them.
+* Now that we have 32 bit handles, don't do any fast posting
+* any more. For Ultra2/Ultra3 cards, we can turn on 32 bit RIO
+* operation or use fast posting. To be conservative, we'll only
+* do this for Ultra3 cards now because the other cards are so
+* rare for this author to find and test with.
*/
MBSINIT(&mbs, MBOX_SET_FW_FEATURES, MBLOGALL, 0);
if (IS_ULTRA2(isp))
mbs.param[1] |= FW_FEATURE_LVD_NOTIFY;
-#ifndefISP_NO_RIO
- if (IS_ULTRA2(isp) || IS_1240(isp))
- mbs.param[1] |= FW_FEATURE_RIO_16BIT;
-#else
- if (IS_ULTRA2(isp) || IS_1240(isp))
+#ifdef ISP_NO_RIO
+ if (IS_ULTRA3(isp))
mbs.param[1] |= FW_FEATURE_FAST_POST;
+#else
+ if (IS_ULTRA3(isp))
+ mbs.param[1] |= FW_FEATURE_RIO_32BIT;
#endif
if (mbs.param[1] != 0) {
uint16_t sfeat = mbs.param[1];
@@ -1604,25 +1606,15 @@ isp_fibre_init(ispsoftc_t *isp)
}
if (IS_2200(isp)) {
/*
-* There seems to just be too much breakage here
-* with RIO and Fast Posting- it probably actually
-* works okay but this driver is messing it up.
-* This card is really ancient by now, so let's
-* just opt for safety and not use the feature.
+* We can't have Fast Posting any more- we now
+* have 32 bit handles.
+*
+* RIO seemed to have to much breakage.
+*
+* Just opt for safety.
*/
-#if0
- if (ISP_FW_NEWER_THAN(isp, 1, 17, 0)) {
- icbp->icb_xfwoptions |= ICBXOPT_RIO_16BIT;
- icbp->icb_fwoptions &= ~ICBOPT_FAST_POST;
- icbp->icb_racctimer = 4;
- icbp->icb_idelaytimer = 8;
- } else {
- icbp->icb_fwoptions |= ICBOPT_FAST_POST;
- }
-#else
icbp->icb_xfwoptions &= ~ICBXOPT_RIO_16BIT;
icbp->icb_fwoptions &= ~ICBOPT_FAST_POST;
-#endif
} else {
/*
* QLogic recommends that FAST Posting be turned
@@ -4863,7 +4855,7 @@ again:
*/
if (sema) {
fmbox:
- if (mbox & 0x4000) {
+ if (mbox & MBOX_COMMAND_COMPLETE) {
isp->isp_intmboxc++;
if (isp->isp_mboxbsy) {
int obits = isp->isp_obits;
@@ -4883,10 +4875,13 @@ again:
} else {
isp_prt(isp, ISP_LOGWARN, "mailbox cmd (0x%x)
with no waiters", mbox);
}
- } else if (isp_parse_async(isp, mbox) < 0) {
- return;
+ } else {
+
Re: svn commit: r204475 - head/sys/fs/msdosfs
On Sunday 28 February 2010 12:19:22 pm Konstantin Belousov wrote: > Author: kib > Date: Sun Feb 28 17:19:22 2010 > New Revision: 204475 > URL: http://svn.freebsd.org/changeset/base/204475 > > Log: > Mark msdosfs as mpsafe. Are you planning on implementing support for LOOKUP_SHARED and EXTENDED_SHARED as well? -- 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: r204325 - in stable/7: etc/defaults etc/rc.d share/man/man5
On Thursday 25 February 2010 1:02:52 pm Maksim Yevmenkin wrote: > Author: emax > Date: Thu Feb 25 18:02:52 2010 > New Revision: 204325 > URL: http://svn.freebsd.org/changeset/base/204325 > > Log: > MFC: r203676 > > Introduce new rc.conf variable firewall_coscripts. It can be used to > specify list of executables and/or rc scripts that should be executed > after firewall starts/stops. > > Submitted by: Yuri Kurenkov > Reviewed by:rhodes, rc@ Looks like this broke natd startup on stable/7 because stable/7 rc.d is different from 8 and doesn't know about quietstart/quietstop. Perhaps this should just use 'start' and 'stop' on 7? -- 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: r204526 - stable/7/etc/rc.d
Author: emax
Date: Mon Mar 1 18:58:18 2010
New Revision: 204526
URL: http://svn.freebsd.org/changeset/base/204526
Log:
Use start/stop instead of quietstart/quietstop. Pointy hat goes to me.
Pointed out by: jhb
Modified:
stable/7/etc/rc.d/ipfw
Modified: stable/7/etc/rc.d/ipfw
==
--- stable/7/etc/rc.d/ipfw Mon Mar 1 17:42:06 2010(r204525)
+++ stable/7/etc/rc.d/ipfw Mon Mar 1 18:58:18 2010(r204526)
@@ -66,7 +66,7 @@ ipfw_poststart()
#
for _coscript in ${firewall_coscripts} ; do
if [ -f "${_coscript}" ]; then
- ${_coscript} quietstart
+ ${_coscript} start
fi
done
@@ -87,7 +87,7 @@ ipfw_stop()
#
for _coscript in `reverse_list ${firewall_coscripts}` ; do
if [ -f "${_coscript}" ]; then
- ${_coscript} quietstop
+ ${_coscript} stop
fi
done
}
___
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: r204528 - in stable/8: . contrib/top lib/libusb sbin/atacontrol sbin/camcontrol sys/cam sys/dev/ata tools/regression/lib/msun tools/regression/usr.bin/pkill tools/tools/ath/common tools...
Author: mav Date: Mon Mar 1 19:16:34 2010 New Revision: 204528 URL: http://svn.freebsd.org/changeset/base/204528 Log: MFC r204195: Improve output for controllers that doesn't report SATA speed. Modified: stable/8/sbin/atacontrol/atacontrol.c stable/8/sbin/camcontrol/camcontrol.c stable/8/sys/cam/cam_xpt.c stable/8/sys/dev/ata/ata-all.c stable/8/sys/dev/ata/ata-pci.c stable/8/sys/dev/ata/ata-sata.c Directory Properties: stable/8/ (props changed) stable/8/Makefile.inc1 (props changed) stable/8/ObsoleteFiles.inc (props changed) stable/8/UPDATING (props changed) stable/8/bin/ (props changed) stable/8/bin/chmod/ (props changed) stable/8/bin/cp/ (props changed) stable/8/bin/csh/ (props changed) stable/8/bin/getfacl/ (props changed) stable/8/bin/ls/ (props changed) stable/8/bin/mv/ (props changed) stable/8/bin/pax/ (props changed) stable/8/bin/pkill/ (props changed) stable/8/bin/ps/ (props changed) stable/8/bin/setfacl/ (props changed) stable/8/bin/sh/ (props changed) stable/8/cddl/compat/opensolaris/ (props changed) stable/8/cddl/contrib/opensolaris/ (props changed) stable/8/cddl/contrib/opensolaris/cmd/zdb/ (props changed) stable/8/cddl/contrib/opensolaris/cmd/zfs/ (props changed) stable/8/cddl/contrib/opensolaris/lib/libzfs/ (props changed) stable/8/cddl/lib/libnvpair/ (props changed) stable/8/contrib/bind9/ (props changed) stable/8/contrib/bsnmp/ (props changed) stable/8/contrib/bzip2/ (props changed) stable/8/contrib/cpio/ (props changed) stable/8/contrib/csup/ (props changed) stable/8/contrib/ee/ (props changed) stable/8/contrib/expat/ (props changed) stable/8/contrib/file/ (props changed) stable/8/contrib/gcc/ (props changed) stable/8/contrib/gdb/ (props changed) stable/8/contrib/gdtoa/ (props changed) stable/8/contrib/groff/ (props changed) stable/8/contrib/less/ (props changed) stable/8/contrib/libpcap/ (props changed) stable/8/contrib/ncurses/ (props changed) stable/8/contrib/netcat/ (props changed) stable/8/contrib/ntp/ (props changed) stable/8/contrib/one-true-awk/ (props changed) stable/8/contrib/openbsm/ (props changed) stable/8/contrib/openpam/ (props changed) stable/8/contrib/pf/ (props changed) stable/8/contrib/sendmail/ (props changed) stable/8/contrib/tcpdump/ (props changed) stable/8/contrib/tcsh/ (props changed) stable/8/contrib/top/ (props changed) stable/8/contrib/top/install-sh (props changed) stable/8/contrib/traceroute/ (props changed) stable/8/contrib/wpa/ (props changed) stable/8/crypto/heimdal/ (props changed) stable/8/crypto/openssh/ (props changed) stable/8/crypto/openssl/ (props changed) stable/8/etc/ (props changed) stable/8/games/factor/ (props changed) stable/8/games/fortune/ (props changed) stable/8/games/fortune/datfiles/ (props changed) stable/8/gnu/usr.bin/groff/ (props changed) stable/8/gnu/usr.bin/patch/ (props changed) stable/8/include/ (props changed) stable/8/kerberos5/lib/libgssapi_krb5/ (props changed) stable/8/kerberos5/lib/libgssapi_spnego/ (props changed) stable/8/kerberos5/usr.bin/kdestroy/ (props changed) stable/8/kerberos5/usr.bin/kpasswd/ (props changed) stable/8/lib/bind/ (props changed) stable/8/lib/csu/ (props changed) stable/8/lib/libarchive/ (props changed) stable/8/lib/libbluetooth/ (props changed) stable/8/lib/libc/ (props changed) stable/8/lib/libc/stdtime/ (props changed) stable/8/lib/libc_r/ (props changed) stable/8/lib/libdevinfo/ (props changed) stable/8/lib/libdisk/ (props changed) stable/8/lib/libelf/ (props changed) stable/8/lib/libexpat/ (props changed) stable/8/lib/libfetch/ (props changed) stable/8/lib/libgpib/ (props changed) stable/8/lib/libgssapi/ (props changed) stable/8/lib/libjail/ (props changed) stable/8/lib/libkse/ (props changed) stable/8/lib/libkvm/ (props changed) stable/8/lib/libpmc/ (props changed) stable/8/lib/libradius/ (props changed) stable/8/lib/librpcsec_gss/ (props changed) stable/8/lib/libstand/ (props changed) stable/8/lib/libtacplus/ (props changed) stable/8/lib/libthr/ (props changed) stable/8/lib/libufs/ (props changed) stable/8/lib/libusb/ (props changed) stable/8/lib/libusb/usb.h (props changed) stable/8/lib/libutil/ (props changed) stable/8/lib/msun/ (props changed) stable/8/libexec/rtld-elf/ (props changed) stable/8/release/ (props changed) stable/8/sbin/ (props changed) stable/8/sbin/atacontrol/ (props changed) stable/8/sbin/bsdlabel/ (props changed) stable/8/sbin/camcontrol/ (props changed) stable/8/sbin/ddb/ (props changed) stable/8/sbin/devfs/ (props changed) stable/8/sbin/dhclient/ (props changed) stable/8/sbin/dumpfs/ (props changed) stable/8/sbin/fsck/ (props changed) stable/8/sbin/
Re: svn commit: r204325 - in stable/7: etc/defaults etc/rc.d share/man/man5
On Mon, Mar 1, 2010 at 10:46 AM, John Baldwin wrote: > On Thursday 25 February 2010 1:02:52 pm Maksim Yevmenkin wrote: >> Author: emax >> Date: Thu Feb 25 18:02:52 2010 >> New Revision: 204325 >> URL: http://svn.freebsd.org/changeset/base/204325 >> >> Log: >> MFC: r203676 >> >> Introduce new rc.conf variable firewall_coscripts. It can be used to >> specify list of executables and/or rc scripts that should be executed >> after firewall starts/stops. >> >> Submitted by: Yuri Kurenkov >> Reviewed by:rhodes, rc@ > > Looks like this broke natd startup on stable/7 because stable/7 rc.d is > different from 8 and doesn't know about quietstart/quietstop. Perhaps this > should just use 'start' and 'stop' on 7? whops sorry... i will fix it right away thanks max ___ 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: r204529 - in stable/8/sys/cam: . ata scsi
Author: mav
Date: Mon Mar 1 19:19:30 2010
New Revision: 204529
URL: http://svn.freebsd.org/changeset/base/204529
Log:
MFC r204220, r204353:
Virtualize transport part of periph announcement.
Modified:
stable/8/sys/cam/ata/ata_xpt.c
stable/8/sys/cam/cam_xpt.c
stable/8/sys/cam/cam_xpt_internal.h
stable/8/sys/cam/scsi/scsi_xpt.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)
stable/8/sys/dev/xen/xenpci/ (props changed)
stable/8/sys/netinet/ (props changed)
Modified: stable/8/sys/cam/ata/ata_xpt.c
==
--- stable/8/sys/cam/ata/ata_xpt.c Mon Mar 1 19:16:34 2010
(r204528)
+++ stable/8/sys/cam/ata/ata_xpt.c Mon Mar 1 19:19:30 2010
(r204529)
@@ -178,11 +178,13 @@ static voidata_dev_async(u_int32_t asy
struct cam_ed *device,
void *async_arg);
static void ata_action(union ccb *start_ccb);
+static void ata_announce_periph(struct cam_periph *periph);
static struct xpt_xport ata_xport = {
.alloc_device = ata_alloc_device,
.action = ata_action,
.async = ata_dev_async,
+ .announce = ata_announce_periph,
};
struct xpt_xport *
@@ -1641,3 +1643,82 @@ ata_dev_async(u_int32_t async_code, stru
}
}
+static void
+ata_announce_periph(struct cam_periph *periph)
+{
+ struct ccb_pathinq cpi;
+ struct ccb_trans_settings cts;
+ struct cam_path *path = periph->path;
+ u_int speed;
+ u_int mb;
+
+ mtx_assert(periph->sim->mtx, MA_OWNED);
+
+ xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL);
+ cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
+ cts.type = CTS_TYPE_CURRENT_SETTINGS;
+ xpt_action((union ccb*)&cts);
+ if ((cts.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)
+ return;
+ /* Ask the SIM for its base transfer speed */
+ xpt_setup_ccb(&cpi.ccb_h, path, CAM_PRIORITY_NORMAL);
+ cpi.ccb_h.func_code = XPT_PATH_INQ;
+ xpt_action((union ccb *)&cpi);
+ /* Report connection speed */
+ speed = cpi.base_transfer_speed;
+ if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_ATA) {
+ struct ccb_trans_settings_ata *ata =
+ &cts.xport_specific.ata;
+
+ if (ata->valid & CTS_ATA_VALID_MODE)
+ speed = ata_mode2speed(ata->mode);
+ }
+ if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_SATA) {
+ struct ccb_trans_settings_sata *sata =
+ &cts.xport_specific.sata;
+
+ if (sata->valid & CTS_SATA_VALID_REVISION)
+ speed = ata_revision2speed(sata->revision);
+ }
+ mb = speed / 1000;
+ if (mb > 0)
+ printf("%s%d: %d.%03dMB/s transfers",
+ periph->periph_name, periph->unit_number,
+ mb, speed % 1000);
+ else
+ printf("%s%d: %dKB/s transfers", periph->periph_name,
+ periph->unit_number, speed);
+ /* Report additional information about connection */
+ if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_ATA) {
+ struct ccb_trans_settings_ata *ata =
+ &cts.xport_specific.ata;
+
+ printf(" (");
+ if (ata->valid & CTS_ATA_VALID_MODE)
+ printf("%s, ", ata_mode2string(ata->mode));
+ if ((ata->valid & CTS_ATA_VALID_ATAPI) && ata->atapi != 0)
+ printf("ATAPI %dbytes, ", ata->atapi);
+ if (ata->valid & CTS_ATA_VALID_BYTECOUNT)
+ printf("PIO %dbytes", ata->bytecount);
+ printf(")");
+ }
+ if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_SATA) {
+ struct ccb_trans_settings_sata *sata =
+ &cts.xport_specific.sata;
+
+ printf(" (");
+ if (sata->valid & CTS_SATA_VALID_REVISION)
+ printf("SATA %d.x, ", sata->revision);
+ else
+ printf("SATA, ");
+ if (sata->valid & CTS_SATA_VALID_MODE)
+ printf("%s, ", ata_mode2string(sata->mode));
+ if ((sata->valid & CTS_ATA_VALID_ATAPI) && sata->atapi != 0)
+ printf("ATAPI %dbytes, ", sata->atapi);
+ if (sata->valid & CTS_SATA_VALID_BYTECOUNT)
+ printf("PIO %dbytes", sata->bytecount);
+ printf(")");
+ }
+ printf("\n");
+}
+
Modified: stable/8/sys/cam/cam_xpt.c
==
svn commit: r204530 - stable/8/sys/cam
Author: mav Date: Mon Mar 1 19:32:34 2010 New Revision: 204530 URL: http://svn.freebsd.org/changeset/base/204530 Log: MFC r204253: Make xpt_rescan() more correct, as it was before r197208: do not use XPT_SCAN_LUN for wildcard LUN, fall back to XPT_SCAN_BUS. Modified: stable/8/sys/cam/cam_xpt.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) stable/8/sys/dev/xen/xenpci/ (props changed) stable/8/sys/netinet/ (props changed) Modified: stable/8/sys/cam/cam_xpt.c == --- stable/8/sys/cam/cam_xpt.c Mon Mar 1 19:19:30 2010(r204529) +++ stable/8/sys/cam/cam_xpt.c Mon Mar 1 19:32:34 2010(r204530) @@ -861,7 +861,8 @@ xpt_rescan(union ccb *ccb) struct ccb_hdr *hdr; /* Prepare request */ - if(ccb->ccb_h.path->target->target_id == CAM_TARGET_WILDCARD) + if (ccb->ccb_h.path->target->target_id == CAM_TARGET_WILDCARD || + ccb->ccb_h.path->device->lun_id == CAM_LUN_WILDCARD) ccb->ccb_h.func_code = XPT_SCAN_BUS; else ccb->ccb_h.func_code = XPT_SCAN_LUN; ___ 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: r204531 - in stable/8/sys: cam/ata sys
Author: mav
Date: Mon Mar 1 19:36:19 2010
New Revision: 204531
URL: http://svn.freebsd.org/changeset/base/204531
Log:
MFC r204354:
Make PUIS detection more strict. Previous implementation caused false
positives on VMWare's virtual CD-ROMs.
Modified:
stable/8/sys/cam/ata/ata_xpt.c
stable/8/sys/sys/ata.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)
stable/8/sys/dev/xen/xenpci/ (props changed)
stable/8/sys/netinet/ (props changed)
Modified: stable/8/sys/cam/ata/ata_xpt.c
==
--- stable/8/sys/cam/ata/ata_xpt.c Mon Mar 1 19:32:34 2010
(r204530)
+++ stable/8/sys/cam/ata/ata_xpt.c Mon Mar 1 19:36:19 2010
(r204531)
@@ -788,11 +788,10 @@ noerror:
ata_btrim(ident_buf->serial, sizeof(ident_buf->serial));
ata_bpack(ident_buf->serial, ident_buf->serial,
sizeof(ident_buf->serial));
/* Device may need spin-up before IDENTIFY become valid. */
- if ((ident_buf->config & ATA_RESP_INCOMPLETE) ||
- ((ident_buf->support.command2 & ATA_SUPPORT_STANDBY) &&
-(ident_buf->enabled.command2 & ATA_SUPPORT_STANDBY) &&
-(ident_buf->support.command2 & ATA_SUPPORT_SPINUP) &&
- softc->spinup == 0)) {
+ if ((ident_buf->specconf == 0x37c8 ||
+ident_buf->specconf == 0x738c) &&
+ ((ident_buf->config & ATA_RESP_INCOMPLETE) ||
+softc->spinup == 0)) {
PROBE_SET_ACTION(softc, PROBE_SPINUP);
xpt_release_ccb(done_ccb);
xpt_schedule(periph, priority);
Modified: stable/8/sys/sys/ata.h
==
--- stable/8/sys/sys/ata.h Mon Mar 1 19:32:34 2010(r204530)
+++ stable/8/sys/sys/ata.h Mon Mar 1 19:36:19 2010(r204531)
@@ -51,7 +51,7 @@ struct ata_params {
#define ATA_RESP_INCOMPLETE 0x0004
/*001*/ u_int16_t cylinders; /* # of cylinders */
- u_int16_t reserved2;
+/*002*/ u_int16_t specconf; /* specific configuration */
/*003*/ u_int16_t heads; /* # heads */
u_int16_t obsolete4;
u_int16_t obsolete5;
___
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: r204532 - stable/8/sys/dev/sound/pci/hda
Author: mav
Date: Mon Mar 1 19:43:26 2010
New Revision: 204532
URL: http://svn.freebsd.org/changeset/base/204532
Log:
MFC r204351:
Fix bug in headphones audio redirection using separate DAC. It was exposed
by removing channel duplication during multichannel audio implementation.
Modified:
stable/8/sys/dev/sound/pci/hda/hdac.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)
stable/8/sys/dev/xen/xenpci/ (props changed)
stable/8/sys/netinet/ (props changed)
Modified: stable/8/sys/dev/sound/pci/hda/hdac.c
==
--- stable/8/sys/dev/sound/pci/hda/hdac.c Mon Mar 1 19:36:19 2010
(r204531)
+++ stable/8/sys/dev/sound/pci/hda/hdac.c Mon Mar 1 19:43:26 2010
(r204532)
@@ -86,7 +86,7 @@
#include "mixer_if.h"
-#define HDA_DRV_TEST_REV "20100122_0141"
+#define HDA_DRV_TEST_REV "20100226_0142"
SND_DECLARE_FILE("$FreeBSD$");
@@ -3503,7 +3503,7 @@ hdac_stream_setup(struct hdac_chan *ch)
/* If HP redirection is enabled, but failed to use same
DAC, make last DAC to duplicate first one. */
- if (as->hpredir >= 0 && i == as->pincnt) {
+ if (as->fakeredir && i == (as->pincnt - 1)) {
c = (ch->sid << 4);
} else {
if (map >= 0) /* Map known speaker setups. */
___
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: r204528 - in stable/8: . contrib/top lib/libusb sbin/atacontrol sbin/camcontrol sys/cam sys/dev/ata tools/regression/lib/msun tools/regression/usr.bin/pkill tools/tools/ath/common tool
On Monday 01 March 2010 2:16:34 pm Alexander Motin wrote: > Author: mav > Date: Mon Mar 1 19:16:34 2010 > New Revision: 204528 > URL: http://svn.freebsd.org/changeset/base/204528 > > Log: > MFC r204195: > Improve output for controllers that doesn't report SATA speed. > > Modified: > stable/8/sbin/atacontrol/atacontrol.c > stable/8/sbin/camcontrol/camcontrol.c > stable/8/sys/cam/cam_xpt.c > stable/8/sys/dev/ata/ata-all.c > stable/8/sys/dev/ata/ata-pci.c > stable/8/sys/dev/ata/ata-sata.c For future reference, it would probably be best to do these as three separate merges (to sbin/atacontrol, sbin/camcontrol, and sys) and then do one commit, at least to avoid extra mergeinfo churn. -- 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: r204533 - head/sys/dev/uart
Author: delphij
Date: Mon Mar 1 20:41:27 2010
New Revision: 204533
URL: http://svn.freebsd.org/changeset/base/204533
Log:
Add PCI ID for MCS9901.
Submitted by: gcooper
PR: kern/144397
MFC after:1 month
Modified:
head/sys/dev/uart/uart_bus_pci.c
Modified: head/sys/dev/uart/uart_bus_pci.c
==
--- head/sys/dev/uart/uart_bus_pci.cMon Mar 1 19:43:26 2010
(r204532)
+++ head/sys/dev/uart/uart_bus_pci.cMon Mar 1 20:41:27 2010
(r204533)
@@ -113,6 +113,8 @@ static struct pci_id pci_ns8250_ids[] =
{ 0x9710, 0x9820, 0x1000, 1, "NetMos NM9820 Serial Port", 0x10 },
{ 0x9710, 0x9835, 0x1000, 1, "NetMos NM9835 Serial Port", 0x10 },
{ 0x9710, 0x9865, 0xa000, 0x1000, "NetMos NM9865 Serial Port", 0x10 },
+{ 0x9710, 0x9901, 0xa000, 0x1000,
+ "MosChip MCS9901 PCIe to Peripheral Controller", 0x10 },
{ 0xdeaf, 0x9051, 0x, 0, "Middle Digital PC Weasel Serial Port", 0x10 },
{ 0x, 0, 0x, 0, NULL, 0, 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: r204535 - stable/8/share/man/man9
Author: jhb Date: Mon Mar 1 21:04:01 2010 New Revision: 204535 URL: http://svn.freebsd.org/changeset/base/204535 Log: MFC: Fix spelling of EACCES. Modified: stable/8/share/man/man9/namei.9 Directory Properties: stable/8/share/man/man9/ (props changed) Modified: stable/8/share/man/man9/namei.9 == --- stable/8/share/man/man9/namei.9 Mon Mar 1 20:42:29 2010 (r204534) +++ stable/8/share/man/man9/namei.9 Mon Mar 1 21:04:01 2010 (r204535) @@ -333,7 +333,7 @@ or an entire pathname exceeded 1023 char .It Bq Er ENOENT A component of the specified pathname does not exist, or the pathname is an empty string. -.It Bq Er ACCES +.It Bq Er EACCES An attempt is made to access a file in a way forbidden by its file access permissions. .It Bq Er ELOOP ___ 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: r204536 - stable/7/share/man/man9
Author: jhb Date: Mon Mar 1 21:04:10 2010 New Revision: 204536 URL: http://svn.freebsd.org/changeset/base/204536 Log: MFC: Fix spelling of EACCES. Modified: stable/7/share/man/man9/namei.9 Directory Properties: stable/7/share/man/man9/ (props changed) Modified: stable/7/share/man/man9/namei.9 == --- stable/7/share/man/man9/namei.9 Mon Mar 1 21:04:01 2010 (r204535) +++ stable/7/share/man/man9/namei.9 Mon Mar 1 21:04:10 2010 (r204536) @@ -333,7 +333,7 @@ or an entire pathname exceeded 1023 char .It Bq Er ENOENT A component of the specified pathname does not exist, or the pathname is an empty string. -.It Bq Er ACCES +.It Bq Er EACCES An attempt is made to access a file in a way forbidden by its file access permissions. .It Bq Er ELOOP ___ 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: r204475 - head/sys/fs/msdosfs
On Mon, Mar 01, 2010 at 10:30:51AM -0500, John Baldwin wrote: > On Sunday 28 February 2010 12:19:22 pm Konstantin Belousov wrote: > > Author: kib > > Date: Sun Feb 28 17:19:22 2010 > > New Revision: 204475 > > URL: http://svn.freebsd.org/changeset/base/204475 > > > > Log: > > Mark msdosfs as mpsafe. > > Are you planning on implementing support for LOOKUP_SHARED and > EXTENDED_SHARED as well? Do you think it makes sense to do this for msdosfs ? Please note that current msdosfs code exclusively uses exclusive locks on the vnodes. One obvious issue with *_SHARED is the fat cache in the denode. pgpPgHkVSKfC9.pgp Description: PGP signature
svn commit: r204539 - head/sys/dev/msk
Author: yongari Date: Mon Mar 1 22:43:22 2010 New Revision: 204539 URL: http://svn.freebsd.org/changeset/base/204539 Log: Properly sync status LEs after processing. Modified: head/sys/dev/msk/if_msk.c Modified: head/sys/dev/msk/if_msk.c == --- head/sys/dev/msk/if_msk.c Mon Mar 1 21:30:44 2010(r204538) +++ head/sys/dev/msk/if_msk.c Mon Mar 1 22:43:22 2010(r204539) @@ -3376,7 +3376,6 @@ msk_handle_events(struct msk_softc *sc) /* Sync status LEs. */ bus_dmamap_sync(sc->msk_stat_tag, sc->msk_stat_map, BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); - /* XXX Sync Rx LEs here. */ rxput[MSK_PORT_A] = rxput[MSK_PORT_B] = 0; @@ -3386,13 +3385,6 @@ msk_handle_events(struct msk_softc *sc) control = le32toh(sd->msk_control); if ((control & HW_OWNER) == 0) break; - /* -* Marvell's FreeBSD driver updates status LE after clearing -* HW_OWNER. However we don't have a way to sync single LE -* with bus_dma(9) API. bus_dma(9) provides a way to sync -* an entire DMA map. So don't sync LE until we have a better -* way to sync LEs. -*/ control &= ~HW_OWNER; sd->msk_control = htole32(control); status = le32toh(sd->msk_status); @@ -3453,7 +3445,8 @@ msk_handle_events(struct msk_softc *sc) } sc->msk_stat_cons = cons; - /* XXX We should sync status LEs here. See above notes. */ + bus_dmamap_sync(sc->msk_stat_tag, sc->msk_stat_map, + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); if (rxput[MSK_PORT_A] > 0) msk_rxput(sc->msk_if[MSK_PORT_A]); ___ 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: r204475 - head/sys/fs/msdosfs
On Monday 01 March 2010 5:12:13 pm Kostik Belousov wrote: > On Mon, Mar 01, 2010 at 10:30:51AM -0500, John Baldwin wrote: > > On Sunday 28 February 2010 12:19:22 pm Konstantin Belousov wrote: > > > Author: kib > > > Date: Sun Feb 28 17:19:22 2010 > > > New Revision: 204475 > > > URL: http://svn.freebsd.org/changeset/base/204475 > > > > > > Log: > > > Mark msdosfs as mpsafe. > > > > Are you planning on implementing support for LOOKUP_SHARED and > > EXTENDED_SHARED as well? > > Do you think it makes sense to do this for msdosfs ? > Please note that current msdosfs code exclusively uses exclusive locks > on the vnodes. > > One obvious issue with *_SHARED is the fat cache in the denode. Oh, hmm. I guess we would need to first allow it to use shared locks generically (VN_LOCK_ASHARE() for VOP_READ() and the like). I do think we should try to make our filesystems concurrent when it is not too terribly difficult. -- 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: r204540 - head/sys/dev/msk
Author: yongari
Date: Mon Mar 1 22:55:35 2010
New Revision: 204540
URL: http://svn.freebsd.org/changeset/base/204540
Log:
Make sure to enable flow-control only if established link is
full-duplex. Previously msk(4) used to allow flow-control on
1000baseT half-duplex media. Also GMAC pause is enabled if link
partner is capable of handling it.
While I'm here use IFM_OPTIONS instead of using IFM_GMASK to check
optional flags of link.
Modified:
head/sys/dev/msk/if_msk.c
Modified: head/sys/dev/msk/if_msk.c
==
--- head/sys/dev/msk/if_msk.c Mon Mar 1 22:43:22 2010(r204539)
+++ head/sys/dev/msk/if_msk.c Mon Mar 1 22:55:35 2010(r204540)
@@ -532,28 +532,25 @@ msk_miibus_statchg(device_t dev)
break;
}
- if (((mii->mii_media_active & IFM_GMASK) & IFM_FDX) != 0)
- gmac |= GM_GPCR_DUP_FULL;
/* Disable Rx flow control. */
- if (((mii->mii_media_active & IFM_GMASK) & IFM_FLAG0) == 0)
+ if ((IFM_OPTIONS(mii->mii_media_active) & IFM_FLAG0) == 0)
gmac |= GM_GPCR_FC_RX_DIS;
/* Disable Tx flow control. */
- if (((mii->mii_media_active & IFM_GMASK) & IFM_FLAG1) == 0)
+ if ((IFM_OPTIONS(mii->mii_media_active) & IFM_FLAG1) == 0)
gmac |= GM_GPCR_FC_TX_DIS;
+ if ((IFM_OPTIONS(mii->mii_media_active) & IFM_FDX) != 0)
+ gmac |= GM_GPCR_DUP_FULL;
+ else
+ gmac |= GM_GPCR_FC_RX_DIS | GM_GPCR_FC_TX_DIS;
gmac |= GM_GPCR_RX_ENA | GM_GPCR_TX_ENA;
GMAC_WRITE_2(sc, sc_if->msk_port, GM_GP_CTRL, gmac);
/* Read again to ensure writing. */
GMAC_READ_2(sc, sc_if->msk_port, GM_GP_CTRL);
-
- gmac = GMC_PAUSE_ON;
- if (((mii->mii_media_active & IFM_GMASK) &
- (IFM_FLAG0 | IFM_FLAG1)) == 0)
- gmac = GMC_PAUSE_OFF;
- /* Diable pause for 10/100 Mbps in half-duplex mode. */
- if mii->mii_media_active & IFM_GMASK) & IFM_FDX) == 0) &&
- (IFM_SUBTYPE(mii->mii_media_active) == IFM_100_TX ||
- IFM_SUBTYPE(mii->mii_media_active) == IFM_10_T))
- gmac = GMC_PAUSE_OFF;
+ gmac = GMC_PAUSE_OFF;
+ if ((IFM_OPTIONS(mii->mii_media_active) & IFM_FDX) != 0) {
+ if ((IFM_OPTIONS(mii->mii_media_active) & IFM_FLAG0) !=
0)
+ gmac = GMC_PAUSE_ON;
+ }
CSR_WRITE_4(sc, MR_ADDR(sc_if->msk_port, GMAC_CTRL), gmac);
/* Enable PHY interrupt for FIFO underrun/overflow. */
___
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: r204541 - head/sys/dev/msk
Author: yongari
Date: Mon Mar 1 23:39:43 2010
New Revision: 204541
URL: http://svn.freebsd.org/changeset/base/204541
Log:
Implement rudimentary interrupt moderation with programmable
countdown timer register. The timer resolution may vary among
controllers but the value would be represented by core clock
cycles. msk(4) will automatically computes number of required clock
cycles from given micro-seconds unit.
The default interrupt holdoff timer value is 100us which will
ensure less than 10k interrupts under load. The timer value can be
changed with dev.mskc.0.int_holdoff sysctl node.
Note, the interrupt moderation is shared resource on dual-port
controllers so you can't use separate interrupt moderation value
for each port. This means we can't stop interrupt moderation in
driver stop routine. Also have msk_tick() reclaim transmitted Tx
buffers as safety belt. With this change there is no need to check
missing Tx completion interrupt in watchdog handler, so remove it.
Modified:
head/sys/dev/msk/if_msk.c
head/sys/dev/msk/if_mskreg.h
Modified: head/sys/dev/msk/if_msk.c
==
--- head/sys/dev/msk/if_msk.c Mon Mar 1 22:55:35 2010(r204540)
+++ head/sys/dev/msk/if_msk.c Mon Mar 1 23:39:43 2010(r204541)
@@ -1659,6 +1659,14 @@ mskc_attach(device_t dev)
}
}
+ sc->msk_int_holdoff = MSK_INT_HOLDOFF_DEFAULT;
+ SYSCTL_ADD_INT(device_get_sysctl_ctx(dev),
+ SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO,
+ "int_holdoff", CTLFLAG_RW, &sc->msk_int_holdoff, 0,
+ "Maximum number of time to delay interrupts");
+ resource_int_value(device_get_name(dev), device_get_unit(dev),
+ "int_holdoff", &sc->msk_int_holdoff);
+
/* Soft reset. */
CSR_WRITE_2(sc, B0_CTST, CS_RST_SET);
CSR_WRITE_2(sc, B0_CTST, CS_RST_CLR);
@@ -2801,8 +2809,6 @@ static void
msk_watchdog(struct msk_if_softc *sc_if)
{
struct ifnet *ifp;
- uint32_t ridx;
- int idx;
MSK_IF_LOCK_ASSERT(sc_if);
@@ -2819,24 +2825,6 @@ msk_watchdog(struct msk_if_softc *sc_if)
return;
}
- /*
-* Reclaim first as there is a possibility of losing Tx completion
-* interrupts.
-*/
- ridx = sc_if->msk_port == MSK_PORT_A ? STAT_TXA1_RIDX : STAT_TXA2_RIDX;
- idx = CSR_READ_2(sc_if->msk_softc, ridx);
- if (sc_if->msk_cdata.msk_tx_cons != idx) {
- msk_txeof(sc_if, idx);
- if (sc_if->msk_cdata.msk_tx_cnt == 0) {
- if_printf(ifp, "watchdog timeout (missed Tx interrupts)
"
- "-- recovering\n");
- if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
- taskqueue_enqueue(taskqueue_fast,
- &sc_if->msk_tx_task);
- return;
- }
- }
-
if_printf(ifp, "watchdog timeout\n");
ifp->if_oerrors++;
ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
@@ -3166,6 +3154,7 @@ msk_tick(void *xsc_if)
mii_tick(mii);
if ((sc_if->msk_flags & MSK_FLAG_LINK) == 0)
msk_miibus_statchg(sc_if->msk_if_dev);
+ msk_handle_events(sc_if->msk_softc);
msk_watchdog(sc_if);
callout_reset(&sc_if->msk_tick_ch, hz, msk_tick, sc_if);
}
@@ -3904,6 +3893,17 @@ msk_init_locked(struct msk_if_softc *sc_
sc->msk_intrmask |= Y2_IS_PORT_B;
sc->msk_intrhwemask |= Y2_HWE_L2_MASK;
}
+ /* Configure IRQ moderation mask. */
+ CSR_WRITE_4(sc, B2_IRQM_MSK, sc->msk_intrmask);
+ if (sc->msk_int_holdoff > 0) {
+ /* Configure initial IRQ moderation timer value. */
+ CSR_WRITE_4(sc, B2_IRQM_INI,
+ MSK_USECS(sc, sc->msk_int_holdoff));
+ CSR_WRITE_4(sc, B2_IRQM_VAL,
+ MSK_USECS(sc, sc->msk_int_holdoff));
+ /* Start IRQ moderation. */
+ CSR_WRITE_1(sc, B2_IRQM_CTRL, TIM_START);
+ }
CSR_WRITE_4(sc, B0_HWE_IMSK, sc->msk_intrhwemask);
CSR_READ_4(sc, B0_HWE_IMSK);
CSR_WRITE_4(sc, B0_IMSK, sc->msk_intrmask);
Modified: head/sys/dev/msk/if_mskreg.h
==
--- head/sys/dev/msk/if_mskreg.hMon Mar 1 22:55:35 2010
(r204540)
+++ head/sys/dev/msk/if_mskreg.hMon Mar 1 23:39:43 2010
(r204541)
@@ -2406,6 +2406,8 @@ struct msk_ring_data {
#defineMSK_PROC_MIN30
#defineMSK_PROC_MAX(MSK_RX_RING_CNT - 1)
+#defineMSK_INT_HOLDOFF_DEFAULT 100
+
#defineMSK_TX_TIMEOUT 5
#defineMSK_PUT_WM 10
@@ -2496,6 +2498,7 @@ struct msk_softc {
bus_dmamap_tmsk_stat_map;
struct msk_stat_desc*msk
svn commit: r204542 - head/sys/dev/bwn
Author: weongyo
Date: Mon Mar 1 23:51:13 2010
New Revision: 204542
URL: http://svn.freebsd.org/changeset/base/204542
Log:
calculates the integer square root if a positive integer X is larger
than 256 instead of using sqrt_table.
Reported by: Joe Marcus Clarke
Modified:
head/sys/dev/bwn/if_bwn.c
Modified: head/sys/dev/bwn/if_bwn.c
==
--- head/sys/dev/bwn/if_bwn.c Mon Mar 1 23:39:43 2010(r204541)
+++ head/sys/dev/bwn/if_bwn.c Mon Mar 1 23:51:13 2010(r204542)
@@ -12846,7 +12846,6 @@ bwn_phy_lp_clear_deaf(struct bwn_mac *ma
static unsigned int
bwn_sqrt(struct bwn_mac *mac, unsigned int x)
{
- struct bwn_softc *sc = mac->mac_sc;
/* Table holding (10 * sqrt(x)) for x between 1 and 256. */
static uint8_t sqrt_table[256] = {
10, 14, 17, 20, 22, 24, 26, 28,
@@ -12886,9 +12885,11 @@ bwn_sqrt(struct bwn_mac *mac, unsigned i
if (x == 0)
return (0);
if (x >= 256) {
- device_printf(sc->sc_dev,
- "out of bounds of the square-root table (%d)\n", x);
- return (16);
+ unsigned int tmp;
+
+ for (tmp = 0; x >= (2 * tmp) + 1; x -= (2 * tmp++) + 1)
+ /* do nothing */ ;
+ return (tmp);
}
return (sqrt_table[x - 1] / 10);
}
___
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: r204543 - head/share/man/man4
Author: yongari Date: Mon Mar 1 23:56:51 2010 New Revision: 204543 URL: http://svn.freebsd.org/changeset/base/204543 Log: Document newly added loader tunable and sysctl variable dev.mskc.%d.int_holdoff Modified: head/share/man/man4/msk.4 Modified: head/share/man/man4/msk.4 == --- head/share/man/man4/msk.4 Mon Mar 1 23:51:13 2010(r204542) +++ head/share/man/man4/msk.4 Mon Mar 1 23:56:51 2010(r204543) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 6, 2009 +.Dd March 1, 2010 .Dt MSK 4 .Os .Sh NAME @@ -235,6 +235,12 @@ variables and .Xr loader 8 tunables: .Bl -tag -width indent +.It Va dev.mskc.%d.int_holdoff +Maximum number of time to delay interrupts. +The valid range is 0 to 34359738 for 125MHz clock in units of 1us, +the default is 100 (100us). +The interface need to be brought down and up again before a change +takes effect. .It Va dev.mskc.%d.process_limit Maximum amount of Rx events to be processed in the event loop before rescheduling a taskqueue. ___ 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: r204545 - head/sys/dev/msk
Author: yongari
Date: Tue Mar 2 01:45:02 2010
New Revision: 204545
URL: http://svn.freebsd.org/changeset/base/204545
Log:
Remove taskqueue based interrupt handling. After r204541 msk(4)
does not generate excessive interrupts any more so we don't need
to have two copies of interrupt handler.
While I'm here remove two STAT_PUT_IDX register accesses in LE
status event handler. After r204539 msk(4) always sync status LEs
so there is no need to resort to reading STAT_PUT_IDX register to
know the end of status LE processing. Just trust status LE's
ownership bit.
Modified:
head/sys/dev/msk/if_msk.c
head/sys/dev/msk/if_mskreg.h
Modified: head/sys/dev/msk/if_msk.c
==
--- head/sys/dev/msk/if_msk.c Tue Mar 2 01:21:33 2010(r204544)
+++ head/sys/dev/msk/if_msk.c Tue Mar 2 01:45:02 2010(r204545)
@@ -113,7 +113,6 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
-#include
#include
#include
@@ -257,9 +256,7 @@ static int msk_attach(device_t);
static int msk_detach(device_t);
static void msk_tick(void *);
-static void msk_legacy_intr(void *);
-static int msk_intr(void *);
-static void msk_int_task(void *, int);
+static void msk_intr(void *);
static void msk_intr_phy(struct msk_if_softc *);
static void msk_intr_gmac(struct msk_if_softc *);
static __inline void msk_rxput(struct msk_if_softc *);
@@ -273,8 +270,8 @@ static void msk_rxeof(struct msk_if_soft
static void msk_jumbo_rxeof(struct msk_if_softc *, uint32_t, uint32_t, int);
static void msk_txeof(struct msk_if_softc *, int);
static int msk_encap(struct msk_if_softc *, struct mbuf **);
-static void msk_tx_task(void *, int);
static void msk_start(struct ifnet *);
+static void msk_start_locked(struct ifnet *);
static int msk_ioctl(struct ifnet *, u_long, caddr_t);
static void msk_set_prefetch(struct msk_softc *, int, bus_addr_t, uint32_t);
static void msk_set_rambuffer(struct msk_if_softc *);
@@ -1511,9 +1508,6 @@ msk_attach(device_t dev)
IFQ_SET_MAXLEN(&ifp->if_snd, MSK_TX_RING_CNT - 1);
ifp->if_snd.ifq_drv_maxlen = MSK_TX_RING_CNT - 1;
IFQ_SET_READY(&ifp->if_snd);
-
- TASK_INIT(&sc_if->msk_tx_task, 1, msk_tx_task, ifp);
-
/*
* Get station address for this interface. Note that
* dual port cards actually come with three station
@@ -1836,25 +1830,10 @@ mskc_attach(device_t dev)
}
/* Hook interrupt last to avoid having to lock softc. */
- if (legacy_intr)
- error = bus_setup_intr(dev, sc->msk_irq[0], INTR_TYPE_NET |
- INTR_MPSAFE, NULL, msk_legacy_intr, sc,
- &sc->msk_intrhand);
- else {
- TASK_INIT(&sc->msk_int_task, 0, msk_int_task, sc);
- sc->msk_tq = taskqueue_create_fast("msk_taskq", M_WAITOK,
- taskqueue_thread_enqueue, &sc->msk_tq);
- taskqueue_start_threads(&sc->msk_tq, 1, PI_NET, "%s taskq",
- device_get_nameunit(sc->msk_dev));
- error = bus_setup_intr(dev, sc->msk_irq[0], INTR_TYPE_NET |
- INTR_MPSAFE, msk_intr, NULL, sc, &sc->msk_intrhand);
- }
-
+ error = bus_setup_intr(dev, sc->msk_irq[0], INTR_TYPE_NET |
+ INTR_MPSAFE, NULL, msk_intr, sc, &sc->msk_intrhand);
if (error != 0) {
device_printf(dev, "couldn't set up interrupt handler\n");
- if (legacy_intr == 0)
- taskqueue_free(sc->msk_tq);
- sc->msk_tq = NULL;
goto fail;
}
fail:
@@ -1891,7 +1870,6 @@ msk_detach(device_t dev)
/* Can't hold locks while calling detach. */
MSK_IF_UNLOCK(sc_if);
callout_drain(&sc_if->msk_tick_ch);
- taskqueue_drain(taskqueue_fast, &sc_if->msk_tx_task);
ether_ifdetach(ifp);
MSK_IF_LOCK(sc_if);
}
@@ -1956,11 +1934,6 @@ mskc_detach(device_t dev)
msk_status_dma_free(sc);
- if (legacy_intr == 0 && sc->msk_tq != NULL) {
- taskqueue_drain(sc->msk_tq, &sc->msk_int_task);
- taskqueue_free(sc->msk_tq);
- sc->msk_tq = NULL;
- }
if (sc->msk_intrhand) {
bus_teardown_intr(dev, sc->msk_irq[0], sc->msk_intrhand);
sc->msk_intrhand = NULL;
@@ -2740,30 +2713,29 @@ msk_encap(struct msk_if_softc *sc_if, st
}
static void
-msk_tx_task(void *arg, int pending)
+msk_start(struct ifnet *ifp)
{
- struct ifnet *ifp;
+ struct msk_if_softc *sc_if;
- ifp = arg;
- msk_start(ifp);
+ sc_if = ifp->if_softc;
+ MSK_IF_LOCK(sc_if);
+ msk_start_locked(ifp);
+ MSK_IF_UNLOCK(sc_if);
}
static void
-msk_start(struct ifnet *ifp)
+msk_start_locked(struct ifnet *ifp)
{
-struct msk_if_softc *sc_if;
-struct mbuf *m_head;
+ struct msk_if_sof
svn commit: r204546 - in stable/8: . lib share/man/man4 share/man/man4/man4.i386 sys/amd64/conf sys/compat/x86bios sys/conf sys/contrib/x86emu sys/dev/atkbdc sys/dev/dpms sys/dev/fb sys/dev/pci sys...
Author: delphij
Date: Tue Mar 2 01:56:55 2010
New Revision: 204546
URL: http://svn.freebsd.org/changeset/base/204546
Log:
MFC x86emu/x86bios emulator and make previously i386 only dpms and vesa
framebuffer driver, etc. work on FreeBSD/amd64.
A significant amount of improvements were done by jkim@ during the recent
months to make vesa(4) work better, over the initial code import. This
work is based on OpenBSD's x86emu implementation and contributed by
paradox and swell.k at gmail com.
Hopefully I have stolen all their work to 8-STABLE :)
All bugs in this commit are mine, as usual.
Added:
stable/8/share/man/man4/dpms.4
- copied unchanged from r197025, head/share/man/man4/dpms.4
stable/8/sys/compat/x86bios/
- copied from r197444, head/sys/compat/x86bios/
stable/8/sys/contrib/x86emu/
- copied from r197009, head/sys/contrib/x86emu/
stable/8/sys/dev/dpms/
- copied from r197021, head/sys/dev/dpms/
stable/8/sys/dev/dpms/dpms.c
- copied, changed from r197022, head/sys/dev/dpms/dpms.c
stable/8/sys/dev/fb/vesa.c
- copied, changed from r197022, head/sys/dev/fb/vesa.c
stable/8/sys/dev/fb/vesa.h
- copied, changed from r197022, head/sys/dev/fb/vesa.h
stable/8/sys/modules/x86bios/
- copied from r197383, head/sys/modules/x86bios/
stable/8/sys/modules/x86emu/
- copied from r197019, head/sys/modules/x86emu/
Deleted:
stable/8/share/man/man4/man4.i386/dpms.4
stable/8/sys/i386/include/pc/vesa.h
stable/8/sys/i386/isa/dpms.c
stable/8/sys/i386/isa/vesa.c
Modified:
stable/8/ObsoleteFiles.inc (contents, props changed)
stable/8/lib/Makefile (contents, props changed)
stable/8/share/man/man4/Makefile
stable/8/share/man/man4/syscons.4
stable/8/sys/amd64/conf/NOTES
stable/8/sys/compat/x86bios/x86bios.c
stable/8/sys/compat/x86bios/x86bios.h
stable/8/sys/conf/NOTES
stable/8/sys/conf/files
stable/8/sys/conf/files.amd64
stable/8/sys/conf/files.i386
stable/8/sys/conf/options
stable/8/sys/conf/options.amd64
stable/8/sys/contrib/x86emu/x86emu.c (contents, props changed)
stable/8/sys/contrib/x86emu/x86emu.h (contents, props changed)
stable/8/sys/dev/atkbdc/atkbd.c
stable/8/sys/dev/fb/s3_pci.c
stable/8/sys/dev/fb/vga.c
stable/8/sys/dev/fb/vgareg.h
stable/8/sys/dev/pci/vga_pci.c
stable/8/sys/dev/syscons/scvesactl.c
stable/8/sys/dev/syscons/scvgarndr.c
stable/8/sys/dev/syscons/scvidctl.c
stable/8/sys/dev/syscons/syscons.c
stable/8/sys/dev/syscons/syscons.h
stable/8/sys/i386/conf/NOTES
stable/8/sys/isa/vga_isa.c
stable/8/sys/modules/Makefile
stable/8/sys/modules/dpms/Makefile
stable/8/sys/modules/vesa/Makefile
stable/8/sys/modules/x86bios/Makefile
stable/8/sys/sys/fbio.h
stable/8/sys/sys/param.h
Directory Properties:
stable/8/share/man/man4/ (props changed)
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)
stable/8/sys/dev/xen/xenpci/ (props changed)
stable/8/sys/netinet/ (props changed)
Modified: stable/8/ObsoleteFiles.inc
==
--- stable/8/ObsoleteFiles.inc Tue Mar 2 01:45:02 2010(r204545)
+++ stable/8/ObsoleteFiles.inc Tue Mar 2 01:56:55 2010(r204546)
@@ -14,6 +14,9 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20100301: vesa and dpms promoted to be i386/amd64 common
+OLD_FILES+=usr/include/machine/pc/vesa.h
+OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz
# 20091218: removal of rc.early(8) link
OLD_FILES+=usr/share/man/man8/rc.early.8.gz
# 20091027: pselect.3 implemented as syscall
Modified: stable/8/lib/Makefile
==
--- stable/8/lib/Makefile Tue Mar 2 01:45:02 2010(r204545)
+++ stable/8/lib/Makefile Tue Mar 2 01:56:55 2010(r204546)
@@ -112,6 +112,7 @@ _libsmb=libsmb
_libncp= libncp
.endif
_libsmb= libsmb
+_libvgl= libvgl
.endif
.if ${MACHINE_ARCH} == "powerpc"
Modified: stable/8/share/man/man4/Makefile
==
--- stable/8/share/man/man4/MakefileTue Mar 2 01:45:02 2010
(r204545)
+++ stable/8/share/man/man4/MakefileTue Mar 2 01:56:55 2010
(r204546)
@@ -86,6 +86,7 @@ MAN= aac.4 \
digi.4 \
disc.4 \
divert.4 \
+ ${_dpms.4} \
dpt.4 \
dummynet.4 \
ed.4 \
@@ -622,6 +623,7 @@ _amdtemp.4= amdtemp.4
_asmc.4= asmc.4
_coretemp.4= coretemp.4
_cpuctl.4= cpuctl.4
+_dpms.4= dpms.4
_hptiop.4= hptiop.4
_hptmv.4= hptmv.4
_hptrr.4= hptrr.4
Copied: stable/8/share/man/man4/dpms.4 (from r197025,
head/share/
svn commit: r204548 - head/gnu/usr.bin/binutils/ld
Author: imp
Date: Tue Mar 2 05:43:04 2010
New Revision: 204548
URL: http://svn.freebsd.org/changeset/base/204548
Log:
Add n32 ABI generators...
Submitted by: neel, jmallet
Added:
head/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh
- copied unchanged from r204272,
head/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh
head/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh
- copied unchanged from r204272,
head/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh
Modified:
head/gnu/usr.bin/binutils/ld/Makefile.mips
head/gnu/usr.bin/binutils/ld/genscripts.sh
Modified: head/gnu/usr.bin/binutils/ld/Makefile.mips
==
--- head/gnu/usr.bin/binutils/ld/Makefile.mips Tue Mar 2 05:40:01 2010
(r204547)
+++ head/gnu/usr.bin/binutils/ld/Makefile.mips Tue Mar 2 05:43:04 2010
(r204548)
@@ -10,7 +10,8 @@ NATIVE_EMULATION=elf${_sz}btsmip_fbsd
NATIVE_EMULATION=elf${_sz}ltsmip_fbsd
.endif
-MIPS_ABIS=elf32btsmip_fbsd elf32ltsmip_fbsd elf64btsmip_fbsd elf64ltsmip_fbsd
+MIPS_ABIS=elf32btsmip_fbsd elf32ltsmip_fbsd elf64btsmip_fbsd elf64ltsmip_fbsd \
+elf32btsmipn32_fbsd elf32ltsmipn32_fbsd
.for abi in ${MIPS_ABIS}
#.if (${abi} != ${NATIVE_EMULATION})
EMS+= ${abi}
Copied: head/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh (from r204272,
head/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh Tue Mar 2 05:43:04
2010(r204548, copy of r204272,
head/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+. ${srcdir}/emulparams/elf32btsmip.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+GENERATE_PIE_SCRIPT=yes
Copied: head/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh (from r204272,
head/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh Tue Mar 2 05:43:04
2010(r204548, copy of r204272,
head/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+. ${srcdir}/emulparams/elf32ltsmip.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+GENERATE_PIE_SCRIPT=yes
Modified: head/gnu/usr.bin/binutils/ld/genscripts.sh
==
--- head/gnu/usr.bin/binutils/ld/genscripts.sh Tue Mar 2 05:40:01 2010
(r204547)
+++ head/gnu/usr.bin/binutils/ld/genscripts.sh Tue Mar 2 05:43:04 2010
(r204548)
@@ -50,6 +50,7 @@ fi
if test -d ldscripts; then
true
else
+ rm -f ldscripts
mkdir ldscripts
fi
___
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: r204549 - head/contrib/gcc/config/mips
Author: imp
Date: Tue Mar 2 05:59:14 2010
New Revision: 204549
URL: http://svn.freebsd.org/changeset/base/204549
Log:
Bring in more built-in defines from NetBSD
a few #defines from JC.
# tested only with o32 at the moment
Submitted by: C. Jayachandran (CJ)
Obtained from:NetBSD
Modified:
head/contrib/gcc/config/mips/freebsd.h
Modified: head/contrib/gcc/config/mips/freebsd.h
==
--- head/contrib/gcc/config/mips/freebsd.h Tue Mar 2 05:43:04 2010
(r204548)
+++ head/contrib/gcc/config/mips/freebsd.h Tue Mar 2 05:59:14 2010
(r204549)
@@ -130,10 +130,67 @@ Boston, MA 02110-1301, USA. */
if (TARGET_MIPS16) \
builtin_define ("__mips16");\
\
+ if (mips_abi == ABI_N32) \
+{ \
+ builtin_define ("__mips_n32");\
+ builtin_define ("_ABIN32=2"); \
+ builtin_define ("_MIPS_SIM=_ABIN32"); \
+ builtin_define ("_MIPS_SZLONG=32"); \
+ builtin_define ("_MIPS_SZPTR=32");\
+} \
+ else if (mips_abi == ABI_64) \
+{ \
+ builtin_define ("__mips_n64");\
+ builtin_define ("_ABI64=3"); \
+ builtin_define ("_MIPS_SIM=_ABI64"); \
+ builtin_define ("_MIPS_SZLONG=64"); \
+ builtin_define ("_MIPS_SZPTR=64");\
+} \
+ else if (mips_abi == ABI_O64) \
+{ \
+ builtin_define ("__mips_o64");\
+ builtin_define ("_ABIO64=4"); \
+ builtin_define ("_MIPS_SIM=_ABIO64"); \
+ builtin_define ("_MIPS_SZLONG=64"); \
+ builtin_define ("_MIPS_SZPTR=64");\
+} \
+ else if (mips_abi == ABI_EABI)\
+{ \
+ builtin_define ("__mips_eabi"); \
+ builtin_define ("_ABIEMB=5"); \
+ builtin_define ("_MIPS_SIM=_ABIEMB"); \
+ if (TARGET_LONG64)\
+builtin_define ("_MIPS_SZLONG=64"); \
+ else \
+builtin_define ("_MIPS_SZLONG=32"); \
+ if (TARGET_64BIT) \
+builtin_define ("_MIPS_SZPTR=64"); \
+ else \
+builtin_define ("_MIPS_SZPTR=32"); \
+} \
+ else \
+{ \
+ builtin_define ("__mips_o32");\
+ builtin_define ("_ABIO32=1"); \
+ builtin_define ("_MIPS_SIM=_ABIO32"); \
+ builtin_define ("_MIPS_SZLONG=32"); \
+ builtin_define ("_MIPS_SZPTR=32");\
+} \
+ if (TARGET_FLOAT64) \
+builtin_define ("_MIPS_FPSET=32"); \
+ else \
+builtin_define ("_MIPS_FPSET=16"); \
+\
+ builtin_define ("_MIPS_SZINT=32");\
+ \
MIPS_CPP_SET_PROCESSOR ("_MIPS_ARCH", mips_arch_info); \
MIPS_CPP_SET_PROCESSOR ("_MIPS_TUNE", mips_tune_info); \
\
- if (ISA_MIPS3) \
+ if (ISA_MIPS1)\
+builtin_define ("__mips=1");\
+ else if (ISA_MIPS2) \
+builtin_define ("__mips=2");
Re: svn commit: r204548 - head/gnu/usr.bin/binutils/ld
In message: <201003020543.o225h4bn034...@svn.freebsd.org>
Warner Losh writes:
: Author: imp
: Date: Tue Mar 2 05:43:04 2010
: New Revision: 204548
: URL: http://svn.freebsd.org/changeset/base/204548
:
: Log:
: Add n32 ABI generators...
:
: Submitted by: neel, jmallet
Correction: This was submitted by JC (C. Jayachandran).
: Added:
: head/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh
: - copied unchanged from r204272,
head/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh
: head/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh
: - copied unchanged from r204272,
head/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh
: Modified:
: head/gnu/usr.bin/binutils/ld/Makefile.mips
: head/gnu/usr.bin/binutils/ld/genscripts.sh
:
: Modified: head/gnu/usr.bin/binutils/ld/Makefile.mips
: ==
: --- head/gnu/usr.bin/binutils/ld/Makefile.mipsTue Mar 2 05:40:01
2010(r204547)
: +++ head/gnu/usr.bin/binutils/ld/Makefile.mipsTue Mar 2 05:43:04
2010(r204548)
: @@ -10,7 +10,8 @@ NATIVE_EMULATION=elf${_sz}btsmip_fbsd
: NATIVE_EMULATION=elf${_sz}ltsmip_fbsd
: .endif
:
: -MIPS_ABIS=elf32btsmip_fbsd elf32ltsmip_fbsd elf64btsmip_fbsd elf64ltsmip_fbsd
: +MIPS_ABIS=elf32btsmip_fbsd elf32ltsmip_fbsd elf64btsmip_fbsd
elf64ltsmip_fbsd \
: +elf32btsmipn32_fbsd elf32ltsmipn32_fbsd
: .for abi in ${MIPS_ABIS}
: #.if (${abi} != ${NATIVE_EMULATION})
: EMS+= ${abi}
:
: Copied: head/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh (from r204272,
head/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh)
: ==
: --- /dev/null 00:00:00 1970 (empty, because file is newly added)
: +++ head/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh Tue Mar 2
05:43:04 2010(r204548, copy of r204272,
head/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh)
: @@ -0,0 +1,4 @@
: +# $FreeBSD$
: +. ${srcdir}/emulparams/elf32btsmip.sh
: +. ${srcdir}/emulparams/elf_fbsd.sh
: +GENERATE_PIE_SCRIPT=yes
:
: Copied: head/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh (from r204272,
head/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh)
: ==
: --- /dev/null 00:00:00 1970 (empty, because file is newly added)
: +++ head/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh Tue Mar 2
05:43:04 2010(r204548, copy of r204272,
head/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh)
: @@ -0,0 +1,4 @@
: +# $FreeBSD$
: +. ${srcdir}/emulparams/elf32ltsmip.sh
: +. ${srcdir}/emulparams/elf_fbsd.sh
: +GENERATE_PIE_SCRIPT=yes
:
: Modified: head/gnu/usr.bin/binutils/ld/genscripts.sh
: ==
: --- head/gnu/usr.bin/binutils/ld/genscripts.shTue Mar 2 05:40:01
2010(r204547)
: +++ head/gnu/usr.bin/binutils/ld/genscripts.shTue Mar 2 05:43:04
2010(r204548)
: @@ -50,6 +50,7 @@ fi
: if test -d ldscripts; then
:true
: else
: + rm -f ldscripts
:mkdir ldscripts
: fi
:
:
___
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: r204552 - in head/sys: conf kern net sys
Author: alfred
Date: Tue Mar 2 06:58:58 2010
New Revision: 204552
URL: http://svn.freebsd.org/changeset/base/204552
Log:
Merge projects/enhanced_coredumps (r204346) into HEAD:
Enhanced process coredump routines.
This brings in the following features:
1) Limit number of cores per process via the %I coredump formatter.
Example:
if corefilename is set to %N.%I.core AND num_cores = 3, then
if a process "rpd" cores, then the corefile will be named
"rpd.0.core", however if it cores again, then the kernel will
generate "rpd.1.core" until we hit the limit of "num_cores".
this is useful to get several corefiles, but also prevent filling
the machine with corefiles.
2) Encode machine hostname in core dump name via %H.
3) Compress coredumps, useful for embedded platforms with limited space.
A sysctl kern.compress_user_cores is made available if turned on.
To enable compressed coredumps, the following config options need to be
set:
options COMPRESS_USER_CORES
device zlib # brings in the zlib requirements.
device gzio # brings in the kernel vnode gzip output module.
4) Eventhandlers are fired to indicate coredumps in progress.
5) The imgact sv_coredump routine has grown a flag to pass in more
state, currently this is used only for passing a flag down to compress
the coredump or not.
Note that the gzio facility can be used for generic output of gzip'd
streams via vnodes.
Obtained from: Juniper Networks
Reviewed by: kan
Added:
head/sys/kern/kern_gzio.c (contents, props changed)
head/sys/net/zutil.h (contents, props changed)
Modified:
head/sys/conf/files
head/sys/conf/options
head/sys/kern/imgact_elf.c
head/sys/kern/kern_sig.c
head/sys/net/zlib.h
head/sys/sys/eventhandler.h
head/sys/sys/imgact.h
head/sys/sys/imgact_aout.h
head/sys/sys/imgact_elf.h
head/sys/sys/sysent.h
Modified: head/sys/conf/files
==
--- head/sys/conf/files Tue Mar 2 06:54:15 2010(r204551)
+++ head/sys/conf/files Tue Mar 2 06:58:58 2010(r204552)
@@ -2053,6 +2053,7 @@ kern/kern_exec.c standard
kern/kern_exit.c standard
kern/kern_fail.c standard
kern/kern_fork.c standard
+kern/kern_gzio.c optional gzio
kern/kern_idle.c standard
kern/kern_intr.c standard
kern/kern_jail.c standard
@@ -2344,7 +2345,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
+ddb_ctf | zlib
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 Tue Mar 2 06:54:15 2010(r204551)
+++ head/sys/conf/options Tue Mar 2 06:58:58 2010(r204552)
@@ -71,6 +71,7 @@ COMPAT_FREEBSD5 opt_compat.h
COMPAT_FREEBSD6opt_compat.h
COMPAT_FREEBSD7opt_compat.h
COMPILING_LINT opt_global.h
+COMPRESS_USER_CORES opt_core.h
CY_PCI_FASTINTR
DEADLKRES opt_watchdog.h
DIRECTIO
Modified: head/sys/kern/imgact_elf.c
==
--- head/sys/kern/imgact_elf.c Tue Mar 2 06:54:15 2010(r204551)
+++ head/sys/kern/imgact_elf.c Tue Mar 2 06:58:58 2010(r204552)
@@ -32,6 +32,7 @@
__FBSDID("$FreeBSD$");
#include "opt_compat.h"
+#include "opt_core.h"
#include
#include
@@ -58,6 +59,10 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
+#include
+
+#include
#include
#include
@@ -95,6 +100,12 @@ static boolean_t __elfN(check_note)(stru
SYSCTL_NODE(_kern, OID_AUTO, __CONCAT(elf, __ELF_WORD_SIZE), CTLFLAG_RW, 0,
"");
+#ifdef COMPRESS_USER_CORES
+static int compress_core(gzFile, char *, char *, unsigned int,
+struct thread * td);
+#define CORE_BUF_SIZE (16 * 1024)
+#endif
+
int __elfN(fallback_brand) = -1;
SYSCTL_INT(__CONCAT(_kern_elf, __ELF_WORD_SIZE), OID_AUTO,
fallback_brand, CTLFLAG_RW, &__elfN(fallback_brand), 0,
@@ -1003,16 +1014,38 @@ static void cb_put_phdr(vm_map_entry_t,
static void cb_size_segment(vm_map_entry_t, void *);
static void each_writable_segment(struct thread *, segment_callback, void *);
static int __elfN(corehdr)(struct thread *, struct vnode *, struct ucred *,
-int, void *, size_t);
+int, void *, size_t, gzFile);
static void __elfN(puthdr)(struct thread *, void *, size_t *, int);
static void __elfN(putnote)(vo
svn commit: r204553 - head/bin/pkill
Author: joel (doc committer) Date: Tue Mar 2 07:20:46 2010 New Revision: 204553 URL: http://svn.freebsd.org/changeset/base/204553 Log: The NetBSD Foundation has granted permission to remove clause 3 and 4 from their software. Approved by: pjd Obtained from:NetBSD Modified: head/bin/pkill/pkill.1 head/bin/pkill/pkill.c Modified: head/bin/pkill/pkill.1 == --- head/bin/pkill/pkill.1 Tue Mar 2 06:58:58 2010(r204552) +++ head/bin/pkill/pkill.1 Tue Mar 2 07:20:46 2010(r204553) @@ -16,13 +16,6 @@ .\" 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. -.\" 3. All advertising materials mentioning features or use of this software -.\"must display the following acknowledgement: -.\"This product includes software developed by the NetBSD -.\"Foundation, Inc. and its contributors. -.\" 4. Neither the name of The NetBSD Foundation nor the names of its -.\"contributors may be used to endorse or promote products derived -.\"from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: head/bin/pkill/pkill.c == --- head/bin/pkill/pkill.c Tue Mar 2 06:58:58 2010(r204552) +++ head/bin/pkill/pkill.c Tue Mar 2 07:20:46 2010(r204553) @@ -16,13 +16,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - *contributors may be used to endorse or promote products derived - *from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED ___ 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: r204554 - head/share/mk
Author: imp Date: Tue Mar 2 07:24:47 2010 New Revision: 204554 URL: http://svn.freebsd.org/changeset/base/204554 Log: -mno-dsp hasn't been required for a while now. Modified: head/share/mk/bsd.cpu.mk Modified: head/share/mk/bsd.cpu.mk == --- head/share/mk/bsd.cpu.mkTue Mar 2 07:20:46 2010(r204553) +++ head/share/mk/bsd.cpu.mkTue Mar 2 07:24:47 2010(r204554) @@ -208,7 +208,7 @@ LD += -EB CFLAGS += -EL LD += -EL . endif -CFLAGS += -msoft-float -G0 -mno-dsp -mabicalls +CFLAGS += -msoft-float -G0 -mabicalls .endif # NB: COPTFLAGS is handled in /usr/src/sys/conf/kern.pre.mk ___ 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: r204555 - head/lib/libedit
Author: joel (doc committer) Date: Tue Mar 2 07:25:20 2010 New Revision: 204555 URL: http://svn.freebsd.org/changeset/base/204555 Log: The NetBSD Foundation has granted permission to remove clause 3 and 4 from their software. Obtained from:NetBSD Modified: head/lib/libedit/editline.3 head/lib/libedit/editrc.5 head/lib/libedit/read.h Modified: head/lib/libedit/editline.3 == --- head/lib/libedit/editline.3 Tue Mar 2 07:24:47 2010(r204554) +++ head/lib/libedit/editline.3 Tue Mar 2 07:25:20 2010(r204555) @@ -13,9 +13,6 @@ .\" 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. -.\" 3. Neither the name of The NetBSD Foundation nor the names of its -.\"contributors may be used to endorse or promote products derived -.\"from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: head/lib/libedit/editrc.5 == --- head/lib/libedit/editrc.5 Tue Mar 2 07:24:47 2010(r204554) +++ head/lib/libedit/editrc.5 Tue Mar 2 07:25:20 2010(r204555) @@ -13,9 +13,6 @@ .\" 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. -.\" 3. Neither the name of The NetBSD Foundation nor the names of its -.\"contributors may be used to endorse or promote products derived -.\"from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: head/lib/libedit/read.h == --- head/lib/libedit/read.h Tue Mar 2 07:24:47 2010(r204554) +++ head/lib/libedit/read.h Tue Mar 2 07:25:20 2010(r204555) @@ -13,9 +13,6 @@ * 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. - * 3. Neither the name of The NetBSD Foundation nor the names of its - *contributors may be used to endorse or promote products derived - *from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED ___ 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: r204556 - in head: contrib/csup usr.bin/csup
Author: lulf Date: Tue Mar 2 07:26:07 2010 New Revision: 204556 URL: http://svn.freebsd.org/changeset/base/204556 Log: - Move csup away from contrib/ and into usr.bin/. Software is no longer contributed, and main development is happening in the FreeBSD repo. Suggested by: joel Added: head/usr.bin/csup/README - copied unchanged from r204523, head/contrib/csup/README head/usr.bin/csup/TODO - copied unchanged from r204523, head/contrib/csup/TODO head/usr.bin/csup/attrstack.c - copied unchanged from r204523, head/contrib/csup/attrstack.c head/usr.bin/csup/attrstack.h - copied unchanged from r204523, head/contrib/csup/attrstack.h head/usr.bin/csup/auth.c - copied unchanged from r204523, head/contrib/csup/auth.c head/usr.bin/csup/auth.h - copied unchanged from r204523, head/contrib/csup/auth.h head/usr.bin/csup/config.c - copied unchanged from r204523, head/contrib/csup/config.c head/usr.bin/csup/config.h - copied unchanged from r204523, head/contrib/csup/config.h head/usr.bin/csup/cpasswd.1 - copied unchanged from r204523, head/contrib/csup/cpasswd.1 head/usr.bin/csup/cpasswd.sh - copied unchanged from r204523, head/contrib/csup/cpasswd.sh head/usr.bin/csup/csup.1 - copied unchanged from r204523, head/contrib/csup/csup.1 head/usr.bin/csup/detailer.c - copied unchanged from r204523, head/contrib/csup/detailer.c head/usr.bin/csup/detailer.h - copied unchanged from r204523, head/contrib/csup/detailer.h head/usr.bin/csup/diff.c - copied unchanged from r204523, head/contrib/csup/diff.c head/usr.bin/csup/diff.h - copied unchanged from r204523, head/contrib/csup/diff.h head/usr.bin/csup/fattr.c - copied unchanged from r204523, head/contrib/csup/fattr.c head/usr.bin/csup/fattr.h - copied unchanged from r204523, head/contrib/csup/fattr.h head/usr.bin/csup/fattr_bsd.h - copied unchanged from r204523, head/contrib/csup/fattr_bsd.h head/usr.bin/csup/fattr_posix.h - copied unchanged from r204523, head/contrib/csup/fattr_posix.h head/usr.bin/csup/fixups.c - copied unchanged from r204523, head/contrib/csup/fixups.c head/usr.bin/csup/fixups.h - copied unchanged from r204523, head/contrib/csup/fixups.h head/usr.bin/csup/fnmatch.c - copied unchanged from r204523, head/contrib/csup/fnmatch.c head/usr.bin/csup/fnmatch.h - copied unchanged from r204523, head/contrib/csup/fnmatch.h head/usr.bin/csup/globtree.c - copied unchanged from r204523, head/contrib/csup/globtree.c head/usr.bin/csup/globtree.h - copied unchanged from r204523, head/contrib/csup/globtree.h head/usr.bin/csup/idcache.c - copied unchanged from r204523, head/contrib/csup/idcache.c head/usr.bin/csup/idcache.h - copied unchanged from r204523, head/contrib/csup/idcache.h head/usr.bin/csup/keyword.c - copied unchanged from r204523, head/contrib/csup/keyword.c head/usr.bin/csup/keyword.h - copied unchanged from r204523, head/contrib/csup/keyword.h head/usr.bin/csup/lex.rcs.c - copied unchanged from r204523, head/contrib/csup/lex.rcs.c head/usr.bin/csup/lister.c - copied unchanged from r204523, head/contrib/csup/lister.c head/usr.bin/csup/lister.h - copied unchanged from r204523, head/contrib/csup/lister.h head/usr.bin/csup/main.c - copied unchanged from r204523, head/contrib/csup/main.c head/usr.bin/csup/main.h - copied unchanged from r204523, head/contrib/csup/main.h head/usr.bin/csup/misc.c - copied unchanged from r204523, head/contrib/csup/misc.c head/usr.bin/csup/misc.h - copied unchanged from r204523, head/contrib/csup/misc.h head/usr.bin/csup/mux.c - copied unchanged from r204523, head/contrib/csup/mux.c head/usr.bin/csup/mux.h - copied unchanged from r204523, head/contrib/csup/mux.h head/usr.bin/csup/parse.y - copied unchanged from r204523, head/contrib/csup/parse.y head/usr.bin/csup/pathcomp.c - copied unchanged from r204523, head/contrib/csup/pathcomp.c head/usr.bin/csup/pathcomp.h - copied unchanged from r204523, head/contrib/csup/pathcomp.h head/usr.bin/csup/proto.c - copied unchanged from r204523, head/contrib/csup/proto.c head/usr.bin/csup/proto.h - copied unchanged from r204523, head/contrib/csup/proto.h head/usr.bin/csup/queue.h - copied unchanged from r204523, head/contrib/csup/queue.h head/usr.bin/csup/rcsfile.c - copied unchanged from r204523, head/contrib/csup/rcsfile.c head/usr.bin/csup/rcsfile.h - copied unchanged from r204523, head/contrib/csup/rcsfile.h head/usr.bin/csup/rcsparse.c - copied unchanged from r204523, head/contrib/csup/rcsparse.c head/usr.bin/csup/rcsparse.h - copied unchanged from r204523, head/contrib/csup/rcsparse.h head/usr.bin/csup/rcstokenizer.h - copied unchanged from r204523, head/contrib/csup/rcstokenizer.h head/usr.bin/csup/rcstokenizer.l - copied unchanged from r20452
svn commit: r204557 - head/sys/mips/include
Author: imp
Date: Tue Mar 2 07:27:30 2010
New Revision: 204557
URL: http://svn.freebsd.org/changeset/base/204557
Log:
Update macros for multiple ABI support from NetBSD.
Also update SZREG define in ucontext
Modified:
head/sys/mips/include/asm.h
head/sys/mips/include/cdefs.h
head/sys/mips/include/ucontext.h
Modified: head/sys/mips/include/asm.h
==
--- head/sys/mips/include/asm.h Tue Mar 2 07:26:07 2010(r204556)
+++ head/sys/mips/include/asm.h Tue Mar 2 07:27:30 2010(r204557)
@@ -340,17 +340,47 @@ _C_LABEL(x):
#defineNON_LEAF(x, fsize, retpc) NESTED(x, fsize, retpc)
#defineNNON_LEAF(x, fsize, retpc) NESTED_NOPROFILE(x, fsize,
retpc)
+#if defined(__mips_o32)
+#defineSZREG 4
+#else
+#defineSZREG 8
+#endif
+
+#if defined(__mips_o32) || defined(__mips_o64)
+#defineALSK7 /* stack alignment */
+#defineALMASK -7 /* stack alignment */
+#defineSZFPREG 4
+#defineFP_Llwc1
+#defineFP_Sswc1
+#else
+#defineALSK15 /* stack alignment */
+#defineALMASK -15 /* stack alignment */
+#defineSZFPREG 8
+#defineFP_Lldc1
+#defineFP_Ssdc1
+#endif
+
/*
* standard callframe {
- * register_t cf_args[4]; arg0 - arg3
+ * register_t cf_pad[N]; o32/64 (N=0), n32 (N=1) n64 (N=1)
+ * register_t cf_args[4]; arg0 - arg3 (only on o32 and o64)
+ * register_t cf_gp; global pointer (only on n32 and n64)
* register_t cf_sp; frame pointer
* register_t cf_ra; return address
* };
*/
-#defineCALLFRAME_SIZ (4 * (4 + 2))
-#defineCALLFRAME_SP(4 * 4)
-#defineCALLFRAME_RA(4 * 5)
-#defineSTART_FRAME CALLFRAME_SIZ
+#if defined(__mips_o32) || defined(__mips_o64)
+#defineCALLFRAME_SIZ (SZREG * (4 + 2))
+#defineCALLFRAME_S00
+#elif defined(__mips_n32) || defined(__mips_n64)
+#defineCALLFRAME_SIZ (SZREG * 4)
+#defineCALLFRAME_S0(CALLFRAME_SIZ - 4 * SZREG)
+#endif
+#ifndef _KERNEL
+#defineCALLFRAME_GP(CALLFRAME_SIZ - 3 * SZREG)
+#endif
+#defineCALLFRAME_SP(CALLFRAME_SIZ - 2 * SZREG)
+#defineCALLFRAME_RA(CALLFRAME_SIZ - 1 * SZREG)
/*
* While it would be nice to be compatible with the SGI
@@ -361,27 +391,264 @@ _C_LABEL(x):
* assembler to prevent the assembler from generating 64-bit style
* ABI calls.
*/
+#if _MIPS_SZPTR == 32
+#definePTR_ADD add
+#definePTR_ADDIaddi
+#definePTR_ADDUaddu
+#definePTR_ADDIU addiu
+#definePTR_SUB add
+#definePTR_SUBIsubi
+#definePTR_SUBUsubu
+#definePTR_SUBIU subu
+#definePTR_L lw
+#definePTR_LA la
+#definePTR_S sw
+#definePTR_SLL sll
+#definePTR_SLLVsllv
+#definePTR_SRL srl
+#definePTR_SRLVsrlv
+#definePTR_SRA sra
+#definePTR_SRAVsrav
+#definePTR_LL ll
+#definePTR_SC sc
+#definePTR_WORD.word
+#definePTR_SCALESHIFT 2
+#else /* _MIPS_SZPTR == 64 */
+#definePTR_ADD dadd
+#definePTR_ADDIdaddi
+#definePTR_ADDUdaddu
+#definePTR_ADDIU daddiu
+#definePTR_SUB dadd
+#definePTR_SUBIdsubi
+#definePTR_SUBUdsubu
+#definePTR_SUBIU dsubu
+#definePTR_L ld
+#definePTR_LA dla
+#definePTR_S sd
+#definePTR_SLL dsll
+#definePTR_SLLVdsllv
+#definePTR_SRL dsrl
+#definePTR_SRLVdsrlv
+#definePTR_SRA dsra
+#definePTR_SRAVdsrav
+#definePTR_LL lld
+#definePTR_SC scd
+#definePTR_WORD.dword
+#definePTR_SCALESHIFT 3
+#endif /* _MIPS_SZPTR == 64 */
+
+#if _MIPS_SZINT == 32
+#defineINT_ADD add
+#defineINT_ADDIaddi
+#defineINT_ADDUaddu
+#defineINT_ADDIU addiu
+#defineINT_SUB add
+#defineINT_SUBIsubi
+#defineINT_SUBUsubu
+#defineINT_SUBIU subu
+#defineINT_L lw
+#defineINT_LA la
+#defineINT_S sw
+#defineINT_SLL sll
+#defineINT_SLLVsllv
+#defineINT_SRL srl
+#defineINT_SRLVsrlv
+#defineINT_SRA sra
+#defineINT_SRAVsrav
+#defineINT_LL ll
+#defineINT_SC sc
+#defineIN
svn commit: r204558 - head/usr.bin/csup
Author: lulf Date: Tue Mar 2 07:37:35 2010 New Revision: 204558 URL: http://svn.freebsd.org/changeset/base/204558 Log: - Unmark authentication support as a TODO item. Modified: head/usr.bin/csup/TODO Modified: head/usr.bin/csup/TODO == --- head/usr.bin/csup/TODO Tue Mar 2 07:27:30 2010(r204557) +++ head/usr.bin/csup/TODO Tue Mar 2 07:37:35 2010(r204558) @@ -18,9 +18,8 @@ BUGS: MISSING FEATURES: - Add support for shell commands sent by the server. -- Add missing support for various CVSup options : -D, -a (requires - authentication support), -e and -E (requires shell commands support) - and the destDir parameter. +- Add missing support for various CVSup options : -D, -e and -E (requires + shell commands support) and the destDir parameter. - For now, this code should build fine on FreeBSD, NetBSD, OpenBSD, Linux and Darwin. Solaris support would also be nice at some point. - Implement some new useful options : the ability to generate CVS ___ 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: r204559 - head/share/mk
Author: imp Date: Tue Mar 2 07:44:38 2010 New Revision: 204559 URL: http://svn.freebsd.org/changeset/base/204559 Log: -mabi-calls and -msoft-float aren't needed either Submitted by: jmallet@ Modified: head/share/mk/bsd.cpu.mk Modified: head/share/mk/bsd.cpu.mk == --- head/share/mk/bsd.cpu.mkTue Mar 2 07:37:35 2010(r204558) +++ head/share/mk/bsd.cpu.mkTue Mar 2 07:44:38 2010(r204559) @@ -208,7 +208,7 @@ LD += -EB CFLAGS += -EL LD += -EL . endif -CFLAGS += -msoft-float -G0 -mabicalls +CFLAGS += -G0 .endif # NB: COPTFLAGS is handled in /usr/src/sys/conf/kern.pre.mk ___ 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: r204560 - stable/8/share/man/man4/man4.i386
Author: delphij Date: Tue Mar 2 07:48:12 2010 New Revision: 204560 URL: http://svn.freebsd.org/changeset/base/204560 Log: MFC r197042: remove dpms.4. Modified: stable/8/share/man/man4/man4.i386/Makefile Directory Properties: stable/8/share/man/man4/ (props changed) Modified: stable/8/share/man/man4/man4.i386/Makefile == --- stable/8/share/man/man4/man4.i386/Makefile Tue Mar 2 07:44:38 2010 (r204559) +++ stable/8/share/man/man4/man4.i386/Makefile Tue Mar 2 07:48:12 2010 (r204560) @@ -10,7 +10,6 @@ MAN= aic.4 \ cs.4 \ ct.4 \ ctau.4 \ - dpms.4 \ cx.4 \ ep.4 \ ex.4 \ ___ 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"
