From 40ab9f9facc0375ca5d5da48990e2e8728cf0412 Mon Sep 17 00:00:00 2001
From: Guohan Lu <gulv@microsoft.com>
Date: Mon, 29 Jan 2018 07:26:51 +0000
Subject: [PATCH] [dell]: add psuutil support for s6000

also remove w83627dhg as it raises false alarm.
---
 .../plugins/psuutil.py                        | 74 +++++++++++++++++++
 .../x86_64-dell_s6000_s1220-r0/sensors.conf   | 21 ------
 .../broadcom/sonic-platform-modules-s6000     |  2 +-
 3 files changed, 75 insertions(+), 22 deletions(-)
 create mode 100644 device/dell/x86_64-dell_s6000_s1220-r0/plugins/psuutil.py

diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/plugins/psuutil.py b/device/dell/x86_64-dell_s6000_s1220-r0/plugins/psuutil.py
new file mode 100644
index 000000000000..537605f3975b
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/plugins/psuutil.py
@@ -0,0 +1,74 @@
+#
+# 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"""
+
+    def __init__(self):
+        PsuBase.__init__(self)
+
+    def get_cpld_register(self, reg_name):
+        cpld_dir = "/sys/devices/platform/dell-s6000-cpld.0"
+        retval = 'ERR'
+        reg_file = cpld_dir +'/' + reg_name
+        if (not os.path.isfile(reg_file)):
+            return retval
+
+        try:
+            with open(reg_file, 'r') as fd:
+                retval = fd.read()
+        except Exception as error:
+            logging.error("Unable to open ", reg_file, "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
+         """
+        S6000_MAX_PSUS = 2
+        return S6000_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
+        psu_status = self.get_cpld_register('psu'+str(index - 1)+'_status')
+        if (psu_status != 'ERR'):
+            status = int(psu_status, 10)
+
+        presence = self.get_psu_presence(index)
+
+        return (status & presence)
+
+    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_presence = self.get_cpld_register('psu'+str(index - 1)+'_prs')
+        if (psu_presence != 'ERR'):
+            status = int(psu_presence, 10)
+
+        return status
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/sensors.conf b/device/dell/x86_64-dell_s6000_s1220-r0/sensors.conf
index 2208bb6340d1..c87af11afacc 100644
--- a/device/dell/x86_64-dell_s6000_s1220-r0/sensors.conf
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/sensors.conf
@@ -27,27 +27,6 @@ chip "max6620-i2c-*-2a"
      ignore fan3
      ignore fan4
 
-chip "w83627dhg-*"
-     label in0 "VCore 1"
-     label in1 "VCore 2"
-     set in0_min 0
-     set in0_max 1.74
-     set in1_min 0
-     set in1_max 1.74
-     ignore fan1
-     ignore fan2
-     ignore fan3
-     ignore fan4
-     ignore fan5
-     ignore in4
-     ignore in5
-     ignore in6
-     ignore temp1
-     ignore temp2
-     ignore temp3
-     ignore cpu0_vid
-     ignore intrusion0
-
 chip "jc42-*"
      set temp1_max 50
      set temp1_crit 85
diff --git a/platform/broadcom/sonic-platform-modules-s6000 b/platform/broadcom/sonic-platform-modules-s6000
index 1f6c70e7db89..952208ce52d8 160000
--- a/platform/broadcom/sonic-platform-modules-s6000
+++ b/platform/broadcom/sonic-platform-modules-s6000
@@ -1 +1 @@
-Subproject commit 1f6c70e7db890851510a36892b602c534e4f41a7
+Subproject commit 952208ce52d88095da9591cc548d1e013f363476