diff --git a/patch/0329-platform-mellanox-indicate-deferred-I2C-bus-creation.patch b/patch/0329-platform-mellanox-indicate-deferred-I2C-bus-creation.patch new file mode 100644 index 000000000..0f602a940 --- /dev/null +++ b/patch/0329-platform-mellanox-indicate-deferred-I2C-bus-creation.patch @@ -0,0 +1,31 @@ +From ab5040e2b99cc3eb57eaa266b90877bcc38c28ed Mon Sep 17 00:00:00 2001 +From: Michael Shych +Date: Wed, 29 Nov 2023 13:12:38 +0000 +Subject: [PATCH v1 1/1] platform: mellanox: indicate deferred I2C bus creation + for a hot-plug driver + +It fixes timing issue when during initialization hot-plug driver +attempts to attach a component to I2C bus, which is still not created. +Setting deferred bus parameter will force hot-plug driver to wait +until the bus is available. + +Signed-off-by: Michael Shych +--- + drivers/platform/mellanox/nvsw-sn2201.c | 1 + + 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 +--- 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 = { + .counter = ARRAY_SIZE(nvsw_sn2201_items), + .cell = NVSW_SN2201_SYS_INT_STATUS_OFFSET, + .mask = NVSW_SN2201_CPLD_AGGR_MASK_DEF, ++ .deferred_nr = NVSW_SN2201_2ND_MUX_CH3_NR, + }; + + /* SN2201 static devices. */ +-- +2.14.1 + diff --git a/patch/kconfig-inclusions b/patch/kconfig-inclusions index 0435e4586..3354ad9af 100644 --- a/patch/kconfig-inclusions +++ b/patch/kconfig-inclusions @@ -5,7 +5,6 @@ CONFIG_LOG_BUF_SHIFT=20 [amd64] CONFIG_SATA_MOBILE_LPM_POLICY=1 - # For Arista CONFIG_I2C_MUX_PCA9541=m CONFIG_SENSORS_MAX6697=m @@ -71,7 +70,6 @@ CONFIG_MELLANOX_PLATFORM=y CONFIG_NET_DEVLINK=y CONFIG_I2C_MUX_REG=m CONFIG_I2C_MUX_MLXCPLD=m -CONFIG_REGMAP_I2C=m CONFIG_IIO_SYSFS_TRIGGER=m CONFIG_NVME_HWMON=y CONFIG_MLXSW_CORE_HWMON=y @@ -83,7 +81,6 @@ CONFIG_MLXREG_IO=m CONFIG_MLX_WDT=m CONFIG_MLXREG_LC=m CONFIG_SENSORS_MLXREG_FAN=m -CONFIG_GPIO_GENERIC=m CONFIG_MAX1363=m CONFIG_SENSORS_TPS53679=m CONFIG_SENSORS_XDPE122=m diff --git a/patch/series b/patch/series index ef46779ac..c46ef4e10 100755 --- a/patch/series +++ b/patch/series @@ -211,6 +211,7 @@ kernel-compat-always-include-linux-compat.h-from-net-compat.patch 0314-platform-mellanox-mlx-platform-Introduce-ACPI-init-f.patch 0315-platform-mellanox-mlx-platform-Get-interrupt-line-th.patch 0316-platform-mellanox-Add-initial-support-for-PCIe-based.patch +0329-platform-mellanox-indicate-deferred-I2C-bus-creation.patch ###-> mellanox_hw_mgmt-end # Cisco patches for 5.10 kernel