[pull] master from Azure:master

device/arista/x86_64-arista_7280cr3_32d4/Arista-7280CR3-C40/jr2-a7280cr3-32d4-40x100G.config.bcm

@@ -760,7 +760,7 @@ ucode_port_38=CGE23:core_1.38
 ucode_port_39=CGE20:core_1.39
 ucode_port_40=CGE21:core_1.40
 
-rif_id_max=0x4000
+rif_id_max=0x6000
 
 dma_desc_aggregator_chain_length_max.BCM8869X=1000
 dma_desc_aggregator_buff_size_kb.BCM8869X=100

device/arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C28S8/jr2-a7280cr3-32p4-28x100G-8x10G.config.bcm

@@ -732,7 +732,7 @@ ucode_port_34=XE53:core_1.34
 ucode_port_35=XE54:core_1.35
 ucode_port_36=XE55:core_1.36
 
-rif_id_max=0x4000
+rif_id_max=0x6000
 
 dma_desc_aggregator_chain_length_max.BCM8869X=1000
 dma_desc_aggregator_buff_size_kb.BCM8869X=100

device/arista/x86_64-arista_7800_sup/Arista-7804R3-FM/0/context_config.json

@@ -0,0 +1,65 @@
+{
+    "CONTEXTS": [
+        {
+            "guid" : 0,
+            "name" : "syncd",
+            "dbAsic" : "ASIC_DB",
+            "dbCounters" : "COUNTERS_DB",
+            "dbFlex": "FLEX_COUNTER_DB",
+            "dbState" : "STATE_DB",
+            "zmq_enable": false,
+            "zmq_endpoint": "tcp://127.0.0.1:5555",
+            "zmq_ntf_endpoint": "tcp://127.0.0.1:5556",
+            "switches": [
+                {
+                    "index" : 0,
+                    "hwinfo" : "09:00.0"
+                },
+                {
+                    "index" : 1,
+                    "hwinfo" : "10:00.0"
+                },
+                {
+                    "index" : 2,
+                    "hwinfo" : "13:00.0"
+                },
+                {
+                    "index" : 3,
+                    "hwinfo" : "1a:00.0"
+                },
+                {
+                    "index" : 4,
+                    "hwinfo" : "1d:00.0"
+                },
+                {
+                    "index" : 5,
+                    "hwinfo" : "24:00.0"
+                },
+                {
+                    "index" : 6,
+                    "hwinfo" : "27:00.0"
+                },
+                {
+                    "index" : 7,
+                    "hwinfo" : "2e:00.0"
+                },
+                {
+                    "index" : 8,
+                    "hwinfo" : "31:00.0"
+                },
+                {
+                    "index" : 9,
+                    "hwinfo" : "38:00.0"
+                },
+                {
+                    "index" : 10,
+                    "hwinfo" : "3b:00.0"
+                },
+                {
+                    "index" : 11,
+                    "hwinfo" : "42:00.0"
+                }
+            ]
+        }
+    ]
+}

device/arista/x86_64-arista_7800_sup/Arista-7804R3-FM/0/default_config.json

@@ -0,0 +1,14 @@
+{
+    "DEVICE_METADATA": {
+        "localhost": {
+            "instance_name": "Ramon1",
+            "switch_id": "300",
+            "switch_type": "fabric",
+            "chassis_db_address" : "240.127.1.1",
+            "start_chassis_db" : "1",
+            "connect_to_chassis_db" : "1",
+            "sub_role" : "None",
+            "asic_id" : "09:00.0"
+        }
+    }
+}

device/arista/x86_64-arista_7800_sup/Arista-7804R3-FM/0/port_config.ini

@@ -0,0 +1 @@
+# name         lanes                     alias        index  speed

device/arista/x86_64-arista_7800_sup/Arista-7804R3-FM/0/ramon-a7800-7804r3-fm.config.bcm

@@ -0,0 +1,223 @@
+appl_param_module_id=300
+
+dpp_db_path=/usr/share/bcm/db
+port_init_cl72=1
+serdes_lane_config_cl72_auto_polarity_en=1
+serdes_lane_config_cl72_restart_timeout_en=0
+port_init_speed=53125
+
+appl_enable_intr_init=0
+bcm_linkscan_interval=0
+bcm_stat_interval=1000000
+bist_enable=0
+lane_to_serdes_map_fabric_lane0=rx0:tx0
+lane_to_serdes_map_fabric_lane1=rx1:tx1
+lane_to_serdes_map_fabric_lane2=rx2:tx3
+lane_to_serdes_map_fabric_lane3=rx3:tx2
+lane_to_serdes_map_fabric_lane4=rx4:tx4
+lane_to_serdes_map_fabric_lane5=rx5:tx7
+lane_to_serdes_map_fabric_lane6=rx6:tx6
+lane_to_serdes_map_fabric_lane7=rx7:tx5
+lane_to_serdes_map_fabric_lane8=rx8:tx10
+lane_to_serdes_map_fabric_lane9=rx9:tx11
+lane_to_serdes_map_fabric_lane10=rx10:tx9
+lane_to_serdes_map_fabric_lane11=rx11:tx8
+lane_to_serdes_map_fabric_lane12=rx12:tx12
+lane_to_serdes_map_fabric_lane13=rx13:tx14
+lane_to_serdes_map_fabric_lane14=rx14:tx13
+lane_to_serdes_map_fabric_lane15=rx15:tx15
+lane_to_serdes_map_fabric_lane16=rx16:tx16
+lane_to_serdes_map_fabric_lane17=rx17:tx17
+lane_to_serdes_map_fabric_lane18=rx18:tx18
+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:tx22
+lane_to_serdes_map_fabric_lane23=rx23:tx20
+lane_to_serdes_map_fabric_lane24=rx24:tx24
+lane_to_serdes_map_fabric_lane25=rx25:tx25
+lane_to_serdes_map_fabric_lane26=rx26:tx26
+lane_to_serdes_map_fabric_lane27=rx27:tx27
+lane_to_serdes_map_fabric_lane28=rx28:tx28
+lane_to_serdes_map_fabric_lane29=rx29:tx29
+lane_to_serdes_map_fabric_lane30=rx30:tx30
+lane_to_serdes_map_fabric_lane31=rx31:tx31
+lane_to_serdes_map_fabric_lane32=rx32:tx32
+lane_to_serdes_map_fabric_lane33=rx33:tx33
+lane_to_serdes_map_fabric_lane34=rx34:tx34
+lane_to_serdes_map_fabric_lane35=rx35:tx35
+lane_to_serdes_map_fabric_lane36=rx36:tx36
+lane_to_serdes_map_fabric_lane37=rx37:tx37
+lane_to_serdes_map_fabric_lane38=rx38:tx38
+lane_to_serdes_map_fabric_lane39=rx39:tx39
+lane_to_serdes_map_fabric_lane40=rx40:tx42
+lane_to_serdes_map_fabric_lane41=rx41:tx41
+lane_to_serdes_map_fabric_lane42=rx42:tx40
+lane_to_serdes_map_fabric_lane43=rx43:tx43
+lane_to_serdes_map_fabric_lane44=rx44:tx47
+lane_to_serdes_map_fabric_lane45=rx45:tx44
+lane_to_serdes_map_fabric_lane46=rx46:tx46
+lane_to_serdes_map_fabric_lane47=rx47:tx45
+lane_to_serdes_map_fabric_lane48=rx48:tx48
+lane_to_serdes_map_fabric_lane49=rx49:tx49
+lane_to_serdes_map_fabric_lane50=rx50:tx50
+lane_to_serdes_map_fabric_lane51=rx51:tx51
+lane_to_serdes_map_fabric_lane52=rx52:tx52
+lane_to_serdes_map_fabric_lane53=rx53:tx53
+lane_to_serdes_map_fabric_lane54=rx54:tx54
+lane_to_serdes_map_fabric_lane55=rx55:tx55
+lane_to_serdes_map_fabric_lane56=rx56:tx56
+lane_to_serdes_map_fabric_lane57=rx57:tx57
+lane_to_serdes_map_fabric_lane58=rx58:tx58
+lane_to_serdes_map_fabric_lane59=rx59:tx59
+lane_to_serdes_map_fabric_lane60=rx60:tx60
+lane_to_serdes_map_fabric_lane61=rx61:tx61
+lane_to_serdes_map_fabric_lane62=rx62:tx62
+lane_to_serdes_map_fabric_lane63=rx63:tx63
+lane_to_serdes_map_fabric_lane64=rx64:tx64
+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_lane72=rx72:tx75
+lane_to_serdes_map_fabric_lane73=rx73:tx74
+lane_to_serdes_map_fabric_lane74=rx74:tx72
+lane_to_serdes_map_fabric_lane75=rx75:tx73
+lane_to_serdes_map_fabric_lane76=rx76:tx77
+lane_to_serdes_map_fabric_lane77=rx77:tx76
+lane_to_serdes_map_fabric_lane78=rx78:tx79
+lane_to_serdes_map_fabric_lane79=rx79:tx78
+lane_to_serdes_map_fabric_lane80=rx80:tx82
+lane_to_serdes_map_fabric_lane81=rx81:tx83
+lane_to_serdes_map_fabric_lane82=rx82:tx80
+lane_to_serdes_map_fabric_lane83=rx83:tx81
+lane_to_serdes_map_fabric_lane84=rx84:tx85
+lane_to_serdes_map_fabric_lane85=rx85:tx86
+lane_to_serdes_map_fabric_lane86=rx86:tx87
+lane_to_serdes_map_fabric_lane87=rx87:tx84
+lane_to_serdes_map_fabric_lane88=rx88:tx88
+lane_to_serdes_map_fabric_lane89=rx89:tx90
+lane_to_serdes_map_fabric_lane90=rx90:tx91
+lane_to_serdes_map_fabric_lane91=rx91:tx89
+lane_to_serdes_map_fabric_lane92=rx92:tx93
+lane_to_serdes_map_fabric_lane93=rx93:tx92
+lane_to_serdes_map_fabric_lane94=rx94:tx95
+lane_to_serdes_map_fabric_lane95=rx95:tx94
+lane_to_serdes_map_fabric_lane96=rx96:tx96
+lane_to_serdes_map_fabric_lane97=rx97:tx97
+lane_to_serdes_map_fabric_lane98=rx98:tx98
+lane_to_serdes_map_fabric_lane99=rx99:tx99
+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:tx104
+lane_to_serdes_map_fabric_lane105=rx105:tx105
+lane_to_serdes_map_fabric_lane106=rx106:tx106
+lane_to_serdes_map_fabric_lane107=rx107:tx107
+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:tx111
+lane_to_serdes_map_fabric_lane112=rx112:tx112
+lane_to_serdes_map_fabric_lane113=rx113:tx113
+lane_to_serdes_map_fabric_lane114=rx114:tx114
+lane_to_serdes_map_fabric_lane115=rx115:tx115
+lane_to_serdes_map_fabric_lane116=rx116:tx116
+lane_to_serdes_map_fabric_lane117=rx117:tx117
+lane_to_serdes_map_fabric_lane118=rx118:tx118
+lane_to_serdes_map_fabric_lane119=rx119:tx119
+lane_to_serdes_map_fabric_lane120=rx120:tx123
+lane_to_serdes_map_fabric_lane121=rx121:tx122
+lane_to_serdes_map_fabric_lane122=rx122:tx120
+lane_to_serdes_map_fabric_lane123=rx123:tx121
+lane_to_serdes_map_fabric_lane124=rx124:tx124
+lane_to_serdes_map_fabric_lane125=rx125:tx125
+lane_to_serdes_map_fabric_lane126=rx126:tx127
+lane_to_serdes_map_fabric_lane127=rx127:tx126
+lane_to_serdes_map_fabric_lane128=rx128:tx128
+lane_to_serdes_map_fabric_lane129=rx129:tx131
+lane_to_serdes_map_fabric_lane130=rx130:tx130
+lane_to_serdes_map_fabric_lane131=rx131:tx129
+lane_to_serdes_map_fabric_lane132=rx132:tx133
+lane_to_serdes_map_fabric_lane133=rx133:tx134
+lane_to_serdes_map_fabric_lane134=rx134:tx132
+lane_to_serdes_map_fabric_lane135=rx135:tx135
+lane_to_serdes_map_fabric_lane136=rx136:tx136
+lane_to_serdes_map_fabric_lane137=rx137:tx139
+lane_to_serdes_map_fabric_lane138=rx138:tx138
+lane_to_serdes_map_fabric_lane139=rx139:tx137
+lane_to_serdes_map_fabric_lane140=rx140:tx141
+lane_to_serdes_map_fabric_lane141=rx141:tx140
+lane_to_serdes_map_fabric_lane142=rx142:tx142
+lane_to_serdes_map_fabric_lane143=rx143:tx143
+lane_to_serdes_map_fabric_lane144=rx144:tx146
+lane_to_serdes_map_fabric_lane145=rx145:tx145
+lane_to_serdes_map_fabric_lane146=rx146:tx147
+lane_to_serdes_map_fabric_lane147=rx147:tx144
+lane_to_serdes_map_fabric_lane148=rx148:tx150
+lane_to_serdes_map_fabric_lane149=rx149:tx148
+lane_to_serdes_map_fabric_lane150=rx150:tx151
+lane_to_serdes_map_fabric_lane151=rx151:tx149
+lane_to_serdes_map_fabric_lane152=rx152:tx155
+lane_to_serdes_map_fabric_lane153=rx153:tx154
+lane_to_serdes_map_fabric_lane154=rx154:tx152
+lane_to_serdes_map_fabric_lane155=rx155:tx153
+lane_to_serdes_map_fabric_lane156=rx156:tx156
+lane_to_serdes_map_fabric_lane157=rx157:tx157
+lane_to_serdes_map_fabric_lane158=rx158:tx158
+lane_to_serdes_map_fabric_lane159=rx159:tx159
+lane_to_serdes_map_fabric_lane160=rx160:tx163
+lane_to_serdes_map_fabric_lane161=rx161:tx161
+lane_to_serdes_map_fabric_lane162=rx162:tx162
+lane_to_serdes_map_fabric_lane163=rx163:tx160
+lane_to_serdes_map_fabric_lane164=rx164:tx164
+lane_to_serdes_map_fabric_lane165=rx165:tx166
+lane_to_serdes_map_fabric_lane166=rx166:tx165
+lane_to_serdes_map_fabric_lane167=rx167:tx167
+lane_to_serdes_map_fabric_lane168=rx168:tx170
+lane_to_serdes_map_fabric_lane169=rx169:tx168
+lane_to_serdes_map_fabric_lane170=rx170:tx169
+lane_to_serdes_map_fabric_lane171=rx171:tx171
+lane_to_serdes_map_fabric_lane172=rx172:tx173
+lane_to_serdes_map_fabric_lane173=rx173:tx174
+lane_to_serdes_map_fabric_lane174=rx174:tx175
+lane_to_serdes_map_fabric_lane175=rx175:tx172
+lane_to_serdes_map_fabric_lane176=rx176:tx176
+lane_to_serdes_map_fabric_lane177=rx177:tx177
+lane_to_serdes_map_fabric_lane178=rx178:tx179
+lane_to_serdes_map_fabric_lane179=rx179:tx178
+lane_to_serdes_map_fabric_lane180=rx180:tx183
+lane_to_serdes_map_fabric_lane181=rx181:tx181
+lane_to_serdes_map_fabric_lane182=rx182:tx182
+lane_to_serdes_map_fabric_lane183=rx183:tx180
+lane_to_serdes_map_fabric_lane184=rx184:tx187
+lane_to_serdes_map_fabric_lane185=rx185:tx185
+lane_to_serdes_map_fabric_lane186=rx186:tx186
+lane_to_serdes_map_fabric_lane187=rx187:tx184
+lane_to_serdes_map_fabric_lane188=rx188:tx188
+lane_to_serdes_map_fabric_lane189=rx189:tx191
+lane_to_serdes_map_fabric_lane190=rx190:tx189
+lane_to_serdes_map_fabric_lane191=rx191:tx190
+load_firmware=0x102
+mem_cache_enable_parity=1
+miim_intr_enable=0
+miim_timeout_usec=300000
+os=unix
+polled_irq_delay=1000
+polled_irq_mode=0
+schan_timeout_usec=300000
+serdes_fabric_clk_freq_in=1
+serdes_fabric_clk_freq_out=bypass
+soc_family=BCM88790X
+stable_location=3
+stable_size=200000
+table_dma_enable=1
+tdma_intr_enable=0
+tdma_timeout_usec=5000000
+tslam_dma_enable=1
+tslam_intr_enable=0
+tslam_timeout_usec=5000000

device/arista/x86_64-arista_7800_sup/Arista-7804R3-FM/0/sai.profile

@@ -0,0 +1 @@
+../sai.profile

device/arista/x86_64-arista_7800_sup/Arista-7804R3-FM/1/context_config.json

@@ -0,0 +1 @@
+../0/context_config.json

device/arista/x86_64-arista_7800_sup/Arista-7804R3-FM/1/default_config.json

@@ -0,0 +1,14 @@
+{
+    "DEVICE_METADATA": {
+        "localhost": {
+            "instance_name": "Ramon2",
+            "switch_id": "301",
+            "switch_type": "fabric",
+            "chassis_db_address" : "240.127.1.1",
+            "start_chassis_db" : "1",
+            "connect_to_chassis_db" : "1",
+            "sub_role" : "None",
+            "asic_id" : "10:00.0"
+        }
+    }
+}

device/arista/x86_64-arista_7800_sup/Arista-7804R3-FM/1/port_config.ini

@@ -0,0 +1 @@
+# name         lanes                     alias        index  speed