From patchwork Fri May 1 14:55:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1281352 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=prevas.dk Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.a=rsa-sha256 header.s=selector1 header.b=PGJIQjVO; 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 49DFhR4cY4z9sRY for ; Sat, 2 May 2020 00:56:55 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8CA2B822B7; Fri, 1 May 2020 16:55:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=prevas.dk 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=prevas.dk header.i=@prevas.dk header.b="PGJIQjVO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C5F2282291; Fri, 1 May 2020 16:55:37 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0730.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::730]) (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 D767D8228F for ; Fri, 1 May 2020 16:55:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rasmus.villemoes@prevas.dk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a+AS44DjYuaMremxaMhvVX8NdLSLYDeBlBg4zmoXAmoxzSjl9AAuqF+S+rexICCDMD+FHP9gLOmg8FkhMFtVToBAb6Yp9dq8Hzwg9uPc3fXvlbA4iDKGzfKL6TseP1dxVlf7sTX6x2QLoOwdadrbZK68Gq7IkK6Ib9OE8w/MxPRByUK9hAy0YAd6jXZE/b+YFptXIx8cETO7GLr+TaKYCdL59ujTopN50iiuHcl+CL3CcXMWPZ89a132Xk7yLWSlyWH/BT782TSKMaeQvVsj19R30l50glCfI1GuH5BnWn6Mu7hLRSWTvXw2CX3OPEHJU/wDKKnQK45BMnfjOOR9+A== 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=nFH0G9BnIROrXKovxYkcpOBFDInI9G1kAuxJl2ooT7Q=; b=HAdZDMH6CiU17YvPJBGAZkn95sy6c61jcTqZEbEh1FRIVYjua4gX2S19cl5x2AfNCzAP51WoqP35Z6TthG1gteLx/KSKhOLjsY0rc8SoP//rdYyH4vXN/J7hs03xzdrfNttZUlK7G7VOcaxpM4PAsZ8U7SEO2zwqshcnyNrwwNvekp3jfaaKmUl35lRSa6Jktx8+ikz0ZeOT1+wurnVPPuqHLLl1gFE1d302VzkheupWFo1LPERrr9V0YF9AGJAcadbfE9x9H/rKQKEbkZ6Hpq3n3YQ1FerzcSYRDJJTzAKlhpUbTn1AcdtWZFkFz2MhVBWi2mrU/iAy2xP/UMcSjg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=prevas.dk; dmarc=pass action=none header.from=prevas.dk; dkim=pass header.d=prevas.dk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prevas.dk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nFH0G9BnIROrXKovxYkcpOBFDInI9G1kAuxJl2ooT7Q=; b=PGJIQjVO3v1pbgfZGQRhwkI9axVkjQ2YQs4lYryz9qgNXV/Zp17FChWPCwqgEJ90wJk65zKs2Ade71uxGq7KvjqYmgUKm82X4R2mpVrusVISwPH1OK0bqTRze/yId3FFobZgyQjyAczbgQTSkk8/5PmmzxpFmdGXjU1FjxG8/dQ= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=prevas.dk; Received: from VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:e1::21) by VI1PR10MB1967.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:32::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.27; Fri, 1 May 2020 14:55:31 +0000 Received: from VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM ([fe80::f0ac:4e97:2536:faa]) by VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM ([fe80::f0ac:4e97:2536:faa%7]) with mapi id 15.20.2958.020; Fri, 1 May 2020 14:55:31 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Simon Glass , Mario Six , Bin Meng , Urja Rannikko , Rasmus Villemoes Subject: [PATCH 5/5] sysreset: move print_resetinfo() to sysreset-uclass.c Date: Fri, 1 May 2020 16:55:16 +0200 Message-Id: <20200501145516.18168-6-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200501145516.18168-1-rasmus.villemoes@prevas.dk> References: <20200501145516.18168-1-rasmus.villemoes@prevas.dk> X-ClientProxiedBy: AM6PR0502CA0065.eurprd05.prod.outlook.com (2603:10a6:20b:56::42) To VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:e1::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from prevas-ravi.prevas.se (5.186.116.45) by AM6PR0502CA0065.eurprd05.prod.outlook.com (2603:10a6:20b:56::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Fri, 1 May 2020 14:55:30 +0000 X-Mailer: git-send-email 2.23.0 X-Originating-IP: [5.186.116.45] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2788d476-6a79-40b8-f64e-08d7eddfb1a3 X-MS-TrafficTypeDiagnostic: VI1PR10MB1967: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:67; X-Forefront-PRVS: 0390DB4BDA X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cZLG/kU5BdTmyl0Bq0wBd0ELbNB/sDXkMC+/FyqSGDqMMgiJfn+m6vegBpMSWXPqomDSy8nPWUY/SJNDVzg3OWsbTjGbx0bJ11EJ8YlVzFUafHIo58g3JAadENnM3nCgYscmAUlUYw8IljJuTq/Scgs4nJXqV17KPcliTQxwh4kC1OkMr0sCw6Y0KUhhlSrcgoEL2ES7POp/YP03FnfEA6sRiMV7d1jMjJJN7yb5taI3pp3mzgjucnyABPhcgYWQvGY7Oa34ZVDFKe2fONfQSQfqPewZyuLdBako/D6qjfkd+DggUt9QaZ1G02/EVdkC6By3CuTwT7+TUul8qtqAr8Cw8cM5STWUnR+ZIWBlOgAuiA9T2NLcNnOantcUw4y/yzoN+M7xCAljWi3JvBAq3x0rqTC/3llMhPhFyPtcEIOLOJBUhS8J85bS/7Ndj+4t X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFTY:; SFS:(396003)(376002)(39840400004)(136003)(346002)(366004)(52116002)(66946007)(8676002)(66556008)(66476007)(26005)(186003)(6486002)(6666004)(16526019)(316002)(6506007)(2906002)(54906003)(86362001)(107886003)(6916009)(8976002)(8936002)(4326008)(6512007)(478600001)(2616005)(44832011)(1076003)(36756003)(956004)(5660300002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: r/4Q/gENreuc9ZXVCIEm8wCF8cKJgFywAm6q5ux05QKBHk5p3oRLoan8zWKamesc3rYXysq9qs12RhRzdkPfsx2eTf7WZz4NqUu4WPKUIvSJWI4F0btTw/e36bqNI+V0qjnXQLuShc1Uk0qHTpOqLxejzPIaMOFE7BPBD+gS9JhZUZHg/vBnLZUPQdub6ZG2+LvdXk/82H92k/Xgmh68B/i2CrNnkMOmgvjXXn9Vb7NlkL9tE1jLSM9DwIecCBe2hgzIjpslNj5RdLIS3jGdGiI3Rq62RwFqytakjmVH6Z4mvoU5scTPC//LMUVsThZ79v4HiV5j3mE2vEtyNKucleis0bPbDqrhT7KHSEk+jaWg7asklFeSF1bcDVQtDbVoYBXI0MY0BvDyvMsU1OtLl9zxWIqzS657OIqfY3yGzXgKM1jFk0iPj+cAwQArH205o9umtqd8nIfqcXTg0hxYw7CMP9Rxl6cb0epn+pYi1Zz0yh3yHpYDA8iAGzEn4pCEkz4SOEcBTRlH+z67NHS2kSRb7TuVWJ9zKwTiNX5PirAdEGz20mOy/wY7fjhC6b1ia8tuSOy7SzUtI3ZcTN4Ma8sH7O9gVmE5xUgHPnh6RI07mfCOYX3sKamFVk1HK6322+GvOOl4nDBn2nFnR5mZFU/HovOBrvTD2S0anhn8m8KLteaRi0Q4N45DHHIT3izbyOGG2XT5deWWiP77ErcjfaSmKIV0+lRGQbAfjO0KBhTdCUjz9xFfTyUFrAJwPO+yg4ojVR686XM3EejR92Js6oz+PS5GDekKj/vjTx9X+94= X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: 2788d476-6a79-40b8-f64e-08d7eddfb1a3 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 May 2020 14:55:31.1686 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d350cf71-778d-4780-88f5-071a4cb1ed61 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: t6NLdju6jRfOb6WWtxdcqDPa1cKGyt2BknCq6KqZAPlQWc/mG68heEVnOhB5hWIMc/NpuqJdjvk61T4bv+PkEkcxBnGwhZ4mg0y84YQ/HvU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB1967 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean Moving this out of board_f.c allows board-specific SPL code to call this rather than duplicating its implementation. Signed-off-by: Rasmus Villemoes Reviewed-by: Simon Glass --- common/board_f.c | 24 ------------------------ drivers/sysreset/sysreset-uclass.c | 22 ++++++++++++++++++++++ include/sysreset.h | 5 +++++ 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index 82a164752a..252ad1c520 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -152,30 +152,6 @@ static int display_text_info(void) return 0; } -#ifdef CONFIG_SYSRESET -static int print_resetinfo(void) -{ - struct udevice *dev; - char status[256]; - int ret; - - ret = uclass_first_device_err(UCLASS_SYSRESET, &dev); - if (ret) { - debug("%s: No sysreset device found (error: %d)\n", - __func__, ret); - /* Not all boards have sysreset drivers available during early - * boot, so don't fail if one can't be found. - */ - return 0; - } - - if (!sysreset_get_status(dev, status, sizeof(status))) - printf("%s", status); - - return 0; -} -#endif - #if defined(CONFIG_DISPLAY_CPUINFO) && CONFIG_IS_ENABLED(CPU) static int print_cpuinfo(void) { diff --git a/drivers/sysreset/sysreset-uclass.c b/drivers/sysreset/sysreset-uclass.c index 51fdb1055e..739e4526ff 100644 --- a/drivers/sysreset/sysreset-uclass.c +++ b/drivers/sysreset/sysreset-uclass.c @@ -18,6 +18,28 @@ #include #include +int print_resetinfo(void) +{ + struct udevice *dev; + char status[256]; + int ret; + + ret = uclass_first_device_err(UCLASS_SYSRESET, &dev); + if (ret) { + debug("%s: No sysreset device found (error: %d)\n", + __func__, ret); + /* Not all boards have sysreset drivers available during early + * boot, so don't fail if one can't be found. + */ + return 0; + } + + if (!sysreset_get_status(dev, status, sizeof(status))) + printf("%s", status); + + return 0; +} + int sysreset_request(struct udevice *dev, enum sysreset_t type) { struct sysreset_ops *ops = sysreset_get_ops(dev); diff --git a/include/sysreset.h b/include/sysreset.h index 61295e3fcb..5f402b9d04 100644 --- a/include/sysreset.h +++ b/include/sysreset.h @@ -116,4 +116,9 @@ void sysreset_walk_halt(enum sysreset_t type); */ void reset_cpu(ulong addr); +/** + * print_resetinfo() - print reset information to console + */ +int print_resetinfo(void); + #endif