Merge pull request #1855 from cvswen/revert_patch
Adding patch to revert Removed-pdwn-settings
Fixes xstop on loading nvidia driver on NVLink2 systems.
diff --git a/ci/Dockerfile/fedora25.x86_64 b/ci/Dockerfile/fedora25.x86_64
deleted file mode 120000
index c6db8fc..0000000
--- a/ci/Dockerfile/fedora25.x86_64
+++ /dev/null
@@ -1 +0,0 @@
-fedora25
\ No newline at end of file
diff --git a/ci/Dockerfile/fedora25 b/ci/Dockerfile/fedora27
similarity index 96%
rename from ci/Dockerfile/fedora25
rename to ci/Dockerfile/fedora27
index 433f948..ff77500 100644
--- a/ci/Dockerfile/fedora25
+++ b/ci/Dockerfile/fedora27
@@ -1,4 +1,4 @@
-FROM fedora:25
+FROM fedora:27
RUN dnf -y remove vim-minimal
RUN dnf -y install gcc-c++ flex bison git ctags cscope expat-devel patch zlib-devel zlib-static texinfo perl-bignum "perl(XML::Simple)" "perl(YAML)" "perl(XML::SAX)" "perl(Fatal)" "perl(Thread::Queue)" "perl(Env)" "perl(XML::LibXML)" "perl(Digest::SHA1)" libxml2-devel libxslt "perl(ExtUtils::MakeMaker)"
RUN dnf -y install which wget unzip tar cpio python bzip2 bc vim redhat-lsb-core
diff --git a/ci/Dockerfile/fedora27.x86_64 b/ci/Dockerfile/fedora27.x86_64
new file mode 120000
index 0000000..7c4b5e7
--- /dev/null
+++ b/ci/Dockerfile/fedora27.x86_64
@@ -0,0 +1 @@
+fedora27
\ No newline at end of file
diff --git a/ci/Dockerfile/ubuntu1404 b/ci/Dockerfile/ubuntu1404
deleted file mode 100644
index b3833c9..0000000
--- a/ci/Dockerfile/ubuntu1404
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM ubuntu:14.04
-# Don't ask. Ubuntu is awful.
-RUN sed -e 's/main$/main universe/' --in-place=orig /etc/apt/sources.list
-RUN DEBIAN_FRONTEND=noninteractive apt-get update
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -yy cscope ctags \
- libz-dev libexpat-dev \
- python language-pack-en texinfo \
- build-essential g++ git bison flex unzip \
- libxml-simple-perl libxml-sax-perl libxml2-dev libxml2-utils xsltproc
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -yy wget bc libssl-dev
diff --git a/ci/Dockerfile/ubuntu1404.ppc64le b/ci/Dockerfile/ubuntu1404.ppc64le
deleted file mode 120000
index 529a5fa..0000000
--- a/ci/Dockerfile/ubuntu1404.ppc64le
+++ /dev/null
@@ -1 +0,0 @@
-ubuntu1404
\ No newline at end of file
diff --git a/ci/Dockerfile/ubuntu1404.x86_64 b/ci/Dockerfile/ubuntu1404.x86_64
deleted file mode 120000
index 529a5fa..0000000
--- a/ci/Dockerfile/ubuntu1404.x86_64
+++ /dev/null
@@ -1 +0,0 @@
-ubuntu1404
\ No newline at end of file
diff --git a/ci/Dockerfile/ubuntu1604 b/ci/Dockerfile/ubuntu1604
new file mode 100644
index 0000000..46f6801
--- /dev/null
+++ b/ci/Dockerfile/ubuntu1604
@@ -0,0 +1,10 @@
+FROM ubuntu:16.04
+# Don't ask. Ubuntu is awful.
+RUN sed -e 's/main$/main universe/' --in-place=orig /etc/apt/sources.list
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yy cscope ctags \
+ libz-dev libexpat-dev \
+ python language-pack-en texinfo \
+ build-essential g++ git bison flex unzip \
+ cpio vim-common lsb-release \
+ libxml-simple-perl libxml-sax-perl libxml2-dev libxml2-utils xsltproc \
+ wget bc libssl-dev
diff --git a/ci/Dockerfile/ubuntu1604.ppc64le b/ci/Dockerfile/ubuntu1604.ppc64le
new file mode 120000
index 0000000..174b820
--- /dev/null
+++ b/ci/Dockerfile/ubuntu1604.ppc64le
@@ -0,0 +1 @@
+ubuntu1604
\ No newline at end of file
diff --git a/ci/Dockerfile/ubuntu1604.x86_64 b/ci/Dockerfile/ubuntu1604.x86_64
new file mode 120000
index 0000000..174b820
--- /dev/null
+++ b/ci/Dockerfile/ubuntu1604.x86_64
@@ -0,0 +1 @@
+ubuntu1604
\ No newline at end of file
diff --git a/ci/build.sh b/ci/build.sh
index 0ace0e1..4e45262 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-CONTAINERS="ubuntu1404 fedora25"
+CONTAINERS="ubuntu1604 fedora27"
while getopts ":ahp:c:" opt; do
case $opt in
@@ -64,21 +64,27 @@
fi
if [[ -n "$HTTP_PROXY" ]]; then
http_proxy=$HTTP_PROXY
+ HTTP_PROXY_ENV="ENV http_proxy $HTTP_PROXY"
+ fi
+ if [[ -n "$HTTPS_PROXY" ]]; then
+ https_proxy=$HTTPS_PROXY
+ HTTPS_PROXY_ENV="ENV https_proxy $HTTPS_PROXY"
fi
if [[ -n "$http_proxy" ]]; then
- if [[ "$distro" == fedora25 ]]; then
+ if [[ "$distro" == fedora27 ]]; then
PROXY="RUN echo \"proxy=${http_proxy}\" >> /etc/dnf/dnf.conf"
fi
- if [[ "$distro" == ubuntu1404 ]]; then
+ if [[ "$distro" == ubuntu1604 ]]; then
PROXY="RUN echo \"Acquire::http::Proxy \\"\"${http_proxy}/\\"\";\" > /etc/apt/apt.conf.d/000apt-cacher-ng-proxy"
fi
fi
Dockerfile=$(head -n1 $base_dockerfile; echo ${PROXY}; tail -n +2 $base_dockerfile; cat << EOF
-RUN groupadd -g ${GROUPS} ${USER} && useradd -d ${HOME} -m -u ${UID} -g ${GROUPS} ${USER}
${PROXY}
-USER ${USER}
+RUN useradd -d ${HOME} -m -u ${UID} ${USER}
ENV HOME ${HOME}
+${HTTP_PROXY_ENV}
+${HTTPS_PROXY_ENV}
EOF
)
$DOCKER_PREFIX docker build -t openpower/op-build-$distro - <<< "${Dockerfile}"
diff --git a/openpower/configs/hostboot/romulus.config b/openpower/configs/hostboot/romulus.config
old mode 100755
new mode 100644
index f41ec16..6e03400
--- a/openpower/configs/hostboot/romulus.config
+++ b/openpower/configs/hostboot/romulus.config
@@ -44,25 +44,30 @@
set CONSOLE
set BMC_AST2500
-set DISABLE_HOSTBOOT_RUNTIME
+unset DISABLE_HOSTBOOT_RUNTIME
# Compile in hostboot runtime PRD
set HBRT_PRD
+
+# Compile in hb rt HTMGT : Load/Start OCC
set HTMGT
set START_OCC_DURING_BOOT
+unset CONSOLE_OUTPUT_OCC_COMM
#PNOR flags
unset PNOR_TWO_SIDE_SUPPORT
set BMC_BT_LPC_IPMI
-# Enable Checktop Analysis
-unset ENABLE_CHECKSTOP_ANALYSIS
-unset IPLTIME_CHECKSTOP_ANALYSIS
+# Enable IPLtime + Runtime Checktop Analysis
+set ENABLE_CHECKSTOP_ANALYSIS
+set IPLTIME_CHECKSTOP_ANALYSIS
# set for trace debug to console
unset CONSOLE_OUTPUT_TRACE
+set CONSOLE_OUTPUT_FFDCDISPLAY
-unset CONFIG_SECUREBOOT
-unset CONFIG_TPMDD
-unset CONFIG_TPM_NUVOTON
+
+unset SECUREBOOT
+unset TPMDD
+unset TPM_NUVOTON
diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig
index 902f859..9e1b708 100644
--- a/openpower/configs/zaius_defconfig
+++ b/openpower/configs/zaius_defconfig
@@ -1,5 +1,6 @@
BR2_powerpc64le=y
BR2_powerpc_power8=y
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/zaius-patches"
BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
BR2_TOOLCHAIN_BUILDROOT_CXX=y
diff --git a/openpower/package/capp-ucode/capp-ucode.mk b/openpower/package/capp-ucode/capp-ucode.mk
index ed41f02..5272d35 100644
--- a/openpower/package/capp-ucode/capp-ucode.mk
+++ b/openpower/package/capp-ucode/capp-ucode.mk
@@ -3,7 +3,7 @@
# capp-ucode.mk
#
################################################################################
-CAPP_UCODE_VERSION ?= p9-dd2-v2
+CAPP_UCODE_VERSION ?= p9-dd2-v3
CAPP_UCODE_SITE ?= $(call github,open-power,capp-ucode,$(CAPP_UCODE_VERSION))
CAPP_UCODE_LICENSE = Apache-2.0
CAPP_UCODE_LICENSE_FILES = NOTICES
diff --git a/openpower/package/hostboot-binaries/hostboot_binaries.mk b/openpower/package/hostboot-binaries/hostboot_binaries.mk
index 2e072e6..ed21f5c 100644
--- a/openpower/package/hostboot-binaries/hostboot_binaries.mk
+++ b/openpower/package/hostboot-binaries/hostboot_binaries.mk
@@ -5,7 +5,7 @@
################################################################################
-HOSTBOOT_BINARIES_VERSION ?= 6924d6b711ba7b1d4c47346c9a8dff88cfaaf4c8
+HOSTBOOT_BINARIES_VERSION ?= 134d61bcf3f2183c69793a3b9475d3ae80a6deae
HOSTBOOT_BINARIES_SITE ?= $(call github,open-power,hostboot-binaries,$(HOSTBOOT_BINARIES_VERSION))
HOSTBOOT_BINARIES_LICENSE = Apache-2.0
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index 9835958..5116078 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -4,7 +4,7 @@
#
################################################################################
HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= d3025f5d7ddd0723946bb54fcb471d2bf1fd2da4
-HOSTBOOT_VERSION_BRANCH_MASTER ?= 9bfb2013af399c316891e005ca0fb8b417deffb3
+HOSTBOOT_VERSION_BRANCH_MASTER ?= de8120523a0cf74b2c682b1f8723b99cb0388a4e
HOSTBOOT_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(HOSTBOOT_VERSION_BRANCH_MASTER),$(HOSTBOOT_VERSION_BRANCH_MASTER_P8))
HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION))
diff --git a/openpower/package/occ/occ.mk b/openpower/package/occ/occ.mk
index a1af1a8..a497c94 100644
--- a/openpower/package/occ/occ.mk
+++ b/openpower/package/occ/occ.mk
@@ -5,7 +5,7 @@
################################################################################
OCC_VERSION_BRANCH_MASTER_P8 ?= 28f2cec690b7f19548ce860a8820f519e6c39a6a
-OCC_VERSION_BRANCH_MASTER ?= 577915f28604090d3b9a16e7a5a109d3afff87f9
+OCC_VERSION_BRANCH_MASTER ?= f72f857b7e5ab25a5616b1655005b963405eb350
OCC_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_VERSION_BRANCH_MASTER),$(OCC_VERSION_BRANCH_MASTER_P8))
OCC_SITE ?= $(call github,open-power,occ,$(OCC_VERSION))
diff --git a/openpower/package/sbe/sbe.mk b/openpower/package/sbe/sbe.mk
index 8df1e47..9c23b08 100644
--- a/openpower/package/sbe/sbe.mk
+++ b/openpower/package/sbe/sbe.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SBE_VERSION ?= 095e608c7f68eeac89d277da09b48ffa71b49230
+SBE_VERSION ?= 1f773f1f298361bc64ebd97859a997e400e4442d
SBE_SITE ?= $(call github,open-power,sbe,$(SBE_VERSION))
SBE_LICENSE = Apache-2.0
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index 705e97f..dbbc77a 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -31,7 +31,7 @@
config BR2_SKIBOOT_VERSION
string
- default "v5.10-rc1" if BR2_SKIBOOT_LATEST_VERSION
+ default "v5.10-rc2" if BR2_SKIBOOT_LATEST_VERSION
default BR2_SKIBOOT_CUSTOM_VERSION_VALUE \
if BR2_SKIBOOT_CUSTOM_VERSION
diff --git a/openpower/patches/zaius-patches/machine-xml/0001-Update-EREPAIR-attributes.patch b/openpower/patches/zaius-patches/machine-xml/0001-Update-EREPAIR-attributes.patch
new file mode 100644
index 0000000..0f352ae
--- /dev/null
+++ b/openpower/patches/zaius-patches/machine-xml/0001-Update-EREPAIR-attributes.patch
@@ -0,0 +1,59 @@
+From b2391175e61b3d1bd7e5fdba719d7fd2925fdbed Mon Sep 17 00:00:00 2001
+From: Adrian Barrera <abarrera@us.ibm.com>
+Date: Tue, 6 Feb 2018 18:38:21 -0600
+Subject: [PATCH 1/2] Update EREPAIR attributes
+
+---
+ zaius.xml | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/zaius.xml b/zaius.xml
+index 3b9f54a884d4..df1f4dfcd2d0 100644
+--- a/zaius.xml
++++ b/zaius.xml
+@@ -8972,11 +8972,11 @@
+ </attribute>
+ <attribute>
+ <id>DMI_EREPAIR_THRESHOLD_FIELD</id>
+- <default></default>
++ <default>0x1</default>
+ </attribute>
+ <attribute>
+ <id>DMI_EREPAIR_THRESHOLD_MNFG</id>
+- <default></default>
++ <default>0x0</default>
+ </attribute>
+ <attribute>
+ <id>DO_ABUS_DECONFIG</id>
+@@ -9932,6 +9932,14 @@
+ <id>OS_IPL_MODE</id>
+ <default></default>
+ </attribute>
++ <attribute>
++ <id>O_EREPAIR_THRESHOLD_FIELD</id>
++ <default>0x1</default>
++ </attribute>
++ <attribute>
++ <id>O_EREPAIR_THRESHOLD_MNFG</id>
++ <default>0x0</default>
++ </attribute>
+ <attribute>
+ <id>PAYLOAD_BASE</id>
+ <default>0</default>
+@@ -10543,11 +10551,11 @@
+ </attribute>
+ <attribute>
+ <id>X_EREPAIR_THRESHOLD_FIELD</id>
+- <default></default>
++ <default>0x1</default>
+ </attribute>
+ <attribute>
+ <id>X_EREPAIR_THRESHOLD_MNFG</id>
+- <default></default>
++ <default>0x0</default>
+ </attribute>
+ <attribute>
+ <id>power-def-filenames</id>
+--
+2.14.3
+
diff --git a/openpower/patches/zaius-patches/machine-xml/0002-Update-Obus-PLL-bucket-to-25G.patch b/openpower/patches/zaius-patches/machine-xml/0002-Update-Obus-PLL-bucket-to-25G.patch
new file mode 100644
index 0000000..58b69af
--- /dev/null
+++ b/openpower/patches/zaius-patches/machine-xml/0002-Update-Obus-PLL-bucket-to-25G.patch
@@ -0,0 +1,40 @@
+From d3a35441092c3616e69a2e3c81c0e2f1f5df96ed Mon Sep 17 00:00:00 2001
+From: Adrian Barrera <abarrera@us.ibm.com>
+Date: Fri, 9 Feb 2018 15:23:55 -0600
+Subject: [PATCH 2/2] Update Obus PLL bucket to 25G
+
+---
+ zaius.xml | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/zaius.xml b/zaius.xml
+index df1f4dfcd2d0..9929e8b9f5a4 100644
+--- a/zaius.xml
++++ b/zaius.xml
+@@ -14407,19 +14407,19 @@
+ </attribute>
+ <attribute>
+ <id>OB0_PLL_BUCKET</id>
+- <default>2</default>
++ <default>1</default>
+ </attribute>
+ <attribute>
+ <id>OB1_PLL_BUCKET</id>
+- <default>2</default>
++ <default>1</default>
+ </attribute>
+ <attribute>
+ <id>OB2_PLL_BUCKET</id>
+- <default>2</default>
++ <default>1</default>
+ </attribute>
+ <attribute>
+ <id>OB3_PLL_BUCKET</id>
+- <default>2</default>
++ <default>1</default>
+ </attribute>
+ <attribute>
+ <id>OBUS_RATIO_VALUE</id>
+--
+2.14.3
+