From patchwork Mon Jan 24 20:48:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ZHIZHIKIN Andrey X-Patchwork-Id: 1583685 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=leica-geosystems.com header.i=@leica-geosystems.com header.a=rsa-sha256 header.s=selector1 header.b=iQ7dFnax; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JjMXs3r0Rz9s1l for ; Tue, 25 Jan 2022 07:49:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 45668830DC; Mon, 24 Jan 2022 21:49:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=leica-geosystems.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=leica-geosystems.com header.i=@leica-geosystems.com header.b="iQ7dFnax"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 258C182A65; Mon, 24 Jan 2022 21:49:07 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20730.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::730]) (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 78CF3830DC for ; Mon, 24 Jan 2022 21:49:03 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=leica-geosystems.com Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=andrey.zhizhikin@leica-geosystems.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aN8owKoJf18wor+lUmQ35PZa5KWg71ZVv+4VkuX9mz6ho33MSBC7CorSLYHsEvghM61fOsCdWQtPsbAC8Ge9q4hYp03KFmI9e220X2TGAUM2Y1GEzhT2sbtTlQTydxP0ybwe0IeRmEsduPYYGCRBD1oZxsPAhHoVUwRA0KyN9nbZcYspVpaLuH4TVs+9km/yBsxoRE2pVZPWwc/usToxBKlVHH+k+IGn133KKvFO6xn94I9hRAMYWvuNw5nmYUGcMBnWOdvsV/h87GX5NT/hNCtTlV1TyxBHQioC81mSDfZeKSKNDQDSkWVfyGGex1ZLmi7/kqnaArcYaMy7Tt/lCg== 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=vV5W1YcU1eByCSgy6J6WFP9Z8LEyrggfeTycYYnhTXc=; b=Bb2rQ+MNUqMURI50/rapKrm5ETlYn25QYAQ0z9hbk2uvfwNwMB0j2W7hod78J5HRoEshfFRn6a80lF4+zgiKJNx6xKTTFGsWctdFYwY7DXtUgeqhuKsDvXcmI20Ci2OBVgfFa2AOMVconzLIepWPUVzGVawTENfrn4vUBLfYn8HklGlfZDT2gxE0t3n5oevC1/08T2ru04jztFPoEi1aiHqWg4IeS7yzUc9/i+2G0r+Qfa1fYfR507YV/INlZ5RQu8BTsFkjBiLJP7aLhirY1FdooFycIvaIbjp3IgDz4FR31HAAEVCP/RZPcDP4SjwduYwFABdAN1yq6v6HVCcTsg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leica-geosystems.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vV5W1YcU1eByCSgy6J6WFP9Z8LEyrggfeTycYYnhTXc=; b=iQ7dFnaxN6BfRP12s+7kWMOB4NkUTqcuNikgNfhE+D56dC7rF/9fHpL6freT15LsPJt+R+QqjXV/Up2p9oKKNdlCBxaJQzCpwa121hx8slm/NbmfWJB/MqUzQfxaQMC3lAZU+M9vhhCwwCwqCMMKr2RWL2Do+Wz0Y9ZDi56ft9g= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=leica-geosystems.com; Received: from DB6PR06MB3096.eurprd06.prod.outlook.com (2603:10a6:6:3::13) by DB6PR0602MB2872.eurprd06.prod.outlook.com (2603:10a6:4:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.10; Mon, 24 Jan 2022 20:49:02 +0000 Received: from DB6PR06MB3096.eurprd06.prod.outlook.com ([fe80::6986:1763:6366:acdc]) by DB6PR06MB3096.eurprd06.prod.outlook.com ([fe80::6986:1763:6366:acdc%3]) with mapi id 15.20.4909.013; Mon, 24 Jan 2022 20:49:01 +0000 From: Andrey Zhizhikin To: u-boot@lists.denx.de Cc: sbabic@denx.de, festevam@gmail.com, uboot-imx@nxp.com, peng.fan@nxp.com, alice.guo@nxp.com, marex@denx.de, ye.li@nxp.com, sjg@chromium.org, frieder.schrempf@kontron.de, marek.behun@nic.cz, hws@denx.de, paulliu@debian.org, Andrey Zhizhikin Subject: [PATCH] imx8m: lock id_swap_bypass bit in tzc380 enable Date: Mon, 24 Jan 2022 21:48:09 +0100 Message-Id: <20220124204809.19528-1-andrey.zhizhikin@leica-geosystems.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: ZRAP278CA0015.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::25) To DB6PR06MB3096.eurprd06.prod.outlook.com (2603:10a6:6:3::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 18cb5a0e-7209-4fc6-10b9-08d9df7af2f9 X-MS-TrafficTypeDiagnostic: DB6PR0602MB2872:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1107; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Mhfq2DceOz1fUSNekI84l9J01Q8bC+Mk8tJs6ObRPjNmATVp84LAl/FHsEir3GV6VMkLDx/hlx7XrX1HbD0vrKsl4gAMCpHSjke94f0D6p4plsHa1MGoQbjZCKzN2xlEFCP4Ga+szMqCm1xfmvARI8L567KCB8pHDj5INf5RoEDYYmrRIVTKD4XT87/gRfwty6UN5Ape62IZ3QoWjpGbjhXxRojLQHSkTJD2pgiih4iVRZF77IeyvHL7G7pJJk+tOgc8wU2HxBRYqgaZwqhNcYm5xqr68EKqsw9CXjHCfmf5EV1YLVgqyJoYr5m7C+LqZS6jF6jzgzmBqhfVelbPDRRUt/ZnoU9K3k65FwqQ2cJQgFuNFiK2ofkvkjWkR6w6gTC/osP23pGanYHH48fqQ5uK85xavstAHtDZfSphB/73mrGsdiqZZMfzJUUdfP7scLumzE/rU+aE248LzAUhsTaIyCrmhFz74ItYvUf1ECTI6aRQb4M64jb5tecNITj2sRICa9kirwL9hZFWRUCXu1aLTCSGGqNqiA2O/dO+uWPgwr1zXDQi9LhFqmq6oNbsdVA2vudiRkBq5p2zoGGQNcThqUuE9vFWCbiPI6FsoZToaTLrdGNA1O2nN454KDJzhV6T/O+sjukPg7qvAEt9UigukoZj2oOSdGsx4/p61Yf5iQrL72l2mKdcFgZnF0jLRmH8Bp0LbImPbJ0SRtuuP02wu5rzklokk9H823gqYgo= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB6PR06MB3096.eurprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(7416002)(5660300002)(4326008)(1076003)(36756003)(66946007)(2906002)(38350700002)(6916009)(52116002)(66476007)(6512007)(66556008)(6506007)(44832011)(186003)(26005)(107886003)(2616005)(8936002)(316002)(6486002)(508600001)(86362001)(8676002)(83380400001)(38100700002)(32563001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GDZmhRej8lTBiqPhbyF7PTRt3GIGxanhOngaiO698rFGN6uCahJpXHhJej8eNnBlLc5O0Nk2MLUI2XULa2Uaw8GJwPeH2Q9OsT4ZHg2NzogasSeIYOeBdHAu5liPa3IUmGQf3LAuTnfSnjTGMeAGntl1SWpDGAZNDa5YuiIiAZ+jP5PSCkHnykzLFYpukYJPfB7DWi2pIeQB3G/WyozOrGOH8y90kg4pG5tWu3o7qtICZpiZbDExmbZ9Z9U0zDzLxaH6733AfdPHgM/zseGcRe+HU5GjK4bTCmwsseg8VaMlY8R7hLlnOFTUTULDTNjpf88O1fvYhqte116HErzEtHkX/zLZvLIAD6vkntRy724ebTz3fr/ba41V+PExUbHbhK9YUe9r5SHgYS+UnmBruLMmQUUtyRbompKiLm5vQ75OwoY/34jxUrtcM6y6Ih/WH48wUmlQuKU545hDbO4p0zhnpuyTZ/hYxh31hwNAahg/vfe2VvDSl7Whha24c4RWNgISjmZUZaM7RkrBf8OHVMH/+CXlM0zrws/VKC3tgiLqjQt54w35/4KRrb4fWRSZ2rr9LwXb6ClfMQo7e3/XtuBcMkBLIM98elsOw0bQvNbfpUYxH3yM/UOHJc4g2pNRiJij9CosyWyIOJSmI2TxZ0kX4F+ikzA8PpJKl5B8hFBftrFAAt67kc1rg9TEKUrfWaEPlWXdo1rMaOK3adcAlntcxvwuW/60Vr2fQ3psGciteIaPMvQ/FPu4ooD4Dc3TgtxgVIuMa2aYyX6b+Fb5lOPInBMMhm4yDP2NMqbrfYv26ArKbxhLJfBDzM3FQHzjTEc5LdmPTNZFnU871ZB09R35XP5zDvmaRMz5OGmYBfLSnBK9o1xHT3l2UlGQQukO+Mjg8Y/KOGgfUPIgIZYXQer9GzFXRFPBPpNDs9IN1O+T/PLKXAYMlWyzYHWS89uJmgbyYjJdsyM0Eyzhlq/pi4EdvYHoRxPFJ3JULjMKZQ8aaW2DQUZF7Q0m8CKfXb3eh83mHkqiU3PRo+4Sb7tIySHuw0Z06sr9pcAWc/NYtko/d+Emq76cqTC3VA1bkonsAPmHlDbjkUt+AOwTOX3vtZaocKusBcVnOITehxSzW/lm5X0h+SgvmDWOdaYhrUv6LkHc7EuM+wAeNaGTpA/3iJqmeVmJ8TWgndv+NAS5WlwtalkTwoPriDtMT6UHJy1rPR8JAOnTwwFy9+ZeaFNQWx8oA90Ndau54h1pWmijFG0+ko/l8QTPmtpAmDP2DGCTPefuNoOhidR4bFMslXpq9OfO5oz7ci41+dGFU/I4HTlNx2ND6mIagtDttabmu1v89kwC79C63wJZxhNvVy3D+dcgjKIOMxwO5q+AUc09fHsMJp6I8YQvb+naASwGBIivvDmmDhsqz8pt0887KJtKAtTZo9T8uifENbaSB1or5tipQY0njdbyCdpQdPPa4X0Lh95xPS8J+j75ompVUG5I2pFX7Ef9+oJ/BLR77gbBosJzyhiU2499/OEF6GGNFTYOTCcfALD0aLAV5vz/yeuQXjNDzJfU3ntKg9Gd1TCryiluHl3c+eErF58viakAV6Yf3QwuGZfDeEFIAN8+bUx+1L5Gl5IbAPpdUX+N2eJQtNmo2nElYxwxfn7MiIhLmQgt3hkJCKzinm4siSjxbfmmSg== X-OriginatorOrg: leica-geosystems.com X-MS-Exchange-CrossTenant-Network-Message-Id: 18cb5a0e-7209-4fc6-10b9-08d9df7af2f9 X-MS-Exchange-CrossTenant-AuthSource: DB6PR06MB3096.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2022 20:49:01.8641 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: lCmPZwzk8zNo6EpkqOou3yDAys8zEH14j1ExPcwA7OLYm/xgbfu+B6s1szy/aSSYGXFjceFjiatMrn10Hfrr5OFDOpheAQQinXaogwPyzeo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0602MB2872 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.5 at phobos.denx.de X-Virus-Status: Clean According to TRM for i.MX8M Nano and Plus, GPR10 register contains lock bit for TZASC_ID_SWAP_BYPASS bit. This bit is required to be set in order to avoid AXI bus errors when GPU is enabled on the platform. TZASC_ID_SWAP_BYPASS bit is alread set for all imx8m applicable derivatives, but is missing a lock settings to be applied. Set the TZASC_ID_SWAP_BYPASS_LOCK bit for those derivatives which have it implemented. Since we're here, provide also names to bits from TRM instead of using BIT() macro in the code. Fixes: deca6cfbf5d7 ("imx8mn: set BYPASS ID SWAP to avoid AXI bus errors") Fixes: a07c7181296f ("imx8mp: set BYPASS ID SWAP to avoid AXI bus errors") Signed-off-by: Andrey Zhizhikin Cc: Peng Fan --- arch/arm/include/asm/arch-imx8m/imx-regs.h | 6 ++++-- arch/arm/mach-imx/imx8m/soc.c | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) base-commit: 21a1439d986a889cefbc2ed785c3f592fc9266de diff --git a/arch/arm/include/asm/arch-imx8m/imx-regs.h b/arch/arm/include/asm/arch-imx8m/imx-regs.h index b800da13a1..45d95a7c19 100644 --- a/arch/arm/include/asm/arch-imx8m/imx-regs.h +++ b/arch/arm/include/asm/arch-imx8m/imx-regs.h @@ -80,8 +80,10 @@ #include #include -#define GPR_TZASC_EN BIT(0) -#define GPR_TZASC_EN_LOCK BIT(16) +#define GPR_TZASC_EN BIT(0) +#define GPR_TZASC_ID_SWAP_BYPASS BIT(1) +#define GPR_TZASC_EN_LOCK BIT(16) +#define GPR_TZASC_ID_SWAP_BYPASS_LOCK BIT(17) #define SRC_SCR_M4_ENABLE_OFFSET 3 #define SRC_SCR_M4_ENABLE_MASK BIT(3) diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 863508776d..5f5175b4dd 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -66,8 +66,21 @@ void enable_tzc380(void) /* Enable TZASC and lock setting */ setbits_le32(&gpr->gpr[10], GPR_TZASC_EN); setbits_le32(&gpr->gpr[10], GPR_TZASC_EN_LOCK); + + /* + * According to TRM, TZASC_ID_SWAP_BYPASS should be set in + * order to avoid AXI Bus errors when GPU is in use + */ if (is_imx8mm() || is_imx8mn() || is_imx8mp()) - setbits_le32(&gpr->gpr[10], BIT(1)); + setbits_le32(&gpr->gpr[10], GPR_TZASC_ID_SWAP_BYPASS); + + /* + * imx8mn and imx8mp implements the lock bit for + * TZASC_ID_SWAP_BYPASS, enable it to lock settings + */ + if (is_imx8mn() || is_imx8mp()) + setbits_le32(&gpr->gpr[10], GPR_TZASC_ID_SWAP_BYPASS_LOCK); + /* * set Region 0 attribute to allow secure and non-secure * read/write permission. Found some masters like usb dwc3