Move mei documentation under driver-api, convert the docs to rst,
fix the outdated information, update broken links, and add new docs.
Tomas Winkler (7):
mei: docs: move documentation under driver-api
mei: docs: move iamt docs to a iamt.rst file
mei: docs: update mei documentation
mei: docs: update mei client bus documentation.
mei: docs: add a short description for nfc behind mei
mei: docs: add hdcp documentation
mei: docs: fix broken links in iamt documentation.
Documentation/driver-api/index.rst | 1 +
Documentation/driver-api/mei/hdcp.rst | 32 +++
Documentation/driver-api/mei/iamt.rst | 101 +++++++
Documentation/driver-api/mei/index.rst | 23 ++
.../driver-api/mei/mei-client-bus.rst | 168 +++++++++++
Documentation/driver-api/mei/mei.rst | 176 ++++++++++++
Documentation/driver-api/mei/nfc.rst | 28 ++
.../misc-devices/mei/mei-client-bus.txt | 141 ----------
Documentation/misc-devices/mei/mei.txt | 266 ------------------
MAINTAINERS | 2 +-
drivers/misc/mei/hdcp/mei_hdcp.c | 11 +-
11 files changed, 534 insertions(+), 415 deletions(-)
create mode 100644 Documentation/driver-api/mei/hdcp.rst
create mode 100644 Documentation/driver-api/mei/iamt.rst
create mode 100644 Documentation/driver-api/mei/index.rst
create mode 100644 Documentation/driver-api/mei/mei-client-bus.rst
create mode 100644 Documentation/driver-api/mei/mei.rst
create mode 100644 Documentation/driver-api/mei/nfc.rst
delete mode 100644 Documentation/misc-devices/mei/mei-client-bus.txt
delete mode 100644 Documentation/misc-devices/mei/mei.txt
--
2.20.1
Move mei driver documentation under Documentation/driver-api/
Perform some minimal formating changes to produce correct sphinx rendering
and add index.rst
Signed-off-by: Tomas Winkler <[email protected]>
---
Documentation/driver-api/index.rst | 1 +
Documentation/driver-api/mei/index.rst | 22 +++
.../mei/mei-client-bus.rst} | 135 ++++++++++--------
.../mei/mei.txt => driver-api/mei/mei.rst} | 30 +---
MAINTAINERS | 2 +-
5 files changed, 104 insertions(+), 86 deletions(-)
create mode 100644 Documentation/driver-api/mei/index.rst
rename Documentation/{misc-devices/mei/mei-client-bus.txt => driver-api/mei/mei-client-bus.rst} (54%)
rename Documentation/{misc-devices/mei/mei.txt => driver-api/mei/mei.rst} (94%)
diff --git a/Documentation/driver-api/index.rst b/Documentation/driver-api/index.rst
index d26308af6036..0dbaa987aa11 100644
--- a/Documentation/driver-api/index.rst
+++ b/Documentation/driver-api/index.rst
@@ -42,6 +42,7 @@ available subsections can be seen below.
target
mtdnand
miscellaneous
+ mei/index
w1
rapidio
s390-drivers
diff --git a/Documentation/driver-api/mei/index.rst b/Documentation/driver-api/mei/index.rst
new file mode 100644
index 000000000000..35c1117d8366
--- /dev/null
+++ b/Documentation/driver-api/mei/index.rst
@@ -0,0 +1,22 @@
+.. SPDX-License-Identifier: GPL-2.0
+
+.. include:: <isonum.txt>
+
+===================================================
+Intel(R) Management Engine Interface (Intel(R) MEI)
+===================================================
+
+**Copyright** |copy| 2019 Intel Corporation
+
+
+.. only:: html
+
+ .. class:: toc-title
+
+ Table of Contents
+
+.. toctree::
+ :maxdepth: 2
+
+ mei
+ mei-client-bus
diff --git a/Documentation/misc-devices/mei/mei-client-bus.txt b/Documentation/driver-api/mei/mei-client-bus.rst
similarity index 54%
rename from Documentation/misc-devices/mei/mei-client-bus.txt
rename to Documentation/driver-api/mei/mei-client-bus.rst
index 743be4ec8989..a26a85453bdf 100644
--- a/Documentation/misc-devices/mei/mei-client-bus.txt
+++ b/Documentation/driver-api/mei/mei-client-bus.rst
@@ -1,3 +1,6 @@
+.. SPDX-License-Identifier: GPL-2.0
+
+==============================================
Intel(R) Management Engine (ME) Client bus API
==============================================
@@ -22,22 +25,24 @@ MEI CL bus API
A driver implementation for an MEI Client is very similar to existing bus
based device drivers. The driver registers itself as an MEI CL bus driver through
-the mei_cl_driver structure:
+the ``struct mei_cl_driver`` structure:
+
+.. code-block:: C
-struct mei_cl_driver {
- struct device_driver driver;
- const char *name;
+ struct mei_cl_driver {
+ struct device_driver driver;
+ const char *name;
- const struct mei_cl_device_id *id_table;
+ const struct mei_cl_device_id *id_table;
- int (*probe)(struct mei_cl_device *dev, const struct mei_cl_id *id);
- int (*remove)(struct mei_cl_device *dev);
-};
+ int (*probe)(struct mei_cl_device *dev, const struct mei_cl_id *id);
+ int (*remove)(struct mei_cl_device *dev);
+ };
-struct mei_cl_id {
- char name[MEI_NAME_SIZE];
- kernel_ulong_t driver_info;
-};
+ struct mei_cl_id {
+ char name[MEI_NAME_SIZE];
+ kernel_ulong_t driver_info;
+ };
The mei_cl_id structure allows the driver to bind itself against a device name.
@@ -61,58 +66,62 @@ Example
As a theoretical example let's pretend the ME comes with a "contact" NFC IP.
The driver init and exit routines for this device would look like:
-#define CONTACT_DRIVER_NAME "contact"
+.. code-block:: C
-static struct mei_cl_device_id contact_mei_cl_tbl[] = {
- { CONTACT_DRIVER_NAME, },
+ #define CONTACT_DRIVER_NAME "contact"
- /* required last entry */
- { }
-};
-MODULE_DEVICE_TABLE(mei_cl, contact_mei_cl_tbl);
+ static struct mei_cl_device_id contact_mei_cl_tbl[] = {
+ { CONTACT_DRIVER_NAME, },
-static struct mei_cl_driver contact_driver = {
- .id_table = contact_mei_tbl,
- .name = CONTACT_DRIVER_NAME,
+ /* required last entry */
+ { }
+ };
+ MODULE_DEVICE_TABLE(mei_cl, contact_mei_cl_tbl);
- .probe = contact_probe,
- .remove = contact_remove,
-};
+ static struct mei_cl_driver contact_driver = {
+ .id_table = contact_mei_tbl,
+ .name = CONTACT_DRIVER_NAME,
-static int contact_init(void)
-{
- int r;
+ .probe = contact_probe,
+ .remove = contact_remove,
+ };
- r = mei_cl_driver_register(&contact_driver);
- if (r) {
- pr_err(CONTACT_DRIVER_NAME ": driver registration failed\n");
- return r;
- }
+ static int contact_init(void)
+ {
+ int r;
+
+ r = mei_cl_driver_register(&contact_driver);
+ if (r) {
+ pr_err(CONTACT_DRIVER_NAME ": driver registration failed\n");
+ return r;
+ }
- return 0;
-}
+ return 0;
+ }
-static void __exit contact_exit(void)
-{
- mei_cl_driver_unregister(&contact_driver);
-}
+ static void __exit contact_exit(void)
+ {
+ mei_cl_driver_unregister(&contact_driver);
+ }
-module_init(contact_init);
-module_exit(contact_exit);
+ module_init(contact_init);
+ module_exit(contact_exit);
And the driver's simplified probe routine would look like that:
-int contact_probe(struct mei_cl_device *dev, struct mei_cl_device_id *id)
-{
- struct contact_driver *contact;
+.. code-block:: C
- [...]
- mei_cl_enable_device(dev);
+ int contact_probe(struct mei_cl_device *dev, struct mei_cl_device_id *id)
+ {
+ struct contact_driver *contact;
- mei_cl_register_event_cb(dev, contact_event_cb, contact);
+ [...]
+ mei_cl_enable_device(dev);
- return 0;
-}
+ mei_cl_register_event_cb(dev, contact_event_cb, contact);
+
+ return 0;
+ }
In the probe routine the driver first enable the MEI device and then registers
an ME bus event handler which is as close as it can get to registering a
@@ -122,20 +131,22 @@ the pending events:
#define MAX_NFC_PAYLOAD 128
-static void contact_event_cb(struct mei_cl_device *dev, u32 events,
- void *context)
-{
- struct contact_driver *contact = context;
+.. code-block:: C
+
+ static void contact_event_cb(struct mei_cl_device *dev, u32 events,
+ void *context)
+ {
+ struct contact_driver *contact = context;
- if (events & BIT(MEI_EVENT_RX)) {
- u8 payload[MAX_NFC_PAYLOAD];
- int payload_size;
+ if (events & BIT(MEI_EVENT_RX)) {
+ u8 payload[MAX_NFC_PAYLOAD];
+ int payload_size;
- payload_size = mei_recv(dev, payload, MAX_NFC_PAYLOAD);
- if (payload_size <= 0)
- return;
+ payload_size = mei_recv(dev, payload, MAX_NFC_PAYLOAD);
+ if (payload_size <= 0)
+ return;
- /* Hook to the NFC subsystem */
- nfc_hci_recv_frame(contact->hdev, payload, payload_size);
+ /* Hook to the NFC subsystem */
+ nfc_hci_recv_frame(contact->hdev, payload, payload_size);
+ }
}
-}
diff --git a/Documentation/misc-devices/mei/mei.txt b/Documentation/driver-api/mei/mei.rst
similarity index 94%
rename from Documentation/misc-devices/mei/mei.txt
rename to Documentation/driver-api/mei/mei.rst
index 2b80a0cd621f..5aa3a5e6496a 100644
--- a/Documentation/misc-devices/mei/mei.txt
+++ b/Documentation/driver-api/mei/mei.rst
@@ -1,5 +1,4 @@
-Intel(R) Management Engine Interface (Intel(R) MEI)
-===================================================
+.. SPDX-License-Identifier: GPL-2.0
Introduction
============
@@ -70,6 +69,8 @@ user to access it.
A code snippet for an application communicating with Intel AMTHI client:
+.. code-block:: C
+
struct mei_connect_client_data data;
fd = open(MEI_DEVICE);
@@ -93,8 +94,8 @@ A code snippet for an application communicating with Intel AMTHI client:
close(fd);
-IOCTL
-=====
+IOCTLs
+======
The Intel MEI Driver supports the following IOCTL commands:
IOCTL_MEI_CONNECT_CLIENT Connect to firmware Feature (client).
@@ -114,8 +115,7 @@ The Intel MEI Driver supports the following IOCTL commands:
error returns:
EINVAL Wrong IOCTL Number
- ENODEV Device or Connection is not initialized or ready.
- (e.g. Wrong UUID)
+ ENODEV Device or Connection is not initialized or ready. (e.g. Wrong UUID)
ENOMEM Unable to allocate memory to client internal data.
EFAULT Fatal Error (e.g. Unable to access user input data)
EBUSY Connection Already Open
@@ -241,26 +241,10 @@ watchdog is 120 seconds.
If the Intel AMT is not enabled in the firmware then the watchdog client won't enumerate
on the me client bus and watchdog devices won't be exposed.
-
Supported Chipsets
==================
+82X38/X48 Express and newer
-7 Series Chipset Family
-6 Series Chipset Family
-5 Series Chipset Family
-4 Series Chipset Family
-Mobile 4 Series Chipset Family
-ICH9
-82946GZ/GL
-82G35 Express
-82Q963/Q965
-82P965/G965
-Mobile PM965/GM965
-Mobile GME965/GLE960
-82Q35 Express
-82G33/G31/P35/P31 Express
-82Q33 Express
-82X38/X48 Express
---
[email protected]
diff --git a/MAINTAINERS b/MAINTAINERS
index 5cfbea4ce575..bfe48cbea84c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8021,7 +8021,7 @@ F: include/uapi/linux/mei.h
F: include/linux/mei_cl_bus.h
F: drivers/misc/mei/*
F: drivers/watchdog/mei_wdt.c
-F: Documentation/misc-devices/mei/*
+F: Documentation/driver-api/mei/*
F: samples/mei/*
INTEL MENLOW THERMAL DRIVER
--
2.20.1