From patchwork Fri Jul 17 03:22:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1330692 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=BrCtt3iH; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B7Gfs3Btbz9sRW for ; Fri, 17 Jul 2020 13:23:33 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 686C381C1A; Fri, 17 Jul 2020 05:23:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="BrCtt3iH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9337781C17; Fri, 17 Jul 2020 05:22:57 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd42.google.com (mail-io1-xd42.google.com [IPv6:2607:f8b0:4864:20::d42]) (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 D897B81BFF for ; Fri, 17 Jul 2020 05:22:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd42.google.com with SMTP id v6so8940728iob.4 for ; Thu, 16 Jul 2020 20:22:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U7NtcUCowghSufaTuhS1d3X5AVvyIiAdwBs8/0pfYDs=; b=BrCtt3iHc2gpqL6XPDQF08qOoQ1DhzqZ7RMwp8yDP+QSnpTaV7MZSylQrUQ++HrIzb mCj7Brh1Cvj03+ng/B7CaMd1N1HFoCdzEXw0i+/fcjI76MW77+wCDJvddsz22ye8Qzyy AZcgFURvUmdkeuvjAAoICG/2UlxRReDAHUIyc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U7NtcUCowghSufaTuhS1d3X5AVvyIiAdwBs8/0pfYDs=; b=aPQvDr4RmhLiw5Kx8Zzw8D283s+1UAUisICJTe2wu6qWj7LnQpHdaLwo3P++89H5TC rXSBYCme2w8La5pwEb9wv6vzGgE50TEzt3u4wNbRl6VJlyHQcrDqTECxXmTQld89Re1G PEEdU8MmqE/kqG6/9nPfkkc7oa6wY9sS6qPl4AfL5UpzsHk2Eunc3AYNcNa1QxkFAps7 sAJnNBWPS34EyJ3R9DhSKznPaejfRUCoAt0SbPmRVenLR2UL4XKrG+ktFdLEZ6DnDygJ PpUxD42OiMZAxHkGPd5LV+MdFnkYDCGGYIMvaV53R6rXo9nxfGyxZZkVSvR4fN5KvIHJ 4OAQ== X-Gm-Message-State: AOAM531tTbOB//6QVgqhFkCHu24ur8z6dMfs83+fKzhMOzL48NY4e0Bb jryN/2HQnIYE58KKQ9bJ3Q90rV935M8EQQ== X-Google-Smtp-Source: ABdhPJxKIdyp6cyxUxpWHBlisItMKBNVVhnAYis9KVO+ZDby367QI5PYt3yCXKupjzGPRy1Coo+hzw== X-Received: by 2002:a92:7949:: with SMTP id u70mr7900574ilc.88.1594956172650; Thu, 16 Jul 2020 20:22:52 -0700 (PDT) Received: from localhost.localdomain (c-73-14-175-90.hsd1.co.comcast.net. [73.14.175.90]) by smtp.gmail.com with ESMTPSA id 28sm3790693ilv.17.2020.07.16.20.22.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2020 20:22:52 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Wolfgang Wallner , Bin Meng , Andy Shevchenko , Simon Glass Subject: [PATCH v3 03/10] x86: apl: Set the correct boot mode in the FSP-M code Date: Thu, 16 Jul 2020 21:22:32 -0600 Message-Id: <20200717032239.197695-2-sjg@chromium.org> X-Mailer: git-send-email 2.28.0.rc0.105.gf9edc3c819-goog In-Reply-To: <20200717032239.197695-1-sjg@chromium.org> References: <20200717032239.197695-1-sjg@chromium.org> MIME-Version: 1.0 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.102.3 at phobos.denx.de X-Virus-Status: Clean If there is MRC information we should run FSP-M with a different boot_mode flag since it is supposed to do a 'fast path' through the memory init. Fix this. Signed-off-by: Simon Glass Reviewed-by: Wolfgang Wallner Reviewed-by: Bin Meng --- (no changes since v2) Changes in v2: - Add a new commit to handle the boot_mode fix arch/x86/cpu/apollolake/fsp_m.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/cpu/apollolake/fsp_m.c b/arch/x86/cpu/apollolake/fsp_m.c index 65461d85b8..e19a2b0826 100644 --- a/arch/x86/cpu/apollolake/fsp_m.c +++ b/arch/x86/cpu/apollolake/fsp_m.c @@ -26,7 +26,8 @@ int fspm_update_config(struct udevice *dev, struct fspm_upd *upd) return log_msg_ret("mrc", cache_ret); arch->stack_base = (void *)0xfef96000; arch->boot_loader_tolum_size = 0; - arch->boot_mode = FSP_BOOT_WITH_FULL_CONFIGURATION; + arch->boot_mode = cache_ret ? FSP_BOOT_WITH_FULL_CONFIGURATION : + FSP_BOOT_ASSUMING_NO_CONFIGURATION_CHANGES; node = dev_ofnode(dev); if (!ofnode_valid(node))