From patchwork Sun Sep 6 21:43:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1358506 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=85.214.62.61; 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=kdgOHUkB; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4Bl4tR6ZW8z9sSn for ; Mon, 7 Sep 2020 07:53:51 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3966E824EB; Sun, 6 Sep 2020 23:45:38 +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="kdgOHUkB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9FB4E82465; Sun, 6 Sep 2020 23:45:06 +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-xd41.google.com (mail-io1-xd41.google.com [IPv6:2607:f8b0:4864:20::d41]) (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 64D1A82450 for ; Sun, 6 Sep 2020 23:45:02 +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-xd41.google.com with SMTP id z25so12164382iol.10 for ; Sun, 06 Sep 2020 14:45:02 -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=v5FhGJyC9epBU9lX8RH4zZ8PtjO/B3bBQRIanMru+8c=; b=kdgOHUkBW4X1jWtfTEJOjgiMYR8HxJ5JUenU6pHAObg/onSxsQXAvZ4jsjpIhfFum5 zjCZU6h5z5Cf9BCfjBUycOLNUIW3dyAjIFI0lO+LJdliXykHqlBA1eQLOTZd2OqOu//x Ne21OKg3jJbrQL29aSSP92viTBcCYyDimphQ8= 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=v5FhGJyC9epBU9lX8RH4zZ8PtjO/B3bBQRIanMru+8c=; b=QEJIH9oksyizTsfuEyo3UF2Bg6Dci8XCcowO1gbMuFv82/zCGGkIdjrN1wU+LXT3yU 95v7rAxu9EovGL9m6EPY5/7lksCnDwJ3wWPqKq83adWZ4Q2LMY7CfZh4suY1AqsGbVlh 8KWPL7uKUl1VdmR3Z7HfT9N5XPlT/DTW3yb7s9z4c2BEi+ns8HmbxYBxsHWUxS7/GF+x qRlsL4JO/shuXTuLPCSOH2mKkSkzKcuw2F3BvVAtxTiADm6F/ba0MR+q95ndHzgh9olx sR2H1SdJav4FkbFlKLiyyQcOjP+ITdbEpen8zwqhAa7MNtoCo0NSG5TzsvMG7XNi5vMi MYcQ== X-Gm-Message-State: AOAM533G7bEgRW3INPJAiDk4X38jcYG2S8YZV5DHfCby8FtqJerulBoQ hoTXF8XLRnsIG0jCdVria2PE/y4U8HKN9uQ2 X-Google-Smtp-Source: ABdhPJzRJjYEdfCxKEZTWtA/l/xxfISZvUbqhkiBr7WABL/E+U2u1LVcQOtpNxLE1bIkC0Xq3gu03Q== X-Received: by 2002:a05:6602:58c:: with SMTP id v12mr15109099iox.110.1599428701215; Sun, 06 Sep 2020 14:45:01 -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 w13sm6232663iox.10.2020.09.06.14.45.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Sep 2020 14:45:00 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Wolfgang Wallner , Bin Meng , Bernhard Messerklinger , Andy Shevchenko , Simon Glass Subject: [PATCH v3 51/57] x86: apl: Check low-level init in FSP-S pre-init Date: Sun, 6 Sep 2020 15:43:59 -0600 Message-Id: <20200906214405.71632-17-sjg@chromium.org> X-Mailer: git-send-email 2.28.0.526.ge36021eeef-goog In-Reply-To: <20200906214405.71632-1-sjg@chromium.org> References: <20200906214405.71632-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 U-Boot is not running FSP-S it should not do the pre-init either. Add a condition to handle this. Signed-off-by: Simon Glass --- (no changes since v1) arch/x86/cpu/apollolake/fsp_s.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c index e54b0ac1047..715ceab6ac7 100644 --- a/arch/x86/cpu/apollolake/fsp_s.c +++ b/arch/x86/cpu/apollolake/fsp_s.c @@ -157,6 +157,8 @@ int arch_fsps_preinit(void) struct udevice *itss; int ret; + if (!ll_boot_init()) + return 0; ret = irq_first_device_type(X86_IRQT_ITSS, &itss); if (ret) return log_msg_ret("no itss", ret);