Merge pull request #1312 from e-liner/memd_base
Base MEMD changes
diff --git a/openpower/configs/barreleye_defconfig b/openpower/configs/barreleye_defconfig
index 7c7760e..0e86241 100644
--- a/openpower/configs/barreleye_defconfig
+++ b/openpower/configs/barreleye_defconfig
@@ -16,7 +16,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.5"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/firenze_defconfig b/openpower/configs/firenze_defconfig
index a020849..b1063d2 100644
--- a/openpower/configs/firenze_defconfig
+++ b/openpower/configs/firenze_defconfig
@@ -15,7 +15,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.5"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig
index 5804091..e273945 100644
--- a/openpower/configs/firestone_defconfig
+++ b/openpower/configs/firestone_defconfig
@@ -16,7 +16,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.5"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig
index 0fc49d6..eb9f6db 100644
--- a/openpower/configs/garrison_defconfig
+++ b/openpower/configs/garrison_defconfig
@@ -16,7 +16,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.5"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig
index 8bf21c4..bdfb2e6 100644
--- a/openpower/configs/habanero_defconfig
+++ b/openpower/configs/habanero_defconfig
@@ -17,7 +17,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.5"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/openpower_mambo_defconfig b/openpower/configs/openpower_mambo_defconfig
index 5f2766a..4baffbb 100644
--- a/openpower/configs/openpower_mambo_defconfig
+++ b/openpower/configs/openpower_mambo_defconfig
@@ -14,7 +14,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.5"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/openpower_p9_mambo_defconfig b/openpower/configs/openpower_p9_mambo_defconfig
index 2d1b180..c7d9134 100644
--- a/openpower/configs/openpower_p9_mambo_defconfig
+++ b/openpower/configs/openpower_p9_mambo_defconfig
@@ -14,7 +14,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.5"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/p9dsu_defconfig b/openpower/configs/p9dsu_defconfig
index bf75c55..47d319a 100644
--- a/openpower/configs/p9dsu_defconfig
+++ b/openpower/configs/p9dsu_defconfig
@@ -16,7 +16,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.5"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_p9_defconfig"
diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig
index 987c343..d622f54 100644
--- a/openpower/configs/palmetto_defconfig
+++ b/openpower/configs/palmetto_defconfig
@@ -16,7 +16,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.5"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/pseries_defconfig b/openpower/configs/pseries_defconfig
index 7241c45..d609996 100644
--- a/openpower/configs/pseries_defconfig
+++ b/openpower/configs/pseries_defconfig
@@ -15,7 +15,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.5"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/pseries_skiroot_defconfig"
diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig
index 5bc88fb..8258167 100644
--- a/openpower/configs/romulus_defconfig
+++ b/openpower/configs/romulus_defconfig
@@ -16,7 +16,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.5"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_p9_defconfig"
@@ -42,7 +42,7 @@
BR2_OPENPOWER_POWER9=y
BR2_HOSTBOOT_CONFIG_FILE="romulus.config"
BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="romulus-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="4a9a504238c6cb965c1288ace63b938fa23fe6ba"
+BR2_OPENPOWER_MACHINE_XML_VERSION="01469bcb75751ce0b02468fbef0c392006ea7ba1"
BR2_OPENPOWER_MACHINE_XML_FILENAME="romulus.xml"
BR2_OPENPOWER_SYSTEM_XML_FILENAME="ROMULUS_hb.system.xml"
BR2_OPENPOWER_MRW_XML_FILENAME="ROMULUS_hb.mrw.xml"
diff --git a/openpower/configs/witherspoon-redbud_defconfig b/openpower/configs/witherspoon-redbud_defconfig
index 98ce74d..c11c244 100644
--- a/openpower/configs/witherspoon-redbud_defconfig
+++ b/openpower/configs/witherspoon-redbud_defconfig
@@ -17,7 +17,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.5"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_p9_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 a15c2b3..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
@@ -16,7 +17,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.5"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_p9_defconfig"
@@ -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/configs/zaius_defconfig b/openpower/configs/zaius_defconfig
index 8ecc40a..8d78330 100644
--- a/openpower/configs/zaius_defconfig
+++ b/openpower/configs/zaius_defconfig
@@ -16,7 +16,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.5"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_p9_defconfig"
diff --git a/openpower/configs/zz_defconfig b/openpower/configs/zz_defconfig
index bd6994a..ebef5b8 100644
--- a/openpower/configs/zz_defconfig
+++ b/openpower/configs/zz_defconfig
@@ -15,7 +15,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.5"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_p9_defconfig"
diff --git a/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch b/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
index 1050749..4a93f43 100644
--- a/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
+++ b/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
@@ -10,10 +10,10 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
-index 0965bae95a7b..0124e353cc0d 100644
+index 1ef622ededfd..77f0f83a869c 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
-@@ -488,7 +488,7 @@ static struct pci_driver xhci_pci_driver = {
+@@ -494,7 +494,7 @@ static struct pci_driver xhci_pci_driver = {
.remove = xhci_pci_remove,
/* suspend and resume implemented later */
diff --git a/openpower/linux/0002-Release-OpenPower-kernel.patch b/openpower/linux/0002-Release-OpenPower-kernel.patch
index 16caf13..806396a 100644
--- a/openpower/linux/0002-Release-OpenPower-kernel.patch
+++ b/openpower/linux/0002-Release-OpenPower-kernel.patch
@@ -9,13 +9,13 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index f5bbee480317..e05cc38a2137 100644
+index 382e967b0792..832de374937a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 4
PATCHLEVEL = 12
- SUBLEVEL = 3
+ SUBLEVEL = 5
-EXTRAVERSION =
+EXTRAVERSION = -openpower1
NAME = Fearless Coyote
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/package/sbe/sbe-0001-Restore-backward-compatibilty-of-SBE-image-with-HB-H.patch b/openpower/package/sbe/sbe-0001-Restore-backward-compatibilty-of-SBE-image-with-HB-H.patch
deleted file mode 100644
index da51587..0000000
--- a/openpower/package/sbe/sbe-0001-Restore-backward-compatibilty-of-SBE-image-with-HB-H.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From bee7283419489e911b3e2f44ca96bf1ac12264e5 Mon Sep 17 00:00:00 2001
-From: Sachin Gupta <sgupta2m@in.ibm.com>
-Date: Thu, 6 Jul 2017 12:33:32 -0500
-Subject: [PATCH] Restore backward compatibilty of SBE image with HB/HWSV
-
-Change-Id: I2eba38a5d5a254c9595ee49e56f65b6c7ded67a6
-Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42819
-Reviewed-by: Dean Sanner <dsanner@us.ibm.com>
-Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
-Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
-Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
-Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42822
-Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
----
- .../p9/procedures/hwp/perv/p9_sbe_attr_setup.C | 24 ++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
-diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.C
-index 03f1530..bf7b129 100644
---- a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.C
-+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.C
-@@ -233,6 +233,30 @@ fapi2::ReturnCode p9_sbe_attr_setup(const
- l_read_scratch_reg.extractToRight<ATTR_OB2_PLL_BUCKET_STARTBIT, ATTR_OB2_PLL_BUCKET_LENGTH>(l_ob2_pll_bucket);
- l_read_scratch_reg.extractToRight<ATTR_OB3_PLL_BUCKET_STARTBIT, ATTR_OB3_PLL_BUCKET_LENGTH>(l_ob3_pll_bucket);
-
-+ // Workaround to handle backward compatibilty
-+ // Old drivers will keep MBX OBUS PLL bucket value as zero. So
-+ // change it to 1 to make old drivers compatible with new SBE
-+ // image
-+ if( 0 == l_ob0_pll_bucket )
-+ {
-+ l_ob0_pll_bucket = 1;
-+ }
-+
-+ if( 0 == l_ob1_pll_bucket )
-+ {
-+ l_ob1_pll_bucket = 1;
-+ }
-+
-+ if( 0 == l_ob2_pll_bucket )
-+ {
-+ l_ob2_pll_bucket = 1;
-+ }
-+
-+ if( 0 == l_ob3_pll_bucket )
-+ {
-+ l_ob3_pll_bucket = 1;
-+ }
-+
- FAPI_DBG("Setting up ATTR_I2C_BUS_DIV_REF");
- FAPI_TRY(FAPI_ATTR_SET(fapi2::ATTR_I2C_BUS_DIV_REF, i_target_chip, l_read_4));
-
---
-1.8.2.2
-
diff --git a/openpower/package/sbe/sbe.mk b/openpower/package/sbe/sbe.mk
index 5d82c66..aa45863 100644
--- a/openpower/package/sbe/sbe.mk
+++ b/openpower/package/sbe/sbe.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SBE_VERSION ?= 02021c69d7d55b09718050265a1813d7806c0f01
+SBE_VERSION ?= bcb079b1fcdb76c08d7c7a7bff736d0626ee3456
SBE_SITE ?= $(call github,open-power,sbe,$(SBE_VERSION))
SBE_LICENSE = Apache-2.0
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
+