From patchwork Sat Jan 1 17:13:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1574499 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=windriver.com header.i=@windriver.com header.a=rsa-sha256 header.s=PPS06212021 header.b=MDnfrhaF; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JR7tm11JRz9tk2 for ; Sun, 2 Jan 2022 04:15:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D8E5881277; Sat, 1 Jan 2022 18:15:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=windriver.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=windriver.com header.i=@windriver.com header.b="MDnfrhaF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8EB8982FB5; Sat, 1 Jan 2022 18:15:23 +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_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) (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 EBF4D81277 for ; Sat, 1 Jan 2022 18:15:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=prvs=800048d64d=ovidiu.panait@windriver.com Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 201HED0e012132; Sat, 1 Jan 2022 17:14:13 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=R91qelrT8MOQ4vUJ2BYDsaxzrIrcOKn+1vmYE6Ctz4w=; b=MDnfrhaFavaWP+A9lv5dRRy7t4dJouaMsOlBJ6kZpPq6/s3edaZgKzUnn5Fcunyl2xrk /qhp9c9YGTS0zDi2abXKwTodh8DBZf+fzdkyM7i9ju3tSAki075qwJqiLDKFGxKgDGv/ gb9C+6OfD0GJtojazdqbfVwrq57jsyQGcTnU6KI03LV8U3v2ad1/2gAYoFKFNLcWcyf2 /UUcUJe5Ey1FWVS98GakOcxFviCPi5vJEifuR7zPhnZeujyPuiDmp+riyykouxkWbnI+ qHhY6ntOp4bn9NyD9FoaviILgYU/MLQb2XDTf34UecGGWxumejFbOHESvGwkSo/UCJ49 zQ== Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam08lp2174.outbound.protection.outlook.com [104.47.73.174]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dac6089vu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 01 Jan 2022 17:14:13 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IaygVslwaD54bbpdEQ3kRPdOAMX5jxiozlhmm0wONNl115I3uWPMCo+we7tZ7lU2nVBLEczol82MMmWHY/YM+qQDOZf63qZ1Me3aFJFJZTSlN/D6l2x0V2ulbmq2ejvJyOiWJSoCHbu+8ui9ixPBzzWnIr9kDNwCUrxeTCBH8jK6ZNdQwRckhJLe7DlZUClVCHXiLRsY4baBaZTk2RIdYv0AxGiSEryC9dKYLk5xbdudDHRJc5BAhg+8Hiww6w3rgHyyQjV5/6/AD0KmNOwUd2OG94sIKtawsQUdviMCJdo5f7OT46j7ubirsupNkbU05wbORa+znsFZhDbRpWn5uw== 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=R91qelrT8MOQ4vUJ2BYDsaxzrIrcOKn+1vmYE6Ctz4w=; b=dO96wVS+bTm/kVIfEh45SE6W9wCqJxcvcq5G4eWsJUFphOqFeev3vlqU++b4vS6zKpQynHkbRjzNctaCRr2QJ2BrKNITyxmRDzZv8KNPCzpM/bpkFroXGBOkR5ygxJ2k49tNodoVloiWDHRWX6+MEIf9hAuNXmdNYljsqUXUulm5Ar9OT3UTkt2NjoGZET95pARhL8uvnCeoPCPC5RsqCm063CUeDPQhbAII1PmhsmSnC/PUKK6vImTol+oArBiP6wIEEkh60W4fPy+VIXWD8VBRSSIk4siJFlkKUUAyFKjJqqgFTEwlHwZTyB9Blk6ExGc+VZVVh/M57etIMa+oeg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) by DM5PR1101MB2284.namprd11.prod.outlook.com (2603:10b6:4:58::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.19; Sat, 1 Jan 2022 17:14:11 +0000 Received: from DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::7d5a:c35:1ddb:11f3]) by DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::7d5a:c35:1ddb:11f3%8]) with mapi id 15.20.4844.015; Sat, 1 Jan 2022 17:14:11 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: Ovidiu Panait , Simon Glass , Andy Shevchenko , Bin Meng , Daniel Schwierzeck , Matthias Brugger , Priyanka Jain , Tim Harvey , Wolfgang Denk , Zong Li Subject: [PATCH v2 5/7] common: board_r: move init_addr_map() to init.h Date: Sat, 1 Jan 2022 19:13:29 +0200 Message-Id: <20220101171332.2676936-5-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220101171332.2676936-1-ovidiu.panait@windriver.com> References: <20220101171332.2676936-1-ovidiu.panait@windriver.com> X-ClientProxiedBy: VI1PR0801CA0071.eurprd08.prod.outlook.com (2603:10a6:800:7d::15) To DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 54569416-9e4e-4a0e-7048-08d9cd4a20f0 X-MS-TrafficTypeDiagnostic: DM5PR1101MB2284:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /Bcac2tLD34dWv0gYuuvB3OWBr7PgFUQ98TwHrHKDf0GnMCrPZS0K5BBRcXGHu0TOLs7w3tirH/9Vni1J3G5c24S4UKdQMzsD8ST5AT7usOysJUs03tmS3BH316KZbHNLP0OaaUyvqNf/hA/TU2vQIRCh2WW2i415l0LPlNk1pjET47UfaMIMYZSkjbzk2ilXAgYB8V3sdDK0ZLBzu7zIXbqRY+K+ovAtaOpPedVwktmC3xQSo8w+yIgSE5H+plI1f3pUNcd7qGBTnA3jM5FnO033gGAYTnpmp0IFlXsg5yrvRsHixmSDStl+JpryB//DPPEJvU7H+4eoKAF4TZ4MRcxEAyhhsoMSZO2SQ27zIJ71ziqcR5fxawwrpliSicZ+ocxnz+QopjUtp6jXddnBm1hqn6GtiN3ZMPD5oNgmLVZBRkrOkyal/idXiiMFImCevF0RX6/q8IcFt1c5eFkCPwapSZ6ehwlRRQOUBEbI5MOR+k7CKdkawrsRGFj+D7WXxldJdlGpbqu6ucT3oIlXTFfLNgLIDjpOgxetu+4+plDifT5BBva8WyfeUtFe8Y+ydK3bI4SppmDCn8ZRoUKwD29rR5opzg/76xhKDhFvF9RxBa2mrG9rE/cm7DpECgFRcDy+WYctvNlbMM/uwslJGXaSEgrptGBRBp49TgthDf4x1Z5ibb/TIWw6GHfSsaTEKubHsaWxZIvCrNaFjulmA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5327.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(66946007)(6506007)(44832011)(66476007)(66556008)(316002)(6666004)(8676002)(38100700002)(4326008)(54906003)(5660300002)(6486002)(508600001)(38350700002)(52116002)(1076003)(2906002)(8936002)(36756003)(186003)(2616005)(7416002)(6512007)(86362001)(26005)(6916009)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: or6poVgPPguU0S87Ir+/W0aHDN8GyiQRAzcI8kOGCwwmNEFwEHwA3dO+nINf658yL7vSqU3pUHxfeLAqg0hrMwVZg/6Jd4HiLTTwLFoJCmCKZmNx1c79q40wRu94uHcY8Cy1efWhJUMG4YQNtYkKSvgtrG5JArkA8IZzjYTYnuZVAsSfd4jV29OF0k31/FoLo8ZR9OIoJ+UWX10og0DSaErxXXWbNLtM7e1DCoXNEsRvME6WetNK/9cBEWxi+RiO8HG7Ngf7aKhQN4/AZlIRBO8JhV9+1iKfmCf+pA2nryGU1oCZtwNQyBDcfAOgHHxJ+HTVUe2I1suVnQeboFEzgDToJY9Lni/HxFPxv+cag/mvdhqXwSE5wbn220zc8kJxI9Jm/vwgbZ2EWvogX3ibAeRsVAr/yXK0akSyfi4Yc8DWdfB0aQWYwukz39u3LKlQxqbJFb0fchZy3Arjlw5sHltZwOpbReL7fzMckbBIgBAVzwoVjk9FgBEZxZ5Be6vA2KwVcoCj9T4+DUqO6lctYkKhsZBsnZcldt1tOgQLwD7TFugijTSC1fIgOekoEN7Fol/i8gfCBFbn1XaRiSmACD6J6SOZxagPPRMyjM/od0VOqChGieP8ruA7u3mLeDbOFhsmEoiIuEhraxsIi/J6FwFyOb6lmZ61WPB1oqLAok0cUb6zcrPaDXpiwnQ7RSmp1hmubyjOQCoct4Uzewb37OiQcKDeUMh5s/gzh3luJxI4JVjB3NbBo11uTwwoobQPN51Q0gGKwvM6dcHrIAyk5vpOH1iVUsrzmW4tve8m8aowJMUR2HyROmNL9KSU5nGEwTug5CBnJxujJJgDD5wSZaAMEXsWfXcchFhbGl9HQRbCf8tpBX+nfbJrEbaqhajsf6/f/Ve6YfKl9OjGuFMaBjY4AuDAnsTlDVBFQXln/3O7NkeqQcCSnf1v1HeuY0md1BYYKd1WAD9xSXpoPAQqtcQLVhT5kRz8mf8FxrBVfmH753KxvnSbPKt6rP0cFhroGgxrxxBuMLHEm2nsZkq5JsQ+HnhVWFbSn5zEqC9tnMwyPwBsTLj/EoPt5Wkhv0I09/aAHs7ms6jAT+frt3n7c8wl0IyfsofsvvCSXygx5dE7xyNz5uum5ryA6BOXx5up1IJtOfHEbm5scWnClGOo+LZlCjhfPTuZ0WU4McxucyR5HR2CXW/gnBToIrJZ5CNW/AKsLzBlRViolGXZ7eD5Y4XcHlxPMLdGFeRM3pNMdzCN6TqUo4d6a+jwdOvnKE2FnNMx0QeUCuLa6updOPuHNsrnd6Erw4PKagQjWbjEIqaZgL/KgMni35rjFfRChZLTaqz0z9wlvrw897UAVmoIz+AbY9MeR1xKaFtk051xfkVV2lUvHGXh4jKuC+qi0+cmca3Jwz+4OHvz9vbVbDyADd2kg969M4bKCn/w1nyCzaFZiQrvn5MyO2qjMpBHIrYlWwzx0TNAQZ23I4K11yfreH8Rulppxuwa7scElg++neazaoZXDkC9Q66gv9hLyphLBakTWghzu1txyBgIrqWStL4ttvqSIkje79Wl1CPYLhkfJ0X69Ug/P7HryZkx3lOnHEdYQT5d3FymxryToMVdy163Hi6duTszKPx6s1uxy4IP2LrM3wFt9vGxEwCClLa4hFAXNspfoaC0wdmpn6VLWA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 54569416-9e4e-4a0e-7048-08d9cd4a20f0 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jan 2022 17:14:11.5255 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: qp8AKFY5R4i3sSOlJROygAvDa52lx56CGsmc9/WoYoGNX4sY+SyUfMp9G97z9LJSeRaV9NzXRQoXOBAavSCAOBzFJ3L2GNkzLb6/B8BAz28= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1101MB2284 X-Proofpoint-ORIG-GUID: Nshp89L_mwZkUIXl3G64ug7Pqk6QIci- X-Proofpoint-GUID: Nshp89L_mwZkUIXl3G64ug7Pqk6QIci- X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-01_02,2022-01-01_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 impostorscore=0 phishscore=0 spamscore=0 suspectscore=0 mlxlogscore=999 adultscore=0 mlxscore=0 bulkscore=0 clxscore=1011 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201010054 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 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.2 at phobos.denx.de X-Virus-Status: Clean asm/mmu.h include is currently guarded by CONFIG_ADDR_MAP ifdef because the header is only present on arm and powerpc. In order to remove the dependency on this header and the associated ifdef, move init_addr_map() declaration to init.h, since it is only called during the common init sequence. Reviewed-by: Simon Glass Signed-off-by: Ovidiu Panait --- (no changes since v1) arch/arm/include/asm/mmu.h | 8 -------- arch/powerpc/cpu/mpc85xx/tlb.c | 1 + arch/powerpc/include/asm/mmu.h | 4 ---- board/freescale/common/fsl_chain_of_trust.c | 5 +---- common/board_r.c | 3 --- include/init.h | 10 ++++++++++ 6 files changed, 12 insertions(+), 19 deletions(-) delete mode 100644 arch/arm/include/asm/mmu.h diff --git a/arch/arm/include/asm/mmu.h b/arch/arm/include/asm/mmu.h deleted file mode 100644 index 8449720fad..0000000000 --- a/arch/arm/include/asm/mmu.h +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ - -#ifndef __ASM_ARM_MMU_H -#define __ASM_ARM_MMU_H - -int init_addr_map(void); - -#endif diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c index aa9b59d487..550d45da0e 100644 --- a/arch/powerpc/cpu/mpc85xx/tlb.c +++ b/arch/powerpc/cpu/mpc85xx/tlb.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h index cb5b26cd77..2e6255f0d6 100644 --- a/arch/powerpc/include/asm/mmu.h +++ b/arch/powerpc/include/asm/mmu.h @@ -137,10 +137,6 @@ typedef struct _MMU_context { extern void _tlbie(unsigned long va); /* invalidate a TLB entry */ extern void _tlbia(void); /* invalidate all TLB entries */ -#ifdef CONFIG_ADDR_MAP -extern int init_addr_map(void); -#endif - typedef enum { IBAT0 = 0, IBAT1, IBAT2, IBAT3, DBAT0, DBAT1, DBAT2, DBAT3, diff --git a/board/freescale/common/fsl_chain_of_trust.c b/board/freescale/common/fsl_chain_of_trust.c index cafb24971b..7ffb315bc9 100644 --- a/board/freescale/common/fsl_chain_of_trust.c +++ b/board/freescale/common/fsl_chain_of_trust.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -16,10 +17,6 @@ #include #endif -#ifdef CONFIG_ADDR_MAP -#include -#endif - #ifdef CONFIG_FSL_CORENET #include #endif diff --git a/common/board_r.c b/common/board_r.c index b0840c70b2..7c45e494ed 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -59,9 +59,6 @@ #ifdef CONFIG_XEN #include #endif -#ifdef CONFIG_ADDR_MAP -#include -#endif #include #include #include diff --git a/include/init.h b/include/init.h index f2cd46dead..d8278f1c00 100644 --- a/include/init.h +++ b/include/init.h @@ -307,6 +307,16 @@ int board_early_init_r(void); */ int arch_initr_trap(void); +/** + * init_addr_map() + * + * Initialize non-identity virtual-physical memory mappings for 32bit CPUs. + * It is called during the generic board init sequence, after relocation. + * + * Return: 0 if OK + */ +int init_addr_map(void); + /** * main_loop() - Enter the main loop of U-Boot *