From patchwork Sun Feb 16 20:43:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 13976734 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 4A2E5C02198 for ; Sun, 16 Feb 2025 20:46:00 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tjlVa-0007Fk-SW; Sun, 16 Feb 2025 15:44:59 -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 1tjlVV-0007FJ-LB for qemu-devel@nongnu.org; Sun, 16 Feb 2025 15:44:53 -0500 Received: from mail-io1-xd2e.google.com ([2607:f8b0:4864:20::d2e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tjlVT-0005fu-Qr for qemu-devel@nongnu.org; Sun, 16 Feb 2025 15:44:53 -0500 Received: by mail-io1-xd2e.google.com with SMTP id ca18e2360f4ac-84a012f7232so137134339f.0 for ; Sun, 16 Feb 2025 12:44:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1739738690; x=1740343490; 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=DreV9NBWw1rAAKxQDwzKoQMmZrapH2rDpG7DGjQOfBQ=; b=cv0NN7fr2Xg5l8NFJT0ZAcCKr6hIlbelXZ/n6KYU1z4Q0AzvKSwTfSiDv/JByAhX27 kfMkAKImwmPV+ozEZ2/GetdC3YW2Fl0JmDohKfGmWB4UTUPi5wqLElLW/Wvm7zaf5Rhb ylQoH4RXrIz2IAnQuBd278CucjQDfyReRxt+A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739738690; x=1740343490; 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=DreV9NBWw1rAAKxQDwzKoQMmZrapH2rDpG7DGjQOfBQ=; b=Cb/XOW8b0HtscwJSM2t6KR91M5fma69qKlWA5LlAiu5IxMRWEn8eBNb6FC/roIEAXQ Zmj/tHyxXxnTb+uxBMM/5ydXnh4PSWX538O9EYo+GcENkdfsoinRTZ4g/H3qywILVlVN xe9l6YIl9uvJzyuBmyuFfUtdyftyffLIjn99ukZLd0q2G4AhbF6FCfZwNCVGjZzJWlJ7 9i/2WmkBGR/2H6/8NLr6foZOOQtls8xN/qcUtkYGxjLLdlSSAruRkd8fk0RQ2q6R3OZp 8Qp+aH76SeCYwhYvrt13/aK2f5vIFk0gDQKrs0eEqszJLp4JSLyqkg7whgTXeWXteKJh Bb8Q== X-Forwarded-Encrypted: i=1; AJvYcCUgC6kCyuETAq0cnMOG251utykwXE1R3cl8jnIKnKd8Eo5CQq7zaE/LJwdxcawL/k1zKDinl+OvPGe8@nongnu.org X-Gm-Message-State: AOJu0Yx6+urCuOotUbGd68UNaSx9kiP9Q3hv2myypQkrVG/Vk9GEaakv Cb/vRzkyuSIx7wmzcQD7VjXPEmciRKhL371lddEAAyTZdpCznXcPhjDUAHH7Hg== X-Gm-Gg: ASbGnctD4cZLvxiUQMpPnyDSJOpdYjn33F3MaQbCN3cl/yF13Ndwm9r8QQiZlLfn+mJ sHSJu23Wo2jL6kLuuKZS03UVXdOWN4sTLyaiGA8EckaFml5XZvhxUOTedTARmYxL8A4WTFnvpMq og0/D5F0bvf+WrZHq59jyYc14Jdq7wMPC4yh3DyDgGXcLkyvurKYydD2YnByWDNuKYsPnsG3BQI ue/RHKcf5w2OxI2gtVVTMhLdg8XJq9A1BPWs0dqbxNtvM+0pfLvb1MNqc2DrpBSDXqQIl8FzLrK a5QttVZmiBLF7yZDUjM3o3SooTHgqRruENNYlWhXFXYHIutcCv3N X-Google-Smtp-Source: AGHT+IFVW4sYH36KMd/WtC0pieXo6dZkD4DFQF6MqOw1XkQ0XCh5/OjhdzlMOChRjesLs4sLeAimXA== X-Received: by 2002:a92:d34f:0:b0:3d1:5dce:5105 with SMTP id e9e14a558f8ab-3d18cc7476amr85680815ab.4.1739738690507; Sun, 16 Feb 2025 12:44:50 -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-4ed281718f4sm1854186173.45.2025.02.16.12.44.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Feb 2025 12:44:49 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Bin Meng , Simon Glass , Tom Rini , qemu-devel@nongnu.org Subject: [PATCH v2 02/28] x86: qemu: Switch to bochs display Date: Sun, 16 Feb 2025 13:43:47 -0700 Message-ID: <20250216204421.3560012-3-sjg@chromium.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250216204421.3560012-1-sjg@chromium.org> References: <20250216204421.3560012-1-sjg@chromium.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d2e; envelope-from=sjg@chromium.org; helo=mail-io1-xd2e.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.382, 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 --- 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 Sun Feb 16 20:43:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 13976733 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 A101EC02198 for ; Sun, 16 Feb 2025 20:45:51 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tjlVc-0007GV-OL; Sun, 16 Feb 2025 15:45: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 1tjlVb-0007Fy-00 for qemu-devel@nongnu.org; Sun, 16 Feb 2025 15:44:59 -0500 Received: from mail-il1-x136.google.com ([2607:f8b0:4864:20::136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tjlVZ-0005gm-ID for qemu-devel@nongnu.org; Sun, 16 Feb 2025 15:44:58 -0500 Received: by mail-il1-x136.google.com with SMTP id e9e14a558f8ab-3cfc79a8a95so8651015ab.2 for ; Sun, 16 Feb 2025 12:44:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1739738693; x=1740343493; 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=R5YkOFB6sctSm8uDd9ewoLd6APfZT9X89d8Jqho0v8qt9OLyclU2wplyDDPjLnwFUa P3jOk0VZxZ8pJ91bD+DWUp2uISd3n192fFggWywVVTWoTvVYmyT9mvDjzLR2nBHXjuCN /WmHr39kPop3/MgBPhxVJprRhmkaJdjx6zgLI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739738693; x=1740343493; 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=XUbN8rygPWv+FNCfvvu+PwMHr4el6eXr4HwmtScNjxY5s5SejMfIaekJBX7HZla18Y pQ4Us1JSgomx3u47H3dOAfEH07S2QB0BiTotoXA5GqYetgW5ChY0zauFtU7AvcOrXmxW sfOOYqFc3kJQXCu3MmSNUnyF/GHg9hpd57zdFRmlCD/FZetysnFBaMhkV3E2WNF0JJtw 8MOiakvAuOld+rgDG2+ZvLxsu5w3+M1MMEU4UKfgy24H1asl5GxedHKkzKOK07gEWMAr dqyJAHo66sDdwz14clbOcFlrx+hS8B89KucAskNg05VjFW71xobB1rNaHcKYDpMEvN/J jmkw== X-Forwarded-Encrypted: i=1; AJvYcCW+QVMQFlJilW3XWuNcrYNgNytLEXHco8zeqTEnpAD5Wa3Qns+fB523De/PfbA1DAlF/FVv+nfZeri6@nongnu.org X-Gm-Message-State: AOJu0YwH6wajpVoHK2bAGYxc4hR8g/Df+NhWvBeXJ2qH6unV9Gy8ECGA TaG5BvF4vTvd9ENOH9gk/6OK0cNfg+hpJDtgMqTg7XFxt8jqx9/ffofnQDxaeA== X-Gm-Gg: ASbGncvMn1YSTQDfi+2PKVW9NGcyUSMfvFKZfBEXiYpJMNKbkGU6TPN7X/GGvb7oFM9 WBL8qqfHuBQ6TmWM8wGSX7YK3vZP+fXP4CmO6O1msco0bodinBBbByJNuWq37YynvdSdIOIRaQC czcsn1ZuzlQlHwPLoX5bhIrmKji1sh2tEbIBNICF0FL/+nfWOJdfr2fMmLUtcT0bbynZZausr15 mdm6ytFQlwdhgmv9mCwx4M4f80fIC/p72LKiqVAl4uxe3h9sluXwtwqmaV/lPox/DqXTd4NZpoI 7SjnYWFhsG1jXF+4/j4I6pmUgAfM8shq0RgBFcS2EadvuraxtALQ X-Google-Smtp-Source: AGHT+IG1lIlV7TAI2qw+8rSe0qDw8P2CfBy6qkfganzRJzifaoZrwlkPUC7GKwykq9D/qATeTDz7hg== X-Received: by 2002:a05:6e02:1446:b0:3d0:21aa:a752 with SMTP id e9e14a558f8ab-3d2807b0baemr60764185ab.2.1739738693288; Sun, 16 Feb 2025 12:44: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-4ed281718f4sm1854186173.45.2025.02.16.12.44.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Feb 2025 12:44:51 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Bin Meng , Simon Glass , Tom Rini , qemu-devel@nongnu.org Subject: [PATCH v2 03/28] x86: qemu: Enable dhrystone Date: Sun, 16 Feb 2025 13:43:48 -0700 Message-ID: <20250216204421.3560012-4-sjg@chromium.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250216204421.3560012-1-sjg@chromium.org> References: <20250216204421.3560012-1-sjg@chromium.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::136; envelope-from=sjg@chromium.org; helo=mail-il1-x136.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.382, 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 Sun Feb 16 20:43:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 13976732 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 22639C021A6 for ; Sun, 16 Feb 2025 20:45:32 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tjlVc-0007GU-Mw; Sun, 16 Feb 2025 15:45: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 1tjlVb-0007Fz-6W for qemu-devel@nongnu.org; Sun, 16 Feb 2025 15:44:59 -0500 Received: from mail-io1-xd34.google.com ([2607:f8b0:4864:20::d34]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tjlVZ-0005hP-IC for qemu-devel@nongnu.org; Sun, 16 Feb 2025 15:44:58 -0500 Received: by mail-io1-xd34.google.com with SMTP id ca18e2360f4ac-855799b9d1cso36675239f.1 for ; Sun, 16 Feb 2025 12:44:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1739738696; x=1740343496; 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=DZiwzsUVlqocwM7SnJfzKAPkRZmWPiVy3khKFDYyUnKIXua39jXwZMaipu0nFQv2xO IVEnfHAZj+o7YmVxxo62ekj+4nNAsXKvYZyjQ2K8q9ifw5IE55gpyxbNMZ43LnB3FHdi LSoUOhO2st5Jnmtt9vpBGVKGIjrwHbE1brJsw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739738696; x=1740343496; 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=km7bidC9TrJ/heElOVnuVWRWlQ+kqHbuJpXB/cO8Gmu2O+lmPrdqV08T2LHY6WXHBW k6JhAjaXtCQxieHfNbm6nrmsUct1XpCfpiKXGMls6jqzuzM0pcTspot5LO7qdg7DcA/k S4kOm852zr73PSkPzNxtyzYPoZGd0vmTFHfMUb6Rb0Zy4xmVi4FNs+v7JBGMCMXI9U1G 7OuXD0OZmd54rRjDPj/i3+kji4nyiMoNsGqvPjD3Wp8V2e0nLFAm5hk0dREyYvlazAI4 X1paNhSAxwLMBAB362gD5/Vb/QzDvNREMivcXbHN/tBREnnuUAY+T//y2HXySGzQzb00 s2BA== X-Forwarded-Encrypted: i=1; AJvYcCWg/7zWltIfnlDjsyXteiunz9Bp82gyMfs26FmC3X+eeIhTlhBhhzzs1AksAwjefSp4FmZgPBdzrsoC@nongnu.org X-Gm-Message-State: AOJu0YxxU1Ma9F2tBOw/Re072ZAtHb/hReK2b4NJwnEX2HLAV3UFRgGA HGtSPXpUi5S9F3y67uChvg1e/xrv8HgvNchUFrvK4nB0x+VVCjkmj8Qtn8rS/A== X-Gm-Gg: ASbGncuaU8Z6w66dZjb2kMAVuVaR/Lgjf5ODL1pK7IygRsXBugZ7qf5inza/xDKZDdz 0aokH/R3M2Sinjn8D+QuZabXzb2UllPLTat9dcbdy3C7NPqQKfil4Ld/7OI9LAFRVV0GY99+cwI nGQj69fbSsCQc8nCruLoqotoVZRWsXCRp9P1wi+nU8zRsoW873c+3ammERP1/FGf0p6ZWWEDBPb 0gw/K6QwqL+O60+P614YLirqzwmK/hAaiAEXKLTmXzb3EpmvuaQ/fVQgh59bOXaAir+27BTyMPY q/P2Qd3QDWG1/OcmtHcos2zGn6gj0EYXYkQwPBrOUNT1EofuEwui X-Google-Smtp-Source: AGHT+IFISbdq5Wij5MmQleMsFwBroEinOUYjslIJWvkUtfyVXW49il4lSVIOnWISmblklYFkdKf4fw== X-Received: by 2002:a05:6e02:1fed:b0:3cf:fa94:c7d with SMTP id e9e14a558f8ab-3d2807fe341mr49492515ab.9.1739738696188; Sun, 16 Feb 2025 12:44:56 -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-4ed281718f4sm1854186173.45.2025.02.16.12.44.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Feb 2025 12:44:54 -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 v2 04/28] x86: qemu: Avoid accessing BSS too early Date: Sun, 16 Feb 2025 13:43:49 -0700 Message-ID: <20250216204421.3560012-5-sjg@chromium.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250216204421.3560012-1-sjg@chromium.org> References: <20250216204421.3560012-1-sjg@chromium.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d34; envelope-from=sjg@chromium.org; helo=mail-io1-xd34.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.382, 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