From 41f14fcfef42d0e8d5995690902b95895bf51009 Mon Sep 17 00:00:00 2001
From: Jason Tsai <cytsai0409@gmail.com>
Date: Thu, 4 Jan 2018 03:26:27 +0800
Subject: [PATCH] [Platform] Add psuutil support for Ingrasys S9130-32X (#1273)

Update psuutil and psu kernel module on S9230
---
 .../plugins/psuutil.py                        | 92 +++++++++++++++++++
 .../plugins/psuutil.py                        |  4 +-
 .../nephos/sonic-platform-modules-ingrasys    |  2 +-
 3 files changed, 95 insertions(+), 3 deletions(-)
 create mode 100644 device/ingrasys/x86_64-ingrasys_s9130_32x-r0/plugins/psuutil.py

diff --git a/device/ingrasys/x86_64-ingrasys_s9130_32x-r0/plugins/psuutil.py b/device/ingrasys/x86_64-ingrasys_s9130_32x-r0/plugins/psuutil.py
new file mode 100644
index 0000000000..4a029c15b1
--- /dev/null
+++ b/device/ingrasys/x86_64-ingrasys_s9130_32x-r0/plugins/psuutil.py
@@ -0,0 +1,92 @@
+#
+# psuutil.py
+# Platform-specific PSU status interface for SONiC
+#
+
+
+import os.path
+
+try:
+    from sonic_psu.psu_base import PsuBase
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class PsuUtil(PsuBase):
+    """Platform-specific PSUutil class"""
+
+    SYSFS_PSU_DIR = ["/sys/bus/i2c/devices/i2c-10/10-0050",
+                     "/sys/bus/i2c/devices/i2c-9/9-0050"]
+
+    def __init__(self):
+        PsuBase.__init__(self)
+    
+             
+    # Get sysfs attribute
+    def get_attr_value(self, attr_path):
+        
+        retval = 'ERR'        
+        if (not os.path.isfile(attr_path)):
+            return retval
+
+        try:
+            with open(attr_path, 'r') as fd:
+                retval = fd.read()
+        except Exception as error:
+            logging.error("Unable to open ", attr_path, " file !")
+
+        retval = retval.rstrip('\r\n')
+        return retval
+
+    def get_num_psus(self):
+        """
+        Retrieves the number of PSUs available on the device
+        :return: An integer, the number of PSUs available on the device
+         """
+        MAX_PSUS = 2
+        return MAX_PSUS
+
+    def get_psu_status(self, index):
+        """
+        Retrieves the oprational status of power supply unit (PSU) defined
+                by index <index>
+        :param index: An integer, index of the PSU of which to query status
+        :return: Boolean, True if PSU is operating properly, False if PSU is\
+        faulty
+        """
+        status = 0
+        attr_file = 'psu_pg'        
+        attr_path = self.SYSFS_PSU_DIR[index-1] +'/' + attr_file
+                  
+        attr_value = self.get_attr_value(attr_path)
+        
+        if (attr_value != 'ERR'):
+            attr_value = int(attr_value, 16)
+            # Check for PSU status
+            if (attr_value == 1):
+                    status = 1
+
+        return status
+
+    def get_psu_presence(self, index):
+        """
+        Retrieves the presence status of power supply unit (PSU) defined
+                by index <index>
+        :param index: An integer, index of the PSU of which to query status
+        :return: Boolean, True if PSU is plugged, False if not
+        """
+        status = 0
+        psu_absent = 0
+        attr_file ='psu_abs'
+        attr_path = self.SYSFS_PSU_DIR[index-1] +'/' + attr_file
+        
+        attr_value = self.get_attr_value(attr_path)
+
+        if (attr_value != 'ERR'):
+            attr_value = int(attr_value, 16)
+            # Check for PSU presence
+            if (attr_value == 0):
+                    status = 1
+
+        return status
+
diff --git a/device/ingrasys/x86_64-ingrasys_s9230_64x-r0/plugins/psuutil.py b/device/ingrasys/x86_64-ingrasys_s9230_64x-r0/plugins/psuutil.py
index 91d7de05dc..cc996057e0 100644
--- a/device/ingrasys/x86_64-ingrasys_s9230_64x-r0/plugins/psuutil.py
+++ b/device/ingrasys/x86_64-ingrasys_s9230_64x-r0/plugins/psuutil.py
@@ -15,8 +15,8 @@ except ImportError as e:
 class PsuUtil(PsuBase):
     """Platform-specific PSUutil class"""
 
-    SYSFS_PSU_DIR = ["/sys/bus/i2c/devices/i2c-17/17-0050",
-                     "/sys/bus/i2c/devices/i2c-18/18-0050"]
+    SYSFS_PSU_DIR = ["/sys/bus/i2c/devices/i2c-18/18-0050",
+                     "/sys/bus/i2c/devices/i2c-17/17-0050"]
 
     def __init__(self):
         PsuBase.__init__(self)
diff --git a/platform/nephos/sonic-platform-modules-ingrasys b/platform/nephos/sonic-platform-modules-ingrasys
index e8fd460120..b03499ed1d 160000
--- a/platform/nephos/sonic-platform-modules-ingrasys
+++ b/platform/nephos/sonic-platform-modules-ingrasys
@@ -1 +1 @@
-Subproject commit e8fd460120b73cc175b509a344345f30a70e3126
+Subproject commit b03499ed1d72a239ed386e40370b146c9a479eaa