From patchwork Wed Nov 14 16:55:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Bisson X-Patchwork-Id: 997831 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=none (p=none dis=none) header.from=boundarydevices.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=boundarydevices-com.20150623.gappssmtp.com header.i=@boundarydevices-com.20150623.gappssmtp.com header.b="YXuDfREb"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42w9dD2Jvtz9s8J for ; Thu, 15 Nov 2018 03:56:48 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 09CF9C224A8; Wed, 14 Nov 2018 16:55:57 +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_MSPIKE_H2, 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 0F72DC222F1; Wed, 14 Nov 2018 16:55:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 256E4C2210C; Wed, 14 Nov 2018 16:55:37 +0000 (UTC) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by lists.denx.de (Postfix) with ESMTPS id B96F7C21E5B for ; Wed, 14 Nov 2018 16:55:36 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id j10so3867349wru.4 for ; Wed, 14 Nov 2018 08:55:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=80ZE0Cab6MK+ib3ST+ZZUPr3GLWbzy7eKMpR0cHYowU=; b=YXuDfREblHQ21MFqWct0tY1yu2BjvybLbMslFc58eAdypuQcOSpZp5CGLgKpGGwUjV g7fH5iaCYd/l9skMyKCFVeaRcrTKXwY9cPES6KmOhRUqDLGJp4PU4GGjyZ8KSINruDRl hQx9EQ6gAusv+iVc5l5MpKvf/rHWVrpmd0e6hzN3/1f70fnjH1tBAQrg/XZjc8Wmyv/+ LXeoQDR1XtsZ4KZjJvzwFCQbsJ91pAi0ap1llCX8QfCyOHKnAP+ra+T7fsogXTcB6r6y 5r8Eo5ULBeibUZZKIBAL0CeciXsPf1FGe/WwMr/VUoN+/cLT7lTx10sYEHogj9zpiC6b 2Fzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=80ZE0Cab6MK+ib3ST+ZZUPr3GLWbzy7eKMpR0cHYowU=; b=pcQ1igZZNs9/yDB4FOPYQBhhC2fcNxDn2CR9Y2cFoafGhj759mmAnsxYasmPgjbOYP +zg4VR+Xo00TR2Sy2343r37V6aRSWUvFWrZkMtVujO/LCzJkfSInvX9VPulXjMjtftAh rgDnECOGYUw79bKY7gVnihSh7X/u2G4imVayZri66KBzK8UZpX8592AC7tqCUohWYB/v cSRGFJikJRdUTiQmiD0T9YGtbZZyrP1lzjlfpCXOIw5of/cqjiZQ68KWdnmcLh1IqzjZ 05oODFWnUzAm0FCXJTKtj4wWgkIygj21bSJFRSnRuCvHykWc/S9Y2yTcN7NX8JT35Hzy QGBA== X-Gm-Message-State: AGRZ1gL5rbEZH/vSo4uCeHyKvU6sUcfzaaaqAVneDYUzxxqS0v8Tz2YW hXlCVC+Fix8d1FUl4dzBSVlylCQ71r8= X-Google-Smtp-Source: AJdET5cfy3iebo7AyEa8ScmuXpP+12L6Pxrgh0nsfYDoUpECUdc+anht1xkhQQhP25g5d/PwRe7nrA== X-Received: by 2002:adf:84a4:: with SMTP id 33-v6mr2618088wrg.191.1542214536132; Wed, 14 Nov 2018 08:55:36 -0800 (PST) Received: from g751.home (2a01cb040a7dd500594a1dd15dc2c3d7.ipv6.abo.wanadoo.fr. [2a01:cb04:a7d:d500:594a:1dd1:5dc2:c3d7]) by smtp.googlemail.com with ESMTPSA id i13sm9434857wrw.32.2018.11.14.08.55.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 08:55:35 -0800 (PST) From: Gary Bisson To: u-boot@lists.denx.de Date: Wed, 14 Nov 2018 17:55:28 +0100 Message-Id: <20181114165529.6563-2-gary.bisson@boundarydevices.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181114165529.6563-1-gary.bisson@boundarydevices.com> References: <20181114165529.6563-1-gary.bisson@boundarydevices.com> MIME-Version: 1.0 Cc: fabio.estevam@nxp.com, Gary Bisson , linux-imx@nxp.com Subject: [U-Boot] [PATCH 1/2] imx: mx8m: add memory mapping for CAAM and TCM 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" Otherwise can't boot the M4 core as it is impossible to load its firmware into the TCM memory. Signed-off-by: Gary Bisson Reviewed-by: Peng Fan --- arch/arm/mach-imx/mx8m/soc.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/arm/mach-imx/mx8m/soc.c b/arch/arm/mach-imx/mx8m/soc.c index 46873aa8dd..11251c5f9a 100644 --- a/arch/arm/mach-imx/mx8m/soc.c +++ b/arch/arm/mach-imx/mx8m/soc.c @@ -77,6 +77,22 @@ static struct mm_region imx8m_mem_map[] = { .size = 0x100000UL, .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_OUTER_SHARE + }, { + /* CAAM */ + .virt = 0x100000UL, + .phys = 0x100000UL, + .size = 0x8000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* TCM */ + .virt = 0x7C0000UL, + .phys = 0x7C0000UL, + .size = 0x80000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN }, { /* OCRAM */ .virt = 0x900000UL, From patchwork Wed Nov 14 16:55:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Bisson X-Patchwork-Id: 997832 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=none (p=none dis=none) header.from=boundarydevices.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=boundarydevices-com.20150623.gappssmtp.com header.i=@boundarydevices-com.20150623.gappssmtp.com header.b="PtBXECea"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42w9dG4pYVz9s8J for ; Thu, 15 Nov 2018 03:56:50 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 3C137C22106; Wed, 14 Nov 2018 16:56:13 +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_MSPIKE_H2, 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 D657FC224E5; Wed, 14 Nov 2018 16:55:49 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D0790C22106; Wed, 14 Nov 2018 16:55:41 +0000 (UTC) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by lists.denx.de (Postfix) with ESMTPS id AF100C22103 for ; Wed, 14 Nov 2018 16:55:37 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id j26-v6so18085582wre.1 for ; Wed, 14 Nov 2018 08:55:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iJtfG95qMnjksn/egMtCt/mrdpNrWrE+fbtBDQk+f88=; b=PtBXECea+021mjNaPXcgDRtwE0IM515OZRIwxZLYA+3zPINEq9c4mCoPAxePF7kiNb fFr9iZEddWHpXY2evMmjDKq6cLdp3R1W3H83kuGM9lHRVN5joNyDc1zbCoz9qcSKy+aL Xbyw0NrsEraj5Yu2TI1Z01ByUqcJDJj+nbgHWCDTIznXHC0I9Cp6mYoGrS67bEeZEJTT oFi9sOGviXSC8rmw6coQr5eTLkmpYtH48YsZV7rtN+V7goxWUaeBHuGR9Nknw8NJ4ELZ I80VAWTaYqNtAG9a7hiTnv6i3vewALrz7bbt7t6jhae4vhRGJCo2E3rIzVI9m/hGM3yR RSvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iJtfG95qMnjksn/egMtCt/mrdpNrWrE+fbtBDQk+f88=; b=X/7XMTWHD5yxnHLM4cqiqxemUpC8r73DJXjQ5jdDJ6+xkv98prTFZ66Mq7zh6P1Rlj Q37A6yYvMIrmeiApq9QaLFjHab72khYohH7bYvNcv59nwczuk/Y6SPOO5WxfP4HFeb8a 5GJvOKv0veC3Bc69CbaAe5f5jHcsq2qlwxfgJbUV+uVqDob+tIlNBrhW2QZpE07rPMcW w3shqUdEVswuLVw5ASf6KFFCVJtA2RuPUmXCtJwAGZc7IK8V48nF4XzNY3r/mdxzHZRW L3OsjGlZjN4a3GKHi0/vOZrslygJ2LOmnj55vUYxUomPxCfl2nL1RXiOXPvtdEVlVCx4 3HeQ== X-Gm-Message-State: AGRZ1gJq3ugUy1OGbb/Tdvo6XWlPb1GvmpP+T4Ysbus3eqCOH5U1OJP/ /ZoklQSRwNMoItsh+boV8fg1jwL0t+E= X-Google-Smtp-Source: AJdET5fuyEk+UR3UIQBy76r875s9PyLOOesx2PKLCnaAjLT2krgtt/ORVYhIBdcHf5dikFUx7Z06qg== X-Received: by 2002:adf:8361:: with SMTP id 88-v6mr2663021wrd.192.1542214537006; Wed, 14 Nov 2018 08:55:37 -0800 (PST) Received: from g751.home (2a01cb040a7dd500594a1dd15dc2c3d7.ipv6.abo.wanadoo.fr. [2a01:cb04:a7d:d500:594a:1dd1:5dc2:c3d7]) by smtp.googlemail.com with ESMTPSA id i13sm9434857wrw.32.2018.11.14.08.55.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 08:55:36 -0800 (PST) From: Gary Bisson To: u-boot@lists.denx.de Date: Wed, 14 Nov 2018 17:55:29 +0100 Message-Id: <20181114165529.6563-3-gary.bisson@boundarydevices.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181114165529.6563-1-gary.bisson@boundarydevices.com> References: <20181114165529.6563-1-gary.bisson@boundarydevices.com> MIME-Version: 1.0 Cc: fabio.estevam@nxp.com, Gary Bisson , linux-imx@nxp.com Subject: [U-Boot] [PATCH 2/2] imx: bootaux: fix stack and pc assignment on 64-bit platforms 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" Using ulong is wrong as its size depends on the Host CPU architecture (32-bit vs. 64-bit) although the Cortex-M4 is always 32-bit. Without this patch, the stack and PC are obviously wrong and it generates an abort when used on 64-bit processors such as the i.MX8MQ. Signed-off-by: Gary Bisson Reviewed-by: Peng Fan --- arch/arm/mach-imx/imx_bootaux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c index a1ea5c13f1..3103001b7c 100644 --- a/arch/arm/mach-imx/imx_bootaux.c +++ b/arch/arm/mach-imx/imx_bootaux.c @@ -17,8 +17,8 @@ int arch_auxiliary_core_up(u32 core_id, ulong boot_private_data) if (!boot_private_data) return -EINVAL; - stack = *(ulong *)boot_private_data; - pc = *(ulong *)(boot_private_data + 4); + stack = *(u32 *)boot_private_data; + pc = *(u32 *)(boot_private_data + 4); /* Set the stack and pc to M4 bootROM */ writel(stack, M4_BOOTROM_BASE_ADDR);