From patchwork Thu Dec 7 21:16:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 845850 X-Patchwork-Delegate: trini@ti.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 3yt7Zs0wqlz9s82 for ; Fri, 8 Dec 2017 08:16:35 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 33780C21FEA; Thu, 7 Dec 2017 21:16:23 +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_MSPIKE_H3, 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 6AA02C21E76; Thu, 7 Dec 2017 21:16:21 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A0333C21E76; Thu, 7 Dec 2017 21:16:20 +0000 (UTC) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0047.outbound.protection.outlook.com [104.47.41.47]) by lists.denx.de (Postfix) with ESMTPS id BE293C21C4B for ; Thu, 7 Dec 2017 21:16:19 +0000 (UTC) Received: from DM5PR03CA0038.namprd03.prod.outlook.com (10.174.189.155) by DM5PR03MB2698.namprd03.prod.outlook.com (10.168.197.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.302.9; Thu, 7 Dec 2017 21:16:17 +0000 Received: from BN1BFFO11FD042.protection.gbl (2a01:111:f400:7c10::1:171) by DM5PR03CA0038.outlook.office365.com (2603:10b6:4:3b::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.302.9 via Frontend Transport; Thu, 7 Dec 2017 21:16:17 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nvidia.com; dkim=none (message not signed) header.d=none; nvidia.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 BN1BFFO11FD042.mail.protection.outlook.com (10.58.144.105) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.282.5 via Frontend Transport; Thu, 7 Dec 2017 21:16:14 +0000 Received: from oslab-l16.am.freescale.net ([10.214.84.86]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id vB7LGEoi001808; Thu, 7 Dec 2017 14:16:14 -0700 From: York Sun To: Date: Thu, 7 Dec 2017 13:16:07 -0800 Message-ID: <1512681367-18205-1-git-send-email-york.sun@nxp.com> X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131571549750832803; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(7966004)(336005)(376002)(39380400002)(346002)(39860400002)(2980300002)(1110001)(1109001)(339900001)(189003)(199004)(8656006)(6916009)(356003)(305945005)(6666003)(77096006)(36756003)(5660300001)(104016004)(97736004)(48376002)(68736007)(2906002)(50466002)(2351001)(8936002)(81156014)(81166006)(8676002)(50226002)(105606002)(33646002)(316002)(106466001)(53936002)(51416003)(85426001)(47776003)(4326008)(86362001)(498600001)(54906003)(16586007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB2698; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD042; 1:iAszz1w2mbx6tbdFmo1DvhreCv8pLxwEzk7ceqWG6gw3YOVdxsFoW3zyAU5ESAzZ57uDMXQI5dsVW5JiXTAmvv9pq8DUsQwuLv5OFyK+6RPxChrvlzI+RuTmm2g7YbLU MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7facfe0f-1e34-4aa3-2ea3-08d53db7bfe9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4628075)(201703131517081)(2017052603304); SRVR:DM5PR03MB2698; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2698; 3:7JqoxRdXNlo1OBmk+6KirXLdURlega766JSQxltkZWYWfH5a128ct2raOuyJcH0Uc3rlW6SoNqd0+MlP5Uzk6qvy2P8w2esEalKMts8wBLSsMtuT9PgctsZ1vlp0j5Vp0Vu65WwQzGmBSLRMirCXW3T089ZNcR4x/r5UVE9+2Ckl42hDQXvi89luF3T/xz8Ad8pW8fE1MJORFv4uZ/kZVOK/FKEYIDb7bL6iqQf0xqyOHGsccnBRLhRqJA5rH10GQroE5xS8AP2QF4bDpZRQ8Lt7IILQup82gTYpKbzQFm0S42ktzpKxNhLW26ntMIae+tfbz8e7B8BpQNbxlHa7CHIXsLEIfoo36h4hlclU94Y=; 25:MJW+bJjNDnZzpsj4FujWkvVCTNAsuZJ+AXI7Q6GLRdCSc80/R7gEh7/wnZH5LRfCDJkaLmI85Y5rK4xmCdu9gx8+/dzSDsowbhELY6E07FL+pzOAiHc/wB1W+bvjvmXvWJRHXf6VR4VZBUOVsh0jLEqHvkN5HhDJq7kjZiUqdB9Dt9LKbd04bioobDj+wQrQN2fLaEQUNCO6Uze/mLChSBFRHUZpcdGAYVGIpMtl1+5+UBew7V1HHzDO9Yyg22bZKSl/CSTHiuXUeM8i33vIWmYcIfVqGlWTlsf78uFydQcIUWw8/QRTkDPrvqKA6PXp3ilulQ9oU7ptrpiY8Q2k2g== X-MS-TrafficTypeDiagnostic: DM5PR03MB2698: X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2698; 31:SApCvDoFb/+m4UPHNWTz4NZ/OjQDtu/oUkZY+oEeEXyFencUMD91SXgmWoYSLssjqDe0sO/Os6Oqs12hCNd7dkouo5hPjNdzQTSxYX17RVOFv0edY2aB4PxapMFehs/F8AZP01BGaPvDr59MZVBvwlh/CVK984KKIw14q3ftJoPMlBH2rkF2oSLkmtdr1zGXMg+1ZRyvaL0fSNYVkxgghulfLKj+PQHpQArCtRM47ro=; 4:K/srU/km+c3VUDk7vmvvYIKoubS56f4qj2mmSfs/ClGB6T9eRNcN5jo0gAsr0tmHulSMpUGQLw6MYw5N2soLHseGqlC2tldLvQ0XESs/5Xe0kxYh/TyGNKEjvs0QpIBnC7NVLU8ywXaS1ale/mkJwoCqGdN3l+2oicAX2CDPeRKjdOvgSkoI+17y7JA9QRgobNn5KLfwcxYHNDXn4gK6N50iuDjvJpstwPzQ7aaJH/H6G+BeiPHIjOcP8ITms1nio4UCy511tWNfr09kGE1IEBmc2Hv6vlziY7zwaZKJ+P68vfS7H9V0OTUNH1ZUYnuy X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(8121501046)(5005006)(3231022)(10201501046)(93006095)(93001095)(3002001)(6055026)(6096035)(20161123559100)(20161123561025)(20161123556025)(20161123563025)(20161123565025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(201708071742011); SRVR:DM5PR03MB2698; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:DM5PR03MB2698; X-Forefront-PRVS: 05143A8241 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR03MB2698; 23:qHrX5007eKnJgVBZxNRtUL8BlVV+e1DrBOr/+Yg5t?= F02kiJJjNcR8WH+y/U8V8M2KFbKFzleGOtHxPW1jSYuT7B7ySWXunU4VBWlAaUQLQyG0JUtiZCLEdh4gpatWmA2Y2R9xEp9ZmopbtEIDB1lLlC/lhW28BY6jU2l6CtrQKD/hTUggsbDBLhF8M+WuFoP7HhigK1w5LSN/FxUYFdC+xYR7DaGNHxPdzLxhn4P9Sl4YZ7Z6l6WAb2D8VTHwPkZJyZ4rQShtadJw17+efE0lr92KeMDULWensVJEaQYXPIjvv9kAqXdvozGpnD/FFVoVv7JWzhhzPhrvzff/TiMgYEwFb7sm3WNUKbIwalF4zpgtvftuAD/KgoglaLf1MeHHrYBRJC+A2XVVBOhrSMTWaV9xgkXcR8Gg9jPgeEFLU3FMF3SQZAZaiD991z5Y0rBvuRW8etG1i23OV9CiH5dAuny1McGhHEUzU1fagx2kcP4orjNDpGJET0UNGAbErLCrJ5apSFT1E//aIfEgWrjpQDIPp/HTqBNE2bUmv5qnax5b71c1+BJnhdk5ZVTHCV6uQC+BeM3EVEDQJGT22MZTMbKzk5oyCOrl1rD4epjMQIGyN+kTcXIBEraNhLh/x5MA0nKTC/8//hthHQww30ogbbukaSJYOTH3knpjbSQsFkiqPusNjLDdWGcgpJIBXBirKooRIqS4n0IijXtsuMZQkt7WBCChtXuskznAClRQhsPHBqVepWG4MzO4Yvvxs1CnOV/m9gvtxPOo86mDNtOTDV1UT/uoOggGFV65ZQ67QlrJ+VD8KMLfngKj8xt5etyRuhlcTAuvFLCwCE/KxOsnl2UkXnA6ujxxbReRkwVjxZDZzMnx8pjk+A5B7vleJ/H4P9f7+jW4/RQTrxK7vwpxtoARP7Qhh2AtVNcAPMyWbadJ+/cB1MmCCgw+8zZ2Rk+eo2gSgx2RIMzh6S8rfbQOn0B2mcExPgage6VOWrMA77GDEg+IeNfOTG67STD84h/TvsCnqLFICrNQvMgWhtZ/ynC3+Pnc8RGjo5MwoeCh8E= X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2698; 6:1BqRQDXIC4sra39sTQ+ocMpk1w1BvmBo7fQs3j/UgTcr1bAchxPkMKdky6Flb/v9QaHBgLALQIWonmB3jEYpIrAIwEzWB0VjNjBmoEkMTU/fOSBzWmpCkwIuqDzQUdZZH3nXbDnE+bqSiV38c5UMJE9OHmivTxWaxcUeaSaPf06j/02WShhl0Ax/6nHpD/s3PEkHE6wak6+pdmrlYq0emiik5/K4bSvBrKsnXfd0eL63RDy7kuK+Or4++dgTWwMTQkjtE4kEFKopQELk2/VpzFGkR90BBrOYWOhVRCJ3sh+E9XWKoNFNbCrkO1VsWct5u1mJSpbWaqNl7hSY8ZOhanGRunzhPYgKgefakVywdA8=; 5:31MRsKCRH3Q9/AneWf1vaQKyrbWYx0HxZUfO7Ym5aisE2yZN51ZgCx7goubsrExFP6G9XQdJg+nhCJU5JUVFA+ZOG5ZBsqCEj0uboEV0kAgnAxH+Gf2twDUigPpqzFCk2wYXhI77/LRIOCocT8X94VoceYXuO4EwyG0P12Azivw=; 24:9wEeCokR8cWcy+OAJURqSwpt8TEbxngyTT17SFas6iEnE98WNE4X+oxigWHtCcPlQkRq9voPTOtFXppXRS+QYEfo+Zl5SwCyHv/l0bDmPZg=; 7:cosna0bTsk+isvhGYK/yYvjZAqRY9v2sHEiBt9XiJltm+EDL9V8Murb6mqisj77YWp2u7yRhfgfW+XtY7H7rLy+nRJ/dMiGfCM7FLrfDS6J3cWAbc+bVKo+lwOI5CZFItMxQC6fYcB0Vrp8bg2fa5LmNuHEX2BqoKJn5L89+mAF8GlSGHI1zfEpE/HiTZVnRB1GSBKRJVIric9lM2XDE6WlpWMjFphBhXj54xLYIhYmdcXNrGXuBLso840gOMzae SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2017 21:16:14.9116 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7facfe0f-1e34-4aa3-2ea3-08d53db7bfe9 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: DM5PR03MB2698 Cc: Stephen Warren , zijun_hu Subject: [U-Boot] [PATCH] armv8: fix gd after relocation 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" Commit 21f4486faa5d ("armv8: update gd after relocate") sets x18 without checking the return value of spl_relocate_stack_gd(). Signed-off-by: York Sun CC: Kever Yang CC: Philipp Tomsich Reviewed-by: Stephen Warren --- arch/arm/lib/crt0_64.S | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S index ccefce0..9cb7055 100644 --- a/arch/arm/lib/crt0_64.S +++ b/arch/arm/lib/crt0_64.S @@ -120,8 +120,9 @@ relocation_return: #endif /* !CONFIG_SPL_BUILD */ #if defined(CONFIG_SPL_BUILD) bl spl_relocate_stack_gd /* may return NULL */ - /* set up gd here, outside any C code */ - mov x18, x0 + /* set up gd here, outside any C code, if new stack is returned */ + cmp x0, #0 + csel x18, x0, x18, ne /* * Perform 'sp = (x0 != NULL) ? x0 : sp' while working * around the constraint that conditional moves can not