[Midnightbsd-cvs] src: sys/kern: Merge several changes from FreeBSD 7-stable.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Nov 26 22:39:47 EST 2011


Log Message:
-----------
Merge several changes from FreeBSD 7-stable.

Introduce virtualization detection.  The kernel knows if it's running with VMWar
e, VirtualBox, Parallels, etc and changes the hz level as well as disables MSI a
s appropriate.  We will need to drop the loader support for part of this once it
's tested further. This is more general and allows us to make more changes for s
pecail hardware emulation.

Update alc(4), bge(4), mii(4) and cardbus as well as pci.  This fixes several pr
oblems with various devices, particularly alc(4) which often had difficulty dete
cting cables were plugged in and DHCP. bge(4) gains support for several newer ch
ips and disables UDP offloading for stability reasons.

We also had to hack zfs so that the kernel memmove can be used now rather than t
he macro bcopy hack.

Modified Files:
--------------
    src/sys/kern:
        subr_param.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/kern/subr_param.c?r1=1.2&r2=1.3)
    src/sys/dev/alc:
        if_alc.c (r1.11 -> r1.12)
        (http://cvsweb.midnightbsd.org/src/sys/dev/alc/if_alc.c?r1=1.11&r2=1.12)
        if_alcvar.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/alc/if_alcvar.h?r1=1.2&r2=1.3)
    src/sys/dev/bge:
        if_bge.c (r1.5 -> r1.6)
        (http://cvsweb.midnightbsd.org/src/sys/dev/bge/if_bge.c?r1=1.5&r2=1.6)
        if_bgereg.h (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/dev/bge/if_bgereg.h?r1=1.4&r2=1.5)
    src/sys/dev/cardbus:
        cardbus.c (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/dev/cardbus/cardbus.c?r1=1.4&r2=1.5)
        cardbus_cis.c (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/dev/cardbus/cardbus_cis.c?r1=1.4&r2=1.5)
        cardbus_cis.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/cardbus/cardbus_cis.h?r1=1.2&r2=1.3)
        cardbus_device.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/cardbus/cardbus_device.c?r1=1.3&r2=1.4)
        cardbusreg.h (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/dev/cardbus/cardbusreg.h?r1=1.4&r2=1.5)
        cardbusvar.h (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/dev/cardbus/cardbusvar.h?r1=1.4&r2=1.5)
    src/sys/dev/mii:
        acphy.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/acphy.c?r1=1.2&r2=1.3)
        acphyreg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/acphyreg.h?r1=1.2&r2=1.3)
        amphy.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/amphy.c?r1=1.2&r2=1.3)
        amphyreg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/amphyreg.h?r1=1.2&r2=1.3)
        atphy.c (r1.1 -> r1.2)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/atphy.c?r1=1.1&r2=1.2)
        atphyreg.h (r1.1 -> r1.2)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/atphyreg.h?r1=1.1&r2=1.2)
        bmtphy.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/bmtphy.c?r1=1.2&r2=1.3)
        bmtphyreg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/bmtphyreg.h?r1=1.2&r2=1.3)
        brgphy.c (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/brgphy.c?r1=1.4&r2=1.5)
        brgphyreg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/brgphyreg.h?r1=1.2&r2=1.3)
        ciphy.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/ciphy.c?r1=1.2&r2=1.3)
        ciphyreg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/ciphyreg.h?r1=1.2&r2=1.3)
        e1000phy.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/e1000phy.c?r1=1.2&r2=1.3)
        e1000phyreg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/e1000phyreg.h?r1=1.2&r2=1.3)
        exphy.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/exphy.c?r1=1.2&r2=1.3)
        gentbi.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/gentbi.c?r1=1.2&r2=1.3)
        icsphy.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/icsphy.c?r1=1.2&r2=1.3)
        icsphyreg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/icsphyreg.h?r1=1.2&r2=1.3)
        inphy.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/inphy.c?r1=1.2&r2=1.3)
        inphyreg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/inphyreg.h?r1=1.2&r2=1.3)
        ip1000phy.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/ip1000phy.c?r1=1.2&r2=1.3)
        ip1000phyreg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/ip1000phyreg.h?r1=1.2&r2=1.3)
        jmphy.c (r1.1 -> r1.2)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/jmphy.c?r1=1.1&r2=1.2)
        jmphyreg.h (r1.1 -> r1.2)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/jmphyreg.h?r1=1.1&r2=1.2)
        lxtphy.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/lxtphy.c?r1=1.2&r2=1.3)
        lxtphyreg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/lxtphyreg.h?r1=1.2&r2=1.3)
        mii.c (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/mii.c?r1=1.4&r2=1.5)
        mii.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/mii.h?r1=1.2&r2=1.3)
        mii_physubr.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/mii_physubr.c?r1=1.2&r2=1.3)
        miibus_if.m (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/miibus_if.m?r1=1.2&r2=1.3)
        miidevs (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/miidevs?r1=1.4&r2=1.5)
        miivar.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/miivar.h?r1=1.2&r2=1.3)
        mlphy.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/mlphy.c?r1=1.2&r2=1.3)
        nsgphy.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/nsgphy.c?r1=1.2&r2=1.3)
        nsgphyreg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/nsgphyreg.h?r1=1.2&r2=1.3)
        nsphy.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/nsphy.c?r1=1.2&r2=1.3)
        nsphyreg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/nsphyreg.h?r1=1.2&r2=1.3)
        nsphyter.c (r1.1 -> r1.2)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/nsphyter.c?r1=1.1&r2=1.2)
        nsphyterreg.h (r1.1 -> r1.2)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/nsphyterreg.h?r1=1.1&r2=1.2)
        pnaphy.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/pnaphy.c?r1=1.2&r2=1.3)
        qsphy.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/qsphy.c?r1=1.2&r2=1.3)
        qsphyreg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/qsphyreg.h?r1=1.2&r2=1.3)
        rgephy.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/rgephy.c?r1=1.2&r2=1.3)
        rgephyreg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/rgephyreg.h?r1=1.2&r2=1.3)
        rlphy.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/rlphy.c?r1=1.2&r2=1.3)
        rlswitch.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/rlswitch.c?r1=1.2&r2=1.3)
        ruephy.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/ruephy.c?r1=1.2&r2=1.3)
        ruephyreg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/ruephyreg.h?r1=1.2&r2=1.3)
        tdkphy.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/tdkphy.c?r1=1.2&r2=1.3)
        tdkphyreg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/tdkphyreg.h?r1=1.2&r2=1.3)
        tlphy.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/tlphy.c?r1=1.2&r2=1.3)
        tlphyreg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/tlphyreg.h?r1=1.2&r2=1.3)
        truephy.c (r1.1 -> r1.2)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/truephy.c?r1=1.1&r2=1.2)
        truephyreg.h (r1.1 -> r1.2)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/truephyreg.h?r1=1.1&r2=1.2)
        ukphy.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/ukphy.c?r1=1.2&r2=1.3)
        ukphy_subr.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/ukphy_subr.c?r1=1.2&r2=1.3)
        xmphy.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/xmphy.c?r1=1.2&r2=1.3)
        xmphyreg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/xmphyreg.h?r1=1.2&r2=1.3)
    src/sys/dev/pci:
        pci.c (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/dev/pci/pci.c?r1=1.4&r2=1.5)
        pci_pci.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/pci/pci_pci.c?r1=1.3&r2=1.4)
        pci_private.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/pci/pci_private.h?r1=1.2&r2=1.3)
        pci_user.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/pci/pci_user.c?r1=1.2&r2=1.3)
        pcib_private.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/pci/pcib_private.h?r1=1.2&r2=1.3)
        pcireg.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/pci/pcireg.h?r1=1.3&r2=1.4)
        pcivar.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/pci/pcivar.h?r1=1.3&r2=1.4)
        vga_pci.c (r1.1 -> r1.2)
        (http://cvsweb.midnightbsd.org/src/sys/dev/pci/vga_pci.c?r1=1.1&r2=1.2)
    src/sys/cddl/compat/opensolaris/sys:
        sysmacros.h (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/cddl/compat/opensolaris/sys/sysmacros.h?r1=1.4&r2=1.5)
    src/sys/cddl/contrib/opensolaris/uts/common/os:
        callb.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/cddl/contrib/opensolaris/uts/common/os/callb.c?r1=1.2&r2=1.3)

Added Files:
-----------
    src/sys/dev/mii:
        mii_bitbang.c (r1.1)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/mii_bitbang.c?rev=1.1&content-type=text/x-cvsweb-markup)
        mii_bitbang.h (r1.1)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/mii_bitbang.h?rev=1.1&content-type=text/x-cvsweb-markup)
        rdcphy.c (r1.1)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/rdcphy.c?rev=1.1&content-type=text/x-cvsweb-markup)
        rdcphyreg.h (r1.1)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/rdcphyreg.h?rev=1.1&content-type=text/x-cvsweb-markup)


More information about the Midnightbsd-cvs mailing list