[device/Dell] SOSFTDEP to lpc_ich module for dell_ich module (#2440)

dell_ich module fails to load sometimes due to the failure of pci_get_drvdata(). This function is responsible for fetching INTEL PCI related memory handle in kernel. This is implemented in lpc_ich kernel module. Due to race in addition/deletion of kernel modules, sometimes lpc_ich loads after dell_ich. Because of this behaviour dell_ich module fails to load. Fixed by addding dependency between modules. Removed i2c_mux_gpio module from blacklist entry as it is not the original root case of this issue.
sonic-net · Jan 15, 2019 · 9c70e65 · 9c70e65
1 parent 878c523
commit 9c70e65
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/installer.conf b/device/dell/x86_64-dell_s6100_c2538-r0/installer.conf
@@ -1,3 +1,3 @@
 CONSOLE_PORT=0x2f8
 CONSOLE_DEV=1
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich,i2c_mux_gpio"
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich"
diff --git a/device/dell/x86_64-dell_z9100_c2538-r0/installer.conf b/device/dell/x86_64-dell_z9100_c2538-r0/installer.conf
@@ -1,3 +1,3 @@
 CONSOLE_PORT=0x2f8
 CONSOLE_DEV=1
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich,i2c_mux_gpio"
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich"
diff --git a/platform/broadcom/sonic-platform-modules-dell/common/dell_ich.c b/platform/broadcom/sonic-platform-modules-dell/common/dell_ich.c
@@ -1038,5 +1038,6 @@ MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:"DRV_NAME);
 MODULE_PARM_DESC(force_id, "Override the detected device ID");
 
+MODULE_SOFTDEP("pre: lpc_ich");
 module_init(dell_ich_init);
 module_exit(dell_ich_exit);