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.

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

Jump to bottom

Advance swss #5099

Closed
wants to merge 18 commits into from
Closed

Advance swss #5099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 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
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
1b97021
[submodule]: update sonic-swss
slogan621 Aug 4, 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
32 changes: 32 additions & 0 deletions device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/context_config.json
View file
Open in desktop
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" : ""
}
]
}
]
}
38 changes: 38 additions & 0 deletions device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/gearbox_config.json
View file
Open in desktop
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]
}
]
}
168 changes: 168 additions & 0 deletions device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/phy1_config_1.json
View file
Open in desktop
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"
}
]
}
32 changes: 32 additions & 0 deletions device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-25G/context_config.json
View file
Open in desktop
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" : ""
}
]
}
]
}
38 changes: 38 additions & 0 deletions device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-25G/gearbox_config.json
View file
Open in desktop
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/sesto-1.json",
"sai_init_config_file": "/usr/share/sonic/hwsku/sesto-1.bcm",
"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],
"line_lanes": [216]
}
]
}
Loading