From patchwork Mon Mar 7 02:27:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 592627 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 DC41514030F for ; Mon, 7 Mar 2016 13:31:56 +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=CQSOxVQX; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9CE41A7712; Mon, 7 Mar 2016 03:31:53 +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 dKgdnUC4U-zA; Mon, 7 Mar 2016 03:31:53 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3DAF8A76DC; Mon, 7 Mar 2016 03:31:45 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8095DA74D6 for ; Mon, 7 Mar 2016 03:31:41 +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 rOSxvuTQJAdB for ; Mon, 7 Mar 2016 03:31:41 +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-f176.google.com (mail-ig0-f176.google.com [209.85.213.176]) by theia.denx.de (Postfix) with ESMTPS id 1DEB4A76C8 for ; Mon, 7 Mar 2016 03:31:37 +0100 (CET) Received: by mail-ig0-f176.google.com with SMTP id vs8so15773932igb.1 for ; Sun, 06 Mar 2016 18:31:37 -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=yZlM0JeC4QtDoI2IE6EOaPYB5HFMfcL6mhfBoyGwMDg=; b=CQSOxVQXT6l0WA8j0Nujy4ZZjoPIAnNXJeABzCikirFx/6r1obqcX/PqD2ROAw7Tco XkCx2FgL0qXwrXT8fmTuHZykLfnB1+9Mb1jj8/wkm26SrdHgXPNgmbd30W4ze6uz6fi0 lpHeD+cUBb0AEt6KkmDSBglbeXvYaB2ZCRpCD8pM5NOL7W3Ti2M0Xokol0xwq8W9KqUB sggXEK6gfJ5suUGWk0qMdihWk0laKF2vfNKHYeRKJeFesSHbwF9COxlvjHUHYl73mP/b gpJx/aG+Jqwnr3/EaSU97impb34Tkvdvj/SHaXu+oKIpoEXEUN/P5negn/Vv2esNnJhJ +EMA== 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=yZlM0JeC4QtDoI2IE6EOaPYB5HFMfcL6mhfBoyGwMDg=; b=OTelRKZWv4GwrZKQPb76Q1gd6yqzpjIVqfAIkSfu81OotcDef0OoP1lsPXCZ7mmAJD dFVY6vSZFJSi8uV2dM09qFMku2Lk4mE9V5bMDvleIair4AxuQuO/HXCTMjPiSgujYhIj 3hvkF0+g6hT/2xotQdgANaEioxQvUfcMHCwfdotiATGk7B99aEZY6jjfZYH4fPmI7Iat nAlPHZhir6fsomh49a5a22D+CZjddBiRm/e6PYcX2x2LlqB4u3po+56mHIwxWRVNu62y GWVpfnwo2fIVh6CS4pDxN2KvZFHts6j7IpHZxm5DlF4DcuqXIffGMWS6ecSWfioLRfuN Fe+w== X-Gm-Message-State: AD7BkJLos/ILkvK7EGv3Yiz160uw55BDbQRRxF/Xx82jYoRDrajd8Hi7/LXDvseWdTxECVd4 X-Received: by 10.50.79.234 with SMTP id m10mr1010175igx.45.1457317896105; Sun, 06 Mar 2016 18:31:36 -0800 (PST) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by smtp.gmail.com with ESMTPSA id cj10sm4775774igc.2.2016.03.06.18.31.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Mar 2016 18:31:35 -0800 (PST) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 06860220A04; Sun, 6 Mar 2016 19:31:34 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Sun, 6 Mar 2016 19:27:44 -0700 Message-Id: <1457317732-18406-2-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 01/69] dm: timer: Correct timer init ordering 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" Commit 1057e6c broke use of the timer with driver model. If the timer is used before relocation, then it becomes broken after relocation. This prevents some x86 boards from booting. Fix it. Fixes: 1057e6c (timer: Set up the real timer after driver model is available) Signed-off-by: Simon Glass --- common/board_r.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/board_r.c b/common/board_r.c index 52a9b26..0f068bf 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -318,11 +318,13 @@ static int initr_dm(void) /* Save the pre-reloc driver model and start a new one */ gd->dm_root_f = gd->dm_root; gd->dm_root = NULL; +#ifdef CONFIG_TIMER + gd->timer = NULL; +#endif ret = dm_init_and_scan(false); if (ret) return ret; #ifdef CONFIG_TIMER_EARLY - gd->timer = NULL; ret = dm_timer_init(); if (ret) return ret;