From 6a59dd5c400d3a67f540330886c0701912dd2385 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Mon, 15 Sep 2025 08:19:27 -0700
Subject: [PATCH] tree: support apple-nvme transport

Apple silicon support on Linux uses a separate platform driver called
'apple-nvme', and libnvme doesn't know about this transport. This fixes
a "No transport address for 'apple-nvme'" error when running on Apple
silicon, where libnvme was unable to enumerate nvme storage attached to
this platform.

$ nvme list
Node                  Generic               SN                   Model                                    Namespace  Usage                      Format           FW Rev
--------------------- --------------------- -------------------- ---------------------------------------- ---------- -------------------------- ---------------- --------
/dev/nvme0n1          /dev/ng0n1            xxxxxxxxxxxxxxxx     APPLE SSD AP2048Z                        0x1          2.00  TB /   2.00  TB      4 KiB +  0 B   532.140.
...

Signed-off-by: Clayton Craft <clayton@craftyguy.net>

squash
---
 src/nvme/tree.c                        |   9 +++--
 test/sysfs/data/tree-apple-nvme.out    |  49 +++++++++++++++++++++++++
 test/sysfs/data/tree-apple-nvme.tar.xz | Bin 0 -> 8708 bytes
 test/sysfs/meson.build                 |   1 +
 4 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 test/sysfs/data/tree-apple-nvme.out
 create mode 100644 test/sysfs/data/tree-apple-nvme.tar.xz

diff --git a/src/nvme/tree.c b/src/nvme/tree.c
index d79707439..4553fa2b3 100644
--- a/src/nvme/tree.c
+++ b/src/nvme/tree.c
@@ -1417,7 +1417,8 @@ struct nvme_ctrl *nvme_create_ctrl(nvme_root_t r,
 		return NULL;
 	}
 	if (strncmp(transport, "loop", 4) &&
-	    strncmp(transport, "pcie", 4) && !traddr) {
+	    strncmp(transport, "pcie", 4) &&
+	    strncmp(transport, "apple-nvme", 10) && !traddr) {
 		nvme_msg(r, LOG_ERR, "No transport address for '%s'\n",
 			 transport);
 	       errno = EINVAL;
@@ -2166,7 +2167,8 @@ static nvme_ctrl_t nvme_ctrl_alloc(nvme_root_t r, nvme_subsystem_t s,
 			goto skip_address;
 
 		/* Older kernel don't support pcie transport addresses */
-		if (strcmp(transport, "pcie")) {
+		if (strcmp(transport, "pcie") &&
+		    strcmp(transport, "apple-nvme")) {
 			errno = ENXIO;
 			return NULL;
 		}
@@ -2187,7 +2189,8 @@ static nvme_ctrl_t nvme_ctrl_alloc(nvme_root_t r, nvme_subsystem_t s,
 		}
 		if (p)
 			addr = strdup(p);
-	} else if (!strcmp(transport, "pcie")) {
+	} else if (!strcmp(transport, "pcie") ||
+		   !strcmp(transport, "apple-nvme")) {
 		/* The 'address' string is the transport address */
 		traddr = addr;
 	} else {
diff --git a/test/sysfs/data/tree-apple-nvme.out b/test/sysfs/data/tree-apple-nvme.out
new file mode 100644
index 000000000..9207575ad
--- /dev/null
+++ b/test/sysfs/data/tree-apple-nvme.out
@@ -0,0 +1,49 @@
+{
+  "hosts":[
+    {
+      "hostnqn":"nqn.2014-08.org.nvmexpress:uuid:ce4fee3e-c02c-11ee-8442-830d068a36c6",
+      "hostid":"ce4fee3e-c02c-11ee-8442-830d068a36c6",
+      "subsystems":[
+        {
+          "name":"nvme-subsys0",
+          "nqn":"nqn.2014.08.org.nvmexpress:106b106b0ba01e49841cc620    APPLE SSD AP2048Z",
+          "namespaces":[
+            {
+              "nsid":1,
+              "name":"nvme0n1",
+              "controller":[
+                {
+                  "name":"nvme0",
+                  "transport":"apple-nvme",
+                  "traddr":"27bcc0000.nvme"
+                }
+              ]
+            },
+            {
+              "nsid":2,
+              "name":"nvme0n2",
+              "controller":[
+                {
+                  "name":"nvme0",
+                  "transport":"apple-nvme",
+                  "traddr":"27bcc0000.nvme"
+                }
+              ]
+            },
+            {
+              "nsid":3,
+              "name":"nvme0n3",
+              "controller":[
+                {
+                  "name":"nvme0",
+                  "transport":"apple-nvme",
+                  "traddr":"27bcc0000.nvme"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/sysfs/data/tree-apple-nvme.tar.xz b/test/sysfs/data/tree-apple-nvme.tar.xz
new file mode 100644
index 0000000000000000000000000000000000000000..a6fecde4d6aa73c9dadaf8a17ef876ecc0c4c089
GIT binary patch
literal 8708
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

literal 0
HcmV?d00001

diff --git a/test/sysfs/meson.build b/test/sysfs/meson.build
index 2a7e8e3cd..7cb543f58 100644
--- a/test/sysfs/meson.build
+++ b/test/sysfs/meson.build
@@ -16,6 +16,7 @@ if diff.found()
 
     tree_data = [
         'tree-pcie',
+        'tree-apple-nvme',
     ]
 
     tree_diff = find_program('tree-diff.sh')