<div class="socmaildefaultfont" dir="ltr" style="font-family:Arial, Helvetica, sans-serif;font-size:10pt" ><div dir="ltr" >Would that affect how Hostboot fills the label into HDAT or does that not matter?</div>
<div dir="ltr" ><br>--<br>Dan Crowell<br>Senior Software Engineer - Power Systems Enablement Firmware<br>IBM Rochester: t/l 553-2987<br>dcrowell@us.ibm.com</div>
<div dir="ltr" > </div>
<div dir="ltr" > </div>
<blockquote data-history-content-modified="1" dir="ltr" style="border-left:solid #aaaaaa 2px; margin-left:5px; padding-left:5px; direction:ltr; margin-right:0px" >----- Original message -----<br>From: "Oliver O'Halloran" <oohall@gmail.com><br>To: Vasant Hegde <hegdevasant@linux.vnet.ibm.com><br>Cc: skiboot list <skiboot@lists.ozlabs.org>, dcrowell@us.ibm.com<br>Subject: [EXTERNAL] Re: [PATCH] hdata: Fix reserved node label search<br>Date: Thu, Nov 7, 2019 11:03 PM<br> 
<div><font size="2" face="Default Monospace,Courier New,Courier,monospace" >On Fri, Oct 25, 2019 at 2:55 AM Vasant Hegde<br><hegdevasant@linux.vnet.ibm.com> wrote:<br>><br>> Soon hostboot/HDAT will provide consistent reserved node name. It will<br>> just provide node name without starting string "ibm,". Commit 50d508c3<br>> made sure that all device tree nodes starts with "ibm,".<br>><br>> But we use hostboot/HDAT provided name for `ibm,prd-label` property. So we<br>> have to fix couple of our `ibm,prd-label` property based search/comparision<br>> to accommodate this change.<br>><br>> Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com><br><br>Merged as c3bfa320955967c943348dc526828de3d278fdbc, that said...<br><br>> ---<br>>  external/opal-prd/opal-prd.c | 13 +++++++++----<br>>  hdata/tpmrel.c               | 10 +++++++---<br>>  2 files changed, 16 insertions(+), 7 deletions(-)<br>><br>> diff --git a/external/opal-prd/opal-prd.c b/external/opal-prd/opal-prd.c<br>> index b49d9ae6d..1dc7691a8 100644<br>> --- a/external/opal-prd/opal-prd.c<br>> +++ b/external/opal-prd/opal-prd.c<br>> @@ -122,7 +122,8 @@ static struct opal_prd_ctx *ctx;<br>><br>>  static const char *opal_prd_devnode = "/dev/opal-prd";<br>>  static const char *opal_prd_socket = "/run/opal-prd-control";<br>> -static const char *hbrt_code_region_name = "ibm,hbrt-code-image";<br>> +static const char *hbrt_code_region_name = "hbrt-code-image";<br>> +static const char *hbrt_code_region_name_ibm = "ibm,hbrt-code-image";<br>>  static const int opal_prd_version = 1;<br>>  static uint64_t opal_prd_ipoll = 0xf000000000000000;<br>><br>> @@ -2193,9 +2194,13 @@ static int run_prd_daemon(struct opal_prd_ctx *ctx)<br>>         } else {<br>>                 rc = map_hbrt_physmem(ctx, hbrt_code_region_name);<br>>                 if (rc) {<br>> -                       pr_log(LOG_ERR, "IMAGE: Can't access hbrt "<br>> -                                       "physical memory");<br>> -                       goto out_close;<br>> +                       /* Fallback to old style ibm,prd-label */<br>> +                       rc = map_hbrt_physmem(ctx, hbrt_code_region_name_ibm);<br><br>We should probably add the prefix to "hbrt-code-region" so we don't<br>break existing opal-prd binaries. It should be safe since<br>hbrt-code-region is consumed by opal-prd instead of HBRT itself.</font><br> </div></blockquote>
<div dir="ltr" > </div></div><BR>