[Skiboot] [PATCH] core/flash: Fix IMA Catalog loading

[Tanushree Shah]

IMA Catalog (IMCC) partition on P11 require subid as 0x820200 for proper
PVR TOC matching. But the catalog toc currently supports only 0x800200.

Patch checks for given subid value in flash_subpart_info() along with
IMCC eyecatcher and fixes the subid as 0x800200 for P11.

Co-developed-by: Madhavan Srinivasan <maddy at linux.ibm.com>
Signed-off-by: Madhavan Srinivasan <maddy at linux.ibm.com>
Signed-off-by: Tanushree Shah <tshah at linux.ibm.com>
---
 core/flash-subpartition.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/flash-subpartition.c b/core/flash-subpartition.c
index 6e0fec6c3..ad93d1636 100644
--- a/core/flash-subpartition.c
+++ b/core/flash-subpartition.c
@@ -59,6 +59,14 @@ int flash_subpart_info(void *part_header, uint32_t header_len,
 	prlog(PR_DEBUG, "FLASH: flash subpartition eyecatcher %s\n",
 	      eyecatcher);
 
+	/*
+	 * P11 IMA Catalog partition require subid 0x800200.
+	 * Override the subid when we detect an IMCC partition.
+	 */
+	if (strcmp(eyecatcher, "IMCC") == 0 && subid == 0x820200) {
+		subid = 0x800200;
+	}
+
 	subpart_found = false;
 	part_actual = 0;
 	for (i = 0; i < FLASH_HOSTBOOT_TOC_MAX_ENTRIES; i++) {
-- 
2.47.3