{"id":818792,"url":"http://patchwork.ozlabs.org/api/patches/818792/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20170926192142.42308-12-sjg@chromium.org/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170926192142.42308-12-sjg@chromium.org>","list_archive_url":null,"date":"2017-09-26T19:21:39","name":"[U-Boot,v2,11/14] log: Plumb logging into the init sequence","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"54b3c56eda73074ea3072d2c9a33802a05771b06","submitter":{"id":6170,"url":"http://patchwork.ozlabs.org/api/people/6170/?format=json","name":"Simon Glass","email":"sjg@chromium.org"},"delegate":{"id":3184,"url":"http://patchwork.ozlabs.org/api/users/3184/?format=json","username":"sjg","first_name":"Simon","last_name":"Glass","email":"sjg@chromium.org"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20170926192142.42308-12-sjg@chromium.org/mbox/","series":[{"id":5217,"url":"http://patchwork.ozlabs.org/api/series/5217/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=5217","date":"2017-09-26T19:21:28","name":"log: Add a new logging feature","version":2,"mbox":"http://patchwork.ozlabs.org/series/5217/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/818792/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/818792/checks/","tags":{},"related":[],"headers":{"Return-Path":"<u-boot-bounces@lists.denx.de>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=<UNKNOWN>)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=google.com header.i=@google.com\n\theader.b=\"jqLdD5R+\"; dkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3y1rYH0nn9z9t4X\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 27 Sep 2017 05:26:43 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid D9940C21F35; Tue, 26 Sep 2017 19:24:07 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 62251C21F46;\n\tTue, 26 Sep 2017 19:22:52 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 0BDF4C21E28; Tue, 26 Sep 2017 19:22:30 +0000 (UTC)","from mail-oi0-f48.google.com (mail-oi0-f48.google.com\n\t[209.85.218.48])\n\tby lists.denx.de (Postfix) with ESMTPS id 2D866C21F03\n\tfor <u-boot@lists.denx.de>; Tue, 26 Sep 2017 19:22:27 +0000 (UTC)","by mail-oi0-f48.google.com with SMTP id w65so13466444oia.7\n\tfor <u-boot@lists.denx.de>; Tue, 26 Sep 2017 12:22:27 -0700 (PDT)","from kiwi.bld.corp.google.com ([100.101.164.89])\n\tby smtp.gmail.com with ESMTPSA id\n\tb73sm9315467oii.1.2017.09.26.12.22.24\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 26 Sep 2017 12:22:24 -0700 (PDT)","by kiwi.bld.corp.google.com (Postfix, from userid 121222)\n\tid A649F14164E; Tue, 26 Sep 2017 13:22:22 -0600 (MDT)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE,\n\tRCVD_IN_MSPIKE_H2,\n\tT_DKIM_INVALID autolearn=unavailable autolearn_force=no\n\tversion=3.4.0","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;\n\ts=20161025; \n\th=sender:from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=a7SmzKmxv4HeN1TVhtR1bjUkmzUx5gMNtzSn0JgpBok=;\n\tb=jqLdD5R+LZLHkswC5K1cbEHri0FqeBWthOkSgHIVYIGREIFaPSqBfZJ4mq5UAfSIB7\n\tr0ydkn7ow01gtLxTeXfoQiWN/E2PMTi+dJcva3+7WT+FRk/5rpYfL1ZZmDlshXTVLt7l\n\t0gSlmDFxKNFECWIehXVim1T1P3qN1s1hvy+FHPWhGZmBVitXj1yiAuIWSlpS8LZ2KB9j\n\tTG2CSVGJqIgHaR/Ina60JXMGXs0g0slrwtSwPG2WyQRwWPqzLQRij6577WkPnmo1f9Sp\n\tjlBTinrKoWNk34vft3vWDGgKnVRkFONZ7YIPHx/FljTVL/4TtWBLxVZgnGlP0Uk8h4Wi\n\tuwSg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:sender:from:to:cc:subject:date:message-id\n\t:in-reply-to:references;\n\tbh=a7SmzKmxv4HeN1TVhtR1bjUkmzUx5gMNtzSn0JgpBok=;\n\tb=peTK2SO8IJvuPwQQsnoPZQkGXX20yRYsw+VLPNAZXi8uqIAoVq/hAptLh2OBMZ+ODV\n\tKvTvCBR+cnRabQmUloG89GQhK3YksAlUbUFj5x/M1KemP3Vsl3Q1W2p1ItOVgm64aHci\n\tF6VjKyIm/LN1DQ+OEoDuTa+TnC7nnWmtgQx5FMOqoZHQ6Xore9ODHxCpjKXg1TElZN/J\n\t7LF/u41kGjZgBkxKuEDX1k/EuDAihylz07xQruTRs2HY8QSJPji2MdZAt2GRpNzpFbO1\n\t/jXHBPVycsHVwExGmgZy036I8HSHTunhYxLY45ZLJlI9BX5liiKa2Us7eWKplyR+7wcv\n\tv2aw==","X-Gm-Message-State":"AHPjjUjJa4i4KN6UPzDZkkHVDKkzsuWauPu1Lic6o0uZaBd/D2iwFNyQ\n\tvz8XkSO4sraM/YIgNu8CJ4uGdg==","X-Google-Smtp-Source":"AOwi7QBAG6qd5TjEy7pRk1shNKDBC5OToDdU/hqnoLO0kEvPZExmZbV/cKOZKQPr9C+cwsW24UFbcg==","X-Received":"by 10.202.205.206 with SMTP id\n\td197mr1167855oig.352.1506453745708; \n\tTue, 26 Sep 2017 12:22:25 -0700 (PDT)","From":"Simon Glass <sjg@chromium.org>","To":"U-Boot Mailing List <u-boot@lists.denx.de>","Date":"Tue, 26 Sep 2017 13:21:39 -0600","Message-Id":"<20170926192142.42308-12-sjg@chromium.org>","X-Mailer":"git-send-email 2.14.1.992.g2c7b836f3a-goog","In-Reply-To":"<20170926192142.42308-1-sjg@chromium.org>","References":"<20170926192142.42308-1-sjg@chromium.org>","Cc":"Tom Rini <trini@konsulko.com>","Subject":"[U-Boot] [PATCH v2 11/14] log: Plumb logging into the init sequence","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion <u-boot.lists.denx.de>","List-Unsubscribe":"<https://lists.denx.de/options/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>","List-Archive":"<http://lists.denx.de/pipermail/u-boot/>","List-Post":"<mailto:u-boot@lists.denx.de>","List-Help":"<mailto:u-boot-request@lists.denx.de?subject=help>","List-Subscribe":"<https://lists.denx.de/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" <u-boot-bounces@lists.denx.de>"},"content":"Set up logging both before and after relocation.\n\nSigned-off-by: Simon Glass <sjg@chromium.org>\nReviewed-by: Bin Meng <bmeng.cn@gmail.com>\n---\n\nChanges in v2: None\n\n common/board_f.c                  | 5 ++++-\n common/board_r.c                  | 2 ++\n common/log.c                      | 1 +\n include/asm-generic/global_data.h | 1 +\n 4 files changed, 8 insertions(+), 1 deletion(-)","diff":"diff --git a/common/board_f.c b/common/board_f.c\nindex 1e8bf63ec1..e46eceda7d 100644\n--- a/common/board_f.c\n+++ b/common/board_f.c\n@@ -751,6 +751,7 @@ static const init_fnc_t init_sequence_f[] = {\n \ttrace_early_init,\n #endif\n \tinitf_malloc,\n+\tlog_init,\n \tinitf_bootstage,\t/* uses its own timer, so does not need DM */\n \tinitf_console_record,\n #if defined(CONFIG_HAVE_FSP)\n@@ -932,8 +933,10 @@ void board_init_f_r(void)\n \t * The pre-relocation drivers may be using memory that has now gone\n \t * away. Mark serial as unavailable - this will fall back to the debug\n \t * UART if available.\n+\t *\n+\t * Do the same with log drivers since the memory may not be available.\n \t */\n-\tgd->flags &= ~GD_FLG_SERIAL_READY;\n+\tgd->flags &= ~(GD_FLG_SERIAL_READY | GD_FLG_LOG_READY);\n #ifdef CONFIG_TIMER\n \tgd->timer = NULL;\n #endif\ndiff --git a/common/board_r.c b/common/board_r.c\nindex 02ac43d39c..fb56b7d997 100644\n--- a/common/board_r.c\n+++ b/common/board_r.c\n@@ -703,6 +703,7 @@ static init_fnc_t init_sequence_r[] = {\n #endif\n \tinitr_barrier,\n \tinitr_malloc,\n+\tlog_init,\n \tinitr_bootstage,\t/* Needs malloc() but has its own timer */\n \tinitr_console_record,\n #ifdef CONFIG_SYS_NONCACHED_MEMORY\n@@ -899,6 +900,7 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)\n #if !defined(CONFIG_X86) && !defined(CONFIG_ARM) && !defined(CONFIG_ARM64)\n \tgd = new_gd;\n #endif\n+\tgd->flags &= ~GD_FLG_LOG_READY;\n \n #ifdef CONFIG_NEEDS_MANUAL_RELOC\n \tfor (i = 0; i < ARRAY_SIZE(init_sequence_r); i++)\ndiff --git a/common/log.c b/common/log.c\nindex a7d9a548f2..c94a3c1759 100644\n--- a/common/log.c\n+++ b/common/log.c\n@@ -238,6 +238,7 @@ int log_init(void)\n \t\t\t      (struct list_head *)&gd->log_head);\n \t\tdrv++;\n \t}\n+\tgd->flags |= GD_FLG_LOG_READY;\n \tgd->default_log_level = LOGL_INFO;\n \n \treturn 0;\ndiff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h\nindex 77755dbb06..73e036d6fd 100644\n--- a/include/asm-generic/global_data.h\n+++ b/include/asm-generic/global_data.h\n@@ -146,5 +146,6 @@ typedef struct global_data {\n #define GD_FLG_RECORD\t\t0x01000\t/* Record console\t\t   */\n #define GD_FLG_ENV_DEFAULT\t0x02000 /* Default variable flag\t   */\n #define GD_FLG_SPL_EARLY_INIT\t0x04000 /* Early SPL init is done\t   */\n+#define GD_FLG_LOG_READY\t0x08000 /* Log system is ready for use\t   */\n \n #endif /* __ASM_GENERIC_GBL_DATA_H */\n","prefixes":["U-Boot","v2","11/14"]}