Vadimp merge v.7.0040.3000 br

.pulse-trufflehog-allowlist.json

@@ -0,0 +1,6 @@
+{
+    "/usr/usr/bin/hw_management_redfish_client.py": {
+        "Password" : ["\"pa*****************\""]
+    }
+}
+

debian/changelog

@@ -1,36 +1,4 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-hw-management (1.mlnx.7.0040.2002) unstable; urgency=low
+hw-management (1.mlnx.7.0040.3035) unstable; urgency=low
   [ MLNX ] 
 
- -- Yehuda Yehudai <[email protected]> Tue, 29 Oct 2024 17:10:00 +0300
-=======
-hw-management (1.mlnx.7.0040.1125-QS) unstable; urgency=low
-  [ MLNX ] 
-
- -- Oleksandr Shamray <[email protected]> Tue, 15 Oct 2024 13:10:00 +0300
->>>>>>> 57559499 (Update changelog V.7.0040.1125-QS)
-=======
-hw-management (1.mlnx.7.0040.1126-QS) unstable; urgency=low
-  [ MLNX ] 
-
- -- Vadim Pasternak <[email protected]> Tue, 03 Nov 2024 13:10:00 +0300
->>>>>>> 08988691 (hw-mgmt: Update changelog)
-=======
-hw-management (1.mlnx.7.0040.1127-QS) unstable; urgency=low
-=======
-hw-management (1.mlnx.7.0040.1128-QS) unstable; urgency=low
->>>>>>> 056c6af1 (Promote tag)
-  [ MLNX ] 
-
- -- Vadim Pasternak <[email protected]> Tue, 05 Nov 2024 13:10:00 +0300
->>>>>>> 7b9090c6 (Promote tag)
-=======
-hw-management (1.mlnx.7.0040.1129-QS) unstable; urgency=low
-  [ MLNX ] 
-
- -- Vadim Pasternak <[email protected]> Tue, 10 Nov 2024 13:10:00 +0300
->>>>>>> 77a34ea1 (Promote tag)
+ -- Felix Radensky <[email protected]> Thu, 12 Dec 2024 16:50:00 +0300

recipes-kernel/linux/Patch_Status_Table.txt

@@ -392,6 +392,7 @@ Kernel-5.10
 |9004-DS-OPT-mlxsw-minimal-Downstream-Disable-ethtool-interface.patch|                 | Downstream accepted                      |            |                                                |
 |9005-platform-mellanox-Downstream-Introduce-support-of-Nv.patch  |                    | Downstream;skip[sonic]                   |            |                                                |
 |9006-mlxsw-core_hwmon-Downstream-Fix-module-sensor-number-for-QM3200.patch|           | Downstream;skip[ALL];take[opt]           |            |                                                |
+|9007-platform-mellanox-mlx-platform-Add-support-for-new-N.patch  |                    | Feature pending;skip[ALL];take[opt]      |            | SN5640                                         |
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 Kernel-5.14
@@ -696,6 +697,8 @@ Kernel-6.1
 |0093-hwmon-pmbus-Add-support-for-MPS-Multi-phase-mp2855-c.patch  |                    | Feature pending                          |            |                                                |
 |0094-i2c-asf-Introduce-MCTP-support-over-ASF-controller.patch    |                    | Downstream accepted                      |            |                                                |
 |0095-platform-mellanox-nvsw-sn2201-Add-support-for-new-sy.patch  |                    | Downstream accepted                      |            |                                                |
+|0096-platform-mellanox-Downstream-Add-dedicated-match-for.patch  |                    | Downstream accepted;skip[sonic,cumulus]  |            | Add dedicated match for QMB8700                |
+|0097-platform-mellanox-mlx-platform-Add-support-for-new-N.patch  |                    | Downstream accepted					  |            | SN5640                                         |
 |8000-mlxsw-Use-weak-reverse-dependencies-for-firmware-fla.patch  |                    | Downstream accepted                      |            | Disable FW update                              |
 |8002-platform-mlx-platform-Downstream-Add-SPI-path-for-ra.patch  |                    | Downstream;skip[sonic,cumulus]           |            | Add SPI                                        |
 |8003-mlxsw-i2c-SONIC-ISSU-Prevent-transaction-execution-f.patch  |                    | Downstream accepted                      |            | Sonic/ISSU                                     |
@@ -707,13 +710,14 @@ Kernel-6.1
 |8009-hwmon-mlxsw-Downstream-Allow-fan-speed-setting-granu.patch  |                    | Downstream accepted                      |            | Fix for mlxminimal cooling level granularity   |
 |8010-mlxsw-i2c-Downstream-Add-retry-mechanism-for-failed-.patch  |                    | Downstream accepted                      |            |                                                |
 |8011-mlxsw-minimal-Downstream-Disable-ethtool-interface.patch    |                    | Downstream accepted                      |            |                                                |
+|8012-hwmon-pmbus-Downstream-Workaround-for-psu-attributes.patch  |                    | Downstream accepted                      |            |                                                |
 |9000-e1000e-OPT-skip-NVM-checksum.patch                          |                    | Downstream;skip[ALL];take[opt]           |            |                                                |
 |9001-iio-pressure-icp20100-OPT-add-driver-for-InvenSense-.patch  |                    | Downstream;skip[ALL];take[opt]           |            |                                                |
 |9002-regmap-debugfs-FT-Enable-writing-to-the-regmap-debug.patch  |                    | Downstream;skip[ALL];take[opt]           |            | BF3 (FT purpose)                               |
 |9003-platform-mellanox-Introduce-support-of-Nvidia-L1-tra.patch  |                    | Downstream;skip[sonic,cumulus]           |            | P4300                                          |
 |9004-platform-mellanox-Downstream-Introduce-support-of-Nv.patch  |                    | Downstream;skip[sonic,cumulus]           |            |                                                |
-|9005-platform-mellanox-Downstream-Add-dedicated-match-for.patch  |                    | Downstream;skip[sonic,cumulus]           |            | Add dedicated match for QMB8700                |
 |9006-mlxsw-core_hwmon-Downstream-Fix-module-sensor-number-for-QM3200.patch|           | Downstream;skip[ALL];take[opt]           |            |                                                |
+|9007-mlxsw-core-Downstream-Fix-uninitialized-variable.patch      |                    | Downstream accepted;skip[sonic]          |            |                                                |
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 Legend:

recipes-kernel/linux/kconfig_5_10.txt

@@ -41,6 +41,7 @@ CONFIG_SENSORS_MLXREG_FAN=m
 CONFIG_SENSORS_JC42=m
 CONFIG_SENSORS_LM75=m
 CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP401=m
 CONFIG_SENSORS_TMP421=m
 CONFIG_SENSORS_STTS751=m
 CONFIG_SENSORS_EMC1403=m

recipes-kernel/linux/kconfig_6_1.txt

@@ -166,6 +166,7 @@ CONFIG_SENSORS_MLXREG_FAN=m
 CONFIG_SENSORS_JC42=m
 CONFIG_SENSORS_LM75=m
 CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP401=m
 CONFIG_SENSORS_TMP421=m
 CONFIG_SENSORS_STTS751=m
 CONFIG_LEDS_MLXREG=m

recipes-kernel/linux/linux-5.10/0261-hwmon-pmbus-Add-support-for-MPS-Multi-phase-mp2891-c.patch

@@ -342,14 +342,14 @@ index 000000000..8e551b9c5
 +		ret = pmbus_read_word_data(client, page, phase, MP2891_PMBUS_VOUT_MIN);
 +		if (ret <= 0)
 +			return ret;
-+		ret = (ret & GENMASK(10, 0)) * data->vid_step[page] * 105;
-+		return DIV_ROUND_CLOSEST(ret, 10000);
++		ret = (ret & GENMASK(10, 0)) * data->vid_step[page];
++		return DIV_ROUND_CLOSEST(ret, 100);
 +	case PMBUS_VOUT_OV_FAULT_LIMIT:
 +		ret = pmbus_read_word_data(client, page, phase, PMBUS_VOUT_MAX);
 +		if (ret <= 0)
 +			return ret;
-+		ret = (ret & GENMASK(10, 0)) * data->vid_step[page] * 95;
-+		return DIV_ROUND_CLOSEST(ret, 10000);
++		ret = (ret & GENMASK(10, 0)) * data->vid_step[page];
++		return DIV_ROUND_CLOSEST(ret, 100);
 +	case PMBUS_IOUT_UC_FAULT_LIMIT:
 +		ret = pmbus_read_word_data(client, page, phase, reg);
 +		return ret <= 0 ? ret : DIV_ROUND_CLOSEST((ret & GENMASK(7, 0)) *

recipes-kernel/linux/linux-5.10/9005-platform-mellanox-Downstream-Introduce-support-of-Nv.patch

@@ -105,8 +105,8 @@ index ad1e421fe..71ab11400 100644
 +static const int mlxplat_l1_scale_out_channels[] = {
 +	1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
 +	18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
-+	33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-+	48, 49, 50, 51, 52,
++	33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 48, 49,
++	50, 51, 52, 53, 54,
 +};
 +
 +/* Platform L1 scale out mux data */
@@ -668,7 +668,7 @@ index ad1e421fe..71ab11400 100644
 +		.mask = GENMASK(7, 0) & ~BIT(7),
 +		.mode = 0444,
 +	},
-+	{
++	/*{
 +		.label = "reset_sw_reset",
 +		.reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET,
 +		.mask = GENMASK(7, 0) & ~BIT(0),
@@ -685,31 +685,31 @@ index ad1e421fe..71ab11400 100644
 +		.reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET,
 +		.mask = GENMASK(7, 0) & ~BIT(2),
 +		.mode = 0444,
-+	},
++	},*/
 +	{
 +		.label = "reset_comex_pwr_fail",
 +		.reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET,
 +		.mask = GENMASK(7, 0) & ~BIT(3),
 +		.mode = 0444,
 +	},
-+	{
++	/*{
 +		.label = "reset_platform",
 +		.reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET,
 +		.mask = GENMASK(7, 0) & ~BIT(4),
 +		.mode = 0444,
-+	},
++	},*/
 +	{
 +		.label = "reset_soc",
 +		.reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET,
 +		.mask = GENMASK(7, 0) & ~BIT(5),
 +		.mode = 0444,
 +	},
-+	{
++	/*{
 +		.label = "reset_pwr",
 +		.reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET,
 +		.mask = GENMASK(7, 0) & ~BIT(7),
 +		.mode = 0444,
-+	},
++	},*/
 +	{
 +		.label = "reset_erot",
 +		.reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET,

recipes-kernel/linux/linux-5.10/9007-platform-mellanox-mlx-platform-Add-support-for-new-N.patch

@@ -0,0 +1,154 @@
+From 463c161032854233835045c9a84a9fc22f55d1e9 Mon Sep 17 00:00:00 2001
+From: Oleksandr Shamray <[email protected]>
+Date: Mon, 28 Oct 2024 16:11:41 +0200
+Subject: [PATCH] platform: mellanox: mlx-platform: Add support for new Nvidia
+ system
+
+Add support for SN5640 Nvidia switch.
+
+SN5640 is a 51.2Tbps switch based on Nvidia SPC-5 ASIC.
+It provides up-to 400Gbps full bidirectional bandwidth per port.
+The system supports 64 OSFP cages and fits into standard 2U racks.
+
+SN5640 Features:
+ - 64 OSFP ports supporting 2.5Gbps - 400Gbps speeds.
+ - Air-cooled with 4 + 1 redundant fan units.
+ - 2 + 2 redundant 2000W PSUs.
+ - System management board based on AMD CPU with secure-boot support.
+
+Signed-off-by: Oleksandr Shamray <[email protected]>
+Reviewed-by: Vadim Pasternak <[email protected]>
+---
+ drivers/platform/mellanox/mlx-platform.c | 95 ++++++++++++++++++++++++
+ 1 file changed, 95 insertions(+)
+
+diff --git a/drivers/platform/mellanox/mlx-platform.c b/drivers/platform/mellanox/mlx-platform.c
+index fcac62431..e8a93ccd2 100644
+--- a/drivers/platform/mellanox/mlx-platform.c
++++ b/drivers/platform/mellanox/mlx-platform.c
+@@ -2992,6 +2992,60 @@ struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_modular_data = {
+ 	.mask_low = MLXPLAT_CPLD_LOW_AGGR_MASK_LOW,
+ };
+
++
++static struct mlxreg_core_item mlxplat_mlxcpld_ng800_hi171_items[] = {
++	{
++		.data = mlxplat_mlxcpld_ext_psu_items_data,
++		.aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF,
++		.reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET,
++		.mask = MLXPLAT_CPLD_PSU_EXT_MASK,
++		.capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET,
++		.count = ARRAY_SIZE(mlxplat_mlxcpld_ext_psu_items_data),
++		.inversed = 1,
++		.health = false,
++	},
++	{
++		.data = mlxplat_mlxcpld_modular_pwr_items_data,
++		.aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF,
++		.reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET,
++		.mask = MLXPLAT_CPLD_PWR_EXT_MASK,
++		.capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET,
++		.count = ARRAY_SIZE(mlxplat_mlxcpld_ext_pwr_items_data),
++		.inversed = 0,
++		.health = false,
++	},
++	{
++		.data = mlxplat_mlxcpld_xdr_fan_items_data,
++		.aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF,
++		.reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
++		.mask = MLXPLAT_CPLD_FAN_XDR_MASK,
++		.capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET,
++		.capability_mask = MLXPLAT_CPLD_FAN_CAP_MASK,
++		.count = ARRAY_SIZE(mlxplat_mlxcpld_xdr_fan_items_data),
++		.inversed = 1,
++		.health = false,
++	},
++	{
++		.data = mlxplat_mlxcpld_default_asic_items_data,
++		.aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF,
++		.reg = MLXPLAT_CPLD_LPC_REG_ASIC_HEALTH_OFFSET,
++		.mask = MLXPLAT_CPLD_ASIC_MASK,
++		.count = ARRAY_SIZE(mlxplat_mlxcpld_default_asic_items_data),
++		.inversed = 0,
++		.health = true,
++	},
++};
++
++static
++struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_ng800_hi171_data = {
++	.items = mlxplat_mlxcpld_ng800_hi171_items,
++	.counter = ARRAY_SIZE(mlxplat_mlxcpld_ng800_hi171_items),
++	.cell = MLXPLAT_CPLD_LPC_REG_AGGR_OFFSET,
++	.mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF | MLXPLAT_CPLD_AGGR_MASK_COMEX,
++	.cell_low = MLXPLAT_CPLD_LPC_REG_AGGRLO_OFFSET,
++	.mask_low = MLXPLAT_CPLD_LOW_AGGR_MASK_LOW | MLXPLAT_CPLD_LOW_AGGR_MASK_ASIC2,
++};
++
+ /* Platform hotplug for chassis blade systems family data  */
+ static struct mlxreg_core_data mlxplat_mlxcpld_global_wp_items_data[] = {
+ 	{
+@@ -5387,6 +5441,12 @@ static struct mlxreg_core_data mlxplat_mlxcpld_default_ng_regs_io_data[] = {
+ 		.mask = GENMASK(7, 0) & ~BIT(4),
+ 		.mode = 0644,
+ 	},
++	{
++		.label = "shutdown_unlock",
++		.reg = MLXPLAT_CPLD_LPC_REG_GP0_OFFSET,
++		.mask = GENMASK(7, 0) & ~BIT(5),
++		.mode = 0644,
++	},
+ 	{
+ 		.label = "erot1_ap_reset",
+ 		.reg = MLXPLAT_CPLD_LPC_REG_GP4_RO_OFFSET,
+@@ -9366,6 +9426,27 @@ static int __init mlxplat_dmi_l1_scale_out_switch_matched(const struct dmi_syste
+ 	return mlxplat_register_platform_device();
+ }
+
++static int __init mlxplat_dmi_ng400_hi171_matched(const struct dmi_system_id *dmi)
++{
++	int i;
++
++	mlxplat_max_adap_num = MLXPLAT_CPLD_MAX_PHYS_ADAPTER_NUM;
++	mlxplat_mux_num = ARRAY_SIZE(mlxplat_ng800_mux_data);
++	mlxplat_mux_data = mlxplat_ng800_mux_data;
++	mlxplat_hotplug = &mlxplat_mlxcpld_ng800_hi171_data;
++	mlxplat_hotplug->deferred_nr =
++		mlxplat_msn21xx_channels[MLXPLAT_CPLD_GRP_CHNL_NUM - 1];
++	mlxplat_led = &mlxplat_default_ng_led_data;
++	mlxplat_regs_io = &mlxplat_default_ng_regs_io_data;
++	mlxplat_fan = &mlxplat_xdr_fan_data;
++	for (i = 0; i < ARRAY_SIZE(mlxplat_mlxcpld_wd_set_type3); i++)
++		mlxplat_wd_data[i] = &mlxplat_mlxcpld_wd_set_type3[i];
++	mlxplat_i2c = &mlxplat_mlxcpld_i2c_ng_data;
++	mlxplat_regmap_config = &mlxplat_mlxcpld_regmap_config_ng400;
++
++	return mlxplat_register_platform_device();
++}
++
+ static const struct dmi_system_id mlxplat_dmi_table[] __initconst = {
+ 	{
+ 		.callback = mlxplat_dmi_default_wc_matched,
+@@ -9526,6 +9607,20 @@ static const struct dmi_system_id mlxplat_dmi_table[] __initconst = {
+ 			DMI_MATCH(DMI_BOARD_NAME, "VMOD0021"),
+ 		},
+ 	},
++{
++		.callback = mlxplat_dmi_ng400_hi171_matched,
++		.matches = {
++			DMI_MATCH(DMI_BOARD_NAME, "VMOD0022"),
++			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "HI171"),
++		},
++	},
++	{
++		.callback = mlxplat_dmi_ng400_hi171_matched,
++		.matches = {
++			DMI_MATCH(DMI_BOARD_NAME, "VMOD0022"),
++			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "HI172"),
++		},
++	},
+ 	{
+ 		.callback = mlxplat_dmi_msn274x_matched,
+ 		.matches = {
+-- 
+2.20.1
+

recipes-kernel/linux/linux-5.10/dvs/0261-hwmon-pmbus-Add-support-for-MPS-Multi-phase-mp2891-c.patch

@@ -342,14 +342,14 @@ index 000000000..8e551b9c5
 +		ret = pmbus_read_word_data(client, page, phase, MP2891_PMBUS_VOUT_MIN);
 +		if (ret <= 0)
 +			return ret;
-+		ret = (ret & GENMASK(10, 0)) * data->vid_step[page] * 105;
-+		return DIV_ROUND_CLOSEST(ret, 10000);
++		ret = (ret & GENMASK(10, 0)) * data->vid_step[page];
++		return DIV_ROUND_CLOSEST(ret, 100);
 +	case PMBUS_VOUT_OV_FAULT_LIMIT:
 +		ret = pmbus_read_word_data(client, page, phase, PMBUS_VOUT_MAX);
 +		if (ret <= 0)
 +			return ret;
-+		ret = (ret & GENMASK(10, 0)) * data->vid_step[page] * 95;
-+		return DIV_ROUND_CLOSEST(ret, 10000);
++		ret = (ret & GENMASK(10, 0)) * data->vid_step[page];
++		return DIV_ROUND_CLOSEST(ret, 100);
 +	case PMBUS_IOUT_UC_FAULT_LIMIT:
 +		ret = pmbus_read_word_data(client, page, phase, reg);
 +		return ret <= 0 ? ret : DIV_ROUND_CLOSEST((ret & GENMASK(7, 0)) *

recipes-kernel/linux/linux-5.10/nvos/0261-hwmon-pmbus-Add-support-for-MPS-Multi-phase-mp2891-c.patch

@@ -342,14 +342,14 @@ index 000000000..8e551b9c5
 +		ret = pmbus_read_word_data(client, page, phase, MP2891_PMBUS_VOUT_MIN);
 +		if (ret <= 0)
 +			return ret;
-+		ret = (ret & GENMASK(10, 0)) * data->vid_step[page] * 105;
-+		return DIV_ROUND_CLOSEST(ret, 10000);
++		ret = (ret & GENMASK(10, 0)) * data->vid_step[page];
++		return DIV_ROUND_CLOSEST(ret, 100);
 +	case PMBUS_VOUT_OV_FAULT_LIMIT:
 +		ret = pmbus_read_word_data(client, page, phase, PMBUS_VOUT_MAX);
 +		if (ret <= 0)
 +			return ret;
-+		ret = (ret & GENMASK(10, 0)) * data->vid_step[page] * 95;
-+		return DIV_ROUND_CLOSEST(ret, 10000);
++		ret = (ret & GENMASK(10, 0)) * data->vid_step[page];
++		return DIV_ROUND_CLOSEST(ret, 100);
 +	case PMBUS_IOUT_UC_FAULT_LIMIT:
 +		ret = pmbus_read_word_data(client, page, phase, reg);
 +		return ret <= 0 ? ret : DIV_ROUND_CLOSEST((ret & GENMASK(7, 0)) *

recipes-kernel/linux/linux-5.10/opt/0261-hwmon-pmbus-Add-support-for-MPS-Multi-phase-mp2891-c.patch

@@ -342,14 +342,14 @@ index 000000000..8e551b9c5
 +		ret = pmbus_read_word_data(client, page, phase, MP2891_PMBUS_VOUT_MIN);
 +		if (ret <= 0)
 +			return ret;
-+		ret = (ret & GENMASK(10, 0)) * data->vid_step[page] * 105;
-+		return DIV_ROUND_CLOSEST(ret, 10000);
++		ret = (ret & GENMASK(10, 0)) * data->vid_step[page];
++		return DIV_ROUND_CLOSEST(ret, 100);
 +	case PMBUS_VOUT_OV_FAULT_LIMIT:
 +		ret = pmbus_read_word_data(client, page, phase, PMBUS_VOUT_MAX);
 +		if (ret <= 0)
 +			return ret;
-+		ret = (ret & GENMASK(10, 0)) * data->vid_step[page] * 95;
-+		return DIV_ROUND_CLOSEST(ret, 10000);
++		ret = (ret & GENMASK(10, 0)) * data->vid_step[page];
++		return DIV_ROUND_CLOSEST(ret, 100);
 +	case PMBUS_IOUT_UC_FAULT_LIMIT:
 +		ret = pmbus_read_word_data(client, page, phase, reg);
 +		return ret <= 0 ? ret : DIV_ROUND_CLOSEST((ret & GENMASK(7, 0)) *