397908aa59
- Why I did it
Facilitate Automatic integration of new hw-mgmt version into SONiC.
Inputs to the Script:
MLNX_HW_MANAGEMENT_VERSION Eg: 7.0040.5202
CREATE_BRANCH: (y|n) Creates a branch instead of a commit (optional, default: n)
BRANCH_SONIC: Only relevant when CREATE_BRANCH is y. Default: master.
Note: These should be provided through SONIC_OVERRIDE_BUILD_VARS parameter
Output:
Script creates a commit (in each of sonic-buildimage, sonic-linux-kernel) with all the changes required for upgrading the hw-management version to a version provided by MLNX_HW_MANAGEMENT_VERSION
Brief Summary of the changes made:
MLNX_HW_MANAGEMENT_VERSION flag in the hw-management.mk file
hw-mgmt submodule is updated to the corresponding version
Updates are made to non-upstream-patches/patches and series.patch file
series, kconfig-inclusion and kconfig-exclusion files can be updated in the sonic-linux-kernel repo
sonic-linux-kernel/patches folder is updated with the corresponding upstream patches
Based on the inputs, there could be a branch seen in the local for each of the repo's. Branch is named as <branch>_<parent_commit>_integrate_<hw_mgmt_version>
- How I did it
Added a new make target which can be invoked by calling make integrate-mlnx-hw-mgmt
user@server:/sonic-buildimage$ git rev-parse --abbrev-ref HEAD
master_23193446a_integrate_7.0020.5052
user@server:/sonic-buildimage$ git log --oneline -n 2
f66e01867 (HEAD -> master_23193446a_integrate_V.7.0020.5052, show) Intgerate HW-MGMT V.7.0020.5052 Changes
23193446a (master_intg_hw_mgmt) Update logic
user@server:/sonic-buildimage/src/sonic-linux-kernel$ git rev-parse --abbrev-ref HEAD
master_6847319_integrate_7.0020.4104
user@server:/sonic-buildimage/src/sonic-linux-kernel$ git log --oneline -n 2
6094f71 (HEAD -> master_6847319_integrate_V.7.0020.5052) Intgerate HW-MGMT V.7.0020.5052 Changes
6847319 (origin/master, origin/HEAD) Read ID register for optoe1 to find pageable bit in optoe driver (#308)
Changes made will be summarized under sonic-buildimage/integrate-mlnx-hw-mgmt_user.out file. Debugging and troubleshooting output is written to sonic-buildimage/integrate-mlnx-hw-mgmt.log files
User output file & stdout file:
log_files.tar.gz
Limitations:
Assumes the changes would only work for amd64
Assumes the non-upstream patches in mellanox only belong to hw-mgmt
- How to verify it
Build the Kernel
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
65 lines
2.2 KiB
Plaintext
Executable File
65 lines
2.2 KiB
Plaintext
Executable File
# This series applies on GIT commit 18c5597832fcf6988111b05a9a1607ae148723c
|
|
# Note: Markers should start with "###->".
|
|
# Header should end with .*-start eg: any_description-start
|
|
# Footer must end with .*-end eg: any_description-end
|
|
# Markers should not be nested
|
|
|
|
# Backport from 5.15
|
|
0001-x86-platform-Increase-maximum-GPIO-number-for-X86_64.patch
|
|
|
|
# Backport from 5.16
|
|
0001-net-arp-introduce-arp_evict_nocarrier-sysctl-paramet.patch
|
|
|
|
# Backport from 5.19
|
|
0001-net-ipv6-Introduce-accept_unsolicited_na-knob-to-imp.patch
|
|
0002-net-ipv6-Expand-and-rename-accept_unsolicited_na-to-.patch
|
|
|
|
#
|
|
# This series applies on GIT commit 1451b36b2b0d62178e42f648d8a18131af18f7d8
|
|
# Tkernel-sched-core-fix-cgroup-fork-race.patch
|
|
# Tconfig-mlnx-sn2700.patch
|
|
# Tdriver-at24-fix-odd-length-two-byte-access.patch
|
|
# Tdriver-hwmon-lm75b-update.patch
|
|
# Tdriver-hwmon-pmbus-add-dps460-support.patch
|
|
# Tdriver-hwmon-pmbus-ucd9200-mlnx.patch
|
|
# Trtnetlink-catch-EOPNOTSUPP-errors.patch
|
|
# Tbridge-per-port-multicast-broadcast-flood-flags.patch
|
|
#
|
|
|
|
# Mellanox patches for 5.10
|
|
###-> mellanox_sdk-start
|
|
###-> mellanox_sdk-end
|
|
|
|
###-> mellanox_hw_mgmt-start
|
|
0001-i2c-mlxcpld-Update-module-license.patch
|
|
0002-i2c-mlxcpld-Decrease-polling-time-for-performan.patch
|
|
0003-i2c-mlxcpld-Add-support-for-I2C-bus-frequency-s.patch
|
|
0004-i2c-mux-mlxcpld-Update-module-license.patch
|
|
0005-i2c-mux-mlxcpld-Move-header-file-out-of-x86-rea.patch
|
|
0006-i2c-mux-mlxcpld-Convert-driver-to-platform-driv.patch
|
|
0007-i2c-mux-mlxcpld-Prepare-mux-selection-infrastru.patch
|
|
0008-i2c-mux-mlxcpld-Get-rid-of-adapter-numbers-enfo.patch
|
|
###-> mellanox_hw_mgmt-end
|
|
|
|
# Cisco patches for 5.10 kernel
|
|
cisco-mtd-part.patch
|
|
cisco-mdio-mux-support-acpi.patch
|
|
cisco-x86-gpio-config.patch
|
|
|
|
# sFlow + dropmon support
|
|
0001-psample-Encapsulate-packet-metadata-in-a-struct.patch
|
|
0002-psample-Add-additional-metadata-attributes.patch
|
|
0003-psample-define-the-macro-PSAMPLE_MD_EXTENDED_ATTR.patch
|
|
|
|
#
|
|
# Marvell platform patches for 4.19
|
|
armhf_secondary_boot_online.patch
|
|
#
|
|
#
|
|
############################################################
|
|
#
|
|
# Internal patches will be added below (placeholder)
|
|
# Do not add any public patch below this marker
|
|
#
|
|
############################################################
|