{"id":814742,"url":"http://patchwork.ozlabs.org/api/1.2/patches/814742/?format=json","web_url":"http://patchwork.ozlabs.org/project/skiboot/patch/20170918022523.16131-1-stewart@linux.vnet.ibm.com/","project":{"id":44,"url":"http://patchwork.ozlabs.org/api/1.2/projects/44/?format=json","name":"skiboot firmware development","link_name":"skiboot","list_id":"skiboot.lists.ozlabs.org","list_email":"skiboot@lists.ozlabs.org","web_url":"http://github.com/open-power/skiboot","scm_url":"http://github.com/open-power/skiboot","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170918022523.16131-1-stewart@linux.vnet.ibm.com>","list_archive_url":null,"date":"2017-09-18T02:25:23","name":"hdat: fix parsing of P8 hdat","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"8894668d331f02163913d5d776de0e53f99af0c4","submitter":{"id":48041,"url":"http://patchwork.ozlabs.org/api/1.2/people/48041/?format=json","name":"Stewart Smith","email":"stewart@linux.vnet.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/skiboot/patch/20170918022523.16131-1-stewart@linux.vnet.ibm.com/mbox/","series":[{"id":3553,"url":"http://patchwork.ozlabs.org/api/1.2/series/3553/?format=json","web_url":"http://patchwork.ozlabs.org/project/skiboot/list/?series=3553","date":"2017-09-18T02:25:23","name":"hdat: fix parsing of P8 hdat","version":1,"mbox":"http://patchwork.ozlabs.org/series/3553/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/814742/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814742/checks/","tags":{},"related":[],"headers":{"Return-Path":"<skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org>","X-Original-To":["incoming@patchwork.ozlabs.org","skiboot@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","skiboot@lists.ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xwVGt39vVz9rxm\n\tfor <incoming@patchwork.ozlabs.org>;\n\tMon, 18 Sep 2017 12:25:42 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xwVGt2KMLzDrTM\n\tfor <incoming@patchwork.ozlabs.org>;\n\tMon, 18 Sep 2017 12:25:42 +1000 (AEST)","from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com\n\t[148.163.158.5])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3xwVGk6prdzDrMd\n\tfor <skiboot@lists.ozlabs.org>; Mon, 18 Sep 2017 12:25:34 +1000 (AEST)","from pps.filterd (m0098416.ppops.net [127.0.0.1])\n\tby mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv8I2OpQv128613\n\tfor <skiboot@lists.ozlabs.org>; Sun, 17 Sep 2017 22:25:31 -0400","from e37.co.us.ibm.com (e37.co.us.ibm.com [32.97.110.158])\n\tby mx0b-001b2d01.pphosted.com with ESMTP id 2d1mgge86d-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor <skiboot@lists.ozlabs.org>; Sun, 17 Sep 2017 22:25:31 -0400","from localhost\n\tby e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor <skiboot@lists.ozlabs.org> from <stewart@linux.vnet.ibm.com>;\n\tSun, 17 Sep 2017 20:25:30 -0600","from b03cxnp07029.gho.boulder.ibm.com (9.17.130.16)\n\tby e37.co.us.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tSun, 17 Sep 2017 20:25:28 -0600","from b03ledav005.gho.boulder.ibm.com\n\t(b03ledav005.gho.boulder.ibm.com [9.17.130.236])\n\tby b03cxnp07029.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v8I2PSQM10224110; Sun, 17 Sep 2017 19:25:28 -0700","from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id E968DBE039;\n\tSun, 17 Sep 2017 20:25:27 -0600 (MDT)","from birb.localdomain (unknown [9.185.16.148])\n\tby b03ledav005.gho.boulder.ibm.com (Postfix) with ESMTP id 7CC38BE03E;\n\tSun, 17 Sep 2017 20:25:27 -0600 (MDT)","by birb.localdomain (Postfix, from userid 1000)\n\tid F37B14F0F8F; Mon, 18 Sep 2017 12:25:23 +1000 (AEST)"],"Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=linux.vnet.ibm.com\n\t(client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com;\n\tenvelope-from=stewart@linux.vnet.ibm.com; receiver=<UNKNOWN>)","From":"Stewart Smith <stewart@linux.vnet.ibm.com>","To":"skiboot@lists.ozlabs.org","Date":"Mon, 18 Sep 2017 12:25:23 +1000","X-Mailer":"git-send-email 2.13.5","X-TM-AS-GCONF":"00","x-cbid":"17091802-0024-0000-0000-000017354233","X-IBM-SpamModules-Scores":"","X-IBM-SpamModules-Versions":"BY=3.00007754; HX=3.00000241; KW=3.00000007;\n\tPH=3.00000004; SC=3.00000229; SDB=6.00918583; UDB=6.00461442;\n\tIPR=6.00698809; \n\tBA=6.00005593; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009;\n\tZB=6.00000000; \n\tZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00017190;\n\tXFM=3.00000015; UTC=2017-09-18 02:25:29","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17091802-0025-0000-0000-00004CC21097","Message-Id":"<20170918022523.16131-1-stewart@linux.vnet.ibm.com>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-09-17_16:, , signatures=0","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=1\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1709180034","Subject":"[Skiboot] [PATCH] hdat: fix parsing of P8 hdat","X-BeenThere":"skiboot@lists.ozlabs.org","X-Mailman-Version":"2.1.24","Precedence":"list","List-Id":"Mailing list for skiboot development <skiboot.lists.ozlabs.org>","List-Unsubscribe":"<https://lists.ozlabs.org/options/skiboot>,\n\t<mailto:skiboot-request@lists.ozlabs.org?subject=unsubscribe>","List-Archive":"<http://lists.ozlabs.org/pipermail/skiboot/>","List-Post":"<mailto:skiboot@lists.ozlabs.org>","List-Help":"<mailto:skiboot-request@lists.ozlabs.org?subject=help>","List-Subscribe":"<https://lists.ozlabs.org/listinfo/skiboot>,\n\t<mailto:skiboot-request@lists.ozlabs.org?subject=subscribe>","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org","Sender":"\"Skiboot\"\n\t<skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org>"},"content":"Also fixes hdat_to_dt test cases.\n\nFixes: ad484081ef8a51811e7902aec436fa8f1ca9604a\nSigned-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>\n---\n hdata/iohub.c      | 7 ++-----\n hdata/test/stubs.c | 2 +-\n 2 files changed, 3 insertions(+), 6 deletions(-)","diff":"diff --git a/hdata/iohub.c b/hdata/iohub.c\nindex 567ab5971231..4c4178da2d35 100644\n--- a/hdata/iohub.c\n+++ b/hdata/iohub.c\n@@ -798,8 +798,6 @@ static void io_parse_slots(const void *sp_iohubs, int hub_id)\n \tconst struct slot_map_entry *entry;\n \tunsigned int i, count;\n \n-\tdt_slots = get_slot_node();\n-\n \tioslot_arr = HDIF_child_arr(sp_iohubs, CECHUB_CHILD_IOSLOTS);\n \tif (!ioslot_arr)\n \t\treturn;\n@@ -808,6 +806,8 @@ static void io_parse_slots(const void *sp_iohubs, int hub_id)\n \tif (!count)\n \t\treturn;\n \n+\tdt_slots = get_slot_node();\n+\n \tprlog(PR_DEBUG, \"CEC: Found slot map for IOHUB %d\\n\", hub_id);\n \tif (count > 1)\n \t\tprerror(\"CEC: Multiple IOSLOTs found for IO HUB %d\\n\", hub_id);\n@@ -846,9 +846,6 @@ static void io_parse_fru(const void *sp_iohubs)\n \t\tunsigned int size, hub_id;\n \t\tuint32_t chip_id;\n \n-\t\tif(i > 0)\n-\t\t\tbreak;\n-\n \t\thub = HDIF_get_iarray_item(sp_iohubs, CECHUB_FRU_IO_HUBS,\n \t\t\t\t\t   i, &size);\n \t\tif (!hub || size < CECHUB_IOHUB_MIN_SIZE) {\ndiff --git a/hdata/test/stubs.c b/hdata/test/stubs.c\nindex cb166f97516c..abeb832d2abc 100644\n--- a/hdata/test/stubs.c\n+++ b/hdata/test/stubs.c\n@@ -97,7 +97,6 @@ STUB(op_display);\n STUB(fsp_preload_lid);\n STUB(fsp_wait_lid_loaded);\n STUB(fsp_adjust_lid_side);\n-STUB(backtrace);\n \n /* Add HW specific stubs here */\n static bool true_stub(void) { return true; }\n@@ -117,4 +116,5 @@ NOOP_STUB(mem_reserve_fw);\n NOOP_STUB(mem_reserve_hwbuf);\n NOOP_STUB(add_chip_dev_associativity);\n NOOP_STUB(enable_mambo_console);\n+NOOP_STUB(backtrace);\n \n","prefixes":[]}