svn-src-head Digest, Vol 88, Issue 2
Nikolai Lifanov
lifanov at mail.lifanov.com
Mon May 2 21:07:38 UTC 2011
svn-src-head-request at freebsd.org wrote:
>Send svn-src-head mailing list submissions to
> svn-src-head at freebsd.org
>
>To subscribe or unsubscribe via the World Wide Web, visit
> http://lists.freebsd.org/mailman/listinfo/svn-src-head
>or, via email, send a message with subject or body 'help' to
> svn-src-head-request at freebsd.org
>
>You can reach the person managing the list at
> svn-src-head-owner at freebsd.org
>
>When replying, please edit your Subject line so it is more specific
>than "Re: Contents of svn-src-head digest..."
>
>Today's Topics:
>
> 1. svn commit: r221300 - head/sys/conf (Bernhard Schmidt)
> 2. svn commit: r221301 - head/sys/conf (Bernhard Schmidt)
> 3. Re: svn commit: r221301 - head/sys/conf (Nathan Whitehorn)
> 4. svn commit: r221303 - head/usr.bin/man (Ulrich Spoerlein)
> 5. Re: svn commit: r221301 - head/sys/conf (Bernhard Schmidt)
> 6. svn commit: r221304 - head/sbin/recoverdisk (Ulrich Spoerlein)
> 7. svn commit: r221305 - head/share/man/man4 (Christian Brueffer)
> 8. svn commit: r221306 - in head/sys: fs/nfs nfs (Rick Macklem)
> 9. svn commit: r221307 - head/sys/mips/atheros (Adrian Chadd)
> 10. svn commit: r221308 - head/usr.bin/nfsstat (Rick Macklem)
> 11. svn commit: r221309 - head/usr.bin/nfsstat (Rick Macklem)
> 12. svn commit: r221312 - head/sys/conf (Adrian Chadd)
> 13. Re: svn commit: r221301 - head/sys/conf (Adrian Chadd)
> 14. svn commit: r221319 - head/share/misc (Maxim Konovalov)
> 15. svn commit: r221320 - head/sys/conf (Bruce Cran)
> 16. svn commit: r221321 - head/sys/mips/conf (Adrian Chadd)
> 17. Re: svn commit: r221320 - head/sys/conf (Alexander Best)
> 18. Re: svn commit: r221214 - head/sys/x86/x86 (Dimitry Andric)
> 19. svn commit: r221324 - in head/sys: amd64/pci dev/acpica
> dev/pci i386/pci x86/x86 (John Baldwin)
> 20. svn commit: r221326 - head/sys/dev/puc (John Baldwin)
> 21. Re: svn commit: r221301 - head/sys/conf (John Baldwin)
> 22. svn commit: r221327 - head/sys/dev/cardbus (John Baldwin)
> 23. svn commit: r221328 - head/sys/netinet (Michael Tuexen)
> 24. svn commit: r221329 - head/sys/i386/conf (Bernhard Schmidt)
> 25. Re: svn commit: r221301 - head/sys/conf (Bernhard Schmidt)
> 26. svn commit: r221331 - head/sys/x86/x86 (Jung-uk Kim)
> 27. Re: svn commit: r221214 - head/sys/x86/x86 (Jung-uk Kim)
> 28. Re: svn commit: r221301 - head/sys/conf (John Baldwin)
> 29. svn commit: r221333 - head (Dimitry Andric)
> 30. svn commit: r221334 - head/sys/ia64/include (Marcel Moolenaar)
> 31. svn commit: r221335 - head/sys/dev/coretemp (Xin LI)
> 32. svn commit: r221336 - head/sys/dev/acpica (John Baldwin)
>
>Author: bschmidt
>Date: Sun May 1 18:42:56 2011
>New Revision: 221300
>URL: http://svn.freebsd.org/changeset/base/221300
>
>Log:
> Add files for wpi(4)
>
>Modified:
> head/sys/conf/files
>
>Modified: head/sys/conf/files
>==============================================================================
>--- head/sys/conf/files Sun May 1 18:41:57 2011 (r221299)
>+++ head/sys/conf/files Sun May 1 18:42:56 2011 (r221300)
>@@ -1995,6 +1995,7 @@ dev/wi/if_wi.c optional wi
> dev/wi/if_wi_pccard.c optional wi pccard
> dev/wi/if_wi_pci.c optional wi pci
> dev/wl/if_wl.c optional wl isa
>+dev/wpi/if_wpi.c optional wpi pci
> wpifw.c optional wpifw \
> compile-with "${AWK} -f $S/tools/fw_stub.awk wpi.fw:wpifw:153229 -mwpi -c${.TARGET}" \
> no-implicit-rule before-depend local \
>
>
>Author: bschmidt
>Date: Sun May 1 19:05:54 2011
>New Revision: 221301
>URL: http://svn.freebsd.org/changeset/base/221301
>
>Log:
> These are of course i386/amd64 only.
>
>Modified:
> head/sys/conf/NOTES
>
>Modified: head/sys/conf/NOTES
>==============================================================================
>--- head/sys/conf/NOTES Sun May 1 18:42:56 2011 (r221300)
>+++ head/sys/conf/NOTES Sun May 1 19:05:54 2011 (r221301)
>@@ -1935,9 +1935,6 @@ device xmphy # XaQti XMAC II
> # (hint of prefer_iomap can be done to prefer I/O instead of Mem mapping)
> # gem: Apple GMAC/Sun ERI/Sun GEM
> # hme: Sun HME (Happy Meal Ethernet)
>-# ipw: Intel 2100 wireless NICs.
>-# iwi: Intel 2200BG/2225BG/2915ABG wireless NICs.
>-# iwn: Intel 4965/1000/5000/6000 wireless NICs.
> # jme: JMicron JMC260 Fast Ethernet/JMC250 Gigabit Ethernet based adapters.
> # le: AMD Am7900 LANCE and Am79C9xx PCnet
> # lge: Support for PCI gigabit ethernet adapters based on the Level 1
>@@ -2016,7 +2013,6 @@ device xmphy # XaQti XMAC II
> # wi: Lucent WaveLAN/IEEE 802.11 PCMCIA adapters. Note: this supports both
> # the PCMCIA and ISA cards: the ISA card is really a PCMCIA to ISA
> # bridge with a PCMCIA adapter plugged into it.
>-# wpi: Intel 3945ABG wireless NICs.
> # xe: Xircom/Intel EtherExpress Pro100/16 PC Card ethernet controller,
> # Accton Fast EtherCard-16, Compaq Netelligent 10/100 PC Card,
> # Toshiba 10/100 Ethernet PC Card, Xircom 16-bit Ethernet + Modem 56
>@@ -2137,13 +2133,9 @@ options AH_RXCFG_SDMAMW_4BYTES
> device ath_rate_sample # SampleRate tx rate control for ath
> device bwi # Broadcom BCM430* BCM431*
> device bwn # Broadcom BCM43xx
>-device ipw # Intel 2100 wireless NICs.
>-device iwi # Intel 2200BG/2225BG/2915ABG wireless NICs.
>-device iwn # Intel 4965/1000/5000/6000 wireless NICs.
> device malo # Marvell Libertas wireless NICs.
> device mwl # Marvell 88W8363 802.11n wireless NICs.
> device ral # Ralink Technology RT2500 wireless NICs.
>-device wpi # Intel 3945ABG wireless NICs.
>
> # Use "private" jumbo buffers allocated exclusively for the ti(4) driver.
> # This option is incompatible with the TI_JUMBO_HDRSPLIT option below.
>
>
>On 05/01/11 14:05, Bernhard Schmidt wrote:
>> Author: bschmidt
>> Date: Sun May 1 19:05:54 2011
>> New Revision: 221301
>> URL: http://svn.freebsd.org/changeset/base/221301
>>
>> Log:
>> These are of course i386/amd64 only.
>
>
>I'm not sure that's intrinsically true. Even if they mostly only ship
>with Intel motherboards, many of these are Mini-PCI parts which could be
>put into non-x86 systems.
>-Nathan
>
>
>Author: uqs
>Date: Sun May 1 19:47:34 2011
>New Revision: 221303
>URL: http://svn.freebsd.org/changeset/base/221303
>
>Log:
> Let users' PATH decide which groff suite to pick up.
>
> Let groff pass the -c flag to grotty, which will turn off ANSI
> sequences. While these are not a problem for our more/less, they get
> mangled by col(1) and this will result in garbage output.
>
> This makes man(1) work together with textproc/groff, in case the
> user decided to delete the old groff from base (-DWITHOUT_GROFF).
>
>Modified:
> head/usr.bin/man/man.sh
>
>Modified: head/usr.bin/man/man.sh
>==============================================================================
>--- head/usr.bin/man/man.sh Sun May 1 19:24:51 2011 (r221302)
>+++ head/usr.bin/man/man.sh Sun May 1 19:47:34 2011 (r221303)
>@@ -889,16 +889,18 @@ do_whatis() {
> search_whatis whatis "$@"
> }
>
>-EQN=/usr/bin/eqn
>+# User's PATH setting decides on the groff-suite to pick up.
>+EQN=eqn
>+NROFF='groff -S -P-c -Wall -mtty-char -man'
>+PIC=pic
>+REFER=refer
>+TBL=tbl
>+TROFF='groff -S -P-c -man'
>+VGRIND=vgrind
>+
> COL=/usr/bin/col
> LOCALE=/usr/bin/locale
>-NROFF='/usr/bin/groff -S -Wall -mtty-char -man'
>-PIC=/usr/bin/pic
> SYSCTL=/sbin/sysctl
>-TBL=/usr/bin/tbl
>-TROFF='/usr/bin/groff -S -man'
>-REFER=/usr/bin/refer
>-VGRIND=/usr/bin/vgrind
>
> debug=0
> man_default_sections='1:1aout:8:2:3:n:4:5:6:7:9:l'
>
>
>On Sunday 01 May 2011 21:28:28 Nathan Whitehorn wrote:
>> On 05/01/11 14:05, Bernhard Schmidt wrote:
>> > Author: bschmidt
>> > Date: Sun May 1 19:05:54 2011
>> > New Revision: 221301
>> > URL: http://svn.freebsd.org/changeset/base/221301
>> >
>> > Log:
>> > These are of course i386/amd64 only.
>>
>>
>> I'm not sure that's intrinsically true. Even if they mostly only ship
>> with Intel motherboards, many of these are Mini-PCI parts which could be
>> put into non-x86 systems.
>
>Yes, indeed. Those might of course be used on other platforms too
>(well at least it fits into the slot, I know that certain features
>are not even available on AMD platforms). I'm just not aware that
>anyone ever tried one of it on mips for example.
>
>I don't mind being proven wrong and if so move the entries back to
>a more generic location. Currently I'm just trying mimic the module
>behaviour in sys/modules/Makefile.
>
>--
>Bernhard
>
>
>Author: uqs
>Date: Sun May 1 20:14:10 2011
>New Revision: 221304
>URL: http://svn.freebsd.org/changeset/base/221304
>
>Log:
> recoverdisk(8): treat output file consistently and abort on EINVAL
>
> This improves usability a little as we no longer require using touch.
> Also reword the manpage wrt. parameters and fix usage() [1]
>
> With no media in a cd(4) drive, the reads will loop producing EINVAL,
> abort in that case [2].
>
> Document the shortcoming of sectorsize and MAXPHYS (a quick solution
> to this might be having MAXPHYS as the "bigsize", in short testing it
> didn't make a difference on throughput).
>
> Submitted by: arundel [1]
> PR: bin/154528 [2]
>
>Modified:
> head/sbin/recoverdisk/recoverdisk.1
> head/sbin/recoverdisk/recoverdisk.c
>
>Modified: head/sbin/recoverdisk/recoverdisk.1
>==============================================================================
>--- head/sbin/recoverdisk/recoverdisk.1 Sun May 1 19:47:34 2011 (r221303)
>+++ head/sbin/recoverdisk/recoverdisk.1 Sun May 1 20:14:10 2011 (r221304)
>@@ -24,7 +24,7 @@
> .\"
> .\" $FreeBSD$
> .\"
>-.Dd May 6, 2006
>+.Dd May 1, 2011
> .Dt RECOVERDISK 1
> .Os
> .Sh NAME
>@@ -33,17 +33,20 @@
> .Sh SYNOPSIS
> .Nm
> .Op Fl b Ar bigsize
>-.Op Fl r Ar rlist
>-.Op Fl s Ar snapshot
>-.Op Fl w Ar wlist
>-.Ar special
>-.Op Ar file
>+.Op Fl r Ar readlist
>+.Op Fl s Ar interval
>+.Op Fl w Ar writelist
>+.Ar source
>+.Op Ar destination
> .Sh DESCRIPTION
> The
> .Nm
> utility reads data from the
>-.Ar special
>+.Ar source
> file until all blocks could be successfully read.
>+If
>+.Ar destination
>+was specified all data is being written to that file.
> It starts reading in multiples of the sector size.
> Whenever a block fails, it is put to the end of the working queue and will be
> read again, possibly with a smaller read size.
>@@ -59,13 +62,13 @@ The options are as follows:
> The size of reads attempted first.
> The middle pass is roughly the logarithmic average of the bigsize and
> the sectorsize.
>-.It Fl r Ar rlist
>+.It Fl r Ar readlist
> Read the list of blocks and block sizes to read from the specified file.
>-.It Fl s Ar snapshot
>-How often we should update the worklist file while things go OK.
>-The default is 60 and the units is "progress messages" so if things
>+.It Fl s Ar interval
>+How often we should update the writelist file while things go OK.
>+The default is 60 and the unit is "progress messages" so if things
> go well, this is the same as once per minute.
>-.It Fl w Ar wlist
>+.It Fl w Ar writelist
> Write the list of remaining blocks to read to the specified file if
> .Nm
> is aborted via
>@@ -102,20 +105,19 @@ Percent complete.
> .Sh EXAMPLES
> .Bd -literal
> # recover data from failing hard drive ad3
>-touch /data/lots_of_space
>-recoverdisk /dev/ad3 /data/lots_of_space
>+recoverdisk /dev/ad3 /data/disk.img
>
> # clone a hard disk
> recoverdisk /dev/ad3 /dev/ad4
>
> # read an ISO image from a CD-ROM
>-touch /data/cd.iso; recoverdisk /dev/acd0 /data/cd.iso
>+recoverdisk /dev/cd0 /data/cd.iso
>
> # continue reading from a broken CD and update the existing worklist
>-recoverdisk -r worklist -w worklist /dev/acd0 /data/cd.iso
>+recoverdisk -r worklist -w worklist /dev/cd0 /data/cd.iso
>
> # recover a single file from the unreadable media
>-touch file.avi; recoverdisk /cdrom/file.avi file.avi
>+recoverdisk /cdrom/file.avi file.avi
>
> # If the disk hangs the system on read-errors try:
> recoverdisk -b 0 /dev/ad3 /somewhere
>@@ -133,7 +135,7 @@ utility first appeared in
> The original implementation was done by
> .An Poul-Henning Kamp Aq phk at FreeBSD.org
> with minor improvements from
>-.An Ulrich Sp\(:orlein Aq uspoerlein at gmail.com .
>+.An Ulrich Sp\(:orlein Aq uqs at FreeBSD.org .
> .Pp
> This manual page was written by
> .An Ulrich Sp\(:orlein .
>@@ -144,4 +146,13 @@ This is due to the DMA reads being split
> These reads then fail if the sectorsize is not a divisor of 128kB.
> When reading a full raw audio CD, this leads to roughly 700 error messages
> flying by.
>-This is harmless.
>+This is harmless and can be avoided by setting
>+.Fl b
>+to no more than 128kB.
>+.\".Pp
>+.\"When reading from optical media, a bug in the GEOM framework will
>+.\"prevent it from seeing that the media has been removed.
>+.\"The device can still be opened, but all reads will fail.
>+.\"This is usually harmless, but will send
>+.\".Nm
>+.\"into an infinite loop.
>
>Modified: head/sbin/recoverdisk/recoverdisk.c
>==============================================================================
>--- head/sbin/recoverdisk/recoverdisk.c Sun May 1 19:47:34 2011 (r221303)
>+++ head/sbin/recoverdisk/recoverdisk.c Sun May 1 20:14:10 2011 (r221304)
>@@ -86,7 +86,7 @@ save_worklist(void)
> if (file == NULL)
> err(1, "Error opening file %s", wworklist);
>
>- TAILQ_FOREACH(llp, &lumps, list)
>+ TAILQ_FOREACH(llp, &lumps, list)
> fprintf(file, "%jd %jd %d\n",
> (intmax_t)llp->start, (intmax_t)llp->len,
> llp->state);
>@@ -134,8 +134,8 @@ read_worklist(off_t t)
> static void
> usage(void)
> {
>- (void)fprintf(stderr,
>- "usage: recoverdisk [-r worklist] [-w worklist] source-drive [destination]\n");
>+ (void)fprintf(stderr, "usage: recoverdisk [-b bigsize] [-r readlist] "
>+ "[-s interval] [-w writelist] source [destination]\n");
> exit(1);
> }
>
>@@ -153,7 +153,7 @@ main(int argc, char * const argv[])
> int fdr, fdw;
> off_t t, d, start, len;
> size_t i, j;
>- int error, flags, state;
>+ int error, state;
> u_char *buf;
> u_int sectorsize;
> time_t t1, t2;
>@@ -196,7 +196,6 @@ main(int argc, char * const argv[])
> error = fstat(fdr, &sb);
> if (error < 0)
> err(1, "fstat failed");
>- flags = O_WRONLY;
> if (S_ISBLK(sb.st_mode) || S_ISCHR(sb.st_mode)) {
> error = ioctl(fdr, DIOCGSECTORSIZE, §orsize);
> if (error < 0)
>@@ -210,7 +209,6 @@ main(int argc, char * const argv[])
> err(1, "DIOCGMEDIASIZE failed");
> } else {
> t = sb.st_size;
>- flags |= O_CREAT | O_TRUNC;
> }
>
> if (bigsize < minsize)
>@@ -229,9 +227,12 @@ main(int argc, char * const argv[])
> err(1, "Cannot allocate %zu bytes buffer", bigsize);
>
> if (argc > 1) {
>- fdw = open(argv[1], flags, DEFFILEMODE);
>+ fdw = open(argv[1], O_WRONLY | O_CREAT, DEFFILEMODE);
> if (fdw < 0)
> err(1, "Cannot open write descriptor %s", argv[1]);
>+ if (ftruncate(fdw, t) < 0)
>+ err(1, "Cannot truncate output %s to %jd bytes",
>+ argv[1], (intmax_t)t);
> } else
> fdw = -1;
>
>@@ -292,6 +293,10 @@ main(int argc, char * const argv[])
> }
> printf("\n%jd %zu failed (%s)\n",
> lp->start, i, strerror(errno));
>+ if (errno == EINVAL) {
>+ printf("read() size too big? Try with -b 131072");
>+ aborting = 1;
>+ }
> if (errno == ENXIO)
> aborting = 1;
> new_lump(lp->start, i, lp->state + 1);
>
>
>Author: brueffer
>Date: Sun May 1 20:46:37 2011
>New Revision: 221305
>URL: http://svn.freebsd.org/changeset/base/221305
>
>Log:
> Minor cleanup.
>
>Modified:
> head/share/man/man4/vxge.4
>
>Modified: head/share/man/man4/vxge.4
>==============================================================================
>--- head/share/man/man4/vxge.4 Sun May 1 20:14:10 2011 (r221304)
>+++ head/share/man/man4/vxge.4 Sun May 1 20:46:37 2011 (r221305)
>@@ -49,13 +49,12 @@ The
> .Nm
> driver provides support for Neterion X3100 adapters.
> The driver supports TCP Segmentation Offload (TSO/LSO),
>-Large Receive Offlaod (LRO), Jumbo Frames, Receive Traffic Hash (RTH),
>+Large Receive Offload (LRO), Jumbo Frames, Receive Traffic Hash (RTH),
> VLAN, Promiscuous mode and Multi function mode.
> .Pp
>-
> The
> .Nm
>-driver supports following function modes:
>+driver supports the following function modes:
> .Bd -ragged -offset indent
> .Cd "SF1_VP17 - 1 function with 17 VPATHs"
> .Ed
>
>
>Author: rmacklem
>Date: Sun May 1 22:19:52 2011
>New Revision: 221306
>URL: http://svn.freebsd.org/changeset/base/221306
>
>Log:
> Add the kernel support needed to zero out the nfsstats
> structure for the new NFS subsystem. This will be used
> by nfsstats.c to implement the "-z" option.
>
> MFC after: 2 weeks
>
>Modified:
> head/sys/fs/nfs/nfs_commonport.c
> head/sys/nfs/nfssvc.h
>
>Modified: head/sys/fs/nfs/nfs_commonport.c
>==============================================================================
>--- head/sys/fs/nfs/nfs_commonport.c Sun May 1 20:46:37 2011 (r221305)
>+++ head/sys/fs/nfs/nfs_commonport.c Sun May 1 22:19:52 2011 (r221306)
>@@ -404,6 +404,8 @@ nfssvc_call(struct thread *p, struct nfs
> } else if (uap->flag & NFSSVC_GETSTATS) {
> error = copyout(&newnfsstats,
> CAST_USER_ADDR_T(uap->argp), sizeof (newnfsstats));
>+ if ((uap->flag & NFSSVC_ZEROSTATS) != 0 && error == 0)
>+ bzero(&newnfsstats, sizeof(newnfsstats));
> return (error);
> } else if (uap->flag & NFSSVC_NFSUSERDPORT) {
> u_short sockport;
>
>Modified: head/sys/nfs/nfssvc.h
>==============================================================================
>--- head/sys/nfs/nfssvc.h Sun May 1 20:46:37 2011 (r221305)
>+++ head/sys/nfs/nfssvc.h Sun May 1 22:19:52 2011 (r221306)
>@@ -64,5 +64,6 @@
> #define NFSSVC_CBADDSOCK 0x00200000
> #define NFSSVC_GETSTATS 0x00400000
> #define NFSSVC_BACKUPSTABLE 0x00800000
>+#define NFSSVC_ZEROSTATS 0x01000000 /* modifier for GETSTATS */
>
> #endif /* _NFS_NFSSVC_H */
>
>
>Author: adrian
>Date: Sun May 1 23:32:37 2011
>New Revision: 221307
>URL: http://svn.freebsd.org/changeset/base/221307
>
>Log:
> Some AR724x PCIe fixes, which should wrap up the first round
> of endian-ness issues with the AR724x.
>
> From Luiz:
>
> * Fix the bus space tag used so endian-ness is correctly handled;
> * Only do the workaround for the AR7240; AR7241/AR7242 (PB92)
> don't require this
>
> From me:
>
> * Add a read flush from openwrt
>
> Submitted by: Luiz Otavio O Souza
>
>Modified:
> head/sys/mips/atheros/ar724x_pci.c
>
>Modified: head/sys/mips/atheros/ar724x_pci.c
>==============================================================================
>--- head/sys/mips/atheros/ar724x_pci.c Sun May 1 22:19:52 2011 (r221306)
>+++ head/sys/mips/atheros/ar724x_pci.c Sun May 1 23:32:37 2011 (r221307)
>@@ -57,8 +57,7 @@ __FBSDID("$FreeBSD$");
> #include <mips/atheros/ar71xxreg.h>
> #include <mips/atheros/ar724xreg.h>
> #include <mips/atheros/ar71xx_setup.h>
>-#include <mips/atheros/ar71xx_pci_bus_space.h> /* XXX */
>-#include <mips/atheros/ar71xx_bus_space_reversed.h> /* XXX */
>+#include <mips/atheros/ar71xx_pci_bus_space.h>
>
> #include <mips/atheros/ar71xx_cpudef.h>
>
>@@ -113,7 +112,7 @@ static uint32_t
> ar724x_pci_read_config(device_t dev, u_int bus, u_int slot, u_int func,
> u_int reg, int bytes)
> {
>- uint32_t cmd, data, shift, mask;
>+ uint32_t data, shift, mask;
>
> /* Register access is 32-bit aligned */
> shift = (reg & 3) * 8;
>@@ -125,18 +124,9 @@ ar724x_pci_read_config(device_t dev, u_i
> dprintf("%s: tag (%x, %x, %x) reg %d(%d)\n", __func__, bus, slot,
> func, reg, bytes);
>
>- if ((bus == 0) && (slot == 0) && (func == 0)) {
>+ if ((bus == 0) && (slot == 0) && (func == 0))
> data = ATH_READ_REG(AR724X_PCI_CFG_BASE + (reg & ~3));
>- /*
>- * WAR for BAR issue - We are unable to access the PCI device
>- * space if we set the BAR with proper base address.
>- */
>- if (reg == PCIR_BAR(0) && bytes == 4) {
>- cmd = (ar71xx_soc == AR71XX_SOC_AR7240) ?
>- 0xffff : 0x1000ffff;
>- ar724x_pci_write(AR724X_PCI_CFG_BASE, reg, cmd, bytes);
>- }
>- } else
>+ else
> data = -1;
>
> /* Get request bytes from 32-bit word */
>@@ -158,14 +148,14 @@ ar724x_pci_write_config(device_t dev, u_
> if ((bus != 0) || (slot != 0) || (func != 0))
> return;
>
>- ar724x_pci_write(AR724X_PCI_CFG_BASE, reg, data, bytes);
> /*
>- * WAR for BAR issue - We are unable to access the PCI device space
>- * if we set the BAR with proper base address.
>- * Force a flush here (at register writing).
>+ * WAR for BAR issue on AR7240 - We are unable to access the PCI device
>+ * space if we set the BAR with proper base address.
> */
>- if (reg == PCIR_BAR(0) && bytes == 4)
>- (void)ar724x_pci_read_config(dev, bus, slot, func, reg, bytes);
>+ if (reg == PCIR_BAR(0) && bytes == 4 && ar71xx_soc == AR71XX_SOC_AR7240)
>+ ar724x_pci_write(AR724X_PCI_CFG_BASE, reg, 0xffff, bytes);
>+ else
>+ ar724x_pci_write(AR724X_PCI_CFG_BASE, reg, data, bytes);
> }
>
> static void
>@@ -232,6 +222,9 @@ ar724x_pci_setup(device_t dev)
> else
> reg = 0x1ffc1;
> ATH_WRITE_REG(AR724X_PCI_APP, reg);
>+ /* Flush write */
>+ (void) ATH_READ_REG(AR724X_PCI_APP);
>+
> DELAY(1000);
>
> reg = ATH_READ_REG(AR724X_PCI_RESET);
>@@ -457,10 +450,7 @@ ar724x_pci_activate_resource(device_t bu
> case SYS_RES_MEMORY:
> case SYS_RES_IOPORT:
>
>- /* XXX */
>- //rman_set_bustag(r, ar71xx_bus_space_pcimem);
>- //rman_set_bustag(r, mips_bus_space_generic);
>- rman_set_bustag(r, ar71xx_bus_space_reversed);
>+ rman_set_bustag(r, ar71xx_bus_space_pcimem);
> break;
> }
> }
>
>
>Author: rmacklem
>Date: Sun May 1 23:41:35 2011
>New Revision: 221308
>URL: http://svn.freebsd.org/changeset/base/221308
>
>Log:
> Fix nfsstat so that the "-z" option works for the
> new NFS subsystem.
>
> MFC after: 2 weeks
>
>Modified:
> head/usr.bin/nfsstat/nfsstat.c
>
>Modified: head/usr.bin/nfsstat/nfsstat.c
>==============================================================================
>--- head/usr.bin/nfsstat/nfsstat.c Sun May 1 23:32:37 2011 (r221307)
>+++ head/usr.bin/nfsstat/nfsstat.c Sun May 1 23:41:35 2011 (r221308)
>@@ -85,6 +85,7 @@ static int zflag = 0;
> static int run_v4 = 0;
> static int printtitle = 1;
> static struct ext_nfsstats ext_nfsstats;
>+static int nfssvc_flag;
>
> void intpr(int, int);
> void printhdr(int, int);
>@@ -107,6 +108,7 @@ main(int argc, char **argv)
> char *memf, *nlistf;
> char errbuf[_POSIX2_LINE_MAX];
>
>+ nfssvc_flag = NFSSVC_GETSTATS;
> interval = 0;
> memf = nlistf = NULL;
> while ((ch = getopt(argc, argv, "cesWM:N:w:z")) != -1)
>@@ -135,6 +137,7 @@ main(int argc, char **argv)
> break;
> case 'z':
> zflag = 1;
>+ nfssvc_flag |= NFSSVC_ZEROSTATS;
> break;
> case 'e':
> run_v4 = 1;
>@@ -161,7 +164,7 @@ main(int argc, char **argv)
> errx(1, "experimental client/server not loaded");
>
> if (run_v4 != 0) {
>- if (nfssvc(NFSSVC_GETSTATS, &ext_nfsstats) < 0)
>+ if (nfssvc(nfssvc_flag, &ext_nfsstats) < 0)
> err(1, "Can't get stats");
> } else if (nlistf != NULL || memf != NULL) {
> deadkernel = 1;
>@@ -793,13 +796,13 @@ exp_sidewaysintpr(u_int interval, int cl
> int hdrcnt = 1;
>
> ext_nfsstatsp = &lastst;
>- if (nfssvc(NFSSVC_GETSTATS, ext_nfsstatsp) < 0)
>+ if (nfssvc(nfssvc_flag, ext_nfsstatsp) < 0)
> err(1, "Can't get stats");
> sleep(interval);
>
> for (;;) {
> ext_nfsstatsp = &nfsstats;
>- if (nfssvc(NFSSVC_GETSTATS, ext_nfsstatsp) < 0)
>+ if (nfssvc(nfssvc_flag, ext_nfsstatsp) < 0)
> err(1, "Can't get stats");
>
> if (--hdrcnt == 0) {
>
>
>Author: rmacklem
>Date: Sun May 1 23:55:56 2011
>New Revision: 221309
>URL: http://svn.freebsd.org/changeset/base/221309
>
>Log:
> Fix nfsstat.1 to indicate that "-z" now works for
> the new NFS subsystems after r221308.
> This is a content change.
>
> MFC after: 2 weeks
>
>Modified:
> head/usr.bin/nfsstat/nfsstat.1
>
>Modified: head/usr.bin/nfsstat/nfsstat.1
>==============================================================================
>--- head/usr.bin/nfsstat/nfsstat.1 Sun May 1 23:41:35 2011 (r221308)
>+++ head/usr.bin/nfsstat/nfsstat.1 Sun May 1 23:55:56 2011 (r221309)
>@@ -28,7 +28,7 @@
> .\" From: @(#)nfsstat.1 8.1 (Berkeley) 6/6/93
> .\" $FreeBSD$
> .\"
>-.Dd October 18, 2007
>+.Dd May 1, 2011
> .Dt NFSSTAT 1
> .Os
> .Sh NAME
>@@ -78,7 +78,6 @@ activity for both the client and server
> second intervals.
> .It Fl z
> Reset statistics after displaying them.
>-(Not currently supported by the experimental nfs subsystem.)
> .It Fl e
> Gather statistics from the experimental nfs subsystem that includes
> support for NFSv4 instead of the regular nfs subsystem.
>
>
>Author: adrian
>Date: Mon May 2 05:39:43 2011
>New Revision: 221312
>URL: http://svn.freebsd.org/changeset/base/221312
>
>Log:
> Add documentation to sys/conf/options pointing out that AH_SUPPORT_AR9130
> shouldn't be enabled by default unless you're truely building for the
> AR913x platform.
>
>Modified:
> head/sys/conf/options
>
>Modified: head/sys/conf/options
>==============================================================================
>--- head/sys/conf/options Mon May 2 01:01:03 2011 (r221311)
>+++ head/sys/conf/options Mon May 2 05:39:43 2011 (r221312)
>@@ -775,6 +775,8 @@ ATH_ENABLE_11N opt_ah.h
>
> # options for the Atheros hal
> AH_SUPPORT_AR5416 opt_ah.h
>+# XXX For now, this breaks non-AR9130 chipsets, so only use it
>+# XXX when actually targetting AR9130.
> AH_SUPPORT_AR9130 opt_ah.h
>
> AH_DEBUG opt_ah.h
>@@ -791,6 +793,7 @@ AH_MAXCHAN opt_ah.h
> AH_RXCFG_SDMAMW_4BYTES opt_ah.h
>
> # AR5416 and later interrupt mitigation
>+# XXX do not use this for AR9130
> AH_AR5416_INTERRUPT_MITIGATION opt_ah.h
>
> # options for the Broadcom BCM43xx driver (bwi)
>
>
>On 2 May 2011 03:54, Bernhard Schmidt <bschmidt at freebsd.org> wrote:
>
>>> I'm not sure that's intrinsically true. Even if they mostly only ship
>>> with Intel motherboards, many of these are Mini-PCI parts which could be
>>> put into non-x86 systems.
>>
>> Yes, indeed. Those might of course be used on other platforms too
>> (well at least it fits into the slot, I know that certain features
>> are not even available on AMD platforms). I'm just not aware that
>> anyone ever tried one of it on mips for example.
>>
>> I don't mind being proven wrong and if so move the entries back to
>> a more generic location. Currently I'm just trying mimic the module
>> behaviour in sys/modules/Makefile.
>
>I'm likely to try the intel mini-pcie stuff on the atheros PB92 ref
>board (AR7242 MIPS). Just not yet.
>
>I'll let you know how it goes when i've done it.
>
>
>
>Adiran
>
>
>Author: maxim
>Date: Mon May 2 09:47:13 2011
>New Revision: 221319
>URL: http://svn.freebsd.org/changeset/base/221319
>
>Log:
> o OpenBSD 4.9 added.
>
>Modified:
> head/share/misc/bsd-family-tree
>
>Modified: head/share/misc/bsd-family-tree
>==============================================================================
>--- head/share/misc/bsd-family-tree Mon May 2 08:33:20 2011 (r221318)
>+++ head/share/misc/bsd-family-tree Mon May 2 09:47:13 2011 (r221319)
>@@ -246,7 +246,7 @@ FreeBSD 5.2 | |
> | | | | | NetBSD 5.1 | |
> | FreeBSD FreeBSD | | | |
> | 8.2 7.4 | | | DragonFly 2.10.1
>- | v | | | |
>+ | v | | OpenBSD 4.9 |
> | | | | |
> FreeBSD 9 -current | NetBSD -current OpenBSD -current |
> | | | | |
>@@ -533,6 +533,7 @@ NetBSD 5.1 2010-11-19 [NBD]
> FreeBSD 7.4 2011-02-24 [FBD]
> FreeBSD 8.2 2011-02-24 [FBD]
> DragonFly 2.10.1 2011-04-26 [DFB]
>+OpenBSD 4.9 2011-05-01 [OBD]
>
> Bibliography
> ------------------------
>
>
>Author: brucec
>Date: Mon May 2 10:35:27 2011
>New Revision: 221320
>URL: http://svn.freebsd.org/changeset/base/221320
>
>Log:
> Add -Wmissing-include-dirs to CWARNFLAGS, so tinderbox will punish those
> developers committing new code with broken include directories.
> Fix a few whitespace issues.
> Improve a couple of comments.
> -W is now deprecated and is referred to as -Wextra (see gcc(1)).
>
> Submitted by: arundel
>
>Modified:
> head/sys/conf/kern.mk
>
>Modified: head/sys/conf/kern.mk
>==============================================================================
>--- head/sys/conf/kern.mk Mon May 2 09:47:13 2011 (r221319)
>+++ head/sys/conf/kern.mk Mon May 2 10:35:27 2011 (r221320)
>@@ -3,24 +3,25 @@
> #
> # Warning flags for compiling the kernel and components of the kernel.
> #
>-# Note that the newly added -Wcast-qual is responsible for generating
>+# Note that the newly added -Wcast-qual is responsible for generating
> # most of the remaining warnings. Warnings introduced with -Wall will
> # also pop up, but are easier to fix.
> CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
> -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
>- -Wundef -Wno-pointer-sign -fformat-extensions
>+ -Wundef -Wno-pointer-sign -fformat-extensions \
>+ -Wmissing-include-dirs
> #
> # The following flags are next up for working on:
>-# -W
>+# -Wextra
>
> #
>-# On the i386, do not align the stack to 16-byte boundaries. Otherwise GCC
>-# 2.95 adds code to the entry and exit point of every function to align the
>+# On i386, do not align the stack to 16-byte boundaries. Otherwise GCC 2.95
>+# and above adds code to the entry and exit point of every function to align the
> # stack to 16-byte boundaries -- thus wasting approximately 12 bytes of stack
>-# per function call. While the 16-byte alignment may benefit micro benchmarks,
>+# per function call. While the 16-byte alignment may benefit micro benchmarks,
> # it is probably an overall loss as it makes the code bigger (less efficient
> # use of code cache tag lines) and uses more stack (less efficient use of data
>-# cache tag lines). Explicitly prohibit the use of SSE and other SIMD
>+# cache tag lines). Explicitly prohibit the use of FPU, SSE and other SIMD
> # operations inside the kernel itself. These operations are exclusively
> # reserved for user applications.
> #
>@@ -35,6 +36,7 @@ INLINE_LIMIT?= 8000
> .if ${MACHINE_CPUARCH} == "arm"
> INLINE_LIMIT?= 8000
> .endif
>+
> #
> # For IA-64, we use r13 for the kernel globals pointer and we only use
> # a very small subset of float registers for integer divides.
>@@ -98,7 +100,7 @@ INLINE_LIMIT?= 8000
> CFLAGS+= -ffreestanding
>
> #
>-# GCC SSP support.
>+# GCC SSP support
> #
> .if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
> ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
>@@ -106,9 +108,8 @@ CFLAGS+= -fstack-protector
> .endif
>
> #
>-# Enable CTF conversation on request.
>+# Enable CTF conversation on request
> #
> .if defined(WITH_CTF)
> .undef NO_CTF
> .endif
>-
>
>
>Author: adrian
>Date: Mon May 2 10:42:19 2011
>New Revision: 221321
>URL: http://svn.freebsd.org/changeset/base/221321
>
>Log:
> Add in the work-around for the AR8316 gige switch PHY.
>
> This allows the ethernet to function on the PB92 board.
>
> Submitted by: Luiz Otavio O Souza
>
>Modified:
> head/sys/mips/conf/PB92.hints
>
>Modified: head/sys/mips/conf/PB92.hints
>==============================================================================
>--- head/sys/mips/conf/PB92.hints Mon May 2 10:35:27 2011 (r221320)
>+++ head/sys/mips/conf/PB92.hints Mon May 2 10:42:19 2011 (r221321)
>@@ -30,7 +30,11 @@ hint.arge.0.at="nexus0"
> hint.arge.0.maddr=0x19000000
> hint.arge.0.msize=0x1000
> hint.arge.0.irq=2
>-hint.arge.0.phymask=0x1
>+
>+# AR8316 workaround for now
>+hint.arge.0.media=1000
>+hint.arge.0.fduplex=1
>+hint.arge.0.phymask=0x3
>
> # GPIO
> hint.gpio.0.at="apb0"
>
>
>On Mon May 2 11, Bruce Cran wrote:
>> Author: brucec
>> Date: Mon May 2 10:35:27 2011
>> New Revision: 221320
>> URL: http://svn.freebsd.org/changeset/base/221320
>>
>> Log:
>> Add -Wmissing-include-dirs to CWARNFLAGS, so tinderbox will punish those
>> developers committing new code with broken include directories.
>
>Bruce already committed r220712 in order to make the current tree work with
>-Wmissing-include-dirs. So hopefully tinderbox will not complain for any ARCH.
>
>Please also note that currently -Wmissing-include-dirs is a noop in clang. Once
>it gets implemented we will hopefully benefit from it via the vendor import.
>
>Thanks again Bruce for taking care! :)
>
>> Fix a few whitespace issues.
>> Improve a couple of comments.
>> -W is now deprecated and is referred to as -Wextra (see gcc(1)).
>>
>> Submitted by: arundel
>>
>> Modified:
>> head/sys/conf/kern.mk
>>
>> Modified: head/sys/conf/kern.mk
>> ==============================================================================
>> --- head/sys/conf/kern.mk Mon May 2 09:47:13 2011 (r221319)
>> +++ head/sys/conf/kern.mk Mon May 2 10:35:27 2011 (r221320)
>> @@ -3,24 +3,25 @@
>> #
>> # Warning flags for compiling the kernel and components of the kernel.
>> #
>> -# Note that the newly added -Wcast-qual is responsible for generating
>> +# Note that the newly added -Wcast-qual is responsible for generating
>> # most of the remaining warnings. Warnings introduced with -Wall will
>> # also pop up, but are easier to fix.
>> CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
>> -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
>> - -Wundef -Wno-pointer-sign -fformat-extensions
>> + -Wundef -Wno-pointer-sign -fformat-extensions \
>> + -Wmissing-include-dirs
>> #
>> # The following flags are next up for working on:
>> -# -W
>> +# -Wextra
>>
>> #
>> -# On the i386, do not align the stack to 16-byte boundaries. Otherwise GCC
>> -# 2.95 adds code to the entry and exit point of every function to align the
>> +# On i386, do not align the stack to 16-byte boundaries. Otherwise GCC 2.95
>> +# and above adds code to the entry and exit point of every function to align the
>> # stack to 16-byte boundaries -- thus wasting approximately 12 bytes of stack
>> -# per function call. While the 16-byte alignment may benefit micro benchmarks,
>> +# per function call. While the 16-byte alignment may benefit micro benchmarks,
>> # it is probably an overall loss as it makes the code bigger (less efficient
>> # use of code cache tag lines) and uses more stack (less efficient use of data
>> -# cache tag lines). Explicitly prohibit the use of SSE and other SIMD
>> +# cache tag lines). Explicitly prohibit the use of FPU, SSE and other SIMD
>> # operations inside the kernel itself. These operations are exclusively
>> # reserved for user applications.
>> #
>> @@ -35,6 +36,7 @@ INLINE_LIMIT?= 8000
>> .if ${MACHINE_CPUARCH} == "arm"
>> INLINE_LIMIT?= 8000
>> .endif
>> +
>> #
>> # For IA-64, we use r13 for the kernel globals pointer and we only use
>> # a very small subset of float registers for integer divides.
>> @@ -98,7 +100,7 @@ INLINE_LIMIT?= 8000
>> CFLAGS+= -ffreestanding
>>
>> #
>> -# GCC SSP support.
>> +# GCC SSP support
>> #
>> .if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
>> ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
>> @@ -106,9 +108,8 @@ CFLAGS+= -fstack-protector
>> .endif
>>
>> #
>> -# Enable CTF conversation on request.
>> +# Enable CTF conversation on request
>> #
>> .if defined(WITH_CTF)
>> .undef NO_CTF
>> .endif
>> -
>
>--
>a13x
>
>
>On 2011-04-29 20:20, Jung-uk Kim wrote:
>...
>> +static __inline void
>> +vmware_hvcall(u_int cmd, u_int *p)
>> +{
>> +
>> + __asm __volatile("inl (%%dx)"
>> + : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3])
>> + : "0" (VMW_HVMAGIC), "1" (UINT_MAX), "2" (cmd), "3" (VMW_HVPORT)
>> + : "memory");
>> +}
>
>This upsets clang's integrated assembler, and I think it's right in this
>case:
>
>sys/x86/x86/tsc.c:103:19: error: invalid operand for instruction
> __asm __volatile("inl (%%dx)"
> ^
><inline asm>:1:6: note: instantiated into assembly here
> inl (%dx)
> ^
>
>Can we please add an explicit %%eax as second argument here? E.g.:
>
>diff --git a/sys/x86/x86/tsc.c b/sys/x86/x86/tsc.c
>index 0b7510c..9638167 100644
>--- a/sys/x86/x86/tsc.c
>+++ b/sys/x86/x86/tsc.c
>@@ -100,7 +100,7 @@ static __inline void
> vmware_hvcall(u_int cmd, u_int *p)
> {
>
>- __asm __volatile("inl (%%dx)"
>+ __asm __volatile("inl (%%dx), %%eax"
> : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3])
> : "0" (VMW_HVMAGIC), "1" (UINT_MAX), "2" (cmd), "3" (VMW_HVPORT)
> : "memory");
>
>
>Author: jhb
>Date: Mon May 2 14:13:12 2011
>New Revision: 221324
>URL: http://svn.freebsd.org/changeset/base/221324
>
>Log:
> Add implementations of BUS_ADJUST_RESOURCE() to the PCI bus driver,
> generic PCI-PCI bridge driver, x86 nexus driver, and x86 Host to PCI bridge
> drivers.
>
>Modified:
> head/sys/amd64/pci/pci_bus.c
> head/sys/dev/acpica/acpi_pcib_acpi.c
> head/sys/dev/pci/pci.c
> head/sys/dev/pci/pci_pci.c
> head/sys/i386/pci/pci_bus.c
> head/sys/x86/x86/mptable_pci.c
> head/sys/x86/x86/nexus.c
>
>Modified: head/sys/amd64/pci/pci_bus.c
>==============================================================================
>--- head/sys/amd64/pci/pci_bus.c Mon May 2 13:58:40 2011 (r221323)
>+++ head/sys/amd64/pci/pci_bus.c Mon May 2 14:13:12 2011 (r221324)
>@@ -348,6 +348,7 @@ static device_method_t legacy_pcib_metho
> DEVMETHOD(bus_read_ivar, legacy_pcib_read_ivar),
> DEVMETHOD(bus_write_ivar, legacy_pcib_write_ivar),
> DEVMETHOD(bus_alloc_resource, legacy_pcib_alloc_resource),
>+ DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource),
> DEVMETHOD(bus_release_resource, bus_generic_release_resource),
> DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
> DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
>
>Modified: head/sys/dev/acpica/acpi_pcib_acpi.c
>==============================================================================
>--- head/sys/dev/acpica/acpi_pcib_acpi.c Mon May 2 13:58:40 2011 (r221323)
>+++ head/sys/dev/acpica/acpi_pcib_acpi.c Mon May 2 14:13:12 2011 (r221324)
>@@ -100,6 +100,7 @@ static device_method_t acpi_pcib_acpi_me
> DEVMETHOD(bus_read_ivar, acpi_pcib_read_ivar),
> DEVMETHOD(bus_write_ivar, acpi_pcib_write_ivar),
> DEVMETHOD(bus_alloc_resource, acpi_pcib_acpi_alloc_resource),
>+ DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource),
> DEVMETHOD(bus_release_resource, bus_generic_release_resource),
> DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
> DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
>
>Modified: head/sys/dev/pci/pci.c
>==============================================================================
>--- head/sys/dev/pci/pci.c Mon May 2 13:58:40 2011 (r221323)
>+++ head/sys/dev/pci/pci.c Mon May 2 14:13:12 2011 (r221324)
>@@ -142,6 +142,7 @@ static device_method_t pci_methods[] = {
> DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource),
> DEVMETHOD(bus_delete_resource, pci_delete_resource),
> DEVMETHOD(bus_alloc_resource, pci_alloc_resource),
>+ DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource),
> DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource),
> DEVMETHOD(bus_activate_resource, pci_activate_resource),
> DEVMETHOD(bus_deactivate_resource, pci_deactivate_resource),
>
>Modified: head/sys/dev/pci/pci_pci.c
>==============================================================================
>--- head/sys/dev/pci/pci_pci.c Mon May 2 13:58:40 2011 (r221323)
>+++ head/sys/dev/pci/pci_pci.c Mon May 2 14:13:12 2011 (r221324)
>@@ -73,6 +73,7 @@ static device_method_t pcib_methods[] =
> DEVMETHOD(bus_read_ivar, pcib_read_ivar),
> DEVMETHOD(bus_write_ivar, pcib_write_ivar),
> DEVMETHOD(bus_alloc_resource, pcib_alloc_resource),
>+ DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource),
> DEVMETHOD(bus_release_resource, bus_generic_release_resource),
> DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
> DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
>
>Modified: head/sys/i386/pci/pci_bus.c
>==============================================================================
>--- head/sys/i386/pci/pci_bus.c Mon May 2 13:58:40 2011 (r221323)
>+++ head/sys/i386/pci/pci_bus.c Mon May 2 14:13:12 2011 (r221324)
>@@ -565,6 +565,7 @@ static device_method_t legacy_pcib_metho
> DEVMETHOD(bus_read_ivar, legacy_pcib_read_ivar),
> DEVMETHOD(bus_write_ivar, legacy_pcib_write_ivar),
> DEVMETHOD(bus_alloc_resource, legacy_pcib_alloc_resource),
>+ DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource),
> DEVMETHOD(bus_release_resource, bus_generic_release_resource),
> DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
> DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
>
>Modified: head/sys/x86/x86/mptable_pci.c
>==============================================================================
>--- head/sys/x86/x86/mptable_pci.c Mon May 2 13:58:40 2011 (r221323)
>+++ head/sys/x86/x86/mptable_pci.c Mon May 2 14:13:12 2011 (r221324)
>@@ -116,6 +116,7 @@ static device_method_t mptable_hostb_met
> DEVMETHOD(bus_read_ivar, legacy_pcib_read_ivar),
> DEVMETHOD(bus_write_ivar, legacy_pcib_write_ivar),
> DEVMETHOD(bus_alloc_resource, legacy_pcib_alloc_resource),
>+ DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource),
> DEVMETHOD(bus_release_resource, bus_generic_release_resource),
> DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
> DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
>
>Modified: head/sys/x86/x86/nexus.c
>==============================================================================
>--- head/sys/x86/x86/nexus.c Mon May 2 13:58:40 2011 (r221323)
>+++ head/sys/x86/x86/nexus.c Mon May 2 14:13:12 2011 (r221324)
>@@ -100,6 +100,8 @@ static device_t nexus_add_child(device_t
> int unit);
> static struct resource *nexus_alloc_resource(device_t, device_t, int, int *,
> u_long, u_long, u_long, u_int);
>+static int nexus_adjust_resource(device_t, device_t, int, struct resource *,
>+ u_long, u_long);
> #ifdef SMP
> static int nexus_bind_intr(device_t, device_t, struct resource *, int);
> #endif
>@@ -144,6 +146,7 @@ static device_method_t nexus_methods[] =
> DEVMETHOD(bus_print_child, nexus_print_child),
> DEVMETHOD(bus_add_child, nexus_add_child),
> DEVMETHOD(bus_alloc_resource, nexus_alloc_resource),
>+ DEVMETHOD(bus_adjust_resource, nexus_adjust_resource),
> DEVMETHOD(bus_release_resource, nexus_release_resource),
> DEVMETHOD(bus_activate_resource, nexus_activate_resource),
> DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource),
>@@ -332,6 +335,23 @@ nexus_add_child(device_t bus, u_int orde
> return(child);
> }
>
>+static struct rman *
>+nexus_rman(int type)
>+{
>+ switch (type) {
>+ case SYS_RES_IRQ:
>+ return (&irq_rman);
>+ case SYS_RES_DRQ:
>+ return (&drq_rman);
>+ case SYS_RES_IOPORT:
>+ return (&port_rman);
>+ case SYS_RES_MEMORY:
>+ return (&mem_rman);
>+ default:
>+ return (NULL);
>+ }
>+}
>+
> /*
> * Allocate a resource on behalf of child. NB: child is usually going to be a
> * child of one of our descendants, not a direct child of nexus0.
>@@ -364,27 +384,9 @@ nexus_alloc_resource(device_t bus, devic
> }
>
> flags &= ~RF_ACTIVE;
>-
>- switch (type) {
>- case SYS_RES_IRQ:
>- rm = &irq_rman;
>- break;
>-
>- case SYS_RES_DRQ:
>- rm = &drq_rman;
>- break;
>-
>- case SYS_RES_IOPORT:
>- rm = &port_rman;
>- break;
>-
>- case SYS_RES_MEMORY:
>- rm = &mem_rman;
>- break;
>-
>- default:
>- return 0;
>- }
>+ rm = nexus_rman(type);
>+ if (rm == NULL)
>+ return (NULL);
>
> rv = rman_reserve_resource(rm, start, end, count, flags, child);
> if (rv == 0)
>@@ -402,6 +404,20 @@ nexus_alloc_resource(device_t bus, devic
> }
>
> static int
>+nexus_adjust_resource(device_t bus, device_t child, int type,
>+ struct resource *r, u_long start, u_long end)
>+{
>+ struct rman *rm;
>+
>+ rm = nexus_rman(type);
>+ if (rm == NULL)
>+ return (ENXIO);
>+ if (!rman_is_region_manager(r, rm))
>+ return (EINVAL);
>+ return (rman_adjust_resource(r, start, end));
>+}
>+
>+static int
> nexus_activate_resource(device_t bus, device_t child, int type, int rid,
> struct resource *r)
> {
>
>
>Author: jhb
>Date: Mon May 2 14:34:03 2011
>New Revision: 221326
>URL: http://svn.freebsd.org/changeset/base/221326
>
>Log:
> Add an entry for the Kuroutoshikou SERIAL4P-LPPCI2 which uses an Oxford
> 4 port chip but with a nonstandard clock.
>
> PR: kern/104212
> Submitted by: Shuichi KITAGUCHI kit of ysnb net
> MFC after: 1 week
>
>Modified:
> head/sys/dev/puc/pucdata.c
>
>Modified: head/sys/dev/puc/pucdata.c
>==============================================================================
>--- head/sys/dev/puc/pucdata.c Mon May 2 14:23:36 2011 (r221325)
>+++ head/sys/dev/puc/pucdata.c Mon May 2 14:34:03 2011 (r221326)
>@@ -638,6 +638,12 @@ const struct puc_cfg puc_pci_devices[] =
> PUC_PORT_4S, 0x10, 0, 8,
> },
>
>+ { 0x1415, 0x9501, 0x14db, 0x2150,
>+ "Kuroutoshikou SERIAL4P-LPPCI2",
>+ DEFAULT_RCLK * 10,
>+ PUC_PORT_4S, 0x10, 0, 8,
>+ },
>+
> { 0x1415, 0x9501, 0xffff, 0,
> "Oxford Semiconductor OX16PCI954 UARTs",
> DEFAULT_RCLK,
>
>
>On Sunday, May 01, 2011 3:05:54 pm Bernhard Schmidt wrote:
>> Author: bschmidt
>> Date: Sun May 1 19:05:54 2011
>> New Revision: 221301
>> URL: http://svn.freebsd.org/changeset/base/221301
>>
>> Log:
>> These are of course i386/amd64 only.
>>
>> Modified:
>> head/sys/conf/NOTES
>
>Please put them in i386/conf/NOTES and amd64/conf/NOTES. All drivers should
>be in appropriate NOTES files.
>
>--
>John Baldwin
>
>
>Author: jhb
>Date: Mon May 2 15:01:28 2011
>New Revision: 221327
>URL: http://svn.freebsd.org/changeset/base/221327
>
>Log:
> Don't explicitly list pci_write_ivar() for bus_write_ivar, the method is
> already inherited from the PCI bus driver.
>
>Modified:
> head/sys/dev/cardbus/cardbus.c
>
>Modified: head/sys/dev/cardbus/cardbus.c
>==============================================================================
>--- head/sys/dev/cardbus/cardbus.c Mon May 2 14:34:03 2011 (r221326)
>+++ head/sys/dev/cardbus/cardbus.c Mon May 2 15:01:28 2011 (r221327)
>@@ -317,7 +317,6 @@ static device_method_t cardbus_methods[]
>
> /* Bus interface */
> DEVMETHOD(bus_read_ivar, cardbus_read_ivar),
>- DEVMETHOD(bus_write_ivar, pci_write_ivar),
> DEVMETHOD(bus_driver_added, cardbus_driver_added),
>
> /* Card Interface */
>
>
>Author: tuexen
>Date: Mon May 2 15:53:00 2011
>New Revision: 221328
>URL: http://svn.freebsd.org/changeset/base/221328
>
>Log:
> Some more cleanups related to an kernel without INET.
>
> MFC after: 1 week
>
>Modified:
> head/sys/netinet/sctputil.c
> head/sys/netinet/sctputil.h
>
>Modified: head/sys/netinet/sctputil.c
>==============================================================================
>--- head/sys/netinet/sctputil.c Mon May 2 15:01:28 2011 (r221327)
>+++ head/sys/netinet/sctputil.c Mon May 2 15:53:00 2011 (r221328)
>@@ -2844,9 +2844,11 @@ sctp_notify_peer_addr_change(struct sctp
> spc->spc_flags = 0;
> spc->spc_length = sizeof(struct sctp_paddr_change);
> switch (sa->sa_family) {
>+#ifdef INET
> case AF_INET:
> memcpy(&spc->spc_aaddr, sa, sizeof(struct sockaddr_in));
> break;
>+#endif
> #ifdef INET6
> case AF_INET6:
> {
>@@ -4084,6 +4086,7 @@ sctp_cmpaddr(struct sockaddr *sa1, struc
> sin6_2));
> }
> #endif
>+#ifdef INET
> case AF_INET:
> {
> /* IPv4 addresses */
>@@ -4093,6 +4096,7 @@ sctp_cmpaddr(struct sockaddr *sa1, struc
> sin_2 = (struct sockaddr_in *)sa2;
> return (sin_1->sin_addr.s_addr == sin_2->sin_addr.s_addr);
> }
>+#endif
> default:
> /* we don't do these... */
> return (0);
>@@ -4122,6 +4126,7 @@ sctp_print_address(struct sockaddr *sa)
> break;
> }
> #endif
>+#ifdef INET
> case AF_INET:
> {
> struct sockaddr_in *sin;
>@@ -4133,6 +4138,7 @@ sctp_print_address(struct sockaddr *sa)
> p[0], p[1], p[2], p[3], ntohs(sin->sin_port));
> break;
> }
>+#endif
> default:
> SCTP_PRINTF("?\n");
> break;
>@@ -4143,6 +4149,7 @@ void
> sctp_print_address_pkt(struct ip *iph, struct sctphdr *sh)
> {
> switch (iph->ip_v) {
>+#ifdef INET
> case IPVERSION:
> {
> struct sockaddr_in lsa, fsa;
>@@ -4163,6 +4170,7 @@ sctp_print_address_pkt(struct ip *iph, s
> sctp_print_address((struct sockaddr *)&fsa);
> break;
> }
>+#endif
> #ifdef INET6
> case IPV6_VERSION >> 4:
> {
>@@ -4862,22 +4870,33 @@ sctp_find_ifa_in_ep(struct sctp_inpcb *i
> uint32_t
> sctp_get_ifa_hash_val(struct sockaddr *addr)
> {
>- if (addr->sa_family == AF_INET) {
>- struct sockaddr_in *sin;
>+ switch (addr->sa_family) {
>+#ifdef INET
>+ case AF_INET:
>+ {
>+ struct sockaddr_in *sin;
>
>- sin = (struct sockaddr_in *)addr;
>- return (sin->sin_addr.s_addr ^ (sin->sin_addr.s_addr >> 16));
>- } else if (addr->sa_family == AF_INET6) {
>- struct sockaddr_in6 *sin6;
>- uint32_t hash_of_addr;
>+ sin = (struct sockaddr_in *)addr;
>+ return (sin->sin_addr.s_addr ^ (sin->sin_addr.s_addr >> 16));
>+ }
>+#endif
>+#ifdef INET6
>+ case INET6:
>+ {
>+ struct sockaddr_in6 *sin6;
>+ uint32_t hash_of_addr;
>
>- sin6 = (struct sockaddr_in6 *)addr;
>- hash_of_addr = (sin6->sin6_addr.s6_addr32[0] +
>- sin6->sin6_addr.s6_addr32[1] +
>- sin6->sin6_addr.s6_addr32[2] +
>- sin6->sin6_addr.s6_addr32[3]);
>- hash_of_addr = (hash_of_addr ^ (hash_of_addr >> 16));
>- return (hash_of_addr);
>+ sin6 = (struct sockaddr_in6 *)addr;
>+ hash_of_addr = (sin6->sin6_addr.s6_addr32[0] +
>+ sin6->sin6_addr.s6_addr32[1] +
>+ sin6->sin6_addr.s6_addr32[2] +
>+ sin6->sin6_addr.s6_addr32[3]);
>+ hash_of_addr = (hash_of_addr ^ (hash_of_addr >> 16));
>+ return (hash_of_addr);
>+ }
>+#endif
>+ default:
>+ break;
> }
> return (0);
> }
>@@ -6250,7 +6269,9 @@ sctp_connectx_helper_add(struct sctp_tcb
> inp = stcb->sctp_ep;
> *error = 0;
> for (i = 0; i < totaddr; i++) {
>- if (sa->sa_family == AF_INET) {
>+ switch (sa->sa_family) {
>+#ifdef INET
>+ case AF_INET:
> incr = sizeof(struct sockaddr_in);
> if (sctp_add_remote_addr(stcb, sa, SCTP_DONOT_SETSCOPE, SCTP_ADDR_IS_CONFIRMED)) {
> /* assoc gone no un-lock */
>@@ -6260,7 +6281,10 @@ sctp_connectx_helper_add(struct sctp_tcb
> goto out_now;
> }
> added++;
>- } else if (sa->sa_family == AF_INET6) {
>+ break;
>+#endif
>+#ifdef INET6
>+ case AF_INET6:
> incr = sizeof(struct sockaddr_in6);
> if (sctp_add_remote_addr(stcb, sa, SCTP_DONOT_SETSCOPE, SCTP_ADDR_IS_CONFIRMED)) {
> /* assoc gone no un-lock */
>@@ -6270,6 +6294,10 @@ sctp_connectx_helper_add(struct sctp_tcb
> goto out_now;
> }
> added++;
>+ break;
>+#endif
>+ default:
>+ break;
> }
> sa = (struct sockaddr *)((caddr_t)sa + incr);
> }
>@@ -6288,10 +6316,13 @@ sctp_connectx_helper_find(struct sctp_in
>
> at = incr = 0;
> sa = addr;
>+
> *error = *num_v6 = *num_v4 = 0;
> /* account and validate addresses */
> for (i = 0; i < (size_t)*totaddr; i++) {
>- if (sa->sa_family == AF_INET) {
>+ switch (sa->sa_family) {
>+#ifdef INET
>+ case AF_INET:
> (*num_v4) += 1;
> incr = sizeof(struct sockaddr_in);
> if (sa->sa_len != incr) {
>@@ -6300,30 +6331,40 @@ sctp_connectx_helper_find(struct sctp_in
> *bad_addr = 1;
> return (NULL);
> }
>- } else if (sa->sa_family == AF_INET6) {
>- struct sockaddr_in6 *sin6;
>-
>- sin6 = (struct sockaddr_in6 *)sa;
>- if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
>- /* Must be non-mapped for connectx */
>- SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTPUTIL, EINVAL);
>- *error = EINVAL;
>- *bad_addr = 1;
>- return (NULL);
>- }
>- (*num_v6) += 1;
>- incr = sizeof(struct sockaddr_in6);
>- if (sa->sa_len != incr) {
>- SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTPUTIL, EINVAL);
>- *error = EINVAL;
>- *bad_addr = 1;
>- return (NULL);
>+ break;
>+#endif
>+#ifdef INET6
>+ case AF_INET6:
>+ {
>+ struct sockaddr_in6 *sin6;
>+
>+ sin6 = (struct sockaddr_in6 *)sa;
>+ if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
>+ /* Must be non-mapped for connectx */
>+ SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTPUTIL, EINVAL);
>+ *error = EINVAL;
>+ *bad_addr = 1;
>+ return (NULL);
>+ }
>+ (*num_v6) += 1;
>+ incr = sizeof(struct sockaddr_in6);
>+ if (sa->sa_len != incr) {
>+ SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTPUTIL, EINVAL);
>+ *error = EINVAL;
>+ *bad_addr = 1;
>+ return (NULL);
>+ }
>+ break;
> }
>- } else {
>+#endif
>+ default:
> *totaddr = i;
> /* we are done */
> break;
> }
>+ if (i == (size_t)*totaddr) {
>+ break;
>+ }
> SCTP_INP_INCR_REF(inp);
> stcb = sctp_findassociation_ep_addr(&inp, sa, NULL, NULL, NULL);
> if (stcb != NULL) {
>@@ -6364,7 +6405,7 @@ sctp_bindx_add_address(struct socket *so
> return;
> }
> addr_touse = sa;
>-#if defined(INET6) && !defined(__Userspace__) /* TODO port in6_sin6_2_sin */
>+#ifdef INET6
> if (sa->sa_family == AF_INET6) {
> struct sockaddr_in6 *sin6;
>
>@@ -6393,6 +6434,7 @@ sctp_bindx_add_address(struct socket *so
> }
> }
> #endif
>+#ifdef INET
> if (sa->sa_family == AF_INET) {
> if (sa->sa_len != sizeof(struct sockaddr_in)) {
> SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTPUTIL, EINVAL);
>@@ -6407,6 +6449,7 @@ sctp_bindx_add_address(struct socket *so
> return;
> }
> }
>+#endif
> if (inp->sctp_flags & SCTP_PCB_FLAGS_UNBOUND) {
> if (p == NULL) {
> /* Can't get proc for Net/Open BSD */
>@@ -6519,6 +6562,7 @@ sctp_bindx_delete_address(struct socket
> }
> }
> #endif
>+#ifdef INET
> if (sa->sa_family == AF_INET) {
> if (sa->sa_len != sizeof(struct sockaddr_in)) {
> SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTPUTIL, EINVAL);
>@@ -6533,6 +6577,7 @@ sctp_bindx_delete_address(struct socket
> return;
> }
> }
>+#endif
> /*
> * No lock required mgmt_ep_sa does its own locking. If the FIX:
> * below is ever changed we may need to lock before calling
>@@ -6599,6 +6644,7 @@ sctp_local_addr_count(struct sctp_tcb *s
> if (sctp_is_addr_restricted(stcb, sctp_ifa))
> continue;
> switch (sctp_ifa->address.sa.sa_family) {
>+#ifdef INET
> case AF_INET:
> if (ipv4_addr_legal) {
> struct sockaddr_in *sin;
>@@ -6621,6 +6667,7 @@ sctp_local_addr_count(struct sctp_tcb *s
> continue;
> }
> break;
>+#endif
> #ifdef INET6
> case AF_INET6:
> if (ipv6_addr_legal) {
>@@ -6715,6 +6762,8 @@ sctp_log_trace(uint32_t subsys, const ch
> }
>
> #endif
>+/* XXX: Remove the #ifdef after tunneling over IPv6 works also on FreeBSD. */
>+#ifdef INET
> /* We will need to add support
> * to bind the ports and such here
> * so we can do UDP tunneling. In
>@@ -6816,7 +6865,7 @@ out:
> m_freem(m);
> }
>
>-void
>+void
> sctp_over_udp_stop(void)
> {
> struct socket *sop;
>@@ -6833,7 +6882,8 @@ sctp_over_udp_stop(void)
> soclose(sop);
> SCTP_BASE_INFO(udp_tun_socket) = NULL;
> }
>-int
>+
>+int
> sctp_over_udp_start(void)
> {
> uint16_t port;
>@@ -6886,3 +6936,5 @@ exit_stage_left:
> */
> return (0);
> }
>+
>+#endif
>
>Modified: head/sys/netinet/sctputil.h
>==============================================================================
>--- head/sys/netinet/sctputil.h Mon May 2 15:01:28 2011 (r221327)
>+++ head/sys/netinet/sctputil.h Mon May 2 15:53:00 2011 (r221328)
>@@ -313,10 +313,14 @@ do { \
> } \
> } while (0)
>
>-/* new functions to start/stop udp tunneling */
>+/* functions to start/stop udp tunneling */
>+/* XXX: Remove the #ifdef after tunneling over IPv6 works also on FreeBSD. */
>+#ifdef INET
> void sctp_over_udp_stop(void);
> int sctp_over_udp_start(void);
>
>+#endif
>+
> int
> sctp_soreceive(struct socket *so, struct sockaddr **psa,
> struct uio *uio,
>
>
>Author: bschmidt
>Date: Mon May 2 16:51:02 2011
>New Revision: 221329
>URL: http://svn.freebsd.org/changeset/base/221329
>
>Log:
> All PCI based wireless drivers seem to be explicitly removed from the
> PAE kernel config, do that also for those added to GENERIC lately.
>
>Modified:
> head/sys/i386/conf/PAE
>
>Modified: head/sys/i386/conf/PAE
>==============================================================================
>--- head/sys/i386/conf/PAE Mon May 2 15:53:00 2011 (r221328)
>+++ head/sys/i386/conf/PAE Mon May 2 16:51:02 2011 (r221329)
>@@ -77,5 +77,11 @@ nodevice ath # Atheros pci/cardbus NIC'
> nodevice ath_pci
> nodevice ath_hal
> nodevice ath_rate_sample # SampleRate tx rate control for ath
>+nodevice ipw
>+nodevice iwi
>+nodevice iwn
>+nodevice malo
>+nodevice mwl
> nodevice ral
> nodevice wi
>+nodevice wpi
>
>
>On Monday 02 May 2011 14:39:57 John Baldwin wrote:
>> On Sunday, May 01, 2011 3:05:54 pm Bernhard Schmidt wrote:
>> > Author: bschmidt
>> > Date: Sun May 1 19:05:54 2011
>> > New Revision: 221301
>> > URL: http://svn.freebsd.org/changeset/base/221301
>> >
>> > Log:
>> > These are of course i386/amd64 only.
>> >
>> > Modified:
>> > head/sys/conf/NOTES
>>
>> Please put them in i386/conf/NOTES and amd64/conf/NOTES. All drivers should
>> be in appropriate NOTES files.
>
>They actually are. My fault was to not check those 2 files in the
>first place.
>
>Sorry the noise this has caused.
>
>--
>Bernhard
>
>
>Author: jkim
>Date: Mon May 2 17:08:36 2011
>New Revision: 221331
>URL: http://svn.freebsd.org/changeset/base/221331
>
>Log:
> Fix build with clang. Please note there is an LLVM/Clang PR:
>
> http://llvm.org/bugs/show_bug.cgi?id=9379
>
> Reported by: rpaulo, dim
>
>Modified:
> head/sys/x86/x86/tsc.c
>
>Modified: head/sys/x86/x86/tsc.c
>==============================================================================
>--- head/sys/x86/x86/tsc.c Mon May 2 17:04:09 2011 (r221330)
>+++ head/sys/x86/x86/tsc.c Mon May 2 17:08:36 2011 (r221331)
>@@ -100,7 +100,7 @@ static __inline void
> vmware_hvcall(u_int cmd, u_int *p)
> {
>
>- __asm __volatile("inl (%%dx)"
>+ __asm __volatile("inl %w3, %0"
> : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3])
> : "0" (VMW_HVMAGIC), "1" (UINT_MAX), "2" (cmd), "3" (VMW_HVPORT)
> : "memory");
>
>
>On Monday 02 May 2011 07:08 am, Dimitry Andric wrote:
>> On 2011-04-29 20:20, Jung-uk Kim wrote:
>> ...
>>
>> > +static __inline void
>> > +vmware_hvcall(u_int cmd, u_int *p)
>> > +{
>> > +
>> > + __asm __volatile("inl (%%dx)"
>> > + : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3])
>> > + : "0" (VMW_HVMAGIC), "1" (UINT_MAX), "2" (cmd), "3"
>> > (VMW_HVPORT) + : "memory");
>> > +}
>>
>> This upsets clang's integrated assembler, and I think it's right in
>> this case:
>>
>> sys/x86/x86/tsc.c:103:19: error: invalid operand for instruction
>> __asm __volatile("inl (%%dx)"
>> ^
>> <inline asm>:1:6: note: instantiated into assembly here
>> inl (%dx)
>> ^
>>
>> Can we please add an explicit %%eax as second argument here? E.g.:
>>
>> diff --git a/sys/x86/x86/tsc.c b/sys/x86/x86/tsc.c
>> index 0b7510c..9638167 100644
>> --- a/sys/x86/x86/tsc.c
>> +++ b/sys/x86/x86/tsc.c
>> @@ -100,7 +100,7 @@ static __inline void
>> vmware_hvcall(u_int cmd, u_int *p)
>> {
>>
>> - __asm __volatile("inl (%%dx)"
>> + __asm __volatile("inl (%%dx), %%eax"
>>
>> : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3])
>> : "0" (VMW_HVMAGIC), "1" (UINT_MAX), "2" (cmd), "3" (VMW_HVPORT)
>> : "memory");
>
>Fixed in r221331.
>
>Sorry for the breakage.
>
>Jung-uk Kim
>
>
>On Monday, May 02, 2011 12:53:22 pm Bernhard Schmidt wrote:
>> On Monday 02 May 2011 14:39:57 John Baldwin wrote:
>> > On Sunday, May 01, 2011 3:05:54 pm Bernhard Schmidt wrote:
>> > > Author: bschmidt
>> > > Date: Sun May 1 19:05:54 2011
>> > > New Revision: 221301
>> > > URL: http://svn.freebsd.org/changeset/base/221301
>> > >
>> > > Log:
>> > > These are of course i386/amd64 only.
>> > >
>> > > Modified:
>> > > head/sys/conf/NOTES
>> >
>> > Please put them in i386/conf/NOTES and amd64/conf/NOTES. All drivers should
>> > be in appropriate NOTES files.
>>
>> They actually are. My fault was to not check those 2 files in the
>> first place.
>>
>> Sorry the noise this has caused.
>
>Ah, whoops. :)
>
>There are many drivers missing from the NOTES files, so I just assumed they
>had been missing. :-P
>
>I wrote a python script to look for missing drivers and options, it's at
>src/tools/tools/notescheck/notescheck.py. I haven't had time to sit down
>and fix all the missing entries though.
>
>--
>John Baldwin
>
>
>Author: dim
>Date: Mon May 2 17:46:59 2011
>New Revision: 221333
>URL: http://svn.freebsd.org/changeset/base/221333
>
>Log:
> Remove usr/include/nfs/krpc.h and usr/include/nfs/nfsdiskless.h from
> ObsoleteFiles.inc, since these files have been reincarnated in the new
> NFS implementation.
>
> Reviewed by: rmacklem
>
>Modified:
> head/ObsoleteFiles.inc
>
>Modified: head/ObsoleteFiles.inc
>==============================================================================
>--- head/ObsoleteFiles.inc Mon May 2 17:13:40 2011 (r221332)
>+++ head/ObsoleteFiles.inc Mon May 2 17:46:59 2011 (r221333)
>@@ -4874,9 +4874,7 @@ OLD_FILES+=usr/include/netns/spidp.h
> OLD_FILES+=usr/include/netns/spp_debug.h
> OLD_FILES+=usr/include/netns/spp_timer.h
> OLD_FILES+=usr/include/netns/spp_var.h
>-OLD_FILES+=usr/include/nfs/krpc.h
> OLD_FILES+=usr/include/nfs/nfs.h
>-OLD_FILES+=usr/include/nfs/nfsdiskless.h
> OLD_FILES+=usr/include/nfs/nfsm_subs.h
> OLD_FILES+=usr/include/nfs/nfsmount.h
> OLD_FILES+=usr/include/nfs/nfsnode.h
>
>
>Author: marcel
>Date: Mon May 2 17:49:05 2011
>New Revision: 221334
>URL: http://svn.freebsd.org/changeset/base/221334
>
>Log:
> Don't use the whole region 5 for KVA, because the CPU may not implement all
> of the 61 bits available within the region for virtual addressing. Since
> there's no good way for us to map out the gap in the virtual address space,
> limit KVA to the architectural minimum implemented address bits. This still
> gives us 1 petabyte of KVA, so no worries.
>
>Modified:
> head/sys/ia64/include/vmparam.h
>
>Modified: head/sys/ia64/include/vmparam.h
>==============================================================================
>--- head/sys/ia64/include/vmparam.h Mon May 2 17:46:59 2011 (r221333)
>+++ head/sys/ia64/include/vmparam.h Mon May 2 17:49:05 2011 (r221334)
>@@ -182,7 +182,8 @@
> #define VM_MIN_ADDRESS 0
> #define VM_MAXUSER_ADDRESS IA64_RR_BASE(IA64_VM_MINKERN_REGION)
> #define VM_MIN_KERNEL_ADDRESS IA64_RR_BASE(IA64_VM_MINKERN_REGION + 1)
>-#define VM_MAX_KERNEL_ADDRESS (IA64_RR_BASE(IA64_VM_MINKERN_REGION + 2) - 1)
>+#define VM_MAX_KERNEL_ADDRESS \
>+ (VM_MIN_KERNEL_ADDRESS + IA64_REGION_GAP_START - 1)
> #define VM_MAX_ADDRESS ~0UL
>
> #define KERNBASE VM_MAXUSER_ADDRESS
>
>
>Author: delphij
>Date: Mon May 2 18:41:54 2011
>New Revision: 221335
>URL: http://svn.freebsd.org/changeset/base/221335
>
>Log:
> Correct a typo. According to Intel document 318914, the Tj(max) for Core 2
> Duo Mobile CPUs should be 105.
>
> Noticed by: Mark Johnston <markjdb gmail.com>
> MFC after: 3 days
>
>Modified:
> head/sys/dev/coretemp/coretemp.c
>
>Modified: head/sys/dev/coretemp/coretemp.c
>==============================================================================
>--- head/sys/dev/coretemp/coretemp.c Mon May 2 17:49:05 2011 (r221334)
>+++ head/sys/dev/coretemp/coretemp.c Mon May 2 18:41:54 2011 (r221335)
>@@ -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;
>
>
>Author: jhb
>Date: Mon May 2 19:02:30 2011
>New Revision: 221336
>URL: http://svn.freebsd.org/changeset/base/221336
>
>Log:
> The ACPI Host-PCI bridge driver actually supports multiple domains via
> the optional _SEG function. Return that value (ap->segment) rather than
> 0 for the pcib domain ivar.
>
>Modified:
> head/sys/dev/acpica/acpi_pcib_acpi.c
>
>Modified: head/sys/dev/acpica/acpi_pcib_acpi.c
>==============================================================================
>--- head/sys/dev/acpica/acpi_pcib_acpi.c Mon May 2 18:41:54 2011 (r221335)
>+++ head/sys/dev/acpica/acpi_pcib_acpi.c Mon May 2 19:02:30 2011 (r221336)
>@@ -268,7 +268,7 @@ acpi_pcib_read_ivar(device_t dev, device
>
> switch (which) {
> case PCIB_IVAR_DOMAIN:
>- *result = 0;
>+ *result = sc->ap_segment;
> return (0);
> case PCIB_IVAR_BUS:
> *result = sc->ap_bus;
>
>
>_______________________________________________
>svn-src-head at freebsd.org mailing list
>http://lists.freebsd.org/mailman/listinfo/svn-src-head
>To unsubscribe, send any mail to "svn-src-head-unsubscribe at freebsd.org"
More information about the svn-src-head
mailing list