[202311][Mellanox][MFT]: Update MFT to 4.27.0-83: bash login fix (#18462)

* Revert "[mellanox]: Disable MFT bash autocompletion. (#17543)"

This reverts commit 49e96c3daa.

* [mellanox][mft]: Update MFT to 4.27.0-83: bash login fix.

Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>

---------

Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>

.azure-pipelines/azure-pipelines-UpgrateVersion.yml

@@ -33,7 +33,6 @@ parameters:
   type: object
   default:
   - vs
-  - barefoot
   - broadcom
   - centec
   - centec-arm64

.azure-pipelines/azure-pipelines-build-ubuntu-2004.yml

@@ -9,6 +9,16 @@ trigger:
   branches:
     include:
     - master
+    - 202???
+
+schedules:
+- cron: "0 0 * * *"
+  displayName: Daily build
+  branches:
+    include:
+      - master
+      - 202???
+  always: true
 
 stages:
 - stage: Build
@@ -28,13 +38,14 @@ stages:
                          cmake pkg-config python3-pip python cmake libgtest-dev libgmock-dev libyang-dev \
                          debhelper-compat dh-elpa dh-sequence-python3 python3-all \
                          libpython3-all-dev python3-six xmlto unzip rake-compiler gem2deb pkg-php-tools \
-                         ant default-jdk maven-repo-helper libguava-java
+                         ant default-jdk maven-repo-helper libguava-java \
+                         libboost-all-dev libgtest-dev build-essential
         wget http://ftp.us.debian.org/debian/pool/main/libg/libgoogle-gson-java/libgoogle-gson-java_2.8.6-1+deb11u1_all.deb
         sudo dpkg -i libgoogle-gson-java_2.8.6-1+deb11u1_all.deb
         mkdir -p /tmp/artifacts
       displayName: "Install dependencies"
     - script: |
-        SONIC_CONFIG_MAKE_JOBS=$(nproc) CONFIGURED_ARCH=amd64 DEST=/tmp/artifacts make -f ../rules/protobuf.mk -f protobuf/Makefile
+        BLDENV=bullseye SONIC_CONFIG_MAKE_JOBS=$(nproc) CONFIGURED_ARCH=amd64 DEST=/tmp/artifacts make -f ../rules/protobuf.mk -f protobuf/Makefile
       workingDirectory: src
       displayName: "Build protobuf"
     - script: |

.azure-pipelines/azure-pipelines-image-template.yml

@@ -30,7 +30,7 @@ jobs:
       - script: |
           [ -n "$OVERRIDE_BUILD_OPTIONS" ] && OVERRIDE_BUILD_OPTIONS=$(OVERRIDE_BUILD_OPTIONS)
           BUILD_OPTIONS="$(BUILD_OPTIONS) $OVERRIDE_BUILD_OPTIONS"
-          if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-armhf)$"; then
+          if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-armhf|marvell-arm64)$"; then
             CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=$(CACHE_MODE) SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/$(PLATFORM_AZP)"
             BUILD_OPTIONS="$BUILD_OPTIONS $CACHE_OPTIONS"
           fi

.gitmodules

@@ -1,15 +1,19 @@
 [submodule "sonic-swss-common"]
 	path = src/sonic-swss-common
 	url = https://github.com/sonic-net/sonic-swss-common
+	branch = 202311
 [submodule "sonic-linux-kernel"]
 	path = src/sonic-linux-kernel
 	url = https://github.com/sonic-net/sonic-linux-kernel
+	branch = 202311
 [submodule "sonic-sairedis"]
 	path = src/sonic-sairedis
 	url = https://github.com/sonic-net/sonic-sairedis
+	branch = 202311
 [submodule "sonic-swss"]
 	path = src/sonic-swss
 	url = https://github.com/sonic-net/sonic-swss
+	branch = 202311
 [submodule "src/p4c-bm/p4c-bm"]
 	path = platform/p4/p4c-bm/p4c-bm
 	url = https://github.com/krambn/p4c-bm
@@ -19,27 +23,33 @@
 [submodule "sonic-dbsyncd"]
 	path = src/sonic-dbsyncd
 	url = https://github.com/sonic-net/sonic-dbsyncd
+	branch = 202311
 [submodule "src/sonic-py-swsssdk"]
 	path = src/sonic-py-swsssdk
 	url = https://github.com/sonic-net/sonic-py-swsssdk.git
+	branch = 202311
 [submodule "src/sonic-snmpagent"]
 	path = src/sonic-snmpagent
 	url = https://github.com/sonic-net/sonic-snmpagent
+	branch = 202311
 [submodule "src/ptf"]
 	path = src/ptf
 	url = https://github.com/p4lang/ptf.git
 [submodule "src/sonic-utilities"]
 	path = src/sonic-utilities
 	url = https://github.com/sonic-net/sonic-utilities
+	branch = 202311
 [submodule "platform/broadcom/sonic-platform-modules-arista"]
 	path = platform/broadcom/sonic-platform-modules-arista
 	url = https://github.com/aristanetworks/sonic
 [submodule "src/sonic-platform-common"]
 	path = src/sonic-platform-common
 	url = https://github.com/sonic-net/sonic-platform-common
+	branch = 202311
 [submodule "src/sonic-platform-daemons"]
 	path = src/sonic-platform-daemons
 	url = https://github.com/sonic-net/sonic-platform-daemons
+	branch = 202311
 [submodule "src/sonic-platform-pde"]
 	path = src/sonic-platform-pde
 	url = https://github.com/sonic-net/sonic-platform-pdk-pde
@@ -74,7 +84,7 @@
 [submodule "src/sonic-restapi"]
 	path = src/sonic-restapi
 	url = https://github.com/sonic-net/sonic-restapi.git
-	branch = master
+	branch = 202311
 [submodule "src/sonic-mgmt-common"]
 	path = src/sonic-mgmt-common
 	url = https://github.com/sonic-net/sonic-mgmt-common.git
@@ -91,6 +101,7 @@
 [submodule "src/linkmgrd"]
 	path = src/linkmgrd
 	url = https://github.com/sonic-net/sonic-linkmgrd.git
+	branch = 202311
 [submodule "src/sonic-p4rt/sonic-pins"]
 	path = src/sonic-p4rt/sonic-pins
 	url = https://github.com/sonic-net/sonic-pins.git
@@ -100,21 +111,26 @@
 [submodule "src/dhcprelay"]
 	path = src/dhcprelay
 	url = https://github.com/sonic-net/sonic-dhcp-relay.git
+	branch = 202311
 [submodule "src/sonic-host-services"]
 	path = src/sonic-host-services
 	url = https://github.com/sonic-net/sonic-host-services
+	branch = 202311
 [submodule "src/sonic-gnmi"]
 	path = src/sonic-gnmi
 	url = https://github.com/sonic-net/sonic-gnmi.git
+	branch = 202311
 [submodule "src/sonic-genl-packet"]
 	path = src/sonic-genl-packet
 	url = https://github.com/sonic-net/sonic-genl-packet
 [submodule "src/dhcpmon"]
 	path = src/dhcpmon
 	url = https://github.com/sonic-net/sonic-dhcpmon.git
-[submodule "src/sonic-dash-api/sonic-dash-api"]
-	path = src/sonic-dash-api/sonic-dash-api
+	branch = 202311
+[submodule "src/sonic-dash-api"]
+	path = src/sonic-dash-api
 	url = https://github.com/sonic-net/sonic-dash-api.git
+	branch = 202311
 [submodule "platform/marvell-arm64/mrvl-prestera"]
 	path = platform/marvell-arm64/mrvl-prestera
 	url = https://github.com/Marvell-switching/mrvl-prestera.git

Makefile.work

@@ -40,6 +40,9 @@
 #  * ENABLE_NATIVE_WRITE: Enable native write/config operations via the gNMI interface.
 #  *                 Default: unset
 #  *                 Values: y
+#  * ENABLE_DIALOUT: Enable dialout client in telemetry.
+#  *                 Default: unset
+#  *                 Values: y
 #  * SONIC_DPKG_CACHE_METHOD: Specifying method of obtaining the Debian packages from cache: none or cache
 #  * SONIC_DPKG_CACHE_SOURCE: Debian package cache location when cache enabled for debian packages
 #  * BUILD_LOG_TIMESTAMP: Set timestamp in the build log (simple/none)
@@ -518,6 +521,7 @@ SONIC_BUILD_INSTRUCTION :=  $(MAKE) \
                            INCLUDE_KUBERNETES=$(INCLUDE_KUBERNETES) \
                            KUBERNETES_VERSION=$(KUBERNETES_VERSION) \
                            KUBERNETES_CNI_VERSION=$(KUBERNETES_CNI_VERSION) \
+                           KUBERNETES_CRI_TOOLS_VERSION=$(KUBERNETES_CRI_TOOLS_VERSION) \
                            K8s_GCR_IO_PAUSE_VERSION=$(K8s_GCR_IO_PAUSE_VERSION) \
                            INCLUDE_KUBERNETES_MASTER=$(INCLUDE_KUBERNETES_MASTER) \
                            SONIC_ENABLE_PFCWD_ON_START=$(ENABLE_PFCWD_ON_START) \
@@ -544,6 +548,7 @@ SONIC_BUILD_INSTRUCTION :=  $(MAKE) \
                            SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD=$(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD) \
                            SONIC_INCLUDE_SYSTEM_TELEMETRY=$(INCLUDE_SYSTEM_TELEMETRY) \
                            SONIC_INCLUDE_SYSTEM_GNMI=$(INCLUDE_SYSTEM_GNMI) \
+                           SONIC_INCLUDE_SYSTEM_EVENTD=$(INCLUDE_SYSTEM_EVENTD) \
                            INCLUDE_DHCP_RELAY=$(INCLUDE_DHCP_RELAY) \
                            INCLUDE_DHCP_SERVER=$(INCLUDE_DHCP_SERVER) \
                            INCLUDE_MACSEC=$(INCLUDE_MACSEC) \
@@ -551,6 +556,7 @@ SONIC_BUILD_INSTRUCTION :=  $(MAKE) \
                            SONIC_INCLUDE_MUX=$(INCLUDE_MUX) \
                            ENABLE_TRANSLIB_WRITE=$(ENABLE_TRANSLIB_WRITE) \
                            ENABLE_NATIVE_WRITE=$(ENABLE_NATIVE_WRITE) \
+			   ENABLE_DIALOUT=$(ENABLE_DIALOUT) \
                            EXTRA_DOCKER_TARGETS=$(EXTRA_DOCKER_TARGETS) \
                            BUILD_LOG_TIMESTAMP=$(BUILD_LOG_TIMESTAMP) \
                            SONIC_ENABLE_IMAGE_SIGNATURE=$(ENABLE_IMAGE_SIGNATURE) \

azure-pipelines.yml

@@ -50,7 +50,7 @@ stages:
   jobs:
   - template: .azure-pipelines/azure-pipelines-build.yml
     parameters:
-      buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) BUILD_MULTIASIC_KVM=y ${{ variables.VERSION_CONTROL_OPTIONS }}'
+      buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) BUILD_MULTIASIC_KVM=y INCLUDE_DHCP_SERVER=y ${{ variables.VERSION_CONTROL_OPTIONS }}'
       jobGroups:
       - name: vs
 
@@ -164,7 +164,7 @@ stages:
         TOPOLOGY: t0
         MIN_WORKER: $(T0_INSTANCE_NUM)
         MAX_WORKER: $(T0_INSTANCE_NUM)
-        MGMT_BRANCH: "master"
+        MGMT_BRANCH: "202311"
 
   - job: t0_2vlans_elastictest
     pool: ubuntu-20.04
@@ -178,7 +178,7 @@ stages:
         TEST_SET: t0-2vlans
         MIN_WORKER: $(T0_2VLANS_INSTANCE_NUM)
         MAX_WORKER: $(T0_2VLANS_INSTANCE_NUM)
-        MGMT_BRANCH: "master"
+        MGMT_BRANCH: "202311"
         DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a"
 
   - job: t1_lag_elastictest
@@ -192,7 +192,7 @@ stages:
         TOPOLOGY: t1-lag
         MIN_WORKER: $(T1_LAG_INSTANCE_NUM)
         MAX_WORKER: $(T1_LAG_INSTANCE_NUM)
-        MGMT_BRANCH: "master"
+        MGMT_BRANCH: "202311"
 
   - job: multi_asic_elastictest
     displayName: "kvmtest-multi-asic-t1-lag by Elastictest"
@@ -207,7 +207,7 @@ stages:
           MIN_WORKER: $(MULTI_ASIC_INSTANCE_NUM)
           MAX_WORKER: $(MULTI_ASIC_INSTANCE_NUM)
           NUM_ASIC: 4
-          MGMT_BRANCH: "master"
+          MGMT_BRANCH: "202311"
 
   - job: dualtor_elastictest
     pool: ubuntu-20.04
@@ -220,7 +220,7 @@ stages:
           TOPOLOGY: dualtor
           MIN_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
           MAX_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
-          MGMT_BRANCH: "master"
+          MGMT_BRANCH: "202311"
           COMMON_EXTRA_PARAMS: "--disable_loganalyzer "
 
   - job: sonic_t0_elastictest
@@ -235,23 +235,22 @@ stages:
           MIN_WORKER: $(T0_SONIC_INSTANCE_NUM)
           MAX_WORKER: $(T0_SONIC_INSTANCE_NUM)
           TEST_SET: t0-sonic
-          MGMT_BRANCH: "master"
+          MGMT_BRANCH: "202311"
           COMMON_EXTRA_PARAMS: "--neighbor_type=sonic "
           VM_TYPE: vsonic
 
-  - job: dpu_elastictest
-    displayName: "kvmtest-dpu by Elastictest"
-    timeoutInMinutes: 240
-    continueOnError: false
-    pool: ubuntu-20.04
-    steps:
-      - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
-        parameters:
-          TOPOLOGY: dpu
-          MIN_WORKER: $(T0_SONIC_INSTANCE_NUM)
-          MAX_WORKER: $(T0_SONIC_INSTANCE_NUM)
-          KVM_IMAGE_BRANCH: "master"
-          MGMT_BRANCH: "master"
+#  - job: dpu_elastictest
+#    displayName: "kvmtest-dpu by Elastictest"
+#    timeoutInMinutes: 240
+#    continueOnError: false
+#    pool: ubuntu-20.04
+#    steps:
+#      - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
+#        parameters:
+#          TOPOLOGY: dpu
+#          MIN_WORKER: $(T0_SONIC_INSTANCE_NUM)
+#          MAX_WORKER: $(T0_SONIC_INSTANCE_NUM)
+#          MGMT_BRANCH: "202311"
 
 
 #  - job: wan_elastictest

build_debian.sh

@@ -276,16 +276,25 @@ sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y remove software-properties-common
 
 install_kubernetes () {
     local ver="$1"
-    sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -fsSL \
-        https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
-        sudo LANG=C chroot $FILESYSTEM_ROOT apt-key add -
-    ## Check out the sources list update matches current Debian version
-    sudo cp files/image_config/kubernetes/kubernetes.list $FILESYSTEM_ROOT/etc/apt/sources.list.d/
-    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get update
-    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubernetes-cni=${KUBERNETES_CNI_VERSION}
-    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubelet=${ver}
-    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubectl=${ver}
-    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubeadm=${ver}
+    ## Install k8s package from storage
+    local storage_prefix="https://sonicstorage.blob.core.windows.net/public/kubernetes"
+    sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/cri-tools.deb -fsSL \
+        ${storage_prefix}/cri-tools_${KUBERNETES_CRI_TOOLS_VERSION}_${CONFIGURED_ARCH}.deb
+    sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/kubernetes-cni.deb -fsSL \
+        ${storage_prefix}/kubernetes-cni_${KUBERNETES_CNI_VERSION}_${CONFIGURED_ARCH}.deb
+    sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/kubelet.deb -fsSL \
+        ${storage_prefix}/kubelet_${ver}_${CONFIGURED_ARCH}.deb
+    sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/kubectl.deb -fsSL \
+        ${storage_prefix}/kubectl_${ver}_${CONFIGURED_ARCH}.deb
+    sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/kubeadm.deb -fsSL \
+        ${storage_prefix}/kubeadm_${ver}_${CONFIGURED_ARCH}.deb
+
+    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install -f /tmp/cri-tools.deb
+    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install -f /tmp/kubernetes-cni.deb
+    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install -f /tmp/kubelet.deb
+    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install -f /tmp/kubectl.deb
+    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install -f /tmp/kubeadm.deb
+    sudo LANG=C chroot $FILESYSTEM_ROOT rm -f /tmp/{cri-tools,kubernetes-cni,kubelet,kubeadm,kubectl}.deb
 }
 
 if [ "$INCLUDE_KUBERNETES" == "y" ]
@@ -475,6 +484,10 @@ fi
 ## Disable kexec supported reboot which was installed by default
 sudo sed -i 's/LOAD_KEXEC=true/LOAD_KEXEC=false/' $FILESYSTEM_ROOT/etc/default/kexec
 
+# Ensure that 'logrotate-config.service' is set as a dependency to start before 'logrotate.service'.
+sudo mkdir $FILESYSTEM_ROOT/etc/systemd/system/logrotate.service.d
+sudo cp files/image_config/logrotate/logrotateOverride.conf $FILESYSTEM_ROOT/etc/systemd/system/logrotate.service.d/logrotateOverride.conf
+
 ## Remove sshd host keys, and will regenerate on first sshd start
 sudo rm -f $FILESYSTEM_ROOT/etc/ssh/ssh_host_*_key*
 sudo cp files/sshd/host-ssh-keygen.sh $FILESYSTEM_ROOT/usr/local/bin/

device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/hwsku.json

@@ -1,132 +0,0 @@
-{
-    "interfaces": {
-        "Ethernet0": {
-            "default_brkout_mode": "3x10G(3)+1x1G(1)",
-            "port_type": "RJ45"
-        },
-        "Ethernet4": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet8": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet12": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet16": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet20": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet24": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet28": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet32": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet36": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet40": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet44": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet48": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet52": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet56": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet60": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet64": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet68": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet72": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet76": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet80": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet84": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet88": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet92": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet96": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet100": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet104": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet108": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet112": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet116": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet120": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet124": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        }
-    }
-}

device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/port_config.ini

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

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t1.config.bcm

@@ -449,3 +449,4 @@ serdes_preemphasis_109=0x145c00
 
 mmu_init_config="MSFT-TH-Tier1"
 phy_an_lt_msft=1
+phy_unlos_msft=1

device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm

@@ -861,3 +861,4 @@ dma_desc_aggregator_enable_specific_MDB_LPM.BCM8869X=1
 dma_desc_aggregator_enable_specific_MDB_FEC.BCM8869X=1
 sai_pfc_dlr_init_capability=0 
 sai_default_cpu_tx_tc=7
+sai_disable_srcmacqedstmac_ctrl=1

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

@@ -1015,3 +1015,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2
 sai_pfc_dlr_init_capability=0
 sai_default_cpu_tx_tc=7
+sai_disable_srcmacqedstmac_ctrl=1

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

@@ -1015,3 +1015,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2
 sai_pfc_dlr_init_capability=0
 sai_default_cpu_tx_tc=7
+sai_disable_srcmacqedstmac_ctrl=1

device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/port_config.ini

@@ -1,41 +0,0 @@
-# name         lanes             alias        index  role       speed       asic_port_name     coreId      corePortId      numVoq
-Ethernet0      72,73,74,75       Ethernet1/1  1      Ext        100000      Eth0-ASIC0         1           1               8
-Ethernet8      80,81,82,83       Ethernet2/1  2      Ext        100000      Eth8-ASIC0         1           2               8
-Ethernet16     88,89,90,91       Ethernet3/1  3      Ext        100000      Eth16-ASIC0        1           3               8
-Ethernet24     96,97,98,99       Ethernet4/1  4      Ext        100000      Eth24-ASIC0        1           4               8
-Ethernet32     104,105,106,107   Ethernet5/1  5      Ext        100000      Eth32-ASIC0        1           5               8
-Ethernet40     112,113,114,115   Ethernet6/1  6      Ext        100000      Eth40-ASIC0        1           6               8
-Ethernet48     120,121,122,123   Ethernet7/1  7      Ext        100000      Eth48-ASIC0        1           7               8
-Ethernet56     128,129,130,131   Ethernet8/1  8      Ext        100000      Eth56-ASIC0        1           8               8
-Ethernet64     136,137,138,139   Ethernet9/1  9      Ext        100000      Eth64-ASIC0        1           9               8
-Ethernet72     64,65,66,67       Ethernet10/1 10     Ext        100000      Eth72-ASIC0        0           10              8
-Ethernet80     56,57,58,59       Ethernet11/1 11     Ext        100000      Eth80-ASIC0        0           11              8
-Ethernet88     48,49,50,51       Ethernet12/1 12     Ext        100000      Eth88-ASIC0        0           12              8
-Ethernet96     40,41,42,43       Ethernet13/1 13     Ext        100000      Eth96-ASIC0        0           13              8
-Ethernet104    32,33,34,35       Ethernet14/1 14     Ext        100000      Eth104-ASIC0       0           14              8
-Ethernet112    24,25,26,27       Ethernet15/1 15     Ext        100000      Eth112-ASIC0       0           15              8
-Ethernet120    16,17,18,19       Ethernet16/1 16     Ext        100000      Eth120-ASIC0       0           16              8
-Ethernet128    8,9,10,11         Ethernet17/1 17     Ext        100000      Eth128-ASIC0       0           17              8
-Ethernet136    0,1,2,3           Ethernet18/1 18     Ext        100000      Eth136-ASIC0       0           18              8
-Ethernet144    72,73,74,75       Ethernet19/1 19     Ext        100000      Eth0-ASIC1         1           1               8
-Ethernet152    80,81,82,83       Ethernet20/1 20     Ext        100000      Eth8-ASIC1         1           2               8
-Ethernet160    88,89,90,91       Ethernet21/1 21     Ext        100000      Eth16-ASIC1        1           3               8
-Ethernet168    96,97,98,99       Ethernet22/1 22     Ext        100000      Eth24-ASIC1        1           4               8
-Ethernet176    104,105,106,107   Ethernet23/1 23     Ext        100000      Eth32-ASIC1        1           5               8
-Ethernet184    112,113,114,115   Ethernet24/1 24     Ext        100000      Eth40-ASIC1        1           6               8
-Ethernet192    120,121,122,123   Ethernet25/1 25     Ext        100000      Eth48-ASIC1        1           7               8
-Ethernet200    128,129,130,131   Ethernet26/1 26     Ext        100000      Eth56-ASIC1        1           8               8
-Ethernet208    136,137,138,139   Ethernet27/1 27     Ext        100000      Eth64-ASIC1        1           9               8
-Ethernet216    64,65,66,67       Ethernet28/1 28     Ext        100000      Eth72-ASIC1        0           10              8
-Ethernet224    56,57,58,59       Ethernet29/1 29     Ext        100000      Eth80-ASIC1        0           11              8
-Ethernet232    48,49,50,51       Ethernet30/1 30     Ext        100000      Eth88-ASIC1        0           12              8
-Ethernet240    40,41,42,43       Ethernet31/1 31     Ext        100000      Eth96-ASIC1        0           13              8
-Ethernet248    32,33,34,35       Ethernet32/1 32     Ext        100000      Eth104-ASIC1       0           14              8
-Ethernet256    24,25,26,27       Ethernet33/1 33     Ext        100000      Eth112-ASIC1       0           15              8
-Ethernet264    16,17,18,19       Ethernet34/1 34     Ext        100000      Eth120-ASIC1       0           16              8
-Ethernet272    8,9,10,11         Ethernet35/1 35     Ext        100000      Eth128-ASIC1       0           17              8
-Ethernet280    0,1,2,3           Ethernet36/1 36     Ext        100000      Eth136-ASIC1       0           18              8
-Ethernet-Rec0  249               Recirc0/0    37     Rec        400000      Rcy0-ASIC0         0           49              8
-Ethernet-IB0   250               Recirc0/1    38     Inb        400000      Rcy1-ASIC0         1           50              8
-Ethernet-Rec1  249               Recirc0/0    39     Rec        400000      Rcy0-ASIC1         0           49              8
-Ethernet-IB1   250               Recirc0/1    40     Inb        400000      Rcy1-ASIC1         1           50              8

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

@@ -1032,3 +1032,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 sai_pfc_dlr_init_capability=0
 sai_default_cpu_tx_tc=7
+sai_disable_srcmacqedstmac_ctrl=1

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

@@ -1032,3 +1032,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 sai_pfc_dlr_init_capability=0
 sai_default_cpu_tx_tc=7
+sai_disable_srcmacqedstmac_ctrl=1

device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/port_config.ini

@@ -1,77 +0,0 @@
-# name         lanes             alias        index  role       speed      asic_port_name     coreId      corePortId      numVoq
-Ethernet0      72,73,74,75       Ethernet1/1  1      Ext        100000      Eth0-ASIC0         1           1               8
-Ethernet4      76,77,78,79       Ethernet1/5  1      Ext        100000      Eth4-ASIC0         1           2               8
-Ethernet8      80,81,82,83       Ethernet2/1  2      Ext        100000      Eth8-ASIC0         1           3               8
-Ethernet12     84,85,86,87       Ethernet2/5  2      Ext        100000      Eth12-ASIC0        1           4               8
-Ethernet16     88,89,90,91       Ethernet3/1  3      Ext        100000      Eth16-ASIC0        1           5               8
-Ethernet20     92,93,94,95       Ethernet3/5  3      Ext        100000      Eth20-ASIC0        1           6               8
-Ethernet24     96,97,98,99       Ethernet4/1  4      Ext        100000      Eth24-ASIC0        1           7               8
-Ethernet28     100,101,102,103   Ethernet4/5  4      Ext        100000      Eth28-ASIC0        1           8               8
-Ethernet32     104,105,106,107   Ethernet5/1  5      Ext        100000      Eth32-ASIC0        1           9               8
-Ethernet36     108,109,110,111   Ethernet5/5  5      Ext        100000      Eth36-ASIC0        1           10              8
-Ethernet40     112,113,114,115   Ethernet6/1  6      Ext        100000      Eth40-ASIC0        1           11              8
-Ethernet44     116,117,118,119   Ethernet6/5  6      Ext        100000      Eth44-ASIC0        1           12              8
-Ethernet48     120,121,122,123   Ethernet7/1  7      Ext        100000      Eth48-ASIC0        1           13              8
-Ethernet52     124,125,126,127   Ethernet7/5  7      Ext        100000      Eth52-ASIC0        1           14              8
-Ethernet56     128,129,130,131   Ethernet8/1  8      Ext        100000      Eth56-ASIC0        1           15              8
-Ethernet60     132,133,134,135   Ethernet8/5  8      Ext        100000      Eth60-ASIC0        1           16              8
-Ethernet64     136,137,138,139   Ethernet9/1  9      Ext        100000      Eth64-ASIC0        1           17              8
-Ethernet68     140,141,142,143   Ethernet9/5  9      Ext        100000      Eth68-ASIC0        1           18              8
-Ethernet72     64,65,66,67       Ethernet10/1 10     Ext        100000      Eth72-ASIC0        0           19              8
-Ethernet76     68,69,70,71       Ethernet10/5 10     Ext        100000      Eth76-ASIC0        0           20              8
-Ethernet80     56,57,58,59       Ethernet11/1 11     Ext        100000      Eth80-ASIC0        0           21              8
-Ethernet84     60,61,62,63       Ethernet11/5 11     Ext        100000      Eth84-ASIC0        0           22              8
-Ethernet88     48,49,50,51       Ethernet12/1 12     Ext        100000      Eth88-ASIC0        0           23              8
-Ethernet92     52,53,54,55       Ethernet12/5 12     Ext        100000      Eth92-ASIC0        0           24              8
-Ethernet96     40,41,42,43       Ethernet13/1 13     Ext        100000      Eth96-ASIC0        0           25              8
-Ethernet100    44,45,46,47       Ethernet13/5 13     Ext        100000      Eth100-ASIC0       0           26              8
-Ethernet104    32,33,34,35       Ethernet14/1 14     Ext        100000      Eth104-ASIC0       0           27              8
-Ethernet108    36,37,38,39       Ethernet14/5 14     Ext        100000      Eth108-ASIC0       0           28              8
-Ethernet112    24,25,26,27       Ethernet15/1 15     Ext        100000      Eth112-ASIC0       0           29              8
-Ethernet116    28,29,30,31       Ethernet15/5 15     Ext        100000      Eth116-ASIC0       0           30              8
-Ethernet120    16,17,18,19       Ethernet16/1 16     Ext        100000      Eth120-ASIC0       0           31              8
-Ethernet124    20,21,22,23       Ethernet16/5 16     Ext        100000      Eth124-ASIC0       0           32              8
-Ethernet128    8,9,10,11         Ethernet17/1 17     Ext        100000      Eth128-ASIC0       0           33              8
-Ethernet132    12,13,14,15       Ethernet17/5 17     Ext        100000      Eth132-ASIC0       0           34              8
-Ethernet136    0,1,2,3           Ethernet18/1 18     Ext        100000      Eth136-ASIC0       0           35              8
-Ethernet140    4,5,6,7           Ethernet18/5 18     Ext        100000      Eth140-ASIC0       0           36              8
-Ethernet144    72,73,74,75       Ethernet19/1 19     Ext        100000      Eth144-ASIC1       1           1               8
-Ethernet148    76,77,78,79       Ethernet19/5 19     Ext        100000      Eth148-ASIC1       1           2               8
-Ethernet152    80,81,82,83       Ethernet20/1 20     Ext        100000      Eth152-ASIC1       1           3               8
-Ethernet156    84,85,86,87       Ethernet20/5 20     Ext        100000      Eth156-ASIC1       1           4               8
-Ethernet160    88,89,90,91       Ethernet21/1 21     Ext        100000      Eth160-ASIC1       1           5               8
-Ethernet164    92,93,94,95       Ethernet21/5 21     Ext        100000      Eth164-ASIC1       1           6               8
-Ethernet168    96,97,98,99       Ethernet22/1 22     Ext        100000      Eth168-ASIC1       1           7               8
-Ethernet172    100,101,102,103   Ethernet22/5 22     Ext        100000      Eth172-ASIC1       1           8               8
-Ethernet176    104,105,106,107   Ethernet23/1 23     Ext        100000      Eth176-ASIC1       1           9               8
-Ethernet180    108,109,110,111   Ethernet23/5 23     Ext        100000      Eth180-ASIC1       1           10              8
-Ethernet184    112,113,114,115   Ethernet24/1 24     Ext        100000      Eth184-ASIC1       1           11              8
-Ethernet188    116,117,118,119   Ethernet24/5 24     Ext        100000      Eth188-ASIC1       1           12              8
-Ethernet192    120,121,122,123   Ethernet25/1 25     Ext        100000      Eth192-ASIC1       1           13              8
-Ethernet196    124,125,126,127   Ethernet25/5 25     Ext        100000      Eth196-ASIC1       1           14              8
-Ethernet200    128,129,130,131   Ethernet26/1 26     Ext        100000      Eth200-ASIC1       1           15              8
-Ethernet204    132,133,134,135   Ethernet26/5 26     Ext        100000      Eth204-ASIC1       1           16              8
-Ethernet208    136,137,138,139   Ethernet27/1 27     Ext        100000      Eth208-ASIC1       1           17              8
-Ethernet212    140,141,142,143   Ethernet27/5 27     Ext        100000      Eth212-ASIC1       1           18              8
-Ethernet216    64,65,66,67       Ethernet28/1 28     Ext        100000      Eth216-ASIC1       0           19              8
-Ethernet220    68,69,70,71       Ethernet28/5 28     Ext        100000      Eth220-ASIC1       0           20              8
-Ethernet224    56,57,58,59       Ethernet29/1 29     Ext        100000      Eth224-ASIC1       0           21              8
-Ethernet228    60,61,62,63       Ethernet29/5 29     Ext        100000      Eth228-ASIC1       0           22              8
-Ethernet232    48,49,50,51       Ethernet30/1 30     Ext        100000      Eth232-ASIC1       0           23              8
-Ethernet236    52,53,54,55       Ethernet30/5 30     Ext        100000      Eth236-ASIC1       0           24              8
-Ethernet240    40,41,42,43       Ethernet31/1 31     Ext        100000      Eth240-ASIC1       0           25              8
-Ethernet244    44,45,46,47       Ethernet31/5 31     Ext        100000      Eth244-ASIC1       0           26              8
-Ethernet248    32,33,34,35       Ethernet32/1 32     Ext        100000      Eth248-ASIC1       0           27              8
-Ethernet252    36,37,38,39       Ethernet32/5 32     Ext        100000      Eth252-ASIC1       0           28              8
-Ethernet256    24,25,26,27       Ethernet33/1 33     Ext        100000      Eth256-ASIC1       0           29              8
-Ethernet260    28,29,30,31       Ethernet33/5 33     Ext        100000      Eth260-ASIC1       0           30              8
-Ethernet264    16,17,18,19       Ethernet34/1 34     Ext        100000      Eth264-ASIC1       0           31              8
-Ethernet268    20,21,22,23       Ethernet34/5 34     Ext        100000      Eth268-ASIC1       0           32              8
-Ethernet272    8,9,10,11         Ethernet35/1 35     Ext        100000      Eth272-ASIC1       0           33              8
-Ethernet276    12,13,14,15       Ethernet35/5 35     Ext        100000      Eth276-ASIC1       0           34              8
-Ethernet280    0,1,2,3           Ethernet36/1 36     Ext        100000      Eth280-ASIC1       0           35              8
-Ethernet284    4,5,6,7           Ethernet36/5 36     Ext        100000      Eth284-ASIC1       0           36              8
-Ethernet-Rec0  221               Recirc0/0    37     Rec        400000      Rcy0-ASIC0         0           221             8
-Ethernet-IB0   222               Recirc0/1    38     Inb        400000      Rcy1-ASIC0         1           222             8
-Ethernet-Rec1  221               Recirc0/0    39     Rec        400000      Rcy0-ASIC1         0           221             8
-Ethernet-IB1   222               Recirc0/1    40     Inb        400000      Rcy1-ASIC1         1           222             8

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

@@ -1052,3 +1052,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 sai_pfc_dlr_init_capability=0
 sai_default_cpu_tx_tc=7
+sai_disable_srcmacqedstmac_ctrl=1

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

@@ -1052,3 +1052,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 sai_pfc_dlr_init_capability=0
 sai_default_cpu_tx_tc=7
+sai_disable_srcmacqedstmac_ctrl=1

device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/port_config.ini

@@ -1,41 +0,0 @@
-# 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-ASIC0         1           1               8
-Ethernet8      80,81,82,83,84,85,86,87           Ethernet2/1  2      Ext        400000      Eth8-ASIC0         1           2               8
-Ethernet16     88,89,90,91,92,93,94,95           Ethernet3/1  3      Ext        400000      Eth16-ASIC0        1           3               8
-Ethernet24     96,97,98,99,100,101,102,103       Ethernet4/1  4      Ext        400000      Eth24-ASIC0        1           4               8
-Ethernet32     104,105,106,107,108,109,110,111   Ethernet5/1  5      Ext        400000      Eth32-ASIC0        1           5               8
-Ethernet40     112,113,114,115,116,117,118,119   Ethernet6/1  6      Ext        400000      Eth40-ASIC0        1           6               8
-Ethernet48     120,121,122,123,124,125,126,127   Ethernet7/1  7      Ext        400000      Eth48-ASIC0        1           7               8
-Ethernet56     128,129,130,131,132,133,134,135   Ethernet8/1  8      Ext        400000      Eth56-ASIC0        1           8               8
-Ethernet64     136,137,138,139,140,141,142,143   Ethernet9/1  9      Ext        400000      Eth64-ASIC0        1           9               8
-Ethernet72     64,65,66,67,68,69,70,71           Ethernet10/1 10     Ext        400000      Eth72-ASIC0        0           10              8
-Ethernet80     56,57,58,59,60,61,62,63           Ethernet11/1 11     Ext        400000      Eth80-ASIC0        0           11              8
-Ethernet88     48,49,50,51,52,53,54,55           Ethernet12/1 12     Ext        400000      Eth88-ASIC0        0           12              8
-Ethernet96     40,41,42,43,44,45,46,47           Ethernet13/1 13     Ext        400000      Eth96-ASIC0        0           13              8
-Ethernet104    32,33,34,35,36,37,38,39           Ethernet14/1 14     Ext        400000      Eth104-ASIC0       0           14              8
-Ethernet112    24,25,26,27,28,29,30,31           Ethernet15/1 15     Ext        400000      Eth112-ASIC0       0           15              8
-Ethernet120    16,17,18,19,20,21,22,23           Ethernet16/1 16     Ext        400000      Eth120-ASIC0       0           16              8
-Ethernet128    8,9,10,11,12,13,14,15             Ethernet17/1 17     Ext        400000      Eth128-ASIC0       0           17              8
-Ethernet136    0,1,2,3,4,5,6,7                   Ethernet18/1 18     Ext        400000      Eth136-ASIC0       0           18              8
-Ethernet144    72,73,74,75,76,77,78,79           Ethernet19/1 19     Ext        400000      Eth0-ASIC1         1           1               8
-Ethernet152    80,81,82,83,84,85,86,87           Ethernet20/1 20     Ext        400000      Eth8-ASIC1         1           2               8
-Ethernet160    88,89,90,91,92,93,94,95           Ethernet21/1 21     Ext        400000      Eth16-ASIC1        1           3               8
-Ethernet168    96,97,98,99,100,101,102,103       Ethernet22/1 22     Ext        400000      Eth24-ASIC1        1           4               8
-Ethernet176    104,105,106,107,108,109,110,111   Ethernet23/1 23     Ext        400000      Eth32-ASIC1        1           5               8
-Ethernet184    112,113,114,115,116,117,118,119   Ethernet24/1 24     Ext        400000      Eth40-ASIC1        1           6               8
-Ethernet192    120,121,122,123,124,125,126,127   Ethernet25/1 25     Ext        400000      Eth48-ASIC1        1           7               8
-Ethernet200    128,129,130,131,132,133,134,135   Ethernet26/1 26     Ext        400000      Eth56-ASIC1        1           8               8
-Ethernet208    136,137,138,139,140,141,142,143   Ethernet27/1 27     Ext        400000      Eth64-ASIC1        1           9               8
-Ethernet216    64,65,66,67,68,69,70,71           Ethernet28/1 28     Ext        400000      Eth72-ASIC1        0           10              8
-Ethernet224    56,57,58,59,60,61,62,63           Ethernet29/1 29     Ext        400000      Eth80-ASIC1        0           11              8
-Ethernet232    48,49,50,51,52,53,54,55           Ethernet30/1 30     Ext        400000      Eth88-ASIC1        0           12              8
-Ethernet240    40,41,42,43,44,45,46,47           Ethernet31/1 31     Ext        400000      Eth96-ASIC1        0           13              8
-Ethernet248    32,33,34,35,36,37,38,39           Ethernet32/1 32     Ext        400000      Eth104-ASIC1       0           14              8
-Ethernet256    24,25,26,27,28,29,30,31           Ethernet33/1 33     Ext        400000      Eth112-ASIC1       0           15              8
-Ethernet264    16,17,18,19,20,21,22,23           Ethernet34/1 34     Ext        400000      Eth120-ASIC1       0           16              8
-Ethernet272    8,9,10,11,12,13,14,15             Ethernet35/1 35     Ext        400000      Eth128-ASIC1       0           17              8
-Ethernet280    0,1,2,3,4,5,6,7                   Ethernet36/1 36     Ext        400000      Eth136-ASIC1       0           18              8
-Ethernet-Rec0  249                               Recirc0/0    37     Rec        400000      Rcy0-ASIC0         0           49              8
-Ethernet-IB0   250                               Recirc0/1    38     Inb        400000      Rcy1-ASIC0         1           50              8
-Ethernet-Rec1  249                               Recirc0/0    39     Rec        400000      Rcy0-ASIC1         0           49              8
-Ethernet-IB1   250                               Recirc0/1    40     Inb        400000      Rcy1-ASIC1         1           50              8

device/celestica/x86_64-cel_e1031-r0/sonic_platform/common.py

@@ -24,7 +24,6 @@ class Common:
 
     SET_METHOD_IPMI = 'ipmitool'
     NULL_VAL = 'N/A'
-    HOST_CHK_CMD = ["docker"]
     REF_KEY = '$ref:'
 
     def __init__(self, conf=None):
@@ -185,11 +184,12 @@ class Common:
         return True
 
     def is_host(self):
-        try:
-            subprocess.call(self.HOST_CHK_CMD, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-        except FileNotFoundError:
-            return False
-        return True
+        """
+        Test whether current process is running on the host or an docker
+        return True for host and False for docker
+        """
+        docker_env_file = '/.dockerenv'
+        return os.path.exists(docker_env_file) is False
 
     def load_json_file(self, path):
         """

device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/sai.profile

@@ -1,3 +1 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2010.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10

device/mellanox/x86_64-mlnx_msn2010-r0/installer.conf

@@ -1 +1 @@
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq"
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq libata.force=noncq"

device/mellanox/x86_64-mlnx_msn2010-r0/sensors.conf

@@ -47,3 +47,25 @@ bus "i2c-2" "i2c-1-mux (chan_id 1)"
         label fan2 "Chassis Fan 2"
         label fan3 "Chassis Fan 3"
         label fan4 "Chassis Fan 4"
+        ignore temp2
+        ignore temp3
+        ignore temp4
+        ignore temp5
+        ignore temp6
+        ignore temp7
+        ignore temp8
+        ignore temp9
+        ignore temp10
+        ignore temp11
+        ignore temp12
+        ignore temp13
+        ignore temp14
+        ignore temp15
+        ignore temp16
+        ignore temp17
+        ignore temp18
+        ignore temp19
+        ignore temp20
+        ignore temp21
+        ignore temp22
+        ignore temp23

device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/sai.profile

@@ -1,3 +1 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2100.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10

device/mellanox/x86_64-mlnx_msn2100-r0/sensors.conf

@@ -49,3 +49,19 @@ bus "i2c-2" "i2c-1-mux (chan_id 1)"
         label fan2 "Chassis Fan 2"
         label fan3 "Chassis Fan 3"
         label fan4 "Chassis Fan 4"
+        ignore temp2
+        ignore temp3
+        ignore temp4
+        ignore temp5
+        ignore temp6
+        ignore temp7
+        ignore temp8
+        ignore temp9
+        ignore temp10
+        ignore temp11
+        ignore temp12
+        ignore temp13
+        ignore temp14
+        ignore temp15
+        ignore temp16
+        ignore temp17

device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/sai.profile

@@ -1,3 +1 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2410.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10

device/mellanox/x86_64-mlnx_msn2410-r0/sensors.conf

@@ -79,3 +79,59 @@ bus "i2c-2" "i2c-1-mux (chan_id 1)"
         label fan6 "Chassis Drawer-3 Fan-2"
         label fan7 "Chassis Drawer-4 Fan-1"
         label fan8 "Chassis Drawer-4 Fan-2"
+        ignore temp2
+        ignore temp3
+        ignore temp4
+        ignore temp5
+        ignore temp6
+        ignore temp7
+        ignore temp8
+        ignore temp9
+        ignore temp10
+        ignore temp11
+        ignore temp12
+        ignore temp13
+        ignore temp14
+        ignore temp15
+        ignore temp16
+        ignore temp17
+        ignore temp18
+        ignore temp19
+        ignore temp20
+        ignore temp21
+        ignore temp22
+        ignore temp23
+        ignore temp24
+        ignore temp25
+        ignore temp26
+        ignore temp27
+        ignore temp28
+        ignore temp29
+        ignore temp30
+        ignore temp31
+        ignore temp32
+        ignore temp33
+        ignore temp34
+        ignore temp35
+        ignore temp36
+        ignore temp37
+        ignore temp38
+        ignore temp39
+        ignore temp40
+        ignore temp41
+        ignore temp42
+        ignore temp43
+        ignore temp44
+        ignore temp45
+        ignore temp46
+        ignore temp47
+        ignore temp48
+        ignore temp49
+        ignore temp50
+        ignore temp51
+        ignore temp52
+        ignore temp53
+        ignore temp54
+        ignore temp55
+        ignore temp56
+        ignore temp57

device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/sai.profile

@@ -1,3 +1 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10

device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/sai.profile

@@ -1,4 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700_8x50g_28x100g.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1

device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai.profile

@@ -1,4 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700_8x100g_40x50g_8x10g.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1

device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D44C10/sai.profile

@@ -1,4 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700_44x50g_10x100g.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1

device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai.profile

@@ -1,4 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700_48x50g_8x100g.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1

device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/sai.profile

@@ -1,4 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1

device/mellanox/x86_64-mlnx_msn2700-r0/installer.conf

@@ -1 +1 @@
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq"
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq libata.force=noncq"

device/mellanox/x86_64-mlnx_msn2700-r0/platform_wait

@@ -1,69 +1,32 @@
-#!/bin/bash
+#!/usr/bin/python3
 
-declare -r SYSLOG_LOGGER="/usr/bin/logger"
-declare -r SYSLOG_IDENTIFIER="platform_wait"
-declare -r SYSLOG_ERROR="error"
-declare -r SYSLOG_NOTICE="notice"
-declare -r SYSLOG_INFO="info"
+#
+# Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
+# Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
-declare -r HW_MGMT_CONFIG="/var/run/hw-management/config"
+import sys
+from sonic_platform.device_data import DeviceDataManager
+from sonic_py_common.logger import Logger
 
-declare -r MODULE_COUNTER="${HW_MGMT_CONFIG}/module_counter"
-declare -r SFP_COUNTER="${HW_MGMT_CONFIG}/sfp_counter"
 
-declare -r EXIT_SUCCESS="0"
-declare -r EXIT_TIMEOUT="1"
-
-function log_error() {
-    eval "${SYSLOG_LOGGER} -t ${SYSLOG_IDENTIFIER} -p ${SYSLOG_ERROR} $@"
-}
-
-function log_notice() {
-    eval "${SYSLOG_LOGGER} -t ${SYSLOG_IDENTIFIER} -p ${SYSLOG_NOTICE} $@"
-}
-
-function log_info() {
-    eval "${SYSLOG_LOGGER} -t ${SYSLOG_IDENTIFIER} -p ${SYSLOG_INFO} $@"
-}
-
-function wait_for_sfp() {
-    local -r _NUM_MATCH="^[0-9]+$"
-    local -r _NUM_ZERO="0"
-
-    local _MODULE_CNT="0"
-    local _SFP_CNT="0"
-
-    local -i _WDOG_CNT="1"
-    local -ir _WDOG_MAX="300"
-
-    local -r _TIMEOUT="1s"
-
-    while [[ "${_WDOG_CNT}" -le "${_WDOG_MAX}" ]]; do
-        _MODULE_CNT="$(cat ${MODULE_COUNTER} 2>&1)"
-        _SFP_CNT="$(cat ${SFP_COUNTER} 2>&1)"
-
-        if [[ "${_MODULE_CNT}" =~ ${_NUM_MATCH} && "${_SFP_CNT}" =~ ${_NUM_MATCH} ]]; then
-            if [[ "${_SFP_CNT}" -gt "${_NUM_ZERO}" && "${_MODULE_CNT}" -eq "${_SFP_CNT}" ]]; then
-                return "${EXIT_SUCCESS}"
-            fi
-        fi
-
-        let "_WDOG_CNT++"
-        sleep "${_TIMEOUT}"
-    done
-
-    return "${EXIT_TIMEOUT}"
-}
-
-log_info "Wait for SFP interfaces to be ready"
-
-wait_for_sfp
-EXIT_CODE="$?"
-if [[ "${EXIT_CODE}" != "${EXIT_SUCCESS}" ]]; then
-    log_error "SFP interfaces are not ready: timeout"
-    exit "${EXIT_CODE}"
-fi
-
-log_info "SFP interfaces are ready"
-
-exit "${EXIT_SUCCESS}"
+logger = Logger(log_identifier='platform_wait')
+logger.log_notice('Nvidia: Wait for PMON dependencies to be ready')
+if DeviceDataManager.wait_platform_ready():
+    logger.log_notice('Nvidia: PMON dependencies are ready')
+    sys.exit(0)
+else:
+    logger.log_error('Nvidia: PMON dependencies are not ready: timeout')
+    sys.exit(-1)

device/mellanox/x86_64-mlnx_msn2700-r0/sensors.conf

@@ -79,3 +79,35 @@ bus "i2c-2" "i2c-1-mux (chan_id 2)"
         label fan6 "Chassis Drawer-3 Fan-2"
         label fan7 "Chassis Drawer-4 Fan-1"
         label fan8 "Chassis Drawer-4 Fan-2"
+        ignore temp2
+        ignore temp3
+        ignore temp4
+        ignore temp5
+        ignore temp6
+        ignore temp7
+        ignore temp8
+        ignore temp9
+        ignore temp10
+        ignore temp11
+        ignore temp12
+        ignore temp13
+        ignore temp14
+        ignore temp15
+        ignore temp16
+        ignore temp17
+        ignore temp18
+        ignore temp19
+        ignore temp20
+        ignore temp21
+        ignore temp22
+        ignore temp23
+        ignore temp24
+        ignore temp25
+        ignore temp26
+        ignore temp27
+        ignore temp28
+        ignore temp29
+        ignore temp30
+        ignore temp31
+        ignore temp32
+        ignore temp33

device/mellanox/x86_64-mlnx_msn2700a1-r0/installer.conf

@@ -1 +1 @@
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="logs_inram=on"
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="logs_inram=on libata.force=noncq"

device/mellanox/x86_64-mlnx_msn2700a1-r0/sensors.conf

@@ -21,6 +21,38 @@ bus "i2c-17" "i2c-1-mux (chan_id 8)"
 # Temperature sensors
 chip "mlxsw-i2c-*-48"
     label temp1 "Ambient ASIC Temp"
+    ignore temp2
+    ignore temp3
+    ignore temp4
+    ignore temp5
+    ignore temp6
+    ignore temp7
+    ignore temp8
+    ignore temp9
+    ignore temp10
+    ignore temp11
+    ignore temp12
+    ignore temp13
+    ignore temp14
+    ignore temp15
+    ignore temp16
+    ignore temp17
+    ignore temp18
+    ignore temp19
+    ignore temp20
+    ignore temp21
+    ignore temp22
+    ignore temp23
+    ignore temp24
+    ignore temp25
+    ignore temp26
+    ignore temp27
+    ignore temp28
+    ignore temp29
+    ignore temp30
+    ignore temp31
+    ignore temp32
+    ignore temp33
 
 chip "tmp102-i2c-*-49"
     label temp1 "Ambient COMEX Temp"

device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/sai.profile

@@ -1,3 +1 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2740.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10

device/mellanox/x86_64-mlnx_msn2740-r0/sensors.conf

@@ -74,3 +74,36 @@ bus "i2c-2" "i2c-1-mux (chan_id 1)"
         label fan2 "Chassis Fan Drawer-2"
         label fan3 "Chassis Fan Drawer-3"
         label fan4 "Chassis Fan Drawer-4"
+        ignore temp2
+        ignore temp3
+        ignore temp4
+        ignore temp5
+        ignore temp6
+        ignore temp7
+        ignore temp8
+        ignore temp9
+        ignore temp10
+        ignore temp11
+        ignore temp12
+        ignore temp13
+        ignore temp14
+        ignore temp15
+        ignore temp16
+        ignore temp17
+        ignore temp18
+        ignore temp19
+        ignore temp20
+        ignore temp21
+        ignore temp22
+        ignore temp23
+        ignore temp24
+        ignore temp25
+        ignore temp26
+        ignore temp27
+        ignore temp28
+        ignore temp29
+        ignore temp30
+        ignore temp31
+        ignore temp32
+        ignore temp33
+

device/mellanox/x86_64-mlnx_msn3420-r0/ACS-MSN3420/sai.profile

@@ -1,4 +1 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3420.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
-SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn3420-r0/installer.conf

@@ -0,0 +1 @@
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="libata.force=noncq"

device/mellanox/x86_64-mlnx_msn3420-r0/sensors.conf

@@ -8,6 +8,66 @@
 bus "i2c-2" "i2c-1-mux (chan_id 1)"
     chip "mlxsw-i2c-*-48"
         label temp1 "Ambient ASIC Temp"
+        ignore temp2
+        ignore temp3
+        ignore temp4
+        ignore temp5
+        ignore temp6
+        ignore temp7
+        ignore temp8
+        ignore temp9
+        ignore temp10
+        ignore temp11
+        ignore temp12
+        ignore temp13
+        ignore temp14
+        ignore temp15
+        ignore temp16
+        ignore temp17
+        ignore temp18
+        ignore temp19
+        ignore temp20
+        ignore temp21
+        ignore temp22
+        ignore temp23
+        ignore temp24
+        ignore temp25
+        ignore temp26
+        ignore temp27
+        ignore temp28
+        ignore temp29
+        ignore temp30
+        ignore temp31
+        ignore temp32
+        ignore temp33
+        ignore temp34
+        ignore temp35
+        ignore temp36
+        ignore temp37
+        ignore temp38
+        ignore temp39
+        ignore temp40
+        ignore temp41
+        ignore temp42
+        ignore temp43
+        ignore temp44
+        ignore temp45
+        ignore temp46
+        ignore temp47
+        ignore temp48
+        ignore temp49
+        ignore temp50
+        ignore temp51
+        ignore temp52
+        ignore temp53
+        ignore temp54
+        ignore temp55
+        ignore temp56
+        ignore temp57
+        ignore temp58
+        ignore temp59
+        ignore temp60
+        ignore temp61
 
 bus "i2c-7" "i2c-1-mux (chan_id 6)"
     chip "tmp102-i2c-*-49"

device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/sai.profile

@@ -1,4 +1 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3700.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
-SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn3700-r0/installer.conf

@@ -0,0 +1 @@
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="libata.force=noncq"

device/mellanox/x86_64-mlnx_msn3700-r0/sensors.conf

@@ -8,6 +8,38 @@
 bus "i2c-2" "i2c-1-mux (chan_id 1)"
     chip "mlxsw-i2c-*-48"
         label temp1 "Ambient ASIC Temp"
+        ignore temp2
+        ignore temp3
+        ignore temp4
+        ignore temp5
+        ignore temp6
+        ignore temp7
+        ignore temp8
+        ignore temp9
+        ignore temp10
+        ignore temp11
+        ignore temp12
+        ignore temp13
+        ignore temp14
+        ignore temp15
+        ignore temp16
+        ignore temp17
+        ignore temp18
+        ignore temp19
+        ignore temp20
+        ignore temp21
+        ignore temp22
+        ignore temp23
+        ignore temp24
+        ignore temp25
+        ignore temp26
+        ignore temp27
+        ignore temp28
+        ignore temp29
+        ignore temp30
+        ignore temp31
+        ignore temp32
+        ignore temp33
 
 bus "i2c-7" "i2c-1-mux (chan_id 6)"
     chip "tmp102-i2c-*-49"

device/mellanox/x86_64-mlnx_msn3700-r0/sensors_respin.conf

@@ -19,6 +19,38 @@
 bus "i2c-2" "i2c-1-mux (chan_id 1)"
     chip "mlxsw-i2c-*-48"
         label temp1 "Ambient ASIC Temp"
+        ignore temp2
+        ignore temp3
+        ignore temp4
+        ignore temp5
+        ignore temp6
+        ignore temp7
+        ignore temp8
+        ignore temp9
+        ignore temp10
+        ignore temp11
+        ignore temp12
+        ignore temp13
+        ignore temp14
+        ignore temp15
+        ignore temp16
+        ignore temp17
+        ignore temp18
+        ignore temp19
+        ignore temp20
+        ignore temp21
+        ignore temp22
+        ignore temp23
+        ignore temp24
+        ignore temp25
+        ignore temp26
+        ignore temp27
+        ignore temp28
+        ignore temp29
+        ignore temp30
+        ignore temp31
+        ignore temp32
+        ignore temp33
 
 bus "i2c-7" "i2c-1-mux (chan_id 6)"
     chip "tmp102-i2c-*-49"

device/mellanox/x86_64-mlnx_msn3700-r0/sensors_swb_respin.conf

@@ -19,6 +19,38 @@
 bus "i2c-2" "i2c-1-mux (chan_id 1)"
     chip "mlxsw-i2c-*-48"
         label temp1 "Ambient ASIC Temp"
+        ignore temp2
+        ignore temp3
+        ignore temp4
+        ignore temp5
+        ignore temp6
+        ignore temp7
+        ignore temp8
+        ignore temp9
+        ignore temp10
+        ignore temp11
+        ignore temp12
+        ignore temp13
+        ignore temp14
+        ignore temp15
+        ignore temp16
+        ignore temp17
+        ignore temp18
+        ignore temp19
+        ignore temp20
+        ignore temp21
+        ignore temp22
+        ignore temp23
+        ignore temp24
+        ignore temp25
+        ignore temp26
+        ignore temp27
+        ignore temp28
+        ignore temp29
+        ignore temp30
+        ignore temp31
+        ignore temp32
+        ignore temp33
 
 bus "i2c-7" "i2c-1-mux (chan_id 6)"
     chip "tmp102-i2c-*-49"

device/mellanox/x86_64-mlnx_msn3700c-r0/ACS-MSN3700C/sai.profile

@@ -1,4 +1 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3700c.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
-SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn3700c-r0/installer.conf

@@ -0,0 +1 @@
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="libata.force=noncq"

device/mellanox/x86_64-mlnx_msn3700c-r0/sensors.conf

@@ -8,6 +8,38 @@
 bus "i2c-2" "i2c-1-mux (chan_id 1)"
     chip "mlxsw-i2c-*-48"
         label temp1 "Ambient ASIC Temp"
+        ignore temp2
+        ignore temp3
+        ignore temp4
+        ignore temp5
+        ignore temp6
+        ignore temp7
+        ignore temp8
+        ignore temp9
+        ignore temp10
+        ignore temp11
+        ignore temp12
+        ignore temp13
+        ignore temp14
+        ignore temp15
+        ignore temp16
+        ignore temp17
+        ignore temp18
+        ignore temp19
+        ignore temp20
+        ignore temp21
+        ignore temp22
+        ignore temp23
+        ignore temp24
+        ignore temp25
+        ignore temp26
+        ignore temp27
+        ignore temp28
+        ignore temp29
+        ignore temp30
+        ignore temp31
+        ignore temp32
+        ignore temp33
 
 bus "i2c-7" "i2c-1-mux (chan_id 6)"
     chip "tmp102-i2c-*-49"

device/mellanox/x86_64-mlnx_msn3700c-r0/sensors_respin.conf

@@ -19,6 +19,38 @@
 bus "i2c-2" "i2c-1-mux (chan_id 1)"
     chip "mlxsw-i2c-*-48"
         label temp1 "Ambient ASIC Temp"
+        ignore temp2
+        ignore temp3
+        ignore temp4
+        ignore temp5
+        ignore temp6
+        ignore temp7
+        ignore temp8
+        ignore temp9
+        ignore temp10
+        ignore temp11
+        ignore temp12
+        ignore temp13
+        ignore temp14
+        ignore temp15
+        ignore temp16
+        ignore temp17
+        ignore temp18
+        ignore temp19
+        ignore temp20
+        ignore temp21
+        ignore temp22
+        ignore temp23
+        ignore temp24
+        ignore temp25
+        ignore temp26
+        ignore temp27
+        ignore temp28
+        ignore temp29
+        ignore temp30
+        ignore temp31
+        ignore temp32
+        ignore temp33
 
 bus "i2c-7" "i2c-1-mux (chan_id 6)"
     chip "tmp102-i2c-*-49"

device/mellanox/x86_64-mlnx_msn3700c-r0/sensors_swb_respin.conf

@@ -19,6 +19,38 @@
 bus "i2c-2" "i2c-1-mux (chan_id 1)"
     chip "mlxsw-i2c-*-48"
         label temp1 "Ambient ASIC Temp"
+        ignore temp2
+        ignore temp3
+        ignore temp4
+        ignore temp5
+        ignore temp6
+        ignore temp7
+        ignore temp8
+        ignore temp9
+        ignore temp10
+        ignore temp11
+        ignore temp12
+        ignore temp13
+        ignore temp14
+        ignore temp15
+        ignore temp16
+        ignore temp17
+        ignore temp18
+        ignore temp19
+        ignore temp20
+        ignore temp21
+        ignore temp22
+        ignore temp23
+        ignore temp24
+        ignore temp25
+        ignore temp26
+        ignore temp27
+        ignore temp28
+        ignore temp29
+        ignore temp30
+        ignore temp31
+        ignore temp32
+        ignore temp33
 
 bus "i2c-7" "i2c-1-mux (chan_id 6)"
     chip "tmp102-i2c-*-49"

device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/sai.profile

@@ -1,4 +1 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
-SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/sai.profile

@@ -1,5 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
-SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1

device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/sai.profile

@@ -1,5 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_2x10g_100x50g_12x100g.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
-SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1

device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/sai.profile

@@ -1,5 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_112x50g_8x100g.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
-SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1

device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/sai.profile

@@ -1,5 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_24x50g_52x100g.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
-SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1

device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/sai.profile

@@ -1,5 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_1x10g_28x50g_49x100g.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
-SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1

device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/sai.profile

@@ -1,5 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_28x50g_52x100g.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
-SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1

device/mellanox/x86_64-mlnx_msn3800-r0/installer.conf

@@ -0,0 +1 @@
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="libata.force=noncq"

device/mellanox/x86_64-mlnx_msn3800-r0/sensors.conf

@@ -8,6 +8,70 @@
 bus "i2c-2" "i2c-1-mux (chan_id 1)"
     chip "mlxsw-i2c-*-48"
         label temp1 "Ambient ASIC Temp"
+        ignore temp2
+        ignore temp3
+        ignore temp4
+        ignore temp5
+        ignore temp6
+        ignore temp7
+        ignore temp8
+        ignore temp9
+        ignore temp10
+        ignore temp11
+        ignore temp12
+        ignore temp13
+        ignore temp14
+        ignore temp15
+        ignore temp16
+        ignore temp17
+        ignore temp18
+        ignore temp19
+        ignore temp20
+        ignore temp21
+        ignore temp22
+        ignore temp23
+        ignore temp24
+        ignore temp25
+        ignore temp26
+        ignore temp27
+        ignore temp28
+        ignore temp29
+        ignore temp30
+        ignore temp31
+        ignore temp32
+        ignore temp33
+        ignore temp34
+        ignore temp35
+        ignore temp36
+        ignore temp37
+        ignore temp38
+        ignore temp39
+        ignore temp40
+        ignore temp41
+        ignore temp42
+        ignore temp43
+        ignore temp44
+        ignore temp45
+        ignore temp46
+        ignore temp47
+        ignore temp48
+        ignore temp49
+        ignore temp50
+        ignore temp51
+        ignore temp52
+        ignore temp53
+        ignore temp54
+        ignore temp55
+        ignore temp56
+        ignore temp57
+        ignore temp58
+        ignore temp59
+        ignore temp60
+        ignore temp61
+        ignore temp62
+        ignore temp63
+        ignore temp64
+        ignore temp65
 
 bus "i2c-7" "i2c-1-mux (chan_id 6)"
     chip "tmp102-i2c-*-49"

device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/sai.profile

@@ -1,4 +1 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4410.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
-SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn4410-r0/installer.conf

@@ -0,0 +1 @@
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="libata.force=noncq"

device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/sai.profile

@@ -1,4 +1 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
-SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn4600-r0/installer.conf

@@ -0,0 +1 @@
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="libata.force=noncq"

device/mellanox/x86_64-mlnx_msn4600-r0/sensors.conf

@@ -8,6 +8,70 @@
 bus "i2c-2" "i2c-1-mux (chan_id 1)"
     chip "mlxsw-i2c-*-48"
         label temp1 "Ambient ASIC Temp"
+        ignore temp2
+        ignore temp3
+        ignore temp4
+        ignore temp5
+        ignore temp6
+        ignore temp7
+        ignore temp8
+        ignore temp9
+        ignore temp10
+        ignore temp11
+        ignore temp12
+        ignore temp13
+        ignore temp14
+        ignore temp15
+        ignore temp16
+        ignore temp17
+        ignore temp18
+        ignore temp19
+        ignore temp20
+        ignore temp21
+        ignore temp22
+        ignore temp23
+        ignore temp24
+        ignore temp25
+        ignore temp26
+        ignore temp27
+        ignore temp28
+        ignore temp29
+        ignore temp30
+        ignore temp31
+        ignore temp32
+        ignore temp33
+        ignore temp34
+        ignore temp35
+        ignore temp36
+        ignore temp37
+        ignore temp38
+        ignore temp39
+        ignore temp40
+        ignore temp41
+        ignore temp42
+        ignore temp43
+        ignore temp44
+        ignore temp45
+        ignore temp46
+        ignore temp47
+        ignore temp48
+        ignore temp49
+        ignore temp50
+        ignore temp51
+        ignore temp52
+        ignore temp53
+        ignore temp54
+        ignore temp55
+        ignore temp56
+        ignore temp57
+        ignore temp58
+        ignore temp59
+        ignore temp60
+        ignore temp61
+        ignore temp62
+        ignore temp63
+        ignore temp64
+        ignore temp65
 
 bus "i2c-7" "i2c-1-mux (chan_id 6)"
     chip "tmp102-i2c-*-49"

device/mellanox/x86_64-mlnx_msn4600c-r0/ACS-MSN4600C/sai.profile

@@ -1,4 +1 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600C.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
-SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/sai.profile

@@ -1,5 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600C.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
-SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1

device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/sai.profile

@@ -1,5 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600c_100x50g_12x100g_2x10g.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
-SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1

device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/sai.profile

@@ -1,5 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600c_112x50g_8x100g.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
-SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1

device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/sai.profile

@@ -1,5 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600c_48x50g_40x100g.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
-SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1

device/mellanox/x86_64-mlnx_msn4600c-r0/installer.conf

@@ -0,0 +1 @@
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="libata.force=noncq"

device/mellanox/x86_64-mlnx_msn4600c-r0/sensors.conf

@@ -8,6 +8,70 @@
 bus "i2c-2" "i2c-1-mux (chan_id 1)"
     chip "mlxsw-i2c-*-48"
         label temp1 "Ambient ASIC Temp"
+        ignore temp2
+        ignore temp3
+        ignore temp4
+        ignore temp5
+        ignore temp6
+        ignore temp7
+        ignore temp8
+        ignore temp9
+        ignore temp10
+        ignore temp11
+        ignore temp12
+        ignore temp13
+        ignore temp14
+        ignore temp15
+        ignore temp16
+        ignore temp17
+        ignore temp18
+        ignore temp19
+        ignore temp20
+        ignore temp21
+        ignore temp22
+        ignore temp23
+        ignore temp24
+        ignore temp25
+        ignore temp26
+        ignore temp27
+        ignore temp28
+        ignore temp29
+        ignore temp30
+        ignore temp31
+        ignore temp32
+        ignore temp33
+        ignore temp34
+        ignore temp35
+        ignore temp36
+        ignore temp37
+        ignore temp38
+        ignore temp39
+        ignore temp40
+        ignore temp41
+        ignore temp42
+        ignore temp43
+        ignore temp44
+        ignore temp45
+        ignore temp46
+        ignore temp47
+        ignore temp48
+        ignore temp49
+        ignore temp50
+        ignore temp51
+        ignore temp52
+        ignore temp53
+        ignore temp54
+        ignore temp55
+        ignore temp56
+        ignore temp57
+        ignore temp58
+        ignore temp59
+        ignore temp60
+        ignore temp61
+        ignore temp62
+        ignore temp63
+        ignore temp64
+        ignore temp65
 
 bus "i2c-7" "i2c-1-mux (chan_id 6)"
     chip "tmp102-i2c-*-49"

device/mellanox/x86_64-mlnx_msn4600c-r0/sensors.conf.a1

@@ -20,6 +20,70 @@
 bus "i2c-2" "i2c-1-mux (chan_id 1)"
     chip "mlxsw-i2c-*-48"
         label temp1 "Ambient ASIC Temp"
+        ignore temp2
+        ignore temp3
+        ignore temp4
+        ignore temp5
+        ignore temp6
+        ignore temp7
+        ignore temp8
+        ignore temp9
+        ignore temp10
+        ignore temp11
+        ignore temp12
+        ignore temp13
+        ignore temp14
+        ignore temp15
+        ignore temp16
+        ignore temp17
+        ignore temp18
+        ignore temp19
+        ignore temp20
+        ignore temp21
+        ignore temp22
+        ignore temp23
+        ignore temp24
+        ignore temp25
+        ignore temp26
+        ignore temp27
+        ignore temp28
+        ignore temp29
+        ignore temp30
+        ignore temp31
+        ignore temp32
+        ignore temp33
+        ignore temp34
+        ignore temp35
+        ignore temp36
+        ignore temp37
+        ignore temp38
+        ignore temp39
+        ignore temp40
+        ignore temp41
+        ignore temp42
+        ignore temp43
+        ignore temp44
+        ignore temp45
+        ignore temp46
+        ignore temp47
+        ignore temp48
+        ignore temp49
+        ignore temp50
+        ignore temp51
+        ignore temp52
+        ignore temp53
+        ignore temp54
+        ignore temp55
+        ignore temp56
+        ignore temp57
+        ignore temp58
+        ignore temp59
+        ignore temp60
+        ignore temp61
+        ignore temp62
+        ignore temp63
+        ignore temp64
+        ignore temp65
 
 bus "i2c-7" "i2c-1-mux (chan_id 6)"
     chip "tmp102-i2c-*-49"

device/mellanox/x86_64-mlnx_msn4600c-r0/sensors_respin.conf

@@ -19,6 +19,70 @@
 bus "i2c-2" "i2c-1-mux (chan_id 1)"
     chip "mlxsw-i2c-*-48"
         label temp1 "Ambient ASIC Temp"
+        ignore temp2
+        ignore temp3
+        ignore temp4
+        ignore temp5
+        ignore temp6
+        ignore temp7
+        ignore temp8
+        ignore temp9
+        ignore temp10
+        ignore temp11
+        ignore temp12
+        ignore temp13
+        ignore temp14
+        ignore temp15
+        ignore temp16
+        ignore temp17
+        ignore temp18
+        ignore temp19
+        ignore temp20
+        ignore temp21
+        ignore temp22
+        ignore temp23
+        ignore temp24
+        ignore temp25
+        ignore temp26
+        ignore temp27
+        ignore temp28
+        ignore temp29
+        ignore temp30
+        ignore temp31
+        ignore temp32
+        ignore temp33
+        ignore temp34
+        ignore temp35
+        ignore temp36
+        ignore temp37
+        ignore temp38
+        ignore temp39
+        ignore temp40
+        ignore temp41
+        ignore temp42
+        ignore temp43
+        ignore temp44
+        ignore temp45
+        ignore temp46
+        ignore temp47
+        ignore temp48
+        ignore temp49
+        ignore temp50
+        ignore temp51
+        ignore temp52
+        ignore temp53
+        ignore temp54
+        ignore temp55
+        ignore temp56
+        ignore temp57
+        ignore temp58
+        ignore temp59
+        ignore temp60
+        ignore temp61
+        ignore temp62
+        ignore temp63
+        ignore temp64
+        ignore temp65
 
 bus "i2c-7" "i2c-1-mux (chan_id 6)"
     chip "tmp102-i2c-*-49"

device/mellanox/x86_64-mlnx_msn4600c-r0/sensors_respin.conf.a1

@@ -19,6 +19,70 @@
 bus "i2c-2" "i2c-1-mux (chan_id 1)"
     chip "mlxsw-i2c-*-48"
         label temp1 "Ambient ASIC Temp"
+        ignore temp2
+        ignore temp3
+        ignore temp4
+        ignore temp5
+        ignore temp6
+        ignore temp7
+        ignore temp8
+        ignore temp9
+        ignore temp10
+        ignore temp11
+        ignore temp12
+        ignore temp13
+        ignore temp14
+        ignore temp15
+        ignore temp16
+        ignore temp17
+        ignore temp18
+        ignore temp19
+        ignore temp20
+        ignore temp21
+        ignore temp22
+        ignore temp23
+        ignore temp24
+        ignore temp25
+        ignore temp26
+        ignore temp27
+        ignore temp28
+        ignore temp29
+        ignore temp30
+        ignore temp31
+        ignore temp32
+        ignore temp33
+        ignore temp34
+        ignore temp35
+        ignore temp36
+        ignore temp37
+        ignore temp38
+        ignore temp39
+        ignore temp40
+        ignore temp41
+        ignore temp42
+        ignore temp43
+        ignore temp44
+        ignore temp45
+        ignore temp46
+        ignore temp47
+        ignore temp48
+        ignore temp49
+        ignore temp50
+        ignore temp51
+        ignore temp52
+        ignore temp53
+        ignore temp54
+        ignore temp55
+        ignore temp56
+        ignore temp57
+        ignore temp58
+        ignore temp59
+        ignore temp60
+        ignore temp61
+        ignore temp62
+        ignore temp63
+        ignore temp64
+        ignore temp65
 
 bus "i2c-7" "i2c-1-mux (chan_id 6)"
     chip "tmp102-i2c-*-49"

device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai.profile

@@ -1,4 +1 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4700.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
-SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/sai.profile

@@ -1,4 +1 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4700_8x200g_8x100g_96x25g.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
-SAI_DUMP_MFT_CFG_PATH=/etc/sonic/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/hwsku.json

@@ -1,388 +1,516 @@
 {
     "interfaces": {
         "Ethernet0": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet2": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet4": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet6": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet8": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet10": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet12": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet14": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet16": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet18": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet20": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet22": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet24": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet26": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet28": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet30": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet32": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet34": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet36": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet38": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet40": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet42": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet44": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet46": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet48": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet50": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet52": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet54": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet56": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet58": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet60": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet62": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet64": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet66": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet68": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet70": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet72": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet74": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet76": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet78": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet80": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet82": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet84": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet86": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet88": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet90": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet92": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet94": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet96": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet98": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet100": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet102": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet104": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet106": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet108": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet110": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet112": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet114": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet116": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet118": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet120": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet122": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet124": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet126": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet128": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet130": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet132": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet134": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet136": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet138": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet140": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet142": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet144": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet146": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet148": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet150": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet152": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet154": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet156": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet158": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet160": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet162": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet164": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet166": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet168": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet170": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet172": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet174": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet176": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet178": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet180": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet182": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet184": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet186": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet188": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet190": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet192": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet194": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet196": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet198": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet200": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet202": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet204": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet206": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet208": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet210": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet212": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet214": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet216": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet218": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet220": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet222": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet224": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet226": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet228": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet230": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet232": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet234": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet236": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet238": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet240": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet242": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet244": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet246": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet248": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet250": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet252": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet254": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         }
     }
 }

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/sai.profile

@@ -1,4 +1 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4700_128x100g.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
-SAI_DUMP_MFT_CFG_PATH=/etc/sonic/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O28/hwsku.json

@@ -1,100 +1,132 @@
 {
     "interfaces": {
         "Ethernet0": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet8": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet16": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet24": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet32": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet40": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet48": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet56": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet64": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet72": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet80": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet88": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet96": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet104": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet112": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet120": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet128": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet136": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet144": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet152": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet160": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet168": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet176": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet184": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet192": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet200": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet208": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet216": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet224": {
-	    "default_brkout_mode": "1x200G[400G,100G,50G,40G,25G,10G,1G]"
+	     "default_brkout_mode": "1x200G[400G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet232": {
-	    "default_brkout_mode": "1x200G[400G,100G,50G,40G,25G,10G,1G]"
+	     "default_brkout_mode": "1x200G[400G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet240": {
-	    "default_brkout_mode": "1x200G[400G,100G,50G,40G,25G,10G,1G]"
+	     "default_brkout_mode": "1x200G[400G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet248": {
-	    "default_brkout_mode": "1x200G[400G,100G,50G,40G,25G,10G,1G]"
+	     "default_brkout_mode": "1x200G[400G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         }
     }
 }

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O28/sai.profile

@@ -1,4 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4700.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8C48/hwsku.json

@@ -1,172 +1,228 @@
 {
     "interfaces": {
         "Ethernet0": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet4": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet8": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet12": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet16": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet20": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet24": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet28": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet32": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet36": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet40": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet44": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet48": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet52": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet56": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet60": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet64": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet68": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet72": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet76": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet80": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet84": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet88": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet92": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet96": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet104": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet112": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet120": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet128": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet136": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet144": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet152": {
-            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet160": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet164": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet168": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet172": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet176": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet180": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet184": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet188": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet192": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet196": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet200": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet204": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet208": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet212": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet216": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet220": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet224": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet228": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet232": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet236": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet240": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet244": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet248": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet252": {
-            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x100G[200G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         }
     }
 }

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8C48/sai.profile

@@ -1,5 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4700_8x400g_48x100g.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
-SAI_DUMP_MFT_CFG_PATH=/etc/sonic/mft/fwtrace_cfg
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8V48/buffers.json.j2

@@ -0,0 +1,17 @@
+{#
+    Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
+    Apache-2.0
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+#}
+{%- set default_topo = 't0' %}
+{%- include 'buffers_config.j2' %}

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8V48/buffers_defaults_objects.j2

@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8V48/buffers_defaults_t0.j2

@@ -0,0 +1,53 @@
+{#
+    Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
+    Apache-2.0
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+#}
+{% set default_cable = '5m' %}
+{%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) -%}
+{% set ingress_lossless_pool_size =  '48168960' %}
+{% set ingress_lossless_pool_xoff  =  '5218304' %}
+{% set egress_lossless_pool_size =  '60817392' %}
+{% set egress_lossy_pool_size =  '48168960' %}
+{%- else -%}
+{% set ingress_lossless_pool_size =  '49946624' %}
+{% set ingress_lossless_pool_xoff  =  '4063232' %}
+{% set egress_lossless_pool_size =  '60817392' %}
+{% set egress_lossy_pool_size =  '49946624' %}
+{%- endif -%}
+
+{% import 'buffers_defaults_objects.j2' as defs with context %}
+
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) %}
+{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names_active, port_names_extra_queues, port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_pg_profiles_with_extra_lossless_pgs_with_inactive_ports(port_names_active, port_names_extra_pgs, port_names_inactive) %}
+{{ defs.generate_pg_profiles_with_extra_lossless_pgs(port_names_active, port_names_extra_pgs, port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
+{%- endmacro %}

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8V48/buffers_defaults_t1.j2

@@ -0,0 +1,38 @@
+{#
+    Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
+    Apache-2.0
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+#}
+{% set default_cable = '300m' %}
+{% set ingress_lossless_pool_size =  '47546368' %}
+{% set ingress_lossless_pool_xoff  =  '6463488' %}
+{% set egress_lossless_pool_size =  '60817392' %}
+{% set egress_lossy_pool_size =  '47546368' %}
+
+{% import 'buffers_defaults_objects.j2' as defs with context %}
+
+{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
+{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
+{%- endmacro %}
+
+{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
+{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
+{%- endmacro %}

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8V48/buffers_dynamic.json.j2

@@ -0,0 +1,18 @@
+{#
+    Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
+    Apache-2.0
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+#}
+{%- set default_topo = 't0' %}
+{%- set dynamic_mode = 'true' %}
+{%- include 'buffers_config.j2' %}

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8V48/hwsku.json

@@ -0,0 +1,228 @@
+{
+    "interfaces": {
+        "Ethernet0": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet4": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        },
+        "Ethernet8": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet12": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        },
+        "Ethernet16": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet20": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        },
+        "Ethernet24": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet28": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        },
+        "Ethernet32": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet36": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        },
+        "Ethernet40": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet44": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        },
+        "Ethernet48": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet52": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        },
+        "Ethernet56": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet60": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        },
+        "Ethernet64": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet68": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        },
+        "Ethernet72": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet76": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        },
+        "Ethernet80": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet84": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        },
+        "Ethernet88": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet92": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        },
+        "Ethernet96": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet104": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet112": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet120": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet128": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet136": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet144": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet152": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet160": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet164": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        },
+        "Ethernet168": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet172": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        },
+        "Ethernet176": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet180": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        },
+        "Ethernet184": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet188": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        },
+        "Ethernet192": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet196": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        },
+        "Ethernet200": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet204": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        },
+        "Ethernet208": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet212": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        },
+        "Ethernet216": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet220": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        },
+        "Ethernet224": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet228": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        },
+        "Ethernet232": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet236": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        },
+        "Ethernet240": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet244": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        },
+        "Ethernet248": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
+        },
+        "Ethernet252": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
+        }
+    }
+}

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8V48/pg_profile_lookup.ini

@@ -0,0 +1 @@
+../Mellanox-SN4700-C128/pg_profile_lookup.ini

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8V48/port_config.ini

@@ -0,0 +1,74 @@
+##
+## Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
+## Apache-2.0
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+
+# name         lanes                                  alias     index    speed
+Ethernet0      0,1,2,3                                etp1a     1        200000
+Ethernet4      4,5,6,7                                etp1b     1        200000
+Ethernet8      8,9,10,11                              etp2a     2        200000
+Ethernet12     12,13,14,15                            etp2b     2        200000
+Ethernet16     16,17,18,19                            etp3a     3        200000
+Ethernet20     20,21,22,23                            etp3b     3        200000
+Ethernet24     24,25,26,27                            etp4a     4        200000
+Ethernet28     28,29,30,31                            etp4b     4        200000
+Ethernet32     32,33,34,35                            etp5a     5        200000
+Ethernet36     36,37,38,39                            etp5b     5        200000
+Ethernet40     40,41,42,43                            etp6a     6        200000
+Ethernet44     44,45,46,47                            etp6b     6        200000
+Ethernet48     48,49,50,51                            etp7a     7        200000
+Ethernet52     52,53,54,55                            etp7b     7        200000
+Ethernet56     56,57,58,59                            etp8a     8        200000
+Ethernet60     60,61,62,63                            etp8b     8        200000
+Ethernet64     64,65,66,67                            etp9a     9        200000
+Ethernet68     68,69,70,71                            etp9b     9        200000
+Ethernet72     72,73,74,75                            etp10a    10       200000
+Ethernet76     76,77,78,79                            etp10b    10       200000
+Ethernet80     80,81,82,83                            etp11a    11       200000
+Ethernet84     84,85,86,87                            etp11b    11       200000
+Ethernet88     88,89,90,91                            etp12a    12       200000
+Ethernet92     92,93,94,95                            etp12b    12       200000
+Ethernet96     96,97,98,99,100,101,102,103            etp13     13       400000
+Ethernet104    104,105,106,107,108,109,110,111        etp14     14       400000
+Ethernet112    112,113,114,115,116,117,118,119        etp15     15       400000
+Ethernet120    120,121,122,123,124,125,126,127        etp16     16       400000
+Ethernet128    128,129,130,131,132,133,134,135        etp17     17       400000
+Ethernet136    136,137,138,139,140,141,142,143        etp18     18       400000
+Ethernet144    144,145,146,147,148,149,150,151        etp19     19       400000
+Ethernet152    152,153,154,155,156,157,158,159        etp20     20       400000
+Ethernet160    160,161,162,163                        etp21a    21       200000
+Ethernet164    164,165,166,167                        etp21b    21       200000
+Ethernet168    168,169,170,171                        etp22a    22       200000
+Ethernet172    172,173,174,175                        etp22b    22       200000
+Ethernet176    176,177,178,179                        etp23a    23       200000
+Ethernet180    180,181,182,183                        etp23b    23       200000
+Ethernet184    184,185,186,187                        etp24a    24       200000
+Ethernet188    188,189,190,191                        etp24b    24       200000
+Ethernet192    192,193,194,195                        etp25a    25       200000
+Ethernet196    196,197,198,199                        etp25b    25       200000
+Ethernet200    200,201,202,203                        etp26a    26       200000
+Ethernet204    204,205,206,207                        etp26b    26       200000
+Ethernet208    208,209,210,211                        etp27a    27       200000
+Ethernet212    212,213,214,215                        etp27b    27       200000
+Ethernet216    216,217,218,219                        etp28a    28       200000
+Ethernet220    220,221,222,223                        etp28b    28       200000
+Ethernet224    224,225,226,227                        etp29a    29       200000
+Ethernet228    228,229,230,231                        etp29b    29       200000
+Ethernet232    232,233,234,235                        etp30a    30       200000
+Ethernet236    236,237,238,239                        etp30b    30       200000
+Ethernet240    240,241,242,243                        etp31a    31       200000
+Ethernet244    244,245,246,247                        etp31b    31       200000
+Ethernet248    248,249,250,251                        etp32a    32       200000
+Ethernet252    252,253,254,255                        etp32b    32       200000

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8V48/qos.json.j2

@@ -0,0 +1 @@
+../../x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/qos.json.j2

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8V48/sai.profile

@@ -0,0 +1,2 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4700_8x400g_48x200g.xml
+SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8V48/sai_4700_8x400g_48x200g.xml

@@ -0,0 +1,297 @@
+<!--
+  Copyright (c) 2019-2023 NVIDIA CORPORATION & AFFILIATES.
+  Apache-2.0
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<root>
+    <platform_info type="4700">
+
+        <!-- Device MAC address  -->
+        <device-mac-address>00:02:03:04:05:00</device-mac-address>
+
+        <!-- ISSU enabled -->
+        <issu-enabled>1</issu-enabled>
+
+        <!-- Number of ports in the following port list -->
+        <number-of-physical-ports>32</number-of-physical-ports>
+
+        <!-- Global port late create -->
+        <late-create-all-ports>1</late-create-all-ports>
+
+        <!-- List of ports in the device -->
+        <ports-list>
+            <port-info>
+                <local-port>1</local-port>
+                <width>8</width>
+                <module>17</module>
+
+                <!-- 0 none, 1=2, 2=4, 3=2,4 -->
+                <breakout-modes>0</breakout-modes>
+
+                <!-- (BITMASK) 2 - 1Gb , 16 - 10Gb , 32 - 40Gb , 384 - 50Gb , 1536 - 100Gb , 4096 - 200Gb -->
+                <port-speed>32768</port-speed>
+                <split>1</split>
+            </port-info>
+            <port-info>
+                <local-port>5</local-port>
+                <width>8</width>
+                <module>16</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>32768</port-speed>
+                <split>1</split>
+            </port-info>
+            <port-info>
+                <local-port>9</local-port>
+                <width>8</width>
+                <module>19</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>32768</port-speed>
+                <split>1</split>
+            </port-info>
+            <port-info>
+                <local-port>13</local-port>
+                <width>8</width>
+                <module>18</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>32768</port-speed>
+                <split>1</split>
+            </port-info>
+            <port-info>
+                <local-port>17</local-port>
+                <width>8</width>
+                <module>21</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>21</local-port>
+                <width>8</width>
+                <module>20</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>25</local-port>
+                <width>8</width>
+                <module>23</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>29</local-port>
+                <width>8</width>
+                <module>22</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>33</local-port>
+                <width>8</width>
+                <module>29</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>37</local-port>
+                <width>8</width>
+                <module>28</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>41</local-port>
+                <width>8</width>
+                <module>31</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>45</local-port>
+                <width>8</width>
+                <module>30</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>49</local-port>
+                <width>8</width>
+                <module>25</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>53</local-port>
+                <width>8</width>
+                <module>24</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>57</local-port>
+                <width>8</width>
+                <module>27</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>61</local-port>
+                <width>8</width>
+                <module>26</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>65</local-port>
+                <width>8</width>
+                <module>14</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>32768</port-speed>
+                <split>1</split>
+            </port-info>
+            <port-info>
+                <local-port>69</local-port>
+                <width>8</width>
+                <module>15</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>32768</port-speed>
+                <split>1</split>
+            </port-info>
+            <port-info>
+                <local-port>73</local-port>
+                <width>8</width>
+                <module>12</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>32768</port-speed>
+                <split>1</split>
+            </port-info>
+            <port-info>
+                <local-port>77</local-port>
+                <width>8</width>
+                <module>13</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>32768</port-speed>
+                <split>1</split>
+            </port-info>
+            <port-info>
+                <local-port>81</local-port>
+                <width>8</width>
+                <module>10</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>85</local-port>
+                <width>8</width>
+                <module>11</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>89</local-port>
+                <width>8</width>
+                <module>8</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>93</local-port>
+                <width>8</width>
+                <module>9</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>97</local-port>
+                <width>8</width>
+                <module>2</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>101</local-port>
+                <width>8</width>
+                <module>3</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>105</local-port>
+                <width>8</width>
+                <module>0</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>109</local-port>
+                <width>8</width>
+                <module>1</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>113</local-port>
+                <width>8</width>
+                <module>6</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>117</local-port>
+                <width>8</width>
+                <module>7</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>121</local-port>
+                <width>8</width>
+                <module>4</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+            <port-info>
+                <local-port>125</local-port>
+                <width>8</width>
+                <module>5</module>
+                <breakout-modes>1</breakout-modes>
+                <port-speed>4096</port-speed>
+                <split>2</split>
+            </port-info>
+        </ports-list>
+    </platform_info>
+</root>

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/hwsku.json

@@ -1,244 +1,324 @@
 {
     "interfaces": {
         "Ethernet0": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet4": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet8": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet12": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet16": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet20": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet24": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet28": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet32": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet36": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet40": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet44": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet48": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet52": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet56": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet60": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet64": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet68": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet72": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet76": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet80": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet84": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet88": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet92": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet96": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet100": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet104": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet108": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet112": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet116": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet120": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet124": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet128": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet132": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet136": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet140": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet144": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet148": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet152": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet156": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet160": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet164": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet168": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet172": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet176": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet180": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet184": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet188": {
-            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]"
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet192": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet194": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet196": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet198": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet200": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet202": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet204": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet206": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet208": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet210": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet212": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet214": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet216": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet218": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet220": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet222": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet224": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet226": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet228": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet230": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet232": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet234": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet236": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet238": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet240": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet242": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet244": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet246": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         },
         "Ethernet248": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "1"
         },
         "Ethernet250": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "2"
         },
         "Ethernet252": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "3"
         },
         "Ethernet254": {
-            "default_brkout_mode": "4x100G[50G,25G,10G,1G]"
+            "default_brkout_mode": "4x100G[50G,25G,10G,1G]",
+            "subport": "4"
         }
     }
 }

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/sai.profile

@@ -1,4 +1 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4700_32x100g_48x200g.xml
-SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
-SAI_DUMP_STORE_AMOUNT=10
-SAI_DUMP_MFT_CFG_PATH=/etc/sonic/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn4700-r0/installer.conf

@@ -0,0 +1 @@
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="libata.force=noncq"