From d959c4adcd07728daa7d6cc00e8382ae829fbe09 Mon Sep 17 00:00:00 2001
From: jostar-yang <jostar_yang@accton.com>
Date: Sat, 5 Mar 2022 09:40:27 +0800
Subject: [PATCH] [AS4630-54PE] Fix led drv and i2c bus order (#9170)

Signed-off-by: Jostar Yang jostar_yang@accton.com.tw

Why I did it
Fix led drv because CPLD SPEC is updated.
Fix i2c bus order
How I did it
Fix led drv. Set blacklist to i801 and ismt. Let accton util to modprobe i801 and ismt.

How to verify it
Test led and sensors cmd. Results are fine.
---
 .../installer.conf                            |  1 +
 .../modules/x86-64-accton-as4630-54pe-leds.c  |  0
 .../utils/accton_as4630_54pe_util.py          | 24 +++++++++----------
 3 files changed, 12 insertions(+), 13 deletions(-)
 mode change 100755 => 100644 platform/broadcom/sonic-platform-modules-accton/as4630-54pe/modules/x86-64-accton-as4630-54pe-leds.c

diff --git a/device/accton/x86_64-accton_as4630_54pe-r0/installer.conf b/device/accton/x86_64-accton_as4630_54pe-r0/installer.conf
index 925a32fc0c..735fa7992d 100755
--- a/device/accton/x86_64-accton_as4630_54pe-r0/installer.conf
+++ b/device/accton/x86_64-accton_as4630_54pe-r0/installer.conf
@@ -1,3 +1,4 @@
 CONSOLE_PORT=0x3f8
 CONSOLE_DEV=0
 CONSOLE_SPEED=115200
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="intel_iommu=off modprobe.blacklist=i2c-ismt,i2c_ismt,i2c-i801,i2c_i801"
diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54pe/modules/x86-64-accton-as4630-54pe-leds.c b/platform/broadcom/sonic-platform-modules-accton/as4630-54pe/modules/x86-64-accton-as4630-54pe-leds.c
old mode 100755
new mode 100644
diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54pe/utils/accton_as4630_54pe_util.py b/platform/broadcom/sonic-platform-modules-accton/as4630-54pe/utils/accton_as4630_54pe_util.py
index f0081b33b2..66599ad88a 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as4630-54pe/utils/accton_as4630_54pe_util.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54pe/utils/accton_as4630_54pe_util.py
@@ -118,7 +118,6 @@ def main():
         elif opt in ('-f', '--force'):
             FORCE = 1
         else:
-            print("TEST")
             logging.info('no option')
     for arg in args:
         if arg == 'install':
@@ -167,7 +166,9 @@ def driver_inserted():
 kos = [
 'depmod -ae',
 'modprobe i2c_dev',
-'modprobe i2c_mux_pca954x force_deselect_on_exit=1',
+'modprobe i2c_i801',
+'modprobe i2c_ismt',
+'modprobe i2c_mux_pca954x',
 'modprobe ym2651y',
 'modprobe x86_64_accton_as4630_54pe_cpld',
 'modprobe x86_64_accton_as4630_54pe_leds',
@@ -176,17 +177,7 @@ kos = [
 
 def driver_install():
     global FORCE
-    
-    ret=log_os_system("lsmod|grep i2c_ismt",1)    
-    my_log("rmmond i2cismt")
-    log_os_system("rmmod i2c_ismt", 1)
-    log_os_system("rmmod i2c_i801", 1)
-    log_os_system("modprobe i2c-i801", 1)
-    time.sleep(1)
-    log_os_system("modprobe i2c-ismt", 1)
-  
-        
-    
+
     for i in range(0,len(kos)):
         status, output = log_os_system(kos[i], 1)
         if status:
@@ -226,6 +217,13 @@ def device_install():
             if FORCE == 0:
                 return status
 
+    # set all pca954x idle_disconnect
+    cmd = 'echo -2 | tee /sys/bus/i2c/drivers/pca954x/*-00*/idle_state'
+    status, output = log_os_system(cmd, 1)
+    if status:
+        print(output)
+        if FORCE == 0:
+            return status
     for i in range(0,len(sfp_map)):
         if(i < 4):
             opt='optoe2'