From patchwork Thu Sep 7 20:16:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 811142 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xpBZZ0ShMz9sBW for ; Fri, 8 Sep 2017 06:17:25 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A3748C21D90; Thu, 7 Sep 2017 20:17:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAD_ENC_HEADER, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 49677C21D70; Thu, 7 Sep 2017 20:17:16 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A3C78C21D70; Thu, 7 Sep 2017 20:17:14 +0000 (UTC) Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0085.outbound.protection.outlook.com [104.47.32.85]) by lists.denx.de (Postfix) with ESMTPS id A6DECC21C72 for ; Thu, 7 Sep 2017 20:17:13 +0000 (UTC) Received: from BN3PR03CA0096.namprd03.prod.outlook.com (10.174.66.14) by CO2PR03MB2263.namprd03.prod.outlook.com (10.166.92.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10; Thu, 7 Sep 2017 20:17:11 +0000 Received: from BN1BFFO11FD025.protection.gbl (2a01:111:f400:7c10::1:137) by BN3PR03CA0096.outlook.office365.com (2603:10b6:400:4::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.35.12 via Frontend Transport; Thu, 7 Sep 2017 20:17:10 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD025.mail.protection.outlook.com (10.58.144.88) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1385.11 via Frontend Transport; Thu, 7 Sep 2017 20:17:10 +0000 Received: from oslab-l16.am.freescale.net ([10.214.80.154]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v87KH8M1027042; Thu, 7 Sep 2017 13:17:08 -0700 From: York Sun To: Date: Thu, 7 Sep 2017 13:16:49 -0700 Message-ID: <1504815409-27339-1-git-send-email-york.sun@nxp.com> X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131492890304401877; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39860400002)(39380400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(85426001)(110136004)(77096006)(104016004)(53936002)(86362001)(47776003)(5003940100001)(36756003)(7416002)(50466002)(68736007)(33646002)(2906002)(50226002)(8656003)(356003)(81156014)(8676002)(81166006)(5660300001)(305945005)(50986999)(105606002)(189998001)(6916009)(6666003)(498600001)(106466001)(2351001)(97736004)(8936002)(54906002)(4326008)(48376002); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR03MB2263; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD025; 1:ISMkndCj0y/23UocCcBQeA3E5t4nPds5cnpsvRtUOegmlMpJKaPyJ9V43JM7DAuHmo+Oxg8aGYPOluKsZw9MuKA38OjQ+MMVFil+PfqEbJENlprTQpoMuNayS8gS52CN MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e76f7ae8-7a88-4fc0-46d5-08d4f62d6b79 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603199)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CO2PR03MB2263; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2263; 3:QL8odDFF4BQIBz7Dps661frIuhBSXtyaCit4wsepkKRXB3S/QpOII8Uzn+dJOdpFp/9Pnfinq1XjbVazvt79Wj8GImonrt/Ggcf6eOfw4jOR2qa6n4FP80QwgYaOQBBizVEcX+sNhIF854KdVnD9ggSlEqKqzizdkPrsTSe4pWV2p7jY8xcRh80knPeJZunf6IoMQZoarjbaDEqoXcq1atHFLF4UXXhqTjegKXJKtA3Zrbd4iUi/6vih+Mo1eJscPnHJEezgSziIZvQvxfPkiG/SmU9BSg8QGdGkO55gEcfBrurugA+DZxwwJfuhTJajcGEkURTRdNMBepanzfy9p7csTMTcs5iCDUE5N9aI/mw=; 25:9HyMqiRvL/7XPDUi5XzSKJ7HRNCVRNNz/NVjthe0D66ObDKyjHvzvrNtqC039ox2H12fHWTjN2GlnlCD2dbNzoTJw/tLk25tYLtlSi/ZuX+jf2FwhxsLuBFzZ0mtevTPAvMnztUiqSH3qZhgzbA7RMc4GMN+1fx3F/KlD6C/L/pY1WqL9Dq/dDis9IjgRYMobXAlAsrguHQ7v3n3TseXTSMxoQA2q8zcn4LgdIlOe/7NxH1RNdf61y7ICcGtJ51Nivut508uzgonMaI/+3ohJgnzdgKHh38NdZ8DhOrQGay3dm67JhwoWqcSaJlUlifttkWEz8xCSfh/1z7wnyojuA== X-MS-TrafficTypeDiagnostic: CO2PR03MB2263: X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2263; 31:0FIgY96uU3qVfVdqX17euXJAK2WJyIcfTPKwxX8CzTIzWg8Dbk2gilHPKn+FU4YFrn2iVIbzg5vPKOgCwYRxC+N2iYL42DE8RfPDsJs7o8g3tQQ/LA1bR3gl+VDkYfsf3o6DQi8cpq0uySAMlKJSIh5Q/UubgYuUc9zDgim3eW55fgW7hfJiMU64pVhxHNUG17knBAcdxwumPO0RKsEBLljtRnYE9SxhAU91LRT9k34=; 4:m41gBRPM/j4bAvfxZpc68BU9ZZ7GqmhdEL8NHg0Cz9elMLeec+D4MZpLVRSr4bby+OtROjuH9B22AGqtUBtyz4zLHf4W5wW4B4knbaRd5g5A1SLa41yNWUAYesswk0Um7+O/5re3oWtrQ1iliAb5mfr2TnopsR2v+eEFzDNfw1kYse3QQX9QHR4Rd+zO1cvcs8lEaSs6hGsEdJdGzuYyvt3e/Hv6YDkK07lcQKyp1L8o1yLEjTFC0RZeEg1ym8q+jCez/27ab7qlmtrtZlF9WqE06A2T4lQtTPxImeJLrUk= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(100000703101)(100105400095)(10201501046)(6055026)(6096035)(20161123561025)(20161123563025)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(20161123565025)(20161123559100)(20161123556025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CO2PR03MB2263; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CO2PR03MB2263; X-Forefront-PRVS: 04238CD941 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR03MB2263; 23:IPLCMTC9rwpYMxFFeyWuGrmLU9LCy3NZPj0Nywwz+?= NxX0eOTmAtm5y8UKGxzkFFCp49erxgye4tWn2UkwBXCEq6s2SL4wrDsfIhV5/62MlY2kfHYfRE5dFY4QRw0HIuR4Ge/g/bOKiS6VzNDgIwNGNxuHu9+o82yqq+Ab6kfFnfTZGuOTXf5fxmqpe1njL8hS10jeSXZMDQdyLcxZqnLGZENWc8tmr9nImRD+NGpICQddbG/tgVLfIS78bXlRdBOhFB3tY1WlBdKKp+E8GN0SGu4L9iKoZGRecd8Hq9QG9Qwqqzjeifsz8hQuyxxS1Ce1p7t0zh7xVhHDsRniJ27XWGvwyabvs344bmBYTcrdJGVow0+uzSdVb/k6ZMRPMJIJNHSlHINDsz9TPe9Y8wT/lLxK6u3PEzaKlKXBf2aAIZYTus1m7czDkZbJ2dDCsLe9CCS4nZsD/+Pv1wF2iiI+lt42nYb6bjYDxBr1aY02CMbbt27qsw5Wzkr5XoSt6Lfli5ntj9m3pQBKoyIQzRb4xAnwbtXHikMryyojYxQEhFVn8kaMXJKxO/tsg057p8ibBNKfkn73uDkzXBRIBLLFP0f3dhmHGP9H33edTOwOFF840RMDwbf0A0Rpt6zjE1O4hyuVEsCcF0vABLM4t5xFwlE7n01ZVsndjrztSNiittWaDG1FRE5wu4L60UduAFZ341yGtld8MF0bFKwGDQhE7Yy/4JrZeUHV7/gt8jHV9kkGTqiL1kkv06RbWyO5fLBAELTPjyHXrylr8jIrWgwQWEsG8u0iWQ6BJd7pXxK/snlgajZtAUsVEBI6ZuuOdNrVONXtEQDMPnI47/hPWjls0ZqWH3u750QZKw2exwJwSkXoAf0DEARZAzocStxpfO42pMIOAuAFiU/fvm0hz7/1Yi4uSTWPXOjJgXXWHYwdwHdBed5mabibfeT2ufz0gpxPQqIADq4pX0Z5JbzCrF8JdIrRvqQOKE1Cs+DBI6ACnZ17yMNHl/MxJYT1QOYYa8r/sgR11naCaL6kOeRGZO+sxXJnjmk0z7WE6fBfPiYcL/fnV2CgIjYwJxhS1eP4m0pop6hmMZyiI6Nl0oEXEUqxg== X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2263; 6:D8xT2q/O1VOQkSmOsSlDRXwQD0DLpdgaQwXRtHHOrAmujm9uI7HkXFNFI+/gVijxc41MqQyQiccjfRIWzXzZnOM9NmPa8E5aJV5KFsIVEZ+awVF1c9MhOxgYvWpq0KT0NlQdsh5pkVhvwzke0+mZDdXZXH3U4xZwisMd0SXqTlrotnXw+7nFUgIY9HacUYF7TR7xnyxuzNg4uJRTfJ68ORAg3raI+yL2hdlMlIG+3kjoeCY/GxMlyiRLyEK2BCoEOzqCBjbPw7HIsjkljDJnD0qal0fF7KAzQJN0yoHXlt4t2KaBllpvu85unBrNeS/av1hMX4+FAfsxv6Fp79Wmxw==; 5:cIEFuR2B3jNEKymJ2m/C8mjEghpUjMULCw/Sf4qwcmDYL9HafwiryxEVv4V0orQMAw6+LFMj9Cuzrt//y/pd/KGMmU9KeCcxCCiB1IpNKf1bGC8UukXGKRRKJmOp0BgA3UBwVIIuieTzHpb6vYkLlg==; 24:XiM1rX+4toHdnHURLK0KekSPMeTOFGBJj0ihpckv5HFpGR7x3UYfZ8bvlzqH8CWPOxBtQ5BKnu7mZ0iBgIzP/V/BPT+oPgqWidNOycGEM1Q=; 7:nwQtfPSS7wTv5mhh3jGe6RngW0t/hlwLFRt/a60PP49+UR5O5EJyBQyZC6ru/VulbeEkGCGJJKsNRqLGHd6TYDqSawlrh+zaDwscbRkXsRXlsDAlg7p96vyMrqu57iwVWkdTSkkWJ4YPDMoXaUNriBXVJkkKSG1sEm1JuERK/70r6leS75N5pK8iw7SN940LTKFh4GXwwQignHCi79of3WVsGWtdk3lO42VfG4YzWIw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2017 20:17:10.1125 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR03MB2263 Cc: Albert Aribaud , Yuantian Tang , Priyanka Jain , Hou Zhiqiang Subject: [U-Boot] [PATCH] armv8: fsl-layerscape: Fix MC reserved memory calculation X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" In case high region memory doesn't have enough space for Management Complex (MC), the return value should indicate a failure so the caller can handle it accordingly. Signed-off-by: York Sun Reported-by: Ebony Zhu --- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 3c9a5ed..d21a494 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -619,13 +619,22 @@ void efi_reset_system_init(void) #endif +/* + * Calculate reserved memory with given memory bank + * Return aligned memory size on success + * Return (ram_size + needed size) for failure + */ phys_size_t board_reserve_ram_top(phys_size_t ram_size) { phys_size_t ram_top = ram_size; #if defined(CONFIG_FSL_MC_ENET) && !defined(CONFIG_SPL_BUILD) + ram_top = mc_get_dram_block_size(); + if (ram_top > ram_size) + return ram_size + ram_top; + + ram_top = ram_size - ram_top; /* The start address of MC reserved memory needs to be aligned. */ - ram_top -= mc_get_dram_block_size(); ram_top &= ~(CONFIG_SYS_MC_RSV_MEM_ALIGN - 1); #endif @@ -669,8 +678,8 @@ phys_size_t get_effective_memsize(void) /* Check if we have enough memory for MC */ if (rem < board_reserve_ram_top(rem)) { /* Not enough memory in high region to reserve */ - if (ea_size > board_reserve_ram_top(rem)) - ea_size -= board_reserve_ram_top(rem); + if (ea_size > board_reserve_ram_top(ea_size)) + ea_size -= board_reserve_ram_top(ea_size); else printf("Error: No enough space for reserved memory.\n"); }