From patchwork Mon Nov 23 13:16:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404789 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=Eo+dqgAL; 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 4Cfnvs5Qd1z9sX2 for ; Tue, 24 Nov 2020 00:25:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 146F482638; Mon, 23 Nov 2020 14:20:13 +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="Eo+dqgAL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3E7B7825DC; Mon, 23 Nov 2020 14:18:38 +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.6 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-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on20603.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eaa::603]) (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 88CAD825E1 for ; Mon, 23 Nov 2020 14:18:14 +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=c0/voSZYNl6iVjqPcGKtQVJcCcwJL/vZ5G2p7Xu1Z1GZ+881NVBibu8nOvTk5kv9I8WyG9MYF8RLElVknckcKDf9fBiq+BfmUU6DOLT5pMR/GKqD+v+0XE60wFHZRKZNe38oS168Djf/N795AMYj4eNWUZ6Wq4lb2KE1M6y5N8oPBqUBcXbqau6BgFfOghZMEylW1xPfbowb3BuJgKZL4Bftc+2sNJ5cgwSvQ3k8L5YmT6zHNDpzlMe7GlRPsHyijf7+IfzVFHJ5JGJwUxNY2jh3oRMufeQISr8vhjgFuZTLfrBQAiuumWIHpblHnKEMT4qvSVnRQBDgBCy62Z8w3w== 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=j3uz3TiiOVyPC2OL67b4HdLScJONXXWUzRMPPdDu7/Q=; b=aYqsvduK58Wdv4SFu+dzEIroJ4Z2Hip82BRxPXfHUaaesa4Cfn+M0l7hPZ8dsYsdgHM6T7jwwPEeXtEG7+lZVnG4drrqZij9yrK8nWu+kp1azZftNcjB/2hd93Atzgb5BtPS7WKmKLyEp6QV7aOruLow7xAta3mah+I7Nk8sGgnP6P3t6sEdtIZDOS2Q2tB5E6TLlXaFPdjO+xChZlOgFqiKRAdVFN+4cKv2woDufrE89n6tUdGfO6bbLiGSNxveebT4F1t65ZYvAUmnEah1KDTE02jIyEJcB2H0Qc4f5OVL5/63loR+6IwXpHSoKcJKjnNNHeizUOtz51BSjSSpIQ== 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=j3uz3TiiOVyPC2OL67b4HdLScJONXXWUzRMPPdDu7/Q=; b=Eo+dqgALksIb1RgYpbVIm1eqVZXWc4A8ASaoYu1YgMuPlLlsP+hFPLlifm5xiP5fuK50LYwTp/ZxEM15UVGw5kgwr9cXGbaYij5br0oIcIct7Sn4KaDec0/wA6pximWYCMPeFYbn3QbsNJrF3fANIoUN0r/c6y6TzuN6I6fdYNc= 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 MN2PR11MB4336.namprd11.prod.outlook.com (2603:10b6:208:18c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Mon, 23 Nov 2020 13:17:57 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0%5]) with mapi id 15.20.3589.025; Mon, 23 Nov 2020 13:17:57 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 11/18] common: board_r: Drop initr_noncached wrapper Date: Mon, 23 Nov 2020 15:16:44 +0200 Message-Id: <20201123131651.33032-12-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201123131651.33032-1-ovidiu.panait@windriver.com> References: <20201123131651.33032-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) 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 VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Mon, 23 Nov 2020 13:17:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c0ce3f62-7052-408e-87c1-08d88fb23190 X-MS-TrafficTypeDiagnostic: MN2PR11MB4336: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rFU8ZbBVGZQjjnujCvcR8BnFh8oqLvwOQQExf5cvS/SjIUz205bqJSwJQNbrtcsXaHhRfcsErqnmYoQQu0W0spjkgREpehpvMhjXYELDOUH4yqX3xdrwGgChA28yCZlpHsNhAwFPQEGB2rsems5RWrqTRC2qnaoVFJuJxtg6A8XTPVMD77WW2qDuUrly0zBrfFM69X+K+J0JGhGst4EhA94n/njjvQQnsooNO8JZ4zzkOEt4T6w4R23U0bJoYqDHW64HcPuoZ0aVoxOGg3NmXdkuEjUCqAyKbExXD8o0lCfjDaqls9gyE+JE+jFehBoPk3gS+L2rFieCKU0WDrjjPg== 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)(346002)(136003)(366004)(396003)(39840400004)(376002)(6512007)(4326008)(16526019)(478600001)(52116002)(186003)(5660300002)(316002)(8676002)(6486002)(6666004)(83380400001)(6916009)(36756003)(66946007)(86362001)(44832011)(2906002)(26005)(2616005)(8936002)(66476007)(66556008)(1076003)(956004)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 0Af1B6YJhQyxZ8jClrcKuuHGJpFkXbbzKhpVpySQavcJkh4f6MoP2Qu6gALLe4YJxVZx4k6OLoWY3vdix5qDZ0nTEM250J0HBpQzK+1Amy7ylDZFTBY1KneRCQA0RJNbIF3jhvrK/NKpCbUikiqdG3SlCVzv/9jFGMZRtM2F076DsAmNpnIlX6itmguwV76mqX1rVkwSOIDKTgNC+ObNDYlixgfcat9h89K24B/rv3wkaGxIAFfnHCI4+YPDjDTA5TwITgFwOYS5906C/ITSB8JINmRCrm4cv3w/m4leL6W8ZUmcmh9Vg74NdhonCXLVAE9ui4he/1I4pr3OuAiHXSxkR3co7ki0/NMmSqFK28Opg/V6MLPEmeirV6tFkVBBZKdddcuDuhPuQWBzc4cUoNHxoJnO5EW07ViwS23vbRgVxU/WSzcOZxPVW1PV7Pbr9kvsRksXjnfWNbqq0grmktl7PrJaHPXHxUlA5AyVGVPSsRgbKrNiPemDjklYhI+dpENYVb3o6f4QGNoZkfxX4J+yYTubPTBI1rCfguKdupo+f2O7cb+tGZlhMz0Rtvw2GPcKFbtxWB7ziveuXlxxf58hGOTUhiOmfV6lCdzQ23hV0ChKGfV9xQndgrr2B7i3BPhGzRtrrlBdmFNpaFNqpXbGXjayK0YP7gJZLu8he4XGvnHKyBpCUj3whiYvE47NED+g/XkuYfYBG//isa8RcrwprCWL+A9CCai1o2JSjNAuoCE8lq7VskAKlHYHvodxZs6+eakOdeO2CUv1moeHDYaTG6Kz6FAjsfv7SDYq+Mdvq94aliqqSg04DeheuD+vu/mK6NOWGQaSgy7xtrQUNZrIskPt6aC1YJQXIkaAKX3D0WHAePp5Vou8FvOzSRFBe0C9KD/dkOpgT+Nxg1wriA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: c0ce3f62-7052-408e-87c1-08d88fb23190 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2020 13:17:57.3370 (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: D7f2tYau++3MfrfipvPJSDSQb5NRUS+c9XkM2NkLV+fyc8HbuY5dvngqv4vih7WkNX6VbXYlIuvwq3gBaT39Gq+ZoIo7u+M8zkxhPUZJ+/c= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4336 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 --- v3 updates: - add reviewed-by tag v2 updates: - add function comment arch/arm/include/asm/system.h | 13 ++++++++++++- arch/arm/lib/cache.c | 4 +++- common/board_r.c | 10 +--------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h index ce552944b7..5fe83699f4 100644 --- a/arch/arm/include/asm/system.h +++ b/arch/arm/include/asm/system.h @@ -628,7 +628,18 @@ 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); +/** + * noncached_init() - Initialize non-cached memory region + * + * Initialize non-cached memory area. This memory region will be typically + * located right below the malloc() area and mapped uncached in the MMU. + * + * It is called during the generic post-relocation init sequence. + * + * Return: 0 if OK + */ +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 414b6272c5..48e898b586 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -242,14 +242,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)) { @@ -668,7 +660,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