Update to Linux 5.10.179 (sonic-net#328)

* Update to Linux 5.10.179 One patch needed some changes; all other patches are unchanged. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> * Fix kversion Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> * Update to 5.10.179-3. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> * Disable 6 Mellanox patches as those changes are already included Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> * Remove Mellanox patches that are not required for 5.10.179 --------- Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> Co-authored-by: Vivek Reddy <vkarri@nvidia.com>
Junchao-Mellanox · Sep 13, 2023 · 3158031 · 3158031
1 parent fa40db7
commit 3158031
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 21 deletions.
diff --git a/Makefile b/Makefile
@@ -3,10 +3,10 @@ SHELL = /bin/bash
 .SHELLFLAGS += -e
 
 KERNEL_ABI_MINOR_VERSION = 2
-KVERSION_SHORT ?= 5.10.0-18-$(KERNEL_ABI_MINOR_VERSION)
+KVERSION_SHORT ?= 5.10.0-23-$(KERNEL_ABI_MINOR_VERSION)
 KVERSION ?= $(KVERSION_SHORT)-amd64
-KERNEL_VERSION ?= 5.10.140
-KERNEL_SUBVERSION ?= 1
+KERNEL_VERSION ?= 5.10.179
+KERNEL_SUBVERSION ?= 3
 kernel_procure_method ?= build
 CONFIGURED_ARCH ?= amd64
 CONFIGURED_PLATFORM ?= vs

diff --git a/patch/driver-arista-mmcblk-not-working-on-AMD-platforms.patch b/patch/driver-arista-mmcblk-not-working-on-AMD-platforms.patch
@@ -42,8 +42,8 @@ index bf04a08ee..c10790dd6 100644
 --- a/drivers/mmc/host/sdhci-pci-core.c
 +++ b/drivers/mmc/host/sdhci-pci-core.c
 @@ -1791,8 +1791,13 @@ static int amd_probe(struct sdhci_pci_chip *chip)
- 		}
- 	}
+
+ 	pci_dev_put(smbus_dev);
 
 -	if (gen == AMD_CHIPSET_BEFORE_ML || gen == AMD_CHIPSET_CZ)
 +	dev_info(&chip->pdev->dev, "identified AMD generation %d chip\n", gen);

diff --git a/patch/preconfig/disable-building-linux-source-deb-package.patch b/patch/preconfig/disable-building-linux-source-deb-package.patch
@@ -1,7 +1,7 @@
 Don't build the linux source package. We don't use it.
 
 diff --git a/debian/config/defines b/debian/config/defines
-index fea89d3b2..7c1d06ad2 100644
+index 55d7e51a7..d0bd92833 100644
 --- a/debian/config/defines
 +++ b/debian/config/defines
 @@ -171,3 +171,6 @@ gcc-10: gcc-10 <!stage1 !cross !pkg.linux.nokernel>, gcc-10-@gnu-type-package@ <
@@ -12,15 +12,15 @@ index fea89d3b2..7c1d06ad2 100644
 +[packages]
 +source: false
 diff --git a/debian/control.md5sum b/debian/control.md5sum
-index b6dae911b..50787e0e6 100644
+index 7d4eabf04..30b3c66a3 100644
 --- a/debian/control.md5sum
 +++ b/debian/control.md5sum
 @@ -38,7 +38,7 @@ afb508873a44a1f196c2a525fec4b415  debian/templates/image.prerm.in
  381bc892fd36ef7ea5327f649b99cb98  debian/templates/sourcebin.meta.maintscript.in
  814dda166c7e3ef02e6e259e805ac66a  debian/templates/tests-control.image.in
  33d71bfd398d2f9b3bc5c0193b67d17e  debian/templates/tests-control.main.in
--8d7d8384c63c762538f8a76b60f6ca01  debian/config/defines
-+d2c3e206c4cfe309bacbea8692b9acae  debian/config/defines
+-4f47bd3f3f88986bd6cb2bd9c006d6aa  debian/config/defines
++c133f81fd44189940d8a695508ae2221  debian/config/defines
  59a811890d2e7129bec940075850f11f  debian/config/alpha/defines
  026ce5cdad7814c28f4fd87589786719  debian/config/amd64/defines
  44bff3917069a99eeb20ceff24609dda  debian/config/arm64/defines
diff --git a/patch/preconfig/packaging-update-abiname.patch b/patch/preconfig/packaging-update-abiname.patch
@@ -9,26 +9,26 @@ From: Olivier Singla <olivier.singla@broadcom.com>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/debian/config/defines b/debian/config/defines
-index cd4938ecc..e54c10256 100644
+index 983625720..55d7e51a7 100644
 --- a/debian/config/defines
 +++ b/debian/config/defines
 @@ -1,5 +1,5 @@
  [abi]
--abiname: 18
-+abiname: 18-2
+-abiname: 23
++abiname: 23-2
  ignore-changes:
   __cpuhp_*
   __udp_gso_segment
 diff --git a/debian/control.md5sum b/debian/control.md5sum
-index e86f5f1db..caddd5360 100644
+index b3ce4f58d..7d4eabf04 100644
 --- a/debian/control.md5sum
 +++ b/debian/control.md5sum
 @@ -38,7 +38,7 @@ afb508873a44a1f196c2a525fec4b415  debian/templates/image.prerm.in
  381bc892fd36ef7ea5327f649b99cb98  debian/templates/sourcebin.meta.maintscript.in
  814dda166c7e3ef02e6e259e805ac66a  debian/templates/tests-control.image.in
  33d71bfd398d2f9b3bc5c0193b67d17e  debian/templates/tests-control.main.in
--eb1d16e5a614c12118ccc36e18c54a69  debian/config/defines
-+8d7d8384c63c762538f8a76b60f6ca01  debian/config/defines
+-a488ddf3e8386253351268ac9218622f  debian/config/defines
++4f47bd3f3f88986bd6cb2bd9c006d6aa  debian/config/defines
  59a811890d2e7129bec940075850f11f  debian/config/alpha/defines
  026ce5cdad7814c28f4fd87589786719  debian/config/amd64/defines
  44bff3917069a99eeb20ceff24609dda  debian/config/arm64/defines
diff --git a/patch/series b/patch/series
@@ -177,12 +177,6 @@ kernel-compat-always-include-linux-compat.h-from-net-compat.patch
 0178-platform-mellanox-Introduce-support-for-next-generat.patch
 0180-hwmon-pmbus-Fix-sensors-readouts-for-MPS-Multi-phase.patch
 0186-platform-mellanox-mlxreg-hotplug-Allow-more-flexible.patch
-0195-platform-x86-MLX_PLATFORM-select-REGMAP-instead-of-d.patch
-0201-i2c-mlxbf-incorrect-base-address-passed-during-io-wr.patch
-0202-i2c-mlxbf-prevent-stack-overflow-in-mlxbf_i2c_smbus_.patch
-0204-i2c-mlxbf-Fix-frequency-calculation.patch
-0205-i2c-mlxbf-support-lock-mechanism.patch
-0265-hwmon-mlxreg-fan-Return-zero-speed-for-broken-fan.patch
 0285-platform-mellanox-nvsw-sn2201-change-fans-i2c-busses.patch
 ###-> mellanox_hw_mgmt-end