Merge branch 'sonic-net:master' into add_as4630-54npe_api2

Makefile.cache

@@ -295,10 +295,12 @@ define SAVE_INTO_CACHE
 		echo "Target $(1) dependencies are modifed - global save cache skipped" >> $($(1)_DST_PATH)/$(1).log
 		$(eval $(1)_CACHE_DIR := $(SONIC_DPKG_LOCAL_CACHE_DIR))
 	 )
-	$($(1)_CACHE_USER) tar -C $($(1)_BASE_PATH) -mczvf $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE) $(2) $(addprefix $($(1)_DST_PATH)/,$($(1)_DERIVED_DEBS) $($(1)_EXTRA_DEBS) )  \
+	cp $($(1)_DST_PATH)/$(1).log $($(1)_DST_PATH)/$(1).cached.log
+	$($(1)_CACHE_USER) tar -C $($(1)_BASE_PATH) -mczvf $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE) $(2) $(addprefix $($(1)_DST_PATH)/,$($(1)_DERIVED_DEBS) $($(1)_EXTRA_DEBS) $(1).cached.log)  \
 		1>>$($(1)_DST_PATH)/$(1).log
 	sudo chmod 777 $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE)
-
+	rm -f $($(1)_DST_PATH)/$(1).cached.log
+
 	echo "File $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE) saved in cache " >> $($(1)_DST_PATH)/$(1).log
 	echo "[ CACHE::SAVED ] $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE)" >> $($(1)_DST_PATH)/$(1).log
 

build_debian.sh

@@ -393,8 +393,8 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     python-is-python3       \
     cron                    \
     libprotobuf32           \
-    libgrpc++1              \
     libgrpc29               \
+    libgrpc++1.51           \
     haveged                 \
     fdisk                   \
     gpg                     \

device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm

@@ -453,17 +453,17 @@ fabric_connect_mode=FE
 fabric_logical_port_base=512
 
 # Fabric lane mapping
-lane_to_serdes_map_fabric_lane0=rx0:tx0
+lane_to_serdes_map_fabric_lane0=rx0:tx3
 lane_to_serdes_map_fabric_lane1=rx1:tx1
 lane_to_serdes_map_fabric_lane2=rx2:tx2
-lane_to_serdes_map_fabric_lane3=rx3:tx3
+lane_to_serdes_map_fabric_lane3=rx3:tx0
 lane_to_serdes_map_fabric_lane4=rx4:tx4
 lane_to_serdes_map_fabric_lane5=rx5:tx5
 lane_to_serdes_map_fabric_lane6=rx6:tx6
 lane_to_serdes_map_fabric_lane7=rx7:tx7
-lane_to_serdes_map_fabric_lane8=rx8:tx10
+lane_to_serdes_map_fabric_lane8=rx8:tx9
 lane_to_serdes_map_fabric_lane9=rx9:tx11
-lane_to_serdes_map_fabric_lane10=rx10:tx9
+lane_to_serdes_map_fabric_lane10=rx10:tx10
 lane_to_serdes_map_fabric_lane11=rx11:tx8
 lane_to_serdes_map_fabric_lane12=rx12:tx12
 lane_to_serdes_map_fabric_lane13=rx13:tx15
@@ -475,15 +475,15 @@ lane_to_serdes_map_fabric_lane18=rx18:tx16
 lane_to_serdes_map_fabric_lane19=rx19:tx19
 lane_to_serdes_map_fabric_lane20=rx20:tx21
 lane_to_serdes_map_fabric_lane21=rx21:tx23
-lane_to_serdes_map_fabric_lane22=rx22:tx20
-lane_to_serdes_map_fabric_lane23=rx23:tx22
-lane_to_serdes_map_fabric_lane24=rx24:tx26
+lane_to_serdes_map_fabric_lane22=rx22:tx22
+lane_to_serdes_map_fabric_lane23=rx23:tx20
+lane_to_serdes_map_fabric_lane24=rx24:tx25
 lane_to_serdes_map_fabric_lane25=rx25:tx24
-lane_to_serdes_map_fabric_lane26=rx26:tx25
-lane_to_serdes_map_fabric_lane27=rx27:tx27
+lane_to_serdes_map_fabric_lane26=rx26:tx27
+lane_to_serdes_map_fabric_lane27=rx27:tx26
 lane_to_serdes_map_fabric_lane28=rx28:tx31
-lane_to_serdes_map_fabric_lane29=rx29:tx30
-lane_to_serdes_map_fabric_lane30=rx30:tx29
+lane_to_serdes_map_fabric_lane29=rx29:tx29
+lane_to_serdes_map_fabric_lane30=rx30:tx30
 lane_to_serdes_map_fabric_lane31=rx31:tx28
 lane_to_serdes_map_fabric_lane32=rx32:tx32
 lane_to_serdes_map_fabric_lane33=rx33:tx33
@@ -522,17 +522,17 @@ lane_to_serdes_map_fabric_lane65=rx65:tx65
 lane_to_serdes_map_fabric_lane66=rx66:tx66
 lane_to_serdes_map_fabric_lane67=rx67:tx67
 lane_to_serdes_map_fabric_lane68=rx68:tx68
-lane_to_serdes_map_fabric_lane69=rx69:tx69
-lane_to_serdes_map_fabric_lane70=rx70:tx70
-lane_to_serdes_map_fabric_lane71=rx71:tx71
+lane_to_serdes_map_fabric_lane69=rx69:tx70
+lane_to_serdes_map_fabric_lane70=rx70:tx71
+lane_to_serdes_map_fabric_lane71=rx71:tx69
 lane_to_serdes_map_fabric_lane72=rx72:tx75
 lane_to_serdes_map_fabric_lane73=rx73:tx74
 lane_to_serdes_map_fabric_lane74=rx74:tx73
 lane_to_serdes_map_fabric_lane75=rx75:tx72
-lane_to_serdes_map_fabric_lane76=rx76:tx79
+lane_to_serdes_map_fabric_lane76=rx76:tx76
 lane_to_serdes_map_fabric_lane77=rx77:tx78
 lane_to_serdes_map_fabric_lane78=rx78:tx77
-lane_to_serdes_map_fabric_lane79=rx79:tx76
+lane_to_serdes_map_fabric_lane79=rx79:tx79
 lane_to_serdes_map_fabric_lane80=rx80:tx80
 lane_to_serdes_map_fabric_lane81=rx81:tx81
 lane_to_serdes_map_fabric_lane82=rx82:tx83
@@ -543,11 +543,11 @@ lane_to_serdes_map_fabric_lane86=rx86:tx84
 lane_to_serdes_map_fabric_lane87=rx87:tx87
 lane_to_serdes_map_fabric_lane88=rx88:tx90
 lane_to_serdes_map_fabric_lane89=rx89:tx88
-lane_to_serdes_map_fabric_lane90=rx90:tx91
-lane_to_serdes_map_fabric_lane91=rx91:tx89
+lane_to_serdes_map_fabric_lane90=rx90:tx89
+lane_to_serdes_map_fabric_lane91=rx91:tx91
 lane_to_serdes_map_fabric_lane92=rx92:tx93
-lane_to_serdes_map_fabric_lane93=rx93:tx92
-lane_to_serdes_map_fabric_lane94=rx94:tx94
+lane_to_serdes_map_fabric_lane93=rx93:tx94
+lane_to_serdes_map_fabric_lane94=rx94:tx92
 lane_to_serdes_map_fabric_lane95=rx95:tx95
 lane_to_serdes_map_fabric_lane96=rx96:tx96
 lane_to_serdes_map_fabric_lane97=rx97:tx97
@@ -557,30 +557,30 @@ lane_to_serdes_map_fabric_lane100=rx100:tx100
 lane_to_serdes_map_fabric_lane101=rx101:tx101
 lane_to_serdes_map_fabric_lane102=rx102:tx102
 lane_to_serdes_map_fabric_lane103=rx103:tx103
-lane_to_serdes_map_fabric_lane104=rx104:tx105
-lane_to_serdes_map_fabric_lane105=rx105:tx106
-lane_to_serdes_map_fabric_lane106=rx106:tx107
-lane_to_serdes_map_fabric_lane107=rx107:tx104
-lane_to_serdes_map_fabric_lane108=rx108:tx111
+lane_to_serdes_map_fabric_lane104=rx104:tx104
+lane_to_serdes_map_fabric_lane105=rx105:tx107
+lane_to_serdes_map_fabric_lane106=rx106:tx106
+lane_to_serdes_map_fabric_lane107=rx107:tx105
+lane_to_serdes_map_fabric_lane108=rx108:tx108
 lane_to_serdes_map_fabric_lane109=rx109:tx109
 lane_to_serdes_map_fabric_lane110=rx110:tx110
-lane_to_serdes_map_fabric_lane111=rx111:tx108
-lane_to_serdes_map_fabric_lane112=rx112:tx114
-lane_to_serdes_map_fabric_lane113=rx113:tx113
+lane_to_serdes_map_fabric_lane111=rx111:tx111
+lane_to_serdes_map_fabric_lane112=rx112:tx115
+lane_to_serdes_map_fabric_lane113=rx113:tx114
 lane_to_serdes_map_fabric_lane114=rx114:tx112
-lane_to_serdes_map_fabric_lane115=rx115:tx115
-lane_to_serdes_map_fabric_lane116=rx116:tx117
-lane_to_serdes_map_fabric_lane117=rx117:tx116
-lane_to_serdes_map_fabric_lane118=rx118:tx119
-lane_to_serdes_map_fabric_lane119=rx119:tx118
-lane_to_serdes_map_fabric_lane120=rx120:tx123
-lane_to_serdes_map_fabric_lane121=rx121:tx120
-lane_to_serdes_map_fabric_lane122=rx122:tx122
-lane_to_serdes_map_fabric_lane123=rx123:tx121
-lane_to_serdes_map_fabric_lane124=rx124:tx127
-lane_to_serdes_map_fabric_lane125=rx125:tx125
-lane_to_serdes_map_fabric_lane126=rx126:tx124
-lane_to_serdes_map_fabric_lane127=rx127:tx126
+lane_to_serdes_map_fabric_lane115=rx115:tx113
+lane_to_serdes_map_fabric_lane116=rx116:tx118
+lane_to_serdes_map_fabric_lane117=rx117:tx119
+lane_to_serdes_map_fabric_lane118=rx118:tx116
+lane_to_serdes_map_fabric_lane119=rx119:tx117
+lane_to_serdes_map_fabric_lane120=rx120:tx121
+lane_to_serdes_map_fabric_lane121=rx121:tx122
+lane_to_serdes_map_fabric_lane122=rx122:tx120
+lane_to_serdes_map_fabric_lane123=rx123:tx123
+lane_to_serdes_map_fabric_lane124=rx124:tx124
+lane_to_serdes_map_fabric_lane125=rx125:tx127
+lane_to_serdes_map_fabric_lane126=rx126:tx126
+lane_to_serdes_map_fabric_lane127=rx127:tx125
 lane_to_serdes_map_fabric_lane128=rx128:tx128
 lane_to_serdes_map_fabric_lane129=rx129:tx129
 lane_to_serdes_map_fabric_lane130=rx130:tx130
@@ -593,12 +593,12 @@ lane_to_serdes_map_fabric_lane136=rx136:tx139
 lane_to_serdes_map_fabric_lane137=rx137:tx138
 lane_to_serdes_map_fabric_lane138=rx138:tx137
 lane_to_serdes_map_fabric_lane139=rx139:tx136
-lane_to_serdes_map_fabric_lane140=rx140:tx140
+lane_to_serdes_map_fabric_lane140=rx140:tx143
 lane_to_serdes_map_fabric_lane141=rx141:tx142
 lane_to_serdes_map_fabric_lane142=rx142:tx141
-lane_to_serdes_map_fabric_lane143=rx143:tx143
-lane_to_serdes_map_fabric_lane144=rx144:tx144
-lane_to_serdes_map_fabric_lane145=rx145:tx145
+lane_to_serdes_map_fabric_lane143=rx143:tx140
+lane_to_serdes_map_fabric_lane144=rx144:tx145
+lane_to_serdes_map_fabric_lane145=rx145:tx144
 lane_to_serdes_map_fabric_lane146=rx146:tx146
 lane_to_serdes_map_fabric_lane147=rx147:tx147
 lane_to_serdes_map_fabric_lane148=rx148:tx148
@@ -614,8 +614,8 @@ lane_to_serdes_map_fabric_lane157=rx157:tx158
 lane_to_serdes_map_fabric_lane158=rx158:tx157
 lane_to_serdes_map_fabric_lane159=rx159:tx156
 lane_to_serdes_map_fabric_lane160=rx160:tx160
-lane_to_serdes_map_fabric_lane161=rx161:tx161
-lane_to_serdes_map_fabric_lane162=rx162:tx162
+lane_to_serdes_map_fabric_lane161=rx161:tx162
+lane_to_serdes_map_fabric_lane162=rx162:tx161
 lane_to_serdes_map_fabric_lane163=rx163:tx163
 lane_to_serdes_map_fabric_lane164=rx164:tx164
 lane_to_serdes_map_fabric_lane165=rx165:tx165
@@ -639,11 +639,11 @@ lane_to_serdes_map_fabric_lane182=rx182:tx180
 lane_to_serdes_map_fabric_lane183=rx183:tx183
 lane_to_serdes_map_fabric_lane184=rx184:tx186
 lane_to_serdes_map_fabric_lane185=rx185:tx184
-lane_to_serdes_map_fabric_lane186=rx186:tx185
-lane_to_serdes_map_fabric_lane187=rx187:tx187
-lane_to_serdes_map_fabric_lane188=rx188:tx188
+lane_to_serdes_map_fabric_lane186=rx186:tx187
+lane_to_serdes_map_fabric_lane187=rx187:tx185
+lane_to_serdes_map_fabric_lane188=rx188:tx190
 lane_to_serdes_map_fabric_lane189=rx189:tx189
-lane_to_serdes_map_fabric_lane190=rx190:tx190
+lane_to_serdes_map_fabric_lane190=rx190:tx188
 lane_to_serdes_map_fabric_lane191=rx191:tx191
 
 #

device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm

@@ -471,17 +471,17 @@ fabric_connect_mode=FE
 fabric_logical_port_base=512
 
 # Fabric lane mapping
-lane_to_serdes_map_fabric_lane0=rx0:tx0
+lane_to_serdes_map_fabric_lane0=rx0:tx3
 lane_to_serdes_map_fabric_lane1=rx1:tx1
 lane_to_serdes_map_fabric_lane2=rx2:tx2
-lane_to_serdes_map_fabric_lane3=rx3:tx3
+lane_to_serdes_map_fabric_lane3=rx3:tx0
 lane_to_serdes_map_fabric_lane4=rx4:tx4
 lane_to_serdes_map_fabric_lane5=rx5:tx5
 lane_to_serdes_map_fabric_lane6=rx6:tx6
 lane_to_serdes_map_fabric_lane7=rx7:tx7
-lane_to_serdes_map_fabric_lane8=rx8:tx10
+lane_to_serdes_map_fabric_lane8=rx8:tx9
 lane_to_serdes_map_fabric_lane9=rx9:tx11
-lane_to_serdes_map_fabric_lane10=rx10:tx9
+lane_to_serdes_map_fabric_lane10=rx10:tx10
 lane_to_serdes_map_fabric_lane11=rx11:tx8
 lane_to_serdes_map_fabric_lane12=rx12:tx12
 lane_to_serdes_map_fabric_lane13=rx13:tx15
@@ -493,15 +493,15 @@ lane_to_serdes_map_fabric_lane18=rx18:tx16
 lane_to_serdes_map_fabric_lane19=rx19:tx19
 lane_to_serdes_map_fabric_lane20=rx20:tx21
 lane_to_serdes_map_fabric_lane21=rx21:tx23
-lane_to_serdes_map_fabric_lane22=rx22:tx20
-lane_to_serdes_map_fabric_lane23=rx23:tx22
-lane_to_serdes_map_fabric_lane24=rx24:tx26
+lane_to_serdes_map_fabric_lane22=rx22:tx22
+lane_to_serdes_map_fabric_lane23=rx23:tx20
+lane_to_serdes_map_fabric_lane24=rx24:tx25
 lane_to_serdes_map_fabric_lane25=rx25:tx24
-lane_to_serdes_map_fabric_lane26=rx26:tx25
-lane_to_serdes_map_fabric_lane27=rx27:tx27
+lane_to_serdes_map_fabric_lane26=rx26:tx27
+lane_to_serdes_map_fabric_lane27=rx27:tx26
 lane_to_serdes_map_fabric_lane28=rx28:tx31
-lane_to_serdes_map_fabric_lane29=rx29:tx30
-lane_to_serdes_map_fabric_lane30=rx30:tx29
+lane_to_serdes_map_fabric_lane29=rx29:tx29
+lane_to_serdes_map_fabric_lane30=rx30:tx30
 lane_to_serdes_map_fabric_lane31=rx31:tx28
 lane_to_serdes_map_fabric_lane32=rx32:tx32
 lane_to_serdes_map_fabric_lane33=rx33:tx33
@@ -540,17 +540,17 @@ lane_to_serdes_map_fabric_lane65=rx65:tx65
 lane_to_serdes_map_fabric_lane66=rx66:tx66
 lane_to_serdes_map_fabric_lane67=rx67:tx67
 lane_to_serdes_map_fabric_lane68=rx68:tx68
-lane_to_serdes_map_fabric_lane69=rx69:tx69
-lane_to_serdes_map_fabric_lane70=rx70:tx70
-lane_to_serdes_map_fabric_lane71=rx71:tx71
+lane_to_serdes_map_fabric_lane69=rx69:tx70
+lane_to_serdes_map_fabric_lane70=rx70:tx71
+lane_to_serdes_map_fabric_lane71=rx71:tx69
 lane_to_serdes_map_fabric_lane72=rx72:tx75
 lane_to_serdes_map_fabric_lane73=rx73:tx74
 lane_to_serdes_map_fabric_lane74=rx74:tx73
 lane_to_serdes_map_fabric_lane75=rx75:tx72
-lane_to_serdes_map_fabric_lane76=rx76:tx79
+lane_to_serdes_map_fabric_lane76=rx76:tx76
 lane_to_serdes_map_fabric_lane77=rx77:tx78
 lane_to_serdes_map_fabric_lane78=rx78:tx77
-lane_to_serdes_map_fabric_lane79=rx79:tx76
+lane_to_serdes_map_fabric_lane79=rx79:tx79
 lane_to_serdes_map_fabric_lane80=rx80:tx80
 lane_to_serdes_map_fabric_lane81=rx81:tx81
 lane_to_serdes_map_fabric_lane82=rx82:tx83
@@ -561,11 +561,11 @@ lane_to_serdes_map_fabric_lane86=rx86:tx84
 lane_to_serdes_map_fabric_lane87=rx87:tx87
 lane_to_serdes_map_fabric_lane88=rx88:tx90
 lane_to_serdes_map_fabric_lane89=rx89:tx88
-lane_to_serdes_map_fabric_lane90=rx90:tx91
-lane_to_serdes_map_fabric_lane91=rx91:tx89
+lane_to_serdes_map_fabric_lane90=rx90:tx89
+lane_to_serdes_map_fabric_lane91=rx91:tx91
 lane_to_serdes_map_fabric_lane92=rx92:tx93
-lane_to_serdes_map_fabric_lane93=rx93:tx92
-lane_to_serdes_map_fabric_lane94=rx94:tx94
+lane_to_serdes_map_fabric_lane93=rx93:tx94
+lane_to_serdes_map_fabric_lane94=rx94:tx92
 lane_to_serdes_map_fabric_lane95=rx95:tx95
 lane_to_serdes_map_fabric_lane96=rx96:tx96
 lane_to_serdes_map_fabric_lane97=rx97:tx97
@@ -575,30 +575,30 @@ lane_to_serdes_map_fabric_lane100=rx100:tx100
 lane_to_serdes_map_fabric_lane101=rx101:tx101
 lane_to_serdes_map_fabric_lane102=rx102:tx102
 lane_to_serdes_map_fabric_lane103=rx103:tx103
-lane_to_serdes_map_fabric_lane104=rx104:tx105
-lane_to_serdes_map_fabric_lane105=rx105:tx106
-lane_to_serdes_map_fabric_lane106=rx106:tx107
-lane_to_serdes_map_fabric_lane107=rx107:tx104
-lane_to_serdes_map_fabric_lane108=rx108:tx111
+lane_to_serdes_map_fabric_lane104=rx104:tx104
+lane_to_serdes_map_fabric_lane105=rx105:tx107
+lane_to_serdes_map_fabric_lane106=rx106:tx106
+lane_to_serdes_map_fabric_lane107=rx107:tx105
+lane_to_serdes_map_fabric_lane108=rx108:tx108
 lane_to_serdes_map_fabric_lane109=rx109:tx109
 lane_to_serdes_map_fabric_lane110=rx110:tx110
-lane_to_serdes_map_fabric_lane111=rx111:tx108
-lane_to_serdes_map_fabric_lane112=rx112:tx114
-lane_to_serdes_map_fabric_lane113=rx113:tx113
+lane_to_serdes_map_fabric_lane111=rx111:tx111
+lane_to_serdes_map_fabric_lane112=rx112:tx115
+lane_to_serdes_map_fabric_lane113=rx113:tx114
 lane_to_serdes_map_fabric_lane114=rx114:tx112
-lane_to_serdes_map_fabric_lane115=rx115:tx115
-lane_to_serdes_map_fabric_lane116=rx116:tx117
-lane_to_serdes_map_fabric_lane117=rx117:tx116
-lane_to_serdes_map_fabric_lane118=rx118:tx119
-lane_to_serdes_map_fabric_lane119=rx119:tx118
-lane_to_serdes_map_fabric_lane120=rx120:tx123
-lane_to_serdes_map_fabric_lane121=rx121:tx120
-lane_to_serdes_map_fabric_lane122=rx122:tx122
-lane_to_serdes_map_fabric_lane123=rx123:tx121
-lane_to_serdes_map_fabric_lane124=rx124:tx127
-lane_to_serdes_map_fabric_lane125=rx125:tx125
-lane_to_serdes_map_fabric_lane126=rx126:tx124
-lane_to_serdes_map_fabric_lane127=rx127:tx126
+lane_to_serdes_map_fabric_lane115=rx115:tx113
+lane_to_serdes_map_fabric_lane116=rx116:tx118
+lane_to_serdes_map_fabric_lane117=rx117:tx119
+lane_to_serdes_map_fabric_lane118=rx118:tx116
+lane_to_serdes_map_fabric_lane119=rx119:tx117
+lane_to_serdes_map_fabric_lane120=rx120:tx121
+lane_to_serdes_map_fabric_lane121=rx121:tx122
+lane_to_serdes_map_fabric_lane122=rx122:tx120
+lane_to_serdes_map_fabric_lane123=rx123:tx123
+lane_to_serdes_map_fabric_lane124=rx124:tx124
+lane_to_serdes_map_fabric_lane125=rx125:tx127
+lane_to_serdes_map_fabric_lane126=rx126:tx126
+lane_to_serdes_map_fabric_lane127=rx127:tx125
 lane_to_serdes_map_fabric_lane128=rx128:tx128
 lane_to_serdes_map_fabric_lane129=rx129:tx129
 lane_to_serdes_map_fabric_lane130=rx130:tx130
@@ -611,12 +611,12 @@ lane_to_serdes_map_fabric_lane136=rx136:tx139
 lane_to_serdes_map_fabric_lane137=rx137:tx138
 lane_to_serdes_map_fabric_lane138=rx138:tx137
 lane_to_serdes_map_fabric_lane139=rx139:tx136
-lane_to_serdes_map_fabric_lane140=rx140:tx140
+lane_to_serdes_map_fabric_lane140=rx140:tx143
 lane_to_serdes_map_fabric_lane141=rx141:tx142
 lane_to_serdes_map_fabric_lane142=rx142:tx141
-lane_to_serdes_map_fabric_lane143=rx143:tx143
-lane_to_serdes_map_fabric_lane144=rx144:tx144
-lane_to_serdes_map_fabric_lane145=rx145:tx145
+lane_to_serdes_map_fabric_lane143=rx143:tx140
+lane_to_serdes_map_fabric_lane144=rx144:tx145
+lane_to_serdes_map_fabric_lane145=rx145:tx144
 lane_to_serdes_map_fabric_lane146=rx146:tx146
 lane_to_serdes_map_fabric_lane147=rx147:tx147
 lane_to_serdes_map_fabric_lane148=rx148:tx148
@@ -632,8 +632,8 @@ lane_to_serdes_map_fabric_lane157=rx157:tx158
 lane_to_serdes_map_fabric_lane158=rx158:tx157
 lane_to_serdes_map_fabric_lane159=rx159:tx156
 lane_to_serdes_map_fabric_lane160=rx160:tx160
-lane_to_serdes_map_fabric_lane161=rx161:tx161
-lane_to_serdes_map_fabric_lane162=rx162:tx162
+lane_to_serdes_map_fabric_lane161=rx161:tx162
+lane_to_serdes_map_fabric_lane162=rx162:tx161
 lane_to_serdes_map_fabric_lane163=rx163:tx163
 lane_to_serdes_map_fabric_lane164=rx164:tx164
 lane_to_serdes_map_fabric_lane165=rx165:tx165
@@ -657,11 +657,11 @@ lane_to_serdes_map_fabric_lane182=rx182:tx180
 lane_to_serdes_map_fabric_lane183=rx183:tx183
 lane_to_serdes_map_fabric_lane184=rx184:tx186
 lane_to_serdes_map_fabric_lane185=rx185:tx184
-lane_to_serdes_map_fabric_lane186=rx186:tx185
-lane_to_serdes_map_fabric_lane187=rx187:tx187
-lane_to_serdes_map_fabric_lane188=rx188:tx188
+lane_to_serdes_map_fabric_lane186=rx186:tx187
+lane_to_serdes_map_fabric_lane187=rx187:tx185
+lane_to_serdes_map_fabric_lane188=rx188:tx190
 lane_to_serdes_map_fabric_lane189=rx189:tx189
-lane_to_serdes_map_fabric_lane190=rx190:tx190
+lane_to_serdes_map_fabric_lane190=rx190:tx188
 lane_to_serdes_map_fabric_lane191=rx191:tx191
 
 #