From patchwork Thu Aug 6 07:54:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pragnesh Patel X-Patchwork-Id: 1341504 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=sifive.com header.i=@sifive.com header.a=rsa-sha256 header.s=selector1 header.b=lVatXHD8; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BMglS0DXRz9sTC for ; Thu, 6 Aug 2020 17:55:31 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1112E82196; Thu, 6 Aug 2020 09:55:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=sifive.com header.i=@sifive.com header.b="lVatXHD8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 874D882192; Thu, 6 Aug 2020 09:55:25 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2060a.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe5b::60a]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B2F3582192 for ; Thu, 6 Aug 2020 09:55:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pragnesh.patel@sifive.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JASV/zdiszKDbgiNg/etsgFfJeaGXVoNBn4Ya3BWWN/e81rptq31W6lnrj8mEJTm2fu8WGdN37p5g0v56R4MdQm0vLDMh8LaGDhlFs4GPyXxDUQeUWTyLkd3I2eYHI1Siisz7oz8o4UG654HxhIRn3nc0PGV4DohcIKIU7vr9mjk0oImasY63gRGvoAtsxhkHBhSIW1aEyU97G9bg+/I6Hj6WnfftlZgzEmMRFAi5dAfKmZa/5BmZPOka9PCLpXpK5XXR0SoflltEdroqyGUK85UdUc+WJfT3LNiY6vhomwkotL9aj4zGrXJFXz89c7qHMRa3eQCvoIhU/vvliAp2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zMJ8NtwjUaJbxmRq06aAJ9o/Nh9G+Z/WFtuoc/uoTSY=; b=GYxuMBpmS0JcC/GwW+kR7RlV0ADnIrGfSXMFoLgenKlZuyjCraEvlhlk2xFB8aB6D/QjHZImHgLNA23+qVmlnq3X5lpQYJ9p+4WjLwL7iljPdb11bJbaRaMRNOMlxmonVqtk6eAemfU2hnEfwklA2p4dekJ029VU53KAe9BD2UraTdMyk4dQNP0cUrxmUD7QZEbXgmonZk2LIu81EzPfYonY6TXFYKe41E8iqZso23dXapontxtabnp3DRD1qs8FmaH+lTs+I10IOoqg7B6EP7eOa9+ebDEtfwuVr7VUcchSrVnC5qSemm6W5+xNZewPUcOHtDP4hnM01Ok6OKdohw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=sifive.com; dmarc=pass action=none header.from=sifive.com; dkim=pass header.d=sifive.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zMJ8NtwjUaJbxmRq06aAJ9o/Nh9G+Z/WFtuoc/uoTSY=; b=lVatXHD8mhzo52Siihi1pvCk5EKFuOgaCjtMSS7unTWn2KAFQrbEeysZhQu5RCsnQNYoHSejFT+6Eb3ywRp+KgmiYuYRJuRfAEKQC79dd09z0P13vmpNLEpXMAeNsXHFghdEYe8l08jLtSqu9+KRvbErmALcypjizixQ+CJUr9M= Authentication-Results: wdc.com; dkim=none (message not signed) header.d=none;wdc.com; dmarc=none action=none header.from=sifive.com; Received: from MN2PR13MB2797.namprd13.prod.outlook.com (2603:10b6:208:f2::30) by MN2PR13MB3742.namprd13.prod.outlook.com (2603:10b6:208:1e7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3261.19; Thu, 6 Aug 2020 07:55:06 +0000 Received: from MN2PR13MB2797.namprd13.prod.outlook.com ([fe80::41cb:510f:26fb:6bc8]) by MN2PR13MB2797.namprd13.prod.outlook.com ([fe80::41cb:510f:26fb:6bc8%4]) with mapi id 15.20.3261.016; Thu, 6 Aug 2020 07:55:06 +0000 From: Pragnesh Patel To: atish.patra@wdc.com, bmeng.cn@gmail.com, u-boot@lists.denx.de, anup.patel@wdc.com, sagar.kadam@sifive.com, rick@andestech.com Cc: paul.walmsley@sifive.com, Pragnesh Patel , Simon Glass , Ovidiu Panait , Stephen Warren , Patrick Delaunay , Joe Hershberger , Vikas Manocha , Masahiro Yamada , Ye Li Subject: [PATCH v2] common/board_f: make sure to call fix_fdt() before reserve_fdt() Date: Thu, 6 Aug 2020 13:24:35 +0530 Message-Id: <20200806075435.9800-1-pragnesh.patel@sifive.com> X-Mailer: git-send-email 2.17.1 X-ClientProxiedBy: LNXP265CA0050.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:5d::14) To MN2PR13MB2797.namprd13.prod.outlook.com (2603:10b6:208:f2::30) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sachinj2-OptiPlex-7010.open-silicon.com (114.143.65.226) by LNXP265CA0050.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:5d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.17 via Frontend Transport; Thu, 6 Aug 2020 07:55:01 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [114.143.65.226] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e6486310-e415-4658-a3d4-08d839de0834 X-MS-TrafficTypeDiagnostic: MN2PR13MB3742: X-LD-Processed: 22f88e9d-ae0d-4ed9-b984-cdc9be1529f1,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:459; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j4xIuFzyinnGpYkWgA3WmTv/Q5HHigeMczYZvn+DvB45kKgYFEuxzNTAkzO0j27qXeytZIGWTBxblD3OAV2lcYqtKSd2JoDBb/IbgwcSA1A63nwME31m+HoPuPNaA7+AdrUckmlCU8OTO5bYT7G2YlZ8DQsuGbszNQqV91TmXbgkh3D1ZIcF1S5UiASMLJM2Zu9CyCrMNNs5O+zdJLImhWtS7zDn73PBX0x2kPQqYnyTXn1qJbcMBD0TRjeP7OXBVrXWivc8dK/J6iLU/dgU0Kqc5TtrnaNKJZHtLdwlH3UiU1fczaxCIY1+BZn3kOPCGEP4Bz2IeuNOLx7leAgEow== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MN2PR13MB2797.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(136003)(376002)(346002)(39850400004)(366004)(396003)(5660300002)(7416002)(4326008)(8676002)(8936002)(83380400001)(52116002)(186003)(478600001)(16526019)(26005)(6512007)(6506007)(316002)(54906003)(2906002)(6486002)(1076003)(66556008)(66476007)(86362001)(44832011)(2616005)(956004)(6666004)(1006002)(36756003)(66946007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: rZbmxSJ5tK6jUdGsB769rwG5Zsf9qiF3iSuu88hXjpOpPdAPkoStRgv90zS+BlmsEtPLmWlya9/GDS/gpomEFwIEay4as+MvcSjj5L3ffo1UQR/j9jYk8RPHuhw778dzrtwQ8+wuaOEyAWS5GqlKtd4pXXiVo9LYjV/n90Jy58RoHR+UbYpUOpxKTGqg+0yye5xam1VK4OCSOSWD2n9pCr8iFiYWEY++X1Z/PeY6XriHIs8KfZHiQVMDy1kkP/J/qT3bKlIFBsbikhrrowCuYARKu6WpwhyNAhzeOtcYKUs8CRikAvUljyIuWsOykASFwJbGzXFqEgkrNPYNvJJK6LQBy8clOC/YRb7i/IDwuXRSWPjweYkQbfwV3FrpQ0rhcRkreAz8Y+obTSJKUfm59neziuxjLTenvuBLP9vH/u1FG94uvUS39I2xltdWAsxajdkvBQFK7ZuK9xho4aVEI6py444b0AKXxpaPDY1tN0XVN4xZ/ZwUJasegWRcfTbOZaWWwDGU/ed4YVQYybCDPCox0hqRdVm6AajOOxLLtSHad99J80klXTxw9/LmgFk4cdjxKBd9Gu/sW3ZROubG0Lrot3dNunxzw8tILKcFv+/X9v5Kw3TjWyWhglLugLRKnBQtjq4WqwHDih/gVOLD1w== X-OriginatorOrg: sifive.com X-MS-Exchange-CrossTenant-Network-Message-Id: e6486310-e415-4658-a3d4-08d839de0834 X-MS-Exchange-CrossTenant-AuthSource: MN2PR13MB2797.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2020 07:55:06.3111 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 22f88e9d-ae0d-4ed9-b984-cdc9be1529f1 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: h96P5JwSwd2YOwsI2+36gktPKAOV2Z63yj0ediW747LOl3doKq1RpdrjuCTXZlkVPgJhOWAPZDNPh27wcmbEylOqUWfD3FC8vafTw6HUDzc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR13MB3742 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean There may be a chance that board specific fix_fdt() will change the size of FDT blob so it's safe to call reserve_fdt() after fix_fdt() otherwise global data (gd) will overwrite with FDT blob values. Fixes: a8492e25ac71 ("riscv: Expand the DT size before copy reserved memory node") Signed-off-by: Pragnesh Patel Reviewed-by: Bin Meng Reviewed-by: Rick Chen --- common/board_f.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index 88ff0424a7..7ae01e9fff 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -956,6 +956,9 @@ static const init_fnc_t init_sequence_f[] = { * - board info struct */ setup_dest_addr, +#ifdef CONFIG_OF_BOARD_FIXUP + fix_fdt, +#endif #ifdef CONFIG_PRAM reserve_pram, #endif @@ -984,9 +987,6 @@ static const init_fnc_t init_sequence_f[] = { setup_board_part2, #endif display_new_sp, -#ifdef CONFIG_OF_BOARD_FIXUP - fix_fdt, -#endif INIT_FUNC_WATCHDOG_RESET reloc_fdt, reloc_bootstage,