Re: svn commit: r221124 - in head: . sbin/mount sbin/mount_nfs sys/amd64/conf sys/fs/nfsclient sys/i386/conf sys/ia64/conf sys/nfsclient sys/pc98/conf sys/powerpc/conf sys/sparc64/conf sys/sun4v/conf
Rick Macklem writes: > "Dag-Erling Smørgrav" writes: > > Ideally, both the old and the new NFS stack would use the same > > fstypes and sysctl names, but I don't know if there's any way we can > > prevent someone from compiling both into the kernel at the same > > time, or loading both modules. > If the scripts in /etc/rc.d are fixed to use the correct sysctl naming, > do you think it matters which one is "vfs.nfs."? Yes. There is a whole world outside the base system: munin, webmin, nagios etc. Are you going to change all of them as well? DES -- Dag-Erling Smørgrav - d...@des.no ___ 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: r221484 - vendor-crypto/openssh/dist
Author: des Date: Thu May 5 07:59:12 2011 New Revision: 221484 URL: http://svn.freebsd.org/changeset/base/221484 Log: djm released a new 5.8p2 tarball with the correct version number. Modified: vendor-crypto/openssh/dist/ChangeLog vendor-crypto/openssh/dist/version.h Modified: vendor-crypto/openssh/dist/ChangeLog == --- vendor-crypto/openssh/dist/ChangeLogThu May 5 04:43:05 2011 (r221483) +++ vendor-crypto/openssh/dist/ChangeLogThu May 5 07:59:12 2011 (r221484) @@ -1,6 +1,7 @@ 20110403 - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] [contrib/suse/openssh.spec] Prepare for 5.8p2 release. + - (djm) [version.h] crank version - Release 5.8p2 20110329 Modified: vendor-crypto/openssh/dist/version.h == --- vendor-crypto/openssh/dist/version.hThu May 5 04:43:05 2011 (r221483) +++ vendor-crypto/openssh/dist/version.hThu May 5 07:59:12 2011 (r221484) @@ -2,5 +2,5 @@ #define SSH_VERSION"OpenSSH_5.8" -#define SSH_PORTABLE "p1" +#define SSH_PORTABLE "p2" #define SSH_RELEASESSH_VERSION SSH_PORTABLE ___ 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: r221485 - vendor-crypto/openssh/5.8p2
Author: des Date: Thu May 5 08:01:22 2011 New Revision: 221485 URL: http://svn.freebsd.org/changeset/base/221485 Log: updated 5.8p2 tarball Modified: vendor-crypto/openssh/5.8p2/ChangeLog vendor-crypto/openssh/5.8p2/version.h Modified: vendor-crypto/openssh/5.8p2/ChangeLog == --- vendor-crypto/openssh/5.8p2/ChangeLog Thu May 5 07:59:12 2011 (r221484) +++ vendor-crypto/openssh/5.8p2/ChangeLog Thu May 5 08:01:22 2011 (r221485) @@ -1,6 +1,7 @@ 20110403 - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] [contrib/suse/openssh.spec] Prepare for 5.8p2 release. + - (djm) [version.h] crank version - Release 5.8p2 20110329 Modified: vendor-crypto/openssh/5.8p2/version.h == --- vendor-crypto/openssh/5.8p2/version.h Thu May 5 07:59:12 2011 (r221484) +++ vendor-crypto/openssh/5.8p2/version.h Thu May 5 08:01:22 2011 (r221485) @@ -2,5 +2,5 @@ #define SSH_VERSION"OpenSSH_5.8" -#define SSH_PORTABLE "p1" +#define SSH_PORTABLE "p2" #define SSH_RELEASESSH_VERSION SSH_PORTABLE ___ 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: r221486 - vendor-crypto/openssh/dist
Author: des Date: Thu May 5 08:04:31 2011 New Revision: 221486 URL: http://svn.freebsd.org/changeset/base/221486 Log: Merge from upstream: #include before checking for macros that it defines. Modified: vendor-crypto/openssh/dist/defines.h Modified: vendor-crypto/openssh/dist/defines.h == --- vendor-crypto/openssh/dist/defines.hThu May 5 08:01:22 2011 (r221485) +++ vendor-crypto/openssh/dist/defines.hThu May 5 08:04:31 2011 (r221486) @@ -25,7 +25,7 @@ #ifndef _DEFINES_H #define _DEFINES_H -/* $Id: defines.h,v 1.164 2011/01/17 10:15:31 dtucker Exp $ */ +/* $Id: defines.h,v 1.165 2011/05/05 01:19:15 djm Exp $ */ /* Constants */ @@ -45,6 +45,8 @@ enum /* * Definitions for IP type of service (ip_tos) */ +#include +#include #ifndef IPTOS_LOWDELAY # define IPTOS_LOWDELAY 0x10 # define IPTOS_THROUGHPUT0x08 @@ -56,8 +58,6 @@ enum /* * Definitions for DiffServ Codepoints as per RFC2474 */ -#include -#include #ifndef IPTOS_DSCP_AF11 # define IPTOS_DSCP_AF11 0x28 # define IPTOS_DSCP_AF12 0x30 ___ 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: r221487 - head/crypto/openssh
Author: des Date: Thu May 5 08:08:18 2011 New Revision: 221487 URL: http://svn.freebsd.org/changeset/base/221487 Log: Merge two upstream patches from vendor branch. No functional changes. Modified: head/crypto/openssh/ChangeLog head/crypto/openssh/defines.h Directory Properties: head/crypto/openssh/ (props changed) Modified: head/crypto/openssh/ChangeLog == --- head/crypto/openssh/ChangeLog Thu May 5 08:04:31 2011 (r221486) +++ head/crypto/openssh/ChangeLog Thu May 5 08:08:18 2011 (r221487) @@ -1,6 +1,7 @@ 20110403 - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] [contrib/suse/openssh.spec] Prepare for 5.8p2 release. + - (djm) [version.h] crank version - Release 5.8p2 20110329 Modified: head/crypto/openssh/defines.h == --- head/crypto/openssh/defines.h Thu May 5 08:04:31 2011 (r221486) +++ head/crypto/openssh/defines.h Thu May 5 08:08:18 2011 (r221487) @@ -25,7 +25,7 @@ #ifndef _DEFINES_H #define _DEFINES_H -/* $Id: defines.h,v 1.164 2011/01/17 10:15:31 dtucker Exp $ */ +/* $Id: defines.h,v 1.165 2011/05/05 01:19:15 djm Exp $ */ /* Constants */ @@ -45,6 +45,7 @@ enum /* * Definitions for IP type of service (ip_tos) */ +#include #include #ifndef IPTOS_LOWDELAY # define IPTOS_LOWDELAY 0x10 @@ -57,7 +58,6 @@ enum /* * Definitions for DiffServ Codepoints as per RFC2474 */ -#include #ifndef IPTOS_DSCP_AF11 # define IPTOS_DSCP_AF11 0x28 # define IPTOS_DSCP_AF12 0x30 ___ 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: r221488 - head/sys/dev/ath/ath_hal/ar5416
Author: adrian
Date: Thu May 5 08:11:22 2011
New Revision: 221488
URL: http://svn.freebsd.org/changeset/base/221488
Log:
Don't perform NF calibration for radio chains which aren't in use:
Quoting the ath9k commit message:
At present the noise floor calibration is processed in supported
control and extension chains rather than required chains.
Unnccesarily doing nfcal in all supported chains leads to
invalid nf readings on extn chains and these invalid values
got updated into history buffer. While loading those values
from history buffer is moving the chip to deaf state.
This issue was observed in AR9002/AR9003 chips while doing
associate/dissociate in HT40 mode and interface up/down
in iterative manner. After some iterations, the chip was moved
to deaf state. Somehow the pci devices are recovered by poll work
after chip reset. Raading the nf values in all supported extension chains
when the hw is not yet configured in HT40 mode results invalid values.
Reference:https://patchwork.kernel.org/patch/753862/
Obtained from:Linux ath9k
Modified:
head/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
==
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_cal.cThu May 5 08:08:18
2011(r221487)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_cal.cThu May 5 08:11:22
2011(r221488)
@@ -620,9 +620,9 @@ ar5416LoadNF(struct ath_hal *ah, const s
HALDEBUG(ah, HAL_DEBUG_NFCAL, "CCA: ");
for (i = 0; i < AR5416_NUM_NF_READINGS; i ++) {
- /* Don't write to EXT radio CCA registers */
+ /* Don't write to EXT radio CCA registers unless in HT/40 mode
*/
/* XXX this check should really be cleaner! */
- if (i >= 3 && !IEEE80211_IS_CHAN_HT40(chan))
+ if (i > 2 && !IEEE80211_IS_CHAN_HT40(chan))
continue;
if (chainmask & (1 << i)) {
@@ -670,6 +670,12 @@ ar5416LoadNF(struct ath_hal *ah, const s
* of next noise floor calibration the baseband does.
*/
for (i = 0; i < AR5416_NUM_NF_READINGS; i ++)
+
+ /* Don't write to EXT radio CCA registers unless in HT/40 mode
*/
+ /* XXX this check should really be cleaner! */
+ if (i > 2 && !IEEE80211_IS_CHAN_HT40(chan))
+ continue;
+
if (chainmask & (1 << i)) {
val = OS_REG_READ(ah, ar5416_cca_regs[i]);
val &= 0xFE00;
@@ -701,10 +707,12 @@ ar5416InitNfHistBuff(struct ar5212NfCalH
* Update the noise floor buffer as a ring buffer
*/
static void
-ar5416UpdateNFHistBuff(struct ar5212NfCalHist *h, int16_t *nfarray)
+ar5416UpdateNFHistBuff(struct ath_hal *ah, struct ar5212NfCalHist *h,
+int16_t *nfarray)
{
int i;
+ /* XXX TODO: don't record nfarray[] entries for inactive chains */
for (i = 0; i < AR5416_NUM_NF_READINGS; i ++) {
h[i].nfCalBuffer[h[i].currIndex] = nfarray[i];
@@ -814,7 +822,7 @@ ar5416GetNf(struct ath_hal *ah, struct i
}
ichan->privFlags |= CHANNEL_MIMO_NF_VALID;
- ar5416UpdateNFHistBuff(AH5416(ah)->ah_cal.nfCalHist, nfarray);
+ ar5416UpdateNFHistBuff(ah, AH5416(ah)->ah_cal.nfCalHist,
nfarray);
ichan->rawNoiseFloor = nf;
}
return nf;
___
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: r221489 - head/sys/mips/conf
Author: adrian Date: Thu May 5 09:04:49 2011 New Revision: 221489 URL: http://svn.freebsd.org/changeset/base/221489 Log: Add nvram2env (untested) and geom_map (tested) to PB92. Modified: head/sys/mips/conf/PB92 head/sys/mips/conf/PB92.hints Modified: head/sys/mips/conf/PB92 == --- head/sys/mips/conf/PB92 Thu May 5 08:11:22 2011(r221488) +++ head/sys/mips/conf/PB92 Thu May 5 09:04:49 2011(r221489) @@ -6,9 +6,13 @@ # ident PB92 +# XXX The default load address in the Uboot environment is 0x8001 makeoptionsKERNLOADADDR=0x8005 optionsHZ=1000 +# The PB92 has 32mb of RAM; hard-code that +optionsAR71XX_REALMEM=32*1024*1024 + hints "PB92.hints" include"../atheros/std.ar71xx" @@ -21,20 +25,17 @@ options KDB optionsSCHED_4BSD #4BSD scheduler optionsINET#InterNETworking optionsINET6 -optionsNFSCLIENT #Network Filesystem Client +# options NFSCLIENT #Network Filesystem Client optionsPSEUDOFS#Pseudo-filesystem framework options_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions optionsALQ -# options NFS_LEGACYRPC -#options NFS_DEBUG - # Debugging for use in -current -optionsDEADLKRES -optionsINVARIANTS -optionsINVARIANT_SUPPORT -optionsWITNESS -optionsWITNESS_SKIPSPIN +#options DEADLKRES +#options INVARIANTS +#options INVARIANT_SUPPORT +#options WITNESS +#options WITNESS_SKIPSPIN options FFS #Berkeley Fast Filesystem #options SOFTUPDATES #Enable FFS soft updates support #options UFS_ACL #Support for access control lists @@ -46,9 +47,13 @@ device geom_uzip optionsGEOM_UZIP optionsROOTDEVNAME=\"ufs:/dev/md0.uzip\" +# PCI bus device pci device ar724x_pci +# NVRAM U-Boot Environment -> Kernel environment +device nvram2env + # Wireless NIC cards optionsIEEE80211_DEBUG optionsIEEE80211_SUPPORT_MESH @@ -75,23 +80,42 @@ device ath_rate_sample device mii device arge +# USB devices - PB92 has EHCI only + device usb optionsUSB_EHCI_BIG_ENDIAN_DESC# handle big-endian byte order optionsUSB_DEBUG optionsUSB_HOST_ALIGN=32 device ehci +# Mass storage +device scbus +device umass +device da + +# Read MSDOS formatted disks +optionsGEOM_PART_BSD +optionsGEOM_PART_MBR +optionsMSDOSFS + +# GPIO Bus device gpio device gpioled +# SPI and flash device spibus device ar71xx_spi device mx25l +# The flash is statically partitioned; add in that +device geom_map + device ar71xx_wdog +# Serial device uart +# Network twiddling device loop device ether device md Modified: head/sys/mips/conf/PB92.hints == --- head/sys/mips/conf/PB92.hints Thu May 5 08:11:22 2011 (r221488) +++ head/sys/mips/conf/PB92.hints Thu May 5 09:04:49 2011 (r221489) @@ -9,12 +9,6 @@ hint.uart.0.maddr=0x18020003 hint.uart.0.msize=0x18 hint.uart.0.irq=3 -# ohci -#hint.ohci.0.at="apb0" -#hint.ohci.0.maddr=0x1b00 -#hint.ohci.0.msize=0x0100 -#hint.ohci.0.irq=1 - #ehci - note the 0x100 offset for the AR913x/AR724x hint.ehci.0.at="nexus0" hint.ehci.0.maddr=0x1b000100 @@ -67,3 +61,53 @@ hint.mx25l.0.cs=0 # Watchdog hint.ar71xx_wdog.0.at="nexus0" + +# nvram mapping - XXX ? +hint.nvram.0.base=0x1f03 +hint.nvram.0.maxsize=0x2000 +hint.nvram.0.flags=3 # 1 = No check, 2 = Format Generic +hint.nvram.1.base=0x1f032000 +hint.nvram.1.maxsize=0x4000 +hint.nvram.1.flags=3 # 1 = No check, 2 = Format Generic + +# GEOM_MAP +# +# From my PB92 environment: +# +# mtdparts=ar7240-nor0:256k(u-boot),64k(u-boot-env),2752k(rootfs),896k(uImage),64k(NVRAM),64k(ART) + +hint.map.0.at="flash/spi0" +hint.map.0.start=0x +hint.map.0.end=0x0004 # 256k u-boot +hint.map.0.name="u-boot" +hint.map.0.readonly=1 + +hint.map.1.at="flash/spi0" +hint.map.1.start=0x0004 +hint.map.1.end=0x0005 # 64k u-boot-env +hint.map.1.name="u-boot-env" +hint.map.1.readonly=0 + +hint.map.2.at="flash/spi0" +hint.map.2.start=0x0005 +hint.map.2.end=0x0030 # 2752k rootfs +hint.map.2.name="rootfs" +hint.ma
svn commit: r221490 - head/share/man/man9
Author: ae Date: Thu May 5 09:55:55 2011 New Revision: 221490 URL: http://svn.freebsd.org/changeset/base/221490 Log: Formatting fixes: o Fix date o Break sentences o Remove trailing whitespaces o Sort xrefs by section number Requested by: ru MFC after:2 weeks Modified: head/share/man/man9/make_dev.9 Modified: head/share/man/man9/make_dev.9 == --- head/share/man/man9/make_dev.9 Thu May 5 09:04:49 2011 (r221489) +++ head/share/man/man9/make_dev.9 Thu May 5 09:55:55 2011 (r221490) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 03, 2011 +.Dd May 3, 2011 .Dt MAKE_DEV 9 .Os .Sh NAME @@ -84,15 +84,15 @@ The device will be owned by .Va uid , with the group ownership as .Va gid . -The name is the expansion of -.Va fmt +The name is the expansion of +.Va fmt and following arguments as .Xr printf 9 would print it. The name determines its path under .Pa /dev -or other -.Xr devfs 5 +or other +.Xr devfs 5 mount point and may contain slash .Ql / characters to denote subdirectories. @@ -152,9 +152,9 @@ created device will be never destroyed return an error if the device name is invalid or already exists .El .Pp -Only +Only .Dv MAKEDEV_NOWAIT , -.Dv MAKEDEV_WAITOK +.Dv MAKEDEV_WAITOK and .Dv MAKEDEV_CHECKNAME values are accepted for the @@ -307,7 +307,8 @@ The .Fn d_close driver method cannot call .Fn destroy_dev -directly. Doing so causes deadlock when +directly. +Doing so causes deadlock when .Fn destroy_dev waits for all threads to leave the driver methods. Also, because @@ -321,7 +322,8 @@ The device driver may call the .Fn destroy_dev_drain function to wait until all devices that have supplied .Fa csw -as cdevsw, are destroyed. This is useful when driver knows that +as cdevsw, are destroyed. +This is useful when driver knows that .Fn destroy_dev_sched is called for all instantiated devices, but need to postpone module unload until @@ -370,9 +372,9 @@ flag was specified and the provided devi .Pp .Sh SEE ALSO .Xr devctl 4 , +.Xr devfs 5 , .Xr destroy_dev_drain 9 , -.Xr dev_clone 9 , -.Xr devfs 5 +.Xr dev_clone 9 .Sh HISTORY The .Fn make_dev ___ 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: r221466 - in head/release: . amd64 i386 pc98 sun4v
On Wed, May 04, 2011 at 11:41:11PM +, Nathan Whitehorn wrote: > Author: nwhitehorn > Date: Wed May 4 23:41:11 2011 > New Revision: 221466 > URL: http://svn.freebsd.org/changeset/base/221466 > > Log: > Repair release CD generation on PC98 and sun4v after release building > changes, and backport the new logic (ISO images are TARGET dependant, not > TARGET_CPUARCH dependant) to Makefile.sysinstall. While modifying ISO > image scripts, change several archs to use makefs (from base) instead of > mkisofs (from ports) which makes release CD generation both faster and > self-hosting. > Is there any reason not to MFC the makefs part? This would allow to remove some nasty and problematic hacks from the cdrtools ports needed to allow cross-building of i386 releases on amd64 (TARGET and TARGET_ARCH set to i386 are passed to the port, although an amd64 mkisofs binary is required in this case). Btw., it looks like you may remove $publisher now. Marius ___ 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: r221491 - head/usr.bin/nfsstat
Author: ru Date: Thu May 5 10:17:08 2011 New Revision: 221491 URL: http://svn.freebsd.org/changeset/base/221491 Log: [mdoc] remove a hard sentence break. Modified: head/usr.bin/nfsstat/nfsstat.1 Modified: head/usr.bin/nfsstat/nfsstat.1 == --- head/usr.bin/nfsstat/nfsstat.1 Thu May 5 09:55:55 2011 (r221490) +++ head/usr.bin/nfsstat/nfsstat.1 Thu May 5 10:17:08 2011 (r221491) @@ -66,7 +66,8 @@ instead of the default Extract the name list from the specified system instead of the default .Pa /boot/kernel/kernel . .It Fl o -Report statistics for the old NFS client and/or server. Without this +Report statistics for the old NFS client and/or server. +Without this option statistics for the new NFS client and/or server will be reported. .It Fl s Only display server side statistics. ___ 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: r221492 - head/usr.bin/nfsstat
Author: ru
Date: Thu May 5 10:17:49 2011
New Revision: 221492
URL: http://svn.freebsd.org/changeset/base/221492
Log:
- Add a forgotten -o to usage().
- Sync usage() with manpage's SYNOPSIS.
Modified:
head/usr.bin/nfsstat/nfsstat.c
Modified: head/usr.bin/nfsstat/nfsstat.c
==
--- head/usr.bin/nfsstat/nfsstat.c Thu May 5 10:17:08 2011
(r221491)
+++ head/usr.bin/nfsstat/nfsstat.c Thu May 5 10:17:49 2011
(r221492)
@@ -646,7 +646,7 @@ void
usage(void)
{
(void)fprintf(stderr,
- "usage: nfsstat [-ceszW] [-M core] [-N system] [-w interval]\n");
+ "usage: nfsstat [-ceoszW] [-M core] [-N system] [-w wait]\n");
exit(1);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r221469 - head
Hi David E. O'Brien!
On Thu, 5 May 2011 00:43:55 + (UTC); David E. O'Brien
wrote:
> Author: obrien
> Date: Thu May 5 00:43:55 2011
> New Revision: 221469
> URL: http://svn.freebsd.org/changeset/base/221469
> Log:
> Correct the kernel config name printed out during install.
>
> PR: 156579
> Submitted by: dhw
> Modified:
> head/Makefile.inc1
> Modified: head/Makefile.inc1
> ==
> --- head/Makefile.inc1Thu May 5 00:43:40 2011(r221468)
> +++ head/Makefile.inc1Thu May 5 00:43:55 2011(r221469)
> @@ -868,7 +868,7 @@ reinstallkernel reinstallkernel.debug: i
> false
> .endif
> @echo "--"
> - @echo ">>> Installing kernel ${KERNCONF}"
> + @echo ">>> Installing kernel ${INSTALLKERNEL}"
Thanks!
--
WBR, Vadim Goncharov. ICQ#166852181 mailto:vadim_nucli...@mail.ru
[Moderator of RU.ANTI-ECOLOGY][FreeBSD][http://antigreen.org][LJ:/nuclight]
___
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: r220954 - head
Hi David Wolfskill!
On Wed, 4 May 2011 11:35:05 -0700; David Wolfskill wrote:
PR: 156579
Submitted by:dhw
>> [..]=20
>>> I have lines like the following in /etc/make.conf on some hosts:
>>>=20
>>> # build specified kernels by default and install first of them
>>> KERNCONF?=3DROUTER GENERIC
>>> and do just cd /usr/src && make buildkernel
>>> Will this patch print the correct first kernel, or this will be entire =
> list?
>>=20
>> Hi Vadim,
>> There seems to be a bug in r220954. dhw is taking a look at it.
> Yeah, it was the whole list; sorry. It should have been
> ${INSTALLKERNEL} -- as in:
> At least, that seems to work for me. I would hardly object to a reality
> check. :-}
I just don't know makefiles internals deeply (some voodoo there) - KERNCONF
may have been replaced by only element at this point, preferred to ask.
--
WBR, Vadim Goncharov. ICQ#166852181 mailto:vadim_nucli...@mail.ru
[Moderator of RU.ANTI-ECOLOGY][FreeBSD][http://antigreen.org][LJ:/nuclight]
___
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: r221493 - stable/8/sys/dev/coretemp
Author: delphij
Date: Thu May 5 12:52:05 2011
New Revision: 221493
URL: http://svn.freebsd.org/changeset/base/221493
Log:
MFC r221335:
Correct a typo. According to Intel document 318914, the Tj(max) for Core 2
Duo Mobile CPUs should be 105.
Noticed by: Mark Johnston
Modified:
stable/8/sys/dev/coretemp/coretemp.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/dev/coretemp/coretemp.c
==
--- stable/8/sys/dev/coretemp/coretemp.cThu May 5 10:17:49 2011
(r221492)
+++ stable/8/sys/dev/coretemp/coretemp.cThu May 5 12:52:05 2011
(r221493)
@@ -192,7 +192,7 @@ coretemp_attach(device_t dev)
} else if (cpu_model == 0x17) {
switch (cpu_stepping) {
case 0x6: /* Mobile Core 2 Duo */
- sc->sc_tjmax = 104;
+ sc->sc_tjmax = 105;
break;
default:/* Unknown stepping */
break;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r221398 - head/share/man/man9
On Tue, May 03, 2011 at 06:55:16PM +, Andrey V. Elsukov wrote: > Author: ae > Date: Tue May 3 18:55:16 2011 > New Revision: 221398 > URL: http://svn.freebsd.org/changeset/base/221398 > > Log: > Document make_dev_alias_p(). You should also add it to MLINKS in share/man/man9/Makefile. -- Pawel Jakub Dawidek http://www.wheelsystems.com FreeBSD committer http://www.FreeBSD.org Am I Evil? Yes, I Am! http://yomoli.com pgpFgkEQ7CmhQ.pgp Description: PGP signature
Re: svn commit: r221449 - head/sys/geom/journal
On Wed, May 04, 2011 at 06:06:40PM +, Andrey V. Elsukov wrote:
> Author: ae
> Date: Wed May 4 18:06:40 2011
> New Revision: 221449
> URL: http://svn.freebsd.org/changeset/base/221449
>
> Log:
> Removed KASSERT, g_new_providerf() can not fail.
Well, the assertion was there to prepare us for times when
g_new_providerf() will be able to fail. I was suspecting we might want
to make g_new_providerf() to fail when the given name is already in use.
In such case we use to create two identical entries in /dev/, not sure
what we do now (panic?).
> Modified:
> head/sys/geom/journal/g_journal.c
>
> Modified: head/sys/geom/journal/g_journal.c
> ==
> --- head/sys/geom/journal/g_journal.c Wed May 4 17:58:15 2011
> (r221448)
> +++ head/sys/geom/journal/g_journal.c Wed May 4 18:06:40 2011
> (r221449)
> @@ -2097,7 +2097,6 @@ g_journal_worker(void *arg)
> gp = sc->sc_geom;
> g_topology_lock();
> pp = g_new_providerf(gp, "%s.journal", sc->sc_name);
> - KASSERT(pp != NULL, ("Cannot create %s.journal.", sc->sc_name));
> pp->mediasize = sc->sc_mediasize;
> /*
>* There could be a problem when data provider and journal providers
--
Pawel Jakub Dawidek http://www.wheelsystems.com
FreeBSD committer http://www.FreeBSD.org
Am I Evil? Yes, I Am! http://yomoli.com
pgp0VnxRUbAas.pgp
Description: PGP signature
Re: svn commit: r221466 - in head/release: . amd64 i386 pc98 sun4v
On 05/05/11 04:41, Marius Strobl wrote: On Wed, May 04, 2011 at 11:41:11PM +, Nathan Whitehorn wrote: Author: nwhitehorn Date: Wed May 4 23:41:11 2011 New Revision: 221466 URL: http://svn.freebsd.org/changeset/base/221466 Log: Repair release CD generation on PC98 and sun4v after release building changes, and backport the new logic (ISO images are TARGET dependant, not TARGET_CPUARCH dependant) to Makefile.sysinstall. While modifying ISO image scripts, change several archs to use makefs (from base) instead of mkisofs (from ports) which makes release CD generation both faster and self-hosting. Is there any reason not to MFC the makefs part? This would allow to remove some nasty and problematic hacks from the cdrtools ports needed to allow cross-building of i386 releases on amd64 (TARGET and TARGET_ARCH set to i386 are passed to the port, although an amd64 mkisofs binary is required in this case). Btw., it looks like you may remove $publisher now. No, none. The whole commit can be MFC'ed back to 7.x, actually, and I'd like to do that. I was hoping to convert sparc64 and ia64 as well and make a clean sweep of it, but at least sparc64 will require some work analogous to what I did for PPC. Thanks for reminding me about the $publisher -- there's also some stray debugging code in the PPC one that crept in. -Nathan ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r221494 - in head/release: amd64 i386 pc98 powerpc
Author: nwhitehorn
Date: Thu May 5 13:55:43 2011
New Revision: 221494
URL: http://svn.freebsd.org/changeset/base/221494
Log:
Garbage collect some unused variables and stray debug code.
Submitted by: marius
Modified:
head/release/amd64/mkisoimages.sh
head/release/i386/mkisoimages.sh
head/release/pc98/mkisoimages.sh
head/release/powerpc/mkisoimages.sh
Modified: head/release/amd64/mkisoimages.sh
==
--- head/release/amd64/mkisoimages.sh Thu May 5 12:52:05 2011
(r221493)
+++ head/release/amd64/mkisoimages.sh Thu May 5 13:55:43 2011
(r221494)
@@ -23,7 +23,6 @@
# extra-bits-dir, if provided, contains additional files to be merged
# into base-bits-dir as part of making the image.
-publisher="The FreeBSD Project. http://www.freebsd.org/";
if [ "x$1" = "x-b" ]; then
# This is highly x86-centric and will be used directly below.
bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"
Modified: head/release/i386/mkisoimages.sh
==
--- head/release/i386/mkisoimages.shThu May 5 12:52:05 2011
(r221493)
+++ head/release/i386/mkisoimages.shThu May 5 13:55:43 2011
(r221494)
@@ -23,7 +23,6 @@
# extra-bits-dir, if provided, contains additional files to be merged
# into base-bits-dir as part of making the image.
-publisher="The FreeBSD Project. http://www.freebsd.org/";
if [ "x$1" = "x-b" ]; then
# This is highly x86-centric and will be used directly below.
bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"
Modified: head/release/pc98/mkisoimages.sh
==
--- head/release/pc98/mkisoimages.shThu May 5 12:52:05 2011
(r221493)
+++ head/release/pc98/mkisoimages.shThu May 5 13:55:43 2011
(r221494)
@@ -23,7 +23,6 @@
# extra-bits-dir, if provided, contains additional files to be merged
# into base-bits-dir as part of making the image.
-publisher="The FreeBSD Project. http://www.freebsd.org/";
if [ "x$1" = "x-b" ]; then
# This is highly x86-centric and will be used directly below.
bootable="-o generic-bootimage=$4/boot/cdboot"
Modified: head/release/powerpc/mkisoimages.sh
==
--- head/release/powerpc/mkisoimages.sh Thu May 5 12:52:05 2011
(r221493)
+++ head/release/powerpc/mkisoimages.sh Thu May 5 13:55:43 2011
(r221494)
@@ -23,13 +23,11 @@
# extra-bits-dir, if provided, contains additional files to be merged
# into base-bits-dir as part of making the image.
-publisher="The FreeBSD Project. http://www.freebsd.org/";
if [ "x$1" = "x-b" ]; then
uudecode -o /tmp/hfs-boot-block.bz2 `dirname $0`/hfs-boot.bz2.uu
bzip2 -d /tmp/hfs-boot-block.bz2
OFFSET=$(hd /tmp/hfs-boot-block | grep 'Loader START' | cut -f 1 -d ' ')
OFFSET=0x$(echo 0x$OFFSET | awk '{printf("%x\n",$1/512);}')
- echo dd if=$4/boot/loader of=/tmp/hfs-boot-block seek=$OFFSET
conv=notrunc
dd if=$4/boot/loader of=/tmp/hfs-boot-block seek=$OFFSET conv=notrunc
bootable="-o bootimage=macppc;/tmp/hfs-boot-block -o no-emul-boot"
___
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: r221124 - in head: . sbin/mount sbin/mount_nfs sys/amd64/conf sys/fs/nfsclient sys/i386/conf sys/ia64/conf sys/nfsclient sys/pc98/conf sys/powerpc/conf sys/sparc64/conf sys/sun4v/conf
> Rick Macklem writes: > > "Dag-Erling Smørgrav" writes: > > > Ideally, both the old and the new NFS stack would use the same > > > fstypes and sysctl names, but I don't know if there's any way we > > > can > > > prevent someone from compiling both into the kernel at the same > > > time, or loading both modules. > > If the scripts in /etc/rc.d are fixed to use the correct sysctl > > naming, > > do you think it matters which one is "vfs.nfs."? > > Yes. There is a whole world outside the base system: munin, webmin, > nagios etc. Are you going to change all of them as well? > Well, another way it could be handled would be to put the sysctls and the global variables they manipulate in a module shared by both clients, like sys/nfs/nfs_lock.c (module "nfslock"). Then the same sysctl would affect both clients. (I hesitate to create "yet another" module just to share the sysctls, but since "nfslock" is used by both clients, it should work ok, I think.) What do you think of that? If anyone else reading this has an idea/opinion, please let us know. rick ___ 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: r221496 - head/share/man/man9
Author: ae Date: Thu May 5 14:13:08 2011 New Revision: 221496 URL: http://svn.freebsd.org/changeset/base/221496 Log: Add make_dev_alias_p to MLINKS. Pointed out by: pjd MFC after:2 weeks Modified: head/share/man/man9/Makefile Modified: head/share/man/man9/Makefile == --- head/share/man/man9/MakefileThu May 5 14:05:29 2011 (r221495) +++ head/share/man/man9/MakefileThu May 5 14:13:08 2011 (r221496) @@ -781,6 +781,7 @@ MLINKS+=make_dev.9 destroy_dev.9 \ make_dev.9 destroy_dev_sched_cb.9 \ make_dev.9 dev_depends.9 \ make_dev.9 make_dev_alias.9 \ + make_dev.9 make_dev_alias_p.9 \ make_dev.9 make_dev_cred.9 \ make_dev.9 make_dev_credf.9 \ make_dev.9 make_dev_p.9 ___ 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: r221449 - head/sys/geom/journal
On 05.05.2011 17:12, Pawel Jakub Dawidek wrote: >> New Revision: 221449 >> URL: http://svn.freebsd.org/changeset/base/221449 >> >> Log: >> Removed KASSERT, g_new_providerf() can not fail. > > Well, the assertion was there to prepare us for times when > g_new_providerf() will be able to fail. I was suspecting we might want > to make g_new_providerf() to fail when the given name is already in use. I think such change will break all code we have now :) But now when it can not fail, KASSERT could slightly confuse those who read code as example. > In such case we use to create two identical entries in /dev/, not sure > what we do now (panic?). geom_dev prints out an error message. -- WBR, Andrey V. Elsukov signature.asc Description: OpenPGP digital signature
svn commit: r221497 - head/release/ia64
Author: nwhitehorn
Date: Thu May 5 14:16:40 2011
New Revision: 221497
URL: http://svn.freebsd.org/changeset/base/221497
Log:
Convert IA64 ISO script to use makefs instead of mkisofs.
Modified:
head/release/ia64/mkisoimages.sh
Modified: head/release/ia64/mkisoimages.sh
==
--- head/release/ia64/mkisoimages.shThu May 5 14:13:08 2011
(r221496)
+++ head/release/ia64/mkisoimages.shThu May 5 14:16:40 2011
(r221497)
@@ -41,27 +41,6 @@ LABEL=$1; shift
NAME=$1; shift
BASE=$1; shift
-MKISOFS=mkisofs
-MKISOFS_PKG=cdrtools
-MKISOFS_PORT=/usr/ports/sysutils/${MKISOFS_PKG}
-
-if ! which ${MKISOFS} > /dev/null; then
-echo -n "${MKISOFS}(8) does not exist: "
-if [ -f ${MKISOFS_PORT}/Makefile ]; then
- echo building the port...
- if ! (cd ${MKISOFS_PORT} && make install BATCH=yes && make clean); then
- echo "error: cannot build ${MKISOFS}(8). Bailing out..."
- exit 2
- fi
-else
- echo fetching the package...
- if ! pkg_add -r ${MKISOFS_PKG}; then
- echo "error: cannot fetch ${MKISOFS}(8). Bailing out..."
- exit 2
- fi
-fi
-fi
-
EFIPART=efipart.sys
# To create a bootable CD under EFI, the boot image should be an EFI
@@ -84,15 +63,13 @@ if [ $bootable = yes ]; then
mv $MNT/boot/loader.efi $MNT/efi/boot/bootia64.efi
umount $MNT
mdconfig -d -u $md
-BOOTOPTS="-b $EFIPART -no-emul-boot"
+BOOTOPTS="-b bootimage=i386;$EFIPART -o no-emul-boot"
else
BOOTOPTS=""
fi
-publisher="The FreeBSD Project. http://www.freebsd.org/";
-
echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
-$MKISOFS $BOOTOPTS -r -J -V $LABEL -publisher "$publisher" -o $NAME $BASE $*
+makefs -t cd9660 $BOOTOPTS -o rockridge -o label=$LABEL $NAME $BASE $*
rm -f $BASE/$EFIPART
rm $1/etc/fstab
exit 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: r221498 - stable/8/sys/fs/nfsclient
Author: rmacklem
Date: Thu May 5 14:19:37 2011
New Revision: 221498
URL: http://svn.freebsd.org/changeset/base/221498
Log:
MFC: r220928
Remove the nm_mtx mutex locking from the test for
nm_maxfilesize. This value rarely, if ever, changes
and the nm_mtx mutex is locked/unlocked earlier in
the function, which should be sufficient to avoid
getting a stale cached value for it. There is a
discussion w.r.t. what these tests should be, but
I've left them basically the same as the regular
NFS client for now.
Modified:
stable/8/sys/fs/nfsclient/nfs_clbio.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/fs/nfsclient/nfs_clbio.c
==
--- stable/8/sys/fs/nfsclient/nfs_clbio.c Thu May 5 14:16:40 2011
(r221497)
+++ stable/8/sys/fs/nfsclient/nfs_clbio.c Thu May 5 14:19:37 2011
(r221498)
@@ -943,12 +943,8 @@ flush_and_restart:
if (uio->uio_offset < 0)
return (EINVAL);
tmp_off = uio->uio_offset + uio->uio_resid;
- mtx_lock(&nmp->nm_mtx);
- if (tmp_off > nmp->nm_maxfilesize || tmp_off < uio->uio_offset) {
- mtx_unlock(&nmp->nm_mtx);
+ if (tmp_off > nmp->nm_maxfilesize || tmp_off < uio->uio_offset)
return (EFBIG);
- }
- mtx_unlock(&nmp->nm_mtx);
if (uio->uio_resid == 0)
return (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: r221500 - head/sys/geom
Author: adrian
Date: Thu May 5 14:43:09 2011
New Revision: 221500
URL: http://svn.freebsd.org/changeset/base/221500
Log:
Updates to geom_map from the author.
The major update here is to support 64 bit size/offsets.
There's also style related changes.
Submitted by: r...@dlink.ua
Modified:
head/sys/geom/geom_map.c
Modified: head/sys/geom/geom_map.c
==
--- head/sys/geom/geom_map.cThu May 5 14:39:14 2011(r221499)
+++ head/sys/geom/geom_map.cThu May 5 14:43:09 2011(r221500)
@@ -43,81 +43,73 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
-
#include
+
#include
#include
-#define MAP_CLASS_NAME "MAP"
-
-struct map_desc {
- uint8_t name [16];/* null-terminated name */
- uint32_toffset; /* offset in flash */
- uint32_taddr; /* address in memory */
- uint32_tsize; /* image size in bytes */
- uint32_tentry; /* offset in image for entry point */
- uint32_tdsize; /* data size in bytes */
-};
-
+#defineMAP_CLASS_NAME "MAP"
#defineMAP_MAXSLICE64
+#defineMAP_MAX_MARKER_LEN 64
struct g_map_softc {
- uint32_tentry [MAP_MAXSLICE];
- uint32_tdsize [MAP_MAXSLICE];
- uint8_t readonly[MAP_MAXSLICE];
- g_access_t *parent_access;
+ off_toffset[MAP_MAXSLICE]; /* offset in flash */
+ off_tsize[MAP_MAXSLICE];/* image size in bytes */
+ off_tentry[MAP_MAXSLICE];
+ off_tdsize[MAP_MAXSLICE];
+ uint8_t readonly[MAP_MAXSLICE];
+ g_access_t *parent_access;
};
static int
-g_map_ioctl(struct g_provider *pp, u_long cmd, void *data, int fflag, struct
thread *td)
-{
- return (ENOIOCTL);
-}
-
-static int
g_map_access(struct g_provider *pp, int dread, int dwrite, int dexcl)
{
- struct g_geom *gp = pp->geom;
- struct g_slicer *gsp = gp->softc;
- struct g_map_softc *sc = gsp->softc;
+ struct g_geom *gp;
+ struct g_slicer *gsp;
+ struct g_map_softc *sc;
+
+ gp = pp->geom;
+ gsp = gp->softc;
+ sc = gsp->softc;
if (dwrite > 0 && sc->readonly[pp->index])
return (EPERM);
+
return (sc->parent_access(pp, dread, dwrite, dexcl));
- /*
-* no (sc->parent_access(pp, dread, dwrite, dexcl));,
-* We need to have way for update flash
-*/
}
static int
g_map_start(struct bio *bp)
{
struct g_provider *pp;
- struct g_geom *gp;
+ struct g_geom *gp;
struct g_map_softc *sc;
struct g_slicer *gsp;
- int idx;
+ int idx;
pp = bp->bio_to;
idx = pp->index;
gp = pp->geom;
gsp = gp->softc;
sc = gsp->softc;
+
if (bp->bio_cmd == BIO_GETATTR) {
if (g_handleattr_int(bp, MAP_CLASS_NAME "::entry",
-sc->entry[idx]))
+ sc->entry[idx])) {
return (1);
+ }
if (g_handleattr_int(bp, MAP_CLASS_NAME "::dsize",
-sc->dsize[idx]))
+ sc->dsize[idx])) {
return (1);
+ }
}
+
return (0);
}
static void
g_map_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp,
- struct g_consumer *cp __unused, struct g_provider *pp)
+struct g_consumer *cp __unused, struct g_provider *pp)
{
struct g_map_softc *sc;
struct g_slicer *gsp;
@@ -127,45 +119,237 @@ g_map_dumpconf(struct sbuf *sb, const ch
g_slice_dumpconf(sb, indent, gp, cp, pp);
if (pp != NULL) {
if (indent == NULL) {
- sbuf_printf(sb, " entry %d", sc->entry[pp->index]);
- sbuf_printf(sb, " dsize %d", sc->dsize[pp->index]);
+ sbuf_printf(sb, " entry %lld", sc->entry[pp->index]);
+ sbuf_printf(sb, " dsize %lld", sc->dsize[pp->index]);
} else {
- sbuf_printf(sb, "%s%d\n", indent,
- sc->entry[pp->index]);
- sbuf_printf(sb, "%s%d\n", indent,
- sc->dsize[pp->index]);
+ sbuf_printf(sb, "%s%lld\n", indent,
+ sc->entry[pp->index]);
+ sbuf_printf(sb, "%s%lld\n", indent,
+ sc->dsize[pp->index]);
}
}
}
-#include
+static int
+find_marker(struct g_consumer *cp, const char *line, off_t *offset)
+{
+ off_t search_start, search_offset, search_step;
+ size_t sectorsize;
+ uint8_t *buf;
+ char *op, key[MAP_MAX_MARKER_LEN], search_ke
svn commit: r221501 - head/share/man/man4
Author: adrian Date: Thu May 5 14:43:35 2011 New Revision: 221501 URL: http://svn.freebsd.org/changeset/base/221501 Log: Add a manpage for geom_map(4). Submitted by: r...@dlink.ua Added: head/share/man/man4/geom_map.4 (contents, props changed) Modified: head/share/man/man4/Makefile Modified: head/share/man/man4/Makefile == --- head/share/man/man4/MakefileThu May 5 14:43:09 2011 (r221500) +++ head/share/man/man4/MakefileThu May 5 14:43:35 2011 (r221501) @@ -134,6 +134,7 @@ MAN=aac.4 \ geom.4 \ geom_fox.4 \ geom_linux_lvm.4 \ + geom_map.4 \ geom_uzip.4 \ gif.4 \ gpib.4 \ Added: head/share/man/man4/geom_map.4 == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/man/man4/geom_map.4 Thu May 5 14:43:35 2011 (r221501) @@ -0,0 +1,179 @@ +.\" +.\" Copyright (c) 2011 Aleksandr Rybalko +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\"notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\"notice, this list of conditions and the following disclaimer in the +.\"documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd April 5, 2011 +.Dt GEOM_MAP 4 +.Os +.Sh NAME +.Nm geom_map +.Nd "GEOM module that map difined items as separate partitions" +.Sh SYNOPSIS +To compile this driver into the kernel, +place the following line in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device geom_map" +.Ed +.Sh DESCRIPTION +The +.Nm +framework provides support for mapping defined parts of the media. Basicaly it +is helpful in the embedded devices where in the one continous flash are loader, +kernel and rootfs parts. The +.Nm +allows making them available as separate parts and protect loader from +overwriting. +.Pp +At boot time +.Nm +partitions listed (only with bootverbose) as: +.Bd -literal -offset indent +MAP: 0x3, data=0x3 "/dev/map/bootloader" +MAP: 3x1, data=0x1 "/dev/map/factory" +MAP: 4x7a, data=0x7a "/dev/map/upgrade" +MAP: search key ".!/bin/sh" from 0x10, step 0x1 +MAP: 4x11, data=0x11 "/dev/map/kernel" +MAP: search key ".!/bin/sh" from 0x10, step 0x1 +MAP: 15x69, data=0x69 "/dev/map/rootfs" +MAP: 7ex2, data=0x2 "/dev/map/config" +.Ed +.Pp +Also +.Nm +current configuration can be accessible with sysctl's kern.geom.conftxt, +kern.geom.confxml, kern.geom.confdot or geom map list. +.Bd -literal -offset indent +# sysctl kern.geom.conftxt +kern.geom.conftxt: 0 MD md0 10485760 512 u 0 s 512 f 0 fs 0 l 10485760 t malloc +0 DISK cfid0 8388608 4 hd 0 sc 0 +1 MAP map/config 131072 4 i 5 o 8257536 entry 0 dsize 131072 +1 MAP map/rootfs 6881280 4 i 4 o 1376256 entry 0 dsize 6881280 +2 UNCOMPRESS map/rootfs.uncompress 18677760 512 +1 MAP map/kernel 1114112 4 i 3 o 262144 entry 0 dsize 1114112 +1 MAP map/upgrade 7995392 4 i 2 o 262144 entry 0 dsize 7995392 +1 MAP map/factory 65536 4 i 1 o 196608 entry 0 dsize 65536 +1 MAP map/bootloader 196608 4 i 0 o 0 entry 0 dsize 196608 +.Ed +.Pp +Driver configuration can be done in device hints file. List of used parameters: +.Bl -tag -width indent +.It Fa at +select media to attach +.It Fa name +name of partiton (will create device /dev/map/that_name) +.It Fa start +offset from the beginning of the parent media to start of the mapped partition. +This field can also have special value +"search:searchstart:searchstep:searchkey", where: +.Bl -tag -width indent +.It Fa searchstart +offset from the beginning of the parent media where search will be started +.It Fa searchstep +value of the increment used while searching for the partition boundary markers +.It Fa sear
svn commit: r221502 - in head: lib/libutil sys/sys
Author: obrien Date: Thu May 5 14:45:24 2011 New Revision: 221502 URL: http://svn.freebsd.org/changeset/base/221502 Log: Don't duplicate define the stdint types. Added: head/sys/sys/_stdint.h - copied, changed from r221139, head/sys/sys/stdint.h Modified: head/lib/libutil/libutil.h head/sys/sys/stdint.h head/sys/sys/types.h Modified: head/lib/libutil/libutil.h == --- head/lib/libutil/libutil.h Thu May 5 14:43:35 2011(r221501) +++ head/lib/libutil/libutil.h Thu May 5 14:45:24 2011(r221502) @@ -41,22 +41,13 @@ #include #include +#include #ifndef _GID_T_DECLARED typedef__gid_t gid_t; #define_GID_T_DECLARED #endif -#ifndef _INT64_T_DECLARED -typedef__int64_t int64_t; -#define_INT64_T_DECLARED -#endif - -#ifndef _UINT64_T_DECLARED -typedef__uint64_t uint64_t; -#define_UINT64_T_DECLARED -#endif - #ifndef _PID_T_DECLARED typedef__pid_t pid_t; #define_PID_T_DECLARED Copied and modified: head/sys/sys/_stdint.h (from r221139, head/sys/sys/stdint.h) == --- head/sys/sys/stdint.h Wed Apr 27 20:42:30 2011(r221139, copy source) +++ head/sys/sys/_stdint.h Thu May 5 14:45:24 2011(r221502) @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2011 David E. O'Brien * Copyright (c) 2001 Mike Barcroft * All rights reserved. * @@ -26,13 +27,8 @@ * $FreeBSD$ */ -#ifndef _SYS_STDINT_H_ -#define _SYS_STDINT_H_ - -#include -#include - -#include +#ifndef _SYS__STDINT_H_ +#define _SYS__STDINT_H_ #ifndef _INT8_T_DECLARED typedef__int8_tint8_t; @@ -74,33 +70,13 @@ typedef __uint64_t uint64_t; #define_UINT64_T_DECLARED #endif -typedef__int_least8_t int_least8_t; -typedef__int_least16_t int_least16_t; -typedef__int_least32_t int_least32_t; -typedef__int_least64_t int_least64_t; - -typedef__uint_least8_t uint_least8_t; -typedef__uint_least16_tuint_least16_t; -typedef__uint_least32_tuint_least32_t; -typedef__uint_least64_tuint_least64_t; - -typedef__int_fast8_t int_fast8_t; -typedef__int_fast16_t int_fast16_t; -typedef__int_fast32_t int_fast32_t; -typedef__int_fast64_t int_fast64_t; - -typedef__uint_fast8_t uint_fast8_t; -typedef__uint_fast16_t uint_fast16_t; -typedef__uint_fast32_t uint_fast32_t; -typedef__uint_fast64_t uint_fast64_t; - -typedef__intmax_t intmax_t; -typedef__uintmax_t uintmax_t; - #ifndef _INTPTR_T_DECLARED typedef__intptr_t intptr_t; -typedef__uintptr_t uintptr_t; #define_INTPTR_T_DECLARED #endif +#ifndef _UINTPTR_T_DECLARED +typedef__uintptr_t uintptr_t; +#define_UINTPTR_T_DECLARED +#endif -#endif /* !_SYS_STDINT_H_ */ +#endif /* !_SYS__STDINT_H_ */ Modified: head/sys/sys/stdint.h == --- head/sys/sys/stdint.h Thu May 5 14:43:35 2011(r221501) +++ head/sys/sys/stdint.h Thu May 5 14:45:24 2011(r221502) @@ -33,46 +33,7 @@ #include #include - -#ifndef _INT8_T_DECLARED -typedef__int8_tint8_t; -#define_INT8_T_DECLARED -#endif - -#ifndef _INT16_T_DECLARED -typedef__int16_t int16_t; -#define_INT16_T_DECLARED -#endif - -#ifndef _INT32_T_DECLARED -typedef__int32_t int32_t; -#define_INT32_T_DECLARED -#endif - -#ifndef _INT64_T_DECLARED -typedef__int64_t int64_t; -#define_INT64_T_DECLARED -#endif - -#ifndef _UINT8_T_DECLARED -typedef__uint8_t uint8_t; -#define_UINT8_T_DECLARED -#endif - -#ifndef _UINT16_T_DECLARED -typedef__uint16_t uint16_t; -#define_UINT16_T_DECLARED -#endif - -#ifndef _UINT32_T_DECLARED -typedef__uint32_t uint32_t; -#define_UINT32_T_DECLARED -#endif - -#ifndef _UINT64_T_DECLARED -typedef__uint64_t uint64_t; -#define_UINT64_T_DECLARED -#endif +#include typedef__int_least8_t int_least8_t; typedef__int_least16_t int_least16_t; @@ -94,13 +55,13 @@ typedef __uint_fast16_t uint_fast16_t; typedef__uint_fast32_t uint_fast32_t; typedef__uint_fast64_t uint_fast64_t; +#ifndef _INTMAX_T_DECLARED typedef__intmax_t intmax_t; +#define_INTMAX_T_DECLARED +#endif +#ifndef _UINTMAX_T_DECLARED typedef__
svn commit: r221503 - head/contrib/llvm/lib/Support/Unix
Author: dim
Date: Thu May 5 16:14:13 2011
New Revision: 221503
URL: http://svn.freebsd.org/changeset/base/221503
Log:
Make cross-compiling using clang work better, by respecting the
LLVM_HOSTTRIPLE that is defined during the cross-tools stage.
Using clang, you can now build amd64 world and kernel on i386, and vice
versa. Other arches still need work.
Modified:
head/contrib/llvm/lib/Support/Unix/Host.inc
Modified: head/contrib/llvm/lib/Support/Unix/Host.inc
==
--- head/contrib/llvm/lib/Support/Unix/Host.inc Thu May 5 14:45:24 2011
(r221502)
+++ head/contrib/llvm/lib/Support/Unix/Host.inc Thu May 5 16:14:13 2011
(r221503)
@@ -35,6 +35,9 @@ static std::string getOSVersion() {
}
std::string sys::getHostTriple() {
+#ifdef __FreeBSD__
+ return LLVM_HOSTTRIPLE;
+#else
// FIXME: Derive directly instead of relying on the autoconf generated
// variable.
@@ -91,4 +94,5 @@ std::string sys::getHostTriple() {
}
return Triple;
+#endif
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r221124 - in head: . sbin/mount sbin/mount_nfs sys/amd64/conf sys/fs/nfsclient sys/i386/conf sys/ia64/conf sys/nfsclient sys/pc98/conf sys/powerpc/conf sys/sparc64/conf sys/sun4v/conf
Rick Macklem writes: > Well, another way it could be handled would be to put the sysctls and > the global variables they manipulate in a module shared by both clients, > like sys/nfs/nfs_lock.c (module "nfslock"). Then the same sysctl would > affect both clients. (I hesitate to create "yet another" module just > to share the sysctls, but since "nfslock" is used by both clients, it > should work ok, I think.) I don't understand why you would want to do that. Can't you just change "oldnfs" back to "nfs" in the old stack? Hmm, it occurred to me that there is currently no way to tell the kernel that two drivers conflict with eachother. Perhaps I should take a shot at implementing a DRIVER_CONFLICT macro to mirror DRIVER_DEPEND. BTW, don't take this personally, I'm very grateful for (and impressed with) your NFS work, other than this little nit :) DES -- Dag-Erling Smørgrav - d...@des.no ___ 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: r221504 - head/sys/dev/ahci
Author: mav
Date: Thu May 5 17:11:26 2011
New Revision: 221504
URL: http://svn.freebsd.org/changeset/base/221504
Log:
Add PCI ID for Marvell 88SE9182 -- PCIe 2.x x2 relative of the 88SE912x.
Submitted by: dchagin
MFC after:1 week
Modified:
head/sys/dev/ahci/ahci.c
Modified: head/sys/dev/ahci/ahci.c
==
--- head/sys/dev/ahci/ahci.cThu May 5 16:14:13 2011(r221503)
+++ head/sys/dev/ahci/ahci.cThu May 5 17:11:26 2011(r221504)
@@ -184,6 +184,7 @@ static struct {
{0x91201b4b, 0x00, "Marvell 88SE912x", AHCI_Q_EDGEIS|AHCI_Q_NOBSYRES},
{0x91231b4b, 0x11, "Marvell 88SE912x", AHCI_Q_NOBSYRES},
{0x91231b4b, 0x00, "Marvell 88SE912x",
AHCI_Q_EDGEIS|AHCI_Q_SATA2|AHCI_Q_NOBSYRES},
+ {0x91821b4b, 0x00, "Marvell 88SE9182", AHCI_Q_NOBSYRES},
{0x06201103, 0x00, "HighPoint RocketRAID 620", AHCI_Q_NOBSYRES},
{0x06201b4b, 0x00, "HighPoint RocketRAID 620", AHCI_Q_NOBSYRES},
{0x06221103, 0x00, "HighPoint RocketRAID 622", AHCI_Q_NOBSYRES},
___
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: r221505 - head/sys/dev/e1000
Author: jfv
Date: Thu May 5 17:28:45 2011
New Revision: 221505
URL: http://svn.freebsd.org/changeset/base/221505
Log:
Add an initialization to the error variable, without
this there is a rare return path that bogusly appears
to fail when it should not. Also white space correction.
Thanks to Arnaud Lacombe for noticing the problem.
Modified:
head/sys/dev/e1000/if_em.c
Modified: head/sys/dev/e1000/if_em.c
==
--- head/sys/dev/e1000/if_em.c Thu May 5 17:11:26 2011(r221504)
+++ head/sys/dev/e1000/if_em.c Thu May 5 17:28:45 2011(r221505)
@@ -3901,7 +3901,7 @@ em_setup_receive_ring(struct rx_ring *rx
struct adapter *adapter = rxr->adapter;
struct em_buffer*rxbuf;
bus_dma_segment_t seg[1];
- int i, j, nsegs, error;
+ int i, j, nsegs, error = 0;
/* Clear the ring contents */
@@ -3919,7 +3919,7 @@ em_setup_receive_ring(struct rx_ring *rx
if (++j == adapter->num_rx_desc)
j = 0;
- while(j != rxr->next_to_check) {
+ while (j != rxr->next_to_check) {
rxbuf = &rxr->rx_buffers[i];
rxbuf->m_head = m_getjcl(M_DONTWAIT, MT_DATA,
M_PKTHDR, adapter->rx_mbuf_sz);
___
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: r221506 - head/sys/boot/i386/boot2
Author: dim
Date: Thu May 5 18:47:24 2011
New Revision: 221506
URL: http://svn.freebsd.org/changeset/base/221506
Log:
Fine-tune llvm optimization for sys/boot/i386/boot2, which shaves off
some more bytes from the final boot2 image.
Submitted by: rdivacky
Modified:
head/sys/boot/i386/boot2/Makefile
Modified: head/sys/boot/i386/boot2/Makefile
==
--- head/sys/boot/i386/boot2/Makefile Thu May 5 17:28:45 2011
(r221505)
+++ head/sys/boot/i386/boot2/Makefile Thu May 5 18:47:24 2011
(r221506)
@@ -43,7 +43,8 @@ CFLAGS= -Os \
-Winline --param max-inline-insns-single=100
.if ${CC:T:Mclang} == "clang"
-CFLAGS+= -mllvm -stack-alignment=8 -mllvm -inline-threshold=3
+CFLAGS+= -mllvm -stack-alignment=8 -mllvm -inline-threshold=3 \
+ -mllvm -enable-load-pre=false
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS+= ${.IMPSRC:T:Mboot1.S:C/^.+$/-no-integrated-as/}
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r221507 - in stable/8/sbin: hastctl hastd
Author: trociny
Date: Thu May 5 18:50:52 2011
New Revision: 221507
URL: http://svn.freebsd.org/changeset/base/221507
Log:
MFC r221074, r221075, r221076, r221078:
r221074:
Fix assert messages.
r221075:
For conversation between hastctl and hastd we should use HASTCTL_CMD
defines.
r221076:
Rename HASTCTL_ defines, which are used for conversation between main
hastd process and workers, remove unused one and set different range
of numbers. This is done in order not to confuse them with HASTCTL_CMD
defines, used for conversation between hastctl and hastd, and to avoid
bugs like the one fixed in r221075.
r221078:
Add missing ifdef. This fixes build with NO_OPENSSL.
Reported by: Pawel Tyll
Approved by: pjd (mentor)
Modified:
stable/8/sbin/hastctl/hastctl.c
stable/8/sbin/hastd/control.c
stable/8/sbin/hastd/control.h
stable/8/sbin/hastd/hast_proto.c
stable/8/sbin/hastd/hastd.c
Directory Properties:
stable/8/sbin/hastctl/ (props changed)
stable/8/sbin/hastd/ (props changed)
Modified: stable/8/sbin/hastctl/hastctl.c
==
--- stable/8/sbin/hastctl/hastctl.c Thu May 5 18:47:24 2011
(r221506)
+++ stable/8/sbin/hastctl/hastctl.c Thu May 5 18:50:52 2011
(r221507)
@@ -465,7 +465,7 @@ main(int argc, char *argv[])
}
break;
default:
- assert(!"Impossible role!");
+ assert(!"Impossible command!");
}
/* Setup control connection... */
@@ -513,7 +513,7 @@ main(int argc, char *argv[])
error = control_status(nv);
break;
default:
- assert(!"Impossible role!");
+ assert(!"Impossible command!");
}
exit(error);
Modified: stable/8/sbin/hastd/control.c
==
--- stable/8/sbin/hastd/control.c Thu May 5 18:47:24 2011
(r221506)
+++ stable/8/sbin/hastd/control.c Thu May 5 18:50:52 2011
(r221507)
@@ -162,7 +162,7 @@ control_status_worker(struct hast_resour
* Prepare and send command to worker process.
*/
cnvout = nv_alloc();
- nv_add_uint8(cnvout, HASTCTL_STATUS, "cmd");
+ nv_add_uint8(cnvout, CONTROL_STATUS, "cmd");
error = nv_error(cnvout);
if (error != 0) {
pjdlog_common(LOG_ERR, 0, error,
@@ -324,7 +324,7 @@ control_handle(struct hastd_config *cfg)
error = EHAST_INVALID;
goto fail;
}
- if (cmd == HASTCTL_SET_ROLE) {
+ if (cmd == HASTCTL_CMD_SETROLE) {
role = nv_get_uint8(nvin, "role");
switch (role) {
case HAST_ROLE_INIT:
@@ -345,11 +345,11 @@ control_handle(struct hastd_config *cfg)
ii = 0;
TAILQ_FOREACH(res, &cfg->hc_resources, hr_next) {
switch (cmd) {
- case HASTCTL_SET_ROLE:
+ case HASTCTL_CMD_SETROLE:
control_set_role_common(cfg, nvout, role, res,
res->hr_name, ii++);
break;
- case HASTCTL_STATUS:
+ case HASTCTL_CMD_STATUS:
control_status(cfg, nvout, res, res->hr_name,
ii++);
break;
@@ -368,11 +368,11 @@ control_handle(struct hastd_config *cfg)
if (str == NULL)
break;
switch (cmd) {
- case HASTCTL_SET_ROLE:
+ case HASTCTL_CMD_SETROLE:
control_set_role_common(cfg, nvout, role, NULL,
str, ii);
break;
- case HASTCTL_STATUS:
+ case HASTCTL_CMD_STATUS:
control_status(cfg, nvout, NULL, str, ii);
break;
default:
@@ -427,7 +427,7 @@ ctrl_thread(void *arg)
}
nvout = nv_alloc();
switch (cmd) {
- case HASTCTL_STATUS:
+ case CONTROL_STATUS:
if (res->hr_remotein != NULL &&
res->hr_remoteout != NULL) {
nv_add_string(nvout, "complete", "status");
@@ -448,7 +448,7 @@ ctrl_thread(void *arg)
}
nv_add_int16(nvout, 0, "error");
break;
- case HASTCTL_RELOAD:
+ case CONTROL_RELOAD:
/*
* When parent receives SIGHUP and discovers that
svn commit: r221508 - head/sys/x86/x86
Author: mav
Date: Thu May 5 18:56:48 2011
New Revision: 221508
URL: http://svn.freebsd.org/changeset/base/221508
Log:
Some changes around LAPIC timer programming.
This fixes heavy interrupt storm and resulting system freeze when using
LAPIC timer in one-shot mode under Xen HVM. There, unlike real hardware,
programming timer with zero period almost immediately causes interrupt.
Modified:
head/sys/x86/x86/local_apic.c
Modified: head/sys/x86/x86/local_apic.c
==
--- head/sys/x86/x86/local_apic.c Thu May 5 18:50:52 2011
(r221507)
+++ head/sys/x86/x86/local_apic.c Thu May 5 18:56:48 2011
(r221508)
@@ -159,9 +159,8 @@ static struct eventtimer lapic_et;
static voidlapic_enable(void);
static voidlapic_resume(struct pic *pic);
-static voidlapic_timer_enable_intr(void);
-static voidlapic_timer_oneshot(u_int count);
-static voidlapic_timer_periodic(u_int count);
+static voidlapic_timer_oneshot(u_int count, int enable_int);
+static voidlapic_timer_periodic(u_int count, int enable_int);
static voidlapic_timer_stop(void);
static voidlapic_timer_set_divisor(u_int divisor);
static uint32_tlvt_mode(struct lapic *la, u_int pin, uint32_t value);
@@ -379,13 +378,11 @@ lapic_setup(int boot)
if (la->la_timer_mode != 0) {
KASSERT(la->la_timer_period != 0, ("lapic%u: zero divisor",
lapic_id()));
- lapic_timer_stop();
lapic_timer_set_divisor(lapic_timer_divisor);
- lapic_timer_enable_intr();
if (la->la_timer_mode == 1)
- lapic_timer_periodic(la->la_timer_period);
+ lapic_timer_periodic(la->la_timer_period, 1);
else
- lapic_timer_oneshot(la->la_timer_period);
+ lapic_timer_oneshot(la->la_timer_period, 1);
}
/* Program error LVT and clear any existing errors. */
@@ -496,7 +493,7 @@ lapic_et_start(struct eventtimer *et,
/* Try to calibrate the local APIC timer. */
do {
lapic_timer_set_divisor(lapic_timer_divisor);
- lapic_timer_oneshot(APIC_TIMER_MAX_COUNT);
+ lapic_timer_oneshot(APIC_TIMER_MAX_COUNT, 0);
DELAY(100);
value = APIC_TIMER_MAX_COUNT - lapic->ccr_timer;
if (value != APIC_TIMER_MAX_COUNT)
@@ -516,9 +513,7 @@ lapic_et_start(struct eventtimer *et,
et->et_max_period.frac =
((0xfffeLLU << 32) / et->et_frequency) << 32;
}
- lapic_timer_stop();
lapic_timer_set_divisor(lapic_timer_divisor);
- lapic_timer_enable_intr();
la = &lapics[lapic_id()];
if (period != NULL) {
la->la_timer_mode = 1;
@@ -526,14 +521,14 @@ lapic_et_start(struct eventtimer *et,
(et->et_frequency * (period->frac >> 32)) >> 32;
if (period->sec != 0)
la->la_timer_period += et->et_frequency * period->sec;
- lapic_timer_periodic(la->la_timer_period);
+ lapic_timer_periodic(la->la_timer_period, 1);
} else {
la->la_timer_mode = 2;
la->la_timer_period =
(et->et_frequency * (first->frac >> 32)) >> 32;
if (first->sec != 0)
la->la_timer_period += et->et_frequency * first->sec;
- lapic_timer_oneshot(la->la_timer_period);
+ lapic_timer_oneshot(la->la_timer_period, 1);
}
return (0);
}
@@ -838,25 +833,29 @@ lapic_timer_set_divisor(u_int divisor)
}
static void
-lapic_timer_oneshot(u_int count)
+lapic_timer_oneshot(u_int count, int enable_int)
{
u_int32_t value;
value = lapic->lvt_timer;
value &= ~APIC_LVTT_TM;
value |= APIC_LVTT_TM_ONE_SHOT;
+ if (enable_int)
+ value &= ~APIC_LVT_M;
lapic->lvt_timer = value;
lapic->icr_timer = count;
}
static void
-lapic_timer_periodic(u_int count)
+lapic_timer_periodic(u_int count, int enable_int)
{
u_int32_t value;
value = lapic->lvt_timer;
value &= ~APIC_LVTT_TM;
value |= APIC_LVTT_TM_PERIODIC;
+ if (enable_int)
+ value &= ~APIC_LVT_M;
lapic->lvt_timer = value;
lapic->icr_timer = count;
}
@@ -870,17 +869,6 @@ lapic_timer_stop(void)
value &= ~APIC_LVTT_TM;
value |= APIC_LVT_M;
lapic->lvt_timer = value;
- lapic->icr_timer = 0;
-}
-
-static void
-lapic_timer_enable_intr(void)
-{
- u_int32_t value;
-
- value = lapic->lvt_timer;
- value &= ~APIC_LVT_M;
- lapic->lvt_timer = value;
}
void
___
svn-src-all@fre
svn commit: r221509 - head/sys/dev/coretemp
Author: delphij
Date: Thu May 5 19:15:15 2011
New Revision: 221509
URL: http://svn.freebsd.org/changeset/base/221509
Log:
Detect and set Atom's Tj(max) to 90 if it's not the 45nm D400/D500/N400
series.
MFC after:2 weeks
Modified:
head/sys/dev/coretemp/coretemp.c
Modified: head/sys/dev/coretemp/coretemp.c
==
--- head/sys/dev/coretemp/coretemp.cThu May 5 18:56:48 2011
(r221508)
+++ head/sys/dev/coretemp/coretemp.cThu May 5 19:15:15 2011
(r221509)
@@ -197,6 +197,15 @@ coretemp_attach(device_t dev)
default:/* Unknown stepping */
break;
}
+ } else if (cpu_model == 0x1c) {
+ switch (cpu_stepping) {
+ case 0xa: /* 45nm Atom D400, N400 and D500 series */
+ sc->sc_tjmax = 100;
+ break;
+ default:
+ sc->sc_tjmax = 90;
+ break;
+ }
} else {
/*
* Attempt to get Tj(max) from MSR IA32_TEMPERATURE_TARGET.
___
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: r221510 - head/release
Author: nwhitehorn
Date: Thu May 5 19:17:55 2011
New Revision: 221510
URL: http://svn.freebsd.org/changeset/base/221510
Log:
Simplify this script somewhat, following excellent suggestions from
Ed Schouten.
Modified:
head/release/generate-release.sh
Modified: head/release/generate-release.sh
==
--- head/release/generate-release.shThu May 5 19:15:15 2011
(r221509)
+++ head/release/generate-release.shThu May 5 19:17:55 2011
(r221510)
@@ -21,7 +21,9 @@
#
mkdir -p $2/usr/src
-svn co ${SVNROOT:-svn://svn.freebsd.org/base}/$1 $2/usr/src || exit 1
+set -e # Everything must succeed
+
+svn co ${SVNROOT:-svn://svn.freebsd.org/base}/$1 $2/usr/src
if [ ! -z $CVSUP_HOST ]; then
cat > $2/docports-supfile << EOF
*default host=$CVSUP_HOST
@@ -35,32 +37,33 @@ if [ ! -z $CVSUP_HOST ]; then
EOF
elif [ ! -z $CVSROOT ]; then
cd $2/usr
- cvs -R ${CVSARGS} -d ${CVSROOT} co -P -r ${CVS_TAG:-HEAD} ports || exit
1
- cvs -R ${CVSARGS} -d ${CVSROOT} co -P -r ${CVS_TAG:-HEAD} doc || exit 1
+ cvs -R ${CVSARGS} -d ${CVSROOT} co -P -r ${CVS_TAG:-HEAD} ports
+ cvs -R ${CVSARGS} -d ${CVSROOT} co -P -r ${CVS_TAG:-HEAD} doc
fi
cd $2/usr/src
-make $MAKE_FLAGS buildworld || exit 1
-make installworld distribution DESTDIR=$2 || exit 1
+make $MAKE_FLAGS buildworld
+make installworld distribution DESTDIR=$2
mount -t devfs devfs $2/dev
+trap "umount $2/dev" EXIT # Clean up devfs mount on exit
if [ ! -z $CVSUP_HOST ]; then
cp /etc/resolv.conf $2/etc/resolv.conf
# Checkout ports and doc trees
- chroot $2 /usr/bin/csup /docports-supfile || exit 1
+ chroot $2 /usr/bin/csup /docports-supfile
fi
if [ -d $2/usr/doc ]; then
cp /etc/resolv.conf $2/etc/resolv.conf
# Build ports to build the docs, then build the docs
- chroot $2 /bin/sh -c 'pkg_add -r docproj || (cd
/usr/ports/textproc/docproj && make install clean BATCH=yes WITHOUT_X11=yes
JADETEX=no WITHOUT_PYTHON=yes)' || exit 1
- chroot $2 /bin/sh -c "cd /usr/doc && make $MAKE_FLAGS 'FORMATS=html
html-split txt' URLS_ABSOLUTE=YES" || exit 1
+ chroot $2 /bin/sh -c 'pkg_add -r docproj || (cd
/usr/ports/textproc/docproj && make install clean BATCH=yes WITHOUT_X11=yes
JADETEX=no WITHOUT_PYTHON=yes)'
+ chroot $2 make -C /usr/doc $MAKE_FLAGS 'FORMATS=html html-split txt'
URLS_ABSOLUTE=YES
fi
-chroot $2 /bin/sh -c "cd /usr/src && make $MAKE_FLAGS buildworld buildkernel"
|| exit 1
-chroot $2 /bin/sh -c "cd /usr/src/release && make obj" || exit 1
-chroot $2 /bin/sh -c "cd /usr/src/release && make release" || exit 1
-chroot $2 /bin/sh -c "cd /usr/src/release && make install DESTDIR=/R" || exit 1
+chroot $2 make -C /usr/src $MAKE_FLAGS buildworld buildkernel
+chroot $2 make -C /usr/src/release obj
+chroot $2 make -C /usr/src/release release
+chroot $2 make -C /usr/src/release install DESTDIR=/R
___
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: r221512 - head/lib/libc/net
Author: tuexen
Date: Thu May 5 19:49:27 2011
New Revision: 221512
URL: http://svn.freebsd.org/changeset/base/221512
Log:
* Update copyright notice.
* Cleanup usage of iov's.
* Add support for SCTP_TIMEOUTS socketoption.
* Fix a bug in sctp_recvmsg(): return the msg_flags in case of an error.
* Fix a bug in the error handling of sctp_peeloff(): return the -1.
Modified:
head/lib/libc/net/sctp_sys_calls.c
Modified: head/lib/libc/net/sctp_sys_calls.c
==
--- head/lib/libc/net/sctp_sys_calls.c Thu May 5 19:35:12 2011
(r221511)
+++ head/lib/libc/net/sctp_sys_calls.c Thu May 5 19:49:27 2011
(r221512)
@@ -1,33 +1,35 @@
-/* $KAME: sctp_sys_calls.c,v 1.9 2004/08/17 06:08:53 itojun Exp $ */
-
-/*
- * Copyright (C) 2002-2007 Cisco Systems Inc,
- * All rights reserved.
+/*-
+ * Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
+ * Copyright (c) 2008-2011, by Randall Stewart. All rights reserved.
+ * Copyright (c) 2008-2011, by Michael Tuexen. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *notice, this list of conditions and the following disclaimer in the
- *documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *may be used to endorse or promote products derived from this software
- *without specific prior written permission.
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * a) Redistributions of source code must retain the above copyright notice,
+ *this list of conditions and the following disclaimer.
+ *
+ * b) 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.
+ *
+ * c) Neither the name of Cisco Systems, Inc. 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 PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
*/
+
#include
__FBSDID("$FreeBSD$");
#include
@@ -58,7 +60,6 @@ __FBSDID("$FreeBSD$");
#define SCTP_CONTROL_VEC_SIZE_SND 8192
#define SCTP_CONTROL_VEC_SIZE_RCV 16384
#define SCTP_STACK_BUF_SIZE 2048
-#define SCTP_SMALL_IOVEC_SIZE 2
#ifdef SCTP_DEBUG_PRINT_ADDRESS
@@ -398,6 +399,9 @@ sctp_opt_info(int sd, sctp_assoc_t id, i
case SCTP_LOCAL_AUTH_CHUNKS:
((struct sctp_authchunks *)arg)->gauth_assoc_id = id;
break;
+ case SCTP_TIMEOUTS:
+ ((struct sctp_timeouts *)arg)->stimo_assoc_id = id;
+ break;
default:
break;
}
@@ -551,11 +555,10 @@ sctp_sendmsg(int s,
return (syscall(SYS_sctp_generic_sendmsg, s,
data, len, to, tolen, &sinfo, 0));
#else
-
ssize_t sz;
struct msghdr msg;
struct sctp_sndrcvinfo *s_info;
- struct iovec iov[SCTP
svn commit: r221513 - in head: bin/sh tools/regression/bin/sh/parser
Author: jilles
Date: Thu May 5 20:55:55 2011
New Revision: 221513
URL: http://svn.freebsd.org/changeset/base/221513
Log:
sh: Add $'quoting' (C-style escape sequences).
A string between $' and ' may contain backslash escape sequences similar to
the ones in a C string constant (except that a single-quote must be escaped
and a double-quote need not be). Details are in the sh(1) man page.
This construct is useful to include unprintable characters, tabs and
newlines in strings; while this can be done with a command substitution
containing a printf command, that needs ugly workarounds if the result is to
end with a newline as command substitution removes all trailing newlines.
The construct may also be useful in future to describe unprintable
characters without needing to write those characters themselves in 'set -x',
'export -p' and the like.
The implementation attempts to comply to the proposal for the next issue of
the POSIX specification. Because this construct is not in POSIX.1-2008,
using it in scripts intended to be portable is unwise.
Matching the minimal locale support in the rest of sh, the \u and \U
sequences are currently not useful.
Exp-run done by: pav (with some other sh(1) changes)
Added:
head/tools/regression/bin/sh/parser/dollar-quote1.0 (contents, props
changed)
head/tools/regression/bin/sh/parser/dollar-quote2.0 (contents, props
changed)
head/tools/regression/bin/sh/parser/dollar-quote3.0 (contents, props
changed)
head/tools/regression/bin/sh/parser/dollar-quote4.0 (contents, props
changed)
head/tools/regression/bin/sh/parser/dollar-quote5.0 (contents, props
changed)
head/tools/regression/bin/sh/parser/dollar-quote6.0 (contents, props
changed)
head/tools/regression/bin/sh/parser/dollar-quote7.0 (contents, props
changed)
head/tools/regression/bin/sh/parser/dollar-quote8.0 (contents, props
changed)
head/tools/regression/bin/sh/parser/dollar-quote9.0 (contents, props
changed)
Modified:
head/bin/sh/mksyntax.c
head/bin/sh/parser.c
head/bin/sh/sh.1
Modified: head/bin/sh/mksyntax.c
==
--- head/bin/sh/mksyntax.c Thu May 5 19:49:27 2011(r221512)
+++ head/bin/sh/mksyntax.c Thu May 5 20:55:55 2011(r221513)
@@ -64,6 +64,7 @@ struct synclass synclass[] = {
{ "CWORD", "character is nothing special" },
{ "CNL","newline character" },
{ "CBACK", "a backslash character" },
+ { "CSBACK", "a backslash character in single quotes" },
{ "CSQUOTE","single quote" },
{ "CDQUOTE","double quote" },
{ "CENDQUOTE", "a terminating quote" },
@@ -224,6 +225,7 @@ main(int argc __unused, char **argv __un
init();
fputs("\n/* syntax table used when in single quotes */\n", cfile);
add("\n", "CNL");
+ add("\\", "CSBACK");
add("'", "CENDQUOTE");
/* ':/' for tilde expansion, '-' for [a\-x] pattern ranges */
add("!*?[=~:/-", "CCTL");
Modified: head/bin/sh/parser.c
==
--- head/bin/sh/parser.cThu May 5 19:49:27 2011(r221512)
+++ head/bin/sh/parser.cThu May 5 20:55:55 2011(r221513)
@@ -1127,6 +1127,127 @@ done:
/*
+ * Called to parse a backslash escape sequence inside $'...'.
+ * The backslash has already been read.
+ */
+static char *
+readcstyleesc(char *out)
+{
+ int c, v, i, n;
+
+ c = pgetc();
+ switch (c) {
+ case '\0':
+ synerror("Unterminated quoted string");
+ case '\n':
+ plinno++;
+ if (doprompt)
+ setprompt(2);
+ else
+ setprompt(0);
+ return out;
+ case '\\':
+ case '\'':
+ case '"':
+ v = c;
+ break;
+ case 'a': v = '\a'; break;
+ case 'b': v = '\b'; break;
+ case 'e': v = '\033'; break;
+ case 'f': v = '\f'; break;
+ case 'n': v = '\n'; break;
+ case 'r': v = '\r'; break;
+ case 't': v = '\t'; break;
+ case 'v': v = '\v'; break;
+ case 'x':
+ v = 0;
+ for (;;) {
+ c = pgetc();
+ if (c >= '0' && c <= '9')
+ v = (v << 4) + c - '0';
+ else if (c >= 'A' && c <= 'F')
+ v = (v << 4) + c - 'A' + 10;
+ else if (c >= 'a' && c <= 'f')
+ v = (v << 4) + c - 'a' + 10;
+ else
+ break;
+ }
+ pungetc();
+ break;
+ case '0': case '1': case '2': case '3':
+ case '4': case '5': case '6': case '7':
+
svn commit: r221514 - stable/8/bin/sh
Author: jilles
Date: Thu May 5 22:04:59 2011
New Revision: 221514
URL: http://svn.freebsd.org/changeset/base/221514
Log:
MFC r221011: sh: Remove duplicate code resetting uid/gid for set +p/
+o privileged.
Modified:
stable/8/bin/sh/options.c
Directory Properties:
stable/8/bin/sh/ (props changed)
Modified: stable/8/bin/sh/options.c
==
--- stable/8/bin/sh/options.c Thu May 5 20:55:55 2011(r221513)
+++ stable/8/bin/sh/options.c Thu May 5 22:04:59 2011(r221514)
@@ -195,13 +195,8 @@ options(int cmdline)
minus_o(*argptr, val);
if (*argptr)
argptr++;
- } else {
- if (c == 'p' && !val && privileged) {
- (void) setuid(getuid());
- (void) setgid(getgid());
- }
+ } else
setoption(c, val);
- }
}
}
return;
@@ -269,10 +264,6 @@ minus_o(char *name, int val)
} else {
for (i = 0; i < NOPTS; i++)
if (equal(name, optlist[i].name)) {
- if (!val && privileged && equal(name,
"privileged")) {
- (void) setuid(getuid());
- (void) setgid(getgid());
- }
setoption(optlist[i].letter, val);
return;
}
@@ -286,6 +277,10 @@ setoption(int flag, int val)
{
int i;
+ if (flag == 'p' && !val && privileged) {
+ (void) setuid(getuid());
+ (void) setgid(getgid());
+ }
for (i = 0; i < NOPTS; i++)
if (optlist[i].letter == flag) {
optlist[i].val = val;
___
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: r221515 - stable/8/bin/sh
Author: jilles
Date: Thu May 5 22:07:02 2011
New Revision: 221515
URL: http://svn.freebsd.org/changeset/base/221515
Log:
MFC r221012: sh: Check setuid()/setgid() return values.
If the -p option is turned off, privileges from a setuid or setgid binary
are dropped. Make sure to check if this succeeds. If it fails, this is an
error which will cause the shell to abort except in interactive mode or if
'command' was used to make 'set' or an outer 'eval' or '.' non-special.
Note that taking advantage of this feature and writing setuid shell scripts
seems unwise.
Modified:
stable/8/bin/sh/options.c
Directory Properties:
stable/8/bin/sh/ (props changed)
Modified: stable/8/bin/sh/options.c
==
--- stable/8/bin/sh/options.c Thu May 5 22:04:59 2011(r221514)
+++ stable/8/bin/sh/options.c Thu May 5 22:07:02 2011(r221515)
@@ -278,8 +278,10 @@ setoption(int flag, int val)
int i;
if (flag == 'p' && !val && privileged) {
- (void) setuid(getuid());
- (void) setgid(getgid());
+ if (setgid(getgid()) == -1)
+ error("setgid");
+ if (setuid(getuid()) == -1)
+ error("setuid");
}
for (i = 0; i < NOPTS; i++)
if (optlist[i].letter == flag) {
___
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: r221124 - in head: . sbin/mount sbin/mount_nfs sys/amd64/conf sys/fs/nfsclient sys/i386/conf sys/ia64/conf sys/nfsclient sys/pc98/conf sys/powerpc/conf sys/sparc64/conf sys/sun4v/conf
> Rick Macklem writes: > > Well, another way it could be handled would be to put the sysctls > > and > > the global variables they manipulate in a module shared by both > > clients, > > like sys/nfs/nfs_lock.c (module "nfslock"). Then the same sysctl > > would > > affect both clients. (I hesitate to create "yet another" module just > > to share the sysctls, but since "nfslock" is used by both clients, > > it > > should work ok, I think.) > > I don't understand why you would want to do that. Can't you just > change > "oldnfs" back to "nfs" in the old stack? > I'm not sure what you are saying. W.r.t. the SYSCTL() naming, the old NFS client is currently using vfs.nfs.xxx and the new NFS client is using vfs.newnfs.xxx. If you are referring to the fstype names, then switching "oldnfs" back to "nfs" means the new one has to change to something other than "nfs", like "newnfs". The whole idea of changing "newnfs"->"nfs" was to make it the default and get it more widely tested/used. (Presumably, if the new NFS works well, it would eventually become the only one, but I don't see that happening until FreeBSD10 at the earliest.) The problem is w.r.t. the SYSCTL() naming. I could make vfs.newnfs.xxx use vfs.nfs.xxx and vfs.nfs.xxx->vfs.oldnfs.xxx quite easily. The problem would be that people couldn't as easily use "oldnfs" instead of "nfs". (At least for cases where setting sysctls matter.) What I was proposing is have the two clients share the vfs.nfs.xxx name space, since most of the SYSCTL()s use the same name and do the same thing. For example, now there is: vfs.nfs.bufpackets: 4 vfs.newnfs.bufpackets: 4 and /etc/rc.d/nfsclient wants to fiddle with vfs.nfs.bufpackets. I was proposing that the two clients share vfs.nfs.bufpackets Make sense now? (I understood that you felt having both vfs.nfs.xxx and vfs.newnfs.xxx made maintaining the scripts awkward.) rick ___ 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: r221516 - head/sys/dev/cxgbe
Author: np Date: Thu May 5 23:09:17 2011 New Revision: 221516 URL: http://svn.freebsd.org/changeset/base/221516 Log: Bump up the number of egress queues that the driver is allowed to use. MFC after:3 days Modified: head/sys/dev/cxgbe/t4_main.c Modified: head/sys/dev/cxgbe/t4_main.c == --- head/sys/dev/cxgbe/t4_main.cThu May 5 22:07:02 2011 (r221515) +++ head/sys/dev/cxgbe/t4_main.cThu May 5 23:09:17 2011 (r221516) @@ -415,7 +415,7 @@ t4_attach(device_t dev) /* These are total (sum of all ports) limits for a bus driver */ rc = -t4_cfg_pfvf(sc, sc->mbox, sc->pf, 0, - 64, /* max # of egress queues */ + 128,/* max # of egress queues */ 64, /* max # of egress Ethernet or control queues */ 64, /* max # of ingress queues with fl/interrupt */ 0, /* max # of ingress queues without interrupt */ ___ 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: r221124 - in head: . sbin/mount sbin/mount_nfs sys/amd64/conf sys/fs/nfsclient sys/i386/conf sys/ia64/conf sys/nfsclient sys/pc98/conf sys/powerpc/conf sys/sparc64/conf sys/sun4v/conf
> Rick Macklem writes: > > Well, another way it could be handled would be to put the sysctls > > and > > the global variables they manipulate in a module shared by both > > clients, > > like sys/nfs/nfs_lock.c (module "nfslock"). Then the same sysctl > > would > > affect both clients. (I hesitate to create "yet another" module just > > to share the sysctls, but since "nfslock" is used by both clients, > > it > > should work ok, I think.) > > I don't understand why you would want to do that. Can't you just > change > "oldnfs" back to "nfs" in the old stack? > > Hmm, it occurred to me that there is currently no way to tell the > kernel > that two drivers conflict with eachother. Perhaps I should take a shot > at implementing a DRIVER_CONFLICT macro to mirror DRIVER_DEPEND. > Also, except for the SYSCTL() naming issue they don't comflict. At the moment it is perfectly ok to use both for mounts concurrently. For example, you could have the following 2 lines in your /etc/fstab: nfs-server:/sub1/mntnfsrw 00 nfs-server:/sub2/mnt2 oldnfs rw 00 I don't know why you would actually choose to do this, unless you found that the old NFS client did something that worked better for "/sub2" for your purposes, but it will work fine. rick ps: The issue you pointed out in the first post is just a line in /etc/rc.d/mountcritremote that needs to be fixed. It uses a module name of "nfs" and "nfsclient" when the new NFS is "nfs" and "nfscl" (the old one is "oldnfs" and "nfsclient"). That's easy to fix. I'm just waiting for a review. ___ 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: r221124 - in head: . sbin/mount sbin/mount_nfs sys/amd64/conf sys/fs/nfsclient sys/i386/conf sys/ia64/conf sys/nfsclient sys/pc98/conf sys/powerpc/conf sys/sparc64/conf sys/sun4v/conf
> Rick Macklem writes: > > "Dag-Erling Smørgrav" writes: > > > Ideally, both the old and the new NFS stack would use the same > > > fstypes and sysctl names, but I don't know if there's any way we > > > can > > > prevent someone from compiling both into the kernel at the same > > > time, or loading both modules. > > If the scripts in /etc/rc.d are fixed to use the correct sysctl > > naming, > > do you think it matters which one is "vfs.nfs."? > > Yes. There is a whole world outside the base system: munin, webmin, > nagios etc. Are you going to change all of them as well? > Btw, the simpler patch is to just change the SYSCTL() naming conventions, but there is no easy way (at least with recompiling the kernel + modules) to switch it back so the old client uses "vfs.nfs.xxx". In other words: vfs.nfs.xxx - would be the variables on the new client vfs.oldnfs.xxx - would be the same variables for the old client Then the default/new client would work, but switching back to the old would be involved. With the SYSCTL() name space shared, the switch back and forth would be simply which fstype was used for the mounts and they would both see the same sysctl changes. rick ps: I have the shared patch running here now. It is straightforward, but fairly big. ___ 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: r221517 - head/sys/fs/nfsserver
Author: rmacklem
Date: Fri May 6 01:29:14 2011
New Revision: 221517
URL: http://svn.freebsd.org/changeset/base/221517
Log:
Change the new NFS server so that it returns 0 when the f_bavail
or f_ffree fields of "struct statfs" are negative, since the
values that go on the wire are unsigned and will appear to be
very large positive values otherwise. This makes the handling
of a negative f_bavail compatible with the old/regular NFS server.
MFC after:2 weeks
Modified:
head/sys/fs/nfsserver/nfs_nfsdport.c
Modified: head/sys/fs/nfsserver/nfs_nfsdport.c
==
--- head/sys/fs/nfsserver/nfs_nfsdport.cThu May 5 23:09:17 2011
(r221516)
+++ head/sys/fs/nfsserver/nfs_nfsdport.cFri May 6 01:29:14 2011
(r221517)
@@ -1280,8 +1280,23 @@ nfsvno_fsync(struct vnode *vp, u_int64_t
int
nfsvno_statfs(struct vnode *vp, struct statfs *sf)
{
+ int error;
- return (VFS_STATFS(vp->v_mount, sf));
+ error = VFS_STATFS(vp->v_mount, sf);
+ if (error == 0) {
+ /*
+* Since NFS handles these values as unsigned on the
+* wire, there is no way to represent negative values,
+* so set them to 0. Without this, they will appear
+* to be very large positive values for clients like
+* Solaris10.
+*/
+ if (sf->f_bavail < 0)
+ sf->f_bavail = 0;
+ if (sf->f_ffree < 0)
+ sf->f_ffree = 0;
+ }
+ return (error);
}
/*
___
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: r221497 - head/release/ia64
On May 5, 2011, at 7:16 AM, Nathan Whitehorn wrote: > @@ -84,15 +63,13 @@ if [ $bootable = yes ]; then > mv $MNT/boot/loader.efi $MNT/efi/boot/bootia64.efi > umount $MNT > mdconfig -d -u $md > -BOOTOPTS="-b $EFIPART -no-emul-boot" > +BOOTOPTS="-b bootimage=i386;$EFIPART -o no-emul-boot" > else > BOOTOPTS="" > fi Thanks! Can you explain what this particular change does or why it's done? -- Marcel Moolenaar mar...@xcllnt.net ___ 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: r221518 - head/sys/mips/atheros
Author: adrian
Date: Fri May 6 02:45:02 2011
New Revision: 221518
URL: http://svn.freebsd.org/changeset/base/221518
Log:
Fix GPIO_MAXPINS calculation for the AR71xx, AR724x, AR913x SoC.
Submitted by: Luiz Otavio O Souza
Modified:
head/sys/mips/atheros/ar71xx_gpio.c
head/sys/mips/atheros/ar71xx_gpiovar.h
head/sys/mips/atheros/ar724xreg.h
head/sys/mips/atheros/ar91xxreg.h
Modified: head/sys/mips/atheros/ar71xx_gpio.c
==
--- head/sys/mips/atheros/ar71xx_gpio.c Fri May 6 01:29:14 2011
(r221517)
+++ head/sys/mips/atheros/ar71xx_gpio.c Fri May 6 02:45:02 2011
(r221518)
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include "gpio_if.h"
@@ -144,7 +145,19 @@ static int
ar71xx_gpio_pin_max(device_t dev, int *maxpin)
{
- *maxpin = AR71XX_GPIO_PINS - 1;
+ switch (ar71xx_soc) {
+ case AR71XX_SOC_AR9130:
+ case AR71XX_SOC_AR9132:
+ *maxpin = AR91XX_GPIO_PINS - 1;
+ break;
+ case AR71XX_SOC_AR7240:
+ case AR71XX_SOC_AR7241:
+ case AR71XX_SOC_AR7242:
+ *maxpin = AR724X_GPIO_PINS - 1;
+ break;
+ default:
+ *maxpin = AR71XX_GPIO_PINS - 1;
+ }
return (0);
}
Modified: head/sys/mips/atheros/ar71xx_gpiovar.h
==
--- head/sys/mips/atheros/ar71xx_gpiovar.h Fri May 6 01:29:14 2011
(r221517)
+++ head/sys/mips/atheros/ar71xx_gpiovar.h Fri May 6 02:45:02 2011
(r221518)
@@ -52,6 +52,8 @@
GPIO_WRITE(sc, reg, GPIO_READ(sc, (reg)) & ~(bits))
#defineAR71XX_GPIO_PINS12
+#defineAR724X_GPIO_PINS18
+#defineAR91XX_GPIO_PINS22
struct ar71xx_gpio_softc {
device_tdev;
Modified: head/sys/mips/atheros/ar724xreg.h
==
--- head/sys/mips/atheros/ar724xreg.h Fri May 6 01:29:14 2011
(r221517)
+++ head/sys/mips/atheros/ar724xreg.h Fri May 6 02:45:02 2011
(r221518)
@@ -105,6 +105,4 @@
#defineAR724X_GPIO_FUNC_UART_EN(1 >> 1)
#defineAR724X_GPIO_FUNC_JTAG_DISABLE (1 >> 0)
-#defineAR724X_GPIO_COUNT 18
-
#endif
Modified: head/sys/mips/atheros/ar91xxreg.h
==
--- head/sys/mips/atheros/ar91xxreg.h Fri May 6 01:29:14 2011
(r221517)
+++ head/sys/mips/atheros/ar91xxreg.h Fri May 6 02:45:02 2011
(r221518)
@@ -81,6 +81,4 @@
#defineAR91XX_GPIO_FUNC_UART_EN(1 << 8)
#defineAR91XX_GPIO_FUNC_USB_CLK_EN (1 << 4)
-#defineAR91XX_GPIO_COUNT 22
-
#endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r221519 - in head/sys: dev/bm powerpc/powermac
Author: nwhitehorn
Date: Fri May 6 03:26:24 2011
New Revision: 221519
URL: http://svn.freebsd.org/changeset/base/221519
Log:
Do not use Open Firmware to open the device and instead program its start
on our own. This prevents hangs at boot when using a bm(4) NIC where the
cable is not plugged in at boot time.
Obtained from:NetBSD
MFC after:1 week
Modified:
head/sys/dev/bm/if_bm.c
head/sys/powerpc/powermac/macio.c
head/sys/powerpc/powermac/maciovar.h
Modified: head/sys/dev/bm/if_bm.c
==
--- head/sys/dev/bm/if_bm.c Fri May 6 02:45:02 2011(r221518)
+++ head/sys/dev/bm/if_bm.c Fri May 6 03:26:24 2011(r221519)
@@ -558,6 +558,7 @@ bm_attach(device_t dev)
}
/* alloc interrupt */
+ bm_disable_interrupts(sc);
sc->sc_txdmairqid = BM_TXDMA_INTERRUPT;
sc->sc_txdmairq = bus_alloc_resource_any(dev, SYS_RES_IRQ,
@@ -591,9 +592,6 @@ bm_attach(device_t dev)
eaddr = sc->sc_enaddr;
OF_getprop(node, "local-mac-address", eaddr, ETHER_ADDR_LEN);
- /* reset the adapter */
- bm_chip_setup(sc);
-
/*
* Setup MII
* On Apple BMAC controllers, we end up in a weird state of
@@ -608,6 +606,9 @@ bm_attach(device_t dev)
return (error);
}
+ /* reset the adapter */
+ bm_chip_setup(sc);
+
sc->sc_mii = device_get_softc(sc->sc_miibus);
if_initname(ifp, device_get_name(sc->sc_dev),
@@ -1129,31 +1130,26 @@ bm_chip_setup(struct bm_softc *sc)
{
uint16_t reg;
uint16_t *eaddr_sect;
- char path[128];
- ihandle_t bmac_ih;
+ struct mii_data *mii;
+ struct mii_softc *miisc;
eaddr_sect = (uint16_t *)(sc->sc_enaddr);
+ dbdma_stop(sc->sc_txdma);
+ dbdma_stop(sc->sc_rxdma);
- /*
-* Enable BMAC cell by opening and closing its OF node. This enables
-* the cell in macio as a side effect. We should probably directly
-* twiddle the FCR bits, but we lack a good interface for this at the
-* present time.
-*/
-
- OF_package_to_path(ofw_bus_get_node(sc->sc_dev), path, sizeof(path));
- bmac_ih = OF_open(path);
- if (bmac_ih == -1) {
- device_printf(sc->sc_dev,
- "Enabling BMAC cell failed! Hoping it's already active.\n");
- } else {
- OF_close(bmac_ih);
+ /* Reset MII */
+ mii = device_get_softc(sc->sc_miibus);
+ LIST_FOREACH(miisc, &mii->mii_phys, mii_list) {
+ PHY_RESET(miisc);
+ PHY_WRITE(miisc, MII_BMCR, PHY_READ(miisc, MII_BMCR) &
+ ~BMCR_ISO);
}
/* Reset chip */
CSR_WRITE_2(sc, BM_RX_RESET, 0x);
CSR_WRITE_2(sc, BM_TX_RESET, 0x0001);
do {
+ DELAY(10);
reg = CSR_READ_2(sc, BM_TX_RESET);
} while (reg & 0x0001);
Modified: head/sys/powerpc/powermac/macio.c
==
--- head/sys/powerpc/powermac/macio.c Fri May 6 02:45:02 2011
(r221518)
+++ head/sys/powerpc/powermac/macio.c Fri May 6 03:26:24 2011
(r221519)
@@ -65,6 +65,10 @@ struct macio_softc {
vm_offset_t sc_base;
vm_offset_t sc_size;
struct rman sc_mem_rman;
+
+ /* FCR registers */
+ int sc_memrid;
+ struct resource *sc_memr;
};
static MALLOC_DEFINE(M_MACIO, "macio", "macio device information");
@@ -296,6 +300,10 @@ macio_attach(device_t dev)
sc->sc_base = reg[2];
sc->sc_size = MACIO_REG_SIZE;
+ sc->sc_memrid = PCIR_BAR(0);
+ sc->sc_memr = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+ &sc->sc_memrid, RF_ACTIVE);
+
sc->sc_mem_rman.rm_type = RMAN_ARRAY;
sc->sc_mem_rman.rm_descr = "MacIO Device Memory";
error = rman_init(&sc->sc_mem_rman);
@@ -347,6 +355,29 @@ macio_attach(device_t dev)
continue;
}
device_set_ivars(cdev, dinfo);
+
+ /* Set FCRs to enable some devices */
+ if (sc->sc_memr == NULL)
+ continue;
+
+ if (strcmp(ofw_bus_get_name(cdev), "bmac") == 0 ||
+ strcmp(ofw_bus_get_compat(cdev), "bmac+") == 0) {
+ uint32_t fcr;
+
+ fcr = bus_read_4(sc->sc_memr, HEATHROW_FCR);
+
+ fcr |= FCR_ENET_ENABLE & ~FCR_ENET_RESET;
+ bus_write_4(sc->sc_memr, HEATHROW_FCR, fcr);
+ DELAY(5);
+ fcr |= FCR_ENET_RESET;
+ bus_write_4(sc->sc_memr, HEATHROW_FCR, fcr);
+ DELAY(5);
+ fcr &= ~FCR_ENET_RESET;
+ bus_write_4(sc->sc_memr, HEATHROW_FCR, fcr
Re: svn commit: r221497 - head/release/ia64
On 05/05/11 16:18, Marcel Moolenaar wrote: On May 5, 2011, at 7:16 AM, Nathan Whitehorn wrote: @@ -84,15 +63,13 @@ if [ $bootable = yes ]; then mv $MNT/boot/loader.efi $MNT/efi/boot/bootia64.efi umount $MNT mdconfig -d -u $md -BOOTOPTS="-b $EFIPART -no-emul-boot" +BOOTOPTS="-b bootimage=i386;$EFIPART -o no-emul-boot" else BOOTOPTS="" fi Thanks! Can you explain what this particular change does or why it's done? I'm cleaning up the release-building code, and am switching them from mkisofs to makefs, which provides the same functionality. This started with some irritation with the cdrtools port and a bug in the HFS hybrid generation that was breaking PPC release CD generation. Switching these to depend on makefs in general speeds the release-building process and removes the number of dependencies involved, since makefs is built as part of base. -Nathan ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r221497 - head/release/ia64
On May 5, 2011, at 8:29 PM, Nathan Whitehorn wrote: > On 05/05/11 16:18, Marcel Moolenaar wrote: >> On May 5, 2011, at 7:16 AM, Nathan Whitehorn wrote: >> >>> @@ -84,15 +63,13 @@ if [ $bootable = yes ]; then >>> mv $MNT/boot/loader.efi $MNT/efi/boot/bootia64.efi >>> umount $MNT >>> mdconfig -d -u $md >>> -BOOTOPTS="-b $EFIPART -no-emul-boot" >>> +BOOTOPTS="-b bootimage=i386;$EFIPART -o no-emul-boot" >>> else >>> BOOTOPTS="" >>> fi >> Thanks! >> >> Can you explain what this particular change does or why it's done? >> > > I'm cleaning up the release-building code, and am switching them from mkisofs > to makefs, which provides the same functionality. This started with some > irritation with the cdrtools port and a bug in the HFS hybrid generation that > was breaking PPC release CD generation. Switching these to depend on makefs > in general speeds the release-building process and removes the number of > dependencies involved, since makefs is built as part of base. Actually, I was just interested in the 'bootimage=i386' part of your change. I totally get why you're doing it :-) Sorry for not being clear... -- Marcel Moolenaar mar...@xcllnt.net ___ 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"
