diff options
| author | Vaibhav Jain <vaibhav@linux.ibm.com> | 2018-09-03 14:42:37 +0530 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.ibm.com> | 2018-10-16 18:26:24 +1100 |
| commit | d5ebd5519dcd1727bd2355d9e5aa4bfbcd7f3792 (patch) | |
| tree | fdc6d7a1665248e558d8de602b0649948f83e5dc /hw | |
| parent | 2d7419274dfad55f1909fd9ad948764d23aef978 (diff) | |
| download | skiboot-d5ebd5519dcd1727bd2355d9e5aa4bfbcd7f3792.zip skiboot-d5ebd5519dcd1727bd2355d9e5aa4bfbcd7f3792.tar.gz skiboot-d5ebd5519dcd1727bd2355d9e5aa4bfbcd7f3792.tar.bz2 | |
phb4/capp: Update the expected Eye-catcher for CAPP ucode lid
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: e50764d4f2b1("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>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/phb4.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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, |