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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 2F7D5C433F5 for ; Sat, 4 Dec 2021 16:04:28 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0AD1182F63; Sat, 4 Dec 2021 17:04:26 +0100 (CET) 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="YBrR34iN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DC53982F03; Sat, 4 Dec 2021 17:04:22 +0100 (CET) Received: from mail-ot1-x335.google.com (mail-ot1-x335.google.com [IPv6:2607:f8b0:4864:20::335]) (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 43C15830DC for ; Sat, 4 Dec 2021 16:57:36 +0100 (CET) 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-x335.google.com with SMTP id x3-20020a05683000c300b0057a5318c517so7578862oto.13 for ; Sat, 04 Dec 2021 07:57:36 -0800 (PST) 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=ExkwGQHIkBhYl/MRxGC7xA1Y9+hn3u9N2axN69VJuhQ=; b=YBrR34iNfhTPhONEzjxpHblWw+mPE0SDuuSAobJBiGFTqTZPPLRD7k4iIMnU0ucmjk w5NYZJy9DnXha3V/wzGqXaS0+cQ/iOJaAdHFgUjRI2UE1UTpi1nrZ6a4LEnXwKXNHqux b45q/DMF03QfXT0h7yYrkKt7oJKK3pZiJUZnA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ExkwGQHIkBhYl/MRxGC7xA1Y9+hn3u9N2axN69VJuhQ=; b=VG4qurbkpcY6sSCIh/NSFgKLElJKee6fgwpI9vC16mXaWvJOxZy8qnTUK5DY0p3eBU 6uouZ/TZdJ6fcnWTqFnZNYPt1vJGv26Fl5wVnEryQ1U8+/CL962hBNcbx9fG2JAjoPG8 +daRY9QiqLVTZfpHSaiy/iMqBtr4Q0CjLa55PepehQQLkqriQO7+J8whLqdbjBdyf/76 ZyiolXNv6iOdvKvp3ddBMj8oGR0FaZC8C5rb9PK3KRaVeve8TGKUoQn5Wq6FXLFlqpjo wjQuB6Wjldg19qUemBFd0otSUuNITno8RlUzMhdXeobq4734Hg1wJO6veyCPFgTAK5RV gN7Q== X-Gm-Message-State: AOAM532ewwQT7glOs+h50nL4MRi0x1ahOnDJFhM58tNzxTnr83tU24b8 VEe10VWquylGmmkk+8D8iW+cI4+hQMp53Q== X-Google-Smtp-Source: ABdhPJxmeSWviXkNr1GrbfJPwfPxp69QOB3m+5oKyxtV1oo+2jwKy9yTpJ45D7Cb2ybzL04EdLiOTw== X-Received: by 2002:a05:6830:1008:: with SMTP id a8mr21903205otp.373.1638633454794; Sat, 04 Dec 2021 07:57:34 -0800 (PST) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id a12sm1230513otk.35.2021.12.04.07.57.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Dec 2021 07:57:34 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Ilias Apalodimas , Christian Melki , Bin Meng , Heinrich Schuchardt , Tom Rini , Simon Glass , Alexander Graf Subject: [PATCH v5 23/28] x86: efi: Don't set up global_data again with EFI Date: Sat, 4 Dec 2021 08:56:52 -0700 Message-Id: <20211204085647.v5.23.I8106c6bf199fd2c7ec7ba51f3cd19b917f195e73@changeid> X-Mailer: git-send-email 2.34.1.400.ga245620fadb-goog In-Reply-To: <20211204155657.2913911-1-sjg@chromium.org> References: <20211204155657.2913911-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 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 Since EFI does not relocate and uses the same global_data pointer throughout the board-init process, drop this unnecessary setup, to avoid a hang. Signed-off-by: Simon Glass --- Changes in v5: - Add new patch to avoid setting up global_data again with EFI common/board_r.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index 31a59c585a8..8b5948100b1 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -817,9 +817,8 @@ void board_init_r(gd_t *new_gd, ulong dest_addr) * TODO(sjg@chromium.org): Consider doing this for all archs, or * dropping the new_gd parameter. */ -#if CONFIG_IS_ENABLED(X86_64) - arch_setup_gd(new_gd); -#endif + if (CONFIG_IS_ENABLED(X86_64) && !IS_ENABLED(CONFIG_EFI_APP)) + arch_setup_gd(new_gd); #ifdef CONFIG_NEEDS_MANUAL_RELOC int i; -- 2.34.1.400.ga245620fadb-goog