Date: Fri, 28 Jun 2013 00:29:08 +0000 (UTC) From: Peter Grehan <grehan@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r252321 - in vendor/hyperv/dist/sys: dev/hyperv/stordisengage dev/hyperv/storvsc dev/hyperv/vmbus modules/hyperv modules/hyperv/stordisengage Message-ID: <201306280029.r5S0T8Pt036728@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: grehan Date: Fri Jun 28 00:29:07 2013 New Revision: 252321 URL: http://svnweb.freebsd.org/changeset/base/252321 Log: Import Microsoft HyperV driver update From https://github.com/FreeBSDonHyper-V/VendorBranchForFreeBSDonHyper-V rev: 3c707c73520adbd6d1f4ff009826dbbfb0c2dc4d Added: vendor/hyperv/dist/sys/dev/hyperv/stordisengage/ vendor/hyperv/dist/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c vendor/hyperv/dist/sys/modules/hyperv/stordisengage/ vendor/hyperv/dist/sys/modules/hyperv/stordisengage/Makefile Modified: vendor/hyperv/dist/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c vendor/hyperv/dist/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c vendor/hyperv/dist/sys/modules/hyperv/Makefile Added: vendor/hyperv/dist/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/hyperv/dist/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c Fri Jun 28 00:29:07 2013 (r252321) @@ -0,0 +1,194 @@ +/*- + * Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org> + * 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, + * without modification, immediately at the beginning of the file. + * 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 ``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 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. + */ +/*- + * Copyright (c) 2009-2013 Microsoft Corp. + * Copyright (c) 2012 NetApp Inc. + * Copyright (c) 2012 Citrix Inc. + * 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 unmodified, 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 ``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 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 <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/module.h> +#include <sys/ata.h> +#include <sys/bus.h> +#include <sys/conf.h> +#include <sys/malloc.h> +#include <sys/sema.h> +#include <sys/taskqueue.h> +#include <vm/uma.h> +#include <machine/stdarg.h> +#include <machine/resource.h> +#include <machine/bus.h> +#include <sys/rman.h> +#include <dev/pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/ata/ata-all.h> +#include <dev/ata/ata-pci.h> +#include <ata_if.h> + +#define HV_X64_MSR_GUEST_OS_ID 0x40000000 +#define HV_X64_CPUID_MIN 0x40000005 +#define HV_X64_CPUID_MAX 0x4000ffff + +/* prototypes */ +static int hv_ata_pci_probe(device_t dev); +static int hv_ata_pci_attach(device_t dev); +static int hv_ata_pci_detach(device_t dev); + +static int hv_check_for_hyper_v(void); + +/* + * generic PCI ATA device probe + */ +static int +hv_ata_pci_probe(device_t dev) +{ + int ata_disk_enable = 0; + if(bootverbose) + device_printf(dev, + "hv_ata_pci_probe dev_class/subslcass = %d, %d\n", + pci_get_class(dev), pci_get_subclass(dev)); + + /* is this a storage class device ? */ + if (pci_get_class(dev) != PCIC_STORAGE) + return (ENXIO); + + /* is this an IDE/ATA type device ? */ + if (pci_get_subclass(dev) != PCIS_STORAGE_IDE) + return (ENXIO); + + if(bootverbose) + device_printf(dev, + "Hyper-V probe for disabling ATA-PCI, emulated driver\n"); + + /* + * On Hyper-V the default is to use the enlightened driver for + * IDE disks. However, if the user wishes to use the native + * ATA driver, the environment variable + * hw_ata.disk_enable must be explicitly set to 1. + */ + if (hv_check_for_hyper_v()) { + if (getenv_int("hw.ata.disk_enable", &ata_disk_enable)) { + if(bootverbose) + device_printf(dev, + "hw.ata.disk_enable flag is disabling Hyper-V" + " ATA driver support\n"); + return (ENXIO); + } + + } + + if(bootverbose) + device_printf(dev, "Hyper-V ATA storage driver enabled.\n"); + + return (BUS_PROBE_VENDOR); +} + +static int +hv_ata_pci_attach(device_t dev) +{ + return 0; +} + +static int +hv_ata_pci_detach(device_t dev) +{ + return 0; +} + +/** +* Detect Hyper-V and enable fast IDE +* via enlighted storage driver +*/ +static int +hv_check_for_hyper_v(void) +{ + u_int regs[4]; + int hyper_v_detected = 0; + do_cpuid(1, regs); + if (regs[2] & 0x80000000) { + /* if(a hypervisor is detected) */ + /* make sure this really is Hyper-V */ + /* we look at the CPUID info */ + do_cpuid(HV_X64_MSR_GUEST_OS_ID, regs); + hyper_v_detected = + regs[0] >= HV_X64_CPUID_MIN && + regs[0] <= HV_X64_CPUID_MAX && + !memcmp("Microsoft Hv", ®s[1], 12); + } + return (hyper_v_detected); +} + +static device_method_t hv_ata_pci_methods[] = { + /* device interface */ + DEVMETHOD(device_probe, hv_ata_pci_probe), + DEVMETHOD(device_attach, hv_ata_pci_attach), + DEVMETHOD(device_detach, hv_ata_pci_detach), + DEVMETHOD(device_shutdown, bus_generic_shutdown), + + DEVMETHOD_END +}; + +devclass_t hv_ata_pci_devclass; + +static driver_t hv_ata_pci_disengage_driver = { + "pciata-disable", + hv_ata_pci_methods, + sizeof(struct ata_pci_controller), +}; + +DRIVER_MODULE(atapci_dis, pci, hv_ata_pci_disengage_driver, + hv_ata_pci_devclass, NULL, NULL); +MODULE_VERSION(atapci_dis, 1); +MODULE_DEPEND(atapci_dis, ata, 1, 1, 1); + + Modified: vendor/hyperv/dist/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c ============================================================================== --- vendor/hyperv/dist/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c Thu Jun 27 22:26:56 2013 (r252320) +++ vendor/hyperv/dist/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c Fri Jun 28 00:29:07 2013 (r252321) @@ -194,7 +194,7 @@ static device_method_t storvsc_methods[] DEVMETHOD(device_attach, storvsc_attach), DEVMETHOD(device_detach, storvsc_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static driver_t storvsc_driver = { @@ -203,10 +203,9 @@ static driver_t storvsc_driver = { static devclass_t storvsc_devclass; DRIVER_MODULE(storvsc, vmbus, storvsc_driver, storvsc_devclass, 0, 0); -MODULE_VERSION(storvsc,1); +MODULE_VERSION(storvsc, 1); MODULE_DEPEND(storvsc, vmbus, 1, 1, 1); -extern int ata_disk_enable; /** * The host is capable of sending messages to us that are @@ -759,15 +758,24 @@ scan_for_luns(struct storvsc_softc *sc) static int storvsc_probe(device_t dev) { + int ata_disk_enable = 0; int ret = ENXIO; switch (storvsc_get_storage_type(dev)) { case DRIVER_BLKVSC: - if (ata_disk_enable == 0) { - ret = 0; - } + if(bootverbose) + device_printf(dev, "DRIVER_BLKVSC-Emulated ATA/IDE probe\n"); + if (!getenv_int("hw.ata.disk_enable", &ata_disk_enable)) { + if(bootverbose) + device_printf(dev, + "Enlightened ATA/IDE detected\n"); + ret = 0; + } else if(bootverbose) + device_printf(dev, "Emulated ATA/IDE set (hw.ata.disk_enable set)\n"); break; case DRIVER_STORVSC: + if(bootverbose) + device_printf(dev, "Enlightened SCSI device detected\n"); ret = 0; break; default: Modified: vendor/hyperv/dist/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c ============================================================================== --- vendor/hyperv/dist/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c Thu Jun 27 22:26:56 2013 (r252320) +++ vendor/hyperv/dist/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c Fri Jun 28 00:29:07 2013 (r252321) @@ -354,7 +354,7 @@ vmbus_bus_init(void) if (ret) { if(bootverbose) - printf("Error VMBUS: Hypervisor Initialization Failed!\n"); + printf("Error VMBUS: Hypervisor Initialization Failed!\n"); return (ret); } Modified: vendor/hyperv/dist/sys/modules/hyperv/Makefile ============================================================================== --- vendor/hyperv/dist/sys/modules/hyperv/Makefile Thu Jun 27 22:26:56 2013 (r252320) +++ vendor/hyperv/dist/sys/modules/hyperv/Makefile Fri Jun 28 00:29:07 2013 (r252321) @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR = vmbus netvsc storvsc utilities +SUBDIR = vmbus netvsc stordisengage storvsc utilities .include <bsd.subdir.mk> Added: vendor/hyperv/dist/sys/modules/hyperv/stordisengage/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/hyperv/dist/sys/modules/hyperv/stordisengage/Makefile Fri Jun 28 00:29:07 2013 (r252321) @@ -0,0 +1,9 @@ +#$FreeBSD$ + +.PATH: ${.CURDIR}/../../../dev/hyperv/stordisengage + +KMOD= hv_ata_pci_disengage + +SRCS = hv_ata_pci_disengage.c + +.include <bsd.kmod.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306280029.r5S0T8Pt036728>