Merge pull request #136 from brihh/master
create 32M habanero_update.pnor image for HPM updates
diff --git a/openpower/configs/hostboot/firestone.config b/openpower/configs/hostboot/firestone.config
index 6684dd6..efd44cc 100755
--- a/openpower/configs/hostboot/firestone.config
+++ b/openpower/configs/hostboot/firestone.config
@@ -7,13 +7,19 @@
# VPD options.
set MVPD_READ_FROM_HW
-unset MVPD_READ_FROM_PNOR
+set MVPD_WRITE_TO_HW
+set MVPD_READ_FROM_PNOR
+set MVPD_WRITE_FROM_PNOR
set DJVPD_READ_FROM_HW
-unset DJVPD_READ_FROM_PNOR
+set DJVPD_WRITE_TO_HW
+set DJVPD_READ_FROM_PNOR
+set DJVPD_WRITE_TO_PNOR
set CVPD_READ_FROM_HW
-#set CVPD_WRITE_TO_HW
-unset CVPD_READ_FROM_PNOR
+set CVPD_WRITE_TO_HW
+set CVPD_READ_FROM_PNOR
+set CVPD_WRITE_TO_PNOR
set SKIP_RESTRICT_EX_UNITS
+unset CDIMM_FORMAT_FOR_CVPD
# gpio config
set GPIODD
diff --git a/openpower/configs/linux/skiroot_defconfig b/openpower/configs/linux/skiroot_defconfig
index e54be62..78a02c0 100644
--- a/openpower/configs/linux/skiroot_defconfig
+++ b/openpower/configs/linux/skiroot_defconfig
@@ -29,6 +29,7 @@
CONFIG_MODULE_UNLOAD=y
CONFIG_PARTITION_ADVANCED=y
# CONFIG_PPC_PMAC is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
CONFIG_HZ_100=y
CONFIG_KEXEC=y
CONFIG_IRQ_ALL_CPUS=y
diff --git a/openpower/package/VERSION.readme b/openpower/package/VERSION.readme
index 59fec86..b9b43bb 100644
--- a/openpower/package/VERSION.readme
+++ b/openpower/package/VERSION.readme
@@ -13,12 +13,18 @@
## Op-build Commands ##
- # Display package version
+ # Display subpackage version
op-build $(package)-version
- # Force a rebuild of a package version
+ # Display entire pnor version
+ op-build openpower-pnor-version
+
+ # Force a rebuild of a subpackage version
op-build $(package)-build-version
+ # Force a rebuild of all subpackage versions
+ op-build openpower-pnor-build-version-all
+
## Version String (ASCII) ##
General:
diff --git a/openpower/package/firestone-xml/firestone.mk b/openpower/package/firestone-xml/firestone.mk
index aa77e03..600c285 100644
--- a/openpower/package/firestone-xml/firestone.mk
+++ b/openpower/package/firestone-xml/firestone.mk
@@ -4,7 +4,7 @@
#
################################################################################
-FIRESTONE_XML_VERSION ?= 8023db709f2ed5ee4c481fcb7eff68a30248e0ae
+FIRESTONE_XML_VERSION ?= 3383b31643c225f7bcecc8ce08dcbb6803f3e058
FIRESTONE_XML_SITE ?= $(call github,open-power,firestone-xml,$(FIRESTONE_XML_VERSION))
FIRESTONE_XML_LICENSE = Apache-2.0
diff --git a/openpower/package/hostboot/hostboot-0019-Fix-TX_MSBSWAP-attribute-for-Firestone.patch b/openpower/package/hostboot/hostboot-0019-Fix-TX_MSBSWAP-attribute-for-Firestone.patch
new file mode 100644
index 0000000..fbdfbda
--- /dev/null
+++ b/openpower/package/hostboot/hostboot-0019-Fix-TX_MSBSWAP-attribute-for-Firestone.patch
@@ -0,0 +1,102 @@
+From 42ad0709dfe4c053498660fe9bc884126082c2d6 Mon Sep 17 00:00:00 2001
+From: Norman James <njames@us.ibm.com>
+Date: Tue, 17 Mar 2015 23:49:24 -0500
+Subject: [PATCH] Serverwiz2: TX_MSBSWAP and PEER_PATH fix
+
+Change-Id: I733f9c09837482469365b4de533f3560d049d0a6
+---
+ src/usr/targeting/common/Targets.pm | 7 +++++++
+ src/usr/targeting/common/processMrw.pl | 29 ++++++++++++++++-------------
+ 2 files changed, 23 insertions(+), 13 deletions(-)
+
+diff --git a/src/usr/targeting/common/Targets.pm b/src/usr/targeting/common/Targets.pm
+index 29f6bcb..ea5ffde 100644
+--- a/src/usr/targeting/common/Targets.pm
++++ b/src/usr/targeting/common/Targets.pm
+@@ -338,8 +338,15 @@ sub buildHierarchy
+ {
+ foreach my $b (@{ $target_xml->{bus} })
+ {
++ if (ref($b->{dest_path}) eq "HASH") {
++ $b->{dest_path}="";
++ }
++ if (ref($b->{source_path}) eq "HASH") {
++ $b->{source_path}="";
++ }
+ my $source_target =
+ $key . "/" . $b->{source_path} . $b->{source_target};
++
+ my $dest_target = $key . "/" . $b->{dest_path} . $b->{dest_target};
+ my $bus_type = $b->{bus_type};
+ push(
+diff --git a/src/usr/targeting/common/processMrw.pl b/src/usr/targeting/common/processMrw.pl
+index 691cbcb..7133534 100644
+--- a/src/usr/targeting/common/processMrw.pl
++++ b/src/usr/targeting/common/processMrw.pl
+@@ -667,11 +667,15 @@ sub processAbus
+ my $target = shift;
+
+ my $found_abus = 0;
+- $targetObj->setAttribute($target, "PEER_PATH","physical:na");
+- $targetObj->setAttribute($target, "EI_BUS_TX_LANE_INVERT","0");
+- $targetObj->setAttribute($target, "EI_BUS_TX_MSBSWAP","0");
+- # $targetObj->setAttribute($target, "PEER_TARGET","");
+-
++ if ($targetObj->isBadAttribute($target, "PEER_PATH"))
++ {
++ $targetObj->setAttribute($target, "PEER_PATH","physical:na");
++ }
++ $targetObj->setAttribute($target, "EI_BUS_TX_LANE_INVERT","0");
++ if ($targetObj->isBadAttribute($target, "EI_BUS_TX_MSBSWAP"))
++ {
++ $targetObj->setAttribute($target, "EI_BUS_TX_MSBSWAP","0");
++ }
+ my $abus_child_conn = $targetObj->getFirstConnectionDestination($target);
+ if ($abus_child_conn ne "")
+ {
+@@ -787,12 +791,12 @@ sub processPcie
+
+ #iop_swap{iop}{clk swap}{clk group reversal}
+ $iop_swap{0}{0}{'00'}=$t[0];
+- $iop_swap{0}{0}{'01'}=$t[1];
+- $iop_swap{0}{0}{'10'}=$t[2];
++ $iop_swap{0}{0}{'10'}=$t[1];
++ $iop_swap{0}{0}{'01'}=$t[2];
+ $iop_swap{0}{0}{'11'}=$t[3];
+ $iop_swap{0}{1}{'00'}=$t[4];
+- $iop_swap{0}{1}{'01'}=$t[5];
+- $iop_swap{0}{1}{'10'}=$t[6];
++ $iop_swap{0}{1}{'10'}=$t[5];
++ $iop_swap{0}{1}{'01'}=$t[6];
+ $iop_swap{0}{1}{'11'}=$t[7];
+
+ $iop_swap{1}{0}{'00'}=$t[8];
+@@ -800,8 +804,8 @@ sub processPcie
+ $iop_swap{1}{0}{'10'}=$t[10];
+ $iop_swap{1}{0}{'11'}=$t[11];
+ $iop_swap{1}{1}{'00'}=$t[12];
+- $iop_swap{1}{1}{'01'}=$t[13];
+- $iop_swap{1}{1}{'10'}=$t[14];
++ $iop_swap{1}{1}{'10'}=$t[13];
++ $iop_swap{1}{1}{'01'}=$t[14];
+ $iop_swap{1}{1}{'11'}=$t[15];
+
+ my @lane_eq;
+@@ -958,13 +962,12 @@ sub processMembufVpdAssociation
+ {
+ my $targetObj = shift;
+ my $target = shift;
+-
+ my $vpds=$targetObj->findConnections($target,"I2C","VPD");
+ if ($vpds ne "" ) {
+ my $vpd = $vpds->{CONN}->[0];
+-
+ my $membuf_assocs=$targetObj->findConnections($vpd->{DEST_PARENT},
+ "LOGICAL_ASSOCIATION","MEMBUF");
++
+ if ($membuf_assocs ne "") {
+ foreach my $membuf_assoc (@{$membuf_assocs->{CONN}}) {
+ my $membuf_target = $membuf_assoc->{DEST_PARENT};
+--
+1.8.2.2
+
diff --git a/openpower/package/hostboot/hostboot-0020-Move-slave-sbe-start-before-proc-cen-ref-clk-enable.patch b/openpower/package/hostboot/hostboot-0020-Move-slave-sbe-start-before-proc-cen-ref-clk-enable.patch
new file mode 100644
index 0000000..06e4730
--- /dev/null
+++ b/openpower/package/hostboot/hostboot-0020-Move-slave-sbe-start-before-proc-cen-ref-clk-enable.patch
@@ -0,0 +1,60 @@
+From d6882c71233b9c4b2fb801c4f3e588b47c2c73bc Mon Sep 17 00:00:00 2001
+From: Dan Crowell <dcrowell@us.ibm.com>
+Date: Wed, 1 Apr 2015 11:07:42 -0500
+Subject: [PATCH] Move slave sbe start before proc_cen_ref_clk_enable
+
+The proc_cen_ref_clk_enable step contains scoms to the processor
+that do not work if the proc hasn't run through its sbe code yet.
+
+Change-Id: I7665992a01bd66a37cd5e79aa2bb2142a304a8f4
+---
+ src/include/usr/isteps/istep06list.H | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/include/usr/isteps/istep06list.H b/src/include/usr/isteps/istep06list.H
+index 6adb784..6a26b2a 100644
+--- a/src/include/usr/isteps/istep06list.H
++++ b/src/include/usr/isteps/istep06list.H
+@@ -68,12 +68,12 @@ namespace INITSERVICE
+ * : Clear deconfigured states
+ * 06.8 proc_revert_sbe_mcs_setup
+ * : Clean up MCS extent regs
+- * 06.9 proc_cen_ref_clk_enable
+- * : Setup centaur ref clocks
+- * 06.10 host_slave_sbe_config
++ * 06.10 host_slave_sbe_config
+ * 06.11 host_sbe_start
+ * 06.12 proc_check_slave_sbe_seeprom_complete
+ * : Check Slave SBE Complete
++ * 06.9 proc_cen_ref_clk_enable
++ * : Setup centaur ref clocks
+ * 06.13 proc_xmit_sbe
+ * : vSBE Init of Slave Chips
+ *
+@@ -127,11 +127,6 @@ const TaskInfo g_istep06[] = {
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+ },
+ {
+- ISTEPNAME(06,09,"proc_cen_ref_clk_enable"),
+- SLAVE_SBE::call_proc_cen_ref_clk_enable,
+- { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+- },
+- {
+ ISTEPNAME(06,10,"host_slave_sbe_config"),
+ SLAVE_SBE::call_host_slave_sbe_config,
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+@@ -147,6 +142,11 @@ const TaskInfo g_istep06[] = {
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
+ },
+ {
++ ISTEPNAME(06,09,"proc_cen_ref_clk_enable"),
++ SLAVE_SBE::call_proc_cen_ref_clk_enable,
++ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
++ },
++ {
+ ISTEPNAME(06,13,"proc_xmit_sbe"),
+ SLAVE_SBE::call_proc_xmit_sbe,
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+--
+1.8.2.2
+
diff --git a/openpower/package/hostboot/hostboot-0021-Fix-more-than-2-PT-keywords-in-MVPD-VTOC.patch b/openpower/package/hostboot/hostboot-0021-Fix-more-than-2-PT-keywords-in-MVPD-VTOC.patch
new file mode 100644
index 0000000..2e8a811
--- /dev/null
+++ b/openpower/package/hostboot/hostboot-0021-Fix-more-than-2-PT-keywords-in-MVPD-VTOC.patch
@@ -0,0 +1,26 @@
+From d64701a8932f53511485f23b8acfb9c564b72297 Mon Sep 17 00:00:00 2001
+From: Matt Ploetz <maploetz@us.ibm.com>
+Date: Wed, 15 Apr 2015 14:51:11 -0500
+Subject: [PATCH] Fix for firestone vpd cache
+
+Change-Id: Ica112e3d5d131b0171b7b54d85a3810582a08e27
+---
+ src/usr/vpd/ipvpd.C | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/usr/vpd/ipvpd.C b/src/usr/vpd/ipvpd.C
+index b409c50..3738c61 100644
+--- a/src/usr/vpd/ipvpd.C
++++ b/src/usr/vpd/ipvpd.C
+@@ -1333,7 +1333,7 @@ IpVpdFacade::getRecordListSeeprom ( std::list<TocPtRecord> & o_recList,
+ offset = le16toh( toc_rec->record_offset ) + 1; // skip 'large resource'
+
+ // Read the PT keyword(s) from the VTOC
+- for (uint16_t index = 0; index < 2; ++index)
++ for (uint16_t index = 0; index < 3; ++index)
+ {
+ pt_len = sizeof(l_buffer);
+ err = retrieveKeyword( "PT",
+--
+1.8.2.2
+
diff --git a/openpower/package/occ/occ.mk b/openpower/package/occ/occ.mk
index 5f601bf..d6f09a3 100644
--- a/openpower/package/occ/occ.mk
+++ b/openpower/package/occ/occ.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OCC_VERSION ?= cc8376d863afd715ea13346d5841610a9fad1bd2
+OCC_VERSION ?= 3ce0a86174ed9dfc7ec3d3b2272c0f059efbf310
OCC_SITE ?= $(call github,open-power,occ,$(OCC_VERSION))
OCC_LICENSE = Apache-2.0
OCC_DEPENDENCIES = host-binutils host-p8-pore-binutils
diff --git a/openpower/package/pkg-versions.mk b/openpower/package/pkg-versions.mk
index 3ac8c9f..e3acbda 100644
--- a/openpower/package/pkg-versions.mk
+++ b/openpower/package/pkg-versions.mk
@@ -184,7 +184,6 @@
@cat $$($$(UPPER_CASE_PKG)_VERSION_FILE)
@echo ""; echo "**See openpower/package/VERSION.readme for detailed info on package strings"; echo ""
-
# Rule to generate pnor version
$(1)-build-version: $$(foreach pkg,$$(OPENPOWER_VERSIONED_SUBPACKAGES), $$(pkg)-version)
@$$($$(UPPER_CASE_PKG)_OPENPOWER_VERSION_FILE)
@@ -192,4 +191,11 @@
@cat $$($$(UPPER_CASE_PKG)_VERSION_FILE)
@echo ""; echo "**See openpower/package/VERSION.readme for detailed info on package strings"; echo ""
+# Rule to force re-generation of all versioned subpackages
+$(1)-build-version-all: $$(foreach pkg,$$(OPENPOWER_VERSIONED_SUBPACKAGES), $$(pkg)-build-version)
+ @$$($$(UPPER_CASE_PKG)_OPENPOWER_VERSION_FILE)
+ @echo "=== $$(UPPER_CASE_PKG)_VERSION ==="
+ @cat $$($$(UPPER_CASE_PKG)_VERSION_FILE)
+ @echo ""; echo "**See openpower/package/VERSION.readme for detailed info on package strings"; echo ""
+
endef
diff --git a/openpower/package/skiboot/skiboot.mk b/openpower/package/skiboot/skiboot.mk
index 0a95c63..3b4ad1a 100644
--- a/openpower/package/skiboot/skiboot.mk
+++ b/openpower/package/skiboot/skiboot.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SKIBOOT_VERSION = 5dea3e71fc7fd13d7a2aeb966d78043b74227394
+SKIBOOT_VERSION = skiboot-5.0-rc3
SKIBOOT_SITE = $(call github,open-power,skiboot,$(SKIBOOT_VERSION))
SKIBOOT_INSTALL_IMAGES = YES
SKIBOOT_INSTALL_TARGET = NO