Attachment 200058 Details for Bug 233960 – VMD Driver Patch

[patch] VMD Driver Patch

vmd.diff (text/plain), 4.43 KB, created by David Fugate on 2018-12-12 17:01:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Fugate

Created: 2018-12-12 17:01:51 UTC

Size: 4.43 KB

patch

obsolete

>diff -u -r -N src_old/sys/amd64/conf/GENERIC src_new/sys/amd64/conf/GENERIC
>--- src_old/sys/amd64/conf/GENERIC	2018-12-12 09:37:46.281613000 -0700
>+++ src_new/sys/amd64/conf/GENERIC	2018-12-12 09:48:14.604660000 -0700
>@@ -189,6 +189,9 @@
> device		nvme			# base NVMe driver
> device		nvd			# expose NVMe namespaces as disks, depends on nvme
> 
>+# Volume Management Device (VMD) support
>+device		vmd			# Currently unsupported platform pcie device
>+
> # atkbdc0 controls both the keyboard and the PS/2 mouse
> device		atkbdc			# AT keyboard controller
> device		atkbd			# AT keyboard
>diff -u -r -N src_old/sys/conf/files.amd64 src_new/sys/conf/files.amd64
>--- src_old/sys/conf/files.amd64	2018-12-12 09:39:02.246168000 -0700
>+++ src_new/sys/conf/files.amd64	2018-12-12 09:48:28.892267000 -0700
>@@ -362,6 +362,7 @@
> dev/nvme/nvme_sysctl.c		optional	nvme
> dev/nvme/nvme_test.c		optional	nvme
> dev/nvme/nvme_util.c		optional	nvme
>+dev/vmd/vmd.c			optional	vmd
> dev/nvram/nvram.c		optional	nvram isa
> dev/random/ivy.c		optional	rdrand_rng
> dev/random/nehemiah.c		optional	padlock_rng
>diff -u -r -N src_old/sys/dev/vmd/vmd.c src_new/sys/dev/vmd/vmd.c
>--- src_old/sys/dev/vmd/vmd.c	1969-12-31 17:00:00.000000000 -0700
>+++ src_new/sys/dev/vmd/vmd.c	2018-12-12 09:48:46.608957000 -0700
>@@ -0,0 +1,66 @@
>+/*-
>+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
>+ *
>+ * Copyright (C) 2018 Intel Corporation
>+ * 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.
>+ */
>+
>+#include <sys/cdefs.h>
>+__FBSDID("$FreeBSD$");
>+
>+#include <sys/types.h>
>+#include <sys/param.h>
>+#include <sys/bus.h>
>+#include <sys/conf.h>
>+#include <sys/kernel.h>
>+#include <sys/module.h>
>+#include <sys/systm.h>
>+
>+#include <dev/pci/pcireg.h>
>+#include <dev/pci/pcivar.h>
>+
>+#include <machine/bus.h>
>+
>+
>+static int
>+vmd_probe(device_t dev)
>+{
>+	uint16_t devid = pci_get_device(dev);
>+	if (pci_get_vendor(dev) == 0x8086 && (devid == 0x201d || devid == 0x28c0)) {
>+		device_printf(dev, "Unsupported Volume Management Device (VMD) controller enabled.\n");
>+		printf("Please disable VMD/VROC in BIOS to see all PCI devices.\n");
>+	}
>+	return (ENXIO);
>+}
>+
>+static device_method_t vmd_pci_methods[] = {
>+	/* Device interface */
>+	DEVMETHOD(device_probe,     vmd_probe),
>+	DEVMETHOD_END
>+};
>+
>+static devclass_t vmd_devclass;
>+
>+DEFINE_CLASS_0(vmd, vmd_pci_driver, vmd_pci_methods, 0);
>+DRIVER_MODULE(vmd, pci, vmd_pci_driver, vmd_devclass, 0, 0);
>diff -u -r -N src_old/sys/modules/Makefile src_new/sys/modules/Makefile
>--- src_old/sys/modules/Makefile	2018-12-12 09:43:43.035370000 -0700
>+++ src_new/sys/modules/Makefile	2018-12-12 09:49:01.892105000 -0700
>@@ -385,6 +385,7 @@
> 	${_viawd} \
> 	videomode \
> 	vkbd \
>+	${_vmd} \
> 	${_vmm} \
> 	${_vmware} \
> 	${_vpo} \
>@@ -735,6 +736,7 @@
> _sgx=		sgx
> _sgx_linux=	sgx_linux
> _smartpqi=	smartpqi
>+_vmd=		vmd
> 
> .if ${MK_BHYVE} != "no" || defined(ALL_MODULES)
> _vmm=		vmm
>diff -u -r -N src_old/sys/modules/vmd/Makefile src_new/sys/modules/vmd/Makefile
>--- src_old/sys/modules/vmd/Makefile	1969-12-31 17:00:00.000000000 -0700
>+++ src_new/sys/modules/vmd/Makefile	2018-12-12 09:49:14.276759000 -0700
>@@ -0,0 +1,13 @@
>+# $FreeBSD$
>+
>+.PATH: ${SRCTOP}/sys/dev/vmd
>+
>+KMOD=	vmd
>+
>+SRCS=	vmd.c		\
>+			\
>+	bus_if.h	\
>+	device_if.h	\
>+	pci_if.h
>+
>+.include <bsd.kmod.mk>

Actions: View | Diff

Attachments on bug 233960: 200058