Merge pull request #72 from geissonator/master
Enable hostboot runtime and VPD caching
diff --git a/openpower/configs/hostboot/habanero.config b/openpower/configs/hostboot/habanero.config
index 08caec1..8c87193 100755
--- a/openpower/configs/hostboot/habanero.config
+++ b/openpower/configs/hostboot/habanero.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
@@ -35,7 +41,7 @@
set KINGSTON_1_35_VOLT
set NO_DMI_EREPAIR
-set DISABLE_HOSTBOOT_RUNTIME
+unset DISABLE_HOSTBOOT_RUNTIME
# OCC Enablment flags
unset SET_NOMINAL_PSTATE
diff --git a/openpower/configs/hostboot/palmetto.config b/openpower/configs/hostboot/palmetto.config
index 9d09e68..2b30fbc 100755
--- a/openpower/configs/hostboot/palmetto.config
+++ b/openpower/configs/hostboot/palmetto.config
@@ -6,13 +6,20 @@
set ALLOW_MACRONIX_PNOR
# VPD options.
-unset MVPD_READ_FROM_PNOR
set MVPD_READ_FROM_HW
-unset DJVPD_READ_FROM_PNOR
+set MVPD_WRITE_TO_HW
+set MVPD_READ_FROM_PNOR
+set MVPD_WRITE_FROM_PNOR
set DJVPD_READ_FROM_HW
-unset CVPD_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
+set CVPD_READ_FROM_PNOR
+set CVPD_WRITE_TO_PNOR
set SKIP_RESTRICT_EX_UNITS
+unset CDIMM_FORMAT_FOR_CVPD
# gpio config
set GPIODD
@@ -33,7 +40,7 @@
set PNOR_IS_32MB
set NO_DMI_EREPAIR
-set DISABLE_HOSTBOOT_RUNTIME
+unset DISABLE_HOSTBOOT_RUNTIME
# OCC Enablment flags
unset SET_NOMINAL_PSTATE
diff --git a/openpower/package/hostboot/hostboot-0007-Assert-called-when-trying-to-deconfigure-a-DIMM.patch b/openpower/package/hostboot/hostboot-0007-Assert-called-when-trying-to-deconfigure-a-DIMM.patch
new file mode 100644
index 0000000..f3d6ff6
--- /dev/null
+++ b/openpower/package/hostboot/hostboot-0007-Assert-called-when-trying-to-deconfigure-a-DIMM.patch
@@ -0,0 +1,32 @@
+From 5a3e8e0e91dfee9f7f6b1e31f07789e2c2788e21 Mon Sep 17 00:00:00 2001
+From: Richard J. Knight <rjknight@us.ibm.com>
+Date: Fri, 27 Feb 2015 19:45:56 -0600
+Subject: [PATCH 2/3] Assert called when trying to deconfigure a DIMM
+
+ -Remove assert call from default path. Assert
+ should not be called for targets without status
+ sensors. Path should be a no-op.
+
+Change-Id: Id1aa002ea3d79cf24b5c123cbd92647257d12093
+RTC:124846
+(cherry picked from commit eadb8a16b0f04ce10169091263297f3dc4372c9c)
+---
+ src/usr/ipmi/ipmisensor.C | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/usr/ipmi/ipmisensor.C b/src/usr/ipmi/ipmisensor.C
+index e5b4e64..a62e084 100644
+--- a/src/usr/ipmi/ipmisensor.C
++++ b/src/usr/ipmi/ipmisensor.C
+@@ -640,7 +640,7 @@ namespace SENSOR
+ break;
+
+ default:
+- assert(0, "No status sensor associated with target type 0x%x",
++ TRACFCOMP(g_trac_ipmi,"INF>>No status sensor associated with target type 0x%x",
+ i_target->getAttr<TARGETING::ATTR_TYPE>());
+ break;
+ }
+--
+1.7.4.1
+
diff --git a/openpower/package/hostboot/hostboot-0008-Disable-SPD-writes-workaround-for-DRAM-repairs-error.patch b/openpower/package/hostboot/hostboot-0008-Disable-SPD-writes-workaround-for-DRAM-repairs-error.patch
new file mode 100644
index 0000000..05ea39a
--- /dev/null
+++ b/openpower/package/hostboot/hostboot-0008-Disable-SPD-writes-workaround-for-DRAM-repairs-error.patch
@@ -0,0 +1,26 @@
+From de6b906bd93e0928cd5464418091268aa7a5ac78 Mon Sep 17 00:00:00 2001
+From: Corey Swenson <cswenson@us.ibm.com>
+Date: Fri, 27 Feb 2015 09:45:47 -0600
+Subject: [PATCH 1/3] Disable SPD writes - workaround for DRAM repairs error
+
+Change-Id: Ic5fac400abff8fef004268dfbdf33fa6ecdded1c
+(cherry picked from commit 1bc5bb42be8e81b525993e9b5dcf08fe684bade4)
+---
+ src/usr/vpd/spd.C | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/usr/vpd/spd.C b/src/usr/vpd/spd.C
+index 54837a5..e101ff0 100644
+--- a/src/usr/vpd/spd.C
++++ b/src/usr/vpd/spd.C
+@@ -323,6 +323,7 @@ errlHndl_t spdWriteKeywordValue ( DeviceFW::OperationType i_opType,
+ va_list i_args )
+ {
+ errlHndl_t err = NULL;
++ return err;
+ VPD::vpdKeyword keyword = va_arg( i_args, uint64_t );
+ VPD::vpdCmdTarget location =
+ (VPD::vpdCmdTarget)va_arg( i_args, uint64_t );
+--
+1.7.4.1
+