Merge branch '202012' of https://github.com/Azure/sonic-buildimage in…

…to internal-202012

device/dell/x86_64-dell_s6100_c2538-r0/pcie_2.yaml

@@ -0,0 +1,50 @@
+- bus: '00'
+  dev: '01'
+  fn: '0'
+  id: 1f10
+  name: 'PCI bridge: Intel Corporation Atom processor C2000 PCIe Root Port 1'
+- bus: '00'
+  dev: '03'
+  fn: '0'
+  id: 1f12
+  name: 'PCI bridge: Intel Corporation Atom processor C2000 PCIe Root Port 3'
+- bus: '00'
+  dev: '04'
+  fn: '0'
+  id: 1f13
+  name: 'PCI bridge: Intel Corporation Atom processor C2000 PCIe Root Port 4'
+- bus: '00'
+  dev: 0f
+  fn: '0'
+  id: 1f16
+  name: 'IOMMU: Intel Corporation Atom processor C2000 RCEC'
+- bus: '00'
+  dev: '13'
+  fn: '0'
+  id: 1f15
+  name: 'System peripheral: Intel Corporation Atom processor C2000 SMBus 2.0'
+- bus: '00'
+  dev: '14'
+  fn: '0'
+  id: 1f41
+  name: 'Ethernet controller: Intel Corporation Ethernet Connection I354'
+- bus: '00'
+  dev: '14'
+  fn: '1'
+  id: 1f41
+  name: 'Ethernet controller: Intel Corporation Ethernet Connection I354'
+- bus: '00'
+  dev: '14'
+  fn: '2'
+  id: 1f41
+  name: 'Ethernet controller: Intel Corporation Ethernet Connection I354'
+- bus: '01'
+  dev: '00'
+  fn: '0'
+  id: b960
+  name: 'Ethernet controller: Broadcom Limited Broadcom BCM56960 Switch ASIC'
+- bus: '01'
+  dev: '00'
+  fn: '1'
+  id: b960
+  name: 'Ethernet controller: Broadcom Limited Broadcom BCM56960 Switch ASIC'

platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-haliburton.postinst

@@ -1,10 +1,12 @@
 depmod -a
+sudo chmod +x /usr/local/bin/udev_prefix.sh
+sudo chmod +x /usr/local/bin/popmsg.sh
+sudo chmod +x /usr/local/bin/reload_udev.sh
 systemctl enable platform-modules-haliburton.service
 systemctl enable fancontrol.service
 
 systemctl start platform-modules-haliburton.service
 systemctl start fancontrol.service
 
 /usr/local/bin/platform_api_mgnt.sh install
-sudo chmod +x /usr/local/bin/udev_prefix.sh
-sudo chmod +x /usr/local/bin/popmsg.sh
+/usr/local/bin/reload_udev.sh

platform/broadcom/sonic-platform-modules-cel/haliburton/script/reload_udev.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+UDEV_DIR=/etc/udev/rules.d/50-ttyUSB-C0.rules
+TTYUSB_DIR=/dev/ttyUSB
+
+if [ -f "$UDEV_DIR" ]; then
+        for i in {0..95}
+        do
+                ttydev=$TTYUSB_DIR$i
+                if [ -c "$ttydev" ]; then
+                        udevadm trigger -c add $ttydev
+                fi
+        done
+fi

platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/pcie.py

@@ -0,0 +1,29 @@
+########################################################################
+#
+# DELLEMC S6100
+#
+# Module contains a platform specific implementation of SONiC Platform
+# Base PCIe class
+#
+########################################################################
+
+try:
+    from sonic_platform.component import Component
+    from sonic_platform_base.sonic_pcie.pcie_common import PcieUtil
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+
+class Pcie(PcieUtil):
+    """DellEMC Platform-specific PCIe class"""
+
+    def __init__(self, platform_path):
+        PcieUtil.__init__(self, platform_path)
+        bios = Component(component_index=0)
+        bios_ver = bios.get_firmware_version()
+
+        versions = bios_ver.split("-")
+        if (len(versions) == 2) and int(versions[1], 10) > 5:
+            self._conf_rev = "2"
+        else:
+            self._conf_rev = "1"