From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE2FEC4338F for ; Mon, 2 Aug 2021 07:07:01 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3868A60F11 for ; Mon, 2 Aug 2021 07:07:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3868A60F11 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3411583357; Mon, 2 Aug 2021 09:06:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AC+umjie"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 131F48336C; Mon, 2 Aug 2021 09:06:53 +0200 (CEST) Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8108983357 for ; Mon, 2 Aug 2021 09:06:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-ed1-x535.google.com with SMTP id z11so655714edb.11 for ; Mon, 02 Aug 2021 00:06:48 -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:mime-version :content-transfer-encoding; bh=2jKIBESt0l0AVgjGbPCS+5MSU1EvT5Ic7g0z6UQzhic=; b=AC+umjie/xNipfbJm5qiVi8XpvqPtpNwjkUp7H//aaobmq2+jOeX9plfVnUhpLeBDl YYIOcas9PHFBbddbBRgVjpRBKAulEGdMzJQ4jFdCaRR9RLTP3Sz5CY5llPRCr2tBekgt loqWxgqvv/8dlqhAz4SndAPRk84OHoebAxwD0Em2f3Rz7pNwqLjfVcboF7PbwUsj3QYE gQiblTqZR8npm8sSqPbDp40k5xu0bU61yzYoAUMQv8pnI0VvaUuhOeGQhw3IvK6dobLK kNfN/goMYnSFELnhDkKhRuasn5o1RP+iGSsavy4hzawOxCU54kdipCDPVhtsnBxAhB4p Tx0g== 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:mime-version:content-transfer-encoding; bh=2jKIBESt0l0AVgjGbPCS+5MSU1EvT5Ic7g0z6UQzhic=; b=PW7RnyvbfkdHcEcwhLZNXO4QeSLmMjOL+I51iXbfzf8PClbYGCe0xqw/ZMPO2f62Lo 7drQJ+ujSZEFdy05DVTuAKGoD3n9LJzrBqHZ9+ibzuDUMZt+UVUm3uSnFyEbmkuRP6M2 AnakK7iUzk3y8yMwH+WwbFSUHLmTLHS7/Fyb6R1npT/Ik64xsBVbL8vSVz/bfOAV1BZ9 EllaDi4hsuRGQtzTTw77NjR4pWbhjLxN2YjqNvHcWb5VYRakNwkktyhlgfAZlAQXqbUI +rRt50lxI7oHt6ev2TfC7qjXI2PE1dxh7T/e5eWltiLonCRGYqkFEHAnIduh3xn/y33D Derw== X-Gm-Message-State: AOAM5309xi2xlkThlJFlmEmmRSxb9Q9FpWgp3prJpjWmklHZfJu9j3fk o9inlFEpqvimj7HGzjl+lqj/17Z0eM/ZnQ== X-Google-Smtp-Source: ABdhPJwetyZZL7NCKR2q1FlfYE5RIsHuGTaVA+K8ovvroVFd1VOpL8Nlfb60OZAulQ4yyYE39DvUHQ== X-Received: by 2002:a05:6402:b72:: with SMTP id cb18mr17291901edb.290.1627888008014; Mon, 02 Aug 2021 00:06:48 -0700 (PDT) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id b17sm1101824edd.27.2021.08.02.00.06.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 00:06:47 -0700 (PDT) From: Bin Meng To: u-boot@lists.denx.de, Simon Glass Subject: [PATCH v2 2/2] x86: fsp: Only FSP2 has INIT_PHASE_END_FIRMWARE Date: Mon, 2 Aug 2021 15:06:39 +0800 Message-Id: <20210802070639.758606-2-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210802070639.758606-1-bmeng.cn@gmail.com> References: <20210802070639.758606-1-bmeng.cn@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean For FSP1, there is no such INIT_PHASE_END_FIRMWARE. Move board_final_cleanup() to fsp2 directory. Fixes: 7c73cea44290 ("x86: Notify the FSP of the 'end firmware' event") Signed-off-by: Bin Meng --- Changes in v2: - Move board_final_cleanup() to fsp2 directory arch/x86/lib/fsp/fsp_common.c | 16 ---------------- arch/x86/lib/fsp2/fsp_common.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c index 6365b0a50a..82f7d3ab5f 100644 --- a/arch/x86/lib/fsp/fsp_common.c +++ b/arch/x86/lib/fsp/fsp_common.c @@ -61,22 +61,6 @@ void board_final_init(void) debug("OK\n"); } -void board_final_cleanup(void) -{ - u32 status; - - /* TODO(sjg@chromium.org): This causes Linux to crash */ - return; - - /* call into FspNotify */ - debug("Calling into FSP (notify phase INIT_PHASE_END_FIRMWARE): "); - status = fsp_notify(NULL, INIT_PHASE_END_FIRMWARE); - if (status) - debug("fail, error code %x\n", status); - else - debug("OK\n"); -} - int fsp_save_s3_stack(void) { struct udevice *dev; diff --git a/arch/x86/lib/fsp2/fsp_common.c b/arch/x86/lib/fsp2/fsp_common.c index f69456e43a..16567f9c85 100644 --- a/arch/x86/lib/fsp2/fsp_common.c +++ b/arch/x86/lib/fsp2/fsp_common.c @@ -11,3 +11,19 @@ int arch_fsp_init(void) { return 0; } + +void board_final_cleanup(void) +{ + u32 status; + + /* TODO(sjg@chromium.org): This causes Linux to crash */ + return; + + /* call into FspNotify */ + debug("Calling into FSP (notify phase INIT_PHASE_END_FIRMWARE): "); + status = fsp_notify(NULL, INIT_PHASE_END_FIRMWARE); + if (status) + debug("fail, error code %x\n", status); + else + debug("OK\n"); +} -- 2.25.1