From patchwork Fri Apr 21 14:24:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 753441 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 lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3w8dS93wv5z9s2x for ; Sat, 22 Apr 2017 00:30:17 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nlbV/ALH"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id 1B6C2C21D33; Fri, 21 Apr 2017 14:24:28 +0000 (UTC) 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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 1CCC9C21CE1; Fri, 21 Apr 2017 14:22:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1A669C21CE1; Fri, 21 Apr 2017 14:21:27 +0000 (UTC) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by lists.denx.de (Postfix) with ESMTPS id B9B55C21CC3 for ; Fri, 21 Apr 2017 14:21:23 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id o81so5184007wmb.0 for ; Fri, 21 Apr 2017 07:21:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=asreXnpjW6xFP7ChDPkcBhRjCywmNNxGC31BB/WL0BA=; b=nlbV/ALHslWEOavp2B1kg3uobWb1ASHaXXCsZFSO0cll31cQJmTq44XAquva8GQIu8 iiD+ppM1T9jax/UU/Yxrr65jcqtWF6q3VXbfZqSfkRQEyxJhF7mr8SA882Tf+scBFNYF nOyvrAvATLPTvsZLv1RFtsXYQy6AiOPPqmo078ARzLRfQw06xXKiVu2zN5MPDRMGcaoX ecfQiOVmPSsnJ12DUXbNzp9aWaXA+JhJJKi+UrClWh5IADaARk6ssutkStT33AQd120S qpmwH6xLQZcs+a29kDQrlshL2fyycNYY3aaibVGxL/HPF7TP4kklbCdwlDvgrrPVddJF O2aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=asreXnpjW6xFP7ChDPkcBhRjCywmNNxGC31BB/WL0BA=; b=VtLSOTVPK1ETh2mfFlJXKcDweslQVI/wB9RQqfuZt3yHRQgTuf9w84iYm0G+mP38ez glIzDFfdfLrXB3tgrslBBpFWN4+2tA1XqKqo0KwDl2GCM2HVMhrgKCcfejooQyXOBRhI l+2v4sYsNODMEW9dL/na+c/6UzapKkAjv0xznVjSl0z2LdMa6HvxR0L7WyT6b/LWtQwT HigAt8ooqAZSPiXr+oyK0WDkHstAzvo2AsoELy84uh64khNlZUjM22idpOpVHPzqyXoD xh2tGqfiiLOKjHVMjn9H7Fs0mf+FPVV3+H8REHsznYPimqPSRjaLZnxn8qRzUgrAUmi5 Wdqw== X-Gm-Message-State: AN3rC/6qtjSX/S4KfiwyUeXWUuAlRqky13C3u+DT4qO6Tx3and7MtyG0 aMdPHxGAdOC1Mw== X-Received: by 10.80.180.241 with SMTP id x46mr57208edd.91.1492784483508; Fri, 21 Apr 2017 07:21:23 -0700 (PDT) Received: from ala-d2121-lx1.wrs.com (unknown-157-139.windriver.com. [147.11.157.139]) by smtp.gmail.com with ESMTPSA id 4sm464843edt.64.2017.04.21.07.21.21 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 21 Apr 2017 07:21:22 -0700 (PDT) From: Bin Meng To: Simon Glass , Stefan Roese , U-Boot Mailing List Date: Fri, 21 Apr 2017 07:24:41 -0700 Message-Id: <1492784689-15701-15-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1492784689-15701-1-git-send-email-bmeng.cn@gmail.com> References: <1492784689-15701-1-git-send-email-bmeng.cn@gmail.com> Subject: [U-Boot] [PATCH v2 14/22] x86: Adjust board_final_cleanup() order X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Call board_final_cleanup() before write_tables(), so that anything done in board_final_cleanup() on a normal boot path is also done on an S3 resume path. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- Changes in v2: None arch/x86/cpu/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index f86eaa9..c9fc7e4 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -205,6 +205,8 @@ __weak void board_final_cleanup(void) int last_stage_init(void) { + board_final_cleanup(); + #if CONFIG_HAVE_ACPI_RESUME void *wake_vector = acpi_find_wakeup_vector(); @@ -214,8 +216,6 @@ int last_stage_init(void) write_tables(); - board_final_cleanup(); - return 0; } #endif