Message ID | 1481455478-8258-12-git-send-email-peng.fan@nxp.com |
---|---|
State | Awaiting Upstream |
Delegated to: | Stefano Babic |
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 theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3tc3fP2bSNz9t0G for <incoming@patchwork.ozlabs.org>; Sun, 11 Dec 2016 22:29:49 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="kMDWwADk"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A0296B3850; Sun, 11 Dec 2016 12:28:50 +0100 (CET) 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 ddbUusyj_Tf5; Sun, 11 Dec 2016 12:28:50 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 36C2FB38A4; Sun, 11 Dec 2016 12:28:28 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3C57BB38BB for <u-boot@lists.denx.de>; Sun, 11 Dec 2016 12:28:20 +0100 (CET) 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 ngkeUVT_WuvY for <u-boot@lists.denx.de>; Sun, 11 Dec 2016 12:28:20 +0100 (CET) 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 EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0055.outbound.protection.outlook.com [104.47.2.55]) by theia.denx.de (Postfix) with ESMTPS id 04E33B389E for <u-boot@lists.denx.de>; Sun, 11 Dec 2016 12:28:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=YOKc8Wt4OVJRBMA0Wi4NciHyGltmgFajMJVT2aNC5mE=; b=kMDWwADk5Zpq+Myls/1GwGH7ijC5LttWlpvT6IAO0Lndwn3bmmhBHMiax0y3kdUO1W5LcY6nFNl7xUFPnEFhrqFEJgEmBITKiDsw2ZQQpFv+3c4EDvjElp9M3p+Sp2geWejcm0FJHvKT49n40NLNpL1y2ks6ylCt3vIlvDqsedE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; Received: from linux-7smt.suse (192.158.241.86) by HE1PR0401MB1801.eurprd04.prod.outlook.com (10.169.118.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.771.8; Sun, 11 Dec 2016 11:28:00 +0000 From: Peng Fan <peng.fan@nxp.com> To: <sbabic@denx.de> Date: Sun, 11 Dec 2016 19:24:30 +0800 Message-ID: <1481455478-8258-12-git-send-email-peng.fan@nxp.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1481455478-8258-1-git-send-email-peng.fan@nxp.com> References: <1481455478-8258-1-git-send-email-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [192.158.241.86] X-ClientProxiedBy: PS1PR06CA0016.apcprd06.prod.outlook.com (10.169.59.154) To HE1PR0401MB1801.eurprd04.prod.outlook.com (10.169.118.155) X-MS-Office365-Filtering-Correlation-Id: cec4ecc3-9a08-4fcf-2f8d-08d421b8c570 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:HE1PR0401MB1801; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0401MB1801; 3:6q6I56cNF4RFm4kZpX8xiDzAOtu8tKKUxcCCswosC2nttZJBrZN3rXX2dsj1juceEAJ2w6GjGvFtTCpRXDKo903H8bFvicR1eGfB1DajuqAYSClANohhnQicVxmilWTiMK19lYbPgQ+hfYC2VgMewNOBXdrqdFXRUJ4tHeVCXn+b9HaAf5q17lvhxNCXwoevXN+cSjyMM/tiiDb9brXn5J20JNjVwfls8Co4BNKNlQkBWealEBUbz+gPrWzT2AJepoQxIfz/AFQHNwnrlUdVPA==; 25:fVBdeHlqE6B80eQqsO7IzCldw53DJWPM2BIXA0/xS2IWRBHZZ/obc5JCOw+OcBy4WXuMaRHmrigjBPkBlX/V2t5J49Z1WpiwoTpnsVqpV0uxJUt1AhY+Jr8+eSTCh1TsiazLt6qSr6EbWiCQ2po/tR0oIvkHjk1rXHVaXmIOROvjQqr2YPj9fn4WfEeijINCpUdjh1HGjDSKV8SJAjZ8FQ7yruE857lYYUWXalN9Po8fqCkdzrGvTsNswRqxug+djYVfE+xTuJuWnwV6FUjgdhToULasux0vpyLvUyGya1TIuJPvkqxfjRn4uj9EP1p+X4Hx221AOnIUBbAIlGdH7yPQKVrhjYjQ4t/S8lxS7RUQCVWciK6v887xVvuW2UPOK+nqwU9k5rP6bDceYARP35pTm9Abn6KvMaF7XEPjDYo9/8K8+DQJ0ILO3SodNlOq8mvYQx/Ix4PCquJ6papy4A== X-Microsoft-Exchange-Diagnostics: 1; HE1PR0401MB1801; 31:VEvupq4FrQdQhFmGb+2Fxf0RLUhuxyrH7CFxLZu85lzKfoF4f/Vc/Kywd+smc/X8vEuBcAa/HCmMQA1OtePKH5KwbXNG4Y+Ia9okIProFkQtbbLw94b28fILRdmdhCEvoIcMOI+qwfBCcV3/r44DnerxP47A7BbX6iPEASnJK80MSPalD+bV7mUSs5+wVhB/WpIx+BqWozQUfqtwhScgFp7zYKSjNsnuKDA/PzcsdrdYoIs4g5wCGuVMGN4VB/Xb; 20:vWa0kVBvpZHrC7yANQtfG+B3iJ79kxolLuIGAYM4cTKW2RAo5bDambHMyalBROLOwLNjSlwhUsam2UvOi/ngw8A75jy6xXpzx6/Zr2fmuKrfF7319kerSDsTTUdJDCU6oMF0BX3QG+Gg41ERWrVbNV3510iJh/3dMA95k1APHlsm5d3x3qgFK/k049tVPlAX3gDhQNM+QorFRHMsvNh1fefZ0tau3mg2itZ2bDb75uaeCq6feGvX7mEz8kmPUjChZgRViBPfA8QjFsBX8nksVhVOb7SDSLtDJhPE4BIp5pA2GvjMOSeo03wIXfsgqdmDKIUC2ZhWVtJ/V03BQIjWdEFkKyAHX8OauxqI1TtxY75I/poVFy0+sC6AthXMyB2tIZ8rERm3RhzLZGSLnxvPmY1Z6bjsg/autyeSk8f+y7wyqSf/JFVieJMH9TVZ4I8fIbqTFDTjtcfazXcLs2qM8QSft/a09OSutWheXhgYKmOXh5pDWkauA29e0r9EMvTi X-Microsoft-Antispam-PRVS: <HE1PR0401MB1801A2E4128BD63D483E10E888990@HE1PR0401MB1801.eurprd04.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6055026)(6041248)(20161123560025)(20161123564025)(20161123562025)(20161123555025)(6047074)(6072148); SRVR:HE1PR0401MB1801; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0401MB1801; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0401MB1801; 4:W9KWjdtpiYlN9+wxcGejtxzDf8E3cpXa10gOi3OWB+H0R8LNyO+ZiA9mP9sxgoQCcXjBgX4XV5PMxK0w763FQXWh/+W/5pZHgdGQVZQeaHjb4dcRjLfhdeeIBwBpvNGNd7W94N/a+NPBZy9FCTzy3EmoMG8iEa6hOn7IUnaJdCyMORd6Ja4ju9wvH7RPuzshUt78cxQm53jxgetefD1nWMjq/TNcCfjJwf/lTNJ7/YHO4oj/KGYT/zjyfSdgiFnA+re2mMpFYoG2tBb4rjGkVLtvbkPt1sn1zn7OKlEkioE2xDICjYYhdFNkan1ai0RQxckXopJ6u63pbwwdivgt9ytMyLNbBzTmN2JvNPdjMaBFfTxBCVTVFHV1XmOuf82d9pBm9IwEMXPvCu8iVd8d8YHk+2DH7ECh1WKLK3mspVGC9qnRjJFIoRrx1fJKKDwBq+ZXNUdH6Gjozjs8fFYJyBCfVVGKJbhhPj31eNvPjcrB+oaYFbG71k1KpO+6Jm+pgTr7+fpGfcwSTj9wSagHyXZHptbSkyGitklJ47MD61SHxLWnp9hzb4wq7MDdaN9crtnuYxorJwim4FFGjyV3qoWmdnrHduLHwXN197Orm0rPQDS96NR3FZVrE5u2EuVfmOcuUWs/zZceN+FZu+mH3A== X-Forefront-PRVS: 0153A8321A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(39410400002)(39860400002)(39450400003)(39850400002)(39840400002)(199003)(189002)(47776003)(5660300001)(33646002)(66066001)(189998001)(97736004)(7736002)(36756003)(305945005)(6506006)(86362001)(6486002)(4326007)(38730400001)(6916009)(6666003)(2950100002)(110136003)(6512006)(5003940100001)(2906002)(76176999)(101416001)(50986999)(50226002)(50466002)(48376002)(6116002)(39060400001)(42186005)(3846002)(81156014)(69596002)(68736007)(2351001)(21086003)(8676002)(106356001)(105586002)(92566002)(81166006)(7099028); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR0401MB1801; H:linux-7smt.suse; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR0401MB1801; 23:1XFxd5lRex/zWQ2kfBTGlXcuEy0vM4ynFQkt4Kl?= =?us-ascii?Q?1JE7E/AsqUNhPtrMjy3WU+EzlQ3WnaM6iXV3Q3NXjS79caNzn9zLybPXTjOk?= =?us-ascii?Q?dwXvmsbAyQZNoZVxhIti4QNrCc/0FqzUSTZNMedmlDSnwPpBohCp4W5sSiJe?= =?us-ascii?Q?MGTV5NfVxrRxj1FOL5lrEAhVwzqzfRScQ4Mqqh3e1yC5r/WVz46yW0TW7ki8?= =?us-ascii?Q?bx3XqtJuaScynQq1kSKKHMRQC9Vsp/oSnmzhWXgcEKhJfFyD+yAbJTED4r7o?= =?us-ascii?Q?hkEnQB2PyEsFP82aWEPxyx6q1rIGrkCj/vUwnYBYwxf0gL+7+x/LHBWTwJND?= =?us-ascii?Q?uoLmZO65Oqbrpu2GYwNdJpDCT+XGpU/HFg4/64npXYxYO9TJsysA6tsPk+Ib?= =?us-ascii?Q?nbExzEes6uGBdYqptEdplyvGDp/kDd2owOfXCYKI0q0P0FVL1msWs1/SzV7V?= =?us-ascii?Q?F3IVUHx7hSZ5UYY70UlcuQpqZ4cmu9IrRBjcCbieKP1GdU7T9a9rgeW/ZcxG?= =?us-ascii?Q?DmcJ0FttPqxcGlaNb5Ayd3YrCddogsAgVi9lyY18kKW63THr/vknN8q3wndC?= =?us-ascii?Q?lSE3aET9tNc+hM+8HoiOZWTE4iwCSxNqQYRMM3BCl2itYkd5N1CRzsd/8JPe?= =?us-ascii?Q?bdTOJpDs9mfm2A5O3mUONbH4bAIEgzw/lV2FpG1DfxUr1XSVgAQzXcqz9xQX?= =?us-ascii?Q?CEGhoaQmo9kIG9IIvI6Wp1HN3AVZlVTYnQ9mLT3eKPv7wqRVueW2Qlq779MZ?= =?us-ascii?Q?vhtYw8+EFULmElKBcy2SeP54h5s+m70f3pXkals60zP9qq6sg5MJmy7lIQMt?= =?us-ascii?Q?jYhqhXtFRHougWalBwbV7zuK/Zefa94DrnOFtnTJ2KklcfFDOljqP/agOHBK?= =?us-ascii?Q?2G7qhExCFPtZXLFed2E+V62ueYt0JrZninBbAPvrKoc6yXH9PVAATWyzYiL8?= =?us-ascii?Q?DHW3TwCfQ1VAS4DxDwQ+X7a8TwHfYHbR9dZz/Hkh5RIN1tY8Gs/RZknOIymy?= =?us-ascii?Q?NNf2bUUXsB8wybdNAGxD8IcMhD77UgiUGIg7MwZRH1XI1qInQq4urOaVX84T?= =?us-ascii?Q?Lhr3Zz9K4Mqu6FDdY3YQAFyW9KjFIlhwKJ61EUs7AHDBjyio2hyR90ZJu4aj?= =?us-ascii?Q?wggxUKNyGo7/lzXRfPXZoykIn9RoqNdhYaaqXyPmfQ6BZv9bzd16rKIwUh9R?= =?us-ascii?Q?x5lyOAaevRrfoVhrXOtvvUSFiBlBmEZOETePDKklMeDpWBkxJrHGtXtGg9pU?= =?us-ascii?Q?swM1WTTn/mQXn3rfTlpt8KoSzXC9SxMyn042ESn8P?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0401MB1801; 6:CdcQgmQYlFtvymTGxuudBNydMMINP5Kc7W6lblaPzK0CBqWDh7XGUVfJf0uYSYuXw6mm/VE2sv/uUstGQqQO/fb59XxrOTwModo5Thve7/wOpZKQILLi/DgtbjqWkNyOfM9rfFHsWXaa211coJKOVLFev5c0GFKFS45zg+30Dx84WXzbAlh3y+USgX19R3MDJzdwIjsE+A1YvSlbMGyxfVHDlq/l9cD19D00xRXpcGbb+lGpkP2HJkdWnjgQVl7mKIOHZ1a6oFnZBtwmIDhqsFnG8yQ5OMuVci5BH9yxk8eOwrHtB5V0Q0JYEcM1D5O99EnawOQyeQBOF++YggmYdq70ODTtJf1mX7BD6aUI0OKiJ1BIMhdTQw3FXHQejHdcrH5gLiEGLQMgIN+/sYsS4/zSYU41gGqaas6Ov4oJGlllUW52TwMoIOwWVSOOTmszYPEkvcEoADw4sHT1ye6RLQ==; 5:wJz7bMUWafLsdO1sOlwNhs7YEtiZ/d6UWIM2wSkuevDfr6/VXwWFZJ3H9xX4XnMhMl+oRDylM6AqkHaIOQKLBHHW3OK3pvAz9yHokgieKyD8H0TbaiZyDaNaOf4EM2wqkDe0yo8+QnW9FGldw+/cgA==; 24:x2CIchLmKpQDQ16B8vQ5J+DNrNcQIav8diM1ZYMkGWq3/71fcDR6/2nKcUacwoWAK2aAkzF5RuUXa4ycpb2g0mxYvo0GQBxIl70YwIkt2qc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0401MB1801; 7:mG9pHwwGmZnA7w7gfOy6bsVMUdVAvX02790B9Hnuuj1quZ01kJTZJ8k5pJHcDzGq7P+HtkEiClVmm6lTUjmMfrRyE8XwkBMTw7jF3h+VzWTLf07aknS100fgZfFOmjFb2GVuF9YzuzL9AQsM4iPL1d93cELKZMfZG3T3t32jKtoD8FKtZkEm4qq7MsZGoVoAvCnp98TKaJ6iv+YSRmPl4Jl3q35bZwSCZqWbOL0AgDY438tA8KFTzFvILWdnOI+ivtwlHzqJwJztpki4oPqrUFTkOTTkiT9pQSwFF5l4JR9Q0QCxUMTyFwxmYpYbS+6fO/vcknEnAaz806gjA5d4Gdl2wW7Qh0LtFZaer5dXlh5/iBxQwvlaqiFEVEQUnmJMPiClPwoLAPjMH0xWv+cr88/yGAUC1oFRf0St2XOCN6OSuDyJKFg+ipklyBjHgU1bHxQuBB/70jKc0w/pBul06w== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2016 11:28:00.3899 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0401MB1801 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH V2 11/19] imx-common: cache: configure L2 Cache for i.MX6SLL X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <http://lists.denx.de/mailman/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/mailman/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
diff --git a/arch/arm/imx-common/cache.c b/arch/arm/imx-common/cache.c index b775488..1c4a9a2 100644 --- a/arch/arm/imx-common/cache.c +++ b/arch/arm/imx-common/cache.c @@ -8,6 +8,7 @@ #include <asm/armv7.h> #include <asm/pl310.h> #include <asm/io.h> +#include <asm/imx-common/sys_proto.h> #ifndef CONFIG_SYS_DCACHE_OFF void enable_caches(void) @@ -39,6 +40,7 @@ void enable_caches(void) void v7_outer_cache_enable(void) { struct pl310_regs *const pl310 = (struct pl310_regs *)L2_PL310_BASE; + struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; unsigned int val; @@ -55,15 +57,14 @@ void v7_outer_cache_enable(void) */ setbits_le32(&pl310->pl310_aux_ctrl, L310_SHARED_ATT_OVERRIDE_ENABLE); -#if defined CONFIG_MX6SL - struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; - val = readl(&iomux->gpr[11]); - if (val & IOMUXC_GPR11_L2CACHE_AS_OCRAM) { - /* L2 cache configured as OCRAM, reset it */ - val &= ~IOMUXC_GPR11_L2CACHE_AS_OCRAM; - writel(val, &iomux->gpr[11]); + if (is_mx6sl() || is_mx6sll()) { + val = readl(&iomux->gpr[11]); + if (val & IOMUXC_GPR11_L2CACHE_AS_OCRAM) { + /* L2 cache configured as OCRAM, reset it */ + val &= ~IOMUXC_GPR11_L2CACHE_AS_OCRAM; + writel(val, &iomux->gpr[11]); + } } -#endif writel(0x132, &pl310->pl310_tag_latency_ctrl); writel(0x132, &pl310->pl310_data_latency_ctrl);
If L2 cache configured as OCRAM, reset it. Switch to use runtime check. Signed-off-by: Peng Fan <peng.fan@nxp.com> Cc: Stefano Babic <sbabic@denx.de> --- arch/arm/imx-common/cache.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)