Skip to content

Commit

Permalink
Integrate HW-MGMT Version 7.0030.3008, Update SDK/FW to 4.6.3064/2012…
Browse files Browse the repository at this point in the history
….3064 SAI to SAIBuild2311.27.0.16 (#18571)

DEPENDS ON sonic-net/sonic-linux-kernel#391
#### Why I did it

Intgerate HW-MGMT 7.0030.3008 Changes
Update SDK/FW to 4.6.3064/2012.3064
Update SAI to SAIBuild2311.27.0.16

#### How I did it
Run make integrate-mlnx-hw-mgmt
Update make files of SDK/FW/SAI

#### How to verify it
Build an image and run tests from "sonic-mgmt".
  • Loading branch information
dgsudharsan authored Apr 11, 2024
1 parent 32ea9da commit d7a4927
Show file tree
Hide file tree
Showing 39 changed files with 10 additions and 5,439 deletions.
12 changes: 6 additions & 6 deletions platform/mellanox/fw.mk
Original file line number Diff line number Diff line change
Expand Up @@ -21,33 +21,33 @@ MLNX_FW_BASE_PATH = $(MLNX_SDK_BASE_PATH)
# Place an URL here to FW if you want to download FW instead
MLNX_FW_BASE_URL =

SIMX_VERSION = 23.10-1123
SIMX_VERSION = 24.4-1067

FW_FROM_URL = y

MLNX_FW_ASSETS_RELEASE_TAG = fw-2012.2202
MLNX_FW_ASSETS_RELEASE_TAG = fw-2012.3064
MLNX_FW_ASSETS_URL = $(MLNX_ASSETS_GITHUB_URL)/releases/download/$(MLNX_FW_ASSETS_RELEASE_TAG)

ifeq ($(MLNX_FW_BASE_URL), )
MLNX_FW_BASE_URL = $(MLNX_FW_ASSETS_URL)
endif

MLNX_SPC_FW_VERSION = 13.2012.2202
MLNX_SPC_FW_VERSION = 13.2012.3064
MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
$(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)

MLNX_SPC2_FW_VERSION = 29.2012.2202
MLNX_SPC2_FW_VERSION = 29.2012.3064
MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
$(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)

MLNX_SPC3_FW_VERSION = 30.2012.2202
MLNX_SPC3_FW_VERSION = 30.2012.3064
MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
$(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)

MLNX_SPC4_FW_VERSION = 34.2012.2202
MLNX_SPC4_FW_VERSION = 34.2012.3064
MLNX_SPC4_FW_FILE = fw-SPC4-rel-$(subst .,_,$(MLNX_SPC4_FW_VERSION))-EVB.mfa
$(MLNX_SPC4_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC4_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC4_FW_FILE)
Expand Down
2 changes: 1 addition & 1 deletion platform/mellanox/hw-management.mk
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#
# Mellanox HW Management

MLNX_HW_MANAGEMENT_VERSION = 7.0030.2008
MLNX_HW_MANAGEMENT_VERSION = 7.0030.3008

export MLNX_HW_MANAGEMENT_VERSION

Expand Down
2 changes: 1 addition & 1 deletion platform/mellanox/hw-management/hw-mgmt
Submodule hw-mgmt updated 297 files
32 changes: 0 additions & 32 deletions platform/mellanox/hw-management/hwmgmt_nonup_patches
Original file line number Diff line number Diff line change
@@ -1,33 +1 @@
# Current non-upstream patch list, should be updated by hwmgmt_kernel_patches.py script
0042-hwmon-mlxreg-fan-Add-support-for-new-flavour-of-capa.patch
0044-leds-mlxreg-Add-support-for-new-flavour-of-capabilit.patch
0045-leds-mlxreg-Remove-code-for-amber-LED-colour.patch
0046-Extend-driver-to-support-Infineon-Digital-Multi-phas.patch
0047-dt-bindings-trivial-devices-Add-infineon-xdpe1a2g7.patch
0048-hwmon-pmbus-Add-support-for-MPS-Multi-phase-mp2891-c.patch
0049-dt-bindings-trivial-devices-Add-mps-mp2891.patch
0050-leds-mlxreg-Skip-setting-LED-color-during-initializa.patch
0053-platform-mellanox-Add-support-for-dynamic-I2C-channe.patch
0054-platform-mellanox-Introduce-support-for-switches-equ.patch
0055-mellanox-Relocate-mlx-platform-driver.patch
0066-UBUNTU-SAUCE-sdhci-of-dwcmshc-Enable-host-V4-support.patch
0067-UBUNTU-SAUCE-mmc-sdhci-of-dwcmshc-add-the-missing-de.patch
0068-UBUNTU-SAUCE-mmc-sdhci-of-dwcmshc-Add-runtime-PM-ope.patch
0069-UBUNTU-SAUCE-mlxbf_gige-add-ethtool-mlxbf_gige_set_r.patch
0070-UBUNTU-SAUCE-Fix-OOB-handling-RX-packets-in-heavy-tr.patch
0071-UBUNTU-SAUCE-mlxbf-gige-Fix-intermittent-no-ip-issue.patch
0072-mlxbf_gige-add-MDIO-support-for-BlueField-3.patch
0073-mlxbf_gige-support-10M-100M-1G-speeds-on-BlueField-3.patch
0074-mlxbf_gige-add-set_link_ksettings-ethtool-callback.patch
0075-UBUNTU-SAUCE-mlxbf-gige-Fix-kernel-panic-at-shutdown.patch
0076-UBUNTU-SAUCE-platform-mellanox-Updates-to-mlxbf-boot.patch
0077-UBUNTU-SAUCE-mlx-bootctl-support-icm-carveout-eeprom.patch
0078-UBUNTU-SAUCE-mlxbf-bootctl-support-SMC-call-for-sett.patch
0079-UBUNTU-SAUCE-mlxbf-ptm-power-and-thermal-management-.patch
0080-UBUNTU-SAUCE-mlxbf-ptm-update-license.patch
0081-UBUNTU-SAUCE-mlxbf-ptm-use-0444-instead-of-S_IRUGO.patch
0082-UBUNTU-SAUCE-mlxbf-ptm-add-atx-debugfs-nodes.patch
0083-UBUNTU-SAUCE-mlxbf-ptm-update-module-version.patch
0084-UBUNTU-SAUCE-mlxbf-bootctl-Fix-kernel-panic-due-to-b.patch
8000-mlxsw-Use-weak-reverse-dependencies-for-firmware-fla.patch
8004-mlxsw-minimal-Downstream-Ignore-error-reading-SPAD-r.patch
2 changes: 1 addition & 1 deletion platform/mellanox/mlnx-sai.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Mellanox SAI

MLNX_SAI_VERSION = SAIBuild2311.26.0.28
MLNX_SAI_VERSION = SAIBuild2311.27.0.16
MLNX_SAI_ASSETS_GITHUB_URL = https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins
MLNX_SAI_ASSETS_RELEASE_TAG = sai-$(MLNX_SAI_VERSION)-$(BLDENV)-$(CONFIGURED_ARCH)
MLNX_SAI_ASSETS_URL = $(MLNX_SAI_ASSETS_GITHUB_URL)/releases/download/$(MLNX_SAI_ASSETS_RELEASE_TAG)
Expand Down
52 changes: 0 additions & 52 deletions platform/mellanox/non-upstream-patches/external-changes.patch
Original file line number Diff line number Diff line change
@@ -1,53 +1 @@
--- a/patch/series
+++ b/patch/series
@@ -113,17 +113,49 @@
0039-mlxsw-reg-Limit-MTBR-register-payload-to-a-single-da.patch
0040-mlxsw-core-Extend-allowed-list-of-external-cooling-d.patch
0041-mlxsw-i2c-Utilize-standard-macros-for-dividing-buffe.patch
+0042-hwmon-mlxreg-fan-Add-support-for-new-flavour-of-capa.patch
0043-hwmon-mlxreg-fan-Extend-number-of-supporetd-fans.patch
+0044-leds-mlxreg-Add-support-for-new-flavour-of-capabilit.patch
+0045-leds-mlxreg-Remove-code-for-amber-LED-colour.patch
+0046-Extend-driver-to-support-Infineon-Digital-Multi-phas.patch
+0047-dt-bindings-trivial-devices-Add-infineon-xdpe1a2g7.patch
+0048-hwmon-pmbus-Add-support-for-MPS-Multi-phase-mp2891-c.patch
+0049-dt-bindings-trivial-devices-Add-mps-mp2891.patch
+0050-leds-mlxreg-Skip-setting-LED-color-during-initializa.patch
0051-platform-mellanox-mlxreg-hotplug-Allow-more-flexible.patch
0052-i2c-mux-Add-register-map-based-mux-driver.patch
+0053-platform-mellanox-Add-support-for-dynamic-I2C-channe.patch
+0054-platform-mellanox-Introduce-support-for-switches-equ.patch
+0055-mellanox-Relocate-mlx-platform-driver.patch
0056-Documentation-ABI-Add-new-attribute-for-mlxreg-io-sy.patch
0057-Documentation-ABI-Add-new-attribute-for-mlxreg-io-sy.patch
0061-pinctrl-Introduce-struct-pinfunction-and-PINCTRL_PIN.patch
0062-pinctrl-mlxbf3-Add-pinctrl-driver-support.patch
0063-gpio-mlxbf3-Add-gpio-driver-support.patch
0064-pinctrl-mlxbf3-set-varaiable-mlxbf3_pmx_funcs-storag.patch
+0066-UBUNTU-SAUCE-sdhci-of-dwcmshc-Enable-host-V4-support.patch
+0067-UBUNTU-SAUCE-mmc-sdhci-of-dwcmshc-add-the-missing-de.patch
+0068-UBUNTU-SAUCE-mmc-sdhci-of-dwcmshc-Add-runtime-PM-ope.patch
+0069-UBUNTU-SAUCE-mlxbf_gige-add-ethtool-mlxbf_gige_set_r.patch
+0070-UBUNTU-SAUCE-Fix-OOB-handling-RX-packets-in-heavy-tr.patch
+0071-UBUNTU-SAUCE-mlxbf-gige-Fix-intermittent-no-ip-issue.patch
+0072-mlxbf_gige-add-MDIO-support-for-BlueField-3.patch
+0073-mlxbf_gige-support-10M-100M-1G-speeds-on-BlueField-3.patch
+0074-mlxbf_gige-add-set_link_ksettings-ethtool-callback.patch
+0075-UBUNTU-SAUCE-mlxbf-gige-Fix-kernel-panic-at-shutdown.patch
+0076-UBUNTU-SAUCE-platform-mellanox-Updates-to-mlxbf-boot.patch
+0077-UBUNTU-SAUCE-mlx-bootctl-support-icm-carveout-eeprom.patch
+0078-UBUNTU-SAUCE-mlxbf-bootctl-support-SMC-call-for-sett.patch
+0079-UBUNTU-SAUCE-mlxbf-ptm-power-and-thermal-management-.patch
+0080-UBUNTU-SAUCE-mlxbf-ptm-update-license.patch
+0081-UBUNTU-SAUCE-mlxbf-ptm-use-0444-instead-of-S_IRUGO.patch
+0082-UBUNTU-SAUCE-mlxbf-ptm-add-atx-debugfs-nodes.patch
+0083-UBUNTU-SAUCE-mlxbf-ptm-update-module-version.patch
+0084-UBUNTU-SAUCE-mlxbf-bootctl-Fix-kernel-panic-due-to-b.patch
0085-hwmon-mlxreg-fan-Separate-methods-of-fan-setting-com.patch
+8000-mlxsw-Use-weak-reverse-dependencies-for-firmware-fla.patch
8003-mlxsw-i2c-SONIC-ISSU-Prevent-transaction-execution-f.patch
+8004-mlxsw-minimal-Downstream-Ignore-error-reading-SPAD-r.patch
8005-leds-leds-mlxreg-Downstream-Send-udev-event-from-led.patch
8006-i2c-mlxcpld-Downstream-WA-to-avoid-error-for-SMBUS-r.patch
8007-hwmon-mlxreg-fan-Downstream-Allow-fan-speed-setting-.patch

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit d7a4927

Please sign in to comment.