From patchwork Mon Feb 24 23:05:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 13989039 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 646B5C021B6 for ; Mon, 24 Feb 2025 23:07:45 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmhXU-0005sX-7C; Mon, 24 Feb 2025 18:07:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tmhXS-0005rR-BM for qemu-devel@nongnu.org; Mon, 24 Feb 2025 18:07:02 -0500 Received: from mail-io1-xd2d.google.com ([2607:f8b0:4864:20::d2d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tmhXQ-0007UW-FV for qemu-devel@nongnu.org; Mon, 24 Feb 2025 18:07:02 -0500 Received: by mail-io1-xd2d.google.com with SMTP id ca18e2360f4ac-855fc51bdfcso61601339f.0 for ; Mon, 24 Feb 2025 15:06:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740438419; x=1741043219; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=scYAFHQt+yZLnJPuXsDZJw8jiztjZtxUpNqeXfeVN2s=; b=SABw4C6JXdTIdqBHeRoHAExTAMIiWMzo/LJW5NUVRe+IozPysSApAHk1v+RDRP3WAu i6iO/Bb/YucPVWH6ohppjkTZlP+OTIcLmmw3/Mzu/y4FA043eytfaBkbQhl0kc2DPTEG Xh/IN+ujMIEGm/UJE+XR+FMDBQjSi6eWKB0W0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740438419; x=1741043219; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=scYAFHQt+yZLnJPuXsDZJw8jiztjZtxUpNqeXfeVN2s=; b=LRU+nq8lvaoylO6H8IOoNgjIGCe/EcAcocZZRjdQOR2ZC5X65ktOgVT/6ksPAFP2ed uRgJ1rB8DG9qXk4lD1Ua49JtFtYeiQh/dSwIR9wV/JzR4RP3cwtL0OM8kTB9nGILsWnD 54hDtHCGXh7sZHVtOom2sisLEC7SBzf3CiHUOX0KNtJczzdP5h+/fc4xAFXIuiSscVG9 9Wyc/hXsUw0nYdQ9J941NZ/3eYRVbeeQ13PxgSyjB/CnsCsoecTYZHVgSKsGdn6B30gq fk8+tdgRyJTPowUOoA/lZSq03sPvMH4zv+izWvTOE2C3dXHotmWskQ/ffBkw3kanOz9c yogw== X-Forwarded-Encrypted: i=1; AJvYcCUHa0FiRZqP+74ObLl9l+HpeQu/mrbcO2HdCY/5toufyr1H6nqB1vWjCNJ++IAmd5I9BUpmrwh0MR2A@nongnu.org X-Gm-Message-State: AOJu0YxdQn4UmyA4j9pu37ftwrRtBBYanaFE/82UT8YJ3I/J5uoIIL2c dh6YEaeFK/65N/ktnP+ioJYTiTDfCx5AisKK7nzOJ25O4MNp9RvfqQFnoYsUhw== X-Gm-Gg: ASbGncvNinYhE/gau8p3Jwt0X/Q2twCJXWvMRVORgDS2JJbGjxHH9doaX2W9eACrcBd kWfhmjGRTmms6Z1KQJxHdkRXIiDKmvJ1OsB8iIBqLkBxRKUdlhWlizhe6unA3MJLUDfrWaYZx0d FbOeDoicS66WyIAFjU1SDhfiS1JJW+1lhl45nsDoRE1509G3ArfIQGqaDK+R5tNWOitxX9OePKN fuRJvLW/6LQ/YG4fdveLU+u9hok0bRcQCC2n+c3fw/1BdYr09wKwf9Fg+PDk58TyRHrZtfzgwKr rcjrw33Y0Z0U24EIVK9KndBWPJ0SaRL/DRxDxlPDsGJfz22M/T+LAQ+WZJ+YvpE= X-Google-Smtp-Source: AGHT+IESzZuQ3xV1xK6PEf28VTHcQqfUJM+ii6gDMG9whtArFN0CXpZoszcI9vr/2XP8ZVa2fuTVFA== X-Received: by 2002:a05:6e02:1066:b0:3d1:54ce:a8f9 with SMTP id e9e14a558f8ab-3d2c027290emr172917405ab.10.1740438418802; Mon, 24 Feb 2025 15:06:58 -0800 (PST) Received: from chromium.org (c-73-203-119-151.hsd1.co.comcast.net. [73.203.119.151]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f04752e026sm113941173.107.2025.02.24.15.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 15:06:57 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Bin Meng , Simon Glass , Tom Rini , qemu-devel@nongnu.org Subject: [PATCH v3 02/44] x86: qemu: Switch to bochs display Date: Mon, 24 Feb 2025 16:05:51 -0700 Message-ID: <20250224230640.2665206-3-sjg@chromium.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250224230640.2665206-1-sjg@chromium.org> References: <20250224230640.2665206-1-sjg@chromium.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d2d; envelope-from=sjg@chromium.org; helo=mail-io1-xd2d.google.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.442, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The vesa display is widely used on hardware, but it is a bit of a pain with QEMU. It requires executing option ROMs, which either doesn't work with kvm, or is difficult to do in a kvm/QEMU-friendly way. THe bochs display is probably better anyway, so switch to that. It works fine with kvm as it doesn't need an option ROM. Signed-off-by: Simon Glass Fixes: https://source.denx.de/u-boot/custodians/u-boot-dm/-/issues/31 --- (no changes since v2) Changes in v2: - Redo commit message configs/qemu-x86_64_defconfig | 5 ++--- configs/qemu-x86_defconfig | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index af275e8ce8f..ff2a192ee7d 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -83,9 +83,8 @@ CONFIG_SYS_NS16550_PORT_MAPPED=y CONFIG_SPI=y CONFIG_USB_KEYBOARD=y CONFIG_CONSOLE_TRUETYPE=y -CONFIG_FRAMEBUFFER_SET_VESA_MODE=y -CONFIG_FRAMEBUFFER_VESA_MODE_USER=y -CONFIG_FRAMEBUFFER_VESA_MODE=0x144 +CONFIG_VIDEO_BOCHS=y +# CONFIG_VIDEO_VESA is not set CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_SPL_VIDEO=y # CONFIG_SPL_USE_TINY_PRINTF is not set diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index 0b0e10c795f..ee5b150e062 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -62,9 +62,8 @@ CONFIG_SYS_NS16550_PORT_MAPPED=y CONFIG_SPI=y CONFIG_USB_KEYBOARD=y CONFIG_CONSOLE_TRUETYPE=y -CONFIG_FRAMEBUFFER_SET_VESA_MODE=y -CONFIG_FRAMEBUFFER_VESA_MODE_USER=y -CONFIG_FRAMEBUFFER_VESA_MODE=0x144 +CONFIG_VIDEO_BOCHS=y +# CONFIG_VIDEO_VESA is not set CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_GENERATE_ACPI_TABLE=y # CONFIG_GZIP is not set From patchwork Mon Feb 24 23:05:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 13989044 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 468B7C021A4 for ; Mon, 24 Feb 2025 23:08:37 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmhXa-0005t5-19; Mon, 24 Feb 2025 18:07:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tmhXX-0005sg-QU for qemu-devel@nongnu.org; Mon, 24 Feb 2025 18:07:07 -0500 Received: from mail-il1-x130.google.com ([2607:f8b0:4864:20::130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tmhXS-0007Vc-My for qemu-devel@nongnu.org; Mon, 24 Feb 2025 18:07:07 -0500 Received: by mail-il1-x130.google.com with SMTP id e9e14a558f8ab-3d2f7257181so2878725ab.1 for ; Mon, 24 Feb 2025 15:07:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740438421; x=1741043221; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UBXnQzSJkDrutDwfAQ4rGuJkH23aeovCFlYOdDvXid8=; b=X0UKPus2/SYniXpwy5gL9PWcN31VSI4+TLyarsubPgqMck9XN+p4+wbU5rOT324VEJ 3FcKmQdfoWB7m2a5Zq0jzVFBS8cDavKZg4Q64tNvP6TvJ8LTOsSUobnLmcpCKDgx9BLb qLMzpCjXIhL0i/qtEKbkIRCEWhI3029n7Ihm8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740438421; x=1741043221; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UBXnQzSJkDrutDwfAQ4rGuJkH23aeovCFlYOdDvXid8=; b=Eb/vBfSXyPnd3lRKga2vJie71EKQC9VgQjji1+kUbs96vSpUdXlHHSDXwOg8lsWUI/ uljjxWbfC3bTuN9meFHdKnV52PGHMWUlPC4jYbguBsuFcZ1K4Oi1RQ0QgoUdmBz6SBUZ bnfoTEdkk0owohtYPfoL3Ob+3GMSP/ObZIG2y0uVejuCA1fvZNzvBOJHI8uYkBgEAvRr MiM8TdikzJnD8UoolhmvAqxksVcv182FQHHdVKr6IeE5Or+UhZVFdVz20OD/mWmzqFbg lIVqHS9vV0Nc/EhBDGigTqN4fpz38ZjEuQpGt1iqWmZz3E2YeHs24Z5qqzVvBrC12x1A VPqA== X-Forwarded-Encrypted: i=1; AJvYcCVNdhAb1Gk4b+WuNQljdg2MduhhicHWx06jgNzBfajdcUT3diFB+WNmY3J5LqzzXfQXYtAfbo+plaFN@nongnu.org X-Gm-Message-State: AOJu0YxbZYFeiGg6inHtDOktV/jBoORXXhMaVmYicv1w6e1h0tGb+Ovj ndD5+V4JW5eHZYDQ3zka51TDIMUGMx5BGfIzwN8V4TDX6N35p5ngWVVzvRFcgg== X-Gm-Gg: ASbGncvfml4oGx+xzjIUwtvx5Yr9jGNmg4S/bqr0I3ccXN6Wvc+firA/xMYcb0J83hf 8sWEcPDyosD3a8m39xCUZsaD06Q/VymlOACZ+zZBYtUPWqmkK9aVBjahSc3HQNCD+WLT8WQaDyW 3J2gAucj0jhPcI91JDEWH1t291BRVfLGKYygBGB0eNgPedsTGu7FR6639Np0ll4Zxuj4A99YJRT Jw46PIMYHl+Mk2S4J2PRHd7mgORhzqVnQYq1gGWibQ70VyaF4TR4jC+uGoT4zI1qTydZhV4gywP 0LI9XRv+W4+Vsq5aG75qsFFtQy/MATH9idBtP5C4VfC9/8+fI39vKXhmi3Go/nY= X-Google-Smtp-Source: AGHT+IFSb+pEHS3x7L/kHUkbhEPATcpEm/zxcvv7hUlNWHfESUt4vsg1VOOpXmfvLtMXm5ytGWqRzw== X-Received: by 2002:a05:6e02:23c1:b0:3cf:fb97:c313 with SMTP id e9e14a558f8ab-3d2caf01835mr179643675ab.18.1740438420777; Mon, 24 Feb 2025 15:07:00 -0800 (PST) Received: from chromium.org (c-73-203-119-151.hsd1.co.comcast.net. [73.203.119.151]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f04752e026sm113941173.107.2025.02.24.15.06.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 15:07:00 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Bin Meng , Simon Glass , Tom Rini , qemu-devel@nongnu.org Subject: [PATCH v3 03/44] x86: qemu: Enable dhrystone Date: Mon, 24 Feb 2025 16:05:52 -0700 Message-ID: <20250224230640.2665206-4-sjg@chromium.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250224230640.2665206-1-sjg@chromium.org> References: <20250224230640.2665206-1-sjg@chromium.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::130; envelope-from=sjg@chromium.org; helo=mail-il1-x130.google.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.442, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Provide the 'dhry' command, which helps to check that kvm is being used properly with QEMU. Signed-off-by: Simon Glass --- (no changes since v1) configs/qemu-x86_64_defconfig | 1 + configs/qemu-x86_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index ff2a192ee7d..84b7dc8e99f 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -89,4 +89,5 @@ CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_SPL_VIDEO=y # CONFIG_SPL_USE_TINY_PRINTF is not set CONFIG_GENERATE_ACPI_TABLE=y +CONFIG_CMD_DHRYSTONE=y # CONFIG_GZIP is not set diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index ee5b150e062..d52afa42955 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -66,4 +66,5 @@ CONFIG_VIDEO_BOCHS=y # CONFIG_VIDEO_VESA is not set CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_GENERATE_ACPI_TABLE=y +CONFIG_CMD_DHRYSTONE=y # CONFIG_GZIP is not set From patchwork Mon Feb 24 23:05:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 13989040 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 67FADC021B8 for ; Mon, 24 Feb 2025 23:07:45 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmhXb-0005tK-Fe; Mon, 24 Feb 2025 18:07:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tmhXZ-0005st-Jh for qemu-devel@nongnu.org; Mon, 24 Feb 2025 18:07:09 -0500 Received: from mail-il1-x133.google.com ([2607:f8b0:4864:20::133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tmhXX-0007XL-RS for qemu-devel@nongnu.org; Mon, 24 Feb 2025 18:07:09 -0500 Received: by mail-il1-x133.google.com with SMTP id e9e14a558f8ab-3d2f5a93a32so3989395ab.0 for ; Mon, 24 Feb 2025 15:07:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740438423; x=1741043223; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aSH50K2JoZy3b57Ten2+Yq1o4INV7m/qW+7NuVpQc3U=; b=T5z1q7rYRDf9Ri3yyVrKGM3ENsCVIE3yBy++VrmqOHXpG+1LzSYnPbc5RDrlXZnn2h vKx1DrFYjp6kYOcBE31gIq2DoUvmg0X3fZLe6kxgU5ZmTCGQ6VR6GAexNlKsQm8lZ7Vh nAXAmaNC/1CVDck/DaGdW+RJDuXvCZKKeexWI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740438423; x=1741043223; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aSH50K2JoZy3b57Ten2+Yq1o4INV7m/qW+7NuVpQc3U=; b=v5tAg0ut1LbtuUmfQJXghY5VuSHsp9vjJLun1LvPUtX95ZoafJHHOrRVpgdCS3BvUr gHDdatXUWgY4cMhN3xK0qoDxqJ2Hg5leka7323YJVyMMD6rP07VMKsEYE6C3LtQVZuaY 7e4bskRJ+vyH8B9CksTx/9lwzGelzVI7yhZZqTQ/TlGp1p/ZOg1A3gZrA7pKW0K1b1uk tNaJvrNV6QL8PeLLhxXOOzneirxVqny43mDKmqDfJi80iOHIpubG7UwV4b9NWCgOQPWF CIMO3my4YUPJ/MUrBgWg3l9xuP1T1Ni7Nt5UD5djcH62pXEZKC2x+iwjdXKBBEGf/Kua UjMg== X-Forwarded-Encrypted: i=1; AJvYcCWYIo2urRsYL1J2fv9dJTl0Q1WYZeODiLl7nZ6Zp9iRRgHZNTiMHUacHqJQRC8hoBBWoA1GLm1+Sbo5@nongnu.org X-Gm-Message-State: AOJu0YwGdIKFgVV0iK1OR81Oi5adkCOr8YByy8BYAqJ//tPmebTvdBe+ KdfSFgw7Dd7QiWCiMrpjUy7elX1qeyOqPsMP3mGFv0RcV+toLHZmziPT3mzOOg== X-Gm-Gg: ASbGncs/l4fv0qoqmauAXzEi7Xyo3YEgtrC1CdhBPGskmlAv9xjw41gO6OuItZbRvTy cjqGRwrIz3Wx6c4Bb4hdgLdcKTuiwUHCJlQGQ/28Gk1zJNZItv1H2LYLKbOtVFpJrdbXimblSFr LM4E8Yx8uiwLR2QAc/oDC+5JwZ479VbHORi7/74mB6rXqcYW11DRiD0UaHqAy4XVn8ZTX1/dInZ 6QMcOMCtTx0maUNEFs3CyHwLSH5RQD5IT7X5IqF9lgsTjdgMT7iUtFGIy6ENg6JOOd8tjm0Qh2m OJlGnzJ/lJWDiHPWvSyfWA++cg/PkV1GBFWNSRMwiF7BV58v1b7a5JgzuiPiilY= X-Google-Smtp-Source: AGHT+IFNct6lnzD/RZAZBeipW8gHFWGG2XuMfCVmS66pkePHPioDGJmUrm5ZiV/XCBnOKBRB9w0pMA== X-Received: by 2002:a05:6e02:16cb:b0:3d0:137a:8ca2 with SMTP id e9e14a558f8ab-3d2caf0dbeamr173540975ab.22.1740438423559; Mon, 24 Feb 2025 15:07:03 -0800 (PST) Received: from chromium.org (c-73-203-119-151.hsd1.co.comcast.net. [73.203.119.151]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f04752e026sm113941173.107.2025.02.24.15.07.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 15:07:02 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Bin Meng , Simon Glass , Andy Shevchenko , Tom Rini , qemu-devel@nongnu.org Subject: [PATCH v3 04/44] x86: qemu: Avoid accessing BSS too early Date: Mon, 24 Feb 2025 16:05:53 -0700 Message-ID: <20250224230640.2665206-5-sjg@chromium.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250224230640.2665206-1-sjg@chromium.org> References: <20250224230640.2665206-1-sjg@chromium.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::133; envelope-from=sjg@chromium.org; helo=mail-il1-x133.google.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.442, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org BSS is placed in DRAM which is actually available early with QEMU. But it is cleared by the init sequence, so values stored there are lost. Move the system-type flag into a function, instead. Signed-off-by: Simon Glass --- (no changes since v1) arch/x86/cpu/qemu/qemu.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c index 563f63e2bc8..e846ccd44aa 100644 --- a/arch/x86/cpu/qemu/qemu.c +++ b/arch/x86/cpu/qemu/qemu.c @@ -15,14 +15,21 @@ #include #include -static bool i440fx; - #if CONFIG_IS_ENABLED(QFW_PIO) U_BOOT_DRVINFO(x86_qfw_pio) = { .name = "qfw_pio", }; #endif +static bool is_i440fx(void) +{ + u16 device; + + pci_read_config16(PCI_BDF(0, 0, 0), PCI_DEVICE_ID, &device); + + return device == PCI_DEVICE_ID_INTEL_82441; +} + static void enable_pm_piix(void) { u8 en; @@ -50,16 +57,17 @@ static void enable_pm_ich9(void) void qemu_chipset_init(void) { - u16 device, xbcs; + bool i440fx; + u16 xbcs; int pam, i; + i440fx = is_i440fx(); + /* * i440FX and Q35 chipset have different PAM register offset, but with * the same bitfield layout. Here we determine the offset based on its * PCI device ID. */ - pci_read_config16(PCI_BDF(0, 0, 0), PCI_DEVICE_ID, &device); - i440fx = (device == PCI_DEVICE_ID_INTEL_82441); pam = i440fx ? I440FX_PAM : Q35_PAM; /* @@ -123,7 +131,7 @@ int mp_determine_pci_dstirq(int bus, int dev, int func, int pirq) { u8 irq; - if (i440fx) { + if (is_i440fx()) { /* * Not like most x86 platforms, the PIRQ[A-D] on PIIX3 are not * connected to I/O APIC INTPIN#16-19. Instead they are routed From patchwork Mon Feb 24 23:06:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 13989042 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BDEDCC021A4 for ; Mon, 24 Feb 2025 23:08:09 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmhYN-0006Ee-PS; Mon, 24 Feb 2025 18:08:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tmhYJ-00068N-Hv for qemu-devel@nongnu.org; Mon, 24 Feb 2025 18:07:56 -0500 Received: from mail-il1-x129.google.com ([2607:f8b0:4864:20::129]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tmhYH-0007eM-Oi for qemu-devel@nongnu.org; Mon, 24 Feb 2025 18:07:55 -0500 Received: by mail-il1-x129.google.com with SMTP id e9e14a558f8ab-3cf8e017abcso17287955ab.1 for ; Mon, 24 Feb 2025 15:07:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740438471; x=1741043271; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YBw5RnVhttKdF2Qo8bwI9+KLvnZSt3HCKA4Su8eQKxU=; b=B9H6WcSl2ILnhxox4HI7L3mGAtI0gfGWODW73qTPS3QP3zfB1bMACBgdAcjNfwpLJD DE52O8r+BLHgIsSsUp4+MPh6k6EGRVjzQPv6f7a65FRtJ53KkFKdRmfpYgQz8ZA6JqOx GgBNWvTWzRiQ9ISxkLK1kqQv/53RGYv6edeeo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740438471; x=1741043271; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YBw5RnVhttKdF2Qo8bwI9+KLvnZSt3HCKA4Su8eQKxU=; b=AZgVIKm0ic5Q/0nz4JFZ4eiG3FE+ruk4namCgI1hG/f7Oz7m+/I95QFGtXxT1pfyVr UN12VXSNf96gkOO95aZM/XxpLtI2Cz9jYDWY4PIwXJZB3ZawPswSrox+x3ZlbJXk+F3L owdpwoho3aIn8fyQHdY4msIiSIYJYWkOn2uqvoXoOsLBGOnD7M5DAZbdiKRWJ9Qg7tez gZIhgLPHyzoml9MlMjvF2PF7oTWte2PFAa+hjpAZkZqvgSUD9ubSl8or/Dmlh8bBNyvy GolKZy6kGXlY77e1IJjLZXk+EkkvFLiId8Ir+gUzFs1XDIunmIeXtZMe+Bjh8YVdZ4T+ 7udg== X-Forwarded-Encrypted: i=1; AJvYcCUoSbd2yTkeEEHJ/woOopSyt3DTubI1YdIeCygbeVJCZ4S83FPN4nEbXLlzzQHYFmES9ijv2x8/nR/h@nongnu.org X-Gm-Message-State: AOJu0YwckqnD1LX9yOj3NS6OhaSvH7ec7Rw30BYtK5bFCBIDeEfV9UZD IXOzr8Sw4Qtk86eiMTfT/MZZBbvYVfZqSGJjiUN7XxxqsqaELyJUli5nCsYJtA== X-Gm-Gg: ASbGncsou9llmRuZcHcqy7cY5/ipqAE4Eos44h5Qvj9Tn+ZNjnR+29EoJXoewfmtMCS YwhitZR9f48pRVPkO0i8XPt1Gpjtf5TBZDHetdrV7jsX3zb/2g/LPkmF7C4aJWiuNrgVIDLcku5 5Ubni1MxMek0R+nxfozh+5/zWfhjl8OPSjmH55mH6u1FJnyNGr7iFSs16Nmb5bRq0RDEwlDD9Zg lCF1X0TwTuHNBueSSVIfiw0ZoAwCEotcG8YQsg10QIRjQDNC/6RDwjotz6arjS8T/0G8fsaT+b+ J4da6N5R+yiGGls0KNNNIUT2w/dU6GyPG1cOURc31S69Ri0SLRDrOLZZv4lnsEk= X-Google-Smtp-Source: AGHT+IGJ0PyYA7aN2H+Wd3AUmLTHv4nsQ7t+eBZtCay/PdzBHbeJLHh3U9MgQnXeG1vnXSkUazdOJg== X-Received: by 2002:a05:6e02:b2a:b0:3ce:78e5:d36d with SMTP id e9e14a558f8ab-3d2fc0ea5camr16148325ab.12.1740438471564; Mon, 24 Feb 2025 15:07:51 -0800 (PST) Received: from chromium.org (c-73-203-119-151.hsd1.co.comcast.net. [73.203.119.151]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f04752e026sm113941173.107.2025.02.24.15.07.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 15:07:50 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Bin Meng , Simon Glass , Tom Rini , qemu-devel@nongnu.org Subject: [PATCH v3 26/44] x86: qemu: Support environment and cat command Date: Mon, 24 Feb 2025 16:06:15 -0700 Message-ID: <20250224230640.2665206-27-sjg@chromium.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250224230640.2665206-1-sjg@chromium.org> References: <20250224230640.2665206-1-sjg@chromium.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::129; envelope-from=sjg@chromium.org; helo=mail-il1-x129.google.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.442, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UPPERCASE_50_75=0.008 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Add support for an environment stored in the first partition of the disk, which is assumed to hold a FAT filesystem. Support the 'cat' command as it is useful for looking at extlinux.conf files. Signed-off-by: Simon Glass --- (no changes since v1) configs/qemu-x86_64_defconfig | 6 ++++-- configs/qemu-x86_defconfig | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index 84b7dc8e99f..ae34cc2a6f8 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -41,9 +41,7 @@ CONFIG_SPL_NO_BSS_LIMIT=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_CPU=y -CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_DM_SPI_FLASH=y -CONFIG_SPL_NET=y CONFIG_SPL_PCI=y CONFIG_SPL_PCH=y CONFIG_SPL_RTC=y @@ -54,6 +52,7 @@ CONFIG_CMD_MEM_SEARCH=y CONFIG_CMD_IDE=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y +CONFIG_CMD_CAT=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_BOOTFILESIZE=y CONFIG_CMD_EFIDEBUG=y @@ -61,6 +60,9 @@ CONFIG_CMD_TIME=y CONFIG_CMD_BOOTSTAGE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_FAT=y +CONFIG_ENV_FAT_INTERFACE="virtio" +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_USE_BOOTFILE=y CONFIG_BOOTFILE="bzImage" diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index d52afa42955..7afa3827e61 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -34,6 +34,7 @@ CONFIG_CMD_MEM_SEARCH=y CONFIG_CMD_IDE=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y +CONFIG_CMD_CAT=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_BOOTFILESIZE=y CONFIG_CMD_EFIDEBUG=y @@ -42,6 +43,9 @@ CONFIG_CMD_BOOTSTAGE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_MAC_PARTITION=y CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_FAT=y +CONFIG_ENV_FAT_INTERFACE="virtio" +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_USE_BOOTFILE=y CONFIG_BOOTFILE="bzImage" From patchwork Mon Feb 24 23:06:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 13989043 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EA669C021B6 for ; Mon, 24 Feb 2025 23:08:36 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmhYa-0006bV-53; Mon, 24 Feb 2025 18:08:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tmhYW-0006YJ-UY for qemu-devel@nongnu.org; Mon, 24 Feb 2025 18:08:09 -0500 Received: from mail-il1-x12d.google.com ([2607:f8b0:4864:20::12d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tmhYU-0007hD-B0 for qemu-devel@nongnu.org; Mon, 24 Feb 2025 18:08:08 -0500 Received: by mail-il1-x12d.google.com with SMTP id e9e14a558f8ab-3d284b9734fso44177455ab.2 for ; Mon, 24 Feb 2025 15:08:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740438484; x=1741043284; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WPqq8WYaPj6J2IwBDMowPX92na6feXUAfjpPv3BrLRw=; b=CtYuJ3i4w9CX/qx3irDD0XWFVAbIYbi0YflD64DRrdVckj+QJiMRbbl3BpppVL5zdO ZMJTb4McJbn1GMuc7ZTxPBDYL7kqOYqiG3xAW/KZAlmQscP+CAfIXsWtRNG/lAgzuGf3 0wwGY3YXkjgIrSL+ZiEV6w9Jw4EtBaEGHt7lQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740438484; x=1741043284; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WPqq8WYaPj6J2IwBDMowPX92na6feXUAfjpPv3BrLRw=; b=q74lBRlj+8c2unJnfElEKlZVayUJTWTxCXuUgmyvXuXnUv2LUj2j+1qW+OCNUAQHT+ RwqYNUpQXMTxp7xxr3vkpUHgfi1xrI1ZwNE8MgC9ayxuYrNhEx6VLNlpXoyqazVBGB0p v2sDooh/LEPsQLgTgQj3hH9Lu+fMyDoLgT4jWyhufoarwKWJvG8yOKHoGeibdqu3X7Hw BIhnh/r/+ZEVU8im+FQDJOpYun4SQf86ednegPuAIUsdImpew0aE9BXzqvvI3qnyywei Zm2iWVnq6t+zbgaWGxXn5O1sW0kj4GsKb0ad9avvwIzehPgCwwuOczEgsXpT3LpZSMDB Sf8Q== X-Forwarded-Encrypted: i=1; AJvYcCV66+yqL5k2WDOe8Colk/cVF0jiQeiIm95jwFGz7lYVvGvJmUQsHou2TwUVWL9Q0fYOIle9IWwick54@nongnu.org X-Gm-Message-State: AOJu0Yx6rr8P9FURg8TrrUBB9mQKIbH9j8tgu53FWAKQcVpTL+qL2t04 hIsUaYvBBXPbs+mLs4WBDEK31b25jTi6ycP1rW8OOgR1KgXORhzGJCNcF0I9bw== X-Gm-Gg: ASbGncthEvymVQjNXsbrN84PE0x53PRpmN+aY/bk5NDA4N7CjbthovKplacDC+Vge6j WJxpPLOfpCqGPHZ+617AwVCJA+S8lEccDTPeCxUiZ+Rhs9klQSCu9tYd2Fx345m454h+Yt2eVu/ bBM5j89hOrQ8n5jpbq//Ywgxs66dGV4EA/szSFZfI86Lo2UwwrW5e52bh9vzlCNma8DzVpfKFqr BjVeI77AEySLExzgRxrRMtBWpun0X8R4PJpa66pz9K3Prt/eM4c4GJ+sBppzN/D6ezr7Eyf9b5S AsfdUU0kHjpoYvqN+HOayfiLlSG+svGazB9BRQFps/Lr9oIrWOn1al4j8dVlYtg= X-Google-Smtp-Source: AGHT+IGHuENz4NSG2YP3MtyNHiMYnYsoBcaBZ+4DIs/SSPItUKJyfRJV3Nh4u0OHC1KyNa9T9uFUxQ== X-Received: by 2002:a05:6e02:12e8:b0:3d2:aa73:7b65 with SMTP id e9e14a558f8ab-3d2cae699b6mr137167905ab.6.1740438484667; Mon, 24 Feb 2025 15:08:04 -0800 (PST) Received: from chromium.org (c-73-203-119-151.hsd1.co.comcast.net. [73.203.119.151]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f04752e026sm113941173.107.2025.02.24.15.08.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 15:08:03 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Bin Meng , Simon Glass , Tom Rini , qemu-devel@nongnu.org Subject: [PATCH v3 32/44] x86: qemu: Use the new e820 API Date: Mon, 24 Feb 2025 16:06:21 -0700 Message-ID: <20250224230640.2665206-33-sjg@chromium.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250224230640.2665206-1-sjg@chromium.org> References: <20250224230640.2665206-1-sjg@chromium.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::12d; envelope-from=sjg@chromium.org; helo=mail-il1-x12d.google.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.442, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Move over to use this API before making the code even more complicated. Signed-off-by: Simon Glass --- Changes in v3: - Add new patch to use the new e820 API arch/x86/cpu/qemu/e820.c | 48 ++++++++++------------------------------ 1 file changed, 12 insertions(+), 36 deletions(-) diff --git a/arch/x86/cpu/qemu/e820.c b/arch/x86/cpu/qemu/e820.c index 17a04f86479..2b0ad179489 100644 --- a/arch/x86/cpu/qemu/e820.c +++ b/arch/x86/cpu/qemu/e820.c @@ -19,51 +19,27 @@ unsigned int install_e820_map(unsigned int max_entries, struct e820_entry *entries) { u64 high_mem_size; - int n = 0; + struct e820_ctx ctx; - entries[n].addr = 0; - entries[n].size = ISA_START_ADDRESS; - entries[n].type = E820_RAM; - n++; + e820_init(&ctx, entries, max_entries); - entries[n].addr = ISA_START_ADDRESS; - entries[n].size = ISA_END_ADDRESS - ISA_START_ADDRESS; - entries[n].type = E820_RESERVED; - n++; + e820_next(&ctx, E820_RAM, ISA_START_ADDRESS); + e820_next(&ctx, E820_RESERVED, ISA_END_ADDRESS); /* * since we use memalign(malloc) to allocate high memory for * storing ACPI tables, we need to reserve them in e820 tables, * otherwise kernel will reclaim them and data will be corrupted */ - entries[n].addr = ISA_END_ADDRESS; - entries[n].size = gd->relocaddr - TOTAL_MALLOC_LEN - ISA_END_ADDRESS; - entries[n].type = E820_RAM; - n++; - - /* for simplicity, reserve entire malloc space */ - entries[n].addr = gd->relocaddr - TOTAL_MALLOC_LEN; - entries[n].size = TOTAL_MALLOC_LEN; - entries[n].type = E820_RESERVED; - n++; - - entries[n].addr = gd->relocaddr; - entries[n].size = qemu_get_low_memory_size() - gd->relocaddr; - entries[n].type = E820_RESERVED; - n++; - - entries[n].addr = CONFIG_PCIE_ECAM_BASE; - entries[n].size = CONFIG_PCIE_ECAM_SIZE; - entries[n].type = E820_RESERVED; - n++; + e820_to_addr(&ctx, E820_RAM, gd->relocaddr - TOTAL_MALLOC_LEN); + e820_next(&ctx, E820_RESERVED, TOTAL_MALLOC_LEN); + e820_to_addr(&ctx, E820_RAM, qemu_get_low_memory_size()); + e820_add(&ctx, E820_RESERVED, CONFIG_PCIE_ECAM_BASE, + CONFIG_PCIE_ECAM_SIZE); high_mem_size = qemu_get_high_memory_size(); - if (high_mem_size) { - entries[n].addr = SZ_4G; - entries[n].size = high_mem_size; - entries[n].type = E820_RAM; - n++; - } + if (high_mem_size) + e820_add(&ctx, E820_RAM, SZ_4G, high_mem_size); - return n; + return e820_finish(&ctx); }