pmci: Move MCTP into the PMCI subsys

PMCI conveys a stack of specifications from DMTF including MCTP (a
transport layer protocol), PLDM (request/response messaging protocol),
and ancillary SPDM messaging. Placing all these libraries under PMCI
subsystem makes more sense than simply adding MCTP as its own subsystem.

Signed-off-by: Tom Burdick <thomas.burdick@intel.com>

MAINTAINERS.yml

@@ -3188,6 +3188,20 @@ PHYTEC Platforms:
   labels:
     - "platform: PHYTEC"
 
+PMCI:
+  status: maintained
+  maintainers:
+    - teburd
+  collaborators:
+    - nashif
+    - inteljiangwe1
+    - kehintel
+  files:
+    - subsys/pmci/
+    - samples/modules/pmci/
+  labels:
+    - "area: PMCI"
+
 POSIX API layer:
   status: maintained
   maintainers:
@@ -5189,8 +5203,7 @@ West:
   collaborators:
     - nashif
     - inteljiangwe1
-  files:
-    - samples/modules/mctp/
+  files: []
   labels:
     - "area: MCTP"
 

samples/modules/pmci/index.rst

@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: pmci
+   :name: PMCI
+   :show-listing:
+
+   These samples demonstrate the use of PMCI related protocols in Zephyr.

samples/modules/pmci/mctp/endpoint/README.rst

@@ -29,7 +29,7 @@ Building and Running
 
 
 .. zephyr-app-commands::
-   :zephyr-app: samples/modules/mctp/mctp_endpoint
+   :zephyr-app: samples/modules/pmci/mctp/endpoint
    :host-os: unix
    :board: nrf52840_nrf52840dk
    :goals: run

samples/modules/pmci/mctp/endpoint/src/main.c

@@ -10,7 +10,7 @@
 #include <unistd.h>
 #include <zephyr/kernel.h>
 #include <zephyr/types.h>
-#include <zephyr/mctp/mctp_uart.h>
+#include <zephyr/pmci/mctp/mctp_uart.h>
 #include <libmctp.h>
 
 #include <zephyr/logging/log.h>

samples/modules/pmci/mctp/host/README.rst

@@ -28,7 +28,7 @@ Building and Running
 ********************
 
 .. zephyr-app-commands::
-   :zephyr-app: samples/modules/mctp/mctp_host
+   :zephyr-app: samples/modules/pmci/mctp/host
    :host-os: unix
    :board: nrf52840_nrf52840dk
    :goals: run

samples/modules/pmci/mctp/host/src/main.c

@@ -11,7 +11,7 @@
 #include <zephyr/types.h>
 #include <zephyr/kernel.h>
 #include <libmctp.h>
-#include <zephyr/mctp/mctp_uart.h>
+#include <zephyr/pmci/mctp/mctp_uart.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(mctp_host);

subsys/CMakeLists.txt

@@ -22,6 +22,7 @@ add_subdirectory(mem_mgmt)
 add_subdirectory(mgmt)
 add_subdirectory(modbus)
 add_subdirectory(pm)
+add_subdirectory(pmci)
 add_subdirectory(portability)
 add_subdirectory(random)
 add_subdirectory(rtio)
@@ -46,7 +47,6 @@ add_subdirectory_ifdef(CONFIG_IMG_MANAGER dfu)
 add_subdirectory_ifdef(CONFIG_INPUT input)
 add_subdirectory_ifdef(CONFIG_JWT jwt)
 add_subdirectory_ifdef(CONFIG_LLEXT llext)
-add_subdirectory_ifdef(CONFIG_MCTP mctp)
 add_subdirectory_ifdef(CONFIG_MODEM_MODULES modem)
 add_subdirectory_ifdef(CONFIG_NETWORKING net)
 add_subdirectory_ifdef(CONFIG_PROFILING profiling)

subsys/Kconfig

@@ -26,13 +26,13 @@ source "subsys/jwt/Kconfig"
 source "subsys/llext/Kconfig"
 source "subsys/logging/Kconfig"
 source "subsys/lorawan/Kconfig"
-source "subsys/mctp/Kconfig"
 source "subsys/mem_mgmt/Kconfig"
 source "subsys/mgmt/Kconfig"
 source "subsys/modbus/Kconfig"
 source "subsys/modem/Kconfig"
 source "subsys/net/Kconfig"
 source "subsys/pm/Kconfig"
+source "subsys/pmci/Kconfig"
 source "subsys/portability/Kconfig"
 source "subsys/profiling/Kconfig"
 source "subsys/random/Kconfig"

subsys/pmci/CMakeLists.txt

@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: Apache-2.0
+
+add_subdirectory(mctp)

subsys/pmci/Kconfig

@@ -0,0 +1,14 @@
+# PMCI configuration options
+
+# Copyright (c) 2025 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+menu "Platform Management Communication Infrastruction (PMCI)"
+
+# zephyr-keep-sorted-start
+
+source "subsys/pmci/mctp/Kconfig"
+
+# zephyr-keep-sorted-stop
+
+endmenu

subsys/pmci/mctp/mctp_uart.c

@@ -8,7 +8,7 @@
 #include <zephyr/sys/__assert.h>
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/uart.h>
-#include <zephyr/mctp/mctp_uart.h>
+#include <zephyr/pmci/mctp/mctp_uart.h>
 #include <crc-16-ccitt.h>
 
 #include <zephyr/logging/log.h>