From patchwork Sun Nov 22 08:35:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404448 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=AWBpOiQY; 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 4Cf3fM5spfz9sSf for ; Sun, 22 Nov 2020 19:41:15 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 250FB825FC; Sun, 22 Nov 2020 09:38: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="AWBpOiQY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 08582825D9; Sun, 22 Nov 2020 09:37:42 +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=-1.3 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,KHOP_HELO_FCRDNS,MSGID_FROM_MTA_HEADER, T_SPF_HELO_TEMPERROR autolearn=no autolearn_force=no version=3.4.2 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on20612.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eab::612]) (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 EFFC5825A4 for ; Sun, 22 Nov 2020 09:37:17 +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=RggqOFoOShgWufwmnhzpj7Au4kuEFXwwVXibJIhBkKWgHoMGYyne7wG6fOkod80NXoSV+m4YRU3W8fXSLWHX5nRQuC1Kt3PNPmLjw+O7If2CtHwPgoom69nKuwMh2SlKCZcTqeLnkh6giUPooiZS4vhSct4mNIvY/AiEDOe1Sn3Yo39kGlZs/xaUkVZNGWAMaI0tmriCZvg+uWYX7uBW2h164HEmE7rka1QnEJQzvvbDZBXN8TJPpnCtEopf4jMKfQjzj+l2eKEIdZi+JoW1zXhxu0MhD6G6+QbAt94m2qhqRl0d0sKVqY6mmmdO/zJzCEzaHo7fi6f11Ewk+mkRsQ== 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=B152Vs81h6v1SIROCQhLa/3Bbki7wgU+x9d6rXrxOFY=; b=NEYnoFkAzATipi7H4VNicjNZ4mw2AVY10bFoF4nO4eEBKq5PzXmwR/upKV21vFI0VYbj8phA3n+1Ry9R34E95lBd8Wi1y8/LoPkpDlWXPalRwj11LXf4Pd3Z08rw9z6OKjTkuXk/smgM4E25YPdA2TEfuyG8YTIMNExC5NJv21g/Z73oS/9/3AgWuwydrEfqPI1oSkd95pA1thgKD3GjpgoYaJz3XMwFfvKMon4WfT7MAimmMb8lVLXu1cefQwrggBRy2aGfzx0Vs0BJgianuDV+vxRfkDTEDrujkJZWwGmJaZXd8dSDMMHUGN/9Q9um92dqXcc2JkYizh8jTytJyg== 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=B152Vs81h6v1SIROCQhLa/3Bbki7wgU+x9d6rXrxOFY=; b=AWBpOiQYChLHZJMett9zUn7OYFlEzRzPBG9lsg7mv2iyqWzToHmhR8qsJTO0XVd0Fkez8faMD8tZjDQPzrzZuQvtVg4FEUwIo7DRoLGB4dyDUJRwNRII9Vy9LcH4B9lrL7TK+dgZkiorbaJiyZf47jJXD/ldVHBuJQZTS6oHp7I= 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 MN2PR11MB4223.namprd11.prod.outlook.com (2603:10b6:208:18a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.22; Sun, 22 Nov 2020 08:37:06 +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; Sun, 22 Nov 2020 08:37:06 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 08/18] common: board_r: Drop initr_post_backlog wrapper Date: Sun, 22 Nov 2020 10:35:46 +0200 Message-Id: <20201122083556.6756-9-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201122083556.6756-1-ovidiu.panait@windriver.com> References: <20201122083556.6756-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR07CA0165.eurprd07.prod.outlook.com (2603:10a6:802:3e::13) 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 VI1PR07CA0165.eurprd07.prod.outlook.com (2603:10a6:802:3e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.11 via Frontend Transport; Sun, 22 Nov 2020 08:37:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 521a9e9c-ece5-43a1-1f7b-08d88ec1cb5c X-MS-TrafficTypeDiagnostic: MN2PR11MB4223: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D3N59ZNBTS/ONhqmgEPumniYzojR6NfskIa52KrpSHqO0RkKm2QAJLEHRNMPehOlvwDbuenTmnaQ4OdM9dpnEAW7itX/puMQ75KZP8NjvOXjs9kRhqRYXr0NoI4Xjj0GduLWVU2TMC66DPdmkK/7JHzcOFPorNmcS52rQGaVNxy1eX/Jtu96XhTC9S8Wahv12OTYenYfzDfZh3nVn5if54nQ9cARUYPZkMA6luZn+/UPk8kfbv+evXSwMx//AJGbT/BvSVSRW0qmRgZwCpAodpcFFeuqyHuR7B7lwje6Se+pZxtjXYH87/BVNFPTry0X 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)(396003)(39840400004)(136003)(366004)(376002)(346002)(36756003)(186003)(16526019)(316002)(26005)(4326008)(2616005)(6916009)(83380400001)(6512007)(478600001)(8676002)(2906002)(6486002)(8936002)(52116002)(44832011)(956004)(66946007)(6506007)(86362001)(6666004)(66556008)(1076003)(66476007)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: F9Yg9N/GB37J3Jzche9uW6ycacM9H5k/9hAIQzN3IReGNCab8MLPhpKeLCI4/6gr8LpTKCuaHbphngDxihWrbl+u1O/hqIl5Pw7szs/96P7nwuPZ6vCbTHwlDO/fbm2BO43WSvMuXEcNX5fl0zXgJl+QArdHY206Dd4aiqZkN9gYMx+bwnbRaGUsT3JcfJw2COHowIGjpU6vlAI4vZv2hHohxDcaLKYJGh3bOEQYwfN5gfBALJl0jSRoWM5Ceq4nJGoLfHaLm46MhOULcmANYfwQt42n7m3SivLv0Sgqc0I+icFVdnPSxQMwf2OBHmvVBeW6sYLi+N9Z8nxi3lHqZajLbt9dpGNqYhPPs/LfUrEN7g2kKZg5eEjEG6GPG4X1tBnQqgLjPccN8K7/qbaSqZPpCycigNiz9jBZjVoTlLaX7zhJ0fRIgjvn1nxG0VDkBD0J3kjD9znOxgnEjdUFT2kzRbzOvDtFXOe0dXu1XZbx73t30D1HjrKY87MJkh1b27UgoW2R+XDA0PC4q8pKSopEkurl+6vbUIWTvZAdP1rZ0QJ3YMwrFt1rEp0HyfnrzixUSy66S21pS1xM6S20CUfsHdeSh3LFqerPoXR1yNqpgl7rtkA7icos+UN15W7ePjR9zn0p8QSmbe4/tHJBriBhvaKQJ25H7qL0gaKQgyLBamMnHFsEsPC6T1rmOYOYakotbRMyowt+d/G7YTG69xW/FiDC4d/R042DGRInBXnNPZwtQ6t71YNmi7Fq3H77xXKDqaw9rBxmtB5UpT73h3UCv3hIp/RGEp8w97T6HhrbqD28c5kVgSHp7MzNJuP6SkqLEbExUR5EZ1VDW432Ip36/QziAxz9LNI0GL9xE0CtDom3FM3FQ0T5ZW5bo3wtNVPwQlN76ea9EUaluQVOEg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 521a9e9c-ece5-43a1-1f7b-08d88ec1cb5c X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Nov 2020 08:37:06.6778 (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: EZdSiv1LdQ9QHimVJZcfAO/0/ulS+VPlWBQxZPrYE5m0/3nla59zOz75WVJNeDpN8+TQM7H8G3+/YDvq+doKxeiWAkhSPWkxhMSVXvlLdv4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4223 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 post_output_backlog 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 --- v2 updates: - add function comment common/board_r.c | 10 +--------- include/post.h | 11 ++++++++++- post/post.c | 4 +++- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index a291543d74..7a06627ba9 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -206,14 +206,6 @@ static int initr_addr_map(void) } #endif -#ifdef CONFIG_POST -static int initr_post_backlog(void) -{ - post_output_backlog(); - return 0; -} -#endif - #if defined(CONFIG_SYS_INIT_RAM_LOCK) && defined(CONFIG_E500) static int initr_unlock_ram_in_cache(void) { @@ -746,7 +738,7 @@ static init_fnc_t init_sequence_r[] = { #endif INIT_FUNC_WATCHDOG_RESET #ifdef CONFIG_POST - initr_post_backlog, + post_output_backlog, #endif INIT_FUNC_WATCHDOG_RESET #if defined(CONFIG_PCI) && defined(CONFIG_SYS_EARLY_PCI_INIT) diff --git a/include/post.h b/include/post.h index eb218acde5..5695e2b533 100644 --- a/include/post.h +++ b/include/post.h @@ -107,7 +107,6 @@ int post_init_f (void); void post_bootmode_init (void); int post_bootmode_get (unsigned int * last_test); void post_bootmode_clear (void); -void post_output_backlog ( void ); int post_run (char *name, int flags); int post_info (char *name); int post_log (char *format, ...); @@ -116,6 +115,16 @@ void post_reloc (void); #endif unsigned long post_time_ms (unsigned long base); +/** + * post_output_backlog() - Print POST results + * + * Print POST results during the generic board init sequence, after + * relocation. + * + * Return: 0 if OK + */ +int post_output_backlog(void); + extern struct post_test post_list[]; extern unsigned int post_list_size; extern int post_hotkeys_pressed(void); diff --git a/post/post.c b/post/post.c index 0f1fe8d905..7d6a647312 100644 --- a/post/post.c +++ b/post/post.c @@ -128,7 +128,7 @@ static void post_log_mark_succ(unsigned long testid) } /* ... and the messages are output once we are relocated */ -void post_output_backlog(void) +int post_output_backlog(void) { int j; @@ -143,6 +143,8 @@ void post_output_backlog(void) } } } + + return 0; } static void post_bootmode_test_on(unsigned int last_test)