From 07d6f424dd1174e1cda984a17e4a83db64c9e4af Mon Sep 17 00:00:00 2001 From: marif-nexthop Date: Thu, 22 Oct 2026 01:44:49 +0000 Subject: [PATCH 1/2] [Nexthop][misc] Introduce the m4340nhp platform (#1828) --- .github/pr-projects.json | 1 + fboss/agent/platforms/common/tests/PlatformMappingUtilsTest.cpp | 1 + .../m4340nhp/platform_mapping/m4340nhp_platform_descriptor.csv | 2 ++ fboss/lib/if/fboss_common.thrift | 1 + 4 files changed, 5 insertions(+) create mode 100644 fboss/configs/platforms/nexthop/m4340nhp/platform_mapping/m4340nhp_platform_descriptor.csv diff --git a/.github/pr-projects.json b/.github/pr-projects.json index 2f2237419d0a8..b74ed0ad3c31f 100644 --- a/.github/pr-projects.json +++ b/.github/pr-projects.json @@ -11,6 +11,7 @@ "ladakh800bcls", "m4061nhp", "m4062nhp", + "m4340nhp", "meru800bfa", "meru800bia", "minipack", diff --git a/fboss/agent/platforms/common/tests/PlatformMappingUtilsTest.cpp b/fboss/agent/platforms/common/tests/PlatformMappingUtilsTest.cpp index 56bd1d27eb5d7..0d3e1efa7d593 100644 --- a/fboss/agent/platforms/common/tests/PlatformMappingUtilsTest.cpp +++ b/fboss/agent/platforms/common/tests/PlatformMappingUtilsTest.cpp @@ -138,6 +138,7 @@ TEST( PlatformType::PLATFORM_M4062NHP, PlatformType::PLATFORM_M4061CLSC, PlatformType::PLATFORM_M5120CSC, + PlatformType::PLATFORM_M4340NHP, futurePlatformType, }; for (const auto type : platformTypes) { diff --git a/fboss/configs/platforms/nexthop/m4340nhp/platform_mapping/m4340nhp_platform_descriptor.csv b/fboss/configs/platforms/nexthop/m4340nhp/platform_mapping/m4340nhp_platform_descriptor.csv new file mode 100644 index 0000000000000..b9ac4c549f34b --- /dev/null +++ b/fboss/configs/platforms/nexthop/m4340nhp/platform_mapping/m4340nhp_platform_descriptor.csv @@ -0,0 +1,2 @@ +System_Vendor,Platform_Type,Product_Name_Prefixes,Mode_Names,Asic_Type +nexthop,PLATFORM_M4340NHP,M4340NHP,m4340nhp,ASIC_TYPE_QUMRAN4D diff --git a/fboss/lib/if/fboss_common.thrift b/fboss/lib/if/fboss_common.thrift index a22a231072c3a..6cd8bbdfb1e00 100644 --- a/fboss/lib/if/fboss_common.thrift +++ b/fboss/lib/if/fboss_common.thrift @@ -71,6 +71,7 @@ enum PlatformType { PLATFORM_WEDGE800CNHP = 56, PLATFORM_M4061CLSC = 57, PLATFORM_M4052ACTM = 58, + PLATFORM_M4340NHP = 59, PLATFORM_UNKNOWN = 1000, # Placeholder for unknown platform type } From 9d2c498f9b5ffdd0ab9b393eac2e2f5a9b24666d Mon Sep 17 00:00:00 2001 From: Lotus Fenn Date: Sat, 24 Oct 2026 18:32:28 +0000 Subject: [PATCH 2/2] [Nexthop][m4061nhp] Introduce the m4061nhp platform m4061nhp is a Nexthop switch on the Broadcom Tomahawk 6 with 64 OSFP ports and a QSFP28 management port. Add PLATFORM_M4061NHP = 60 and its platform descriptor, and list it among the platforms that need an external platform mapping. Stacked on https://github.com/facebook/fboss/pull/1828 (PLATFORM_M4340NHP = 59). --- fboss/agent/platforms/common/tests/PlatformMappingUtilsTest.cpp | 1 + .../m4061nhp/platform_mapping/m4061nhp_platform_descriptor.csv | 2 ++ fboss/lib/if/fboss_common.thrift | 1 + 3 files changed, 4 insertions(+) create mode 100644 fboss/configs/platforms/nexthop/m4061nhp/platform_mapping/m4061nhp_platform_descriptor.csv diff --git a/fboss/agent/platforms/common/tests/PlatformMappingUtilsTest.cpp b/fboss/agent/platforms/common/tests/PlatformMappingUtilsTest.cpp index 0d3e1efa7d593..89022c44d5636 100644 --- a/fboss/agent/platforms/common/tests/PlatformMappingUtilsTest.cpp +++ b/fboss/agent/platforms/common/tests/PlatformMappingUtilsTest.cpp @@ -139,6 +139,7 @@ TEST( PlatformType::PLATFORM_M4061CLSC, PlatformType::PLATFORM_M5120CSC, PlatformType::PLATFORM_M4340NHP, + PlatformType::PLATFORM_M4061NHP, futurePlatformType, }; for (const auto type : platformTypes) { diff --git a/fboss/configs/platforms/nexthop/m4061nhp/platform_mapping/m4061nhp_platform_descriptor.csv b/fboss/configs/platforms/nexthop/m4061nhp/platform_mapping/m4061nhp_platform_descriptor.csv new file mode 100644 index 0000000000000..a18fdfa54bdfb --- /dev/null +++ b/fboss/configs/platforms/nexthop/m4061nhp/platform_mapping/m4061nhp_platform_descriptor.csv @@ -0,0 +1,2 @@ +System_Vendor,Platform_Type,Product_Name_Prefixes,Mode_Names,Asic_Type +nexthop,PLATFORM_M4061NHP,M4061NHP,m4061nhp,ASIC_TYPE_TOMAHAWK6 diff --git a/fboss/lib/if/fboss_common.thrift b/fboss/lib/if/fboss_common.thrift index 6cd8bbdfb1e00..e4851519fb258 100644 --- a/fboss/lib/if/fboss_common.thrift +++ b/fboss/lib/if/fboss_common.thrift @@ -72,6 +72,7 @@ enum PlatformType { PLATFORM_M4061CLSC = 57, PLATFORM_M4052ACTM = 58, PLATFORM_M4340NHP = 59, + PLATFORM_M4061NHP = 60, PLATFORM_UNKNOWN = 1000, # Placeholder for unknown platform type }