Skip to content

Commit

Permalink
[Nokia][device-data] Rename the port name in the port_config.ini and …
Browse files Browse the repository at this point in the history 
…also remove ECN setting in the BCM config file (#13053)

Signed-off-by: mlok <[email protected]>
  • Loading branch information
@mlok-nokia @mssonicbld
mlok-nokia authored and mssonicbld committed Jan 5, 2023
1 parent 83e87cd commit ad3beb6
Show file tree
Hide file tree
Showing 10 changed files with 86 additions and 90 deletions.
1 change: 0 additions & 1 deletion ...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ dma_desc_aggregator_chain_length_max.BCM8885X=1000
dma_desc_aggregator_enable_specific_MDB_LPM.BCM8885X=1
dma_desc_aggregator_timeout_usec.BCM8885X=1000
dport_map_direct.BCM8885X=1
sai_postinit_cmd_file=/usr/share/sonic/hwsku/sai_postinit_cmd.soc
dtm_flow_mapping_mode_region_64.BCM8885X=3
dtm_flow_mapping_mode_region_65.BCM8885X=3
dtm_flow_mapping_mode_region_66.BCM8885X=3
Expand Down
42 changes: 21 additions & 21 deletions device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/port_config.ini
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
# name lanes alias index asic_port_name role speed coreid coreportid numvoq
Ethernet0 72,73,74,75 Ethernet0 1 Eth0-ASIC0 Ext 100000 1 1 8
Ethernet1 80,81,82,83 Ethernet1 2 Eth1-ASIC0 Ext 100000 1 2 8
Ethernet2 88,89,90,91 Ethernet2 3 Eth2-ASIC0 Ext 100000 1 3 8
Ethernet3 96,97,98,99 Ethernet3 4 Eth3-ASIC0 Ext 100000 1 4 8
Ethernet4 104,105,106,107 Ethernet4 5 Eth4-ASIC0 Ext 100000 1 5 8
Ethernet5 112,113,114,115 Ethernet5 6 Eth5-ASIC0 Ext 100000 1 6 8
Ethernet6 120,121,122,123 Ethernet6 7 Eth6-ASIC0 Ext 100000 1 7 8
Ethernet7 128,129,130,131 Ethernet7 8 Eth7-ASIC0 Ext 100000 1 8 8
Ethernet8 136,137,138,139 Ethernet8 9 Eth8-ASIC0 Ext 100000 1 9 8
Ethernet9 64,65,66,67 Ethernet9 10 Eth9-ASIC0 Ext 100000 0 10 8
Ethernet10 56,57,58,59 Ethernet10 11 Eth10-ASIC0 Ext 100000 0 11 8
Ethernet11 48,49,50,51 Ethernet11 12 Eth11-ASIC0 Ext 100000 0 12 8
Ethernet12 40,41,42,43 Ethernet12 13 Eth12-ASIC0 Ext 100000 0 13 8
Ethernet13 32,33,34,35 Ethernet13 14 Eth13-ASIC0 Ext 100000 0 14 8
Ethernet14 24,25,26,27 Ethernet14 15 Eth14-ASIC0 Ext 100000 0 15 8
Ethernet15 16,17,18,19 Ethernet15 16 Eth15-ASIC0 Ext 100000 0 16 8
Ethernet16 8,9,10,11 Ethernet16 17 Eth16-ASIC0 Ext 100000 0 17 8
Ethernet17 0,1,2,3 Ethernet17 18 Eth17-ASIC0 Ext 100000 0 18 8
Ethernet-IB0 115 Ethernet-IB0 37 Rcy1-ASIC0 Inb 10000 0 19 8
Ethernet-Rec0 116 Ethernet-Rec0 39 Rcy2-ASIC0 Rec 10000 1 20 8
# name lanes alias index role speed asic_port_name coreid coreportid numvoq
Ethernet0 72,73,74,75 Ethernet1/1 1 Ext 100000 Eth0 1 1 8
Ethernet8 80,81,82,83 Ethernet2/1 2 Ext 100000 Eth8 1 2 8
Ethernet16 88,89,90,91 Ethernet3/1 3 Ext 100000 Eth16 1 3 8
Ethernet24 96,97,98,99 Ethernet4/1 4 Ext 100000 Eth24 1 4 8
Ethernet32 104,105,106,107 Ethernet5/1 5 Ext 100000 Eth32 1 5 8
Ethernet40 112,113,114,115 Ethernet6/1 6 Ext 100000 Eth40 1 6 8
Ethernet48 120,121,122,123 Ethernet7/1 7 Ext 100000 Eth48 1 7 8
Ethernet56 128,129,130,131 Ethernet8/1 8 Ext 100000 Eth56 1 8 8
Ethernet64 136,137,138,139 Ethernet9/1 9 Ext 100000 Eth64 1 9 8
Ethernet72 64,65,66,67 Ethernet10/1 10 Ext 100000 Eth72 0 10 8
Ethernet80 56,57,58,59 Ethernet11/1 11 Ext 100000 Eth80 0 11 8
Ethernet88 48,49,50,51 Ethernet12/1 12 Ext 100000 Eth88 0 12 8
Ethernet96 40,41,42,43 Ethernet13/1 13 Ext 100000 Eth96 0 13 8
Ethernet104 32,33,34,35 Ethernet14/1 14 Ext 100000 Eth104 0 14 8
Ethernet112 24,25,26,27 Ethernet15/1 15 Ext 100000 Eth112 0 15 8
Ethernet120 16,17,18,19 Ethernet16/1 16 Ext 100000 Eth120 0 16 8
Ethernet128 8,9,10,11 Ethernet17/1 17 Ext 100000 Eth128 0 17 8
Ethernet136 0,1,2,3 Ethernet18/1 18 Ext 100000 Eth136 0 18 8
Ethernet-IB0 115 Recirc0/0 37 Inb 10000 Rcy0 0 19 8
Ethernet-Rec0 116 Recirc0/1 39 Rec 10000 Rcy1 1 20 8
2 changes: 1 addition & 1 deletion device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/sai_postinit_cmd.soc
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
mod ETPPC_MAP_FWD_QOS_DP_TO_TYPE_FWD 0 128 TYPE_FWD_KEEP_ECN_BITS=1

1 change: 0 additions & 1 deletion ...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ dma_desc_aggregator_chain_length_max.BCM8885X=1000
dma_desc_aggregator_enable_specific_MDB_LPM.BCM8885X=1
dma_desc_aggregator_timeout_usec.BCM8885X=1000
dport_map_direct.BCM8885X=1
sai_postinit_cmd_file=/usr/share/sonic/hwsku/sai_postinit_cmd.soc
dtm_flow_mapping_mode_region_64.BCM8885X=3
dtm_flow_mapping_mode_region_65.BCM8885X=3
dtm_flow_mapping_mode_region_66.BCM8885X=3
Expand Down
42 changes: 21 additions & 21 deletions device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/port_config.ini
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
# name lanes alias index asic_port_name role speed coreid coreportid numvoq
Ethernet18 72,73,74,75 Ethernet18 19 Eth0-ASIC1 Ext 100000 1 1 8
Ethernet19 80,81,82,83 Ethernet19 20 Eth1-ASIC1 Ext 100000 1 2 8
Ethernet20 88,89,90,91 Ethernet20 21 Eth2-ASIC1 Ext 100000 1 3 8
Ethernet21 96,97,98,99 Ethernet21 22 Eth3-ASIC1 Ext 100000 1 4 8
Ethernet22 104,105,106,107 Ethernet22 23 Eth4-ASIC1 Ext 100000 1 5 8
Ethernet23 112,113,114,115 Ethernet23 24 Eth5-ASIC1 Ext 100000 1 6 8
Ethernet24 120,121,122,123 Ethernet24 25 Eth6-ASIC1 Ext 100000 1 7 8
Ethernet25 128,129,130,131 Ethernet25 26 Eth7-ASIC1 Ext 100000 1 8 8
Ethernet26 136,137,138,139 Ethernet26 27 Eth8-ASIC1 Ext 100000 1 9 8
Ethernet27 64,65,66,67 Ethernet27 28 Eth9-ASIC1 Ext 100000 0 10 8
Ethernet28 56,57,58,59 Ethernet28 29 Eth10-ASIC1 Ext 100000 0 11 8
Ethernet29 48,49,50,51 Ethernet29 30 Eth11-ASIC1 Ext 100000 0 12 8
Ethernet30 40,41,42,43 Ethernet30 31 Eth12-ASIC1 Ext 100000 0 13 8
Ethernet31 32,33,34,35 Ethernet31 32 Eth13-ASIC1 Ext 100000 0 14 8
Ethernet32 24,25,26,27 Ethernet32 33 Eth14-ASIC1 Ext 100000 0 15 8
Ethernet33 16,17,18,19 Ethernet33 34 Eth15-ASIC1 Ext 100000 0 16 8
Ethernet34 8,9,10,11 Ethernet34 35 Eth16-ASIC1 Ext 100000 0 17 8
Ethernet35 0,1,2,3 Ethernet35 36 Eth17-ASIC1 Ext 100000 0 18 8
Ethernet-IB1 115 Ethernet-IB1 38 Rcy1-ASIC1 Inb 10000 0 19 8
Ethernet-Rec1 116 Ethernet-Rec1 40 Rcy2-ASIC1 Rec 10000 1 20 8
# name lanes alias index role speed asic_port_name coreid coreportid numvoq
Ethernet144 72,73,74,75 Ethernet19/1 19 Ext 100000 Eth0 1 1 8
Ethernet152 80,81,82,83 Ethernet20/1 20 Ext 100000 Eth8 1 2 8
Ethernet160 88,89,90,91 Ethernet21/1 21 Ext 100000 Eth16 1 3 8
Ethernet168 96,97,98,99 Ethernet22/1 22 Ext 100000 Eth24 1 4 8
Ethernet176 104,105,106,107 Ethernet23/1 23 Ext 100000 Eth32 1 5 8
Ethernet184 112,113,114,115 Ethernet24/1 24 Ext 100000 Eth40 1 6 8
Ethernet192 120,121,122,123 Ethernet25/1 25 Ext 100000 Eth48 1 7 8
Ethernet200 128,129,130,131 Ethernet26/1 26 Ext 100000 Eth56 1 8 8
Ethernet208 136,137,138,139 Ethernet27/1 27 Ext 100000 Eth64 1 9 8
Ethernet216 64,65,66,67 Ethernet28/1 28 Ext 100000 Eth72 0 10 8
Ethernet224 56,57,58,59 Ethernet29/1 29 Ext 100000 Eth80 0 11 8
Ethernet232 48,49,50,51 Ethernet30/1 30 Ext 100000 Eth88 0 12 8
Ethernet240 40,41,42,43 Ethernet31/1 31 Ext 100000 Eth96 0 13 8
Ethernet248 32,33,34,35 Ethernet32/1 32 Ext 100000 Eth104 0 14 8
Ethernet256 24,25,26,27 Ethernet33/1 33 Ext 100000 Eth112 0 15 8
Ethernet264 16,17,18,19 Ethernet34/1 34 Ext 100000 Eth120 0 16 8
Ethernet272 8,9,10,11 Ethernet35/1 35 Ext 100000 Eth128 0 17 8
Ethernet280 0,1,2,3 Ethernet36/1 36 Ext 100000 Eth136 0 18 8
Ethernet-IB1 115 Recirc1/0 38 Inb 10000 Rcy0 0 19 8
Ethernet-Rec1 116 Recirc1/1 40 Rec 10000 Rcy1 1 20 8
2 changes: 1 addition & 1 deletion device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/sai_postinit_cmd.soc
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
mod ETPPC_MAP_FWD_QOS_DP_TO_TYPE_FWD 0 128 TYPE_FWD_KEEP_ECN_BITS=1

42 changes: 21 additions & 21 deletions device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/port_config.ini
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
# name lanes alias index asic_port_name role speed coreid coreportid numvoq
Ethernet0 72,73,74,75,76,77,78,79 Ethernet0 1 Eth0-ASIC0 Ext 400000 1 1 8
Ethernet1 80,81,82,83,84,85,86,87 Ethernet1 2 Eth1-ASIC0 Ext 400000 1 2 8
Ethernet2 88,89,90,91,92,93,94,95 Ethernet2 3 Eth2-ASIC0 Ext 400000 1 3 8
Ethernet3 96,97,98,99,100,101,102,103 Ethernet3 4 Eth3-ASIC0 Ext 400000 1 4 8
Ethernet4 104,105,106,107,108,109,110,111 Ethernet4 5 Eth4-ASIC0 Ext 400000 1 5 8
Ethernet5 112,113,114,115,116,117,118,119 Ethernet5 6 Eth5-ASIC0 Ext 400000 1 6 8
Ethernet6 120,121,122,123,124,125,126,127 Ethernet6 7 Eth6-ASIC0 Ext 400000 1 7 8
Ethernet7 128,129,130,131,132,133,134,135 Ethernet7 8 Eth7-ASIC0 Ext 400000 1 8 8
Ethernet8 136,137,138,139,140,141,142,143 Ethernet8 9 Eth8-ASIC0 Ext 400000 1 9 8
Ethernet9 64,65,66,67,68,69,70,71 Ethernet9 10 Eth9-ASIC0 Ext 400000 0 10 8
Ethernet10 56,57,58,59,60,61,62,63 Ethernet10 11 Eth10-ASIC0 Ext 400000 0 11 8
Ethernet11 48,49,50,51,52,53,54,55 Ethernet11 12 Eth11-ASIC0 Ext 400000 0 12 8
Ethernet12 40,41,42,43,44,45,46,47 Ethernet12 13 Eth12-ASIC0 Ext 400000 0 13 8
Ethernet13 32,33,34,35,36,37,38,39 Ethernet13 14 Eth13-ASIC0 Ext 400000 0 14 8
Ethernet14 24,25,26,27,28,29,30,31 Ethernet14 15 Eth14-ASIC0 Ext 400000 0 15 8
Ethernet15 16,17,18,19,20,21,22,23 Ethernet15 16 Eth15-ASIC0 Ext 400000 0 16 8
Ethernet16 8,9,10,11,12,13,14,15 Ethernet16 17 Eth16-ASIC0 Ext 400000 0 17 8
Ethernet17 0,1,2,3,4,5,6,7 Ethernet17 18 Eth17-ASIC0 Ext 400000 0 18 8
Ethernet-IB0 115 Ethernet-IB0 37 Rcy1-ASIC0 Inb 10000 0 19 8
Ethernet-Rec0 116 Ethernet-Rec0 39 Rcy2-ASIC0 Rec 10000 1 20 8
# name lanes alias index role speed asic_port_name coreid coreportid numvoq
Ethernet0 72,73,74,75,76,77,78,79 Ethernet1/1 1 Ext 400000 Eth0 1 1 8
Ethernet8 80,81,82,83,84,85,86,87 Ethernet2/1 2 Ext 400000 Eth8 1 2 8
Ethernet16 88,89,90,91,92,93,94,95 Ethernet3/1 3 Ext 400000 Eth16 1 3 8
Ethernet24 96,97,98,99,100,101,102,103 Ethernet4/1 4 Ext 400000 Eth24 1 4 8
Ethernet32 104,105,106,107,108,109,110,111 Ethernet5/1 5 Ext 400000 Eth32 1 5 8
Ethernet40 112,113,114,115,116,117,118,119 Ethernet6/1 6 Ext 400000 Eth40 1 6 8
Ethernet48 120,121,122,123,124,125,126,127 Ethernet7/1 7 Ext 400000 Eth48 1 7 8
Ethernet56 128,129,130,131,132,133,134,135 Ethernet8/1 8 Ext 400000 Eth56 1 8 8
Ethernet64 136,137,138,139,140,141,142,143 Ethernet9/1 9 Ext 400000 Eth64 1 9 8
Ethernet72 64,65,66,67,68,69,70,71 Ethernet10/1 10 Ext 400000 Eth72 0 10 8
Ethernet80 56,57,58,59,60,61,62,63 Ethernet11/1 11 Ext 400000 Eth80 0 11 8
Ethernet88 48,49,50,51,52,53,54,55 Ethernet12/1 12 Ext 400000 Eth88 0 12 8
Ethernet96 40,41,42,43,44,45,46,47 Ethernet13/1 13 Ext 400000 Eth96 0 13 8
Ethernet104 32,33,34,35,36,37,38,39 Ethernet14/1 14 Ext 400000 Eth104 0 14 8
Ethernet112 24,25,26,27,28,29,30,31 Ethernet15/1 15 Ext 400000 Eth112 0 15 8
Ethernet120 16,17,18,19,20,21,22,23 Ethernet16/1 16 Ext 400000 Eth120 0 16 8
Ethernet128 8,9,10,11,12,13,14,15 Ethernet17/1 17 Ext 400000 Eth128 0 17 8
Ethernet136 0,1,2,3,4,5,6,7 Ethernet18/1 18 Ext 400000 Eth136 0 18 8
Ethernet-IB0 115 Recirc0/0 37 Inb 10000 Rcy0 0 19 8
Ethernet-Rec0 116 Recirc0/1 39 Rec 10000 Rcy1 1 20 8
1 change: 0 additions & 1 deletion device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/sai_postinit_cmd.soc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,3 @@ phy set 17 reg=0xd137 data=0 lane=2
phy set 17 reg=0xd138 data=0 lane=2
phy set 17 reg=0xd133 data=0x1804 lane=2

mod ETPPC_MAP_FWD_QOS_DP_TO_TYPE_FWD 0 128 TYPE_FWD_KEEP_ECN_BITS=1
Loading

0 comments on commit ad3beb6

Please sign in to comment.