From 1e0af58b519b7715c512e27a84f1ed2b8df6dbe8 Mon Sep 17 00:00:00 2001 From: Tom Burdick Date: Mon, 24 Feb 2025 10:57:27 -0600 Subject: [PATCH] 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 --- MAINTAINERS.yml | 17 +++++++++++++++-- include/zephyr/{ => pmci}/mctp/mctp_uart.h | 0 samples/modules/pmci/index.rst | 5 +++++ .../mctp/endpoint}/CMakeLists.txt | 0 .../mctp/endpoint}/README.rst | 2 +- .../boards/nrf52840dk_nrf52840.overlay | 0 .../mctp/endpoint}/prj.conf | 0 .../mctp/endpoint}/src/main.c | 2 +- .../mctp_host => pmci/mctp/host}/CMakeLists.txt | 0 .../mctp_host => pmci/mctp/host}/README.rst | 2 +- .../host}/boards/nrf52840dk_nrf52840.overlay | 0 .../{mctp/mctp_host => pmci/mctp/host}/prj.conf | 0 .../mctp_host => pmci/mctp/host}/src/main.c | 2 +- samples/modules/{ => pmci}/mctp/mctp.rst | 0 subsys/CMakeLists.txt | 2 +- subsys/Kconfig | 2 +- subsys/pmci/CMakeLists.txt | 3 +++ subsys/pmci/Kconfig | 14 ++++++++++++++ subsys/{ => pmci}/mctp/CMakeLists.txt | 0 subsys/{ => pmci}/mctp/Kconfig | 0 subsys/{ => pmci}/mctp/mctp_uart.c | 2 +- 21 files changed, 44 insertions(+), 9 deletions(-) rename include/zephyr/{ => pmci}/mctp/mctp_uart.h (100%) create mode 100644 samples/modules/pmci/index.rst rename samples/modules/{mctp/mctp_endpoint => pmci/mctp/endpoint}/CMakeLists.txt (100%) rename samples/modules/{mctp/mctp_endpoint => pmci/mctp/endpoint}/README.rst (95%) rename samples/modules/{mctp/mctp_endpoint => pmci/mctp/endpoint}/boards/nrf52840dk_nrf52840.overlay (100%) rename samples/modules/{mctp/mctp_endpoint => pmci/mctp/endpoint}/prj.conf (100%) rename samples/modules/{mctp/mctp_endpoint => pmci/mctp/endpoint}/src/main.c (97%) rename samples/modules/{mctp/mctp_host => pmci/mctp/host}/CMakeLists.txt (100%) rename samples/modules/{mctp/mctp_host => pmci/mctp/host}/README.rst (95%) rename samples/modules/{mctp/mctp_host => pmci/mctp/host}/boards/nrf52840dk_nrf52840.overlay (100%) rename samples/modules/{mctp/mctp_host => pmci/mctp/host}/prj.conf (100%) rename samples/modules/{mctp/mctp_host => pmci/mctp/host}/src/main.c (97%) rename samples/modules/{ => pmci}/mctp/mctp.rst (100%) create mode 100644 subsys/pmci/CMakeLists.txt create mode 100644 subsys/pmci/Kconfig rename subsys/{ => pmci}/mctp/CMakeLists.txt (100%) rename subsys/{ => pmci}/mctp/Kconfig (100%) rename subsys/{ => pmci}/mctp/mctp_uart.c (99%) diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml index 3731470db07..dd5b101317e 100644 --- a/MAINTAINERS.yml +++ b/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" diff --git a/include/zephyr/mctp/mctp_uart.h b/include/zephyr/pmci/mctp/mctp_uart.h similarity index 100% rename from include/zephyr/mctp/mctp_uart.h rename to include/zephyr/pmci/mctp/mctp_uart.h diff --git a/samples/modules/pmci/index.rst b/samples/modules/pmci/index.rst new file mode 100644 index 00000000000..23c10268122 --- /dev/null +++ b/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. diff --git a/samples/modules/mctp/mctp_endpoint/CMakeLists.txt b/samples/modules/pmci/mctp/endpoint/CMakeLists.txt similarity index 100% rename from samples/modules/mctp/mctp_endpoint/CMakeLists.txt rename to samples/modules/pmci/mctp/endpoint/CMakeLists.txt diff --git a/samples/modules/mctp/mctp_endpoint/README.rst b/samples/modules/pmci/mctp/endpoint/README.rst similarity index 95% rename from samples/modules/mctp/mctp_endpoint/README.rst rename to samples/modules/pmci/mctp/endpoint/README.rst index 6f7d7b98a5f..a7e2f28047f 100644 --- a/samples/modules/mctp/mctp_endpoint/README.rst +++ b/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 diff --git a/samples/modules/mctp/mctp_endpoint/boards/nrf52840dk_nrf52840.overlay b/samples/modules/pmci/mctp/endpoint/boards/nrf52840dk_nrf52840.overlay similarity index 100% rename from samples/modules/mctp/mctp_endpoint/boards/nrf52840dk_nrf52840.overlay rename to samples/modules/pmci/mctp/endpoint/boards/nrf52840dk_nrf52840.overlay diff --git a/samples/modules/mctp/mctp_endpoint/prj.conf b/samples/modules/pmci/mctp/endpoint/prj.conf similarity index 100% rename from samples/modules/mctp/mctp_endpoint/prj.conf rename to samples/modules/pmci/mctp/endpoint/prj.conf diff --git a/samples/modules/mctp/mctp_endpoint/src/main.c b/samples/modules/pmci/mctp/endpoint/src/main.c similarity index 97% rename from samples/modules/mctp/mctp_endpoint/src/main.c rename to samples/modules/pmci/mctp/endpoint/src/main.c index 430447ad2fe..66a2afa465a 100644 --- a/samples/modules/mctp/mctp_endpoint/src/main.c +++ b/samples/modules/pmci/mctp/endpoint/src/main.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include diff --git a/samples/modules/mctp/mctp_host/CMakeLists.txt b/samples/modules/pmci/mctp/host/CMakeLists.txt similarity index 100% rename from samples/modules/mctp/mctp_host/CMakeLists.txt rename to samples/modules/pmci/mctp/host/CMakeLists.txt diff --git a/samples/modules/mctp/mctp_host/README.rst b/samples/modules/pmci/mctp/host/README.rst similarity index 95% rename from samples/modules/mctp/mctp_host/README.rst rename to samples/modules/pmci/mctp/host/README.rst index d80d02d2137..e1eb0abf756 100644 --- a/samples/modules/mctp/mctp_host/README.rst +++ b/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 diff --git a/samples/modules/mctp/mctp_host/boards/nrf52840dk_nrf52840.overlay b/samples/modules/pmci/mctp/host/boards/nrf52840dk_nrf52840.overlay similarity index 100% rename from samples/modules/mctp/mctp_host/boards/nrf52840dk_nrf52840.overlay rename to samples/modules/pmci/mctp/host/boards/nrf52840dk_nrf52840.overlay diff --git a/samples/modules/mctp/mctp_host/prj.conf b/samples/modules/pmci/mctp/host/prj.conf similarity index 100% rename from samples/modules/mctp/mctp_host/prj.conf rename to samples/modules/pmci/mctp/host/prj.conf diff --git a/samples/modules/mctp/mctp_host/src/main.c b/samples/modules/pmci/mctp/host/src/main.c similarity index 97% rename from samples/modules/mctp/mctp_host/src/main.c rename to samples/modules/pmci/mctp/host/src/main.c index 7fa9423c24c..8a2fd4e9e64 100644 --- a/samples/modules/mctp/mctp_host/src/main.c +++ b/samples/modules/pmci/mctp/host/src/main.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include LOG_MODULE_REGISTER(mctp_host); diff --git a/samples/modules/mctp/mctp.rst b/samples/modules/pmci/mctp/mctp.rst similarity index 100% rename from samples/modules/mctp/mctp.rst rename to samples/modules/pmci/mctp/mctp.rst diff --git a/subsys/CMakeLists.txt b/subsys/CMakeLists.txt index 61f7f3cf940..a0a2bc828cf 100644 --- a/subsys/CMakeLists.txt +++ b/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) diff --git a/subsys/Kconfig b/subsys/Kconfig index 93880693f51..a85bda6ece4 100644 --- a/subsys/Kconfig +++ b/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" diff --git a/subsys/pmci/CMakeLists.txt b/subsys/pmci/CMakeLists.txt new file mode 100644 index 00000000000..620501b12e2 --- /dev/null +++ b/subsys/pmci/CMakeLists.txt @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: Apache-2.0 + +add_subdirectory(mctp) diff --git a/subsys/pmci/Kconfig b/subsys/pmci/Kconfig new file mode 100644 index 00000000000..917a084a52f --- /dev/null +++ b/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 diff --git a/subsys/mctp/CMakeLists.txt b/subsys/pmci/mctp/CMakeLists.txt similarity index 100% rename from subsys/mctp/CMakeLists.txt rename to subsys/pmci/mctp/CMakeLists.txt diff --git a/subsys/mctp/Kconfig b/subsys/pmci/mctp/Kconfig similarity index 100% rename from subsys/mctp/Kconfig rename to subsys/pmci/mctp/Kconfig diff --git a/subsys/mctp/mctp_uart.c b/subsys/pmci/mctp/mctp_uart.c similarity index 99% rename from subsys/mctp/mctp_uart.c rename to subsys/pmci/mctp/mctp_uart.c index fe60cc159c9..b77a4698508 100644 --- a/subsys/mctp/mctp_uart.c +++ b/subsys/pmci/mctp/mctp_uart.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include