Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 065A1C636CD for ; Tue, 31 Jan 2023 08:45:00 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8B1DD859FE; Tue, 31 Jan 2023 09:44:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="OrcFg1KY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 24F7C8599F; Tue, 31 Jan 2023 09:43:11 +0100 (CET) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on2061c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe13::61c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7CB95859C0 for ; Tue, 31 Jan 2023 09:43:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ye.li@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lIMoMxtPIFS+ledKoVq1tzy695cyD0ynGi30TSlJCwTrO1IbsK0eR2JLexvU2Ksb6kwZbuNSb7cF/czX6i3Gr9X4VT78pJesXKB3mcYfmKxZjEf6Bv/byGmMynWCnjhZx44ubd4RqkSfCLLP9UQKGAq7uO62lRHFR1t8nK4ieRi6dR4K+a8wlkYQFzjcDuYvZ7pd/QMH/6MCO0chi5BiWPOn/6087ki/NvUpIFZ0RJGBXU+spNLJ1m5tYTKktfLsU7XaMXv2zP2j9j29N4x2tXXVZ6DXQy1YDqCacLQ63avCqnplmdavigCCTan/TZDstmKjhnHlog5RfYo7+p9S0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JmZ/2WB5rJ0WrdBav3QoQ3+DILRTsMsVi2XWgJdwZzk=; b=Tt9ekRH2kF2t8XVKA4+Mn80IgBUaLUKJt06J8vjqGffcuTj3qcEZs6wlLMxjMkAXTmwLhhbNRGLvVOSYb3g9UTKs1e92r3oXmJUfrwjfsz+F2J2WTDLvB/v+IgjrAVBXzesr83Im2tmEyOWdZj2m6t/CF3nytEmaz1y4Qz3dSYWgBaAeTjULKyxXw0fer4hLxrYlPwdtZMam3QdPBbN18tGhSL0+nL2kR0QISZzf/BYR0RDmaRuQGtKZYvH/OXjeMmVxJ2g0AHtkmPIjQJIVBeECWyHpDNsoPACEwJf+OFEP7cjgVA/QmJjsbJAokkOH4ANGmY7HcpkuBH2b8R1C0g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JmZ/2WB5rJ0WrdBav3QoQ3+DILRTsMsVi2XWgJdwZzk=; b=OrcFg1KYG7e6UGce8CjxyNOGmXVmSsTFkK7Q/ENoAiDtucGNYEhn1pMbIO2rf8ExA1UeFSOV0q1PBg3cqnJV77rmToYYyEHoEae7m0jkJH6wz7IbCf21GrESiChuYXTM9jmy9jQOHxHlHHtIZt0RpD7XySeN/Cj4GZfu9F4JFks= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB5302.eurprd04.prod.outlook.com (2603:10a6:20b:7::20) by AM0PR04MB7154.eurprd04.prod.outlook.com (2603:10a6:208:19f::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36; Tue, 31 Jan 2023 08:43:05 +0000 Received: from AM6PR04MB5302.eurprd04.prod.outlook.com ([fe80::1582:1a4a:3dda:50c6]) by AM6PR04MB5302.eurprd04.prod.outlook.com ([fe80::1582:1a4a:3dda:50c6%5]) with mapi id 15.20.6043.038; Tue, 31 Jan 2023 08:43:05 +0000 From: Ye Li To: sbabic@denx.de, u-boot@lists.denx.de Cc: peng.fan@nxp.com, uboot-imx@nxp.com Subject: [PATCH 05/23] imx: imx8ulp: Remove the TRDC configure from A35 Date: Tue, 31 Jan 2023 16:42:16 +0800 Message-Id: <1675154554-88217-6-git-send-email-ye.li@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1675154554-88217-1-git-send-email-ye.li@nxp.com> References: <1675154554-88217-1-git-send-email-ye.li@nxp.com> Content-Type: text/plain X-ClientProxiedBy: SG2PR02CA0065.apcprd02.prod.outlook.com (2603:1096:4:54::29) To AM6PR04MB5302.eurprd04.prod.outlook.com (2603:10a6:20b:7::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB5302:EE_|AM0PR04MB7154:EE_ X-MS-Office365-Filtering-Correlation-Id: 0e739a7f-abb4-4935-0f9c-08db03672bca X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D80yYclVUU7tKQOhwiJogzfCdIiuHmCF/YRYFX3GqbgsW1GUl0841f5Z8oLov++rdSAk6THV3LxOEsszNkjM3bB3nEbcuOCXhGZYX1KcAkrwxNOYBxURlkEHDoSZtP4m029o0+oXRaWFq596a7TGl93XT5CoGBCvJykVQ8D9peMWuuDhDoRbxhqWOgd1OhRtT76j8P6AtRLvlLZ8RaYx7VY0OK/VW9Ac+B89AUNsMYMxdOO3jRse3G64lQ+90KYHCzGSS4TwEyNTRrgP9FKyxUIFgDMLGrqygFkybcOJrkVpUwY+fpNI4eaY+X9TeZcQ+27Cqj3H1IqAWLe5FdQa+Olo9nDwJqvyxMzPXQybRfgIRWlNrlRlo+jqOI04jpweu2WC20fJJtqxXS4mWYtwmYPudj2bKWYD9lLpZ7W0AQHWuEZPJCrEPlnPBbBKwAoNA4BZpfPYrMiP0wYZT6e1E5/VjC2M2QYrU6wykzoL+df4w0JxKXFi1BwjE/kartVdevcM8P1dnXcXZsCRlLjmIluUGH9fqHsnLVOWtgUqYkLH6xWNWVopBNyKZr5BrDUnlrELRex0hFAQdwA1BCk1aD/18FmYiujQDiK4ZuuPspUxUsFQsvseT+PiaWglQQLj5B/7T18ck4xs0Svcht7QfpTwqVnH/Y5xMs7RMltKigUoOltomFRJa1St+ubPv3HcJE7hdizHOaMA5BtgPGlkqqoYiVbXurpI2eYB6a198DU= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR04MB5302.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(376002)(136003)(346002)(396003)(39860400002)(366004)(451199018)(41300700001)(83380400001)(86362001)(2616005)(36756003)(38100700002)(38350700002)(316002)(8676002)(66476007)(66556008)(6666004)(6506007)(4326008)(6486002)(26005)(478600001)(6512007)(52116002)(66946007)(2906002)(186003)(44832011)(5660300002)(8936002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BO2aEKqEYmEznG+7oJYseivX7TXb9VQKuXjwCuzxg5y2vjSVIzs1pfTzYbii?= =?us-ascii?Q?lUUTq8MtBjLzgwJI8WuTng5FhADfaCwOr+4HyXAl7817+MYqQFFg4QctRM+z?= =?us-ascii?Q?+su2eG7HecaaBa00NM+KljUp3FAzIEfxiTXH7B23LbCAlBPI9UutPhlAIfnO?= =?us-ascii?Q?0C1tsb78pNttvUe3hYp1OYHMG7/qnCiF0PjcFuc/RWzRRs88vpNFhAKiZC4R?= =?us-ascii?Q?ANLRu5XOLBrT/hlpKdXeEghmJSvrqEMWwspnWtjDRhi58kYGIcKk8CREVGo/?= =?us-ascii?Q?Lu0+Q9JrBKngYveQW/q9y+Sih7qRpbrfDxz12TFg45jJ/P5SHLvofBJCmlT8?= =?us-ascii?Q?xiVLNSxnV9tVFRn58lxgY9RLKNuzXGGTVgdfXyejpVZKgNOFCAJjtWwJNS+9?= =?us-ascii?Q?VEHId53FTmU1saEENDNiATx6/hGAcs/chMAxiiJACRNA/YOJ0NPqWxVJHacA?= =?us-ascii?Q?4EF7hkcAkvdBvmijiklU+rYa9SFAehNUx4Uvjr7Mt+CUlCBVAKEcpxii1sjv?= =?us-ascii?Q?IKLRrpiwBVw77w2mC83yWIZR0BZKQzlP6iMKrWL3sz5y7UNw79uaHaHia+Rl?= =?us-ascii?Q?sCphlQ5vcIKsP2hvCWOGh1NpWLFAPi0pEH8L3RoU2mLmqTNBgahrJ8yrB9dA?= =?us-ascii?Q?oDaYumn3hqtEGMdUomXKK/sQdWELP1QTRLknclE3yfme9vUUNNN/pKoq4IwR?= =?us-ascii?Q?cqjxM49NSdAcTlbBtoxFoA1fi36UTdtsbC1ISiBHukO+/v4xTS5hKvfgZwmm?= =?us-ascii?Q?K7H9N7svF8kIAUn3okWwZOmnzFOFTQyaHDyH3dR9WTto+/44LVFcP6dJWOEl?= =?us-ascii?Q?MRRq2xesR0Rj0lN+WE8egvvqrLUSGXbZxUPXQAGAFChX53N5KSxBzzzt+iZ8?= =?us-ascii?Q?zMvFmytKPCTXB92McTC01iR/G27a+CFy5vVI9GwIof//IUK5ND8eUdBonnzn?= =?us-ascii?Q?v++rEz4Jrgz5wJC/cwBZzjhEKZkZUIvkJmxTBHkagWE6nKBkDqHzWdTgfRf/?= =?us-ascii?Q?YTvqkPbxt/tAVlNzDgbuRGmpIQnLt7pZi4N9DyMcjbJaMQEmYMHRfRdiXSUJ?= =?us-ascii?Q?SYu8tpuUlSNszcYTRdlTE637JE6Ez085AyRHaVhtzx+NwhIOUJKVNS3hy3LT?= =?us-ascii?Q?Bsqwj+U5+Z4no8pXKTGCE9gwZOj8B6+c3/5MKM0TwQoI3R00sMIRayac4lDh?= =?us-ascii?Q?2h6fGLW6AWU5eK8lCZyV4FTvOxTf6xRMxNuY90zhYiXx5wLZx/+Wl47yDuuc?= =?us-ascii?Q?2naeKCcG3oYliIER2+34cB3rAHAstumObS0ySPxllM7C46/fh7OH/Jk3CHXT?= =?us-ascii?Q?jklxmN/S2mBY/Djj/BX0QauqtvU45JZSFxCRAVEl2PKWKLJg/muRLeFNLAbj?= =?us-ascii?Q?O4JB06AhKc5YWJkJjy2f5QI6p/MonDVWbVSjiiIvdau3oERX0me3Pm3wrkVv?= =?us-ascii?Q?gz5niO1kZIvZlPxnvrUhoUozsZ8kObBc4SMbQDRT+tYU5B3wx+zmj2V5wtB3?= =?us-ascii?Q?+hsAFuF7wYVJUOyoGziV1EKbYArEf2dy3midYPB/ibdn/ll8BfNDCwjoS8Az?= =?us-ascii?Q?GeoPUI5xE3Dl5hwel5u0NfcrrywbcWwdVLUtYNO+?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e739a7f-abb4-4935-0f9c-08db03672bca X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5302.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2023 08:43:05.7046 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: X5fAZcDdJsLpV6dh7IVitPjkJDmH/PvPqatIQhAa1tSa/AxP0/h+oGzYI6J2NqaH X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB7154 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean As M33 is responsible for TRDC configuration, the settings for A35 nonsecure world access and DMA0 access are moved to M33 image. So remove the codes to release TRDC and configure it. Just keep the configurations for reference. Signed-off-by: Ye Li Reviewed-by: Jacky Bai --- arch/arm/mach-imx/imx8ulp/soc.c | 63 +++++++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 18 deletions(-) diff --git a/arch/arm/mach-imx/imx8ulp/soc.c b/arch/arm/mach-imx/imx8ulp/soc.c index 4370399..0d7858a 100644 --- a/arch/arm/mach-imx/imx8ulp/soc.c +++ b/arch/arm/mach-imx/imx8ulp/soc.c @@ -556,33 +556,65 @@ static void set_core0_reset_vector(u32 entry) setbits_le32(SIM1_BASE_ADDR + 0x8, (0x1 << 26)); } -static int trdc_set_access(void) +/* Not used now */ +int trdc_set_access(void) { /* * TRDC mgr + 4 MBC + 2 MRC. - * S400 should already configure when release RDC - * A35 only map non-secure region for pbridge0 and 1, set sec_access to false */ - trdc_mbc_set_access(2, 7, 0, 49, false); - trdc_mbc_set_access(2, 7, 0, 50, false); - trdc_mbc_set_access(2, 7, 0, 51, false); - trdc_mbc_set_access(2, 7, 0, 52, false); - trdc_mbc_set_access(2, 7, 0, 53, false); - trdc_mbc_set_access(2, 7, 0, 54, false); - - /* CGC0: PBridge0 slot 47 */ + trdc_mbc_set_access(2, 7, 0, 49, true); + trdc_mbc_set_access(2, 7, 0, 50, true); + trdc_mbc_set_access(2, 7, 0, 51, true); + trdc_mbc_set_access(2, 7, 0, 52, true); + trdc_mbc_set_access(2, 7, 0, 53, true); + trdc_mbc_set_access(2, 7, 0, 54, true); + + /* 0x1fff8000 used for resource table by remoteproc */ + trdc_mbc_set_access(0, 7, 2, 31, false); + + /* CGC0: PBridge0 slot 47 and PCC0 slot 48 */ trdc_mbc_set_access(2, 7, 0, 47, false); + trdc_mbc_set_access(2, 7, 0, 48, false); + + /* PCC1 */ + trdc_mbc_set_access(2, 7, 1, 17, false); + trdc_mbc_set_access(2, 7, 1, 34, false); /* Iomuxc0: : PBridge1 slot 33 */ trdc_mbc_set_access(2, 7, 1, 33, false); /* flexspi0 */ + trdc_mbc_set_access(2, 7, 0, 57, false); trdc_mrc_region_set_access(0, 7, 0x04000000, 0x0c000000, false); /* tpm0: PBridge1 slot 21 */ trdc_mbc_set_access(2, 7, 1, 21, false); /* lpi2c0: PBridge1 slot 24 */ trdc_mbc_set_access(2, 7, 1, 24, false); + + /* Allow M33 to access TRDC MGR */ + trdc_mbc_set_access(2, 6, 0, 49, true); + trdc_mbc_set_access(2, 6, 0, 50, true); + trdc_mbc_set_access(2, 6, 0, 51, true); + trdc_mbc_set_access(2, 6, 0, 52, true); + trdc_mbc_set_access(2, 6, 0, 53, true); + trdc_mbc_set_access(2, 6, 0, 54, true); + + /* Set SAI0 for eDMA 0, NS */ + trdc_mbc_set_access(2, 0, 1, 28, false); + + /* Set SSRAM for eDMA0 access */ + trdc_mbc_set_access(0, 0, 2, 0, false); + trdc_mbc_set_access(0, 0, 2, 1, false); + trdc_mbc_set_access(0, 0, 2, 2, false); + trdc_mbc_set_access(0, 0, 2, 3, false); + trdc_mbc_set_access(0, 0, 2, 4, false); + trdc_mbc_set_access(0, 0, 2, 5, false); + trdc_mbc_set_access(0, 0, 2, 6, false); + trdc_mbc_set_access(0, 0, 2, 7, false); + + writel(0x800000a0, 0x28031840); + return 0; } @@ -654,15 +686,10 @@ int arch_cpu_init(void) if (!ret) rdc_en = !!(val & 0x4000); - if (get_boot_mode() == SINGLE_BOOT) { - if (rdc_en) - release_rdc(RDC_TRDC); - - trdc_set_access(); + if (get_boot_mode() == SINGLE_BOOT) lpav_configure(false); - } else { + else lpav_configure(true); - } /* Release xrdc, then allow A35 to write SRAM2 */ if (rdc_en) -- 2.7.4