diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2014-09-29 16:31:45 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-29 11:56:01 -0400 |
commit | 4ad96db6ccdd8b777cff5fd4aa74ec1e86f1afce (patch) | |
tree | 1752b434d40b77db0784e17959fab3c3d2227ab1 /drivers/misc/mei/hw-me.h | |
parent | d08b8fc0dbdbe9bf7edeb46f7a856f993630664f (diff) | |
download | linux-4ad96db6ccdd8b777cff5fd4aa74ec1e86f1afce.tar.gz linux-4ad96db6ccdd8b777cff5fd4aa74ec1e86f1afce.tar.bz2 linux-4ad96db6ccdd8b777cff5fd4aa74ec1e86f1afce.zip |
mei: push pci cfg structure me hw
Device specific configurations are currently only needed by me hw
so we can remove it from txe
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/hw-me.h')
-rw-r--r-- | drivers/misc/mei/hw-me.h | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/drivers/misc/mei/hw-me.h b/drivers/misc/mei/hw-me.h index 12b0f4bbe1f1..b0001b3a0fb5 100644 --- a/drivers/misc/mei/hw-me.h +++ b/drivers/misc/mei/hw-me.h @@ -19,14 +19,38 @@ #ifndef _MEI_INTERFACE_H_ #define _MEI_INTERFACE_H_ -#include <linux/mei.h> #include <linux/irqreturn.h> +#include <linux/pci.h> +#include <linux/mei.h> + #include "mei_dev.h" #include "client.h" +/* + * mei_cfg - mei device configuration + * + * @fw_status: FW status + * @quirk_probe: device exclusion quirk + */ +struct mei_cfg { + const struct mei_fw_status fw_status; + bool (*quirk_probe)(struct pci_dev *pdev); +}; + + +#define MEI_PCI_DEVICE(dev, cfg) \ + .vendor = PCI_VENDOR_ID_INTEL, .device = (dev), \ + .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, \ + .driver_data = (kernel_ulong_t)&(cfg) + + #define MEI_ME_RPM_TIMEOUT 500 /* ms */ +/** + * @cfg: per device generation config and ops + */ struct mei_me_hw { + const struct mei_cfg *cfg; void __iomem *mem_addr; /* * hw states of host and fw(ME) |