From patchwork Tue Jun 30 09:30:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1319666 X-Patchwork-Delegate: uboot@andestech.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=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=YFMCxFCw; 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 49wzdH4c92z9s6w for ; Tue, 30 Jun 2020 19:31:31 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8E61480226; Tue, 30 Jun 2020 11:31:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de 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; secure) header.d=gmx.net header.i=@gmx.net header.b="YFMCxFCw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 74C0F80244; Tue, 30 Jun 2020 11:31:26 +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.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 554F1801EB for ; Tue, 30 Jun 2020 11:31:23 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1593509465; bh=uB/T4968fQ8mAclPOgwEiV2WzKe08hSWuvdQBhWwn1s=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=YFMCxFCwTK7WdQMz5OA4JzOuhAoe2wy27HcutT11HhvexcSgflDciVeQ/a5hxQBee zwf2E8fRZZSP9690rnECw4mZ4jl+fzIK62qq2WBE8j2YHLnrfISlD0xTPHW0+YLEPF WqU3YKG6CDecyN+7PVa3Z+ljedNLPCoRwH5JftoE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from workstation5.fritz.box ([88.152.145.75]) by mail.gmx.com (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MMobU-1jZleP0iN2-00Iikr; Tue, 30 Jun 2020 11:31:05 +0200 From: Heinrich Schuchardt To: Rick Chen Cc: U-Boot Mailing List , Bin Meng , Atish Patra , Simon Glass , rick , Alan Kao , Heinrich Schuchardt Subject: [PATCH v2 1/1] riscv: use log functions in fdt_fixup Date: Tue, 30 Jun 2020 11:30:59 +0200 Message-Id: <20200630093059.19669-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:Wg9rwyyv2u8nOrpORnCVkHlQJUPAZgnFphIqvEutGn8I+AGlCKR HSAp0jlJw+i9eTbHgpi2JifHLsSvOJ0xHY8fWYT0FuF0q8++U3OYhBGuF0Q3iNi5ZGP+0Nd qxB8gJ4VlnHLA6JP0F+Cqh+sEcdBs2mQoaip5QJxILfwCwZAKJroO9TfOzr4uwAej8yytlo loctipWBqbJhwk5qDibFQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:6vTnd5BG398=:HQI/dUXY/QbOlBsd+2X5C6 GMpyiKbPL7Pbjm8Ur4xbFOLoN/pY3SvMXiBmyr9LI/Y9Z2tOuDFx33lI7/Em+4nV3TsT0ViqM WZnTUksOcE0OIn7wS4f3767VcsxtZGQVEdzdI3Kw1uicYM4F+bPZywu/RW+/2DseCZnU95dRi H6w0CRbje7RopwsMfeKq2gg07Q/GHwY1tmtOeAc8chdEIKwU9U9wDCBtqAdAbc0Zfawc4tmm4 fJSFFnOhQUWHsVQDb8UfYnC/LEVyrExYuz6S+H30c4hqQwvlWSRNYt68pVruvQbRAT8cLBYP1 wKCiGIBxWTgBwebyKAb3ZjtXZLd3gVF+QcK2mHEtpJOVWzKj5P0qyq8uRBrFp5+og/tUQAVR6 KywX+Rmn6/gj1imL1PaLiP2vdU5/Qm5XBhXfS/LHjBAb1yQ3V/Zup03iWiBnylkvdNjuLVCBf rgNOvXhEU5cQiHSY87ZkL5jrHLISaLd7A+tXQvvdh7wm651VNmEcwgRSr1umW60uYo50ly/w+ J3l/ovXWsY2aS+pc806AEP44w+F8QZDx+CaSlOppXSaValzhZAJIDjfCg+TWc61JvrtA28RFc flR02se155K3/5wt4I3qMn1xj2sbAYfM03PS7JcJpm7hW4zh5iZyAB0pq4KllwIePU91skXH1 mUHU552rYhV4LlWoki2CslhkNyJrPBcE8mA/C/7atdRo2dqxVWpfaWdy1r+IqCuONsMFgzxw2 8s4G5bLDEHEQUeVLAS6M6gJcvsw0qur6Y0FWzfOz6dw3niCZ3RWXNMUwgY1mHujhzDPyhVCpz W/boHpWNsHMMMDzlpokrf1P0YgaDuq9DvxCPwh/wp3663nk3KM3MPtfEZd0eXfA2+EnUkBV2u hM9fQGSiS/icxU4REF0dWvn0jS9aVt+DcGp4ioakvr8tHbNyWw3wRvZwzLILBb/WjzAV37j+R k+25Pcm+1SlwCghjNl1Fh6axznsfn4N1M5dwsI40dKicIgJLCKI+KuCdABFN5cenEZL6mi7Nq PRL5qvJcRtjxaTc7oFn2CEasy0tMv4mzZBs+mER04QU0NWG0L0rGTtw9CyC245/hbjAQ+EMdo jPDEiOkc+qsWv/LsCIqznd/ok+h279bcYewpvBBf0siZmwkqhnkV/HdFwV5CrzijB07nnzNlK Hb5rHdm+IONeoLagvw4krcLogYd+VfMgc+nTJ+bB+ivTPiyVhzrzZ6itvbn6sf8XR6R80fszF +iTz36jrJUIXhpFWccaoiq6m9d7RDgUaSoULpcQ== 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.3 at phobos.denx.de X-Virus-Status: Clean Replace printf() and debug() by log_err() and log_debug(). "No reserved memory region found in source FDT\n" is not an error but a debug information. %s/can not/cannot/ - use the more common spelling. Signed-off-by: Heinrich Schuchardt Reviewed-by: Bin Meng Reviewed-by: Atish Patra --- v2: define the log category as LOGC_ARCH rebase the patch upon "Assorted fixes related to reserved memory" --- arch/riscv/lib/fdt_fixup.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) -- 2.27.0 diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c index fab93873d5..2780475c5d 100644 --- a/arch/riscv/lib/fdt_fixup.c +++ b/arch/riscv/lib/fdt_fixup.c @@ -4,6 +4,8 @@ * */ +#define LOG_CATEGORY LOGC_ARCH + #include #include #include @@ -37,7 +39,7 @@ int riscv_fdt_copy_resv_mem_node(const void *src, void *dst) offset = fdt_path_offset(src, "/reserved-memory"); if (offset < 0) { - printf("No reserved memory region found in source FDT\n"); + log_debug("No reserved memory region found in source FDT\n"); return 0; } @@ -48,7 +50,7 @@ int riscv_fdt_copy_resv_mem_node(const void *src, void *dst) "reg", 0, &size, false); if (addr == FDT_ADDR_T_NONE) { - debug("failed to read address/size for %s\n", name); + log_debug("failed to read address/size for %s\n", name); continue; } strncpy(basename, name, max_len); @@ -63,7 +65,7 @@ int riscv_fdt_copy_resv_mem_node(const void *src, void *dst) err = fdtdec_add_reserved_memory(dst, basename, &pmp_mem, &phandle); if (err < 0 && err != -FDT_ERR_EXISTS) { - printf("failed to add reserved memory: %d\n", err); + log_err("failed to add reserved memory: %d\n", err); return err; } if (!fdt_getprop(src, node, "no-map", NULL)) @@ -109,7 +111,7 @@ int board_fix_fdt(void *fdt) err = riscv_board_reserved_mem_fixup(fdt); if (err < 0) { - printf("failed to fixup DT for reserved memory: %d\n", err); + log_err("failed to fixup DT for reserved memory: %d\n", err); return err; } @@ -127,14 +129,14 @@ int arch_fixup_fdt(void *blob) size = fdt_totalsize(blob); err = fdt_open_into(blob, blob, size + 32); if (err < 0) { - printf("Device Tree can't be expanded to accommodate new node"); + log_err("Device Tree can't be expanded to accommodate new node"); return err; } chosen_offset = fdt_path_offset(blob, "/chosen"); if (chosen_offset < 0) { err = fdt_add_subnode(blob, 0, "chosen"); if (err < 0) { - printf("chosen node can not be added\n"); + log_err("chosen node cannot be added\n"); return err; } }