From patchwork Thu Mar 6 16:03:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 14004788 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 B8673C282D1 for ; Thu, 6 Mar 2025 16:07:53 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tqDj1-0006MM-E3; Thu, 06 Mar 2025 11:05:32 -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 1tqDiT-0005yS-OW for qemu-devel@nongnu.org; Thu, 06 Mar 2025 11:05:01 -0500 Received: from mail-io1-xd32.google.com ([2607:f8b0:4864:20::d32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqDiR-00085Z-QX for qemu-devel@nongnu.org; Thu, 06 Mar 2025 11:04:57 -0500 Received: by mail-io1-xd32.google.com with SMTP id ca18e2360f4ac-855bd88ee2cso18976939f.0 for ; Thu, 06 Mar 2025 08:04:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1741277094; x=1741881894; 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=MMqV2vSsL2Mix+hSRlId9lnywzdUNH/PJiq4oXr/0FGpfD8TZ61Fxbng7OGtUmwcSx 47OWj+dAJFUup62cPmCV6ok6OM9I6x9XBV5/bRMFfZDy842A/MI5tDMPJOU2/GTvHFFA sR7Y3CDdk7LpelocMG1RdH34ezAFZHdPrt8gc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741277094; x=1741881894; 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=E51f/uePjond7oXA7afhQOtGjgTEeqGcLtMCqwCXI5bEJu2XM/qT/HDTFEjyntQIxy DrFnfRpWPFfa6cTQ63x+gI2c/xgnD8gM+HvvLEaqJHtyVaD5NQAiAwi/b/i6w0dsMZCA xHn7n9n8od8yto/lgVkkmtxDqCZsTfx/SeB4o/br4LD/vifmp0JD2ABn8wqKss6jx25L 0LmePMFWjgSZBRHI7q84+7I1HqXihaHhzbKsuFLlCf/Zg++A2ar905xPHHa2KjTHDD2A DIDZ9XPvcSEC7Il3CIPlfoVXt30TgidExL/x7iaG/yQnJ03xaI04zzXuVcON5eN3IyDi HiDg== X-Forwarded-Encrypted: i=1; AJvYcCUCVEErf1mAiHdxVZJlwMCuFVqUfkyw4b3L9z3ZEEL2cS69h3R+kVI49+pmE9J4hyvxIEarbURNqyTp@nongnu.org X-Gm-Message-State: AOJu0Yzbc2jqBjinhRRmFIcOVjjbj6fFVaUTSn6NmsRWNZeCqP5k2fxP sQL85dTpcL2CYVSprtU7Vh1wYRu/4qXKdv+/iYqZ4d7RUed7dZL667f9TrwQng== X-Gm-Gg: ASbGncuYxWdiBfxuBJMeLn753EI1cMwCeYfJQVd1DZ37eyNs3Q2+Ci6mGjninK5RIlk IK2hLeYdHGjRCU1E278wPb77QNWTJpnFtbTGtlWwoyaYo9V+bVgkZJq6o3tzVmHBMHeez19YuWl 5yYrrAEhrVsDO3Wv1mTO4BFnqwTKeDJymUYPaafSAM5IUdiz35Nrm6Rl9WM5jfMKSrzNAOj4vk6 HXm4ii/NbfCle80FX9YMBgIMJkIoT993VeLGoeBkOAS1Wnv2TjcLfxvlWUdVTRbDKsw+yVlnzeN CxpX30DxwKmCL4PF+zJU3HsuB6s6ayw4uAfVxodgCAxD3Hdz4LQuaQ80KelOqm43n7FnaZQdvrn B2SBBpA== X-Google-Smtp-Source: AGHT+IGrDhWIuTeARQoX0n52NIjXDCU4PV3dfKlAoDGi0UFWbweufFaR2W6GRjviMc5psIKMzaJb6w== X-Received: by 2002:a05:6602:474d:b0:855:b345:4893 with SMTP id ca18e2360f4ac-85affbb4dc7mr888719739f.13.1741277093043; Thu, 06 Mar 2025 08:04:53 -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-4f213b959c1sm46759173.38.2025.03.06.08.04.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Mar 2025 08:04:51 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Bin Meng , Simon Glass , Tom Rini , qemu-devel@nongnu.org Subject: [PATCH v4 04/47] x86: qemu: Switch to bochs display Date: Thu, 6 Mar 2025 09:03:31 -0700 Message-ID: <20250306160428.3041057-5-sjg@chromium.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250306160428.3041057-1-sjg@chromium.org> References: <20250306160428.3041057-1-sjg@chromium.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d32; envelope-from=sjg@chromium.org; helo=mail-io1-xd32.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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 Thu Mar 6 16:03:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 14004786 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 CC1A4C282DE for ; Thu, 6 Mar 2025 16:07:41 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tqDjl-000786-Fa; Thu, 06 Mar 2025 11:06:26 -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 1tqDiX-00061w-NH for qemu-devel@nongnu.org; Thu, 06 Mar 2025 11:05:04 -0500 Received: from mail-io1-xd30.google.com ([2607:f8b0:4864:20::d30]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqDiT-00085d-Eb for qemu-devel@nongnu.org; Thu, 06 Mar 2025 11:05:01 -0500 Received: by mail-io1-xd30.google.com with SMTP id ca18e2360f4ac-854a682d2b6so50768539f.0 for ; Thu, 06 Mar 2025 08:04:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1741277095; x=1741881895; 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=VIlBLlTPr33gj2ZTnDFpukQC5n08ngxUyis3SddTJ04+z9khVxP7RhfyUeTfdSMH6L Z2AJ4vzVEug8rKKh3W9+VuZ92+6OWLdGKnTkdbL0a24A/Fnvl1drvaXDCCel+8903Wn3 3Gtcovtxkq1P425KzpJmtCbymWC1sz2aQKqTs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741277095; x=1741881895; 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=lrpQcDBDU1ANgHIAqkIeFXSKhezOnpOOATv0S5tfUqkk+LAqUYEz7ZnXuZot+kj9P8 6zC8rC0omo+8Ad6rCvu03Rzpdqs77AD5+kEGmKmCJdTfCtRW9lcMw01VNHJqTco+TxhU dlvodaQs4tlGHGAq9cV1u3+0kG99JRJ5Pg2RD0DdljXSLlYDvcxizMcLjDEh0YajQWE9 IQdbkQDNZGqweuabtuJ8ForeaswPArmfciiFrEHmGP1tvwd7IjxydRZdEO45BrvWP4HP OUCf2K5jbJdGWRY32pEsiopr1/dbDogqtBo9L4urlm++jmSFo3+X3YBfYbKe5EKy93uI Y4UQ== X-Forwarded-Encrypted: i=1; AJvYcCWw+hG4xqaGAhQxJ4pe18SaozlAhIMIhoR7V+v1sUFCN1mJ0q2P6kTOaJTrEA9K0H50h/yfheq394Ho@nongnu.org X-Gm-Message-State: AOJu0YzisVgQIhbZH0/Af43u/kEyo5NnUMWAO5iHJ7fPSu8FnpGR8MQ5 GbAwKwkFIHVSL9/GkkjcHmHTacn0pcYfiazVcI0suCxi5rYOEscJp8qXsEl8YQ== X-Gm-Gg: ASbGnctoMZGffXVOv8n0DAcipM8Bslp3r4cel4+xRuxB9VEWTyhw5kT5bqba1IS7SFi nRzgNYWCgQEZoggZpPPy/h9iCxJumkBVZN+gm00KMQzaYlbFFEdTLv2yJW+3gr4VxEXuCF5Pmcd bnLrVdYCIFueTpy1pEmOgKDSdorGbUIziAK/j9Qhy5Xhsrx4soE+GrsbkY7KeCAOJU/BvV74KA3 9h0HoX+xoPkiVEYMO6OJ3L62yZPaDVgiNa1vNuWAYqI2U0RoyjytBnNYftAqeY5Zbv9Ztldx5Y1 VwYoGTrl+2SFRd5xX6TwetUjLZiLxAIkQgqn2dEYJCWmnz6ztUEgArT5U0a8aI5WLx2/IwVLosu Ub35JSQ== X-Google-Smtp-Source: AGHT+IFptUsVDgwryU3pACMw9DrREQ9iwYAZSwjMMULniLe8f5QvU7XKJlpZw5jtr9diDtsIm1c6bg== X-Received: by 2002:a92:cdaf:0:b0:3d4:38a4:388e with SMTP id e9e14a558f8ab-3d44187c0f4mr897545ab.1.1741277095097; Thu, 06 Mar 2025 08:04:55 -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-4f213b959c1sm46759173.38.2025.03.06.08.04.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Mar 2025 08:04:53 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Bin Meng , Simon Glass , Tom Rini , qemu-devel@nongnu.org Subject: [PATCH v4 05/47] x86: qemu: Enable dhrystone Date: Thu, 6 Mar 2025 09:03:32 -0700 Message-ID: <20250306160428.3041057-6-sjg@chromium.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250306160428.3041057-1-sjg@chromium.org> References: <20250306160428.3041057-1-sjg@chromium.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d30; envelope-from=sjg@chromium.org; helo=mail-io1-xd30.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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 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 Thu Mar 6 16:03:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 14004790 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 08293C282DE for ; Thu, 6 Mar 2025 16:10:05 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tqDj8-0006i6-Ti; Thu, 06 Mar 2025 11:05:39 -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 1tqDiW-00061k-AP for qemu-devel@nongnu.org; Thu, 06 Mar 2025 11:05:03 -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 1tqDiU-00085w-Hy for qemu-devel@nongnu.org; Thu, 06 Mar 2025 11:05:00 -0500 Received: by mail-il1-x133.google.com with SMTP id e9e14a558f8ab-3cf8e017abcso2924165ab.1 for ; Thu, 06 Mar 2025 08:04:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1741277097; x=1741881897; 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=MMR8nphitQ/WDcheEWdnV6IJWF1G1FXKxtvaTc1U1y4/jE+h0h1od+engyb6om/umW sgCLn2LSljMfXblD2C5v0G46pp1hlULiRD2uMt8FVQfGWuD7ttFQBaeAlv8FH/VsOZ3B i5Lo8tH3HNdy9rEwoQ2zvtgsYmU9HPxuUR4l0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741277097; x=1741881897; 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=KRFBYZP4xcUODRLHqsIjisO++V+rllF6IzuVCbTSDAmGR/3avYr2Yj9HCNVip4bKEf vjgSfPWaEHvOmX+Pi7IczEGcPk11C/VQkd+hdJgrhI5YRb8C2LmY8ffDZyiA5chHumzr Z2vkzYtUDvshSonVieE02LTlF7qzwKg7x+6MD1BK6WUA9eZqAdWDx5m4kUEeP6Qgz05U apVxK9bQ3CCXmV+/Y6b4MHltbdf2RaxFtylBYO9OtSYjkEqdqEIdOkXqpOk3conHl3e/ 3ixxNcf4rmSlTReX+CAJfcOrUFZJNDIeotyPb+LJC2iGDUqmkz9HgDiH5eMarK2umRaQ Mj3Q== X-Forwarded-Encrypted: i=1; AJvYcCV8aF3kCjd9DATYKZEFaBbVhrPKVqjnqIO0v/1OOCWQRKlsESutWDrJRnKm6OQyAh+2nnWn6sgYeTAU@nongnu.org X-Gm-Message-State: AOJu0YzOMMoNdkJF4/tABTDk2++3Seh8txYyPxh09dvF1LRr0bmbR1rZ 3qJOF4tFAaJEcWYOAp2/S6NTtiDJNBGWAPtF3z6Paq6qe83T9kzRjytIj9ds4w== X-Gm-Gg: ASbGncuD1ftlKmEacJK3jQEyobWYSP/ZWEEJ2s8r7ZreqfV+25N90rsB2HkrGKDozKs +5+94LwNX+66Ifycvm6y4eurbvhDFN6KuqpsGB9oBTmaGr57pu9q9MKcQAPWq8VM3/o7twbzbua 0VDcGwJK4rQse/st5PlY8dKPdGW1WedHDNLrvKwrqq2COx+a4XBiFDz7usXoBYTRA6+XBBXioT4 OXBYxz821UthXczqA3v8FeWqI6orwKnSmTlL1jyog2eJTucQ5cY9ceBHP/lD+AcW372fhFYugwA Pd/XkVebctKoBg/awEUShfNZNVxgP7CvabY/QrfIosi0MU2+k+gpxNEC9901krYRfED4FJO8xvL xTUm46w== X-Google-Smtp-Source: AGHT+IEEQXDzmyW5nkBuIaoREplf5yZ8Jtg/vswpLt2FZkwUf5WEnmJN1MFp2Hg2Quy0N2OWtvpMLg== X-Received: by 2002:a92:c266:0:b0:3cf:bac5:d90c with SMTP id e9e14a558f8ab-3d42b9759f5mr105381605ab.18.1741277097260; Thu, 06 Mar 2025 08:04:57 -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-4f213b959c1sm46759173.38.2025.03.06.08.04.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Mar 2025 08:04:55 -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 v4 06/47] x86: qemu: Avoid accessing BSS too early Date: Thu, 6 Mar 2025 09:03:33 -0700 Message-ID: <20250306160428.3041057-7-sjg@chromium.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250306160428.3041057-1-sjg@chromium.org> References: <20250306160428.3041057-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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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 Thu Mar 6 16:03:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 14004792 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 DA3F9C282D1 for ; Thu, 6 Mar 2025 16:10:37 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tqDl7-0008C7-P9; Thu, 06 Mar 2025 11:07:43 -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 1tqDjM-00071w-Fa for qemu-devel@nongnu.org; Thu, 06 Mar 2025 11:06:06 -0500 Received: from mail-il1-x12c.google.com ([2607:f8b0:4864:20::12c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqDjJ-0008Nv-SO for qemu-devel@nongnu.org; Thu, 06 Mar 2025 11:05:51 -0500 Received: by mail-il1-x12c.google.com with SMTP id e9e14a558f8ab-3d43c972616so1726705ab.0 for ; Thu, 06 Mar 2025 08:05:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1741277147; x=1741881947; 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=Ke4nTtMro0FNWrOIK3224bFW1wRQQovdaebgTErOxaZ54H2brZiUNINuKHgWeJu5YN XN4EO7hyTPeot0P0NL+/XgNX0lvGmjk7f4mftkPiggH+iZFwoY+QvAu5X1w02C0BDW/1 fUbvtctQE+UubjMkZihVKHty1Qokq5hogIZrg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741277147; x=1741881947; 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=psCK6/4NrIyXmTB5ag+BwjFSYcWr5NanIYoxQ8wmTbdGYApamB8Rc/aWk22YZlOcHO 5+FCWKGgpMGfcH3NGlmFd0BGt1wvT862jivvXgbltU1GEziRCcTOGQAE9ScfGa9UAzYs 6bXTQjgSSFGX4Sp4oAEaZPvzZQNbxRdbM0b6BswOnbbfQYc8ImYhV63U/7YhLN+UAyw1 4HJRE6HEUlkLZZsPRwBJI+SEglkXpONPmdpNQnqZ2VpYgVx899ZkEcDMEwXM566GBBX4 ipB6H6CmnsXd9cWnqJKokx3M1xxewAu86IZ5fusl59f8VcQ2GWl7O0i9GeQmv9sex0/i TviA== X-Forwarded-Encrypted: i=1; AJvYcCVuvBOtGsKJrZNVvT2cWcg8xQ3lsIlHDiR8HebTq/oCZW9Xu+XlVu+X5ivm1i2rVOcen4UiUjhKS+i2@nongnu.org X-Gm-Message-State: AOJu0YzxpqpiqxjuBXqhtd6BuntE6pPjqZDm3UFAP3+NRpUnZrUwPSuc VA7o/KmSS/xViaZKVtKYOZLqR8fB5WxVYTjVW2nIlxtObuQR6KRcDQmQ8TvgXA== X-Gm-Gg: ASbGncuA5v/hvC437/TVYjo03X8DDOBFVo2ESAn9JghPAUcKnDoZxvmQ51ZbxSnZe2K nPBMbP5depcWObRcyij6ZsDa5xV3utnBIf5CnTuuKCPSvyHvT3xa2KpsGROcszkKhRudqI8k7lT C9lEwj1BaaNXr24iYTyoxeLBAgg0+BfMYp6u+wp2VeKv9Dx4kEF2yj/s4V8PpTFtr8L2jUdUdgR 2J5FWnY9wmiNxkRpI5ELqq+wZHOozMmJZy3KcREFVpy6Ja9fb7LWKeNA1sMDu5rRUGL68cJXteK 2J9WyLKo3nx14RPqO5L2HddecknsRmK+oK5KZiZaIRvM4fq3iBp/mvAvowsCb4RW3OkfizR7NoA GCc2kQw== X-Google-Smtp-Source: AGHT+IHuglgVnFtzfUwfDuVTzdXWjTh0CPnqHoatBlkZzeNQ3VGOrkEnP75Ie1cpdQ24+4tOGWjSXw== X-Received: by 2002:a05:6e02:4602:b0:3d4:2a80:74fb with SMTP id e9e14a558f8ab-3d436aa13abmr45343645ab.3.1741277147086; Thu, 06 Mar 2025 08:05:47 -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-4f213b959c1sm46759173.38.2025.03.06.08.05.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Mar 2025 08:05:46 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Bin Meng , Simon Glass , Tom Rini , qemu-devel@nongnu.org Subject: [PATCH v4 28/47] x86: qemu: Support environment and cat command Date: Thu, 6 Mar 2025 09:03:55 -0700 Message-ID: <20250306160428.3041057-29-sjg@chromium.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250306160428.3041057-1-sjg@chromium.org> References: <20250306160428.3041057-1-sjg@chromium.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::12c; envelope-from=sjg@chromium.org; helo=mail-il1-x12c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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 Thu Mar 6 16:04:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 14004791 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 E3D66C282DE for ; Thu, 6 Mar 2025 16:10:37 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tqDlj-0000Jt-Mq; Thu, 06 Mar 2025 11:08:20 -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 1tqDjW-00072c-QZ for qemu-devel@nongnu.org; Thu, 06 Mar 2025 11:06:07 -0500 Received: from mail-il1-x132.google.com ([2607:f8b0:4864:20::132]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqDjU-0008PZ-LC for qemu-devel@nongnu.org; Thu, 06 Mar 2025 11:06:02 -0500 Received: by mail-il1-x132.google.com with SMTP id e9e14a558f8ab-3d1a428471fso6554475ab.2 for ; Thu, 06 Mar 2025 08:05:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1741277159; x=1741881959; 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=pEe7q4w3SeigGu9Yyevoz5YHH/txq64uIVifPcLXvEQ=; b=Ub4DjTw1KQBH6Oqx+Z8gGQr7gJy4Aj8GBJRLG2ANxc3fq7gHfIHy8nDNmznJC5gElp 20SgzkuZLDM7Won3sdOt9U/OK0lG+NM1IH8oeGWXfMLzWD5REf0UKtfV+0X0SMu2z8Wl fV2PlUYWyCTiuppM6uJExIARXcLsOBSjzgk4g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741277159; x=1741881959; 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=pEe7q4w3SeigGu9Yyevoz5YHH/txq64uIVifPcLXvEQ=; b=If/dpH9dbyEzjgmbkkOynWLZ+YLOQhyDDuM0tMfrxxbQ4JYv6jc5+9ua5o6GSdHBLx KNgKl++DUX2hZRd1W1/FlqrQ06CmwJXlMQRE9yCjfXyAuMlBZ7xhkQH48+xWmYR+dUE+ 182OiwtZtt7/GhQqdrakB8cyEGpnrg6ebvKZq3+F2NpMF/ApQf+4ugEBXgATuL819u32 3rlApo25rSYV9oS18q8laGAktijQn9Gtzvmpb2vqCROruNgA3vow61YnIiyHUwY7wlwp kAiF6AGWJpLhTe9/Jx4u0Ygbz7ep27PzWaJzEnRGiNaZN4KKlL9f9LLT1D2GtJWxii/P r0GA== X-Forwarded-Encrypted: i=1; AJvYcCU/I1Qz8k7dzWHBXMHvXT2riixTXeBqxRValQNByzCDLr608p1yVIb6ctXFQb6Fg3GXKNzX+xO1gwms@nongnu.org X-Gm-Message-State: AOJu0Yxb5muNTuP4CBrYVPC14HDKgd+G7HsVI8/irAWHcWfksWwXQfFk 0xCYQlnEanR9UZiAhSPCTEo5XhkjEUOymkOUYO2REoiyeQ+fYfT2pL7UY/F6jA== X-Gm-Gg: ASbGncsFGhsgFgp0wo/asU06B/X1FuqsiBOMAU//dgR+v2Moek7NXFglG7M4o6f9Qzt uye3ijPseOfOgQ8NbsfFX2CK24wstCTVVEoHr5GJuOQitTthM/Y4qeU71U79CHnfriBHqEE3x4L C9JMCKK2a4G+OHszdrgGOdX9NvfvJBFhF0j2Xg70FVsmtZN9qXoLek/QUEYoECrH1oQ8QEVjYjq dZWSkhN/riQUlDtzJb6Hae80BN0GMgJjNXT2qM8t3pnFdk83kcT6PcrfxbeXL6mk+c6KyzORkBG rzYGYgIqzgL1Ao+aF9ojNkVb721W/OAXFv+65i5amNhqkFP3gB2dFjUEtFUTUBZ0iQxEztA9lkC nOqGEvg== X-Google-Smtp-Source: AGHT+IFVrNhma8uIsT77632739na8ad17f1vpP9I5ULeUIufeQtRgBbCD/r5f5pfbzXHknwO/BWWFg== X-Received: by 2002:a05:6e02:1c0e:b0:3d3:f4fc:a291 with SMTP id e9e14a558f8ab-3d44193e19fmr390085ab.19.1741277159017; Thu, 06 Mar 2025 08:05:59 -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-4f213b959c1sm46759173.38.2025.03.06.08.05.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Mar 2025 08:05:58 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Bin Meng , Simon Glass , Tom Rini , qemu-devel@nongnu.org Subject: [PATCH v4 34/47] x86: qemu: Use the new e820 API Date: Thu, 6 Mar 2025 09:04:01 -0700 Message-ID: <20250306160428.3041057-35-sjg@chromium.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250306160428.3041057-1-sjg@chromium.org> References: <20250306160428.3041057-1-sjg@chromium.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::132; envelope-from=sjg@chromium.org; helo=mail-il1-x132.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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 --- (no changes since v3) 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); }