From b10abaf435f63e7e4e02ad40affa445b684fc0af Mon Sep 17 00:00:00 2001 From: noaOrMlnx <58519608+noaOrMlnx@users.noreply.github.com> Date: Wed, 28 Feb 2024 21:05:20 +0200 Subject: [PATCH] [Mellanox] Update Nvidia sai.profile SKU files to have common file (#18074) * Update Nvidia sai.profile SKU files to have common file * Remove SAI_DUMP_MFT_CFG_PATH from sai-common.profile as it is not in use --- device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/sai.profile | 2 -- device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/sai.profile | 2 -- device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/sai.profile | 2 -- device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/sai.profile | 2 -- .../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/sai.profile | 2 -- .../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai.profile | 2 -- .../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D44C10/sai.profile | 2 -- .../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai.profile | 2 -- .../x86_64-mlnx_msn2700-r0/Mellanox-SN2700/sai.profile | 2 -- device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/sai.profile | 2 -- device/mellanox/x86_64-mlnx_msn3420-r0/ACS-MSN3420/sai.profile | 3 --- device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/sai.profile | 3 --- .../mellanox/x86_64-mlnx_msn3700c-r0/ACS-MSN3700C/sai.profile | 3 --- device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/sai.profile | 3 --- .../x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/sai.profile | 3 --- .../Mellanox-SN3800-D100C12S2/sai.profile | 3 --- .../x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/sai.profile | 3 --- .../x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/sai.profile | 3 --- .../Mellanox-SN3800-D28C49S1/sai.profile | 3 --- .../x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/sai.profile | 3 --- device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/sai.profile | 3 --- device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/sai.profile | 3 --- .../mellanox/x86_64-mlnx_msn4600c-r0/ACS-MSN4600C/sai.profile | 3 --- .../x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/sai.profile | 3 --- .../Mellanox-SN4600C-D100C12S2/sai.profile | 3 --- .../Mellanox-SN4600C-D112C8/sai.profile | 3 --- .../Mellanox-SN4600C-D48C40/sai.profile | 3 --- device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai.profile | 3 --- .../x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/sai.profile | 3 --- .../x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/sai.profile | 3 --- .../x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O28/sai.profile | 2 -- .../x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8C48/sai.profile | 3 --- .../x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8V48/sai.profile | 3 --- .../x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/sai.profile | 3 --- device/mellanox/x86_64-nvidia_sn2201-r0/ACS-SN2201/sai.profile | 2 -- device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/sai.profile | 3 --- device/mellanox/x86_64-nvidia_sn5600-r0/ACS-SN5600/sai.profile | 2 -- .../x86_64-nvidia_sn5600_simx-r0/ACS-SN5600/sai.profile | 2 -- platform/mellanox/docker-syncd-mlnx/Dockerfile.j2 | 3 +++ platform/mellanox/docker-syncd-mlnx/sai-common.profile | 2 ++ 40 files changed, 5 insertions(+), 100 deletions(-) create mode 100644 platform/mellanox/docker-syncd-mlnx/sai-common.profile diff --git a/device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/sai.profile b/device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/sai.profile index fa261ec655c2..c13ca373750d 100644 --- a/device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/sai.profile b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/sai.profile index 25f879a531d4..5a381e4666ee 100644 --- a/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/sai.profile b/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/sai.profile index b707c2692102..f7cb264c2287 100644 --- a/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/sai.profile b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/sai.profile index 2b855ccb2d8e..696f3d8182f9 100644 --- a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/sai.profile b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/sai.profile index 3b09459755f0..5ee219f34380 100644 --- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai.profile b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai.profile index c1810655051c..8498641f522a 100644 --- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D44C10/sai.profile b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D44C10/sai.profile index e6f3c2f0cf58..7a2add983f13 100644 --- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D44C10/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai.profile b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai.profile index daf2235f0adc..1d1563cd61a6 100644 --- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/sai.profile b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/sai.profile index fcd0120d8342..f1c554fa521a 100644 --- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/sai.profile b/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/sai.profile index e212df2e5ea1..adaa280e6cd5 100644 --- a/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn3420-r0/ACS-MSN3420/sai.profile b/device/mellanox/x86_64-mlnx_msn3420-r0/ACS-MSN3420/sai.profile index 9b50bab67670..a30106c8674d 100644 --- a/device/mellanox/x86_64-mlnx_msn3420-r0/ACS-MSN3420/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/sai.profile b/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/sai.profile index a040416bf51b..4907e971a2dd 100644 --- a/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn3700c-r0/ACS-MSN3700C/sai.profile b/device/mellanox/x86_64-mlnx_msn3700c-r0/ACS-MSN3700C/sai.profile index 1b1b4bbe2477..46750fb2e07b 100644 --- a/device/mellanox/x86_64-mlnx_msn3700c-r0/ACS-MSN3700C/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/sai.profile b/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/sai.profile index 5fe089467374..367f6c4e99c0 100644 --- a/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/sai.profile b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/sai.profile index 7b27b5a2b96f..011612d978df 100644 --- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/sai.profile b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/sai.profile index 92fb9921fdf5..a0d219afc68b 100644 --- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/sai.profile b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/sai.profile index 90534ae58a43..eba550e54e21 100644 --- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/sai.profile b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/sai.profile index f00701cde546..f7d985529020 100644 --- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/sai.profile b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/sai.profile index e90f26e77358..1ad3746399d6 100644 --- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/sai.profile b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/sai.profile index 3b36aff3126a..0e989e17cfe9 100644 --- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/sai.profile b/device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/sai.profile index 09cacbed000d..be729cb4e06a 100644 --- a/device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/sai.profile b/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/sai.profile index f9d5172456a1..8d18361c1620 100644 --- a/device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/ACS-MSN4600C/sai.profile b/device/mellanox/x86_64-mlnx_msn4600c-r0/ACS-MSN4600C/sai.profile index 6dfcaf49bf66..e9d1e3e5f591 100644 --- a/device/mellanox/x86_64-mlnx_msn4600c-r0/ACS-MSN4600C/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/sai.profile b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/sai.profile index 8bf256a6ac45..3324d5b4b6c9 100644 --- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/sai.profile b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/sai.profile index ac24ca45fdf1..acf46cd351f5 100644 --- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/sai.profile b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/sai.profile index 6c8656b90a79..cbe1b241b5f0 100644 --- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/sai.profile b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/sai.profile index f8174ebe6892..5d63094db5a7 100644 --- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai.profile b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai.profile index 8c76d4ca1bbc..d145093cab96 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/sai.profile b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/sai.profile index b90eb55a9ba3..a1542c6e1635 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/sai.profile b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/sai.profile index cd04cc332c5d..ad1011267959 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O28/sai.profile b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O28/sai.profile index fddba40b2233..e246cad50ad8 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O28/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8C48/sai.profile b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8C48/sai.profile index 42f665d760b0..8238fae60b4b 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8C48/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8V48/sai.profile b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8V48/sai.profile index e0109ecf26d3..0570470af163 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8V48/sai.profile +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8V48/sai.profile @@ -1,5 +1,2 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4700_8x400g_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 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1 diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/sai.profile b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/sai.profile index 27e1cdad33b5..5a780a8cc729 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/sai.profile +++ b/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 diff --git a/device/mellanox/x86_64-nvidia_sn2201-r0/ACS-SN2201/sai.profile b/device/mellanox/x86_64-nvidia_sn2201-r0/ACS-SN2201/sai.profile index 692ad368de4c..21a54436be6a 100644 --- a/device/mellanox/x86_64-nvidia_sn2201-r0/ACS-SN2201/sai.profile +++ b/device/mellanox/x86_64-nvidia_sn2201-r0/ACS-SN2201/sai.profile @@ -1,3 +1 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2201.xml -SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps -SAI_DUMP_STORE_AMOUNT=10 diff --git a/device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/sai.profile b/device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/sai.profile index 2ce406ef0185..3a8824058cf0 100644 --- a/device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/sai.profile +++ b/device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/sai.profile @@ -1,4 +1 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4800.xml -SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps -SAI_DUMP_STORE_AMOUNT=10 -SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg diff --git a/device/mellanox/x86_64-nvidia_sn5600-r0/ACS-SN5600/sai.profile b/device/mellanox/x86_64-nvidia_sn5600-r0/ACS-SN5600/sai.profile index b37ca8c3ed0c..ace2d70a85e6 100644 --- a/device/mellanox/x86_64-nvidia_sn5600-r0/ACS-SN5600/sai.profile +++ b/device/mellanox/x86_64-nvidia_sn5600-r0/ACS-SN5600/sai.profile @@ -1,3 +1 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_5600.xml -SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps -SAI_DUMP_STORE_AMOUNT=10 diff --git a/device/mellanox/x86_64-nvidia_sn5600_simx-r0/ACS-SN5600/sai.profile b/device/mellanox/x86_64-nvidia_sn5600_simx-r0/ACS-SN5600/sai.profile index b37ca8c3ed0c..ace2d70a85e6 100644 --- a/device/mellanox/x86_64-nvidia_sn5600_simx-r0/ACS-SN5600/sai.profile +++ b/device/mellanox/x86_64-nvidia_sn5600_simx-r0/ACS-SN5600/sai.profile @@ -1,3 +1 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_5600.xml -SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps -SAI_DUMP_STORE_AMOUNT=10 diff --git a/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2 b/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2 index dbd51e2782ea..bdc51abca7e7 100755 --- a/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2 +++ b/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2 @@ -66,6 +66,9 @@ COPY ["files/supervisor-proc-exit-listener", "/usr/bin"] COPY ["critical_processes", "/etc/supervisor/"] COPY ["platform_syncd_dump.sh", "/usr/bin/"] +RUN mkdir -p /etc/mlnx/ +COPY ["sai-common.profile", "/etc/mlnx/"] + RUN mkdir -p /etc/supervisor/conf.d/ RUN sonic-cfggen -a "{\"ENABLE_ASAN\":\"{{ENABLE_ASAN}}\"}" -t /usr/share/sonic/templates/supervisord.conf.j2 > /etc/supervisor/conf.d/supervisord.conf RUN rm -f /usr/share/sonic/templates/supervisord.conf.j2 diff --git a/platform/mellanox/docker-syncd-mlnx/sai-common.profile b/platform/mellanox/docker-syncd-mlnx/sai-common.profile new file mode 100644 index 000000000000..3b9e6fe00573 --- /dev/null +++ b/platform/mellanox/docker-syncd-mlnx/sai-common.profile @@ -0,0 +1,2 @@ +SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps +SAI_DUMP_STORE_AMOUNT=10