aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStewart Smith <stewart@linux.vnet.ibm.com>2016-10-11 13:23:32 +1100
committerStewart Smith <stewart@linux.vnet.ibm.com>2016-10-11 13:23:32 +1100
commit5093ea33209a8b72ca43f1b1eac08629f060a634 (patch)
treeafad66d27e97721be0148f9c2931455e9dd2fc62
parentf0a23e4fadcdc49f134e122fa134f183f2e172f7 (diff)
downloadskiboot-5093ea33209a8b72ca43f1b1eac08629f060a634.zip
skiboot-5093ea33209a8b72ca43f1b1eac08629f060a634.tar.gz
skiboot-5093ea33209a8b72ca43f1b1eac08629f060a634.tar.bz2
Revert "hw/phb3.c: adjust offset to run CAPP containers"
This reverts commit cf39c2a7dd1a2ee9b19a5490f7fa25690b8e8ae3. Fixes: cf39c2a7dd1a2ee9b19a5490f7fa25690b8e8ae3 Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
-rw-r--r--hw/phb3.c24
1 files changed, 2 insertions, 22 deletions
diff --git a/hw/phb3.c b/hw/phb3.c
index 46a9e96..d0b5010 100644
--- a/hw/phb3.c
+++ b/hw/phb3.c
@@ -34,7 +34,6 @@
#include <fsp.h>
#include <chip.h>
#include <chiptod.h>
-#include <libstb/container.h>
/* Enable this to disable error interrupts for debug purposes */
#undef DISABLE_ERR_INTS
@@ -2310,27 +2309,9 @@ static int64_t capp_load_ucode(struct phb3 *p)
if (rc)
return rc;
+ prlog(PR_INFO, "CHIP%i: CAPP ucode lid loaded at %p\n",
+ p->chip_id, capp_ucode_info.lid);
lid = capp_ucode_info.lid;
-
- /* skip secure boot headers */
- if (stb_is_container(lid, capp_ucode_info.size))
- lid = (struct capp_lid_hdr*) ((uint8_t*)lid + SECURE_BOOT_HEADERS_SIZE);
-
- /*
- * CAPP partition header may be present on BMC machines. It will tell
- * us what sub-partition should be used
- */
- if (be64_to_cpu(lid->eyecatcher) == 0x4341505000000001) {
- uint32_t subpart_offset=0, subpart_size=0;
- flash_subpart_info(lid, CAPP_UCODE_MAX_SIZE,
- capp_ucode_info.ec_level,
- &subpart_offset, &subpart_size);
- if (rc)
- return rc;
-
- lid = (struct capp_lid_hdr*) ((uint8_t*)lid + subpart_offset);
- }
-
/*
* If lid header is present (on FSP machines), it'll tell us where to
* find the ucode. Otherwise this is the ucode.
@@ -2401,7 +2382,6 @@ static int64_t capp_load_ucode(struct phb3 *p)
}
chip->capp_ucode_loaded |= (1 << p->index);
- prlog(PR_INFO, "CHIP%i: CAPP ucode loaded\n", p->chip_id);
return OPAL_SUCCESS;
}