Skip to content
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.

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

Add gearbox phy device files and a new physyncd docker to support VS gearbox phy feature #4851

Merged
merged 38 commits into from
Sep 25, 2020
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
f7253f6
buildimage: Add gearbox phy device files and a new physyncd docker to…
slogan621 Jun 25, 2020
39f20a1
remove gearsyncd from critical processes list
slogan621 Jun 26, 2020
fb2ccb7
minor change to comments
slogan621 Jun 29, 2020
76d0d2d
cleanup startup/shutdown scripts for physyncd, removing platform spec…
slogan621 Jun 30, 2020
06ce6fa
minor cleanups in device configs
slogan621 Jul 8, 2020
4e14591
use supervisord dependent startup to start services
slogan621 Jul 8, 2020
e8958db
more physyncd startup fixes
slogan621 Jul 10, 2020
3aa9f32
Revert "more physyncd startup fixes"
slogan621 Jul 10, 2020
21af753
changes to support current sonic usage of supervisord in physyncd docker
slogan621 Jul 11, 2020
18d6b90
Merge remote-tracking branch 'upstream/master'
slogan621 Jul 16, 2020
26ecb37
changes to gearsyncd startup parameters for supervisord
slogan621 Jul 29, 2020
c5e7280
Merge branch 'master' of https://github.com/Azure/sonic-buildimage in…
slogan621 Jul 29, 2020
889a98d
backout 26ecb378cb98265a746b1544473848ad3193335e
slogan621 Jul 31, 2020
07a4785
Merge remote-tracking branch 'sydlogan/master'
slogan621 Aug 2, 2020
86a0c5c
fix perms on physyncd.sh
slogan621 Aug 3, 2020
8115362
duplicate portsyncd startup for gearsyncd, they should share same set…
slogan621 Aug 3, 2020
ba5cd86
minor changes to orchagent supervisord.conf for gearsyncd
slogan621 Aug 4, 2020
79fc081
fix permissions on vs physyncd docker start script
slogan621 Aug 4, 2020
910e23e
resolve merge conflict
slogan621 Aug 24, 2020
844fc16
Merge branch 'master' into master
sydlogan Aug 24, 2020
7ac845a
rename physyncd to gbsyncd
slogan621 Aug 24, 2020
2a6ded4
Dell Force 10 S6000 gearbox config with one in device/virtual/x86_64-…
slogan621 Aug 25, 2020
321c923
fix merge conflict
slogan621 Aug 25, 2020
ea01eb7
Merge branch 'master' of https://github.com/sydlogan/sonic-buildimage
slogan621 Aug 25, 2020
d316ebc
minor edits
slogan621 Aug 25, 2020
db2da7f
Merge remote-tracking branch 'upstream/master'
slogan621 Sep 18, 2020
387a076
renumber table numbers to accomodate recent rest addition
slogan621 Sep 18, 2020
9809b8e
Update docs for virtual x86 KVM to better describe default_sku
slogan621 Sep 19, 2020
3cb2055
remove openssl reference, and checks for broadcom platform
slogan621 Sep 19, 2020
26f85d4
remove unintended changes to supervisord.conf for swssconfig
slogan621 Sep 19, 2020
0b808f3
remove more unintended changes to supervisord.conf for swssconfig
slogan621 Sep 19, 2020
be70bfa
fix build commands in README
slogan621 Sep 19, 2020
106de40
from stretch to buster
slogan621 Sep 19, 2020
2014eea
update iproute2 and libcap2 for buster
slogan621 Sep 19, 2020
6eaf960
refactor gbsyncd.sh and syncd.sh
slogan621 Sep 22, 2020
d633780
docs for how to change hwsku to use something other than default
slogan621 Sep 23, 2020
f3fe3c4
update build templates for new script
slogan621 Sep 23, 2020
9f4cc83
Minor edit to fix "show gearbox phys status" command
slogan621 Sep 24, 2020
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is the purpose to add gearbox setting to dell s6000? s6000 is phyless design.

Copy link

@wbschwar wbschwar Jul 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Guohan, The s6000 actually has a sesto PHY and was used in our original prototype of gearbox and Phy abstraction interface. We have changed the development vehicle to the Silverstone DP as it is using a real Milleneo Broadcom PHY supported by Broadcom Phy Abstraction Interface code.

The s6000 is now only used for virtual Switch if that makes sense. Silverstone DP PR was not approved yet (its been pending for a while) but we did merge it into our SONiC base and are using that for real testing on JR2 / Gearbox.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not aware of s6000 has any phy. which port has the phy?

"CONTEXTS": [
{
"guid" : 0,
"name" : "sw0",
"dbAsic" : "ASIC_DB",
"dbCounters" : "COUNTERS_DB",
"dbFlex": "FLEX_COUNTER_DB",
"dbState" : "STATE_DB",
"switches": [
{
"index" : 0,
"hwinfo" : ""
}
]
},
{
"guid" : 1,
"name" : "phy1",
"dbAsic" : "GB_ASIC_DB",
"dbCounters" : "GB_COUNTERS_DB",
"dbFlex": "GB_FLEX_COUNTER_DB",
"dbState" : "STATE_DB",
"switches": [
{
"index" : 1,
"hwinfo" : ""
}
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"phys": [
{
"phy_id": 1,
"name": "sesto-1",
"address": "0x1000",
"lib_name": "libsai_phy_sesto-1.so",
"firmware_path": "/tmp/phy-sesto-1.bin",
"config_file": "/usr/share/sonic/hwsku/phy1_config_1.json",
"sai_init_config_file": "/usr/share/sonic/hwsku/sesto-1.bcm",
"phy_access": "mdio",
"bus_id": 0
}
],
"interfaces": [
{
"name": "Ethernet0",
"index": 0,
"phy_id" : 1,
"system_lanes": [200,201],
"line_lanes": [206]
},
{
"name": "Ethernet4",
"index": 1,
"phy_id" : 1,
"system_lanes": [202,203],
"line_lanes": [207]
},
{
"name": "Ethernet8",
"index": 2,
"phy_id" : 1,
"system_lanes": [204,205],
"line_lanes": [208]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
{
"lanes": [
{
"index": 200,
"local_lane_id": 0,
"system_side": true,
"tx_polarity": 0,
"rx_polarity": 0,
"line_tx_lanemap": 0,
"line_rx_lanemap": 0,
"line_to_system_lanemap": 0,
"mdio_addr": "0x0200"
},
{
"index": 201,
"local_lane_id": 0,
"system_side": true,
"tx_polarity": 0,
"rx_polarity": 0,
"line_tx_lanemap": 0,
"line_rx_lanemap": 0,
"line_to_system_lanemap": 0,
"mdio_addr": "0x0201"
},
{
"index": 202,
"local_lane_id": 0,
"system_side": true,
"tx_polarity": 0,
"rx_polarity": 0,
"line_tx_lanemap": 0,
"line_rx_lanemap": 0,
"line_to_system_lanemap": 0,
"mdio_addr": "0x0202"
},
{
"index": 203,
"local_lane_id": 0,
"system_side": true,
"tx_polarity": 0,
"rx_polarity": 0,
"line_tx_lanemap": 0,
"line_rx_lanemap": 0,
"line_to_system_lanemap": 0,
"mdio_addr": "0x0203"
},
{
"index": 204,
"local_lane_id": 0,
"system_side": false,
"tx_polarity": 0,
"rx_polarity": 0,
"line_tx_lanemap": 0,
"line_rx_lanemap": 0,
"line_to_system_lanemap": 200,
"mdio_addr": "0x0204"
},
{
"index": 205,
"local_lane_id": 0,
"system_side": false,
"tx_polarity": 0,
"rx_polarity": 0,
"line_tx_lanemap": 0,
"line_rx_lanemap": 0,
"line_to_system_lanemap": 202,
"mdio_addr": "0x0205"
},
{
"index": 206,
"local_lane_id": 0,
"system_side": true,
"tx_polarity": 0,
"rx_polarity": 0,
"line_tx_lanemap": 0,
"line_rx_lanemap": 0,
"line_to_system_lanemap": 0,
"mdio_addr": "0x0206"
},
{
"index": 207,
"local_lane_id": 0,
"system_side": false,
"tx_polarity": 0,
"rx_polarity": 0,
"line_tx_lanemap": 0,
"line_rx_lanemap": 0,
"line_to_system_lanemap": 0,
"mdio_addr": "0x0207"
},
{
"index": 208,
"local_lane_id": 0,
"system_side": true,
"tx_polarity": 0,
"rx_polarity": 0,
"line_tx_lanemap": 0,
"line_rx_lanemap": 0,
"line_to_system_lanemap": 0,
"mdio_addr": "0x0208"
}
],
"ports": [
{
"index": 0,
"mdio_addr": "0x2000",
"system_speed": 20000,
"system_fec": "none",
"system_auto_neg": true,
"system_loopback": "none",
"system_training": false,
"line_speed": 40000,
"line_fec": "none",
"line_auto_neg": true,
"line_media_type": "fiber",
"line_intf_type": "none",
"line_loopback": "none",
"line_training": false,
"line_adver_speed": [],
"line_adver_fec": [],
"line_adver_auto_neg": false,
"line_adver_asym_pause": false,
"line_adver_media_type": "fiber"
},
{
"index": 1,
"mdio_addr": "0x3000",
"system_speed": 20000,
"system_fec": "none",
"system_auto_neg": true,
"system_loopback": "none",
"system_training": false,
"line_speed": 40000,
"line_fec": "none",
"line_auto_neg": true,
"line_media_type": "fiber",
"line_intf_type": "none",
"line_loopback": "none",
"line_training": false,
"line_adver_speed": [],
"line_adver_fec": [],
"line_adver_auto_neg": false,
"line_adver_asym_pause": false,
"line_adver_media_type": "fiber"
},
{
"index": 2,
"mdio_addr": "0x4000",
"system_speed": 20000,
"system_fec": "none",
"system_auto_neg": true,
"system_loopback": "none",
"system_training": false,
"line_speed": 40000,
"line_fec": "none",
"line_auto_neg": true,
"line_media_type": "fiber",
"line_intf_type": "none",
"line_loopback": "none",
"line_training": false,
"line_adver_speed": [],
"line_adver_fec": [],
"line_adver_auto_neg": false,
"line_adver_asym_pause": false,
"line_adver_media_type": "fiber"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"CONTEXTS": [
{
"guid" : 0,
"name" : "sw0",
"dbAsic" : "ASIC_DB",
"dbCounters" : "COUNTERS_DB",
"dbFlex": "FLEX_COUNTER_DB",
"dbState" : "STATE_DB",
"switches": [
{
"index" : 0,
"hwinfo" : ""
}
]
},
{
"guid" : 1,
"name" : "phy1",
"dbAsic" : "GB_ASIC_DB",
"dbCounters" : "GB_COUNTERS_DB",
"dbFlex": "GB_FLEX_COUNTER_DB",
"dbState" : "STATE_DB",
"switches": [
{
"index" : 1,
"hwinfo" : ""
}
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"phys": [
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where can i find the the format for this gearbox_config.json?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

{
"phy_id": 1,
"name": "sesto-1",
sydlogan marked this conversation as resolved.
Show resolved Hide resolved
"address": "0x1000",
"lib_name": "libsai_phy_sesto-1.so",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we need to specify the library name here. it seems unnecessary.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original requirement was to support the flexibility that each PHY could have their own so file. Please note that this is currently a placeholder and can change as required.

"firmware_path": "/tmp/phy-sesto-1.bin",
sydlogan marked this conversation as resolved.
Show resolved Hide resolved
"config_file": "/usr/share/sonic/hwsku/sesto-1.json",
"sai_init_config_file": "/usr/share/sonic/hwsku/sesto-1.bcm",
sydlogan marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where is this sai_init_config_file checked in? I think we need this file to be checked in.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This initial gearbox delivery is targeting VS and therefore doesn't use any .bcm file. Please note that this is currently a placeholder and can change as required.

"phy_access": "mdio",
"bus_id": 0
}
],
"interfaces": [
{
"name": "Ethernet48",
"index": 49,
"phy_id" : 1,
"system_lanes": [200,201,202,203],
"line_lanes": [204,205]
},
{
"name": "Ethernet49",
"index": 50,
"phy_id" : 1,
"system_lanes": [206,207,208,209],
"line_lanes": [210,211]
},
{
"name": "Ethernet50",
"index": 51,
"phy_id" : 1,
"system_lanes": [212,213,214,215],
sydlogan marked this conversation as resolved.
Show resolved Hide resolved
"line_lanes": [216]
}
]
}
Loading