From patchwork Tue Jun 28 12:18:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Z.Q. Hou" X-Patchwork-Id: 641523 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3rf4qj3zZRz9s9N for ; Tue, 28 Jun 2016 22:29:21 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8C6ECA75A8; Tue, 28 Jun 2016 14:29:18 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8zWwW1NsMb_B; Tue, 28 Jun 2016 14:29:18 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D5350A7527; Tue, 28 Jun 2016 14:29:17 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4F4DFA7527 for ; Tue, 28 Jun 2016 14:29:15 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Oz886qlWs4Q2 for ; Tue, 28 Jun 2016 14:29:15 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0093.outbound.protection.outlook.com [65.55.169.93]) by theia.denx.de (Postfix) with ESMTPS id 96DADA74F1 for ; Tue, 28 Jun 2016 14:29:10 +0200 (CEST) Received: from BN3PR0301CA0065.namprd03.prod.outlook.com (10.160.152.161) by SN2PR03MB1935.namprd03.prod.outlook.com (10.164.114.159) with Microsoft SMTP Server (TLS) id 15.1.447.15; Tue, 28 Jun 2016 12:29:08 +0000 Received: from BN1AFFO11FD034.protection.gbl (2a01:111:f400:7c10::146) by BN3PR0301CA0065.outlook.office365.com (2a01:111:e400:401e::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.528.16 via Frontend Transport; Tue, 28 Jun 2016 12:29:08 +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; nxp.com; dkim=none (message not signed) header.d=none; 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 BN1AFFO11FD034.mail.protection.outlook.com (10.58.52.158) with Microsoft SMTP Server (TLS) id 15.1.523.9 via Frontend Transport; Tue, 28 Jun 2016 12:29:02 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u5SCSs7Q021358; Tue, 28 Jun 2016 05:28:56 -0700 From: Zhiqiang Hou To: , , , , , , , , , , Date: Tue, 28 Jun 2016 20:18:12 +0800 Message-ID: <1467116297-33720-1-git-send-email-Zhiqiang.Hou@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131115905479470235; (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)(7916002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(5003940100001)(8676002)(48376002)(8666005)(106466001)(5001770100001)(19580405001)(68736007)(50986999)(81156014)(77096005)(7846002)(305945005)(8936002)(50466002)(19580395003)(81166006)(47776003)(105606002)(4326007)(86362001)(2201001)(229853001)(11100500001)(356003)(50226002)(87936001)(586003)(36756003)(189998001)(92566002)(6806005)(97736004)(104016004)(2906002)(85426001)(7059030)(921003)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR03MB1935; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD034; 1:9h3w+eEb869YRLP4n5exw+qib+EIZ+dUndikD5LbozQvSFpYGSLH8MT6DiAl/CR5f0IhOfgeW84UTMHYgqy7JL55yG/szlWdQdxGLD+FqB64DP1nQZe9HGVNweOPUZfZYGaz0eY5kIa4MvZvp3sI4CaMm+g/zaQOmNOav9TQAw+lx9Nns8VgeXgSi//r7JXYbtPvNQusH9QtoToH980pgWzBH+4IU037pGDtHeLLnCO9NlLznQy43zOyHK0xZnm3DUDwkdJF+b8GCIqJScEoAT8VCVG4r+DcMleCf8Y0ZT95ceIFBl1B2SudLtOli+RVGKUUB/0qSwL1+hQ0MOMWDm/jEP5RW7RsaQ1tt6ITtjfBhTk8M4KeCA5wJWBQYVwAmxQsyldI44LF5k7hr+JEK6rOb8ajR0gqSshovJEH/rhAq0N+nTalMBuOaK2VfhB8FLstmGbRG35GFRyC8rcdU7ZAg7EyeDG/0s8AbKfaA5HbGdSVSlp4Wbxq3ajwrbPX/QMf1cKZAGy/EUVLfxMjmXaUonUUbPbRBCzOitca7xnA1ja6z0tV6aOkHP+2HnZcS3kZK7YsJoRixp3U9lUlk1fiJc3ygd4QNp9YhF09wpRnOOn9Ww4MQqKAG/o4lJpH6HPSmYRawXScm+OH7mHfLRxF9X2xg1TFLqElfsm6/e1vCMIuXhTIEuQUf9MYmQJhYuaWv4pVdJ9ZE4mZKsVvMsa5oUrrLnL8P52llQszkL2H6567VqWR3aEEIZ/hvwWSDLF6nODzpbmoFcZd90N8Cw== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: fb2c6246-c0f3-4064-8b3f-08d39f4fccf6 X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB1935; 2:RIhLbWdyolinqTDh+etVHN2N9UrtWHjZfjwijtVdJURu8710+vnqh9xOSp2+eKjnlJVVgmmKjkeHHNMThNEaPNOCqhv2JwmVxDPaZ4dLbSeLg9C2iURTDwfDK7Vgu6cpSkCvvagF35GxZuR65Mgj6lQ0WOXfQzzTk9yrah2EtcqhMObxgNsTcZckr9IZagXY; 3:bybaTtr30qT2AqLvbDjigMQTmzOSOE0nLd1ej0bAq6EhMxxwJXGwQi3O1YtSNr4/GQp+mYP57QeucZY3B2YpXVdkseBtRGOg5MWGOA+YlVc/wdv8mkhDbGIWBGdUw+9b6+WdlXMITJI9e8wcUBQ3rEBEbZBQZvVeLyIVS2pZ/5HgRFvoZzNER3SKWO29/fArlVr/xykKBgBpgE0qa2oellhG5DMhftV5Cs3Hx+qXMCA=; 25:wNsU+hEPrssaXUdaqvM/1iPFQZ6uR4RQwOAf3hrBdT7JZmikNDa7b/LI1/QPFNXgsPqxrU5B2nFZRdnX7b4kO5WLU2OPiiC6kRQeuABKH4XqnAQZywbXyiOtyMHZ4rvTCPeOJD56jfvmuDfKIdPU4+E9lrVFccIW3zVqcmP0ALp7E3TNnefAxes0Sh0X4L7ivBeXlDjPXyXKHbc/5DZr9lNJUBXfMoOGUYhw8KFc2LKVWt27UgTglO2SVs5gp/7E X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN2PR03MB1935; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13023025)(13017025)(8121501046)(5005006)(13018025)(13024025)(13015025)(10201501046)(3002001)(6055026); SRVR:SN2PR03MB1935; BCL:0; PCL:0; RULEID:(400006); SRVR:SN2PR03MB1935; X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB1935; 4:NzS5IrZ0IbzsUjBrJe6Yg5GT8uKtjnw9y3jN64NJAuUFlRpqtQ8WLz7sRkHSCtB6RBL9w/DQDUwhfB63VxqzDo4tlkbz6fAdjveHmOa8wOYQP9pcUkV7M1N05PBvW5mul/EVlggWsS4T4Yhl+d3QW+XnkYnAeg7vJboXfvyeUODxBO4qyIYkyzgU1wPlBcSXnw8+VJZqvHgNVoUCvcEIq1OW9Jd+paoF8d9SrAOH2fu+PPIQkVx9tIdD9TJm6ggUYLC/ifpiIyqp0PS0wuERoCjdehnsSjtCCozZDvACdb7UH7FjY8sx1sjw5Sa01CC4D/0VTgEyKaiX/Hop4dwlFKqFCX4tmO4qmVIXMj5xkVG29eRdWi4FoTXxmS6bShJ9eVu+mTknQCj9ovKQo1OtgOpVII7+b3/uuLzfaty8SV+HUmW42K5HlmGr3uWAk6HLR7vV13Dkfpp9Pr1BDYNFGHImLX+vmZ/4yh3IN5+xvSfzm/S3FmtBDqGUS/4kUjAcWMyP7j2tOLY324LoWRg7ww== X-Forefront-PRVS: 0987ACA2E2 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN2PR03MB1935; 23:XP4od03d8LupV2ggDkkIFDkFEOpYFbNkoMD3Ro+0N?= =?us-ascii?Q?nOqOIydSNXs+lnF6x4ck/lP4Eki4hGIRrcCCk/RZbO1K3Lkz3WTK9ZPrDZAs?= =?us-ascii?Q?VPteeiq40rb5YJNGLWWtWUBMEHVEzYTEjkB9sUBs6/oUT39BSMnCDooCTtBd?= =?us-ascii?Q?kBkNYvp7x1YgLpMmgm0e2BhV5eD9LezuGbJ3NZtS1m+g7v8HRIfOaGd5dv6L?= =?us-ascii?Q?WkkZgM6t5hyfXsVGICC3tbWEQJsA4r6rlrn1cDtcQXmbAh3gfsg05Upt0ZaF?= =?us-ascii?Q?VcsnwaDrleTV+dfXqVugko1dfHsdjr9E2SBf2/xeHetRpDa2oU3ZW6GUSuCF?= =?us-ascii?Q?ei0cS8T5+lt9PO9+bsyChi85UENZBgabWgS5AYDeEN2AOIzcgh8mtzzSTYhk?= =?us-ascii?Q?r4Q/FUtnvFg+q42XT2WjvfIbDSzT9ZC9cNa6aZVEWYYvyyFNpaAj1UVwGit6?= =?us-ascii?Q?Bbk4fxzwFBhnP8QlYz4R+GjRp2PefxyN52ap9+xc8KZmW63NtgeOdNpuWQAo?= =?us-ascii?Q?9clVufCdVNFs8Qjb5RML37du0tPjOkHFyfPW3Yw/uscoAyllm7XAT5AK6/tz?= =?us-ascii?Q?f2X/5aeaoTZg2flrd4CW69pRqKXIfS5AwP3D8553QGiUio3p8choGYmVD+zt?= =?us-ascii?Q?MMa1FOmicpp831DyTVY2gQSc7RiFVF3sg+b8mNp57kag1QdOvDepNVF10+tl?= =?us-ascii?Q?0KUvotbzLc2mvIUG9dSIw0dPkdvzTnjzt6/ipjCrjm/jcHLa3YE029CHyJzM?= =?us-ascii?Q?olhksslD9GBQuVLerkNRlHJfP98URKHNVfdQpREZXtfiybG5hzt18pbuQI3o?= =?us-ascii?Q?bn6JnDh8UN8SHmh9uW8t/7TNgpFfs8thowlxtQ8RCzsK1ir+sob7y+XTxU3i?= =?us-ascii?Q?YlH8SS4pC5Q0ddCJTxGfUIryMPS0GTXqGgv/UW3zSDZJHkb33A6dUMyGthPq?= =?us-ascii?Q?JVaBogvRKaRe4sTsfXCqa2eSIo5URrnT7Dpokv2o3iaf6ep08SdJ97id5HEg?= =?us-ascii?Q?xlhi+ceAmZJtts7M5A8j/07hUEYPv7BsNLFQMeDCCwAfIwaCxA7fo03JeKWx?= =?us-ascii?Q?xOdctvc7ZgeKplTaHxi0mcFT7bor2rM98zsponRb/BQc7F+WwRgSFofDuCZz?= =?us-ascii?Q?PIJCWxm9jSpAjCeNhZkuSTtwOb34gwegfAVY2l3HmiwtCEEndL90w=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB1935; 5:geb/X8YrLzmukA3cL63HmVUcuPN8NnGJvzfd8U5q9guKKNNxov9OgSkXU8QjwE5dGnF3DQe6OZpI3YOnLBGeWxJz3U0xoNMrenRfm6viRkSpqSDHww7rwBtF7Lw66hNGq1r45mit0Hqhp3CRBsj/5oHPZX9nQa/7cNjitZCoN4A=; 24:Zf3RxEwF5IDQea9JG4VaKeeCDjxoNRBZQcS8L3vUf124pIWgDkGQetVFgPueleT8iBlmiWg853Y85uofgEP/oWM5uCXlpz4QsQCgYmQ+Pig= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2016 12:29:02.7835 (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: SN2PR03MB1935 Cc: Hou Zhiqiang Subject: [U-Boot] [PATCHv7 1/6] armv8: fsl-layerscape: add i/d-cache enable function to enable_caches X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" From: Hou Zhiqiang This function assume that the d-cache and MMU has been enabled earlier, so it just created MMU table in main memory. But the assumption is not always correct, for example, the early setup is done in EL3, while enable_caches() is called when the PE has turned into another EL. Define the function mmu_setup() for fsl-layerscape to cover the weak one. Signed-off-by: Hou Zhiqiang --- V7: - no change arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 8062106..d5bcf67 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -422,15 +422,21 @@ int arch_cpu_init(void) return 0; } +void mmu_setup(void) +{ + final_mmu_setup(); +} + /* - * This function is called from lib/board.c. - * It recreates MMU table in main memory. MMU and d-cache are enabled earlier. - * There is no need to disable d-cache for this operation. + * This function is called from common/board_r.c. + * It recreates MMU table in main memory. */ void enable_caches(void) { - final_mmu_setup(); + mmu_setup(); __asm_invalidate_tlb_all(); + icache_enable(); + dcache_enable(); } #endif