From a9eb6e42941d10bd8a0788c9b6a0afe3325ddb94 Mon Sep 17 00:00:00 2001
From: Dean Sanner <dsanner@us.ibm.com>
Date: Mon, 10 Apr 2017 20:11:45 -0500
Subject: Add a semi persistent PNOR section for HB reconfig loops

  - Hostboot needs a PNOR partition to store semi
    non-volatile data between reconfig reboots
  - BMC will clear on any true power down or BMC reboot,
    which leaves data intact on HB directed reboots
---
 create_pnor_image.pl                | 2 ++
 p9Layouts/defaultPnorLayout_128.xml | 9 +++++++++
 p9Layouts/defaultPnorLayout_32.xml  | 8 ++++++++
 p9Layouts/defaultPnorLayout_64.xml  | 8 ++++++++
 4 files changed, 27 insertions(+)

diff --git a/create_pnor_image.pl b/create_pnor_image.pl
index 1185896..9622e40 100755
--- a/create_pnor_image.pl
+++ b/create_pnor_image.pl
@@ -136,6 +136,7 @@ $build_pnor_command .= " --binFile_CAPP $scratch_dir/cappucode.bin.ecc";
 $build_pnor_command .= " --binFile_SECBOOT $scratch_dir/secboot.bin.ecc";
 $build_pnor_command .= " --binFile_VERSION $openpower_version_filename";
 $build_pnor_command .= " --binFile_IMA_CATALOG $scratch_dir/ima_catalog.bin.ecc";
+
 if ($release eq "p9"){
     $build_pnor_command .= " --binFile_WOFDATA $wofdata_binary_filename" if -e $wofdata_binary_filename;
 }
@@ -146,6 +147,7 @@ if ($release eq "p8"){
     $build_pnor_command .= " --binFile_HCODE $scratch_dir/$wink_binary_filename";
     $build_pnor_command .= " --binFile_HBBL $scratch_dir/hbbl.bin.ecc";
     $build_pnor_command .= " --binFile_RINGOVD $scratch_dir/ringOvd.bin";
+    $build_pnor_command .= " --binFile_HB_VOLATILE $scratch_dir/guard.bin.ecc";
 }
 $build_pnor_command .= " --fpartCmd \"fpart\"";
 $build_pnor_command .= " --fcpCmd \"fcp\"";
diff --git a/p9Layouts/defaultPnorLayout_128.xml b/p9Layouts/defaultPnorLayout_128.xml
index 3487ea1..784c3f1 100644
--- a/p9Layouts/defaultPnorLayout_128.xml
+++ b/p9Layouts/defaultPnorLayout_128.xml
@@ -298,4 +298,13 @@ Layout Description
         <side>A</side>
         <ecc/>
     </section>
+    <section>
+        <description>Hostboot deconfig area (64KB)</description>
+        <eyeCatch>HB_VOLATILE</eyeCatch>
+        <physicalOffset>0x2AC4000</physicalOffset>
+        <physicalRegionSize>0x5000</physicalRegionSize>
+        <side>A</side>
+        <reprovision/>
+        <ecc/>
+    </section>
 </pnor>
diff --git a/p9Layouts/defaultPnorLayout_32.xml b/p9Layouts/defaultPnorLayout_32.xml
index ec818af..41f0d6c 100644
--- a/p9Layouts/defaultPnorLayout_32.xml
+++ b/p9Layouts/defaultPnorLayout_32.xml
@@ -298,4 +298,12 @@ Layout Description
         <side>A</side>
         <ecc/>
     </section>
+    <section>
+        <description>Hostboot deconfig area (64KB)</description>
+        <eyeCatch>HB_VOLATILE</eyeCatch>
+        <physicalOffset>0x2AC4000</physicalOffset>
+        <physicalRegionSize>0x5000</physicalRegionSize>
+        <side>A</side>
+        <ecc/>
+    </section>
 </pnor>
diff --git a/p9Layouts/defaultPnorLayout_64.xml b/p9Layouts/defaultPnorLayout_64.xml
index ba0fe8c..8277158 100644
--- a/p9Layouts/defaultPnorLayout_64.xml
+++ b/p9Layouts/defaultPnorLayout_64.xml
@@ -298,4 +298,12 @@ Layout Description
         <side>A</side>
         <ecc/>
     </section>
+    <section>
+        <description>Hostboot deconfig area (64KB)</description>
+        <eyeCatch>HB_VOLATILE</eyeCatch>
+        <physicalOffset>0x2B50000</physicalOffset>
+        <physicalRegionSize>0x5000</physicalRegionSize>
+        <side>A</side>
+        <ecc/>
+    </section>
 </pnor>
-- 
cgit v1.2.1