Skip to content

Commit

Permalink
phb4/capp: Update the expected Eye-catcher for CAPP ucode lid
Browse files Browse the repository at this point in the history
Currently on a FSP based P9 system load_capp_code() expects CAPP ucode
lid header to have eye-catcher magic of 'CAPPPSLL'. However skiboot
currently supports CAPP ucode only lids that have a eye-catcher magic
of 'CAPPLIDH'. This prevents skiboot from loading the ucode with this
error message:

CAPP: ucode header invalid

We fix this issue by updating load_capp_ucode() to use the eye-catcher
value of 'CAPPLIDH' instead of 'CAPPPSLL'.

Cc: stable
Fixes: e50764d("capi: Load capp microcode")
Signed-off-by: Vaibhav Jain <vaibhav@linux.ibm.com>
Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Reviewed-by: Christophe Lombard <clombard@linux.vnet.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
  • Loading branch information
vaibhav92 authored and stewartsmith committed Oct 16, 2018
1 parent 2d74192 commit d5ebd55
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions hw/phb4.c
Original file line number Diff line number Diff line change
Expand Up @@ -3013,9 +3013,9 @@ static int64_t load_capp_ucode(struct phb4 *p)
if (p->index != CAPP0_PHB_INDEX && p->index != CAPP1_PHB_INDEX)
return OPAL_HARDWARE;

/* 0x4341505050534C4C = 'CAPPPSLL' in ASCII */
/* 0x434150504c494448 = 'CAPPLIDH' in ASCII */
rc = capp_load_ucode(p->chip_id, p->phb.opal_id, p->index,
0x4341505050534C4C, PHB4_CAPP_REG_OFFSET(p),
0x434150504c494448, PHB4_CAPP_REG_OFFSET(p),
CAPP_APC_MASTER_ARRAY_ADDR_REG,
CAPP_APC_MASTER_ARRAY_WRITE_REG,
CAPP_SNP_ARRAY_ADDR_REG,
Expand Down
2 changes: 1 addition & 1 deletion include/capp.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

/*
* eyecatcher PHB3: 'CAPPLIDH' in ASCII
* eyecatcher PHB4: 'CAPPPSLL' in ASCII
* eyecatcher PHB4: 'CAPPLIDH' in ASCII
*/
struct capp_lid_hdr {
be64 eyecatcher;
Expand Down

0 comments on commit d5ebd55

Please sign in to comment.