From patchwork Mon Oct 17 15:45:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1690982 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=cp8iHbMP; dkim-atps=neutral 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MrhDN5g33z1ygT for ; Tue, 18 Oct 2022 02:46:12 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1B6B484F00; Mon, 17 Oct 2022 17:45:49 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.b="cp8iHbMP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A14FB84ECA; Mon, 17 Oct 2022 17:45:38 +0200 (CEST) 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,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2071.outbound.protection.outlook.com [40.107.22.71]) (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 00EC684ECA for ; Mon, 17 Oct 2022 17:45:35 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nXZcvtVYjAGZgMIMKZcmPH3byuDH3WPuXxGd7BETjRiv6EOnZijRkjhLPCg9PZgBb7SFNOY3VMOs4OI4S8hv6VTZr4nElfEUOI1iwDWMcqpAds+9hjUyhKsS6tsc1xrdZugqbxz4zaoI++hUtIUtoH9CS+sBW8nKm20T4hC0SMK+Y+FcJ1AMEUa1grne1jiFumS2UWr10GKePuD/tCk/34+fRdfkXj8N35gBEyGMppAjQfQLkoXowH38cwW548t0tJaXxkxD+0wVTUtWC89GOykj3+axpHBdaul98qiNv18BlUrlXlNgND5VX8gvvXIvMVxyjxqZM30jf6RV8UaVmQ== 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=G9/EcutWPo23USSAMq1NjyV38tGsr36qCTbuzlME+iY=; b=hqF7sx6Dptaromu/1P359fAoP3xB+MBCTPFfB41diBb1yLui7H+BoxXbPeKDfHdhW9MM2w1+VIk90qHA3Dv+R5jgdXD4X3Qn+nHu6CwpISqMze+cJyGNwk581SGeGBwqIXylTXIqf8CTFX/oh9quVNRph4RYJyj3xVfgpRsgBMM5IZJFYpsf83tuF9lK9UR/LlB4ZtIa1k+/hM2R6AA5gpjkevcnvSjgWJY/54QhGXt1t4m6ZQQ0WB8BRkd0Sjq3LsJc847+VxWyw1VqC16VHGc49OV9TtbNTE/r8PeABBDazmY2jlCeDRPV0r4XiWYSfL0HqsHT5XqDA4TNm/QG2w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=G9/EcutWPo23USSAMq1NjyV38tGsr36qCTbuzlME+iY=; b=cp8iHbMP7beav9CbN1kTDQdHq9FE4xiBFBb6a/bt8luGUpavi4W2R4JzRGNFzArl0nDxXTbw6re107NKFKq9b0MQcTDRKvHGkCPZxvrRkbMnNCwZyu9iay9B16UgWlw9qiIyGCfT3du6o0og5udsEY5Of8wq8u9rFAVpEgNtEqiLsJLyvsL5eHxl400lkhKGH/T1tgC2JNldwVZEnEE04Vs1DXD/ETsmqr6VwpAoXimGrIkVXOcvdVlyJSyTn5JSzvrk9nZQxHT7aoktK7xjquWSd8Jf+ymUOKSvMcrhweRlAHHkdBA6tnw4rVGjGMNDO8RGd1R5Gq+f/7nyEMXdTQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) by DB4PR03MB9484.eurprd03.prod.outlook.com (2603:10a6:10:3f4::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.30; Mon, 17 Oct 2022 15:45:34 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::204a:de22:b651:f86d]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::204a:de22:b651:f86d%6]) with mapi id 15.20.5723.033; Mon, 17 Oct 2022 15:45:34 +0000 From: Sean Anderson To: Priyanka Jain , Peng Fan , u-boot@lists.denx.de Cc: Ran Wang , Mingkai Hu , Pramod Kumar , Rajesh Bhagat , Sean Anderson , Peng Fan , Tom Rini Subject: [PATCH v2 2/3] arm: layerscape: Disable unused parts of ICID tables Date: Mon, 17 Oct 2022 11:45:11 -0400 Message-Id: <20221017154512.1652002-3-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20221017154512.1652002-1-sean.anderson@seco.com> References: <20221017154512.1652002-1-sean.anderson@seco.com> X-ClientProxiedBy: BLAPR03CA0066.namprd03.prod.outlook.com (2603:10b6:208:329::11) To DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB7PR03MB4972:EE_|DB4PR03MB9484:EE_ X-MS-Office365-Filtering-Correlation-Id: eabc6f81-49b7-4ab1-28ef-08dab056a0e4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WcIgZSh3b/VGZS3vsAetY9hPoLlnpXaoXM3Ps1TOvkrxGAt2vKdAmV4d0kjBcgwlqp4nxFa4N18gDka49LwZzXdFiSx5M1W/u6VHA1A8JCJWLT2bgi0ypWiH8HHpkDe2ijzjrx4PQ+rPrQbsrsguOXt3paEbZJdhYSU/e/RISbhsb83j9fwgcu4USbL2m/7IK9TLp21slWbnkd4OW2d9JKStL0q79vDm4Oqd1ps1zCagz+p/C8EcehRsqGsR0r8oOcodTxyXmfI0gO+TJ3xWkXL1B5rNVlyk1U4GqbEbfhhN2/GU+BGLe+zrRDEvQ1TDF4QhF8Xzyh55WTDxSkIBYkc02yWtQpTu0qEERKfa47lIoNVvD6i8CrOqxkDgDggigf6oei7wkl7nlxIGZ+coeEKxK5nqGFG/7U3ept2vnvotyFsISYY9uP/HipXsf223uOP2szIyftWSiW2gnXj6EE3DLqscZnaV8/g4kP/6RrY3r439GqHn/DZ9dJVzaoSRo7Ukln66FlFZ2ss9L6J3A047Hr0mfziA5cf+Scyd40GKqoGlchgLLRoovlophF9Pp9GztPwFV0481zGqWANBUOoMOwLiafYI5eVVbaD4t2lOr1VhInWAp05/qFbnpBMOictMnAtCQ3rRMJmX6IEOW85d9rbeU5GgY5pFzGqj/zOnAlpurHe1m4/9tMnUJrwUBFmmfpInO4bu7jFGBVl2pWa0X006SkHN1rFXl10tV4rWPKkpVtl00c5B+FrrJGbre7SDOUr8jZuTExAu4HKbFw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4972.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(136003)(366004)(376002)(39850400004)(346002)(396003)(451199015)(2906002)(2616005)(6486002)(478600001)(1076003)(186003)(41300700001)(6506007)(26005)(66556008)(316002)(4326008)(6666004)(66476007)(86362001)(38100700002)(44832011)(54906003)(38350700002)(66946007)(5660300002)(36756003)(6512007)(110136005)(52116002)(8676002)(8936002)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fuyj82mggAU4d55NW4vZJOHvCoKm2tJJfNYB2wqgCu/lGDYjGv3pzf71MhxlcdM87E3JvbA3Zxm4YubUX5e8Yc3PunlGM7FvT75dm7A3BVDntr9aJSQ257Z+2U5BfZxRYMKMupUq1iM1Coq2oc5tWgBQBuKuPVqw7CRh6tiilMOemNxVCnjW+gXTCV1r0Eh/jLfKQ90v4i4CBpDWf+xgkXUnXppZiTD0wKqTgJ/hpMaz5Y3DDC7e5cZpEJ82GSKIj2q9BR5qQX7pmXPC9TEzODZN3ipi3Biay2TQlHhARb3ueUzyaH4pCaFgjTAiPszAnndk5Q8fo6vy/PNzI/HhAOSHiWCCBgmIgKj8USmc1K9b9pojOszptGg8Yl1qCpdw/agxiQzLrHr5/zZgyVvqMpgB5NWRUJ3Yy+xkTWet2mSAmlTDRa37fqgyqndHU2XsJ5rjR1e068j1h/5Db8IMxLuU6ISRkkwU6Q99tnuv6qxTB/ZX+rrXBL2NKOuR1FGEBPH0LsZJoyBX6SDxA2RYutTs4j39KNFVWTeZQqPQF0jPs0b94UcurgmOtGNqsbPArJ+aO8N/db7CLxQBkO/gqPopI2sca7ip4ksekGbrXJDS2cdEWsUxhzkb/1Kz38QRt/TKOLis/yG7qOf5768sYcJ4qNgDAR9HR66zN0IJaG02LqH0XvouWhdhmIxS3Gs7EpR7OINqY1/OrL6GiIL1MNOAW1PGnbuNDMD0tCjLmCJn+LEgrYclLMnR71s72Y8Mn/PIbSvHadaIdDSZyH6cPY/ov0RWw8s8C0eDyIMyrIhVC7NWiYr9vw3vS0zFND442xpA6xyL5UoPV3lfVJ1y3kalhIcJlV/YcQyERSaMB9+Dal6pgu/U2MbOHByS1K5K0wz58DCf+CAgOwcyh1iqLRNSrtPapeeaQTqyJ3MLFmMS3Eg4i12rkcoGx+4ezMjKJsZH3YaRAE0LIFQJcifPciFUmhdnbdFsL/Epwj6OfH09uBlUP3c2XWGcafzFnGuYb0+OVwJvkQzUuWlEyFHVMaC76lge9WmqHz53l4udYcTeJLYu7FnKJ82Plk/T1blgO7pRc2AinBAstIr2ZIRDs3vg0Thaqs7y3oMncB+Fk50oLNpiE9nw6j6nkc+J8tH0SuAKNU8YAsT5Yll6dIfH0P67LsnHu4VPVh0BYBK2YjyZ1VPlSelDdKhhNHYUADQ9VzIANRby/xXDZmglgKiB1mUWu+pk3J4jDoWJIFo/pN+UqJj/3BWwWIkvtIJDYjX6V+z7KWY3dQpyXT8vYmfA2qNdR5bEYnyFxmit3ou3eRWG/y0h0A+Oneh3glpxb/q4PJOlI/wp8FHkHy5/xTOrDCA17sI6DxyCXbohqTwjo8E6RLjgAEUY/vyVyMtNbVAkmbIQWr4w2uH05l45Nd7gX8x/zPnK9ay8M3VlwQKv6ZITL0477MadIa+Adwa8J2mXVKXS4WmEhzY3P5zCCTpsT7ElbhqGmp4tem6hMLk8DEQb0PQ8FkxlDh9lUUPcdodiPIx2FeMKMwlGuNyZ1iPPU9H5S4SZwcmgQfqHE6/DMIBvr3enbwKDo9EnSE6VvXlpit8PDbZBmla1xULGu1GBzg== X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: eabc6f81-49b7-4ab1-28ef-08dab056a0e4 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2022 15:45:34.0423 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: DKZyz1q0rDgVYQ/p3KeanDg/YdOy4owReLlPTb25POl8BqDUaZAbjxTfMjyGHiR0ans4etrcCcFhiaFR0t+ujQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR03MB9484 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 Several parts of the ICID table are only necessary for U-Boot proper. Disable them in SPL. This saves around 500 bytes. Signed-off-by: Sean Anderson Reviewed-by: Peng Fan --- (no changes since v1) arch/arm/cpu/armv8/fsl-layerscape/icid.c | 2 ++ .../include/asm/arch-fsl-layerscape/fsl_icid.h | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/icid.c b/arch/arm/cpu/armv8/fsl-layerscape/icid.c index 25cd82f16eb..2d87281ec21 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/icid.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/icid.c @@ -46,6 +46,7 @@ void set_icids(void) #endif } +#ifndef CONFIG_SPL_BUILD int fdt_set_iommu_prop(void *blob, int off, int smmu_ph, u32 *ids, int num_ids) { int i, ret; @@ -190,3 +191,4 @@ void fdt_fixup_icid(void *blob) fdt_fixup_fman_icids(blob, smmu_ph); #endif } +#endif diff --git a/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h b/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h index 3c06a55cb85..8af0d35d27b 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h @@ -12,11 +12,15 @@ #include struct icid_id_table { +#ifndef CONFIG_SPL_BUILD const char *compat; - u32 id; - u32 reg; phys_addr_t compat_addr; +#endif phys_addr_t reg_addr; + u32 reg; +#ifndef CONFIG_SPL_BUILD + u32 id; +#endif bool le; }; @@ -31,6 +35,13 @@ int fdt_set_iommu_prop(void *blob, int off, int smmu_ph, u32 *ids, int num_ids); void set_icids(void); void fdt_fixup_icid(void *blob); +#ifdef CONFIG_SPL_BUILD +#define SET_ICID_ENTRY(name, idA, regA, addr, compataddr, _le) \ + { .reg = regA, \ + .reg_addr = addr, \ + .le = _le \ + } +#else #define SET_ICID_ENTRY(name, idA, regA, addr, compataddr, _le) \ { .compat = name, \ .id = idA, \ @@ -39,6 +50,7 @@ void fdt_fixup_icid(void *blob); .reg_addr = addr, \ .le = _le \ } +#endif #ifdef CONFIG_SYS_FSL_SEC_LE #define SEC_IS_LE true