Merge pull request #1305 from wghoffa/master
Witherspoon XML Patches for GPU Fixes
diff --git a/openpower/configs/witherspoon-redbud_defconfig b/openpower/configs/witherspoon-redbud_defconfig
index 806924e..c11c244 100644
--- a/openpower/configs/witherspoon-redbud_defconfig
+++ b/openpower/configs/witherspoon-redbud_defconfig
@@ -43,7 +43,7 @@
BR2_OPENPOWER_POWER9=y
BR2_HOSTBOOT_CONFIG_FILE="witherspoon.config"
BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="witherspoon-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="5575e7e1defd6441b885eb7169fc6d1276035e3c"
+BR2_OPENPOWER_MACHINE_XML_VERSION="d5a82f8e062236725b69c2648c8d6af85ce5448e"
BR2_OPENPOWER_MACHINE_XML_FILENAME="witherspoon.xml"
BR2_OPENPOWER_SYSTEM_XML_FILENAME="WITHERSPOON_hb.system.xml"
BR2_OPENPOWER_MRW_XML_FILENAME="WITHERSPOON_hb.mrw.xml"
diff --git a/openpower/configs/witherspoon-sequoia_defconfig b/openpower/configs/witherspoon-sequoia_defconfig
index 160ea7d..5847cc9 100644
--- a/openpower/configs/witherspoon-sequoia_defconfig
+++ b/openpower/configs/witherspoon-sequoia_defconfig
@@ -1,6 +1,7 @@
BR2_powerpc64le=y
BR2_powerpc_power8=y
BR2_GLIBC_VERSION_2_25=y
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/sequoia-patches"
BR2_BINUTILS_VERSION_2_28_X=y
BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
BR2_GCC_VERSION_6_X=y
@@ -42,7 +43,7 @@
BR2_OPENPOWER_POWER9=y
BR2_HOSTBOOT_CONFIG_FILE="witherspoon.config"
BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="witherspoon-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="5575e7e1defd6441b885eb7169fc6d1276035e3c"
+BR2_OPENPOWER_MACHINE_XML_VERSION="d5a82f8e062236725b69c2648c8d6af85ce5448e"
BR2_OPENPOWER_MACHINE_XML_FILENAME="witherspoon.xml"
BR2_OPENPOWER_SYSTEM_XML_FILENAME="WITHERSPOON_hb.system.xml"
BR2_OPENPOWER_MRW_XML_FILENAME="WITHERSPOON_hb.mrw.xml"
diff --git a/openpower/package/hostboot/p9Patches/hostboot-0001-Skip-Presence-Detect-in-HDAT-for-BMC-Type.patch b/openpower/package/hostboot/p9Patches/hostboot-0001-Skip-Presence-Detect-in-HDAT-for-BMC-Type.patch
new file mode 100644
index 0000000..7e34dfe
--- /dev/null
+++ b/openpower/package/hostboot/p9Patches/hostboot-0001-Skip-Presence-Detect-in-HDAT-for-BMC-Type.patch
@@ -0,0 +1,27 @@
+From d9da41e3a912a916c4063d0e3995ce71b260e288 Mon Sep 17 00:00:00 2001
+From: Bill Hoffa <wghoffa@us.ibm.com>
+Date: Tue, 8 Aug 2017 14:18:41 -0500
+Subject: [PATCH] Skip Presence Detect in HDAT for BMC Type
+
+Change-Id: Iba981eef5e6535458085b1750d25a8d11aa37200
+---
+ src/usr/hdat/hdathostslcadata.C | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/usr/hdat/hdathostslcadata.C b/src/usr/hdat/hdathostslcadata.C
+index d112659..4599eb7 100755
+--- a/src/usr/hdat/hdathostslcadata.C
++++ b/src/usr/hdat/hdathostslcadata.C
+@@ -94,7 +94,8 @@ bool getVPDCollectedStatus(TARGETING::Target *i_Target)
+ //@TODO: RTC 149382: Method to get VPD collected status for Targets
+
+ if((i_Target->getAttr<ATTR_TYPE>() != TYPE_PCI) &&
+- (i_Target->getAttr<ATTR_TYPE>() != TYPE_SYS))
++ (i_Target->getAttr<ATTR_TYPE>() != TYPE_SYS) &&
++ (i_Target->getAttr<ATTR_TYPE>() != TYPE_BMC))
+ {
+ l_vpdCollectedStatus = pvpdPresent(i_Target);
+ }
+--
+1.8.2.2
+
diff --git a/openpower/patches/redbud-patches/machine-xml/0001-Temporarily-Change-PLL-BUCKET-settings.patch b/openpower/patches/redbud-patches/machine-xml/0001-Temporarily-Change-PLL-BUCKET-settings.patch
new file mode 100644
index 0000000..63867ce
--- /dev/null
+++ b/openpower/patches/redbud-patches/machine-xml/0001-Temporarily-Change-PLL-BUCKET-settings.patch
@@ -0,0 +1,40 @@
+From fc91388ea139d6233484e1fefc606165861f517a Mon Sep 17 00:00:00 2001
+From: Bill Hoffa <wghoffa@us.ibm.com>
+Date: Tue, 8 Aug 2017 15:15:01 -0500
+Subject: [PATCH] Temporarily Change PLL BUCKET settings
+
+---
+ witherspoon.xml | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/witherspoon.xml b/witherspoon.xml
+index 103e865..1319c79 100644
+--- a/witherspoon.xml
++++ b/witherspoon.xml
+@@ -18641,19 +18641,19 @@
+ </attribute>
+ <attribute>
+ <id>OB0_PLL_BUCKET</id>
+- <default>1</default>
++ <default>0x02</default>
+ </attribute>
+ <attribute>
+ <id>OB1_PLL_BUCKET</id>
+- <default>1</default>
++ <default>0x02</default>
+ </attribute>
+ <attribute>
+ <id>OB2_PLL_BUCKET</id>
+- <default>1</default>
++ <default>0x02</default>
+ </attribute>
+ <attribute>
+ <id>OB3_PLL_BUCKET</id>
+- <default>1</default>
++ <default>0x02</default>
+ </attribute>
+ <attribute>
+ <id>OBUS_RATIO_VALUE</id>
+--
+1.8.2.2
+
diff --git a/openpower/patches/sequoia-patches/machine-xml/0001-Temporarily-Change-PLL-BUCKET-settings.patch b/openpower/patches/sequoia-patches/machine-xml/0001-Temporarily-Change-PLL-BUCKET-settings.patch
new file mode 100644
index 0000000..63867ce
--- /dev/null
+++ b/openpower/patches/sequoia-patches/machine-xml/0001-Temporarily-Change-PLL-BUCKET-settings.patch
@@ -0,0 +1,40 @@
+From fc91388ea139d6233484e1fefc606165861f517a Mon Sep 17 00:00:00 2001
+From: Bill Hoffa <wghoffa@us.ibm.com>
+Date: Tue, 8 Aug 2017 15:15:01 -0500
+Subject: [PATCH] Temporarily Change PLL BUCKET settings
+
+---
+ witherspoon.xml | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/witherspoon.xml b/witherspoon.xml
+index 103e865..1319c79 100644
+--- a/witherspoon.xml
++++ b/witherspoon.xml
+@@ -18641,19 +18641,19 @@
+ </attribute>
+ <attribute>
+ <id>OB0_PLL_BUCKET</id>
+- <default>1</default>
++ <default>0x02</default>
+ </attribute>
+ <attribute>
+ <id>OB1_PLL_BUCKET</id>
+- <default>1</default>
++ <default>0x02</default>
+ </attribute>
+ <attribute>
+ <id>OB2_PLL_BUCKET</id>
+- <default>1</default>
++ <default>0x02</default>
+ </attribute>
+ <attribute>
+ <id>OB3_PLL_BUCKET</id>
+- <default>1</default>
++ <default>0x02</default>
+ </attribute>
+ <attribute>
+ <id>OBUS_RATIO_VALUE</id>
+--
+1.8.2.2
+