From 166efeffe26437fc3c97ccd02134f49b404f9c56 Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Tue, 2 Nov 2021 04:06:39 +0530
Subject: [PATCH] Upgrade new DellEMC platforms to bullseye kernel (#10)

* Upgrade new DellEMC platforms to Bullseye

* Update s5212f kernel module
---
 .../sonic-platform-modules-dell/debian/control    |  6 +++---
 .../n3248pxe/scripts/n3248pxe_platform.sh         |  6 ++----
 .../n3248te/scripts/n3248te_platform.sh           |  4 ++--
 .../s5212f/modules/dell_s5212f_fpga_ocores.c      |  4 ++--
 .../s5212f/scripts/s5212f_platform.sh             | 12 ++++++++----
 .../s5224f/scripts/s5224f_platform.sh             | 15 ++++++++++-----
 .../s5232f/scripts/s5232f_platform.sh             | 11 ++++++-----
 .../s5248f/scripts/s5248f_platform.sh             | 11 ++++++-----
 .../s5296f/scripts/s5296f_platform.sh             | 11 ++++++-----
 .../z9264f/scripts/z9264f_platform.sh             | 11 ++++++-----
 .../z9332f/scripts/z9332f_platform.sh             | 13 +++++++------
 11 files changed, 58 insertions(+), 46 deletions(-)

diff --git a/platform/broadcom/sonic-platform-modules-dell/debian/control b/platform/broadcom/sonic-platform-modules-dell/debian/control
index 0e9029efda63..da3f2da58625 100644
--- a/platform/broadcom/sonic-platform-modules-dell/debian/control
+++ b/platform/broadcom/sonic-platform-modules-dell/debian/control
@@ -27,12 +27,12 @@ Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-s5212f
 Architecture: amd64
-Depends: linux-image-4.19.0-12-2-amd64-unsigned
+Depends: linux-image-5.10.0-8-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-s5224f
 Architecture: amd64
-Depends: linux-image-4.19.0-12-2-amd64-unsigned
+Depends: linux-image-5.10.0-8-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-s5232f
@@ -47,7 +47,7 @@ Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-n3248te
 Architecture: amd64
-Depends: linux-image-4.19.0-12-2-amd64-unsigned
+Depends: linux-image-5.10.0-8-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-z9332f
diff --git a/platform/broadcom/sonic-platform-modules-dell/n3248pxe/scripts/n3248pxe_platform.sh b/platform/broadcom/sonic-platform-modules-dell/n3248pxe/scripts/n3248pxe_platform.sh
index c049826608b1..3b50982497f3 100755
--- a/platform/broadcom/sonic-platform-modules-dell/n3248pxe/scripts/n3248pxe_platform.sh
+++ b/platform/broadcom/sonic-platform-modules-dell/n3248pxe/scripts/n3248pxe_platform.sh
@@ -89,8 +89,6 @@ install_python_api_package() {
 }
 
 remove_python_api_package() {
-    rv=$(pip show sonic-platform > /dev/null 2>/dev/null)
-
     rv=$(pip3 show sonic-platform > /dev/null 2>/dev/null)
     if [ $? -eq 0 ]; then
         rv=$(pip3 uninstall -y sonic-platform > /dev/null 2>/dev/null)
@@ -112,7 +110,7 @@ get_reboot_cause() {
 
 if [[ "$1" == "init" ]]; then
    modprobe i2c-dev
-   modprobe i2c-mux-pca954x force_deselect_on_exit=1
+   modprobe i2c-mux-pca954x
    modprobe pmbus
    modprobe emc2305
    modprobe dps200
@@ -124,12 +122,12 @@ if [[ "$1" == "init" ]]; then
    echo 0xf0 > /sys/devices/platform/dell-n3248pxe-cpld.0/sfp_txdis
    install_python_api_package
    platform_firmware_versions
+   echo -2 > /sys/class/i2c-adapter/i2c-0/0-0071/idle_state
 elif [[ "$1" == "deinit" ]]; then
     switch_board_sfp "delete_device"
     sysdevices "delete_device"
 
     modprobe -r dell_n3248pxe_platform
-
     modprobe -r dps200
     modprobe -r emc2305
     modprobe -r pmbus
diff --git a/platform/broadcom/sonic-platform-modules-dell/n3248te/scripts/n3248te_platform.sh b/platform/broadcom/sonic-platform-modules-dell/n3248te/scripts/n3248te_platform.sh
index e4c0734b1fd9..14c233f6a5af 100755
--- a/platform/broadcom/sonic-platform-modules-dell/n3248te/scripts/n3248te_platform.sh
+++ b/platform/broadcom/sonic-platform-modules-dell/n3248te/scripts/n3248te_platform.sh
@@ -114,7 +114,7 @@ get_reboot_cause() {
 
 if [[ "$1" == "init" ]]; then
    modprobe i2c-dev
-   modprobe i2c-mux-pca954x force_deselect_on_exit=1
+   modprobe i2c-mux-pca954x
    modprobe pmbus
    modprobe emc2305
    modprobe dps200
@@ -126,12 +126,12 @@ if [[ "$1" == "init" ]]; then
    echo 0xf0 > /sys/devices/platform/dell-n3248te-cpld.0/sfp_txdis
    install_python_api_package
    platform_firmware_versions
+   echo -2 > /sys/class/i2c-adapter/i2c-0/0-0071/idle_state
 elif [[ "$1" == "deinit" ]]; then
     switch_board_sfp "delete_device"
     sysdevices "delete_device"
 
     modprobe -r dell_n3248te_platform
-
     modprobe -r dps200
     modprobe -r emc2305
     modprobe -r pmbus
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5212f/modules/dell_s5212f_fpga_ocores.c b/platform/broadcom/sonic-platform-modules-dell/s5212f/modules/dell_s5212f_fpga_ocores.c
index 549a299abb3c..b3d9e8dbab3a 100644
--- a/platform/broadcom/sonic-platform-modules-dell/s5212f/modules/dell_s5212f_fpga_ocores.c
+++ b/platform/broadcom/sonic-platform-modules-dell/s5212f/modules/dell_s5212f_fpga_ocores.c
@@ -1047,7 +1047,7 @@ static int map_bars(struct fpgapci_dev *fpgapci, struct pci_dev *dev)
 
 		/* map the device memory or IO region into kernel virtual
 		 * address space */
-		fpgapci->bar[i] = ioremap_nocache (bar_start + FPGALOGIC_I2C_BASE, I2C_PCI_MAX_BUS * FPGALOGIC_CH_OFFSET);
+		fpgapci->bar[i] = ioremap(bar_start + FPGALOGIC_I2C_BASE, I2C_PCI_MAX_BUS * FPGALOGIC_CH_OFFSET);
 
 		if (!fpgapci->bar[i]) {
 			PRINT ( "Could not map BAR #%d.\n", i);
@@ -1061,7 +1061,7 @@ static int map_bars(struct fpgapci_dev *fpgapci, struct pci_dev *dev)
 		{
 
             fpga_phys_addr = bar_start;
-            fpga_ctl_addr = ioremap_nocache (bar_start, FPGA_CTL_REG_SIZE);
+            fpga_ctl_addr = ioremap(bar_start, FPGA_CTL_REG_SIZE);
             fpga_base_addr = fpgapci->bar[i];
 		}
 
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5212f/scripts/s5212f_platform.sh b/platform/broadcom/sonic-platform-modules-dell/s5212f/scripts/s5212f_platform.sh
index 2c778cf98b43..d98c144ab621 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s5212f/scripts/s5212f_platform.sh
+++ b/platform/broadcom/sonic-platform-modules-dell/s5212f/scripts/s5212f_platform.sh
@@ -175,7 +175,7 @@ init_devnum
 
 if [ "$1" == "init" ]; then
     modprobe i2c-dev
-    modprobe i2c-mux-pca954x force_deselect_on_exit=1
+    modprobe i2c-mux-pca954x
     modprobe ipmi_devintf
     modprobe ipmi_si kipmid_max_busy_us=1000
     modprobe i2c_ocores
@@ -189,18 +189,22 @@ if [ "$1" == "init" ]; then
     switch_board_led_default
     install_python_api_package
     platform_firmware_versions
-
+    echo -2 > /sys/bus/i2c/drivers/pca954x/603-0074/idle_state
+    echo -2 > /sys/bus/i2c/drivers/pca954x/604-0074/idle_state
 elif [ "$1" == "deinit" ]; then
     sys_eeprom "delete_device"
     switch_board_qsfp "delete_device"
     switch_board_sfp "delete_device"
     switch_board_qsfp_mux "delete_device"
 
+    modprobe -r dell_s5212f_fpga_ocores
+    modprobe -r i2c_ocores
+    modprobe -r acpi_ipmi
+    modprobe -r ipmi_si
+    modprobe -r ipmi_devintf
     modprobe -r i2c-mux-pca954x
     modprobe -r i2c-dev
     remove_python_api_package
-    modprobe -r ipmi_devintf
-    modprobe -r ipmi_si
 else
      echo "s5212f_platform : Invalid option !"
 fi
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5224f/scripts/s5224f_platform.sh b/platform/broadcom/sonic-platform-modules-dell/s5224f/scripts/s5224f_platform.sh
index 8d78a8eaa166..e68fce7a70d0 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s5224f/scripts/s5224f_platform.sh
+++ b/platform/broadcom/sonic-platform-modules-dell/s5224f/scripts/s5224f_platform.sh
@@ -172,7 +172,7 @@ init_devnum
 
 if [ "$1" == "init" ]; then
     modprobe i2c-dev
-    modprobe i2c-mux-pca954x force_deselect_on_exit=1
+    modprobe i2c-mux-pca954x
     modprobe ipmi_devintf
     modprobe ipmi_si kipmid_max_busy_us=1000
     modprobe i2c_ocores
@@ -186,17 +186,22 @@ if [ "$1" == "init" ]; then
     install_python_api_package
     #python /usr/bin/qsfp_irq_enable.py
     platform_firmware_versions
-
+    echo -2 > /sys/bus/i2c/drivers/pca954x/603-0074/idle_state
+    echo -2 > /sys/bus/i2c/drivers/pca954x/604-0074/idle_state
+    echo -2 > /sys/bus/i2c/drivers/pca954x/605-0074/idle_state
+    echo -2 > /sys/bus/i2c/drivers/pca954x/606-0074/idle_state
 elif [ "$1" == "deinit" ]; then
     sys_eeprom "delete_device"
     switch_board_qsfp "delete_device"
     switch_board_qsfp_mux "delete_device"
 
-    modprobe -r i2c-mux-pca954x
-    modprobe -r i2c-dev
+    modprobe -r dell_s5224f_fpga_ocores
+    modprobe -r i2c_ocores
     modprobe -r acpi_ipmi
-    modprobe -r ipmi_devintf
     modprobe -r ipmi_si
+    modprobe -r ipmi_devintf
+    modprobe -r i2c-mux-pca954x
+    modprobe -r i2c-dev
     remove_python_api_package
 else
      echo "s5224f_platform : Invalid option !"
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5232f/scripts/s5232f_platform.sh b/platform/broadcom/sonic-platform-modules-dell/s5232f/scripts/s5232f_platform.sh
index bdb8e27ad0b1..893dcfafaa26 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s5232f/scripts/s5232f_platform.sh
+++ b/platform/broadcom/sonic-platform-modules-dell/s5232f/scripts/s5232f_platform.sh
@@ -221,13 +221,14 @@ elif [ "$1" == "deinit" ]; then
     switch_board_qsfp "delete_device"
     switch_board_sfp "delete_device"
     switch_board_qsfp_mux "delete_device"
-    modprobe -r i2c-mux-pca954x
-    modprobe -r i2c-dev
+
+    modprobe -r dell_s5232f_fpga_ocores
+    modprobe -r i2c_ocores
     modprobe -r acpi_ipmi
-    modprobe -r ipmi_devintf
     modprobe -r ipmi_si
-    modprobe -r i2c_ocores
-    modprobe -r dell_s5232f_fpga_ocores
+    modprobe -r ipmi_devintf
+    modprobe -r i2c-mux-pca954x
+    modprobe -r i2c-dev
     remove_python_api_package
 else
      echo "s5232f_platform : Invalid option !"
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5248f/scripts/s5248f_platform.sh b/platform/broadcom/sonic-platform-modules-dell/s5248f/scripts/s5248f_platform.sh
index 801601cf98cd..84f236366702 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s5248f/scripts/s5248f_platform.sh
+++ b/platform/broadcom/sonic-platform-modules-dell/s5248f/scripts/s5248f_platform.sh
@@ -175,13 +175,14 @@ elif [ "$1" == "deinit" ]; then
     sys_eeprom "delete_device"
     switch_board_qsfp "delete_device"
     switch_board_qsfp_mux "delete_device"
-    modprobe -r i2c-mux-pca954x
-    modprobe -r i2c-dev
+
+    modprobe -r dell_s5248f_fpga_ocores
+    modprobe -r i2c_ocores
     modprobe -r acpi_ipmi
-    modprobe -r ipmi_devintf
     modprobe -r ipmi_si
-    modprobe -r i2c_ocores
-    modprobe -r dell_s5248f_fpga_ocores
+    modprobe -r ipmi_devintf
+    modprobe -r i2c-mux-pca954x
+    modprobe -r i2c-dev
     remove_python_api_package
 else
      echo "s5248f_platform : Invalid option !"
diff --git a/platform/broadcom/sonic-platform-modules-dell/s5296f/scripts/s5296f_platform.sh b/platform/broadcom/sonic-platform-modules-dell/s5296f/scripts/s5296f_platform.sh
index 32b1815b0ed1..2bf64fa736c6 100755
--- a/platform/broadcom/sonic-platform-modules-dell/s5296f/scripts/s5296f_platform.sh
+++ b/platform/broadcom/sonic-platform-modules-dell/s5296f/scripts/s5296f_platform.sh
@@ -180,13 +180,14 @@ elif [ "$1" == "deinit" ]; then
     sys_eeprom "delete_device"
     switch_board_qsfp "delete_device"
     switch_board_qsfp_mux "delete_device"
-    modprobe -r i2c-mux-pca954x
-    modprobe -r i2c-dev
+
+    modprobe -r dell_s5296f_fpga_ocores
+    modprobe -r i2c_ocores
     modprobe -r acpi_ipmi
-    modprobe -r ipmi_devintf
     modprobe -r ipmi_si
-    modprobe -r i2c_ocores
-    modprobe -r dell_s5296f_fpga_ocores
+    modprobe -r ipmi_devintf
+    modprobe -r i2c-mux-pca954x
+    modprobe -r i2c-dev
     remove_python_api_package
 else
     echo "s5296f_platform : Invalid option !"
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9264f/scripts/z9264f_platform.sh b/platform/broadcom/sonic-platform-modules-dell/z9264f/scripts/z9264f_platform.sh
index 31128ab83374..a113c5e435bb 100755
--- a/platform/broadcom/sonic-platform-modules-dell/z9264f/scripts/z9264f_platform.sh
+++ b/platform/broadcom/sonic-platform-modules-dell/z9264f/scripts/z9264f_platform.sh
@@ -241,13 +241,14 @@ elif [ "$1" == "deinit" ]; then
     switch_board_qsfp "delete_device"
     switch_board_qsfp_mux "delete_device"
     switch_board_sfp "delete_device"
-    modprobe -r i2c-mux-pca954x
-    modprobe -r i2c-dev
+
+    modprobe -r dell_z9264f_fpga_ocores
+    modprobe -r i2c_ocores
     modprobe -r acpi_ipmi
-    modprobe -r ipmi_devintf
     modprobe -r ipmi_si
-    modprobe -r i2c_ocores
-    modprobe -r dell_z9264f_fpga_ocores
+    modprobe -r ipmi_devintf
+    modprobe -r i2c-mux-pca954x
+    modprobe -r i2c-dev
     remove_python_api_package
 else
      echo "z9264f_platform : Invalid option !"
diff --git a/platform/broadcom/sonic-platform-modules-dell/z9332f/scripts/z9332f_platform.sh b/platform/broadcom/sonic-platform-modules-dell/z9332f/scripts/z9332f_platform.sh
index 671c4ae9be26..cc109cd46427 100755
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/scripts/z9332f_platform.sh
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/scripts/z9332f_platform.sh
@@ -205,14 +205,15 @@ elif [ "$1" == "deinit" ]; then
     sys_eeprom "delete_device"
     switch_board_qsfp "delete_device"
     switch_board_sfp "delete_device"
-    modprobe -r cls-i2c-mux-pca954x
-    modprobe -r i2c-dev
-    modprobe -r ipmi_devintf
+
+    modprobe -r mc24lc64t
+    modprobe -r cls-switchboard
+    modprobe -r cls-i2c-ocore
     modprobe -r acpi_ipmi
     modprobe -r ipmi_si
-    modprobe -r cls-i2c-ocore
-    modprobe -r cls-switchboard 
-    modprobe -r mc24lc64t 
+    modprobe -r ipmi_devintf
+    modprobe -r cls-i2c-mux-pca954x
+    modprobe -r i2c-dev
     remove_python_api_package
 else
      echo "z9332f_platform : Invalid option !"