Sync to internal 8-19-2019

Signed-off-by: Ed Tanous <ed.tanous@intel.com>

6 files changed, 134 insertions, 122 deletions

diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-Report-link-statistics-for-the-NCSI-channel.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-Report-link-statistics-for-the-NCSI-channel.patch
new file mode 100644
index 000000000..a79457962
--- /dev/null
+++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-Report-link-statistics-for-the-NCSI-channel.patch
@@ -0,0 +1,54 @@
+From 39ea8eb8a221646ce019bbb176e58be47f4ca03a Mon Sep 17 00:00:00 2001
+From: Johnathan Mantey <johnathanx.mantey@intel.com>
+Date: Thu, 1 Aug 2019 11:29:41 -0700
+Subject: [PATCH] Report link statistics for the NCSI channel
+
+The ftgmac driver does not report the link statistics for the NCSI
+channel used for the shared NICs attached to the BMC. Report a fixed
+value for the NSCI interface.
+
+Change-Id: Idb65ca1ce07f06a883417ee44df30ea2c8483107
+Signed-off-by: Johnathan Mantey <johnathanx.mantey@intel.com>
+---
+ drivers/net/ethernet/faraday/ftgmac100.c | 22 +++++++++++++++++++++-
+ 1 file changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
+index 055f77c70fa3..974ea44e9195 100644
+--- a/drivers/net/ethernet/faraday/ftgmac100.c
++++ b/drivers/net/ethernet/faraday/ftgmac100.c
+@@ -1215,10 +1215,30 @@ static int ftgmac100_set_pauseparam(struct net_device *netdev,
+ 	return 0;
+ }
+ 
++int ftgmac100_ethtool_get_link_ksettings(struct net_device *netdev,
++					 struct ethtool_link_ksettings *cmd)
++{
++	struct phy_device *phydev = netdev->phydev;
++	struct ftgmac100 *priv = netdev_priv(netdev);
++	int retval = 0;
++
++	if (phydev) {
++		phy_ethtool_ksettings_get(phydev, cmd);
++	} else if (priv->use_ncsi) {
++		cmd->base.speed = SPEED_100;
++		cmd->base.duplex = DUPLEX_FULL;
++		cmd->base.autoneg = 0;
++	} else {
++		retval = -ENODEV;
++	}
++
++	return retval;
++}
++
+ static const struct ethtool_ops ftgmac100_ethtool_ops = {
+ 	.get_drvinfo		= ftgmac100_get_drvinfo,
+ 	.get_link		= ethtool_op_get_link,
+-	.get_link_ksettings	= phy_ethtool_get_link_ksettings,
++	.get_link_ksettings	= ftgmac100_ethtool_get_link_ksettings,
+ 	.set_link_ksettings	= phy_ethtool_set_link_ksettings,
+ 	.nway_reset		= phy_ethtool_nway_reset,
+ 	.get_ringparam		= ftgmac100_get_ringparam,
+-- 
+2.20.1
+
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch
index 613118843..782e5e795 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch
@@ -1,4 +1,4 @@
-From a2505e885fafd674fe0eb3a2e6daa69392e46684 Mon Sep 17 00:00:00 2001
+From 219406610ce816c56fa7cb5952bbec72fd94a3a9 Mon Sep 17 00:00:00 2001
 From: Yuan Li <yuan.li@linux.intel.com>
 Date: Tue, 19 Sep 2017 15:55:39 +0800
 Subject: [PATCH] arm: dts: add DTS for Intel platforms
@@ -11,19 +11,19 @@ Signed-off-by: James Feist <james.feist@linux.intel.com>
 Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
 Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
 Signed-off-by: Zhu, Yunge <yunge.zhu@linux.intel.com>
-Signed-off-by: Chen Yugang <yugang.chen@linux.intel.com>
 Signed-off-by: Qiang XU <qiang.xu@linux.intel.com>
+Signed-off-by: Chen Yugang <yugang.chen@linux.intel.com>
 ---
- arch/arm/boot/dts/aspeed-bmc-intel-purley.dts | 410 ++++++++++++++++++++++++++
- 1 file changed, 410 insertions(+)
+ arch/arm/boot/dts/aspeed-bmc-intel-purley.dts | 437 ++++++++++++++++++++++++++
+ 1 file changed, 436 insertions(+)
  create mode 100644 arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
 
 diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
 new file mode 100644
-index 000000000000..e94a1473045f
+index 0000000..9f8192f
 --- /dev/null
 +++ b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
-@@ -0,0 +1,410 @@
+@@ -0,0 +1,437 @@
 +/dts-v1/;
 +
 +#include "aspeed-g5.dtsi"
@@ -129,6 +129,7 @@ index 000000000000..e94a1473045f
 +
 +&peci0 {
 +	status = "okay";
++	gpios = <&gpio ASPEED_GPIO(F, 6) 0>;
 +};
 +
 +&syscon {
@@ -148,7 +149,7 @@ index 000000000000..e94a1473045f
 +	/*C0-C7*/	"","","","","","","","",
 +	/*D0-D7*/	"","","","","","","","",
 +	/*E0-E7*/	"RESET_BUTTON","RESET_OUT","POWER_BUTTON","POWER_OUT","","","","",
-+	/*F0-F7*/	"","","","","CPU_ERR0","CPU_ERR1","","",
++	/*F0-F7*/	"NMI_OUT","","","","CPU_ERR0","CPU_ERR1","","",
 +	/*G0-G7*/	"CPU_ERR2","CPU_CATERR","PCH_BMC_THERMTRIP","","","","","",
 +	/*H0-H7*/	"","","","","","","","",
 +	/*I0-I7*/	"","","","","","","","",
@@ -174,6 +175,36 @@ index 000000000000..e94a1473045f
 +	/*AC0-AC7*/	"","","","","","","","";
 +};
 +
++&sgpio {
++	status = "okay";
++	gpio-line-names =
++	/* SGPIO output lines */
++	/*OA0-OA7*/	"","","","","","","","",
++	/*OB0-OB7*/	"LED_CPU1_CH1_DIMM1_FAULT","LED_CPU1_CH1_DIMM2_FAULT","LED_CPU1_CH2_DIMM1_FAULT","LED_CPU1_CH2_DIMM2_FAULT","LED_CPU1_CH3_DIMM1_FAULT","LED_CPU1_CH3_DIMM2_FAULT","LED_CPU1_CH4_DIMM1_FAULT","LED_CPU1_CH4_DIMM2_FAULT",
++	/*OC0-OC7*/	"LED_CPU1_CH5_DIMM1_FAULT","LED_CPU1_CH5_DIMM2_FAULT","LED_CPU1_CH6_DIMM1_FAULT","LED_CPU1_CH6_DIMM2_FAULT","LED_FAN1_FAULT","LED_FAN2_FAULT","LED_FAN3_FAULT","LED_FAN4_FAULT",
++	/*OD0-OD7*/	"LED_FAN5_FAULT","LED_FAN6_FAULT","LED_FAN7_FAULT","LED_FAN8_FAULT","LED_CPU2_CH1_DIMM1_FAULT","LED_CPU1_CH1_DIMM2_FAULT","LED_CPU2_CH2_DIMM1_FAULT","LED_CPU2_CH2_DIMM2_FAULT",
++	/*OE0-OE7*/	"LED_CPU2_CH3_DIMM1_FAULT","LED_CPU2_CH3_DIMM2_FAULT","LED_CPU2_CH4_DIMM1_FAULT","LED_CPU2_CH4_DIMM2_FAULT","LED_CPU2_CH5_DIMM1_FAULT","LED_CPU2_CH5_DIMM2_FAULT","LED_CPU2_CH6_DIMM1_FAULT","LED_CPU2_CH6_DIMM2_FAULT",
++	/*OF0-OF7*/	"LED_CPU3_CH1_DIMM1_FAULT","LED_CPU3_CH1_DIMM2_FAULT","LED_CPU3_CH2_DIMM1_FAULT","LED_CPU3_CH2_DIMM2_FAULT","LED_CPU3_CH3_DIMM1_FAULT","LED_CPU3_CH3_DIMM2_FAULT","LED_CPU3_CH4_DIMM1_FAULT","LED_CPU3_CH4_DIMM2_FAULT",
++	/*OG0-OG7*/	"LED_CPU3_CH5_DIMM1_FAULT","LED_CPU3_CH5_DIMM2_FAULT","LED_CPU3_CH6_DIMM1_FAULT","LED_CPU3_CH6_DIMM2_FAULT","LED_CPU4_CH1_DIMM1_FAULT","LED_CPU4_CH1_DIMM2_FAULT","LED_CPU4_CH2_DIMM1_FAULT","LED_CPU4_CH2_DIMM2_FAULT",
++	/*OH0-OH7*/	"LED_CPU4_CH3_DIMM1_FAULT","LED_CPU4_CH3_DIMM2_FAULT","LED_CPU4_CH4_DIMM1_FAULT","LED_CPU4_CH4_DIMM2_FAULT","LED_CPU4_CH5_DIMM1_FAULT","LED_CPU4_CH5_DIMM2_FAULT","LED_CPU4_CH6_DIMM1_FAULT","LED_CPU4_CH6_DIMM2_FAULT",
++	/*OI0-OI7*/	"","","","","","","","",
++	/*OJ0-OJ7*/	"","","","","","","","",
++	/*DUMMY*/	"","","","","","","","",
++	/*DUMMY*/	"","","","","","","","",
++
++	/* SGPIO input lines */
++	/*IA0-IA7*/	"CPU1_PRESENCE","","","","","","","",
++	/*IB0-IB7*/	"","","CPU2_PRESENCE","","","","","",
++	/*IC0-IC7*/	"","","","","","","","",
++	/*ID0-ID7*/	"","","","","","","","",
++	/*IE0-IE7*/	"","","","","","","","",
++	/*IF0-IF7*/	"","","","","","","","",
++	/*IG0-IG7*/	"","","","","","","","",
++	/*IH0-IH7*/	"","","","","","","","",
++	/*II0-II7*/	"","","","","","","","",
++	/*IJ0-IJ7*/	"","","","","","","","";
++};
++
 +&kcs3 {
 +	kcs_addr = <0xCA2>;
 +	status = "okay";
@@ -211,10 +242,6 @@ index 000000000000..e94a1473045f
 + *};
 + */
 +
-+&sgpio {
-+	status = "okay";
-+};
-+
 +&uart1 {
 +	status = "okay";
 +	pinctrl-names = "default";
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend
index 1ef28afb5..909e7cccc 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -5,5 +5,6 @@ SRC_URI += "file://intel-ast2500.cfg \
             file://0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch \
             file://0006-Allow-monitoring-of-power-control-input-GPIOs.patch \
             file://0001-aspeed-pwm-tacho-change-default-fan-speed.patch \
+            file://0001-Report-link-statistics-for-the-NCSI-channel.patch \
             "
 SRC_URI += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'file://0005-128MB-flashmap-for-PFR.patch', '', d)}"
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json
index 235e7965a..0e1848dd2 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json
@@ -1793,46 +1793,16 @@
             "Bus": 0,
             "CpuID": 1,
             "Name": "CPU 1",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Label": "DIMM",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 99
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "DIMM",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 89
-                }
-            ],
-            "Type": "XeonCPU"
+            "Type": "XeonCPU",
+            "UseWA": 1
         },
         {
             "Address": "0x31",
             "Bus": 0,
             "CpuID": 2,
             "Name": "CPU 2",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Label": "DIMM",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 99
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "DIMM",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 89
-                }
-            ],
-            "Type": "XeonCPU"
+            "Type": "XeonCPU",
+            "UseWA": 1
         }
     ],
     "Name": "TNP Baseboard",
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json
index 9431c30a6..5dcd316c3 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json
@@ -1120,8 +1120,8 @@
             "Address": "0x72",
             "Bus": 2,
             "ChannelNames": [
-                "PcieSlot1",
-                "PcieSlot2",
+                "Pcie_Slot_1",
+                "Pcie_Slot_2",
                 "",
                 "FruChannel"
             ],
@@ -1132,8 +1132,8 @@
             "Address": "0x73",
             "Bus": 2,
             "ChannelNames": [
-                "PcieSlot1",
-                "PcieSlot2",
+                "Pcie_Slot_1",
+                "Pcie_Slot_2",
                 "",
                 "FruChannel"
             ],
@@ -1156,10 +1156,10 @@
             "Address": "0x74",
             "Bus": 2,
             "ChannelNames": [
-                "PcieSlot1",
-                "PcieSlot2",
-                "PcieSlot3",
-                "PcieSlot4"
+                "Pcie_Slot_1",
+                "Pcie_Slot_2",
+                "Pcie_Slot_3",
+                "Pcie_Slot_4"
             ],
             "Name": "PCIE Mux",
             "Type": "PCA9546Mux"
@@ -1979,48 +1979,28 @@
             "Bus": 0,
             "CpuID": 1,
             "Name": "CPU 1",
-            "PresenceGpio": 232,
-            "Thresholds": [
+            "PresenceGpio": [
                 {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 99,
-                    "label": "DIMM"
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 89,
-                    "label": "DIMM"
+                    "Name": "CPU1_PRESENCE",
+                    "Polarity": "Low"
                 }
             ],
-            "Type": "XeonCPU"
+            "Type": "XeonCPU",
+            "UseWA": 1
         },
         {
             "Address": "0x31",
             "Bus": 0,
             "CpuID": 2,
             "Name": "CPU 2",
-            "PresenceGpio": 242,
-            "Thresholds": [
+            "PresenceGpio": [
                 {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 99,
-                    "label": "DIMM"
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 89,
-                    "label": "DIMM"
+                    "Name": "CPU2_PRESENCE",
+                    "Polarity": "Low"
                 }
             ],
-            "Type": "XeonCPU"
+            "Type": "XeonCPU",
+            "UseWA": 1
         }
     ],
     "Name": "WC Baseboard",
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json
index 7da6fe261..71a5540da 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json
@@ -1113,8 +1113,8 @@
             "Address": "0x72",
             "Bus": 2,
             "ChannelNames": [
-                "PcieSlot1",
-                "PcieSlot2",
+                "Pcie_Slot_1",
+                "Pcie_Slot_2",
                 "",
                 "FruChannel"
             ],
@@ -1125,8 +1125,8 @@
             "Address": "0x73",
             "Bus": 2,
             "ChannelNames": [
-                "PcieSlot1",
-                "PcieSlot2",
+                "Pcie_Slot_1",
+                "Pcie_Slot_2",
                 "",
                 "FruChannel"
             ],
@@ -1149,10 +1149,10 @@
             "Address": "0x74",
             "Bus": 2,
             "ChannelNames": [
-                "PcieSlot1",
-                "PcieSlot2",
-                "PcieSlot3",
-                "PcieSlot4"
+                "Pcie_Slot_1",
+                "Pcie_Slot_2",
+                "Pcie_Slot_3",
+                "Pcie_Slot_4"
             ],
             "Name": "PCIE Mux",
             "Type": "PCA9546Mux"
@@ -1972,48 +1972,28 @@
             "Bus": 0,
             "CpuID": 1,
             "Name": "CPU 1",
-            "PresenceGpio": 232,
-            "Thresholds": [
+            "PresenceGpio": [
                 {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 99,
-                    "label": "DIMM"
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 89,
-                    "label": "DIMM"
+                    "Name": "CPU1_PRESENCE",
+                    "Polarity": "Low"
                 }
             ],
-            "Type": "XeonCPU"
+            "Type": "XeonCPU",
+            "UseWA": 1
         },
         {
             "Address": "0x31",
             "Bus": 0,
             "CpuID": 2,
             "Name": "CPU 2",
-            "PresenceGpio": 242,
-            "Thresholds": [
+            "PresenceGpio": [
                 {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 99,
-                    "label": "DIMM"
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 89,
-                    "label": "DIMM"
+                    "Name": "CPU2_PRESENCE",
+                    "Polarity": "Low"
                 }
             ],
-            "Type": "XeonCPU"
+            "Type": "XeonCPU",
+            "UseWA": 1
         }
     ],
     "Name": "WP Baseboard",
@@ -2034,4 +2014,4 @@
         "AssetTag": "$PRODUCT_ASSET_TAG"
     },
     "xyz.openbmc_project.Inventory.Item.System": {}
-}
\ No newline at end of file
+}