Skip to content

[Nexthop][m4062nhp] BSP platform mapping #1373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anna-nexthop wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Nexthop][m4062nhp] BSP platform mapping #1373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions cmake/QsfpService.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,16 @@ target_link_libraries(saintpaul_bsp
FBThrift::thriftcpp2
)

add_library(m4062nhp_bsp
fboss/lib/bsp/m4062nhp/M4062nhpBspPlatformMapping.cpp
)

target_link_libraries(m4062nhp_bsp
bsp_platform_mapping
bsp_platform_mapping_cpp2
FBThrift::thriftcpp2
)

add_library(qsfp_bsp_core
fboss/lib/bsp/BspGenericSystemContainer.cpp
fboss/lib/bsp/BspIOBus.cpp
Expand Down Expand Up @@ -292,6 +302,7 @@ target_link_libraries(qsfp_bsp_core
ladakh800bcls_bsp
leh800bcls_bsp
saintpaul_bsp
m4062nhp_bsp
device_mdio
fpga_device
phy_management_base
Expand Down
1 change: 1 addition & 0 deletions fboss/lib/bsp/BUCK
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ cpp_library(
"//fboss/lib/bsp/janga800bic:janga800bic_bsp",
"//fboss/lib/bsp/ladakh800bcls:ladakh800bcls_bsp",
"//fboss/lib/bsp/leh800bcls:leh800bcls_bsp",
"//fboss/lib/bsp/m4062nhp:m4062nhp_bsp",
"//fboss/lib/bsp/meru800bfa:meru800bfa_bsp",
"//fboss/lib/bsp/meru800bia:meru800bia_bsp",
"//fboss/lib/bsp/minipack3bta:minipack3bta_bsp",
Expand Down
10 changes: 10 additions & 0 deletions fboss/lib/bsp/BspGenericSystemContainer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "fboss/lib/bsp/janga800bic/Janga800bicBspPlatformMapping.h"
#include "fboss/lib/bsp/ladakh800bcls/Ladakh800bclsBspPlatformMapping.h"
#include "fboss/lib/bsp/leh800bcls/Leh800bclsBspPlatformMapping.h"
#include "fboss/lib/bsp/m4062nhp/M4062nhpBspPlatformMapping.h"
#include "fboss/lib/bsp/meru800bfa/Meru800bfaBspPlatformMapping.h"
#include "fboss/lib/bsp/meru800bia/Meru800biaBspPlatformMapping.h"
#include "fboss/lib/bsp/minipack3bta/Minipack3BTABspPlatformMapping.h"
Expand Down Expand Up @@ -204,5 +205,14 @@ SaintpaulSystemContainer::getInstance() {
return _saintpaulSystemContainer.try_get();
}

using M4062nhpSystemContainer =
BspGenericSystemContainer<M4062nhpBspPlatformMapping>;
folly::Singleton<M4062nhpSystemContainer> _m4062nhpSystemContainer;
template <>
std::shared_ptr<M4062nhpSystemContainer>
M4062nhpSystemContainer::getInstance() {
return _m4062nhpSystemContainer.try_get();
}

} // namespace fboss
} // namespace facebook
1 change: 1 addition & 0 deletions fboss/lib/bsp/bspmapping/Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ const std::map<PlatformType, folly::StringPiece> kHardwareNameMap = {
kPortMappingIcecube800banwCsv},
{facebook::fboss::PlatformType::PLATFORM_SAINTPAUL,
kPortMappingSaintpaulCsv},
{facebook::fboss::PlatformType::PLATFORM_M4062NHP, kPortMappingM4062nhpCsv},
};

// Helper function to generate PHY CSV filename from regular CSV filename
Expand Down
2 changes: 2 additions & 0 deletions fboss/lib/bsp/bspmapping/Parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ inline constexpr folly::StringPiece kPortMappingIcecube800banwCsv{
"Icecube800banw_BspMapping.csv"};
inline constexpr folly::StringPiece kPortMappingSaintpaulCsv{
"Saintpaul_BspMapping.csv"};
inline constexpr folly::StringPiece kPortMappingM4062nhpCsv{
"M4062nhp_BspMapping.csv"};

class Parser {
public:
Expand Down
129 changes: 129 additions & 0 deletions fboss/lib/bsp/bspmapping/input/M4062nhp_BspMapping.csv
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions fboss/lib/bsp/bspmapping/test/ParserTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ TEST(ParserTest, GetNameForTests) {
facebook::fboss::Parser::getNameFor(
facebook::fboss::PlatformType::PLATFORM_SAINTPAUL),
"saintpaul");
EXPECT_EQ(
facebook::fboss::Parser::getNameFor(
facebook::fboss::PlatformType::PLATFORM_M4062NHP),
"m4062nhp");
}

TEST(ParserTest, GetTransceiverConfigRowFromCsvLine) {
Expand Down
17 changes: 17 additions & 0 deletions fboss/lib/bsp/m4062nhp/BUCK
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library")

oncall("fboss_optics_phy")

cpp_library(
name = "m4062nhp_bsp",
srcs = [
"M4062nhpBspPlatformMapping.cpp",
],
headers = [
"M4062nhpBspPlatformMapping.h",
],
exported_deps = [
"//fboss/lib/bsp:bsp_platform_mapping_lib",
"//thrift/lib/cpp2/protocol:protocol",
],
)
Loading
Loading