From mboxrd@z Thu Jan 1 00:00:00 1970 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 A7D74C433EF for ; Sat, 1 Jan 2022 17:14:39 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5F18A82FB5; Sat, 1 Jan 2022 18:14:25 +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="bWwM4cW4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8BE5A82F91; Sat, 1 Jan 2022 18:14:21 +0100 (CET) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.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 3389982F91 for ; Sat, 1 Jan 2022 18:14:18 +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 (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 201HEAAo018804; Sat, 1 Jan 2022 09:14:11 -0800 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=cfNLv93YPQjoZcUHcJHxK56mQ0Ypn1VI4I4UNth3upE=; b=bWwM4cW4OWOCz7mqVUSKJ2+aH0EXIf8TKnAd4ltdZyXZFG+ZiH07U2jt42Ocf7pq/D6t jbLq8dRejVVg7CW3NEJXrxOD8f3VK/kx9LUQhsG6X7sNd/HeH5NX95CQTva0ApQA6JCs fzkVqdOMzhDQgrjMsiuwAjlodqagc5duxkSxKTr3dyL63YLT6Nn1HpKm6EjzTh7JYRsY CGKenHGmFuDluZ0eY6YbcNSR8f1ilIxT5rxrE8RF9iM1LNkM+J9wh29i+1Nxfknlf6zq TUq4CX1DE8a/0O04zrvwHq/KdaRx1pZbMRSIDiJabCk1v7ZajF1sqYU1HqUKAsG8INN+ Yg== Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam08lp2172.outbound.protection.outlook.com [104.47.73.172]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dak4705gk-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 01 Jan 2022 09:14:11 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LwtA9+DoXHnRGpsheneYX1s515f97xAyV5fyrMx8sSc4MsBUJX7yucaBn9GcMWaMr8OH/PJWEZHxatuY1yylbt8FFkn3RP2Oq9xvm2DIBgs1b7TK8dz10VEC0hsgTzk2By3kMlUNWQLxxvWcccfnMv7sqq6kHqglu0gX2NIgb92VC1saC+uTnxLYxLVs5n3AfT65y/63v83OwfcGGlBisOmz+XO0vXvLeJOWytFE3hYaFSc4EPtnSJIXoyqZKBucvAuzuW4qSRuxsE6GrmyS7cYDGkRXRPgU4bL0aDSnXS8eJDgVpz4ZnoKpUAHmmhuG68UFXe8QAUN5twI9brTe8w== 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=cfNLv93YPQjoZcUHcJHxK56mQ0Ypn1VI4I4UNth3upE=; b=PO6VDvFd4l6y9h5FCQ+yXXaKiSUrr2X6rNDIHIk7vK57M0GtJ3RKkkMvSYkO3OSpehcwFf6ByFoherq36gBfiTamoyBRfk7mGacEskdKBKNhABQ5+4ASGMpBAJNdteeqmbWLisrk3MgxythAGA3F32uoqNs6NCWBnBSnL335ocYwbFpOXmVO9Qbon+YuP1zRsYKhdgwlKXKc/rLNapS+flnabZjc2JKz28SPyW9nKbzY0kEc13LYquBZtn6THoGPq76WeFJ8/ofOw0l7ksK3KIx383MvlakP4vlo8gdwjzAYJMStYpa4ZCHX9nVy/6vDZY7SM5JTpe2TJiGFKsumfw== 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:08 +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:08 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: Ovidiu Panait , Matthias Brugger , Simon Glass , Bin Meng , Priyanka Jain , Tim Harvey , Wolfgang Denk , Zong Li Subject: [PATCH v2 4/7] common: board_r: drop initr_addr_map wrapper Date: Sat, 1 Jan 2022 19:13:28 +0200 Message-Id: <20220101171332.2676936-4-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> Content-Transfer-Encoding: 8bit Content-Type: text/plain 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: 55e5c1f1-bf1d-4e6f-07d1-08d9cd4a1f54 X-MS-TrafficTypeDiagnostic: DM5PR1101MB2284:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:236; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Uo5eQqJbXtepLdDiJ4t9azWoBj8Qzh9rYOOQ33buuNNZAU/PzavTMw2daMB0N739QvFVYMbtBgQYidHsFSjquPkthBqBN6cntzxjlpxj9oCtMb0mcFTZGuqOsLit8LYBJHc6ItHxWQgE4OIwvfD883f38I2tMkgd27WqaJ7/MuJsOTt7HaehMxULdh3G5ZwflmN1ESgbUaHsVHIAEHo8YAnl0uTiikmW5bDO9VniV+t8puENj33DkdSMWcaFKBWAeromYiPzrQl0mtjPUnClI2vyUJmi7c+wj8RBiyyjQi6xthi7J1JXgVh6LkbGjz9c0W5frCrNktfjNnMwYw3yZlN6bFpzcGlLu7bvwujL/0qRFtsFqoDpE0Owmt574Ou5RpMIqBC6thkjweYC8AcwbMJjBUSr5/GCR0XmKtwSZZeqY7eM4snFfHmblb9O1stXQJLzs6SH9Q6lPXFzDT5unKulDn6l3ZBNyIC8bFEgoHdnuTEHYauLZLj3Ud6eH1znfE7rYZnmnFN98vtw92E4fY6MKWH6ZM1D97LoBG4uFTy1jNACdLdTvZasvvPOatZhTnmw1g44FMh+XdocooeDB7JDJb5cM5AXXJqpcasZVfJQHzPbLwluyKAtGZc2207SSNjCeORYImD+m+E+vKI6l4tJ6MLhuryia06W5QESc/sprzD7+Bbv19zu9vBpxxjkhbiCbJsogKcYBtVXaFNXSQ== 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)(6512007)(86362001)(26005)(6916009)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+mVhBOelyDSWEZrPxV6NnaFhDlyOXVm8mVdkm5Pl4jFcsdHjHBf9K5W4B33q?= =?us-ascii?Q?vtlmLemLkFoXnABHasAAwLAoom8mD2ftj1ycCthbPGGR7jCV2580docT6pv1?= =?us-ascii?Q?9qbPD097HTkKHyTlxijESGC0wJD3A0Rd9K3XC/hRm5RAaaGdiaN8dlwNXX1a?= =?us-ascii?Q?NDmIPtBwgV4SFDjviWVytHpwbasG8rSNzvl96vAeon5vB8jVZCA5sh8ymuQY?= =?us-ascii?Q?Phf5hxuYCv+HsUyn8rEJLI9qQzkfoJ7xd2ORrrZJqvVbDz8WcHQhLwFjabAV?= =?us-ascii?Q?srQFYYxEDIlVflk479nIYJxsezhdj87oJlxQfvwCcbQD028AQQGbnQjoBKtx?= =?us-ascii?Q?61upzk4ltUqef6scrutX+vEKxZ4rybb53UGdFnBMh4BxVpZGMHs0zU1CjwQ+?= =?us-ascii?Q?5hZsNQY5HSFtOIYtB9owO4sGilw8/O7jxePJkDSTJbobIUt7acKajK9CLcvZ?= =?us-ascii?Q?KiD0cW8GBAjnI3PsjBTrdHl8lpGMmqGbILHAabcI0DdpY1ieqclxdUJ0UtPK?= =?us-ascii?Q?Z4HeaBFAT61vFJa4iTq4TFzK4h2pJq1NswNbjAalgf8KLb9BhtvhyQyHrZGW?= =?us-ascii?Q?Sd0NdKvwWsn5yrprIDAp5wW5NfS4Xfcbd46IkxvTWFNxRuOfJeAKfyyUNBKO?= =?us-ascii?Q?TuUKZB/ibzE/u2SS7dz1UZbBXbfcRUfAsLK19o/blpv04pLtiZT3ueEXWzQQ?= =?us-ascii?Q?jz1MLIdBU/2k/YQJVD65h1e/oeoojIHXp+0j3Qz3jAuazw8FoAqbRSwk49k0?= =?us-ascii?Q?mOokyXxbCNVqi4Csetil8Ut0cPQe4AsLZPOL0iaYAenkUJ9odJiFhKVzw02B?= =?us-ascii?Q?ggcw1FNK7cOZzolHoLcxTEgxc6db7krc8yZTA49uF8jPnQ21AyKhvgMEbWAW?= =?us-ascii?Q?btjj8/yv4D03xPSmgawuKGJtCZLViIbYBgjfYFPfAeAQVKPfxgAjd+WxRZIW?= =?us-ascii?Q?UGQGr2S/D/gpCL5FutyaDltgvWJ9fysn6gwnp5wpbYX2iqLz3EObGjZrxbCm?= =?us-ascii?Q?LFNJfSieeFkrXD0CKHjac4cOnABmFTtdx3+NyLQL2dB01ghpbBRZw4ongf71?= =?us-ascii?Q?fAhdU0OoNiD3xV8fmHi4baAZ2RvTwdZ/vDROKHBv3CaL738xb/Mz9Sg41LM3?= =?us-ascii?Q?Do/i2uxbFPJ6jZEcwfZYdTC3xIqQNueSl5OoA6whShX2lwpcw10WnE0EpL37?= =?us-ascii?Q?530E8MPUR+hlJG7EY8mAtdIdnCUx29SdXc/S+17aN47GrJZb62fjaqHEF+RG?= =?us-ascii?Q?i4eAU7FjYklwE9m34yO1We9gVlLqsh29kvGoUjlU9ndMpPRZVV3AWHpmBu70?= =?us-ascii?Q?8B1eJnfTaA5EhsS70eF1iulJmU/eqduIJlXcQJBKkigA0p3TgzacYkpciyKp?= =?us-ascii?Q?L+RKh40KBVgxiqqNL7kwbn3upyGM5T2cRqlAW7c1Wf96Cyb/AWzTTYUJwNCl?= =?us-ascii?Q?Bkwgye5aAsnm2L68VZ2NhLbN4kr/cbcc5ZCI9MvrK6OGOR/DBRcJE4l/c14g?= =?us-ascii?Q?PuhKKj6YJGqbXjMWZBhJ/tAdTb4LeIDwCFRL0/mVoQNHPRTr6jmc9MY+yWmX?= =?us-ascii?Q?pfLdUOtwCUs3bIYQwv0sTC6Eedxmihfk1jlso3gEfkwmSxJTY7zY7Um2Np5N?= =?us-ascii?Q?FMoQcbbrJ1GHtO3thG9g+VLvDRN2vxB5jDp3Fxe4BIBDRNK+SVpsEKx4h8mk?= =?us-ascii?Q?yOdtKw=3D=3D?= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 55e5c1f1-bf1d-4e6f-07d1-08d9cd4a1f54 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:08.7916 (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: PyMWFSxy4OPmP2iKVjhDSp34D3St4eEiz6HBH/C13RWU5tg8t8PqfMNjquSwGLT/ZtD9CRpz43t6p71dpRBbBZcbL5J3L/XVB6Z6Z/Z6DG0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1101MB2284 X-Proofpoint-ORIG-GUID: I-qv6QaF7SVOg44jJ3efF0KJaJIf86xe X-Proofpoint-GUID: I-qv6QaF7SVOg44jJ3efF0KJaJIf86xe 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 lowpriorityscore=0 bulkscore=0 spamscore=0 adultscore=0 malwarescore=0 phishscore=0 mlxscore=0 clxscore=1011 impostorscore=0 mlxlogscore=999 priorityscore=1501 suspectscore=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 Add a return value to init_addr_map and use it directly in the post-relocation init sequence, rather than using a wrapper stub. Reviewed-by: Matthias Brugger Reviewed-by: Simon Glass Signed-off-by: Ovidiu Panait --- (no changes since v1) arch/arm/include/asm/mmu.h | 2 +- arch/arm/mach-bcm283x/init.c | 4 +++- arch/powerpc/cpu/mpc85xx/tlb.c | 4 ++-- arch/powerpc/include/asm/mmu.h | 2 +- common/board_r.c | 11 +---------- 5 files changed, 8 insertions(+), 15 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 9803499985..183650a90a 100644 --- a/arch/arm/mach-bcm283x/init.c +++ b/arch/arm/mach-bcm283x/init.c @@ -152,7 +152,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, @@ -165,6 +165,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 973b6fbe4b..aa9b59d487 100644 --- a/arch/powerpc/cpu/mpc85xx/tlb.c +++ b/arch/powerpc/cpu/mpc85xx/tlb.c @@ -219,7 +219,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; @@ -235,7 +235,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/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h index 353dc4e874..cb5b26cd77 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); +extern int init_addr_map(void); #endif typedef enum { diff --git a/common/board_r.c b/common/board_r.c index 5905921caa..b0840c70b2 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -186,15 +186,6 @@ __weak int arch_initr_trap(void) return 0; } -#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) { @@ -623,7 +614,7 @@ static init_fnc_t init_sequence_r[] = { initr_dm, #endif #ifdef CONFIG_ADDR_MAP - initr_addr_map, + init_addr_map, #endif #if defined(CONFIG_ARM) || defined(CONFIG_NDS32) || defined(CONFIG_RISCV) || \ defined(CONFIG_SANDBOX) -- 2.25.1