{"id":806407,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806407/?format=json","project":{"id":44,"url":"http://patchwork.ozlabs.org/api/1.0/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":""},"msgid":"<20170828071803.9406-1-hegdevasant@linux.vnet.ibm.com>","date":"2017-08-28T07:17:59","name":"[v2,1/5] hdata: Fix vpd parse","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"66b8bb575f608a5bfa11d37e3444385429f9f856","submitter":{"id":22361,"url":"http://patchwork.ozlabs.org/api/1.0/people/22361/?format=json","name":"Vasant Hegde","email":"hegdevasant@linux.vnet.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/skiboot/patch/20170828071803.9406-1-hegdevasant@linux.vnet.ibm.com/mbox/","series":[{"id":91,"url":"http://patchwork.ozlabs.org/api/1.0/series/91/?format=json","date":"2017-08-28T07:17:59","name":"[v2,1/5] hdata: Fix vpd parse","version":2,"mbox":"http://patchwork.ozlabs.org/series/91/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806407/checks/","tags":{},"headers":{"Return-Path":"","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 [IPv6:2401:3900:2:1::3])\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 3xgjmT2tGzz9sNq\n\tfor ;\n\tMon, 28 Aug 2017 17:18:33 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xgjmS7554zDqBc\n\tfor ;\n\tMon, 28 Aug 2017 17:18:32 +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 3xgjmL0QBZzDq7N\n\tfor ; Mon, 28 Aug 2017 17:18:25 +1000 (AEST)","from pps.filterd (m0098420.ppops.net [127.0.0.1])\n\tby mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv7S7FcVP074015\n\tfor ; Mon, 28 Aug 2017 03:18:23 -0400","from e23smtp08.au.ibm.com (e23smtp08.au.ibm.com [202.81.31.141])\n\tby mx0b-001b2d01.pphosted.com with ESMTP id 2cm9ubb0wb-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Mon, 28 Aug 2017 03:18:22 -0400","from localhost\n\tby e23smtp08.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from ; \n\tMon, 28 Aug 2017 17:18:19 +1000","from d23relay07.au.ibm.com (202.81.31.226)\n\tby e23smtp08.au.ibm.com (202.81.31.205) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tMon, 28 Aug 2017 17:18:17 +1000","from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97])\n\tby d23relay07.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id\n\tv7S7IGxV33620184\n\tfor ; Mon, 28 Aug 2017 17:18:16 +1000","from d23av03.au.ibm.com (localhost [127.0.0.1])\n\tby d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id\n\tv7S7I8wn000604\n\tfor ; Mon, 28 Aug 2017 17:18:08 +1000","from hegdevasant.in.ibm.com ([9.109.222.253])\n\tby d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id\n\tv7S7I6NN000565; Mon, 28 Aug 2017 17:18:07 +1000"],"From":"Vasant Hegde ","To":"skiboot@lists.ozlabs.org","Date":"Mon, 28 Aug 2017 12:47:59 +0530","X-Mailer":"git-send-email 2.9.3","X-TM-AS-MML":"disable","x-cbid":"17082807-0048-0000-0000-0000025A263D","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17082807-0049-0000-0000-0000480E65CE","Message-Id":"<20170828071803.9406-1-hegdevasant@linux.vnet.ibm.com>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-08-28_04:, , 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-1708280117","Subject":"[Skiboot] [PATCH v2 1/5] hdata: Fix vpd parse","X-BeenThere":"skiboot@lists.ozlabs.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"Mailing list for skiboot development ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","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"},"content":"We detect vpd data format in vpd_parse() and set \"op_platform\" variable.\ndt_add_vpd_node() depends on op_platform to select parser type.\n\nThere are places where we call dt_add_vpd_node() even before calling\nvpd_parse(). And in such cases it will not parse vpd data properly.\n\nThis patch fixes above issue.\n\nFixes: 694546c1 (hdata/vpd: Parse the OpenPOWER OPFR record)\nCC: Ananth N Mavinakayanahalli \nSigned-off-by: Vasant Hegde \n---\n hdata/vpd.c | 9 +++------\n 1 file changed, 3 insertions(+), 6 deletions(-)","diff":"diff --git a/hdata/vpd.c b/hdata/vpd.c\nindex d7d57cd..0e23e29 100644\n--- a/hdata/vpd.c\n+++ b/hdata/vpd.c\n@@ -23,8 +23,6 @@\n #include \"hdata.h\"\n #include \n \n-static bool op_platform;\n-\n struct card_info {\n \tconst char *ccin; \t/* Customer card identification number */\n \tconst char *description;\n@@ -492,7 +490,7 @@ struct dt_node *dt_add_vpd_node(const struct HDIF_common_hdr *hdr,\n \t && !dt_find_property(node, \"ibm,vpd\")) {\n \t\tdt_add_property(node, \"ibm,vpd\", fruvpd, fruvpd_sz);\n \n-\t\tif (op_platform)\n+\t\tif (vpd_find_record(fruvpd, fruvpd_sz, \"OPFR\", NULL))\n \t\t\tvpd_opfr_parse(node, fruvpd, fruvpd_sz);\n \t\telse\n \t\t\tvpd_vini_parse(node, fruvpd, fruvpd_sz);\n@@ -607,10 +605,9 @@ static void sysvpd_parse(void)\n \t}\n \n \t/* Look for the new OpenPower \"OSYS\" first */\n-\tif (vpd_find_record(sysvpd, sysvpd_sz, \"OSYS\", NULL)) {\n-\t\top_platform = true;\n+\tif (vpd_find_record(sysvpd, sysvpd_sz, \"OSYS\", NULL))\n \t\tsysvpd_parse_opp(sysvpd, sysvpd_sz);\n-\t} else\n+\telse\n \t\tsysvpd_parse_legacy(sysvpd, sysvpd_sz);\n \n \tdt_add_model_name();\n","prefixes":["v2","1/5"]}