From d91829a85472769ad2ed0caca1cde6796ec5fe98 Mon Sep 17 00:00:00 2001 From: Vasant Hegde Date: Wed, 4 Aug 2021 12:50:50 +0530 Subject: external/opal-prd: Fix occ, homer node label search Starting P10, hostboot/HDAT will provide consistent reserved node name. It will just provide node name without starting string "ibm,". That will cause `pm-complex <*>` operation to fails. This patch fixes above issue. For backward compatability purpose I have kept support for old variant of node name as well. Signed-off-by: Vasant Hegde --- external/opal-prd/opal-prd.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/external/opal-prd/opal-prd.c b/external/opal-prd/opal-prd.c index 12269e8..1c610da 100644 --- a/external/opal-prd/opal-prd.c +++ b/external/opal-prd/opal-prd.c @@ -1508,17 +1508,23 @@ static int pm_complex_load_start(void) range = find_range("ibm,occ-common-area", 0); if (!range) { - pr_log(LOG_ERR, "PM: ibm,occ-common-area not found"); - return rc; + range = find_range("occ-common-area", 0); + if (!range) { + pr_log(LOG_ERR, "PM: occ-common-area not found"); + return rc; + } } occ_common = range->physaddr; for (i = 0; i < nr_chips; i++) { range = find_range("ibm,homer-image", chips[i]); if (!range) { - pr_log(LOG_ERR, "PM: ibm,homer-image not found 0x%lx", - chips[i]); - return -1; + range = find_range("homer-image", chips[i]); + if (!range) { + pr_log(LOG_ERR, "PM: homer-image not found 0x%lx", + chips[i]); + return -1; + } } homer = range->physaddr; -- cgit v1.1