Message ID | 1488397455-4223-1-git-send-email-york.sun@nxp.com |
---|---|
State | Accepted |
Commit | a045a0c33330f4b38b198651901c96829619e60b |
Delegated to: | York Sun |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3vYQrX1tQqz9s7d for <incoming@patchwork.ozlabs.org>; Thu, 2 Mar 2017 06:44:44 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id EDDE0C21C7F; Wed, 1 Mar 2017 19:44:37 +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_BLOCKED, 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 E4B3DC21C2F; Wed, 1 Mar 2017 19:44:33 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E5CABC21C2F; Wed, 1 Mar 2017 19:44:32 +0000 (UTC) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0051.outbound.protection.outlook.com [104.47.42.51]) by lists.denx.de (Postfix) with ESMTPS id B16FEC21C2D for <u-boot@lists.denx.de>; Wed, 1 Mar 2017 19:44:29 +0000 (UTC) Received: from BN3PR03CA0096.namprd03.prod.outlook.com (10.174.66.14) by DM2PR0301MB0736.namprd03.prod.outlook.com (10.160.97.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Wed, 1 Mar 2017 19:44:28 +0000 Received: from BY2FFO11FD029.protection.gbl (2a01:111:f400:7c0c::185) 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_P384) id 15.1.933.12 via Frontend Transport; Wed, 1 Mar 2017 19:44:27 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) 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.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11FD029.mail.protection.outlook.com (10.1.14.212) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.933.11 via Frontend Transport; Wed, 1 Mar 2017 19:44:27 +0000 Received: from oslab-l16.am.freescale.net ([10.213.172.1]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id v21JiL3M002194; Wed, 1 Mar 2017 12:44:21 -0700 From: York Sun <york.sun@nxp.com> To: <u-boot@lists.denx.de> Date: Wed, 1 Mar 2017 11:44:15 -0800 Message-ID: <1488397455-4223-1-git-send-email-york.sun@nxp.com> X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131328710674209604; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(336005)(39860400002)(39380400002)(39450400003)(39840400002)(39410400002)(39400400002)(39850400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(9170700003)(50466002)(86362001)(2351001)(2906002)(356003)(110136004)(54906002)(305945005)(626004)(77096006)(33646002)(47776003)(85426001)(53936002)(4326008)(106466001)(8656002)(105606002)(189998001)(50986999)(8936002)(8676002)(50226002)(38730400002)(104016004)(36756003)(48376002)(81156014)(92566002)(6666003)(6916009)(81166006)(5660300001)(5003940100001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB0736; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD029; 1:n76i2AqEi6639qWZ+nHM4riZO8UDh736KoL7GYEEyv6rSg1R1MNFJsWdu78Dv3HfOELr2M92RJOjmUgtYvmCnw5gaXMUE0LB9LqQNVkq/VQzlKeKAm8B+eGEJ5wbsjl9qwD+LBMvdKWagK/7FoSlP7X8XNl80OoDfc6q48v5hPOGjnydhqIOaXG0R3BJVtfIOLGs5E7LRq5NUZhYtwBwhomKPNOMythrXZKR5fCnF9WEPSCiISGFM8X6jP3p4FOtMrUpqdvyOVExy8bCH2P5O692j50ppKHSf7YP8FDiQlkbQY520AztXnipm2U4CxHYWzQSLpVlbsIu+21wfIvgEwXCpplxfwKNeoh4SJfGvQ3wx5X7zbK/dKFeqMTm/ISmGNDphe7soJd7/w2yFp1pLNfla6RBCaCphyvsnejo+B2Gt0L+1A8U9n+QCKdVfNmg1hqs9M9VwgwbejJJDephmsWAd0wuFHM0onZynAvyTn8fWa9XQuXFjCERwCWf6feVA7sSYTsL8qDHukRePdiP5HMqv34PDekcT3Vu8JtuPW2ZWSrlViMIw9u3jGTXplY3whgLohwcgCOYFJxxc3lt7GOUhexMGLRTr8SmrE2ee/tGFLwT3AumIQKw4Y0SPRzGnKwQpQRpEso7SlN4sqHilOvgjx8+ZelSdKp0Etm59shfruLXTKgLNoB7LfiDlIZYnwvEbLnCfYE33J2GVStw3g== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 514358a8-baed-4a23-6edb-08d460db5eed X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM2PR0301MB0736; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0736; 3:aV8kT9W8Rwlf5kLagrV3v4jPnDc7PMzXXnk1pclNZLy8GQGv010JHzfyIdiZZ2FTVDaknQ7/+y4nhKjTZQMIPtIkHs4sY0Ci4kgbhtqDOY4imxiOodObTbo45B4hoBiC3kZgdiDGgzwYT1AkYnaE3/yAxJZOXOXJrfIt9KQBlmMrv88Cg/xfNzZ72zmQdSRv+gobqR+oU5vtNS7Hx5pIvUhpPc2cp9ODJTf/BblajfRRncZuQffJj4u4XaNYpvdi4iqfEkt+R8tzYx+aIGpNqcYEGDFcEbBXVPslBfUk9YXvL+yHEH6v0dZ879pQ5VDUNbcmlALNAGajs81FLPFSPCNH9uaP3/oG87+W4yg1tziLN5l2mBwOnnIxPAo6wWqT; 25:57aoa1mHXFs0mgwpluPOyv5DjvTqHTX32mCWzYzTB/1szd4YSZ5k8lUdArTLp0xXOPvSbTPExuc3OFfmVoFK+mHS+5iks9sJeJNvgJpTVfCUdr19pzRpZphUAger+aDhlwc8zlg971QI33WCgjOIRb+s/LbiShUgFuWbUjQ7sr1+Pc42JzGMf3+q2PiNkSf6sLqCr/Jf4sSTwgenHsWlS7btKDVHBcaalBA4PHnLhNDUZxoJ1GOllC/5NaJqz8iB+iVFx2QofQFxHoafnxOCyuapwTIMuL4etBRvGyUUP48OYRpiWBKCyuQ0IBXl2hbmbypkevBUVTt30hjS9iP6oY+aq/rUNFgyRo2UJ7G9i/Q1f0qSc1oMHCQEMktdeKtXw84RdPl8k4W05XcFOsGs0zKQpImshsBqgCvYx/OaZrlcmpEFbLfYaGUIIEFZiXiNnb9XTlNLIuBuO3y/lZDEaw== X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0736; 31:H+1GRHswMEx/r4tn10vt73earbBCHRI3sSXYV4dDj3E9r1yXVYJVbXsEwfSYTrj2RW2WYCxX3F0gYfM0xP2ypP/oiw5W4FdXXkWit8ZEdF5WfIRdk8iy/AYpWGSZp0MmKsuDZS03JmoCHgtWqq/J7gOSeg0XCGpS8S2BffSKud+ZuWmmObgx96yLDWL3vcCVj7CinbaCfJFytsCib4F2on3mUAnV4CCqAB1UQEERzgFs5T4EoKPT17rM6QlAifJwn4x2wJ3p8PVjfegwZ50zZw== X-Microsoft-Antispam-PRVS: <DM2PR0301MB0736907079643BA2F26F0AFB9A290@DM2PR0301MB0736.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13015025)(13017025)(13023025)(13024025)(13018025)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6096035)(20161123565025)(20161123561025)(20161123559025)(20161123556025)(20161123563025); SRVR:DM2PR0301MB0736; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR0301MB0736; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0736; 4:DXpAuIxu65eI/MoB25LD5KuUrBA8BLXR67qOmUou0KV5PIGgHom4al+o5eQedV8dW277gAKww2MYAMJ/D+rS5nL+bbMPLoNEW5a8nIT+uYwV/C19sN4LyryMJhbnCnXjtTES8rMAjBlJIQyucnevXnCu3+rEAPrl7/LTYVuV2SGgIXknLxN0XXMqdmn3wbKZIyQ17gaCr4eX1KG1FGAoB0T4jSvql3WSnXfSszXpyOFWzPlmgWb7f+znX3qjaoxMP++TRFZL9YqKVf8rQcrU0AtuliP4J/XC0JQZpSLQX8y1uwMtZNwk9QxbiwCtm1DUkhyN3hZB9u6KudLn+MAXttyk3e0mLSnn7iB+OLzHkHGRDJ78ZRJBkc5iK652KH6o726b8HQZolvDps2+RKkurobDyPxy4VsuPgtfBUfnAdVtm0uOqNviGK9WSccrHwWP2OT4pBcJNcDfQ1BpNGxbcIUujZPTN+2veYjX7LI7aG4++Q5UoGHawVoxtW+b2XMbkhftxf9PtmorDDN9Mb6t+0RuwbHAPCysj3Bs7QhKa2bKvllTQanQ2zyfei1QLacXOuKUbwAkc7vkEFhJu3wJY0vBfH+9ofwijeynKD08ta5btHLtaH4j7wA2A88boWBHCkbmEo8MolsrRtLNK42NFXZ5YK7oBF4TukwT9wPFCgwLKCgsoFj+a+0/0k2lQ0MvX2srP+QOeVVc+HA02rvOQcsL2xTORx5Ju/XI7SefI37sksEYst+87GtPdzqmiclr X-Forefront-PRVS: 0233768B38 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0736; 23:bg3bi8YYokQUIis08BpP1MlvZo6l7VSJIG7XTkK?= =?us-ascii?Q?4RsEWl4eO2FFEZ4T0//27MtUCUt1OKa1ZrId6zDlx55+YXsKgdblYEjxuaCo?= =?us-ascii?Q?fsC+pd9LoFUgLNJvu58JjArtE/NfxxMRiw5rKSYwya9wUlNFSniCFsvv/qsQ?= =?us-ascii?Q?gcW3zYr9ggIM/xAT/H2/dVHZy5IGVyoSLogl29CUsoXwMxIzgQcbRT51BdVB?= =?us-ascii?Q?6OmsA+btM+GluQ3sflmXZVGPBREys4di6gBohTXAYWWmAnbJO2KOjJsLxRLN?= =?us-ascii?Q?uoYPgTAuW/WswobRxu0poIByo2XNMuwaP+d+bL3s6kdbdfMRdupStDr2vNR5?= =?us-ascii?Q?QZlEfjfCC+UsHISym4Y25jfR9w++EwH6OCJld+l9uEpagwI0TDKxFm77z3Eg?= =?us-ascii?Q?t8Ld4Enw/LrlLcb5ng2g78N9EdtCdfhs/Z/ydvJ1RggtOSJisNUX/zxb8+yB?= =?us-ascii?Q?QFOox+41+iykHmia8gQcXUCpLMWcakk6Y3ExztwSaTd5LrLgGYYlAAvW4PQW?= =?us-ascii?Q?ZtxAieUoRyCj93rMhmg0oFWIPO7HlZSx87Kngvv9RNHBYqpdOMHJAgqvg+tj?= =?us-ascii?Q?8ejpfpGxYs+hq6XTr5qf4hk3Ig6toUh6JVf0258vyrTS9YMRM4xT6Zf2L/tO?= =?us-ascii?Q?CzT5dvPlJgED+iGkpOeGtX5uE5pHgD4Ia3uMc3BvJOkXmnDLZYvnk9UHeGTu?= =?us-ascii?Q?Bz66OPQ3MSZmQhBw2WdNLhdiUUQylh4ridYT9RyIWp6MuY07jT+UFOjG3Yel?= =?us-ascii?Q?7PyJTUFgutdNmAgS6IYx5dhBfQsWVrDY5FSZhG1JHpELz9LITqw147ygrO5W?= =?us-ascii?Q?PviAB6KMM84P/dlaP8O8bzdrrJkWaXCW8vyJ+0E6Ic156eits2b/stf6rpvM?= =?us-ascii?Q?ZfTdDethHM9pSbzsARnGdcTt6KaVehS5NAJBVF2p4LguL1nRbsUXTpJnFwut?= =?us-ascii?Q?nZcwkaXqFK48Wmf7ExEuOWHktrzVTPEAYP0VwJOE9x5GzNOxBhkWzaQXwFOc?= =?us-ascii?Q?XBjLJA1TFGwaLoVzawAge2egzCMOuLuzy/8EmulVbcZ9uh27131uI+eS3SBd?= =?us-ascii?Q?94NSDLyxDrPH4YPDjUL8i5y4ZkAhPYuBlxmVkO7CqVLfj4k/BmHOonUrdfVk?= =?us-ascii?Q?SUIRAlTqsJYk/LvVxqhbHfow5Ol2kXfRmZSjKlIH4C3q2zOQU0qH8qgDQ71b?= =?us-ascii?Q?+dZnZM5XT3rK0fdQqOc83Qr7/O4z0CjNpglKfuodNMaZd6f54pB8mpBkD179?= =?us-ascii?Q?li++NlbqgWRInFcbwAhc=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0736; 6:1VKIcioaW8yyKvpAVaG25tDucwSq88Rnd3S1rQaBkYpt2DcFVzjtruhgNrhq6S3Hh0YOs0k2YZjlDe7Yz6GgOFi+xJWejMchuyAQnqTRTKzeSoNOMkuRtIYtfFdiMizuyJgsmJFPfeqkMGPogu6UAod4vgP7xeXwd0acovlzcQvxblfPKp3ZuFNVt3RDEGH4f6n6dEPLj1xpj6yHzM58DgN3M2R1Y9yJEyaFoiyGE0t7GuqNQ4uxSPAljkLGsf3/ZSLYcAZk46hnAGlilJic1aUhvtUwR+mXaytWNsFJntazEN3gDofT+3JUTW5vfE/snJ+VLUDRjt1wgzSHclWpmMpQVlW11YDy+5InoovG86FIr8XKPa7NSr02rLdMh2bs8TieRaECO9JWrH15MPpL+6NmtR5RdxveQCmhqh3teXc=; 5:+Tv97X4lZXtcl1yIlg/VWM2WiZmOg6gnFTTbUh/CLZYrgGRJO//DfkZ4DMfVmbvK567Cowt4cY84xlyw5tw+W5UIe1VdaFUfR1l9OkCMcc+Q9bi6FA7rz/uLwa+tDGDNaya8hui+QDrO6IT4HafrabPqD5Cgg6tzV2kKOWCjHbu1zk/zBXG5mLPU9pOPrJZ6; 24:F/0x6hO35OUnVjv/Ri/JxSc/nF1uZ3DoajVG1b2OzbYwill1B31ML065e6aumf/noj0Lsp/Q7FBvWnvRBWqZOYtM/o81/g5veNziZ781vmg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0736; 7:8krvZOHJFhvdKws2zS2/J690xOW1q7cEpl02Moc7bqmWl1fL7RJVKSOI/YjNcxgMnP5K9sxhGIVQ8Gg4RVz1YlRCX7mleHZ06zYNH5ynbWGyo42GYPAJb/O4/O4AwFS7xoIRBS9LV9kApQk1aq6pA/KUcmVY58cFs31rH6ocnkCJ5KuDUy0spwIJSBJjBpsj8QRIRqv1WZtM4AgXKfuYba6PZxtWdutdd7EwWtzC2aWjpJYhW09e1ZRC9qgM3MKwOwYIoV94V+AvWOzgh6fb/dX/kfLEReRJk9VoyNiIJV5/3EzlsnYVwli54kP+KcwXPhoOZnlvx395CCuY8Ae6pw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2017 19:44:27.1557 (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.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB0736 Cc: priyanka.jain@nxp.com, Zhiqiang.Hou@nxp.com Subject: [U-Boot] [PATCH v4 08/11] armv8: layerscape: Fix the sequence of changing MMU table X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <http://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <http://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <http://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 800ad62..afb6cd1 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -181,21 +181,14 @@ static inline void final_mmu_setup(void) setup_pgtables(); gd->arch.tlb_addr = tlb_addr_save; - /* flush new MMU table */ - flush_dcache_range(gd->arch.tlb_addr, - gd->arch.tlb_addr + gd->arch.tlb_size); + /* Disable cache and MMU */ + dcache_disable(); /* TLBs are invalidated */ + invalidate_icache_all(); /* point TTBR to the new table */ set_ttbr_tcr_mair(el, gd->arch.tlb_addr, get_tcr(el, NULL, NULL), MEMORY_ATTRIBUTES); - /* - * EL3 MMU is already enabled, just need to invalidate TLB to load the - * new table. The new table is compatible with the current table, if - * MMU somehow walks through the new table before invalidation TLB, - * it still works. So we don't need to turn off MMU here. - * When EL2 MMU table is created by calling this function, MMU needs - * to be enabled. - */ + set_sctlr(get_sctlr() | CR_M); }
This patch follows the break-before-make process when making changes to MMU table. MMU is disabled before changing TTBR to avoid any potential race condition. Signed-off-by: York Sun <york.sun@nxp.com> --- Changes in v4: Revert the change of C bit in v3 patch. Changes in v3: Instead of flushing d-cache, following the break-before-make process to change MMU table. Changes in v2: None arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)