aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAndrew Donnellan <andrew.donnellan@au1.ibm.com>2018-06-29 12:57:09 +1000
committerStewart Smith <stewart@linux.ibm.com>2018-07-03 01:25:36 -0500
commita36b40799055d0ff070f87376a486caed5c3a475 (patch)
tree1b768346509295956d43875a5c770335ed19a70e /doc
parent6ede024c810ffeb64814a8d6c4c338f12d357458 (diff)
downloadskiboot-a36b40799055d0ff070f87376a486caed5c3a475.zip
skiboot-a36b40799055d0ff070f87376a486caed5c3a475.tar.gz
skiboot-a36b40799055d0ff070f87376a486caed5c3a475.tar.bz2
npu2: Use same compatible string for NVLink and OpenCAPI link nodes in device tree
Currently, we distinguish between NPU links for NVLink devices and OpenCAPI devices through the use of two different compatible strings - ibm,npu-link and ibm,npu-link-opencapi. As we move towards supporting configurations with both NVLink and OpenCAPI devices behind a single NPU, we need to detect the device type as part of presence detection, which can't happen until well after the point where the HDAT or platform code has created the NPU device tree nodes. Changing a node's compatible string after it's been created is a bit ugly, so instead we should move the device type to a new property which we can add to the node later on. Get rid of the ibm,npu-link-opencapi compatible string, add a new ibm,npu-link-type property, and a helper function to check the link type. Add an "unknown" device type in preparation for later patches to detect device type dynamically. These device tree bindings are entirely internal to skiboot and are not consumed directly by Linux, so this shouldn't break anything (other than internal BML lab environments). Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> Reviewed-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com> Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/device-tree/opencapi.rst10
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/device-tree/opencapi.rst b/doc/device-tree/opencapi.rst
index b24b29c..80ff996 100644
--- a/doc/device-tree/opencapi.rst
+++ b/doc/device-tree/opencapi.rst
@@ -10,8 +10,8 @@ NPU bindings
The NPU nodes are similar to those in :doc:`nvlink`.
We distinguish between OpenCAPI and NVLink links using the
-`ibm.npu-link-opencapi` compatible string. NPUs with a mixture of
-OpenCAPI and NVLink links are currently unsupported.
+`ibm.npu-link-type` property. NPUs with a mixture of OpenCAPI and
+NVLink links are currently unsupported.
.. code-block:: dts
@@ -25,7 +25,8 @@ OpenCAPI and NVLink links are currently unsupported.
ibm,npu-links = <0x2>; /* Number of links wired up to this npu. */
link@2 {
- compatible = "ibm,npu-link-opencapi";
+ compatible = "ibm,npu-link";
+ ibm,npu-link-type = "opencapi";
ibm,npu-group-id = <0x1>;
ibm,npu-lane-mask = <0xf1e000>; /* Mask specifying which IBM PHY lanes
* are used for this link. 24-bit,
@@ -38,7 +39,8 @@ OpenCAPI and NVLink links are currently unsupported.
};
link@3 {
- compatible = "ibm,npu-link-opencapi";
+ compatible = "ibm,npu-link";
+ ibm,npu-link-type = "opencapi";
ibm,npu-group-id = <0x2>;
ibm,npu-lane-mask = <0x78f>;
ibm,npu-phy = <0x80000000 0x9010c3f>;