From patchwork Thu Nov 5 09:09:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1394818 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-windriversystems-onmicrosoft-com header.b=chXLTCF8; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4CRd8w74cxz9sRK for ; Thu, 5 Nov 2020 20:13:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1670A82574; Thu, 5 Nov 2020 10:11:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (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 (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.b="chXLTCF8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B65628253B; Thu, 5 Nov 2020 10:11:04 +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=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on20627.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eab::627]) (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 5140B82540 for ; Thu, 5 Nov 2020 10:10:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fXnqfChczKejANOOWwy5lyMVFCIhRt2mcXLI77DdGJyl0BML60iPFmTN4dASVjJqd0N8YXzT/1f4jDErJ+yTmDPTowZ8q9koJ8QLsnWkym3yCoqL14OL444hlKUfj8Tw+DaunXyO6fvY8JJyRYkJz+/OdspHVTY1XIBf3afKTibjPHcWvxJ3VqbUtHKQ6SP2yovPsYW5PXzNfRHGvb7NwRVbVOz68ikcMjpJmW815eB+mgJ2A9+IK6J3vtbl1Y4RMXPgeXby24YvdNPzn8XhStWAoYMylsqV7DGtVtChjpaMAQRAi2RNLDxHnGRWcdP8sbECLgP695hsxBDAcKx4HQ== 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-SenderADCheck; bh=PRrPBbOmG9u/IKeE5LlDhdwTR3M7CP3VOKUzhowgkqc=; b=YtN0czW69LILtWxr4m7nnZGSPDLSPO/S0RNBjNsjm9WiGEvcT+/0sqDudOMaNSu5r4PMzYGNGCJy+MDy9mleGADgcvmtjqphUuB8SthQknqCE+oySRkZUJRdom5Hq3p58ZnFs0wGzy0xMS1wBw5QacH+MAtilC9twKzJwZNVXfBJpJLD6RGKpDUPOXDha1cvY5G56FZI9EL5sscuoWs+XomYnYvzqkR1jb5fWJExCeg023NjQ1mGtlHhZ3e56oP1U65D9gcyZinyafNMhIJ8NZo1YWyV7hdFgvrgSXCbPSMoO6pml+5LzEny16LPIsYnFff5w8NuTt9+3uUqyZf9fw== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriversystems.onmicrosoft.com; s=selector2-windriversystems-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PRrPBbOmG9u/IKeE5LlDhdwTR3M7CP3VOKUzhowgkqc=; b=chXLTCF8Q2lo0b17EvjvPIH3NgiKiDTkHzMf7qYgxK8NtHTpXemF34CWCGwkv807gzYBFSIz4MijnWdAtsndX7BvYI6KMLVsEot8Fc/v80G5ZAhnZCwQaVNlxwSqKinIo/A2YUX4yliDTyKMESuKZjqG6j1t8mU96rWuLOMg00c= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=windriver.com; Received: from BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) by MN2PR11MB4333.namprd11.prod.outlook.com (2603:10b6:208:195::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.27; Thu, 5 Nov 2020 09:10:52 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::a464:f45d:2dc9:f8df]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::a464:f45d:2dc9:f8df%5]) with mapi id 15.20.3499.032; Thu, 5 Nov 2020 09:10:52 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH 10/18] common: board_r: Drop initr_addr_map wrapper Date: Thu, 5 Nov 2020 11:09:47 +0200 Message-Id: <20201105090955.29641-11-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201105090955.29641-1-ovidiu.panait@windriver.com> References: <20201105090955.29641-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR06CA0198.eurprd06.prod.outlook.com (2603:10a6:802:2c::19) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR06CA0198.eurprd06.prod.outlook.com (2603:10a6:802:2c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.19 via Frontend Transport; Thu, 5 Nov 2020 09:10:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 35da68a3-16bc-456c-aaa2-08d8816ab191 X-MS-TrafficTypeDiagnostic: MN2PR11MB4333: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:236; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oV6Fygfca6ggSGZ3SGWgryclMJWmXymqZzneTJxJz6B1iWA8zAyjSPFrEZZ/XSvwuCd1cwrZbZghzhXDDeK7OE0lyfvcLK8xwdjxf1T6emo9CISZj4NGZeJqts1tt69mzm7M4kLkCRgkD2NZxboDS7T6WBlJJLV91CdM6mCtEDGoVxa1vPN9NfZNw3N+R1U4zbPYZnyDxhEUTGr1b4+WIDSz8bbFdIFVlZJzcK5BO+YSEgWmarNkLQHYiIbPuI2mL274jyMIrIgMKbFzMZYCCdaCAVAN+rjLsD0RaW1sFV9TYx4E6cAFFtNaS2anGdhEBn8NNv/6TVMe3jJRxyf4JA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(136003)(39850400004)(346002)(396003)(376002)(83380400001)(2906002)(66556008)(36756003)(66476007)(66946007)(6916009)(478600001)(4326008)(8936002)(6666004)(16526019)(26005)(44832011)(6506007)(5660300002)(86362001)(8676002)(6486002)(6512007)(1076003)(186003)(52116002)(956004)(2616005)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: OT3athsdg16pGvUvZWiUC+MhPq+aAZI0Mww5iO7hTSplcDvpHoqVteqV8TfQVibnhq5dWrTlUjSAPXnmHV1NetquoUrprK5FjUE1C5n6+8ht6nj27Hd/a0ev8u7CN6Aw21ZWcJYSQ94Q8TSMoapq83EUlJPliMDDGPxXLCedLW6w/rJGJ/JsBYCHwEdgx+pnSbvkSIK9weo4+jkCNBw19TyaFsTQj46jy0YZ/bAe2oOyTGjPbODNbbrSGg72kyJdr8o6AlCFlTwNMyTn8dPXELZdytcYV4zsUG6mE1dFtuON2M0fm4vyNxmXyL/fBOYJpTsH4xQU/0us4OV3M+3bCtLzvb3e5Reo7v+qUkXr6kPpmlzHFHAW3jonB04Y849pKEsPaUd+OpVKSP1wK/optHVKRFMZaEWrGHfjlSNXTykJxrhtSRSe9ol1w1jsWrDxVvys52zSCnIJLRcYNMn+mG1JBEgxLZaS5t4PaJ/jymGNQdj9rRaNb1Da3kZAeG48e8yY6ogo5qtMd7XwyX9PxS8e9tzOwN5xuiXdB2cxKOzcRT09Xwu6gZ7qEOzlshPInTcVpf0KYvH2rxqATnk7dCvA+QfV9+YP+jlVisDaVsshp1/+eb4xA8eIFbdsCKymfWqPLCTBKU4xdEEPM0rk/w== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 35da68a3-16bc-456c-aaa2-08d8816ab191 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2020 09:10:52.0953 (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: G+vqzOKynszhOU0QH5q992Rz/mmPrWHu4qoV4HWy0RITrx0VzKyKQVbFHzfU37k4ycdPwGATutZ88jxCFIaRQi1hsZSgvozonPIc4ajPRUA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4333 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.3 at phobos.denx.de X-Virus-Status: Clean Add a return value to init_addr_map and use it directly in the post-relocation init sequence, rather than using a wrapper stub. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- arch/arm/include/asm/mmu.h | 2 +- arch/arm/mach-bcm283x/init.c | 4 +++- arch/powerpc/cpu/mpc85xx/tlb.c | 4 ++-- arch/powerpc/cpu/mpc86xx/cpu_init.c | 4 +++- arch/powerpc/include/asm/mmu.h | 2 +- common/board_r.c | 11 +---------- 6 files changed, 11 insertions(+), 16 deletions(-) diff --git a/arch/arm/include/asm/mmu.h b/arch/arm/include/asm/mmu.h index 9ac16f599e..8449720fad 100644 --- a/arch/arm/include/asm/mmu.h +++ b/arch/arm/include/asm/mmu.h @@ -3,6 +3,6 @@ #ifndef __ASM_ARM_MMU_H #define __ASM_ARM_MMU_H -void init_addr_map(void); +int init_addr_map(void); #endif diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c index f2a5411623..ba32187315 100644 --- a/arch/arm/mach-bcm283x/init.c +++ b/arch/arm/mach-bcm283x/init.c @@ -151,7 +151,7 @@ int mach_cpu_init(void) #include #include -void init_addr_map(void) +int init_addr_map(void) { mmu_set_region_dcache_behaviour_phys(BCM2711_RPI4_PCIE_XHCI_MMIO_VIRT, BCM2711_RPI4_PCIE_XHCI_MMIO_PHYS, @@ -164,6 +164,8 @@ void init_addr_map(void) addrmap_set_entry(BCM2711_RPI4_PCIE_XHCI_MMIO_VIRT, BCM2711_RPI4_PCIE_XHCI_MMIO_PHYS, BCM2711_RPI4_PCIE_XHCI_MMIO_SIZE, 1); + + return 0; } #endif diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c index 4465ae7565..4afc11125b 100644 --- a/arch/powerpc/cpu/mpc85xx/tlb.c +++ b/arch/powerpc/cpu/mpc85xx/tlb.c @@ -218,7 +218,7 @@ int find_tlb_idx(void *addr, u8 tlbsel) } #ifdef CONFIG_ADDR_MAP -void init_addr_map(void) +int init_addr_map(void) { int i; unsigned int num_cam = mfspr(SPRN_TLB1CFG) & 0xfff; @@ -234,7 +234,7 @@ void init_addr_map(void) addrmap_set_entry(epn, rpn, TSIZE_TO_BYTES(tsize), i); } - return ; + return 0; } #endif diff --git a/arch/powerpc/cpu/mpc86xx/cpu_init.c b/arch/powerpc/cpu/mpc86xx/cpu_init.c index a17091d2ff..f7cbf9658b 100644 --- a/arch/powerpc/cpu/mpc86xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc86xx/cpu_init.c @@ -77,7 +77,7 @@ int cpu_init_r(void) #ifdef CONFIG_ADDR_MAP /* Initialize address mapping array */ -void init_addr_map(void) +int init_addr_map(void) { int i; ppc_bat_t bat = DBAT0; @@ -99,5 +99,7 @@ void init_addr_map(void) bat = DBAT4 - 1; #endif } + + return 0; } #endif diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h index 353dc4e874..a49758a625 100644 --- a/arch/powerpc/include/asm/mmu.h +++ b/arch/powerpc/include/asm/mmu.h @@ -138,7 +138,7 @@ extern void _tlbie(unsigned long va); /* invalidate a TLB entry */ extern void _tlbia(void); /* invalidate all TLB entries */ #ifdef CONFIG_ADDR_MAP -extern void init_addr_map(void); +int init_addr_map(void); #endif typedef enum { diff --git a/common/board_r.c b/common/board_r.c index 414b6272c5..964f3df918 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -197,15 +197,6 @@ static int initr_trap(void) } #endif -#ifdef CONFIG_ADDR_MAP -static int initr_addr_map(void) -{ - init_addr_map(); - - return 0; -} -#endif - #if defined(CONFIG_SYS_INIT_RAM_LOCK) && defined(CONFIG_E500) static int initr_unlock_ram_in_cache(void) { @@ -712,7 +703,7 @@ static init_fnc_t init_sequence_r[] = { initr_trap, #endif #ifdef CONFIG_ADDR_MAP - initr_addr_map, + init_addr_map, #endif #if defined(CONFIG_BOARD_EARLY_INIT_R) board_early_init_r,