Skip to content

Commit

Permalink
Merge branch 'sonic-net:master' into v2
Browse files Browse the repository at this point in the history
  • Loading branch information
@Yagami-Jiang
Yagami-Jiang authored Apr 7, 2023
2 parents 142282a + d74055e commit 31abf62
Show file tree
Hide file tree
Showing 48 changed files with 745 additions and 1,222 deletions.
3 changes: 2 additions & 1 deletion .azure-pipelines/azure-pipelines-image-template.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ jobs:
- template: .azure-pipelines/cleanup.yml@buildimage
- ${{ parameters.preSteps }}
- script: |
BUILD_OPTIONS="$(BUILD_OPTIONS)"
if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-armhf)$"; then
CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=$(CACHE_MODE) SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/$(PLATFORM_AZP)"
BUILD_OPTIONS="$(BUILD_OPTIONS) $CACHE_OPTIONS"
echo "##vso[task.setvariable variable=BUILD_OPTIONS]$BUILD_OPTIONS"
fi
echo "##vso[task.setvariable variable=BUILD_OPTIONS]$BUILD_OPTIONS"
displayName: "Set cache options"
- checkout: self
submodules: recursive
Expand Down
95 changes: 55 additions & 40 deletions ...86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,46 +426,61 @@ port_init_speed_cc.BCM8869X=200000
port_init_speed_cd.BCM8869X=400000
port_init_speed_il.BCM8869X=10312

#ucode_port_100.BCM8869X=RCY_MIRROR.0:core_0.100
#ucode_port_101.BCM8869X=RCY_MIRROR.1:core_0.101
#ucode_port_102.BCM8869X=RCY_MIRROR.2:core_0.102
#ucode_port_103.BCM8869X=RCY_MIRROR.3:core_0.103
#ucode_port_104.BCM8869X=RCY_MIRROR.4:core_0.104
#ucode_port_105.BCM8869X=RCY_MIRROR.5:core_0.105
#ucode_port_106.BCM8869X=RCY_MIRROR.6:core_0.106
#ucode_port_107.BCM8869X=RCY_MIRROR.7:core_0.107
#ucode_port_108.BCM8869X=RCY_MIRROR.8:core_0.108
#ucode_port_109.BCM8869X=RCY_MIRROR.9:core_0.109
#ucode_port_110.BCM8869X=RCY_MIRROR.10:core_0.110
#ucode_port_111.BCM8869X=RCY_MIRROR.11:core_0.111
#ucode_port_112.BCM8869X=RCY_MIRROR.12:core_0.112
#ucode_port_113.BCM8869X=RCY_MIRROR.13:core_0.113
#ucode_port_114.BCM8869X=RCY_MIRROR.14:core_0.114
#ucode_port_115.BCM8869X=RCY_MIRROR.15:core_0.115
#ucode_port_116.BCM8869X=RCY_MIRROR.16:core_0.116
#ucode_port_117.BCM8869X=RCY_MIRROR.17:core_0.117
#ucode_port_118.BCM8869X=RCY_MIRROR.18:core_0.118
#ucode_port_119.BCM8869X=RCY_MIRROR.19:core_0.119
#ucode_port_120.BCM8869X=RCY_MIRROR.0:core_1.120
#ucode_port_121.BCM8869X=RCY_MIRROR.1:core_1.121
#ucode_port_122.BCM8869X=RCY_MIRROR.2:core_1.122
#ucode_port_123.BCM8869X=RCY_MIRROR.3:core_1.123
#ucode_port_124.BCM8869X=RCY_MIRROR.4:core_1.124
#ucode_port_125.BCM8869X=RCY_MIRROR.5:core_1.125
#ucode_port_126.BCM8869X=RCY_MIRROR.6:core_1.126
#ucode_port_127.BCM8869X=RCY_MIRROR.7:core_1.127
#ucode_port_128.BCM8869X=RCY_MIRROR.8:core_1.128
#ucode_port_129.BCM8869X=RCY_MIRROR.9:core_1.129
#ucode_port_130.BCM8869X=RCY_MIRROR.10:core_1.130
#ucode_port_131.BCM8869X=RCY_MIRROR.11:core_1.131
#ucode_port_132.BCM8869X=RCY_MIRROR.12:core_1.132
#ucode_port_133.BCM8869X=RCY_MIRROR.13:core_1.133
#ucode_port_134.BCM8869X=RCY_MIRROR.14:core_1.134
#ucode_port_135.BCM8869X=RCY_MIRROR.15:core_1.135
#ucode_port_136.BCM8869X=RCY_MIRROR.16:core_1.136
#ucode_port_137.BCM8869X=RCY_MIRROR.17:core_1.137
#ucode_port_138.BCM8869X=RCY_MIRROR.18:core_1.138
#ucode_port_139.BCM8869X=RCY_MIRROR.19:core_1.139
ucode_port_100.BCM8869X=RCY_MIRROR.0:core_0.100
ucode_port_101.BCM8869X=RCY_MIRROR.1:core_0.101
ucode_port_102.BCM8869X=RCY_MIRROR.2:core_0.102
ucode_port_103.BCM8869X=RCY_MIRROR.3:core_0.103
ucode_port_104.BCM8869X=RCY_MIRROR.4:core_0.104
ucode_port_105.BCM8869X=RCY_MIRROR.5:core_0.105
ucode_port_106.BCM8869X=RCY_MIRROR.6:core_0.106
ucode_port_107.BCM8869X=RCY_MIRROR.7:core_0.107
ucode_port_108.BCM8869X=RCY_MIRROR.8:core_0.108
ucode_port_109.BCM8869X=RCY_MIRROR.9:core_0.109
ucode_port_110.BCM8869X=RCY_MIRROR.10:core_0.110
ucode_port_111.BCM8869X=RCY_MIRROR.11:core_0.111
ucode_port_112.BCM8869X=RCY_MIRROR.12:core_0.112
ucode_port_113.BCM8869X=RCY_MIRROR.13:core_0.113
ucode_port_114.BCM8869X=RCY_MIRROR.14:core_0.114
ucode_port_115.BCM8869X=RCY_MIRROR.15:core_0.115
ucode_port_116.BCM8869X=RCY_MIRROR.16:core_0.116
ucode_port_117.BCM8869X=RCY_MIRROR.17:core_0.117
ucode_port_118.BCM8869X=RCY_MIRROR.18:core_0.118
ucode_port_119.BCM8869X=RCY_MIRROR.19:core_0.119
ucode_port_120.BCM8869X=RCY_MIRROR.0:core_1.120
ucode_port_121.BCM8869X=RCY_MIRROR.1:core_1.121
ucode_port_122.BCM8869X=RCY_MIRROR.2:core_1.122
ucode_port_123.BCM8869X=RCY_MIRROR.3:core_1.123
ucode_port_124.BCM8869X=RCY_MIRROR.4:core_1.124
ucode_port_125.BCM8869X=RCY_MIRROR.5:core_1.125
ucode_port_126.BCM8869X=RCY_MIRROR.6:core_1.126
ucode_port_127.BCM8869X=RCY_MIRROR.7:core_1.127
ucode_port_128.BCM8869X=RCY_MIRROR.8:core_1.128
ucode_port_129.BCM8869X=RCY_MIRROR.9:core_1.129
ucode_port_130.BCM8869X=RCY_MIRROR.10:core_1.130
ucode_port_131.BCM8869X=RCY_MIRROR.11:core_1.131
ucode_port_132.BCM8869X=RCY_MIRROR.12:core_1.132
ucode_port_133.BCM8869X=RCY_MIRROR.13:core_1.133
ucode_port_134.BCM8869X=RCY_MIRROR.14:core_1.134
ucode_port_135.BCM8869X=RCY_MIRROR.15:core_1.135
ucode_port_136.BCM8869X=RCY_MIRROR.16:core_1.136
ucode_port_137.BCM8869X=RCY_MIRROR.17:core_1.137
ucode_port_138.BCM8869X=RCY_MIRROR.18:core_1.138
ucode_port_139.BCM8869X=RCY_MIRROR.19:core_1.139
ucode_port_140.BCM8869X=RCY_MIRROR.20:core_0.130
ucode_port_141.BCM8869X=RCY_MIRROR.21:core_0.131
ucode_port_142.BCM8869X=RCY_MIRROR.22:core_0.132
ucode_port_143.BCM8869X=RCY_MIRROR.23:core_0.133
ucode_port_144.BCM8869X=RCY_MIRROR.24:core_0.134
ucode_port_145.BCM8869X=RCY_MIRROR.25:core_0.135
ucode_port_146.BCM8869X=RCY_MIRROR.20:core_1.142
ucode_port_147.BCM8869X=RCY_MIRROR.21:core_1.143
ucode_port_148.BCM8869X=RCY_MIRROR.22:core_1.144
ucode_port_149.BCM8869X=RCY_MIRROR.23:core_1.145
ucode_port_150.BCM8869X=RCY_MIRROR.24:core_1.140
ucode_port_151.BCM8869X=RCY_MIRROR.26:core_1.141
ucode_port_152.BCM8869X=RCY_MIRROR.27:core_0.136
ucode_port_153.BCM8869X=RCY_MIRROR.28:core_0.137
ucode_port_154.BCM8869X=RCY_MIRROR.27:core_1.142

port_priorities.BCM8869X=8

Expand Down
102 changes: 51 additions & 51 deletions device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/port_config.ini
View file
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
# name lanes alias index role speed coreId corePortId numVoq
Ethernet0 6,7 Ethernet1/1 1 Ext 100000 0 1 8
Ethernet4 2,3 Ethernet2/1 2 Ext 100000 0 2 8
Ethernet8 4,5 Ethernet3/1 3 Ext 100000 0 3 8
Ethernet12 0,1 Ethernet4/1 4 Ext 100000 0 4 8
Ethernet16 14,15 Ethernet5/1 5 Ext 100000 0 5 8
Ethernet20 10,11 Ethernet6/1 6 Ext 100000 0 6 8
Ethernet24 12,13 Ethernet7/1 7 Ext 100000 0 7 8
Ethernet28 8,9 Ethernet8/1 8 Ext 100000 0 8 8
Ethernet32 22,23 Ethernet9/1 9 Ext 100000 0 9 8
Ethernet36 18,19 Ethernet10/1 10 Ext 100000 0 10 8
Ethernet40 20,21 Ethernet11/1 11 Ext 100000 0 11 8
Ethernet44 16,17 Ethernet12/1 12 Ext 100000 0 12 8
Ethernet48 30,31 Ethernet13/1 13 Ext 100000 0 13 8
Ethernet52 26,27 Ethernet14/1 14 Ext 100000 0 14 8
Ethernet56 28,29 Ethernet15/1 15 Ext 100000 0 15 8
Ethernet60 24,25 Ethernet16/1 16 Ext 100000 0 16 8
Ethernet64 38,39 Ethernet17/1 17 Ext 100000 0 17 8
Ethernet68 34,35 Ethernet18/1 18 Ext 100000 0 18 8
Ethernet72 36,37 Ethernet19/1 19 Ext 100000 0 19 8
Ethernet76 32,33 Ethernet20/1 20 Ext 100000 0 20 8
Ethernet80 46,47 Ethernet21/1 21 Ext 100000 0 21 8
Ethernet84 42,43 Ethernet22/1 22 Ext 100000 0 22 8
Ethernet88 44,45 Ethernet23/1 23 Ext 100000 0 23 8
Ethernet92 40,41 Ethernet24/1 24 Ext 100000 0 24 8
Ethernet96 94,95 Ethernet25/1 25 Ext 100000 1 25 8
Ethernet100 90,91 Ethernet26/1 26 Ext 100000 1 26 8
Ethernet104 92,93 Ethernet27/1 27 Ext 100000 1 27 8
Ethernet108 88,89 Ethernet28/1 28 Ext 100000 1 28 8
Ethernet112 86,87 Ethernet29/1 29 Ext 100000 1 29 8
Ethernet116 82,83 Ethernet30/1 30 Ext 100000 1 30 8
Ethernet120 84,85 Ethernet31/1 31 Ext 100000 1 31 8
Ethernet124 80,81 Ethernet32/1 32 Ext 100000 1 32 8
Ethernet128 78,79 Ethernet33/1 33 Ext 100000 1 33 8
Ethernet132 74,75 Ethernet34/1 34 Ext 100000 1 34 8
Ethernet136 76,77 Ethernet35/1 35 Ext 100000 1 35 8
Ethernet140 72,73 Ethernet36/1 36 Ext 100000 1 36 8
Ethernet144 70,71 Ethernet37/1 37 Ext 100000 1 37 8
Ethernet148 66,67 Ethernet38/1 38 Ext 100000 1 38 8
Ethernet152 68,69 Ethernet39/1 39 Ext 100000 1 39 8
Ethernet156 64,65 Ethernet40/1 40 Ext 100000 1 40 8
Ethernet160 62,63 Ethernet41/1 41 Ext 100000 1 41 8
Ethernet164 58,59 Ethernet42/1 42 Ext 100000 1 42 8
Ethernet168 60,61 Ethernet43/1 43 Ext 100000 1 43 8
Ethernet172 56,57 Ethernet44/1 44 Ext 100000 1 44 8
Ethernet176 54,55 Ethernet45/1 45 Ext 100000 1 45 8
Ethernet180 50,51 Ethernet46/1 46 Ext 100000 1 46 8
Ethernet184 52,53 Ethernet47/1 47 Ext 100000 1 47 8
Ethernet188 48,49 Ethernet48/1 48 Ext 100000 1 48 8
Ethernet-Rec0 249 Recirc0/0 51 Rec 400000 0 49 8
Ethernet-IB0 250 Recirc0/1 52 Inb 400000 1 50 8
# name lanes alias index role speed asic_port_name coreId corePortId numVoq
Ethernet0 6,7 Ethernet1/1 1 Ext 100000 Eth0 0 1 8
Ethernet4 2,3 Ethernet2/1 2 Ext 100000 Eth4 0 2 8
Ethernet8 4,5 Ethernet3/1 3 Ext 100000 Eth8 0 3 8
Ethernet12 0,1 Ethernet4/1 4 Ext 100000 Eth12 0 4 8
Ethernet16 14,15 Ethernet5/1 5 Ext 100000 Eth16 0 5 8
Ethernet20 10,11 Ethernet6/1 6 Ext 100000 Eth20 0 6 8
Ethernet24 12,13 Ethernet7/1 7 Ext 100000 Eth24 0 7 8
Ethernet28 8,9 Ethernet8/1 8 Ext 100000 Eth28 0 8 8
Ethernet32 22,23 Ethernet9/1 9 Ext 100000 Eth32 0 9 8
Ethernet36 18,19 Ethernet10/1 10 Ext 100000 Eth36 0 10 8
Ethernet40 20,21 Ethernet11/1 11 Ext 100000 Eth40 0 11 8
Ethernet44 16,17 Ethernet12/1 12 Ext 100000 Eth44 0 12 8
Ethernet48 30,31 Ethernet13/1 13 Ext 100000 Eth48 0 13 8
Ethernet52 26,27 Ethernet14/1 14 Ext 100000 Eth52 0 14 8
Ethernet56 28,29 Ethernet15/1 15 Ext 100000 Eth56 0 15 8
Ethernet60 24,25 Ethernet16/1 16 Ext 100000 Eth60 0 16 8
Ethernet64 38,39 Ethernet17/1 17 Ext 100000 Eth64 0 17 8
Ethernet68 34,35 Ethernet18/1 18 Ext 100000 Eth68 0 18 8
Ethernet72 36,37 Ethernet19/1 19 Ext 100000 Eth72 0 19 8
Ethernet76 32,33 Ethernet20/1 20 Ext 100000 Eth76 0 20 8
Ethernet80 46,47 Ethernet21/1 21 Ext 100000 Eth80 0 21 8
Ethernet84 42,43 Ethernet22/1 22 Ext 100000 Eth84 0 22 8
Ethernet88 44,45 Ethernet23/1 23 Ext 100000 Eth88 0 23 8
Ethernet92 40,41 Ethernet24/1 24 Ext 100000 Eth92 0 24 8
Ethernet96 94,95 Ethernet25/1 25 Ext 100000 Eth96 1 25 8
Ethernet100 90,91 Ethernet26/1 26 Ext 100000 Eth100 1 26 8
Ethernet104 92,93 Ethernet27/1 27 Ext 100000 Eth104 1 27 8
Ethernet108 88,89 Ethernet28/1 28 Ext 100000 Eth108 1 28 8
Ethernet112 86,87 Ethernet29/1 29 Ext 100000 Eth112 1 29 8
Ethernet116 82,83 Ethernet30/1 30 Ext 100000 Eth116 1 30 8
Ethernet120 84,85 Ethernet31/1 31 Ext 100000 Eth120 1 31 8
Ethernet124 80,81 Ethernet32/1 32 Ext 100000 Eth124 1 32 8
Ethernet128 78,79 Ethernet33/1 33 Ext 100000 Eth128 1 33 8
Ethernet132 74,75 Ethernet34/1 34 Ext 100000 Eth132 1 34 8
Ethernet136 76,77 Ethernet35/1 35 Ext 100000 Eth136 1 35 8
Ethernet140 72,73 Ethernet36/1 36 Ext 100000 Eth140 1 36 8
Ethernet144 70,71 Ethernet37/1 37 Ext 100000 Eth144 1 37 8
Ethernet148 66,67 Ethernet38/1 38 Ext 100000 Eth148 1 38 8
Ethernet152 68,69 Ethernet39/1 39 Ext 100000 Eth152 1 39 8
Ethernet156 64,65 Ethernet40/1 40 Ext 100000 Eth156 1 40 8
Ethernet160 62,63 Ethernet41/1 41 Ext 100000 Eth160 1 41 8
Ethernet164 58,59 Ethernet42/1 42 Ext 100000 Eth164 1 42 8
Ethernet168 60,61 Ethernet43/1 43 Ext 100000 Eth168 1 43 8
Ethernet172 56,57 Ethernet44/1 44 Ext 100000 Eth172 1 44 8
Ethernet176 54,55 Ethernet45/1 45 Ext 100000 Eth176 1 45 8
Ethernet180 50,51 Ethernet46/1 46 Ext 100000 Eth180 1 46 8
Ethernet184 52,53 Ethernet47/1 47 Ext 100000 Eth184 1 47 8
Ethernet188 48,49 Ethernet48/1 48 Ext 100000 Eth188 1 48 8
Ethernet-Rec0 249 Recirc0/0 51 Rec 400000 Rcy0 0 49 8
Ethernet-IB0 250 Recirc0/1 52 Inb 400000 Rcy1 1 50 8
40 changes: 40 additions & 0 deletions ...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,46 @@ tm_port_header_type_out_50=ETH
tm_port_header_type_in_50=ETH
port_init_speed_49=400000
port_init_speed_50=400000
ucode_port_100.BCM8885X=RCY_MIRROR.0:core_0.100
ucode_port_101.BCM8885X=RCY_MIRROR.1:core_0.101
ucode_port_102.BCM8885X=RCY_MIRROR.2:core_0.102
ucode_port_103.BCM8885X=RCY_MIRROR.3:core_0.103
ucode_port_104.BCM8885X=RCY_MIRROR.4:core_0.104
ucode_port_105.BCM8885X=RCY_MIRROR.5:core_0.105
ucode_port_106.BCM8885X=RCY_MIRROR.6:core_0.106
ucode_port_107.BCM8885X=RCY_MIRROR.7:core_0.107
ucode_port_108.BCM8885X=RCY_MIRROR.8:core_0.108
ucode_port_109.BCM8885X=RCY_MIRROR.9:core_0.109
ucode_port_110.BCM8885X=RCY_MIRROR.10:core_0.110
ucode_port_111.BCM8885X=RCY_MIRROR.11:core_0.111
ucode_port_112.BCM8885X=RCY_MIRROR.12:core_0.112
ucode_port_113.BCM8885X=RCY_MIRROR.13:core_0.113
ucode_port_114.BCM8885X=RCY_MIRROR.14:core_0.114
ucode_port_115.BCM8885X=RCY_MIRROR.15:core_0.115
ucode_port_116.BCM8885X=RCY_MIRROR.16:core_0.116
ucode_port_117.BCM8885X=RCY_MIRROR.17:core_0.117
ucode_port_118.BCM8885X=RCY_MIRROR.18:core_0.118
ucode_port_119.BCM8885X=RCY_MIRROR.19:core_0.119
ucode_port_120.BCM8885X=RCY_MIRROR.0:core_1.120
ucode_port_121.BCM8885X=RCY_MIRROR.1:core_1.121
ucode_port_122.BCM8885X=RCY_MIRROR.2:core_1.122
ucode_port_123.BCM8885X=RCY_MIRROR.3:core_1.123
ucode_port_124.BCM8885X=RCY_MIRROR.4:core_1.124
ucode_port_125.BCM8885X=RCY_MIRROR.5:core_1.125
ucode_port_126.BCM8885X=RCY_MIRROR.6:core_1.126
ucode_port_127.BCM8885X=RCY_MIRROR.7:core_1.127
ucode_port_128.BCM8885X=RCY_MIRROR.8:core_1.128
ucode_port_129.BCM8885X=RCY_MIRROR.9:core_1.129
ucode_port_130.BCM8885X=RCY_MIRROR.10:core_1.130
ucode_port_131.BCM8885X=RCY_MIRROR.11:core_1.131
ucode_port_132.BCM8885X=RCY_MIRROR.12:core_1.132
ucode_port_133.BCM8885X=RCY_MIRROR.13:core_1.133
ucode_port_134.BCM8885X=RCY_MIRROR.14:core_1.134
ucode_port_135.BCM8885X=RCY_MIRROR.15:core_1.135
ucode_port_136.BCM8885X=RCY_MIRROR.16:core_1.136
ucode_port_137.BCM8885X=RCY_MIRROR.17:core_1.137
ucode_port_138.BCM8885X=RCY_MIRROR.18:core_1.138
ucode_port_139.BCM8885X=RCY_MIRROR.19:core_1.139

#OLP port
tm_port_header_type_in_240=INJECTED_2
Expand Down
Loading

0 comments on commit 31abf62

Please sign in to comment.