From patchwork Thu Nov 5 09:09:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1394821 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=IMQAHxeo; 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 RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CRd9r0cPGz9sTD for ; Thu, 5 Nov 2020 20:13:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 84CD58257D; Thu, 5 Nov 2020 10:11:35 +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="IMQAHxeo"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 484D482552; Thu, 5 Nov 2020 10:11:06 +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 NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on20622.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe59::622]) (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 A428782541 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=Qw2JZu9OQg+0qibQxXaYT4BsB9nVqH56EeawV3KAU25WPkthKiJlTjbjXQtsR29mhycglU78Voz4JGpv8Y0ke7D0T7wwrLY964fnVsaw/1MyDUbCdvwMwp6CpKUcLMQwBerXUH7/hbaUqMnQCQ2rbcbFYahXIr8gW2yHftVVQGiygMFaKVbyn5sa9iyTZM7wdwLwRMp91vJ6VgcIsHZ3o2/wpc2VnLsNeA4xsKDUQI8pRDaW11K6rbhco16YOfZt3KpYkH8pn0U19xuRto3+ID5yYRnlFLu4Wr9xBh6MdvjQoBj7P7NuZ6uBgCPbVRDUNgV4bX/Fodp/oDdCFtAWsw== 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=gVvZqOMM2tNM5+tPaCwpxedrZXbuH+iKwHC2fHl1WbQ=; b=OeAIf3ITJC711gAxRQqRojQRVODBU12fAl5YUef/PrBEsY/+G5qROSbPGxdORWGsjbmVyJcu6GJ5gvC2e9VRf9SjtceUwVj3tMUmuLdbyatt45gjT/N/7XI2myxzUNBoD+l5hJ49FdoF61iuHKkON5KsVnVynxf+W8TWBkT8tsoNZI9JiiKMiwT6AGii8Ep46lxFfOht2Fzs/G/aqiRC0uvnh52E2xVZL1Fzam9J7iybSO6WadNpVHwUGGPJOr8sgEHaQhPkRIYhu/P/bkrSUW3vMCTL7PBnYl19v3OvNW6R+U9wYQvOgDe48cLY3S0UQizTAYPrdHlVLwcYP8NLsg== 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=gVvZqOMM2tNM5+tPaCwpxedrZXbuH+iKwHC2fHl1WbQ=; b=IMQAHxeoXh2L0Sj+qY6Nrm6rFtYdUJHYqMYBlAA+VB8Xbvo/djIJZIvm3IZuTPItfIS+C62S6yvamjiryI0GeR4RsbUuCMYUKhSiRSzq5Cwnx0yND4Ci6dPYkKg9h1mK/e7p96Vw+Z86k+6ReDYAHFNvkeXSlPlVL6sr8Z7c6PA= 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:53 +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:53 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH 11/18] common: board_r: Drop initr_noncached wrapper Date: Thu, 5 Nov 2020 11:09:48 +0200 Message-Id: <20201105090955.29641-12-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:52 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 782c5aa8-3b36-4805-f597-08d8816ab22f X-MS-TrafficTypeDiagnostic: MN2PR11MB4333: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2657; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4bIQGMM9zcxvu42MH7YFYw5EAWluw4DnLOd6atcnB4WvSoP6WuK2HZDeaVQ1v+CNP/wFi7/blRUkSq5mmP+9IICTY7780SJ4ikFwDqJHuYoeGIfW/hadDvf1QamjhwLeqWdX/ZKa4dOfwzRVH2UduRCDOhi0sd83D6g3zhdSjXSK+qh8PBo27XTrzlR7SvOC9PDNmDERxrSVQxJHuF0T3qxZGUyfB0Cc0k4JzgZWaNAp4D9Oz3qI0G9iy0SNWxU8E0Ue0DsrtvdPkxagolazSpahm1Vb07Wl7BTt1ADlc5nLuf0OaUXBH4/maaasxNzSvNclMuwZS18bjCFWr/T42g== 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: bpWFOh7bKFSGAp04nEjfKOvddgS6VFG6wXQUzpfABplgEVgP3IsZbNyVq0NdXiYpDYbWjRaGBQdiHKXppXB29++9vlG0ostEoOu2H7w6X/2Yig7TMjkXXFsna01SPeDFdvZ6IK0HNGLlAtoDQTAwWyaBW9u1MPAQs6hsioeo3OtFUZoJYWVessoWlXaPuXZ8p8OaLdcLe9ktdkHmN9G8tLZT2W/5tc40qveCkUlo9XitWd8yQuhP67GkT7zvH9uoBC2mqyCx8u0rFP0OSePuAzTJVb95/XzVyWiGM4+2iwVhXnbBVEWQqkXkQniro1hb1OQLC5OhqpqPygb5hFiNcIfdNetfgJQlJc3xBqGzAP3k9ra8JYfKALFqfM1doGkAer1+H2E+L3SPuy1TimUnSD+OcxDAHBnV1ED6V4Ul6btpkTxSW8I+tnu8gfSkZbclnKu6Pd6YJNASL8rQcjZA7KJ0YCEl3sU2KbQl33RkkY/MeD/REVQlM16jstM6Q68+a9ZybK7ZZfoypqCHZP+y8NZSMHnzqsXajHwG9wA7caIhwjX9T+kQvYwEdAOjj+i4Euh3gEeb+YKbLKu7surSxLlrEKH2QG+ad1vVsWfNutrGm+3HMoB1WI1J1ezvk/Uc70ZQMyKoUn21ueC7QnSHjQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 782c5aa8-3b36-4805-f597-08d8816ab22f 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:53.1197 (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: AuHWcwtdQdie1pBmjKu3XYMGmiaXvzuK5P5tSzp1GjeFhiPpLEiJs1Ctoo6+CuWgVdTiCY+W6moQGJnDoQQ6DxzcTQWHy6apI94Zy/6jp3c= 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 noncached_init 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/system.h | 2 +- arch/arm/lib/cache.c | 4 +++- common/board_r.c | 10 +--------- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h index ce552944b7..fb059c4588 100644 --- a/arch/arm/include/asm/system.h +++ b/arch/arm/include/asm/system.h @@ -628,7 +628,7 @@ void mmu_set_region_dcache_behaviour(phys_addr_t start, size_t size, enum dcache_option option); #ifdef CONFIG_SYS_NONCACHED_MEMORY -void noncached_init(void); +int noncached_init(void); phys_addr_t noncached_alloc(size_t size, size_t align); #endif /* CONFIG_SYS_NONCACHED_MEMORY */ diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c index ee7d14b2d3..bdde9cdad5 100644 --- a/arch/arm/lib/cache.c +++ b/arch/arm/lib/cache.c @@ -86,7 +86,7 @@ void noncached_set_region(void) #endif } -void noncached_init(void) +int noncached_init(void) { phys_addr_t start, end; size_t size; @@ -103,6 +103,8 @@ void noncached_init(void) noncached_next = start; noncached_set_region(); + + return 0; } phys_addr_t noncached_alloc(size_t size, size_t align) diff --git a/common/board_r.c b/common/board_r.c index 964f3df918..7f69e59250 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -233,14 +233,6 @@ static int initr_malloc(void) return 0; } -#ifdef CONFIG_SYS_NONCACHED_MEMORY -static int initr_noncached(void) -{ - noncached_init(); - return 0; -} -#endif - static int initr_of_live(void) { if (CONFIG_IS_ENABLED(OF_LIVE)) { @@ -659,7 +651,7 @@ static init_fnc_t init_sequence_r[] = { console_record_init, #endif #ifdef CONFIG_SYS_NONCACHED_MEMORY - initr_noncached, + noncached_init, #endif initr_of_live, #ifdef CONFIG_DM