Merge branch 'sonic-net:master' into Fix_sm_mnt

Author: gpunathilell

device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C28S4/config.bcm.j2

@@ -401,7 +401,7 @@ phy_chain_tx_polarity_flip_physical{97.0}=0x1
 phy_chain_tx_polarity_flip_physical{98.0}=0x1
 phy_chain_tx_polarity_flip_physical{99.0}=0x1
 portmap_103=101:100
-portmap_107=105:10
+portmap_107=105:100
 portmap_1=1:100
 portmap_111=109:100
 portmap_115=113:100
@@ -411,25 +411,25 @@ portmap_127=125:100
 portmap_130=128:10:m
 portmap_13=13:100
 portmap_17=17:100
-portmap_21=21:10
+portmap_21=21:100
 portmap_25=25:100
 portmap_29=29:100
 portmap_33=33:100
 portmap_37=37:100
-portmap_41=41:10
+portmap_41=41:100
 portmap_45=45:100
 portmap_49=49:100
 portmap_53=53:100
 portmap_5=5:100
-portmap_57=57:100
-portmap_61=61:100
+portmap_57=57:10
+portmap_61=61:10
 portmap_66=129:10:m
-portmap_67=65:100
-portmap_71=69:100
+portmap_67=65:10
+portmap_71=69:10
 portmap_75=73:100
 portmap_79=77:100
 portmap_83=81:100
-portmap_87=85:10
+portmap_87=85:100
 portmap_91=89:100
 portmap_95=93:100
 portmap_9=9:100
@@ -505,34 +505,34 @@ serdes_preemphasis_5=0x104105
 serdes_preemphasis_9=0x104105
 serdes_preemphasis_13=0x104105
 serdes_preemphasis_17=0xd3e05
-serdes_driver_current_21=0xe
-serdes_preemphasis_21=0x14410a
+serdes_preemphasis_21=0xd3e05
 serdes_preemphasis_25=0xd3e05
 serdes_preemphasis_29=0xb3403
 serdes_preemphasis_33=0xb3403
 serdes_preemphasis_37=0x93603
-serdes_driver_current_41=0xe
-serdes_preemphasis_41=0x14410a
+serdes_preemphasis_41=0x93603
 serdes_preemphasis_45=0x93503
 serdes_preemphasis_49=0x62e03
 serdes_preemphasis_53=0x63003
-serdes_preemphasis_57=0x63003
-serdes_preemphasis_61=0x62e03
+serdes_driver_current_57=0xe
+serdes_preemphasis_57=0x410a
+serdes_driver_current_61=0xe
+serdes_preemphasis_61=0x410a
 serdes_driver_current_66=0xe
 serdes_preemphasis_66=0x102804
-serdes_preemphasis_67=0x62e03
-serdes_preemphasis_71=0x63003
+serdes_driver_current_67=0xe
+serdes_preemphasis_67=0x410a
+serdes_driver_current_71=0xe
+serdes_preemphasis_71=0x410a
 serdes_preemphasis_75=0x63003
 serdes_preemphasis_79=0x62e03
 serdes_preemphasis_83=0x93503
-serdes_driver_current_87=0xe
-serdes_preemphasis_87=0x14410a
+serdes_preemphasis_87=0x93603
 serdes_preemphasis_91=0x93603
 serdes_preemphasis_95=0x93603
 serdes_preemphasis_99=0xb3403
 serdes_preemphasis_103=0xb3403
-serdes_driver_current_107=0xe
-serdes_preemphasis_107=0x14410a
+serdes_preemphasis_107=0xd3e05
 serdes_preemphasis_111=0xd3e05
 serdes_preemphasis_115=0xd3e05
 serdes_preemphasis_119=0x104105

device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C28S4/port_config.ini

@@ -3,29 +3,29 @@ Ethernet0       1,2,3,4           Ethernet1/1    1     100000
 Ethernet4       5,6,7,8           Ethernet2/1    2     100000
 Ethernet8       9,10,11,12        Ethernet3/1    3     100000
 Ethernet12      13,14,15,16       Ethernet4/1    4     100000
-Ethernet16      21                Ethernet5/1    5     10000
+Ethernet16      21,22,23,24       Ethernet5/1    5     100000
 Ethernet20      17,18,19,20       Ethernet6/1    6     100000
 Ethernet24      25,26,27,28       Ethernet7/1    7     100000
 Ethernet28      29,30,31,32       Ethernet8/1    8     100000
 Ethernet32      37,38,39,40       Ethernet9/1    9     100000
 Ethernet36      33,34,35,36       Ethernet10/1  10     100000
-Ethernet40      41                Ethernet11/1  11     10000
+Ethernet40      41,42,43,44       Ethernet11/1  11     100000
 Ethernet44      45,46,47,48       Ethernet12/1  12     100000
 Ethernet48      53,54,55,56       Ethernet13/1  13     100000
 Ethernet52      49,50,51,52       Ethernet14/1  14     100000
-Ethernet56      57,58,59,60       Ethernet15/1  15     100000
-Ethernet60      61,62,63,64       Ethernet16/1  16     100000
-Ethernet64      69,70,71,72       Ethernet17/1  17     100000
-Ethernet68      65,66,67,68       Ethernet18/1  18     100000
+Ethernet56      57                Ethernet15/1  15     10000
+Ethernet60      61                Ethernet16/1  16     10000
+Ethernet64      69                Ethernet17/1  17     10000
+Ethernet68      65                Ethernet18/1  18     10000
 Ethernet72      73,74,75,76       Ethernet19/1  19     100000
 Ethernet76      77,78,79,80       Ethernet20/1  20     100000
-Ethernet80      85                Ethernet21/1  21     10000
+Ethernet80      85,86,87,88       Ethernet21/1  21     100000
 Ethernet84      81,82,83,84       Ethernet22/1  22     100000
 Ethernet88      89,90,91,92       Ethernet23/1  23     100000
 Ethernet92      93,94,95,96       Ethernet24/1  24     100000
 Ethernet96      101,102,103,104   Ethernet25/1  25     100000
 Ethernet100     97,98,99,100      Ethernet26/1  26     100000
-Ethernet104     105               Ethernet27/1  27     10000
+Ethernet104     105,106,107,108   Ethernet27/1  27     100000
 Ethernet108     109,110,111,112   Ethernet28/1  28     100000
 Ethernet112     117,118,119,120   Ethernet29/1  29     100000
 Ethernet116     113,114,115,116   Ethernet30/1  30     100000

device/mellanox/x86_64-nvidia_sn4280-r0/Mellanox-SN4280-O28/create_only_config_db_buffers.json

@@ -0,0 +1,7 @@
+{
+    "DEVICE_METADATA": {
+        "localhost": {
+            "create_only_config_db_buffers": "true"
+        }
+    }
+}

device/mellanox/x86_64-nvidia_sn4280-r0/Mellanox-SN4280-O28/supporting_bulk_counter_groups

@@ -0,0 +1 @@
+QUEUE_WATERMARK_STAT_COUNTER,PG_WATERMARK_STAT_COUNTER,PFC_WD

device/nokia/arm64-nokia_ixs7215_52xb-r0/Nokia-7215-A1/ASK-Board-AC5X-xb.md5

@@ -1 +1 @@
-7333f3669bbbd18bcc3890028d7afb39
+281851c080b0939f8d5df37d470488b6

device/nokia/arm64-nokia_ixs7215_52xb-r0/Nokia-7215-A1/ASK-Board-AC5X-xb.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2024-09-24-1.09" profile="Askboard" sid="f5800f14-68b6-4eed-bd32-d93056a9feef">
+<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2024-10-24-1.10" profile="Askboard" dsig="md5" sid="7093bb99-b026-4a69-990a-db984aab32e7">
   <askboardplt:ASK-Board xmlns:askboardplt="urn:marvell:askboard:yang">
     <askboardplt:typedefs>
       <askboardplt:typedef>
@@ -183,6 +183,12 @@ with IEEE 1588v2 PTP Support</askboardplt:description>
 with IEEE 1588v2 PTP Support</askboardplt:description>
           <askboardplt:value>6</askboardplt:value>
         </askboardplt:enum>
+        <askboardplt:enum>
+          <askboardplt:name>alaska-88E1781</askboardplt:name>
+          <askboardplt:description>Specifies PHY identifier 88E1781, Integrated Octal 10/100/1000 Mbps Energy
+Efficient Ethernet Transceiver</askboardplt:description>
+          <askboardplt:value>7</askboardplt:value>
+        </askboardplt:enum>
       </askboardplt:typedef>
       <askboardplt:typedef>
         <askboardplt:name>physical-port-num-type</askboardplt:name>
@@ -513,15 +519,6 @@ with IEEE 1588v2 PTP Support</askboardplt:description>
         <askboardplt:min>0</askboardplt:min>
         <askboardplt:max>1</askboardplt:max>
       </askboardplt:typedef>
-      <askboardplt:typedef>
-        <askboardplt:name>led-stream-force-data-type</askboardplt:name>
-        <askboardplt:type>string</askboardplt:type>
-        <askboardplt:description>A hexadecimal string with octets represented as hex digits
-separated by colons.  The canonical representation uses
-lowercase characters.</askboardplt:description>
-        <askboardplt:min>3</askboardplt:min>
-        <askboardplt:max>11</askboardplt:max>
-      </askboardplt:typedef>
       <askboardplt:typedef>
         <askboardplt:name>bit-type</askboardplt:name>
         <askboardplt:type>uint32</askboardplt:type>
@@ -642,6 +639,11 @@ lowercase characters.</askboardplt:description>
           <askboardplt:description>FALCON</askboardplt:description>
           <askboardplt:value>2</askboardplt:value>
         </askboardplt:enum>
+        <askboardplt:enum>
+          <askboardplt:name>ASIC_AC5P</askboardplt:name>
+          <askboardplt:description>AC5P</askboardplt:description>
+          <askboardplt:value>3</askboardplt:value>
+        </askboardplt:enum>
       </askboardplt:typedef>
       <askboardplt:typedef>
         <askboardplt:name>mpp-num-type</askboardplt:name>

device/nokia/arm64-nokia_ixs7215_52xb-r0/Nokia-7215-A1/ASK-L1-AC5X-xb.md5

@@ -1 +1 @@
-1f97e3150eec3a7ee6f56f51f9229db3
+6273881a99a44a9ff33fbadcd535a15a