{"id":814554,"url":"http://patchwork.ozlabs.org/api/1.2/patches/814554/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20170916212331.170463-11-sjg@chromium.org/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/1.2/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":"<20170916212331.170463-11-sjg@chromium.org>","list_archive_url":null,"date":"2017-09-16T21:23:23","name":"[U-Boot,10/13] log: Plumb logging into the init sequence","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"617cf59a8a99d98a5ef6ae0b878d0db5bdaea1af","submitter":{"id":6170,"url":"http://patchwork.ozlabs.org/api/1.2/people/6170/?format=json","name":"Simon Glass","email":"sjg@chromium.org"},"delegate":{"id":3184,"url":"http://patchwork.ozlabs.org/api/1.2/users/3184/?format=json","username":"sjg","first_name":"Simon","last_name":"Glass","email":"sjg@chromium.org"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20170916212331.170463-11-sjg@chromium.org/mbox/","series":[{"id":3473,"url":"http://patchwork.ozlabs.org/api/1.2/series/3473/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=3473","date":"2017-09-16T21:23:14","name":"log: Add a new logging feature","version":1,"mbox":"http://patchwork.ozlabs.org/series/3473/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/814554/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814554/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","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=\"QWz1QF3m\"; dkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xvljj5hCqz9sPr\n\tfor ;\n\tSun, 17 Sep 2017 07:27:53 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 4ED2EC21D90; Sat, 16 Sep 2017 21:26:42 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 2F7ACC21DCA;\n\tSat, 16 Sep 2017 21:24:43 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid E8C2CC21D72; Sat, 16 Sep 2017 21:24:17 +0000 (UTC)","from mail-oi0-f42.google.com (mail-oi0-f42.google.com\n\t[209.85.218.42])\n\tby lists.denx.de (Postfix) with ESMTPS id 55EACC21DE5\n\tfor ; Sat, 16 Sep 2017 21:24:14 +0000 (UTC)","by mail-oi0-f42.google.com with SMTP id l74so2372863oih.1\n\tfor ; Sat, 16 Sep 2017 14:24:14 -0700 (PDT)","from kiwi.bld.corp.google.com ([100.101.164.89])\n\tby smtp.gmail.com with ESMTPSA id\n\tf6sm4674358oib.27.2017.09.16.14.24.11\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSat, 16 Sep 2017 14:24:12 -0700 (PDT)","by kiwi.bld.corp.google.com (Postfix, from userid 121222)\n\tid C2B60140A54; Sat, 16 Sep 2017 15:24:10 -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_H3, RCVD_IN_MSPIKE_WL,\n\tT_DKIM_INVALID autolearn=unavailable\n\tautolearn_force=no version=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=oW9v8NY38OoZrcmGJ+04kaYNmOJ0MNtn/duaEp4+SbY=;\n\tb=QWz1QF3mHVMbeylFXiIfX63wCPbGHnIqjqROqekj3YL3Dg/LiokqsdX4kXsdAsDc6/\n\tFp7zxJ5++aMFO8p56UskkucbuBApUER2yoMFpv3Cy/yvTqLyrWG1h404Sq51YtVHC7KD\n\tfG3Z6d9mUBh4VWIYxhIy13GFmX97w01zGDHuqq7cUmEZrACF1q34NhtV7tB7ausRI7/V\n\t9w/58cfYj4DXlMBENvMdwYzTBisYMkx6/0ubpjvWKTz2B7nFlJShaO4688eRGKZP1PBD\n\tVU43Wtg6AsQfwzFlScs17GPIHHR6/3IAkVPbiZ7x2ZbrbiMVzh+k1NCXtkFZNBsTeyHw\n\toAJg==","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=oW9v8NY38OoZrcmGJ+04kaYNmOJ0MNtn/duaEp4+SbY=;\n\tb=LypnGi/I+RY8xG/13dagizjyDGXbDMqUwzUMPek7luw2Qxv+dTi6JqZbNJnaotP7iO\n\tUbmZ+5yPpX4JpoIHs4/dzd29yqusWUe20TZiBDn/K9YHnkpBFzC9wTsVsEuT9q13CujM\n\tARCLiJuO5vL4Bl8lrcCor46HPuXMwjqXbMlVlP/bEPnjRzsKQmlz9g4+PrsO+xvUW8cU\n\tK7JpL0U0nLsZQvCtcwc4tGrwF/Z3kPtcCIJ4wuambTOJDw2dZ3eh6MvK6h3BnF5ZPttn\n\toFwL1kgqOg3sE2xekhxeHfWQ6kG88MEBqbWg7iEzr3IE6fEAUENY1SY0/ny5y5Xg3y3A\n\tnJAA==","X-Gm-Message-State":"AHPjjUjpk19RTLC38uTDEVc9L1cba3nc8t/c3y870RmqMPIq3LDjhGzt\n\tCLMTUM4ROg94YAAV","X-Google-Smtp-Source":"AOwi7QBWgnNaHDHOjD1CPdj7Ec9QLmgOJfhwAg3buw8yqeryyNDz9rXROR9MM8fBh0a9IwdBAamxGw==","X-Received":"by 10.202.181.195 with SMTP id\n\te186mr32124733oif.290.1505597052838; \n\tSat, 16 Sep 2017 14:24:12 -0700 (PDT)","From":"Simon Glass ","To":"U-Boot Mailing List ","Date":"Sat, 16 Sep 2017 15:23:23 -0600","Message-Id":"<20170916212331.170463-11-sjg@chromium.org>","X-Mailer":"git-send-email 2.14.1.690.gbb1197296e-goog","In-Reply-To":"<20170916212331.170463-1-sjg@chromium.org>","References":"<20170916212331.170463-1-sjg@chromium.org>","Cc":"Thomas Petazzoni ,\n\tTom Rini ,\n\tAndy Shevchenko ,\n\tStefan Roese , Michal Simek ,\n\tAndy Yan ","Subject":"[U-Boot] [PATCH 10/13] 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 ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","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\" "},"content":"Set up logging both before and after relocation.\n\nSigned-off-by: Simon Glass \n---\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 d0b1a00175..b22772d32c 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 \n \t/*\n \t * U-Boot has been copied into SDRAM, the BSS has been cleared etc.\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 6bf2219d38..917152b45a 100644\n--- a/common/log.c\n+++ b/common/log.c\n@@ -240,6 +240,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","10/13"]}