From patchwork Tue Sep 22 18:45:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1369223 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=R7UJ/esc; 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 4BwrBn161zz9sTS for ; Wed, 23 Sep 2020 04:56:49 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 668BA826C4; Tue, 22 Sep 2020 20:49:19 +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="R7UJ/esc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 31AA2823F7; Tue, 22 Sep 2020 20:47:31 +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=-3.5 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-ot1-x342.google.com (mail-ot1-x342.google.com [IPv6:2607:f8b0:4864:20::342]) (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 B37998260D for ; Tue, 22 Sep 2020 20:47:15 +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-ot1-x342.google.com with SMTP id 95so9311136ota.13 for ; Tue, 22 Sep 2020 11:47:15 -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=1tMN5f1hK049JRAkXeCR1ZYAO/uocoD32V6NrVRAvSU=; b=R7UJ/escxr5+M4szWqYL4AU7tNQZfOzPfQNgzm1e33WAOg/vEuIAfB0PEBlrU/f3vQ EsMR8vk4QQ90BrFaOJF2W+mj7vUJa6Lk3KYUFFYmYIgc5tRGEqv4Vky/f2HiWn5WMLn3 Ow0r4QzagDpNHHKF6PIGY3gwfLdp8lKHHi2Bo= 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=1tMN5f1hK049JRAkXeCR1ZYAO/uocoD32V6NrVRAvSU=; b=Z/8B4JrhDDuCoUhf+AoMPnBQoYlccf4IXA1OBR0Q1gq4tWJpJ+QAAHjuXrOoh96a7W MxBWzGE9bBf+WFRUzFz6Yif0IbO7e4zFSucCWAq5fPyTHHLs6wtm6eIg79rF7gOS2enH DVXp8OrQmZ4LA6qskjCap1/2c9k/VHX47MfgyoApjgUGASbzTdojkFFdnjWNUe6Xo8BV rWEDTL9jELz6lMg4jvK1ccxJWfQW4mqZbUwz3L87GZhVqgQmzf/KyFBSublXgy2Alpnr b/D5uqeQ5PqY68J4aPHRN4dk8ccp/B46lN1sHoejdYphKu9vu4umjyAlT8ZAqDM+AmdE Boew== X-Gm-Message-State: AOAM532QKq+VjHR2SY/BhrU6hffepMa6WlOLB+ALX98o5/MY4XNolVLA emPBevKDN3Uf9mUPAIuh0qj80JXYJGfZrWEO X-Google-Smtp-Source: ABdhPJx5fqZf50DYADV2CkWbsOTuCmbjGHl99EiY2aaGo9HJmqXgEFCfoBUgbn+Z4ScCa5Rnf58wug== X-Received: by 2002:a9d:66d4:: with SMTP id t20mr3522580otm.133.1600800434350; Tue, 22 Sep 2020 11:47:14 -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 q24sm7622663oij.19.2020.09.22.11.47.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2020 11:47:13 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Andy Shevchenko , Wolfgang Wallner , Bin Meng , Bernhard Messerklinger , Simon Glass Subject: [PATCH v4 51/59] x86: apl: Check low-level init in FSP-S pre-init Date: Tue, 22 Sep 2020 12:45:36 -0600 Message-Id: <20200922184544.2920969-22-sjg@chromium.org> X-Mailer: git-send-email 2.28.0.681.g6f77f65b4e-goog In-Reply-To: <20200922184544.2920969-1-sjg@chromium.org> References: <20200922184544.2920969-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);