[PATCH 2/2] staging: hv: Add autoloading to hv_utils module
in [Kernel]
|
Prev: arm: update gfp/slab.h includes
Next: [PATCH 1/2] staging: hv: Fix race condition in hv_utils module initialization.
From: Haiyang Zhang on 19 May 2010 12:00 From: Haiyang Zhang <haiyangz(a)microsoft.com> Subject: [PATCH 2/2] staging: hv: Add autoloading to hv_utils module Added autoloading based on pci id and dmi strings. Signed-off-by: Haiyang Zhang <haiyangz(a)microsoft.com> Signed-off-by: Hank Janssen <hjanssen(a)microsoft.com> --- drivers/staging/hv/hv_utils.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/drivers/staging/hv/hv_utils.c b/drivers/staging/hv/hv_utils.c index f9826c7..b831a65 100644 --- a/drivers/staging/hv/hv_utils.c +++ b/drivers/staging/hv/hv_utils.c @@ -24,6 +24,8 @@ #include <linux/slab.h> #include <linux/sysctl.h> #include <linux/reboot.h> +#include <linux/dmi.h> +#include <linux/pci.h> #include "logging.h" #include "osd.h" @@ -251,10 +253,37 @@ static void heartbeat_onchannelcallback(void *context) DPRINT_EXIT(VMBUS); } + +static const struct pci_device_id __initconst +hv_utils_pci_table[] __maybe_unused = { + { PCI_DEVICE(0x1414, 0x5353) }, /* Hyper-V emulated VGA controller */ + { 0 } +}; +MODULE_DEVICE_TABLE(pci, hv_utils_pci_table); + + +static const struct dmi_system_id __initconst +hv_utils_dmi_table[] __maybe_unused = { + { + .ident = "Hyper-V", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "Virtual Machine"), + DMI_MATCH(DMI_BOARD_NAME, "Virtual Machine"), + }, + }, + { }, +}; +MODULE_DEVICE_TABLE(dmi, hv_utils_dmi_table); + + static int __init init_hyperv_utils(void) { printk(KERN_INFO "Registering HyperV Utility Driver...\n"); + if (!dmi_check_system(hv_utils_dmi_table)) + return -ENODEV; + /* Wait until all IC channels are initialized */ while (atomic_read(&hv_utils_initcnt) < MAX_MSG_TYPES) msleep(100); -- 1.6.3.2 |