From patchwork Mon Jan 28 09:39:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1031803 X-Patchwork-Delegate: sbabic@denx.de 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="E2dy2qNi"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43p4Wr4RsHz9sBb for ; Mon, 28 Jan 2019 20:46:16 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 3B58FC21E57; Mon, 28 Jan 2019 09:45:46 +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=RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, T_DKIM_INVALID 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 7798FC21E15; Mon, 28 Jan 2019 09:40:08 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E8DB4C21EC5; Mon, 28 Jan 2019 09:39:59 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150071.outbound.protection.outlook.com [40.107.15.71]) by lists.denx.de (Postfix) with ESMTPS id 070A4C21E96 for ; Mon, 28 Jan 2019 09:39:53 +0000 (UTC) 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:X-MS-Exchange-SenderADCheck; bh=LGYaLOLusYl8XcIRhmLyP+bErVs67NT3dCZt43BF6yk=; b=E2dy2qNiJCOUh1JMBXHFpYz6XOpVxw8ZEi9RGLe/Yk7DuXk1/WWmzYxnu8Ed7XNeYR5+7yzI58hyrMwlzejrFurBexxy/Q8W4Lpa6UxXbtTVYYSVs2sn2YSCHvNxMWZ3GqCIbPZqBqpLZnWvrUiANt+Xb0OUpm7DrJxXxAFVkBw= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.148.143) by AM0PR04MB3972.eurprd04.prod.outlook.com (52.134.90.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.17; Mon, 28 Jan 2019 09:39:51 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::69ce:7da3:3bcf:d903]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::69ce:7da3:3bcf:d903%3]) with mapi id 15.20.1558.023; Mon, 28 Jan 2019 09:39:51 +0000 From: Peng Fan To: "sbabic@denx.de" , Fabio Estevam , dl-uboot-imx , "u-boot@lists.denx.de" Thread-Topic: [PATCH 13/20] imx8m: Fix MMU table issue for OPTEE memory Thread-Index: AQHUtu1q2wIGAa5r9kisUvoZKs3Irw== Date: Mon, 28 Jan 2019 09:39:51 +0000 Message-ID: <20190128094807.26532-14-peng.fan@nxp.com> References: <20190128094807.26532-1-peng.fan@nxp.com> In-Reply-To: <20190128094807.26532-1-peng.fan@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.14.1 x-clientproxiedby: HK0PR03CA0013.apcprd03.prod.outlook.com (2603:1096:203:2e::25) To AM0PR04MB4481.eurprd04.prod.outlook.com (2603:10a6:208:73::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.71] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR04MB3972; 6:5LwrEImRfd44ynmXCLHtdG7qy8GGqZKmmlApbEaxN6KbGzsFfA1KWV3JaXkF8PkavdGv5aUEnCWAoJhJ/WkVUHbyrWiTETVUoVFqI9BJ7V8ISnO5i/R7kpnp3wcrIBz8Y1Qyi0i+Z4/qbERSA4WYTERQHBEpimjAW3jC9dSkpRSkg1uRemZwn+ndLD0V5P+NojJlyp5wNcRrFX/pAeJzcXSV94odcIaPP4ZJJ0zLVdnuZ+V+fNKVVfPJMaYR7szmdFQPqiSZgyqoPeJAl/hg2rqxrHcDJgvpqdrfaN6GVkyXZsLH3c6uS6bbAqwCw4KGvq00z0jFyxSihv8DnRVxSFDASgDWwel3u9ib9JWB9drMhm+xAx6kqwxMa+MhCg6UKMm7NOGK90soBI7Dx6x9ndLXwNoRYJsK04LZNcl/KavzlpJjif8ax4ld4SkvzFNqR+O/KFuSo/SPpx8y+FEBVA==; 5:LRDuTfoRM4lPtYKDF/nCbDTHzUXwqbuCynSKiS8OMQGAvJ0CCgyEMQn+5DdIeqSawnM67Jiz0QWOnrn+RfG0anuv6dVnAdWlkkuhNA/uOrjzyqNNhDIClnu0mditA9BJh0f7KS4KF/3om5ilZg2Sq8GjY5t6IFKo+LQQMX49vUEgE6f6O8A5mRLOMda/x2FYpvnkdBKy25YjevcvcVl9fQ==; 7:YDzAxEA9jYGGWMpZOcjXyXESJcL57mpTUijWdzN+ScOYaqJHJ51TO0JtJC5BYfwgfWnUYylf1XXEvcb3xHCTc5DAP8WeKU8iYY4Pke57dD9guDw30s02DAClpZPgt7AauxtpkfZAjCtgSaCVs05ydQ== x-ms-office365-filtering-correlation-id: 0f43f738-db99-4ec0-2c15-08d685048d34 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB3972; x-ms-traffictypediagnostic: AM0PR04MB3972: x-microsoft-antispam-prvs: x-forefront-prvs: 0931CB1479 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(396003)(136003)(39860400002)(376002)(346002)(199004)(189003)(52116002)(26005)(6486002)(50226002)(186003)(6506007)(386003)(3846002)(102836004)(76176011)(486006)(44832011)(476003)(53936002)(4326008)(11346002)(25786009)(2616005)(446003)(99286004)(6116002)(6436002)(6512007)(81156014)(36756003)(81166006)(8936002)(8676002)(105586002)(106356001)(68736007)(305945005)(7736002)(2906002)(2501003)(478600001)(86362001)(97736004)(316002)(66066001)(14454004)(71190400001)(1076003)(14444005)(256004)(71200400001)(110136005)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB3972; H:AM0PR04MB4481.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 6mg6i0Moz55H63MSTIPWor2qKLp4c0UazGuwHLOvc36OsdOEHTpjmMzYLPFwSAsAXWdgnmShSehDTnClCWyAzORzq7USJ7Fl/vENSkSrsV8cTiiHdvwYLX1lAH9Wr+yf44uhA2QpyvlY0d5kaiY5mc7axuB7Q0ui/BUuwBeNm1o1ZJ2yx91fRPz1LnyxeZ0CL+RMtuRcnKZNShiMhGWqpvZxT7TdQ2zpRMntjxV6bpnjXVT2UITHcr3dT1Egeqz8IwFSBKpGTizmHt9t77AZMECOfknOYfm768gLDUSrrDTgzYYNElY1zWfLRHPsSwrpy8lwxZW8qV3q8R4Y1oUZ/za9FdbQ6XBO1h3gQhHQx58kwF6YUGfUgp/ZHQ0uCnIzqf0Fcux4aBww6KITB81qxOaIH7MfeTm+YHEbUdPE2Zs= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f43f738-db99-4ec0-2c15-08d685048d34 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2019 09:39:46.4285 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB3972 Subject: [U-Boot] [PATCH 13/20] imx8m: Fix MMU table issue for OPTEE memory 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" When running with OPTEE, the MMU table in u-boot does not remove the OPTEE memory from its settings. So ARM speculative prefetch in u-boot may access that OPTEE memory. Due to trust zone is enabled by OPTEE and that memory is set to secure access, then the speculative prefetch will fail and cause various memory issue in u-boot. The fail address register and int_status register in trustzone has logged that speculative access from u-boot. Signed-off-by: Peng Fan --- arch/arm/mach-imx/imx8m/soc.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 4160a75918..5634bfb96a 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -112,16 +112,18 @@ static struct mm_region imx8m_mem_map[] = { /* DRAM1 */ .virt = 0x40000000UL, .phys = 0x40000000UL, - .size = 0xC0000000UL, + .size = PHYS_SDRAM_SIZE, .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_OUTER_SHARE +#ifdef PHYS_SDRAM_2_SIZE }, { /* DRAM2 */ .virt = 0x100000000UL, .phys = 0x100000000UL, - .size = 0x040000000UL, + .size = PHYS_SDRAM_2_SIZE, .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_OUTER_SHARE +#endif }, { /* List terminator */ 0, @@ -130,6 +132,20 @@ static struct mm_region imx8m_mem_map[] = { struct mm_region *mem_map = imx8m_mem_map; +void enable_caches(void) +{ + /* + * If OPTEE runs, remove OPTEE memory from MMU table to + * avoid speculative prefetch. OPTEE runs at the top of + * the first memory bank + */ + if (rom_pointer[1]) + imx8m_mem_map[5].size -= rom_pointer[1]; + + icache_enable(); + dcache_enable(); +} + static u32 get_cpu_variant_type(u32 type) { struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;