From patchwork Mon Mar 7 02:27:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 592649 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 4853A140BAF for ; Mon, 7 Mar 2016 13:36:45 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=Oj5qZsVH; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 24D2BA779A; Mon, 7 Mar 2016 03:34:00 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LFz8o2VLbMqM; Mon, 7 Mar 2016 03:34:00 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7A9EEA779B; Mon, 7 Mar 2016 03:32:38 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0378DA76D6 for ; Mon, 7 Mar 2016 03:32:15 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KDQVeAAE-jVv for ; Mon, 7 Mar 2016 03:32:14 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-ig0-f180.google.com (mail-ig0-f180.google.com [209.85.213.180]) by theia.denx.de (Postfix) with ESMTPS id 2CEC2A7707 for ; Mon, 7 Mar 2016 03:31:43 +0100 (CET) Received: by mail-ig0-f180.google.com with SMTP id ig19so9377615igb.1 for ; Sun, 06 Mar 2016 18:31:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=kMtJZQPBjXz7PFngQA8LLgFimRLR4L7lgIy46sQXoTA=; b=Oj5qZsVH/GlgEBX2pA8zQK4px5CHgt1ZT6KS8ZTb9b8nMPLun9KjLmAxmTqvmDyO1l 4mH9Rr2BHDySjKD80FputYItcUwyil4Qjm7qJ3emeGQKmCaBtrnI3E+4s0nCun3odEXc AmfxGOkUkyVLlRQ2rbdw20hrm3xToNTtMX2+syxMlZ2o4dKkNln/wluTNSvUXJvMKG6z omMUW7tCl+s0iBBF/mNX6TptIMsIvyWp+2LO8VTp4FOYu+1BERIsoVa6QDghkkbVkNfu Cjy5kL4n9X1kIBY4W00pZXE5eN/lluKAh0xEuC1VoxaosN7QMG2sg+DLRKd3AlTUlYlm WX2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=kMtJZQPBjXz7PFngQA8LLgFimRLR4L7lgIy46sQXoTA=; b=AIbjzt78tJWrKEnFb7u0/tPKBH+pIJ4pY+JuyW8FPaAyAu2Muqu/MTT3p/EDYsb+ac 8dSt4A9Koxmlnya4vPtbw142BS6B6WoLV/qdn2UGDDPjsrw3rwDfnhzatJGyH/BSh5b8 GVmBCZAxv0lCQomIZtTIG1JKxdo8I2fdoevnZ3XK+sEjchBFxC0AL9TWIeH28aygWZ5U PpaVbmo5mvnvv/Bm3Azj8JmIVm2vQpVxCzwoAG5dcoVh8o0y3ViO8tzsL/a+mBfXrA1K ZlxAIjCCZ03871MDn56kWb3TULlfLD715npyUeAvgneUwP1ZRJwau1IfTIBVy77LUNPl ewyg== X-Gm-Message-State: AD7BkJIgW48xM8fGfVwghkTHYVuJeG9tApyJfXnvZnWs7xegY2obIvw2Mi3K0wiDyZ9qfZuV X-Received: by 10.50.61.209 with SMTP id s17mr9133786igr.7.1457317902543; Sun, 06 Mar 2016 18:31:42 -0800 (PST) Received: from kaki.bld.corp.google.com ([2620:0:1005:1100:4a7:6f3d:4be:bc56]) by smtp.gmail.com with ESMTPSA id h131sm5852639ioe.7.2016.03.06.18.31.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Mar 2016 18:31:38 -0800 (PST) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 4770F220A04; Sun, 6 Mar 2016 19:31:36 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Sun, 6 Mar 2016 19:27:56 -0700 Message-Id: <1457317732-18406-14-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.7.0.rc3.207.g0ac5344 In-Reply-To: <1457317732-18406-1-git-send-email-sjg@chromium.org> References: <1457317732-18406-1-git-send-email-sjg@chromium.org> Subject: [U-Boot] [PATCH 13/69] x86: Allow use of serial soon after relocation X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" At present on x86 machines with use cache-as-RAM, the memory goes away just before board_init_r() is called. This means that serial drivers are no-longer unavailable, until initr_dm() it called, etc. Any attempt to use printf() within this period will cause a hang. To fix this, mark the serial devices as 'unavailable' when it is no-longer available. Bring it back when serial_initialize() is called. This means that the debug UART will be used instead for this period. Signed-off-by: Simon Glass --- common/board_f.c | 7 +++++++ drivers/serial/serial-uclass.c | 1 + 2 files changed, 8 insertions(+) diff --git a/common/board_f.c b/common/board_f.c index 622093a..109025a 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -1096,6 +1096,13 @@ void board_init_f_r(void) hang(); /* + * The pre-relocation drivers may be using memory that has now gone + * away. Mark serial as unavailable - this will fall back to the debug + * UART if available. + */ + gd->flags &= ~GD_FLG_SERIAL_READY; + + /* * U-Boot has been copied into SDRAM, the BSS has been cleared etc. * Transfer execution from Flash to RAM by calculating the address * of the in-RAM copy of board_init_r() and calling it diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index 1c447ff..6562be0 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -116,6 +116,7 @@ int serial_init(void) void serial_initialize(void) { serial_find_console_or_panic(); + gd->flags |= GD_FLG_SERIAL_READY; } static void _serial_putc(struct udevice *dev, char ch)