diff options
Diffstat (limited to 'drivers/staging/mei/mei_dev.h')
| -rw-r--r-- | drivers/staging/mei/mei_dev.h | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/drivers/staging/mei/mei_dev.h b/drivers/staging/mei/mei_dev.h index d7bc10c..af4b1af 100644 --- a/drivers/staging/mei/mei_dev.h +++ b/drivers/staging/mei/mei_dev.h @@ -18,6 +18,7 @@ #define _MEI_DEV_H_ #include <linux/types.h> +#include <linux/watchdog.h> #include "mei.h" #include "hw.h" @@ -37,6 +38,17 @@ #define MEI_WD_STATE_INDEPENDENCE_MSG_SENT (1 << 0) /* + * MEI PCI Device object + */ +extern struct pci_dev *mei_device; + +/* + * AMT Watchdog Device + */ +#define INTEL_AMT_WATCHDOG_ID "INTCAMT" +extern struct watchdog_device amt_wd_dev; + +/* * AMTHI Client UUID */ extern const uuid_le mei_amthi_guid; @@ -197,7 +209,7 @@ struct mei_device { * lock for the device */ struct mutex device_lock; /* device lock */ - struct delayed_work wd_work; /* watch dog deleye work */ + struct delayed_work timer_work; /* MEI timer delayed work (timeouts) */ bool recvd_msg; /* * hw states of host and fw(ME) @@ -258,6 +270,8 @@ struct mei_device { bool iamthif_flow_control_pending; bool iamthif_ioctl; bool iamthif_canceled; + + bool wd_interface_reg; }; @@ -315,14 +329,14 @@ static inline bool mei_cl_cmp_id(const struct mei_cl *cl1, */ void mei_host_start_message(struct mei_device *dev); void mei_host_enum_clients_message(struct mei_device *dev); -void mei_host_client_properties(struct mei_device *dev); +int mei_host_client_properties(struct mei_device *dev); /* * MEI interrupt functions prototype */ irqreturn_t mei_interrupt_quick_handler(int irq, void *dev_id); irqreturn_t mei_interrupt_thread_handler(int irq, void *dev_id); -void mei_wd_timer(struct work_struct *work); +void mei_timer(struct work_struct *work); /* * MEI input output function prototype @@ -356,7 +370,7 @@ int mei_find_me_client_index(const struct mei_device *dev, uuid_le cuuid); * @dev: the device structure * @offset: offset from which to read the data * - * returns the byte read. + * returns register value (u32) */ static inline u32 mei_reg_read(struct mei_device *dev, unsigned long offset) { @@ -368,7 +382,7 @@ static inline u32 mei_reg_read(struct mei_device *dev, unsigned long offset) * * @dev: the device structure * @offset: offset from which to write the data - * @value: the byte to write + * @value: register value to write (u32) */ static inline void mei_reg_write(struct mei_device *dev, unsigned long offset, u32 value) |
