summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2013-01-08 23:07:12 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-08 16:40:44 -0800
commit0edb23fc3451c84350edcc999c023d225a49530d (patch)
tree70b4c4d9adf73c330c825707f11311a83d8e8ec7
parent20259849bb1ac1ffb0156eb359810e8b99cb644d (diff)
mei: add new hbm.h header to export hbm protocol
hbm.h provides access host bus messaging functionality for other MEI layers Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/misc/mei/amthif.c1
-rw-r--r--drivers/misc/mei/hbm.c1
-rw-r--r--drivers/misc/mei/hbm.h39
-rw-r--r--drivers/misc/mei/init.c1
-rw-r--r--drivers/misc/mei/interface.h7
-rw-r--r--drivers/misc/mei/interrupt.c1
-rw-r--r--drivers/misc/mei/iorw.c1
-rw-r--r--drivers/misc/mei/mei_dev.h10
-rw-r--r--drivers/misc/mei/wd.c1
9 files changed, 47 insertions, 15 deletions
diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c
index 6e3cd31eae3b..add4254eb850 100644
--- a/drivers/misc/mei/amthif.c
+++ b/drivers/misc/mei/amthif.c
@@ -34,6 +34,7 @@
#include <linux/mei.h>
#include "mei_dev.h"
+#include "hbm.h"
#include "interface.h"
const uuid_le mei_amthi_guid = UUID_LE(0x12f80028, 0xb4b7, 0x4b2d, 0xac,
diff --git a/drivers/misc/mei/hbm.c b/drivers/misc/mei/hbm.c
index 6b58b0a10378..9956aaf58aa4 100644
--- a/drivers/misc/mei/hbm.c
+++ b/drivers/misc/mei/hbm.c
@@ -20,6 +20,7 @@
#include <linux/mei.h>
#include "mei_dev.h"
+#include "hbm.h"
#include "interface.h"
/**
diff --git a/drivers/misc/mei/hbm.h b/drivers/misc/mei/hbm.h
new file mode 100644
index 000000000000..b552afbaf85c
--- /dev/null
+++ b/drivers/misc/mei/hbm.h
@@ -0,0 +1,39 @@
+/*
+ *
+ * Intel Management Engine Interface (Intel MEI) Linux driver
+ * Copyright (c) 2003-2012, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ */
+
+#ifndef _MEI_HBM_H_
+#define _MEI_HBM_H_
+
+void mei_hbm_dispatch(struct mei_device *dev, struct mei_msg_hdr *hdr);
+
+static inline void mei_hbm_hdr(struct mei_msg_hdr *hdr, size_t length)
+{
+ hdr->host_addr = 0;
+ hdr->me_addr = 0;
+ hdr->length = length;
+ hdr->msg_complete = 1;
+ hdr->reserved = 0;
+}
+
+void mei_hbm_start_req(struct mei_device *dev);
+
+int mei_hbm_cl_flow_control_req(struct mei_device *dev, struct mei_cl *cl);
+int mei_hbm_cl_disconnect_req(struct mei_device *dev, struct mei_cl *cl);
+int mei_hbm_cl_connect_req(struct mei_device *dev, struct mei_cl *cl);
+
+
+#endif /* _MEI_HBM_H_ */
+
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index 418a85f315f1..55895fc21ff1 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -22,6 +22,7 @@
#include <linux/mei.h>
#include "mei_dev.h"
+#include "hbm.h"
#include "interface.h"
const char *mei_dev_state_str(int state)
diff --git a/drivers/misc/mei/interface.h b/drivers/misc/mei/interface.h
index 90a3dfda9db5..3d06c087ddd2 100644
--- a/drivers/misc/mei/interface.h
+++ b/drivers/misc/mei/interface.h
@@ -72,12 +72,9 @@ void mei_watchdog_unregister(struct mei_device *dev);
int mei_other_client_is_connecting(struct mei_device *dev, struct mei_cl *cl);
int mei_flow_ctrl_reduce(struct mei_device *dev, struct mei_cl *cl);
-void mei_hbm_start_req(struct mei_device *dev);
+void mei_host_client_init(struct work_struct *work);
+
-int mei_hbm_cl_flow_control_req(struct mei_device *dev, struct mei_cl *cl);
-int mei_hbm_cl_disconnect_req(struct mei_device *dev, struct mei_cl *cl);
-int mei_hbm_cl_connect_req(struct mei_device *dev, struct mei_cl *cl);
-void mei_host_client_init(struct work_struct *work);
#endif /* _MEI_INTERFACE_H_ */
diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index a735c8b7ca82..2495e35ccb27 100644
--- a/drivers/misc/mei/interrupt.c
+++ b/drivers/misc/mei/interrupt.c
@@ -24,6 +24,7 @@
#include <linux/mei.h>
#include "mei_dev.h"
+#include "hbm.h"
#include "interface.h"
diff --git a/drivers/misc/mei/iorw.c b/drivers/misc/mei/iorw.c
index d8e08bcf3263..4328c2d2ca54 100644
--- a/drivers/misc/mei/iorw.c
+++ b/drivers/misc/mei/iorw.c
@@ -36,6 +36,7 @@
#include <linux/mei.h>
#include "mei_dev.h"
+#include "hbm.h"
#include "interface.h"
/**
diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h
index 54ddac324578..1b54e675d3f1 100644
--- a/drivers/misc/mei/mei_dev.h
+++ b/drivers/misc/mei/mei_dev.h
@@ -445,16 +445,6 @@ void mei_enable_interrupts(struct mei_device *dev);
void mei_disable_interrupts(struct mei_device *dev);
-void mei_hbm_dispatch(struct mei_device *dev, struct mei_msg_hdr *hdr);
-
-static inline void mei_hbm_hdr(struct mei_msg_hdr *hdr, size_t length)
-{
- hdr->host_addr = 0;
- hdr->me_addr = 0;
- hdr->length = length;
- hdr->msg_complete = 1;
- hdr->reserved = 0;
-}
#define MEI_HDR_FMT "hdr:host=%02d me=%02d len=%d comp=%1d"
#define MEI_HDR_PRM(hdr) \
diff --git a/drivers/misc/mei/wd.c b/drivers/misc/mei/wd.c
index 4f2e9db86478..9814bc1dba01 100644
--- a/drivers/misc/mei/wd.c
+++ b/drivers/misc/mei/wd.c
@@ -24,6 +24,7 @@
#include <linux/mei.h>
#include "mei_dev.h"
+#include "hbm.h"
#include "interface.h"
static const u8 mei_start_wd_params[] = { 0x02, 0x12, 0x13, 0x10 };