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 4588CC38142 for ; Tue, 31 Jan 2023 08:47:24 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7F769859D6; Tue, 31 Jan 2023 09:45:57 +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="bBljbytI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B4461859F5; Tue, 31 Jan 2023 09:44:34 +0100 (CET) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2064.outbound.protection.outlook.com [40.107.20.64]) (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 48033859FB for ; Tue, 31 Jan 2023 09:43: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=ye.li@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cS+FqAmJd3yI8idYE34tt37bSYyLw+9cvF6DO/Ux2ItAymb87EE0JFbXpvBtWs39ko9uXAvv1lqm/2sMzYX2tkBSEimX3iMSkpNet4uvb7bs9be0FiOe/YQUppmY/Uk1BzOPeVzjWb4z9CDdxhReYGuXBwOLR/So534NuWUT2c8phDXLQOtP5TIzETWbw1tC2ou5y6plnPUKI/roOf9ROZJJi3Qzv/j4LXkecpG6NlKALc7MSMLGZZUIOSCmHCS4gE3bpsSMaOaU0iW6GWWdPFrL+sLDCfiD9KpGS6GW200E8iJOkMgFUw7PIO2t1o4JvV4/1iiwnFJxwcGS0WKYaA== 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=cIkxuwKPNeVZgGXpCTvqBa8J/ScLlYsL5ue4TF5j8pM=; b=S2TPUZ4Pyb8YBxYV6DJIsQQ502aSe68KoQBTjRfZmNJL0LB87nllPTIlw82KADzaAVAe+084shdeGsCIfop/qXXHXsXtQG2ENq81AFFWkOA6I3pyeiV2WGfJC5xoH7jjzhQuNZRRtax3sYBoLhXm1Y6zjwyD/IVSUPG24mI/m2vw6VUtaaR+KksbsDynqglodHGV+KvmoODfgptlcBInUFY91kQdYJNe/n7qtE7YjmCm/St2kk4mfCdT+XA9lnEz63JcdEAGLyT9/qtkrLPdO1r8xZxGVIky7B9uZE9LASYLAV4/2Im3uqubRLMpwiobc30JKR1CUCv37jxwYW2xOg== 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=cIkxuwKPNeVZgGXpCTvqBa8J/ScLlYsL5ue4TF5j8pM=; b=bBljbytI9DBTBnB6rEgkx1bEHhZxDgovMSHQs1NpBchlJwi9RSEKvQRZ/wpd+4oxBuCiP5nLFZB+9dokzQvzfZ0WQLiakklvyemp108P7eW2Q5ilQLSMmN7eK+e0m2OH9twcHPgYDYmmLfGgLQAeOhCeotWgSeA6H/o2FoKh6qw= 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 GV1PR04MB9086.eurprd04.prod.outlook.com (2603:10a6:150:21::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.28; Tue, 31 Jan 2023 08:43:24 +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:24 +0000 From: Ye Li To: sbabic@denx.de, u-boot@lists.denx.de Cc: peng.fan@nxp.com, uboot-imx@nxp.com Subject: [PATCH 13/23] imx: imx8ulp: Configure XRDC PDAC and MSC for DBD owner=S400 only Date: Tue, 31 Jan 2023 16:42:24 +0800 Message-Id: <1675154554-88217-14-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_|GV1PR04MB9086:EE_ X-MS-Office365-Filtering-Correlation-Id: 0173d337-1d33-4a88-cc21-08db03673721 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fk1cbv+7mHjqL1YwvkNk0XIiOWXkwpVMCKH8yyb5C0ez5BsygIA6dpFxE/z/DidckkHf75i9Y8q34mgP1RO8xXNxqbQ152YvP5mYjnEV6eOl/QnPz+SNpZHYA01Q3LszIbS2pBgPQlXzD96NcZHZPi6D9V2mo04jBMRgFN/ZFQcDyYrtjdbHDqax0SW7G6IBzCbPJykYMel33ZmcW919Y5iiQvF7bUOTqY8Oz8j3zqgir0vXvddqMu5P2ACLVAj2YpUwkCwuXV2nMh7NPGXKUuP6Nu5WFArsDYhBMbuEcbgINWKCcz+MvlL89rVtAkiZANGJz5a6h0Bd9yD1ekSYKOPpmTo0In+XJa14Mp84WNLW0lhQ7Y8nFmlvuS5wQ0pRkDG9U2HKS/gwK8qMnXwYGIqpBm3wtUXBE7N4/DO+JVo9XDZ/jFrZajPtKVW4n63lM8uXRxP+XBflNBc4gNK1xjIBk46sOyMjiBAVR9u6+a3njLAKY+kT75arlgaFhS9ndo3J16wahY55afrvVBV/Rqt8fv16QeQBSq5bqwaRhpgul/m3KJAZOpK3lsyl3gXhQJTcfV4KDBTiXz+F4kTLya77VKneUjwA8ioVOZGsEd2h9Pp+ytIRNwczuEsoG+Ugv/lH8TGNZ6XJhweJcEwztmBr8r0YnRoOH305kY02AvX3bPl1Sp2gaCAMFDWVLkQIzmSFASzgOXHBQ4AbTLe0ivkxZ3s5nc+5566i/Grva8o= 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)(136003)(376002)(39860400002)(366004)(346002)(396003)(451199018)(38100700002)(38350700002)(41300700001)(26005)(186003)(6506007)(6512007)(83380400001)(86362001)(66476007)(2616005)(66556008)(66946007)(4326008)(8676002)(52116002)(478600001)(6486002)(316002)(36756003)(44832011)(2906002)(8936002)(5660300002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?41j/BcGTwU/5SZzoFJsF0w9qFuFkoiUWceVmQdAXrO1dJdEErfb41gFBl4aB?= =?us-ascii?Q?7fRoLHE8ifqDzL5JbGqeOqYfZY6xl6Z19YBgbw35x7wjsOJT0Lq0D9XwNO9s?= =?us-ascii?Q?LCjlbXJTof4ghN213NOVoYaPaLTjjpWZVIAIZyzOsJ7z006TMLfndt6Y+MXi?= =?us-ascii?Q?zqJ+ToZbZ3ZzgGl6qYQDNwDEadGpXvNekFxrjSxcPUYQptg3p+6pNdKGr4Z3?= =?us-ascii?Q?Adeo7MT2W8BPr4JeUy9MQMqJQyUFr3wB7IhRnjJvHtiZpmE7HEM82SNKdf9y?= =?us-ascii?Q?Pi3W5nEQ21VRCX3ZS9jUjj9Nh1AOLdj8Qm9apt83b+rgxnXKHcEFL8oQ205p?= =?us-ascii?Q?3GmU1hwSXerhaM+2lBrKLr1cdjRYWlh8JdV9aFWG7e80cKzxCY1OrpitzQij?= =?us-ascii?Q?1urRTiPEUilkGcqT8I44Y4T0VdfUPPSMHIDuUM1Z/POc3q42dmTlXrpY8pMi?= =?us-ascii?Q?50Bg/Z++3/A7ZUz0E+ggHAZ44HLcFzUjp7RoPm1vR0BaG5yF6pAHhH/iIec4?= =?us-ascii?Q?szvwATIbW5ilUUbwRyy02wdWQxBRRa/+jxacVrfXNPExDWugK16km2xIZcYv?= =?us-ascii?Q?bs78jXhxATjsytaiBWOuyWXOeXRw1BBpGXq3gbosjR+09OUFJDmMcMIkLBCq?= =?us-ascii?Q?m80T+bGjeknxDejthlqavM3I65kZis+rd6pI+5RsP8lAVoN86s7Z1jkFXEgb?= =?us-ascii?Q?NM/9tDCRE542C6cxm8ggGYagJV4nADqaC5PliUwAeF1ZMqv8Rln1cAx2TPMq?= =?us-ascii?Q?tWzGjYk8gGmbpUPDO0hPQaLPtfn3PB7CRvonNGqZgaAWyBk87hCiK7i0uiLo?= =?us-ascii?Q?estDSYefVw24HslO7sPD+n6OdykNuOHP9BwDlh9amAd5KU2VkKswfI7995IE?= =?us-ascii?Q?1P/CkEcIaAWU71vR0wCta98/DYewpaqO11jSonWRorQF8eFCTaKJAtDrEB2N?= =?us-ascii?Q?u/4wEyTQ1z1LzOSqYm/r5lVfEWJXlgp2M0vluoIFhUvZlYI0A6eUYJRTs4ia?= =?us-ascii?Q?wAfIpSAyITmn5SSff3AX3Hus5xVTgsMi8yOfca+4oUPc6JxSSJfFet8/h1WX?= =?us-ascii?Q?O9ZgJGRCuYNBGOuI0p03HUaYRjwU+vukRfDwf4QXJDQ0u8f3ywCx1TdXIv+Y?= =?us-ascii?Q?+kCEnyN9cljkk/hta+AN+lbEBgQUvtOREtPz/S92ftObvxletX5vm4pbYbLP?= =?us-ascii?Q?LKU10iHOGq6McQwOFWzOb24lH399j2BsYqqEsNaveJlTsZ3A0vDRbklOprDq?= =?us-ascii?Q?HWJZYqAgRRQ2AK3zXu/fq6I/gVuv4gUimAAihqQmEeJZRhPsjwqNU2huCyhq?= =?us-ascii?Q?uNOeisxw2jFkFSEyVt/Y7MWTcXJhc7cgQYPwhEYqL6VF4/kJwwBEn2oD7t5L?= =?us-ascii?Q?XY7st9RmXQUgm1LgTWL4eGsYlBW4OmIxqvNhmWJr0LZsTwFWXwyusyveEvwo?= =?us-ascii?Q?3aeoIvaqMCzgnzQ4B3sB3+0XuW0pmItm952BxpHpn0gLpXIcEp7WCh6wgMyN?= =?us-ascii?Q?OeOWcD09sEWcC1CFxbY54/tDQQNNLxfhMCBWAbHLfsG+HWE/RoOsxLziMJ/d?= =?us-ascii?Q?sQLPuHMCYwqlg4aRDoX9g57OMVoze/Rt79Giu1TP?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0173d337-1d33-4a88-cc21-08db03673721 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:24.6721 (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: WGdtu+N6D6dWrxIf09RbMEL7NL7qj3L7vKWCAil5JBdBy8y3rz9zZ1dXA+CcCigB X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR04MB9086 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 This patch is used to support DBD owner fuse changed to S400 only. The XRDC PDAC2 for LPAV pbridge5 and MSC1/2/3 for GPIO and LPAV are not configured by S400 default setting. So these PDAC and MSC are invalid, only DBD owner can access the corresponding resources. We have to configure necessary PDAC and MSC for SPL before DDR initialization. Signed-off-by: Ye Li Reviewed-by: Peng Fan --- arch/arm/include/asm/arch-imx8ulp/rdc.h | 1 + arch/arm/mach-imx/imx8ulp/rdc.c | 41 +++++++++++++++++++++++++++++++++ board/freescale/imx8ulp_evk/spl.c | 8 ++++--- 3 files changed, 47 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/arch-imx8ulp/rdc.h b/arch/arm/include/asm/arch-imx8ulp/rdc.h index 9746375..5d555c4 100644 --- a/arch/arm/include/asm/arch-imx8ulp/rdc.h +++ b/arch/arm/include/asm/arch-imx8ulp/rdc.h @@ -23,5 +23,6 @@ int trdc_mrc_region_set_access(u32 mrc_x, u32 dom_x, u32 addr_start, u32 addr_en void xrdc_init_mda(void); void xrdc_init_mrc(void); +void xrdc_init_pdac_msc(void); #endif diff --git a/arch/arm/mach-imx/imx8ulp/rdc.c b/arch/arm/mach-imx/imx8ulp/rdc.c index 472b13b..50b097b 100644 --- a/arch/arm/mach-imx/imx8ulp/rdc.c +++ b/arch/arm/mach-imx/imx8ulp/rdc.c @@ -181,6 +181,25 @@ int xrdc_config_pdac(u32 bridge, u32 index, u32 dom, u32 perm) return 0; } +int xrdc_config_msc(u32 msc, u32 index, u32 dom, u32 perm) +{ + ulong w0_addr; + u32 val; + + if (msc > 2) + return -EINVAL; + + w0_addr = XRDC_ADDR + 0x4000 + 0x400 * msc + 0x8 * index; + + val = readl(w0_addr); + writel((val & ~(0x7 << (dom * 3))) | (perm << (dom * 3)), w0_addr); + + val = readl(w0_addr + 4); + writel(val | BIT(31), w0_addr + 4); + + return 0; +} + int release_rdc(enum rdc_type type) { ulong s_mu_base = 0x27020000UL; @@ -325,6 +344,28 @@ void xrdc_init_mrc(void) xrdc_config_mrc_w3_w4(6, 0, 0x0, 0x80000FFF); } +void xrdc_init_pdac_msc(void) +{ + /* Init LPAV PDAC and MSC for DDR init */ + xrdc_config_pdac(5, 36, 6, 0x7); /* CMC2*/ + xrdc_config_pdac(5, 36, 7, 0x7); + xrdc_config_pdac(5, 37, 6, 0x7); /* SIM2 */ + xrdc_config_pdac(5, 37, 7, 0x7); + xrdc_config_pdac(5, 38, 6, 0x7); /* CGC2 */ + xrdc_config_pdac(5, 38, 7, 0x7); + xrdc_config_pdac(5, 39, 6, 0x7); /* PCC5 */ + xrdc_config_pdac(5, 39, 7, 0x7); + + xrdc_config_msc(0, 0, 6, 0x7); /* GPIOE */ + xrdc_config_msc(0, 0, 7, 0x7); + xrdc_config_msc(0, 1, 6, 0x7); /* GPIOF */ + xrdc_config_msc(0, 1, 7, 0x7); + xrdc_config_msc(1, 0, 6, 0x7); /* GPIOD */ + xrdc_config_msc(1, 0, 7, 0x7); + xrdc_config_msc(2, 6, 6, 0x7); /* DDR controller */ + xrdc_config_msc(2, 6, 7, 0x7); +} + int trdc_mbc_set_access(u32 mbc_x, u32 dom_x, u32 mem_x, u32 blk_x, bool sec_access) { struct trdc *trdc_base = (struct trdc *)0x28031000U; diff --git a/board/freescale/imx8ulp_evk/spl.c b/board/freescale/imx8ulp_evk/spl.c index 2a96bd0..a0dad5f 100644 --- a/board/freescale/imx8ulp_evk/spl.c +++ b/board/freescale/imx8ulp_evk/spl.c @@ -104,9 +104,6 @@ void spl_board_init(void) clock_init_late(); - /* DDR initialization */ - spl_dram_init(); - /* This must place after upower init, so access to MDA and MRC are valid */ /* Init XRDC MDA */ xrdc_init_mda(); @@ -114,6 +111,11 @@ void spl_board_init(void) /* Init XRDC MRC for VIDEO, DSP domains */ xrdc_init_mrc(); + xrdc_init_pdac_msc(); + + /* DDR initialization */ + spl_dram_init(); + /* Call it after PS16 power up */ set_lpav_qos(); -- 2.7.4