From patchwork Fri Jun 10 05:03:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavin Shan X-Patchwork-Id: 633506 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rQqrS2fFXz9sD3 for ; Fri, 10 Jun 2016 15:06:00 +1000 (AEST) Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3rQqrS1XZHzDqHQ for ; Fri, 10 Jun 2016 15:06:00 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3rQqqd1qCWzDqJV for ; Fri, 10 Jun 2016 15:05:17 +1000 (AEST) Received: from pps.filterd (m0048827.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u5A53r0m042485 for ; Fri, 10 Jun 2016 01:05:15 -0400 Received: from e23smtp04.au.ibm.com (e23smtp04.au.ibm.com [202.81.31.146]) by mx0a-001b2d01.pphosted.com with ESMTP id 23f9vdg1ty-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 10 Jun 2016 01:05:15 -0400 Received: from localhost by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 10 Jun 2016 15:05:12 +1000 Received: from d23dlp01.au.ibm.com (202.81.31.203) by e23smtp04.au.ibm.com (202.81.31.210) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 10 Jun 2016 15:05:10 +1000 X-IBM-Helo: d23dlp01.au.ibm.com X-IBM-MailFrom: gwshan@linux.vnet.ibm.com X-IBM-RcptTo: skiboot@lists.ozlabs.org Received: from d23relay07.au.ibm.com (d23relay07.au.ibm.com [9.190.26.37]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id A52372CE8063 for ; Fri, 10 Jun 2016 15:04:59 +1000 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay07.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u5A54cY07668206 for ; Fri, 10 Jun 2016 15:04:44 +1000 Received: from d23av03.au.ibm.com (localhost [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u5A54S8F023953 for ; Fri, 10 Jun 2016 15:04:28 +1000 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.192.253.14]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u5A54SD6023878; Fri, 10 Jun 2016 15:04:28 +1000 Received: from bran.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) by ozlabs.au.ibm.com (Postfix) with ESMTP id 4A21EA0150; Fri, 10 Jun 2016 15:03:56 +1000 (AEST) Received: from gwshan (shangw.ozlabs.ibm.com [10.61.2.199]) by bran.ozlabs.ibm.com (Postfix) with ESMTP id 473CCE3B1A; Fri, 10 Jun 2016 15:03:56 +1000 (AEST) Received: by gwshan (Postfix, from userid 1000) id 2B67B942CA3; Fri, 10 Jun 2016 15:03:56 +1000 (AEST) From: Gavin Shan To: skiboot@lists.ozlabs.org Date: Fri, 10 Jun 2016 15:03:34 +1000 X-Mailer: git-send-email 2.1.0 In-Reply-To: <1465535032-26749-1-git-send-email-gwshan@linux.vnet.ibm.com> References: <1465535032-26749-1-git-send-email-gwshan@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16061005-0012-0000-0000-0000019D849B X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16061005-0013-0000-0000-0000055EFAB5 Message-Id: <1465535032-26749-6-git-send-email-gwshan@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-06-10_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=3 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1606100058 Subject: [Skiboot] [PATCH v12 05/23] core/fdt: Introduce __create_dtb() X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair@popple.id.au MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" There is shared logic to flatten the whole device tree (used when loading kernel) or device sub-tree (used by PCI hot add). This introduces helper function __create_dtb() for the shared logic. No functional changes introduced. Signed-off-by: Gavin Shan Reviewed-by: Andrew Donnellan --- core/fdt.c | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/core/fdt.c b/core/fdt.c index 6d8130d..fbfbac6 100644 --- a/core/fdt.c +++ b/core/fdt.c @@ -165,15 +165,31 @@ static void create_dtb_reservemap(void *fdt, const struct dt_node *root) save_err(fdt_finish_reservemap(fdt)); } +static int __create_dtb(void *fdt, size_t len, + const struct dt_node *root) +{ + fdt_create(fdt, len); + create_dtb_reservemap(fdt, root); + flatten_dt_node(fdt, root); + + save_err(fdt_finish(fdt)); + if (fdt_error) { + prerror("dtb: error %s\n", fdt_strerror(fdt_error)); + return fdt_error; + } + + dump_fdt(fdt); + return 0; +} + void *create_dtb(const struct dt_node *root) { void *fdt = NULL; size_t len = DEVICE_TREE_MAX_SIZE; uint32_t old_last_phandle = last_phandle; + int ret; do { - if (fdt) - free(fdt); last_phandle = old_last_phandle; fdt_error = 0; fdt = malloc(len); @@ -182,26 +198,14 @@ void *create_dtb(const struct dt_node *root) return NULL; } - fdt_create(fdt, len); - - create_dtb_reservemap(fdt, root); - - /* Unflatten our live tree */ - flatten_dt_node(fdt, root); - - save_err(fdt_finish(fdt)); - - if (!fdt_error) - break; + ret = __create_dtb(fdt, len, root); + if (ret) { + free(fdt); + fdt = NULL; + } len *= 2; - } while (fdt_error == -FDT_ERR_NOSPACE); + } while (ret == -FDT_ERR_NOSPACE); - dump_fdt(fdt); - - if (fdt_error) { - prerror("dtb: error %s\n", fdt_strerror(fdt_error)); - return NULL; - } return fdt; }