Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mei: move mei-me to separate module

mei layer provides host bus message layer, client management,
and os interface

mei-me - provides access to ME hardware through
the pci bus

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Tomas Winkler and committed by
Greg Kroah-Hartman
40e0b67b b68301e9

+19 -7
+2 -3
drivers/misc/mei/Kconfig
··· 10 10 <http://software.intel.com/en-us/manageability/> 11 11 12 12 config INTEL_MEI_ME 13 - bool "ME Enabled Intel Chipsets" 14 - depends on INTEL_MEI 13 + tristate "ME Enabled Intel Chipsets" 14 + select INTEL_MEI 15 15 depends on X86 && PCI && WATCHDOG_CORE 16 - default y 17 16 help 18 17 MEI support for ME Enabled Intel chipsets. 19 18
+4 -2
drivers/misc/mei/Makefile
··· 10 10 mei-objs += main.o 11 11 mei-objs += amthif.o 12 12 mei-objs += wd.o 13 - mei-$(CONFIG_INTEL_MEI_ME) += pci-me.o 14 - mei-$(CONFIG_INTEL_MEI_ME) += hw-me.o 13 + 14 + obj-$(CONFIG_INTEL_MEI_ME) += mei-me.o 15 + mei-me-objs := pci-me.o 16 + mei-me-objs += hw-me.o
+5 -2
drivers/misc/mei/init.c
··· 14 14 * 15 15 */ 16 16 17 + #include <linux/export.h> 17 18 #include <linux/pci.h> 18 19 #include <linux/sched.h> 19 20 #include <linux/wait.h> ··· 68 67 mei_io_list_init(&dev->amthif_rd_complete_list); 69 68 70 69 } 70 + EXPORT_SYMBOL_GPL(mei_device_init); 71 71 72 72 /** 73 73 * mei_start - initializes host and fw to start work. ··· 138 136 mutex_unlock(&dev->device_lock); 139 137 return -ENODEV; 140 138 } 139 + EXPORT_SYMBOL_GPL(mei_start); 141 140 142 141 /** 143 142 * mei_reset - resets host and fw. ··· 206 203 /* remove all waiting requests */ 207 204 mei_cl_all_write_clear(dev); 208 205 } 206 + EXPORT_SYMBOL_GPL(mei_reset); 209 207 210 208 void mei_stop(struct mei_device *dev) 211 209 { ··· 226 222 flush_scheduled_work(); 227 223 228 224 mei_watchdog_unregister(dev); 229 - 230 225 } 231 - 226 + EXPORT_SYMBOL_GPL(mei_stop); 232 227 233 228 234 229
+4
drivers/misc/mei/interrupt.c
··· 15 15 */ 16 16 17 17 18 + #include <linux/export.h> 18 19 #include <linux/pci.h> 19 20 #include <linux/kthread.h> 20 21 #include <linux/interrupt.h> ··· 79 78 mei_cl_complete_handler(cl, cb); 80 79 } 81 80 } 81 + EXPORT_SYMBOL_GPL(mei_irq_compl_handler); 82 82 /** 83 83 * _mei_irq_thread_state_ok - checks if mei header matches file private data 84 84 * ··· 442 440 end: 443 441 return ret; 444 442 } 443 + EXPORT_SYMBOL_GPL(mei_irq_read_handler); 445 444 446 445 447 446 /** ··· 593 590 } 594 591 return 0; 595 592 } 593 + EXPORT_SYMBOL_GPL(mei_irq_write_handler); 596 594 597 595 598 596
+4
drivers/misc/mei/main.c
··· 758 758 mei_misc_device.parent = dev; 759 759 return misc_register(&mei_misc_device); 760 760 } 761 + EXPORT_SYMBOL_GPL(mei_register); 761 762 762 763 void mei_deregister(void) 763 764 { 764 765 misc_deregister(&mei_misc_device); 765 766 mei_misc_device.parent = NULL; 766 767 } 768 + EXPORT_SYMBOL_GPL(mei_deregister); 767 769 770 + MODULE_AUTHOR("Intel Corporation"); 771 + MODULE_DESCRIPTION("Intel(R) Management Engine Interface"); 768 772 MODULE_LICENSE("GPL v2"); 769 773