From patchwork Thu Aug 13 04:42:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pragnesh Patel X-Patchwork-Id: 1344009 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=OAbrQfnN; 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 4BRv8V2HMlz9sTM for ; Thu, 13 Aug 2020 14:43:22 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1D19581B45; Thu, 13 Aug 2020 06:43:18 +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="OAbrQfnN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F042D81B5E; Thu, 13 Aug 2020 06:43:16 +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=0.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, RCVD_ILLEGAL_IP,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eaa::60d]) (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 BF1E7806CA for ; Thu, 13 Aug 2020 06:43:13 +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=XaVmuFUltrAoulbapUWNrTvIsCJUqag1+SoygGt/ixc+FpiItf/e9QjQAp+x8buzehb0GKzcaJKKfs0wJW8qYoYa0QuGn+FDmHMuEhNx+zervhvO/QFcwGGHp4SYxfSmTnSBZaH3BqZ0OVK56CJ9VErv1zWMpbG0Btoob00+ZUjEEBqNtfSspksUWZQZSZpI6zSLUrRrmJAVfbrtSwPgBWKC498QjqWVfuE6QMfRjXJqxZ0Grr8n4fLk0b259gBiud/6hgixcI1UuRPcZmd8ZaXyHtj0ISFA4pqSMFrqRu9mnBhrKTfIkShV9MqN//hQNNPmwZ9pZR+cq+LyvnxR+A== 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=U9xn2iWkO8PeLeGqiyM9pe4eB2uJi7VGQezbqMu6Kf0=; b=Lsi0xKA7czWeRWm+NXRR2PLHAnihhvdGutSsviiKa+jOnZiduzkrltbGinyg8JxVZt5bnscAY1L9lt+coWdPrrnSMy1a1xy1HwvC6pd+YanvjntF/Zr/ELJJEVQHfvvvRktI3S5xms/eAWxTLfPmBiP4Is2EQO/t6E+WENjRsomF64W+nk9q894mgp5r7wtkZ73My6hYPRYDCtgyU1QjZQ4MJrMiViH0gVl5wHACABx93vctu2OMSDCDwxPXqmsSjz1PQW3mMHRJF0FRmRD45cf6N7jNcWbI6rDqYKFrxV3ERAmLrKGhRS8KmpgOTzGr3I7ABkwxO56fAfK5miDfog== 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=U9xn2iWkO8PeLeGqiyM9pe4eB2uJi7VGQezbqMu6Kf0=; b=OAbrQfnNrDLY4e/YUdDh1lmTiIERLvWkUD7DwpxZcWhYqEU8LpNhLCS+oAjgedL3iTaMPkJs4vFksXSWxXUPxGfgduZ2OSEo2sPPBxvEx0200OULXOwPZWaxqXHSrXan5vmMYuQgnxmYjS8L+pv2PQFYcBO3xsCdLSFSmMHe/aQ= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=sifive.com; Received: from MN2PR13MB2797.namprd13.prod.outlook.com (2603:10b6:208:f2::30) by MN2PR13MB3568.namprd13.prod.outlook.com (2603:10b6:208:162::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.13; Thu, 13 Aug 2020 04:43:06 +0000 Received: from MN2PR13MB2797.namprd13.prod.outlook.com ([fe80::c5b4:919d:f869:fce2]) by MN2PR13MB2797.namprd13.prod.outlook.com ([fe80::c5b4:919d:f869:fce2%7]) with mapi id 15.20.3305.015; Thu, 13 Aug 2020 04:43:06 +0000 From: Pragnesh Patel To: u-boot@lists.denx.de, atish.patra@wdc.com, bmeng.cn@gmail.com, 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 , Vikas Manocha Subject: [PATCH v3] common/board_f: make sure to call fix_fdt() before reserve_fdt() Date: Thu, 13 Aug 2020 10:12:26 +0530 Message-Id: <20200813044228.6247-1-pragnesh.patel@sifive.com> X-Mailer: git-send-email 2.17.1 X-ClientProxiedBy: LO2P265CA0446.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:e::26) To MN2PR13MB2797.namprd13.prod.outlook.com (2603:10b6:208:f2::30) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from 255.255.255.255 (255.255.255.255) by LO2P265CA0446.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:e::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.16 via Frontend Transport; Thu, 13 Aug 2020 04:43:02 +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: 72c247f7-3fa1-4b1a-2103-08d83f435e99 X-MS-TrafficTypeDiagnostic: MN2PR13MB3568: 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:3383; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /ICZSs4U0nwrg2Xc9cFn+RZRd6II3FOVYFQKOKmJfE34P+0RCc3EujVKCvBfE8Dlj+2yW2dfl/9OQoltuiVko3OjwLTrFADDMmRdW/NhrF5mwIjO5K3sMNK2/maoFsmi21ixjbNEDK3dyUR+0wkAKAHs1kKBLCObcfB1cOGTv3WtwUGurk9srxqN/SUKBohuG7ExFY7LLjmUVHIs+/Do/DOz57PZftyRwvlv2bRw4CjsPHycBVbphKGEcrquURza8NrPQH31JIdA/hDcTUmk8APiEkDR6Qoahvv1BoHYe0rpdzzHYLCtu5/cO0Fm08wMh17ay59Z8hR3+jzvQJ8CSJAfztXTVxMRmcaAZ/AJAhF9QQs9dp+s9u0e0QQIpoMB 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; SFS:(366004)(396003)(346002)(39840400004)(376002)(136003)(36756003)(4326008)(1076003)(66946007)(6666004)(7416002)(186003)(83380400001)(16576012)(86362001)(2616005)(956004)(316002)(8936002)(54906003)(26005)(52116002)(2906002)(110011004)(8676002)(478600001)(66556008)(66476007)(44832011)(5660300002)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: oZY8xZ6ZbWoGwCCxcMVFG8FRPatycSvLGekUzX1yKa96zb/jXpSDBnfV4eRsOfiU88LmMqxqs5jeo4LdUEJ5rfDEs09w0FRYSyo943V3EeD+MZWXQboNOBiK953+lDfFJytlpWC07/lV1y9lLfsgh+cVrlrV//98DSPpZS65DSick9Xnx65CadUlEjel5xHqC0XdsOCmKYQy/Dy63YAEETJCUa9eMD8vESngCVl7xr35r8S+lqBRURUrvJe58CrurnsTgzKl5HsWXz8JjmedWQ3ikEWWMmjrG5RjunSirmVbCn465GFDKeT+gX5mBsdmuDOcTDhywR21nN5/mGElaOpwLGBjt38BP6RQrK/G05Iu3RsVEvpU9PeFW/K30X2v2OnSdFyTWPWOJbx+Ll7i4idx0mwGgreCRYd78gJa8z59ytFnctjqhfuc8FK7uAcYvOSNTURb1KfQx3fGDbVCIM2rG9pkJcg+PbBziOWoRRkOPfw9tZeii52rlO5DrUeyVM7Ww6IqAcZURyx5r/2OyT3qro9dxaOQyg9mo1sl5OUQqNs0DGdc30orj0OC8oqqV4OKW0xzDmc2kP8B9Rnqgy/b358rLBrnl/HH0QcMYpXK4Hsqy1Qc0RVbdNwrZfjwCUjfelnv04iZOX+0PK6RSg== X-OriginatorOrg: sifive.com X-MS-Exchange-CrossTenant-Network-Message-Id: 72c247f7-3fa1-4b1a-2103-08d83f435e99 X-MS-Exchange-CrossTenant-AuthSource: MN2PR13MB2797.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2020 04:43:05.9095 (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: i5n1sbtzcFnLdyyU+nFRF/d4xUAdkMwdiQ6arPNBmkZtxT+rvB9KxVYMWoMeJ1azafDITKW2XJnPI8Gxxzn6guhMW5huX2Y2pF+C8kBqiFA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR13MB3568 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 Reviewed-by: Atish Patra --- Changes in v3: - Rebase on master Changes in v2: - Add Fixes tag 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 79532f4365..3932e0c69d 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -919,6 +919,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 @@ -941,9 +944,6 @@ static const init_fnc_t init_sequence_f[] = { INIT_FUNC_WATCHDOG_RESET setup_bdinfo, display_new_sp, -#ifdef CONFIG_OF_BOARD_FIXUP - fix_fdt, -#endif INIT_FUNC_WATCHDOG_RESET reloc_fdt, reloc_bootstage,