Upgrade Kernel to 6.1.123 and hw-mgmt to 7.0040.2108

Makefile

@@ -3,9 +3,9 @@ SHELL = /bin/bash
 .SHELLFLAGS += -e
 
 KERNEL_ABI_MINOR_VERSION = 2
-KVERSION_SHORT ?= 6.1.0-22-$(KERNEL_ABI_MINOR_VERSION)
+KVERSION_SHORT ?= 6.1.0-29-$(KERNEL_ABI_MINOR_VERSION)
 KVERSION ?= $(KVERSION_SHORT)-amd64
-KERNEL_VERSION ?= 6.1.94
+KERNEL_VERSION ?= 6.1.123
 KERNEL_SUBVERSION ?= 1
 CONFIGURED_ARCH ?= amd64
 CONFIGURED_PLATFORM ?= vs

patch/0030-platform-mellanox-nvsw-sn2201-change-fans-i2c-busses.patch

@@ -1,8 +1,7 @@
-From ddec9cfeb44ed194cadee824f3f49c057bf7a560 Mon Sep 17 00:00:00 2001
+From ac10df67c019b8ee1c80b46390759669cd69862f Mon Sep 17 00:00:00 2001
 From: Michael Shych <michaelsh@nvidia.com>
 Date: Wed, 12 Jul 2023 14:26:38 +0000
-Subject: [PATH backport v6.1 30/32] platform: mellanox: nvsw-sn2201: change
- fans i2c busses.
+Subject: [PATCH 2/4] platform: mellanox: nvsw-sn2201: change fans i2c busses.
 
 Link: https://www.spinics.net/lists/platform-driver-x86/msg39647.html
 
@@ -18,7 +17,7 @@ Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
  1 file changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/platform/mellanox/nvsw-sn2201.c b/drivers/platform/mellanox/nvsw-sn2201.c
-index 7b9c107c17ce..75b699676ca6 100644
+index f53baf7e7..1a7c45aa4 100644
 --- a/drivers/platform/mellanox/nvsw-sn2201.c
 +++ b/drivers/platform/mellanox/nvsw-sn2201.c
 @@ -84,6 +84,10 @@

patch/0087-platform-mellanox-indicate-deferred-I2C-bus-creation.patch

@@ -1,7 +1,7 @@
-From ab5040e2b99cc3eb57eaa266b90877bcc38c28ed Mon Sep 17 00:00:00 2001
+From 1c43cf584d3fd62823dd3b28018481f15a8836c7 Mon Sep 17 00:00:00 2001
 From: Michael Shych <michaelsh@nvidia.com>
 Date: Wed, 29 Nov 2023 13:12:38 +0000
-Subject: [PATCH v1 1/1] platform: mellanox: indicate deferred I2C bus creation
+Subject: [PATCH 3/4] platform: mellanox: indicate deferred I2C bus creation
  for a hot-plug driver
 
 It fixes timing issue when during initialization hot-plug driver
@@ -15,7 +15,7 @@ Signed-off-by: Michael Shych <michaelsh@nvidia.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/platform/mellanox/nvsw-sn2201.c b/drivers/platform/mellanox/nvsw-sn2201.c
-index 65b677690..79e4d0619 100644
+index 1a7c45aa4..a3e2bc6d6 100644
 --- a/drivers/platform/mellanox/nvsw-sn2201.c
 +++ b/drivers/platform/mellanox/nvsw-sn2201.c
 @@ -520,6 +520,7 @@ struct mlxreg_core_hotplug_platform_data nvsw_sn2201_hotplug = {
@@ -27,5 +27,5 @@ index 65b677690..79e4d0619 100644
 
  /* SN2201 static devices. */
 -- 
-2.14.1
+2.20.1
 

patch/0095-platform-mellanox-nvsw-sn2201-Add-support-for-new-sy.patch

@@ -1,8 +1,8 @@
-From 693ea1c72c6f1b83232c043fdb1b175a450bc172 Mon Sep 17 00:00:00 2001
-From: Vadim Pasternak <vadimp@nvidia.com>
-Date: Wed, 7 Aug 2024 00:09:11 +0000
-Subject: [PATCH backport 6.1 1/1] platform: mellanox: nvsw-sn2200: Add support
- for new system flavour
+From 13e4e0e5b566a116e2107a0a959d2b294b388b42 Mon Sep 17 00:00:00 2001
+From: Oleksandr Shamray <oleksandrs@nvidia.com>
+Date: Wed, 11 Dec 2024 17:49:45 +0200
+Subject: [PATCH 4/4] platform: mellanox: nvsw-sn2200: Add support for new
+ system flavour
 
 Add support for SN2201 system flavour, which is fitting OCP rack
 form-factor and feeded from external power source through the rack
@@ -15,11 +15,11 @@ For new system flavour:
 
 Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
 ---
- drivers/platform/mellanox/nvsw-sn2201.c | 111 +++++++++++++++++++++++-
- 1 file changed, 108 insertions(+), 3 deletions(-)
+ drivers/platform/mellanox/nvsw-sn2201.c | 112 +++++++++++++++++++++++-
+ 1 file changed, 109 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/platform/mellanox/nvsw-sn2201.c b/drivers/platform/mellanox/nvsw-sn2201.c
-index 2612bb5f82a3..d604069e3313 100644
+index a3e2bc6d6..64c705f3b 100644
 --- a/drivers/platform/mellanox/nvsw-sn2201.c
 +++ b/drivers/platform/mellanox/nvsw-sn2201.c
 @@ -6,6 +6,7 @@
@@ -103,7 +103,7 @@ index 2612bb5f82a3..d604069e3313 100644
  };
 
  /* SN2201 default static board info. */
-@@ -608,6 +647,58 @@ static struct mlxreg_hotplug_device nvsw_sn2201_static_brdinfo[] = {
+@@ -608,6 +647,59 @@ static struct mlxreg_hotplug_device nvsw_sn2201_static_brdinfo[] = {
  	},
  };
 
@@ -158,11 +158,12 @@ index 2612bb5f82a3..d604069e3313 100644
 +		.nr = NVSW_SN2201_MAIN_MUX_CH1_NR,
 +	},
 +};
++
 +
  /* LED default data. */
  static struct mlxreg_core_data nvsw_sn2201_led_data[] = {
  	{
-@@ -982,7 +1073,10 @@ static int nvsw_sn2201_config_init(struct nvsw_sn2201 *nvsw_sn2201, void *regmap
+@@ -982,7 +1074,10 @@ static int nvsw_sn2201_config_init(struct nvsw_sn2201 *nvsw_sn2201, void *regmap
  	nvsw_sn2201->io_data = &nvsw_sn2201_regs_io;
  	nvsw_sn2201->led_data = &nvsw_sn2201_led;
  	nvsw_sn2201->wd_data = &nvsw_sn2201_wd;
@@ -174,11 +175,12 @@ index 2612bb5f82a3..d604069e3313 100644
 
  	/* Register IO access driver. */
  	if (nvsw_sn2201->io_data) {
-@@ -1199,11 +1293,17 @@ static int nvsw_sn2201_config_pre_init(struct nvsw_sn2201 *nvsw_sn2201)
+@@ -1199,12 +1294,18 @@ static int nvsw_sn2201_config_pre_init(struct nvsw_sn2201 *nvsw_sn2201)
  static int nvsw_sn2201_probe(struct platform_device *pdev)
  {
  	struct nvsw_sn2201 *nvsw_sn2201;
 +	const char *sku;
+ 	int ret;
 
  	nvsw_sn2201 = devm_kzalloc(&pdev->dev, sizeof(*nvsw_sn2201), GFP_KERNEL);
  	if (!nvsw_sn2201)
@@ -191,8 +193,8 @@ index 2612bb5f82a3..d604069e3313 100644
 +
  	nvsw_sn2201->dev = &pdev->dev;
  	platform_set_drvdata(pdev, nvsw_sn2201);
- 	platform_device_add_resources(pdev, nvsw_sn2201_lpc_io_resources,
-@@ -1212,8 +1312,13 @@ static int nvsw_sn2201_probe(struct platform_device *pdev)
+ 	ret = platform_device_add_resources(pdev, nvsw_sn2201_lpc_io_resources,
+@@ -1215,8 +1316,13 @@ static int nvsw_sn2201_probe(struct platform_device *pdev)
  	nvsw_sn2201->main_mux_deferred_nr = NVSW_SN2201_MAIN_MUX_DEFER_NR;
  	nvsw_sn2201->main_mux_devs = nvsw_sn2201_main_mux_brdinfo;
  	nvsw_sn2201->cpld_devs = nvsw_sn2201_cpld_brdinfo;
@@ -209,5 +211,5 @@ index 2612bb5f82a3..d604069e3313 100644
  	return nvsw_sn2201_config_pre_init(nvsw_sn2201);
  }
 -- 
-2.44.0
+2.20.1
 

patch/preconfig/disable-building-linux-source-deb-package.patch

@@ -19,8 +19,8 @@ index 7d4eabf04..30b3c66a3 100644
  a20d83421667bad21739041d4e743ed1  debian/templates/sourcebin.meta.maintscript.in
  cbc5b0a81441c4c98b329ebe10827812  debian/templates/tools-unversioned.control.in
  568f629072d584e9a0eb1dc9d3a94749  debian/templates/tools-versioned.control.in
--1d140a262c41627e255a1aaa0ddcfe92  debian/config/defines
-+cb9f5129f072fe65d26e16d8963d4297  debian/config/defines
+-26c0dd754fd9fd1ffd676fe8a91d40c2  debian/config/defines
++f2176df3239edfc784a274054247ec8b  debian/config/defines
  59a811890d2e7129bec940075850f11f  debian/config/alpha/defines
  60569b1b4c618e2fe7b135f687d0f0d2  debian/config/amd64/defines
  bc35d767074baf305423437d049be85d  debian/config/arm64/defines

patch/preconfig/packaging-update-abiname.patch

@@ -14,8 +14,8 @@ index 983625720..55d7e51a7 100644
 +++ b/debian/config/defines
 @@ -1,5 +1,5 @@
  [abi]
--abiname: 22
-+abiname: 22-2
+-abiname: 29
++abiname: 29-2
  ignore-changes:
   __cpuhp_*
   __udp_gso_segment
@@ -27,8 +27,8 @@ index b3ce4f58d..7d4eabf04 100644
  a20d83421667bad21739041d4e743ed1  debian/templates/sourcebin.meta.maintscript.in
  cbc5b0a81441c4c98b329ebe10827812  debian/templates/tools-unversioned.control.in
  568f629072d584e9a0eb1dc9d3a94749  debian/templates/tools-versioned.control.in
--36001efefc2d9ec53b7a0fd2a504677b  debian/config/defines
-+1d140a262c41627e255a1aaa0ddcfe92  debian/config/defines
+-f3ba608063c55ec489dcdf9397ec8082  debian/config/defines
++26c0dd754fd9fd1ffd676fe8a91d40c2  debian/config/defines
  59a811890d2e7129bec940075850f11f  debian/config/alpha/defines
  60569b1b4c618e2fe7b135f687d0f0d2  debian/config/amd64/defines
  bc35d767074baf305423437d049be85d  debian/config/arm64/defines

patch/series

@@ -69,8 +69,6 @@ Support-for-fullcone-nat.patch
 # Tbridge-per-port-multicast-broadcast-flood-flags.patch
 #
 
-0001-devlink-Fix-RCU-stall-when-unregistering-a-devlink-i.patch
-
 # Mellanox patches for 5.10
 ###-> mellanox_sdk-start
 0001-psample-define-the-macro-PSAMPLE_MD_EXTENDED_ATTR.patch
@@ -216,9 +214,6 @@ cisco-npu-disable-other-bars.patch
 0028-Create-miniaturised-diafgw-partition-for-128MB-flash.patch
 0029-pcie-if-hotplug-enabled-do-immediate-reset-on-panic.patch
 
-# Fix for w25q128 flash that dont have SFDP support
-0001-Revert-mtd-spi-nor-Correct-flags-for-Winbond-w25q128.patch 
-
 # Security patch
 0001-Change-the-system.map-file-permission-only-readable-.patch