From nobody Thu Apr 30 00:40:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1776172901; cv=none; d=zohomail.com; s=zohoarc; b=kUJDQ2nYNOMfM/RNY5pCrX5v85/J8Mr7lAz9DuWGqzxj+4UeteN5U1UBAqZLuDU4FkC7OzwATlKzp/jEq3ytwr0G3NGsbR0lkbX206zHls4Fgj9SHjmsUA1nq+ETO+pZJuDDtIteuzu/2vftM26IZ6a/njBXJCi/5jsWomnKICs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776172901; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=inCEUUb5wQiL4df7Ck+PQJAJdTDE+5Ugi7DIvPxrK28=; b=itn13KElOJRfWBZoB53tPBhbyC7eogl26/ZjFOOAjV/rl/HXa55nPDsxPx/uDZNAy55+9qq7qpAdSQrMVMrXZKST8uSrR66CXWFVy+ZbCTjNtlTp4gI1MEsO1KeJ45qb7HCsFEOqRSEKMwzbK14GVPgtaZYXcz70GXCyjusXpTw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776172900927372.3435599462266; Tue, 14 Apr 2026 06:21:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCdhb-0000pR-1F; Tue, 14 Apr 2026 09:21:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCdhZ-0000p4-Dd for qemu-devel@nongnu.org; Tue, 14 Apr 2026 09:21:13 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wCdhX-0007yO-Pe for qemu-devel@nongnu.org; Tue, 14 Apr 2026 09:21:13 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-488ba6366a7so69275965e9.0 for ; Tue, 14 Apr 2026 06:21:11 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43d7bc5f70fsm13480934f8f.3.2026.04.14.06.21.08 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 14 Apr 2026 06:21:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776172870; x=1776777670; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=inCEUUb5wQiL4df7Ck+PQJAJdTDE+5Ugi7DIvPxrK28=; b=bQ17769NKqhG14PuvUbmwxXPJSYg1sz/Rtg3oBWY+YE/rQMJlAKZHaJKUZKEsKA/Tb O0PyBKuON5EAV0RXtnORPJp7vMARInH3kObcfYSvBwUkbc+qnXG8OaPpPclCvtURKIh2 txPK6UnV1KBPE1Hh4VJVaWJzCHpMd1WnL4SiEmm+OUO+gG+fbABL4cppnF+V8egbDAj4 rI9HwITOhhEh+VgJzkUEQG4AqrA6u2bhiQhpePSz6eb/DG7KYOVevSc/WMBo0n29RR7W cAz/gamGU41Zckb55iwSa3NocRGs+Lr9nsdbfOzJmhMEqNmuMit+CgY3dtYRFNeLkWmK zRtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776172870; x=1776777670; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=inCEUUb5wQiL4df7Ck+PQJAJdTDE+5Ugi7DIvPxrK28=; b=EigY6dfkKAFBEIK8veKNp8amXklOyJ+dBcT2wZ0AdHkqxddYzxZ5pvT+j9KybU2HbC BwbVsJOJqWQWBYs15JH0g86drG9mZa/4Wwy4YyIz9CJ9lu2VWHafePWyVt1yNujXTAox eYd+oOZPPABiiap/VNCWcE4EehhN4+A6MQifuG+Xk02XCnIyzWFH7k1nuc1sqebbdlwl 1nu+Nbgbg8CfmjVUmvuFYpapgoKU3Z5ZUANc7yu7dX8X/bA/MzOWfw6uMqcsS7NJpXVQ 3CJv+6JtJtwkJkEwwYqs4ayDQPoe2oRZQ1Gh6N5F6LlftVuoJohVVhKCH4pe0ddew/v4 Y2aA== X-Gm-Message-State: AOJu0YyJv0YMa7cg61mo3a8ZPsQz7B8M5hOHF/3Sz6K06yC6ZWbx+ojN vRELtFB2gSleHlCSnOQcGdhc9cd/c1ZtL6yBsWRKczu70efEDaiAxlKlV/b7d4PrrT51PwUo0T1 jnYKqBV0= X-Gm-Gg: AeBDietlWt3VNpsETV17EpuSxp+LTpJ/1jjm/zcU/Ntk4zK7y7wOhEU2nzc76zUiU81 UvoAmAnkgiGfbPcX1974GZwRLsqqj0JG6mFVZUSqzHQucimN0sF28eNA1JAjDt7p45erAVqIWQU s/SMJ4TU3budhrP16+vC/CdjeeA/CqGwTp7kYdbZAvCdUKMrWbI7MLzxqBf1oRLm2Nly34GlG2w wY4D+Ljtplih+zGvdZPCzim/PWCyPfog05ukvoCWfaGkuWe8cn208hEZz2bDrl9+lWuL2C4sqPU PJt1KkYHUpvF89tS0TLoolqOgcZ9LlDqpVTPh+Zhg5S5TPQ1QfrcellcwsvHFkg1irrnSwqn8RV C0mGthv5gql3mMXPnLy05BtjwGwYEi8Qm4KNgwhR3z9aKklOGLfJJ7uIxOXx3OCaxt26NrllCro NgeScCvS3j8owScMDPrmUKUCyrtp5Gpm8aOVkzJSjOX3yKUQQMvqNHUgpyC+Hf6Ue2kQaq/3MVM Crc5V8/VDs= X-Received: by 2002:a05:600c:1391:b0:487:5c0:671f with SMTP id 5b1f17b1804b1-488d67e6a48mr254675585e9.9.1776172869547; Tue, 14 Apr 2026 06:21:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 1/3] hw/ppc/e500: fix bus-frequency property hardcoded to zero in CPU FDT node Date: Tue, 14 Apr 2026 15:20:57 +0200 Message-ID: <20260414132100.53861-2-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414132100.53861-1-philmd@linaro.org> References: <20260414132100.53861-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1776172902132158500 From: Vivien LEGER The bus-frequency property in the CPU FDT node was hardcoded to 0. This is incorrect - it should reflect the actual platform bus clock frequency, as firmware and RTOSes use it to derive peripheral clock rates. Notably, the RTEMS QorIQ BSP uses bus-frequency to program the MPIC global timer interval. With bus-frequency=3D0, the timer interval overflows to ~85 seconds, preventing any clock interrupts from firing. Fix by adding a bus_freq field to PPCE500MachineClass and using it in the FDT generator. Set bus_freq =3D PLATFORM_CLK_FREQ_HZ (400MHz) for existing machines, matching the existing clock_freq value. Signed-off-by: Vivien LEGER Reviewed-by: Bernhard Beschow Message-ID: <20260411154535.1451361-1-vivien.leger@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/e500.h | 1 + hw/ppc/e500.c | 2 +- hw/ppc/e500plat.c | 1 + hw/ppc/mpc8544ds.c | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/ppc/e500.h b/hw/ppc/e500.h index 11f8ae53177..6d56c7b4cb2 100644 --- a/hw/ppc/e500.h +++ b/hw/ppc/e500.h @@ -40,6 +40,7 @@ struct PPCE500MachineClass { hwaddr pci_mmio_bus_base; hwaddr spin_base; uint32_t clock_freq; + uint32_t bus_freq; uint32_t tb_freq; }; =20 diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index d6ca2e8563a..5be2f2095f6 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -518,7 +518,7 @@ static int ppce500_load_device_tree(PPCE500MachineState= *pms, env->icache_line_size); qemu_fdt_setprop_cell(fdt, cpu_name, "d-cache-size", 0x8000); qemu_fdt_setprop_cell(fdt, cpu_name, "i-cache-size", 0x8000); - qemu_fdt_setprop_cell(fdt, cpu_name, "bus-frequency", 0); + qemu_fdt_setprop_cell(fdt, cpu_name, "bus-frequency", pmc->bus_fre= q); if (cpu->cpu_index) { qemu_fdt_setprop_string(fdt, cpu_name, "status", "disabled"); qemu_fdt_setprop_string(fdt, cpu_name, "enable-method", diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c index ca5647284d0..85cec810d9a 100644 --- a/hw/ppc/e500plat.c +++ b/hw/ppc/e500plat.c @@ -94,6 +94,7 @@ static void e500plat_machine_class_init(ObjectClass *oc, = const void *data) pmc->pci_mmio_bus_base =3D 0xE0000000ULL; pmc->spin_base =3D 0xFEF000000ULL; pmc->clock_freq =3D PLATFORM_CLK_FREQ_HZ; + pmc->bus_freq =3D PLATFORM_CLK_FREQ_HZ; pmc->tb_freq =3D PLATFORM_CLK_FREQ_HZ; =20 mc->desc =3D "generic paravirt e500 platform"; diff --git a/hw/ppc/mpc8544ds.c b/hw/ppc/mpc8544ds.c index 582698559d2..d022761cb6d 100644 --- a/hw/ppc/mpc8544ds.c +++ b/hw/ppc/mpc8544ds.c @@ -56,6 +56,7 @@ static void mpc8544ds_machine_class_init(ObjectClass *oc,= const void *data) pmc->pci_pio_base =3D 0xE1000000ULL; pmc->spin_base =3D 0xEF000000ULL; pmc->clock_freq =3D PLATFORM_CLK_FREQ_HZ; + pmc->bus_freq =3D PLATFORM_CLK_FREQ_HZ; pmc->tb_freq =3D PLATFORM_CLK_FREQ_HZ; =20 mc->desc =3D "mpc8544ds"; --=20 2.53.0 From nobody Thu Apr 30 00:40:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1776172913; cv=none; d=zohomail.com; s=zohoarc; b=gCRblgjDaCGV6+7ZFIZle0UmhxQ6Bf+JtOwjyqdyekLnJ5SBEn1LzVQlJ91AZiTPf1iZufU0q5akOPN/RJV/MsuUEY8klm4z2Q0pqIA20v1m9eQJ1r1OxC0ir9yIWinmwjN41WdFBa6yW7hSrikFEbj6nvGVNk80q7i/yFpk6gc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776172913; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=iR6Z60525WsUcAHnGzZLKIJqtugk1SSKoNFtM74g22c=; b=cbIkIwOv80w94EDLFDGF+VO8nbhGV2b5ZGhJ9EUfjUCsN6gBe/TRwKZvjqPj5AJJFykvusQ7FddhC5czSAFptR5aMk3Fuo/aAJfjTi4zFDOhi0erQMmeoeJJ7AqXayr4bqcMfYEpvz0+U/pSq2siAbsR0xvrahysoGr1o0w/jFE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776172913137536.4959075725099; Tue, 14 Apr 2026 06:21:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCdhh-0000qE-BV; Tue, 14 Apr 2026 09:21:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCdhf-0000q0-VK for qemu-devel@nongnu.org; Tue, 14 Apr 2026 09:21:19 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wCdhe-000809-57 for qemu-devel@nongnu.org; Tue, 14 Apr 2026 09:21:19 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-43d74086e5bso1858061f8f.0 for ; Tue, 14 Apr 2026 06:21:17 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43d6a1203b8sm37370938f8f.16.2026.04.14.06.21.15 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 14 Apr 2026 06:21:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776172876; x=1776777676; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=iR6Z60525WsUcAHnGzZLKIJqtugk1SSKoNFtM74g22c=; b=mWTBhqiLyjx88Grp7ur6Fe8IoF185uhRPfE5/ZFPoA4joBRJJRLxFsWSJ5udUnH2gU Ux2V3qCG7to1Q1X3T7l0LLYA0aHs/uAi34Kn09ZhEhq+O3WWHLoT5LIESsYZZKYhM6AK +hocTTwNFp9Btv/0b/sdfbkHjUhealBwzhZUOAs2NBLiQZponjtPk6B+M0N0g9JQ3OPC CsGoFIiWh3SCR8BDXBWsqZxXYWQij86zSK6mjv486+7wIJxgFwKP17OVeXlJy1YG/GOU Dp/19oaeoJnq1pKsFNhRB8H3uIHnUJ8vxlD+ohga1GNAX0vO9GgsKQoyiXm0CqPbAjBl DzDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776172876; x=1776777676; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=iR6Z60525WsUcAHnGzZLKIJqtugk1SSKoNFtM74g22c=; b=XkNbz9+OPH9mCxPU4u3X0XzZUIJkMxH17tMqS5hcKhJvO1IyZwYgtYYdfwJC/QilZn U6+HYtD+RF/QoDsAPqBzD7iZ4yFWs5w9sVl1ARk3UP6ovbjyqTO+DXPXyiYkVfQ3mnib J2j+Jbcnh0oram5Xm5gxKaqi1yud6pinKQ9t/5YGva+bImlCubl9Jod0UuCbhRD7SmuM vgQP6KyhXhOpbE22AYZo9wrZjiRUv+36Pcf9dKYxBpthE1RnaRS7Q5rFb557toJJYSDD +nqIFEcOZb5YetTYF9GrSZfGoF3lP4YWOv8F0WcvYcrMertmxtA6wfCGLF0S22i3lWRo qBzQ== X-Gm-Message-State: AOJu0YwhnVockztkkAL1J2XOrsmzALWQdBj++EEWrTxTp1qu3boSS6LJ OfufAdfNC4ixe566zdYRN6XRO6sI5pDQb846M7xk/eMunZ4S3OLzfdIGL27LoZoXyYcKv38Xf+T W1eRfKDI= X-Gm-Gg: AeBDietRPnMgF1kLv+oXSjnynXGLiwnClq30i3WWlWAlWZpcyHTGy1Fxe8z0XC8O0QX wveD1pVn0MyZ92YIqTKFcmjkitjCUwDCc32IdDEOHq+eH+1yfKixpWRBsy4FtiacexzA9LdLo1k u7okl/dCIgluCidpRZ18hf7kjaFYXM6hb7BYKkQJ+NINmTr+gzsXJolyCe7MD/W1BK2i39ElTTd zCyPdVCTkqB3wLQuBJz1Smpep5xdzeD29AHBZofov4j7HJAD0EBrcdF/kD+REMnXtovNabojsVY mlCn/qrnaNRv23v8QXGWHNdqnmdqg18bYhoKyxAj5CHOqlJDZ62Q1yhr0fO8VVRPg4mlFQz9eUd OIh9AIYcXeK/spVO6FEiPOKeUdUy5N/14Od9D5Rg+WHUapcJkligIvVEcBVZpYNsXNHouwXDsHS ceOchq2BGS9OX3JXXzYNq0W8QrBR7/foE306+ujAj+agLmAQY2X2aZcaFSjMss59pQyiDJ4IOm X-Received: by 2002:a5d:6a90:0:b0:43d:6fb7:fedb with SMTP id ffacd0b85a97d-43d6fb801bamr10964943f8f.36.1776172876195; Tue, 14 Apr 2026 06:21:16 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 2/3] hw: q35: fix VGA text console with SMM disabled Date: Tue, 14 Apr 2026 15:20:58 +0200 Message-ID: <20260414132100.53861-3-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414132100.53861-1-philmd@linaro.org> References: <20260414132100.53861-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.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, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1776172914058158500 From: Mohamed Mediouni Work around black screen in VGA mode with SMM disabled. Required by NVMM, HVF and WHPX backends. https://gnats.NetBSD.org/59721 https://gitlab.com/qemu-project/qemu/-/issues/2608 https://gitlab.com/qemu-project/qemu/-/work_items/3085 Patch written by Taylor R Campbell Signed-off-by: Mohamed Mediouni Signed-off-by: Michael Tokarev Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260413170407.57574-1-mohamed@unpredictable.fr> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/q35.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index e85e4227b37..05ef5222f7a 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -372,6 +372,10 @@ static void mch_update_smram(MCHPCIState *mch) memory_region_set_enabled(&mch->high_smram, false); } =20 + if (!mch->has_smm_ranges) { + goto out; + } + if ((pd->config[MCH_HOST_BRIDGE_ESMRAMC] & MCH_HOST_BRIDGE_ESMRAMC_T_E= N) && (pd->config[MCH_HOST_BRIDGE_SMRAM] & SMRAM_G_SMRAME)) { switch (pd->config[MCH_HOST_BRIDGE_ESMRAMC] & @@ -405,7 +409,7 @@ static void mch_update_smram(MCHPCIState *mch) mch->below_4g_mem_size - tseg_size); memory_region_set_alias_offset(&mch->tseg_window, mch->below_4g_mem_size - tseg_size); - +out: memory_region_transaction_commit(); } =20 @@ -474,15 +478,15 @@ static void mch_write_config(PCIDevice *d, mch_update_pciexbar(mch); } =20 - if (!mch->has_smm_ranges) { - return; - } - if (ranges_overlap(address, len, MCH_HOST_BRIDGE_SMRAM, MCH_HOST_BRIDGE_SMRAM_SIZE)) { mch_update_smram(mch); } =20 + if (!mch->has_smm_ranges) { + return; + } + if (ranges_overlap(address, len, MCH_HOST_BRIDGE_EXT_TSEG_MBYTES, MCH_HOST_BRIDGE_EXT_TSEG_MBYTES_SIZE)) { mch_update_ext_tseg_mbytes(mch); @@ -585,10 +589,6 @@ static void mch_realize(PCIDevice *d, Error **errp) PAM_EXPAN_BASE + i * PAM_EXPAN_SIZE, PAM_EXPAN_SIZE); } =20 - if (!mch->has_smm_ranges) { - return; - } - /* if *disabled* show SMRAM to all CPUs */ memory_region_init_alias(&mch->smram_region, OBJECT(mch), "smram-regio= n", mch->pci_address_space, MCH_HOST_BRIDGE_SMRAM= _C_BASE, @@ -604,6 +604,10 @@ static void mch_realize(PCIDevice *d, Error **errp) &mch->open_high_smram, 1); memory_region_set_enabled(&mch->open_high_smram, false); =20 + if (!mch->has_smm_ranges) { + return; + } + /* smram, as seen by SMM CPUs */ memory_region_init(&mch->smram, OBJECT(mch), "smram", 4 * GiB); memory_region_set_enabled(&mch->smram, true); --=20 2.53.0 From nobody Thu Apr 30 00:40:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1776172909; cv=none; d=zohomail.com; s=zohoarc; b=BB+66hOj3gP8VIKBVjyMgePHEMvO5COqqOSjUsTFnWGNu3THac6shLdaJz3kIwW1OYnWgvo1NSHjQE7UhABRkYGcvjrqQ5tCMA8RqGUG+xaguF7NNSi5wg+kyPEQ5KWh0nvhdGX/Z1HNArlh0MRn+ix9X86vwAbJBt/+uENJDEM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776172909; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=RTP8G/3syFvWMTvC3Oy537xBcJoeDL0PeXldlkypUIc=; b=QfE70ZSa0xyGUpUXe6adiaxfp9w2ya7k3XVNGB/rUnQYztppRPUNFbvGrKHbzX5osC6aGvsZ0Z7Mth3JQVqVT8W/AWdt3R9X7mCJsfMLawZgKW4ihln7V2QQr4JL9FLz5fI4C917qesuLs80KueoX/dyTFoOEbqztTT3mYcKMz4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776172909855706.4580929247453; Tue, 14 Apr 2026 06:21:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCdho-0000s6-Fg; Tue, 14 Apr 2026 09:21:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCdhm-0000rS-UX for qemu-devel@nongnu.org; Tue, 14 Apr 2026 09:21:26 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wCdhl-00080k-C6 for qemu-devel@nongnu.org; Tue, 14 Apr 2026 09:21:26 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-43d43e09de5so3327998f8f.1 for ; Tue, 14 Apr 2026 06:21:24 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43d7b543057sm14033448f8f.6.2026.04.14.06.21.22 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 14 Apr 2026 06:21:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776172883; x=1776777683; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=RTP8G/3syFvWMTvC3Oy537xBcJoeDL0PeXldlkypUIc=; b=J85Qq5X29zkEt1ZE1zj9GJQlt7eexi+4l0GXiEk8yc1aMMBcx9Qnw62+LLXlp2QfKw LhO6HVe3u/8mW2SoGw91mshmCBatY90XnwJ55kregXaNwMEk9/WpD26BPZVpqtJ0ziUX iP/Z9dfFZgJueIkXcO9ia9nPqKcqyRwJ4qHEnUS4UcvQittIjSFmGjfXo7zcIA/mwb7t H5guz3DN3n2am/TJE7maT0+03C6aVbcmikp1Yx4jCyPatO/EV/bYyaZyhFxMsBXROdIF PsYRtR8a/CHaiSXSv+2d4VAlo5w3/oUxTk1t0tIrG/ychSOMwxe+asm96yZUQqlM9bLs weTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776172883; x=1776777683; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=RTP8G/3syFvWMTvC3Oy537xBcJoeDL0PeXldlkypUIc=; b=ZccWG1VM+kDw+bKd5oCM8Ec8DRnWHstu2FkUT2EcfqLCzJNLfg0eCuEcPwAichdxLR yXjyW7Bfh4niN3kAR6uO9QgFZ/afCwgqI6v2WbmD9HYjTbqk81Yj9NN8jFs+eXqpUuqG 9uroiDlKupoDZMlS2Oy8sRqZcaBDP6IRCAmYIRBEnEQ/SOrE+OB9etmJMD/RQ6DH+Wz2 e3g6T4i94UKNCMtBGRVg+9tmZ6M3ivzfUpITnn8Pf/Y2MC4lvssAE2PkdeSyRFBv9sPu vz9OSXx6LwUGEYe6rP5zdbGH5OJcwyIAhC+LDvwGMU4k429y4G4ySt+F9Fdy53S5jEAd ZBPQ== X-Gm-Message-State: AOJu0YwCgOFMPkAYKxdua1V/JwBenWHkfp+kLdXmcoaGRBML10jaYzop zBO5f9TOlxY1HTnTvikUmjbNp7Qnb201Tu9OjrPEeplnUdZAkPVpe8XmoEisZvzX7IYos5Iszkh +01NUAA8= X-Gm-Gg: AeBDietnEfjRvyAcaH7hdMLNE10kUEdYAlyesyHWLzhxUAZCGs4ccsqSKIjHMgBkRlx HF9LyfSn8Pp8JdmMb14+4BKzszPEQd38LwX5rRXKCT3aQUFu3/o5ZH2Fn2R3eDs76d2BY7aQfRh kFkRxCZQLaCGZiAhTe/qZrEG9sD3lZlyLqCqD05REklDbqq7HfF7XjbyjruovlLHgv9lSiUpz3q 0bgeHqP4scAbTmxeC1X/qUKfLF/6YXq/zO98wfOfa5c0naHvqU44ZgaPNKSzHipVlb8anobkEI3 JQyiA1DbH2oOJXp4RmmUcGRgdvMotqLjQQ2FXu12vXfqzrGkwloTSYus3lAltnklmYwjZJpANma 0CsOQ/wNiCSY05ZEXu/zjn9+KCPRzDxYHJ/Km++6Mj3YQH+aU8N6du0mv0AcJlYxodfITM9Hczv XR4vdoLX1x40lFd6t1iWKWH9gq3ceTzdq+1Lr04F/owqSwFSruyR/g8p6mibUjYmYHmthKF62f X-Received: by 2002:a05:6000:612:b0:43e:a81d:c475 with SMTP id ffacd0b85a97d-43ea81dc4d7mr2249966f8f.6.1776172883117; Tue, 14 Apr 2026 06:21:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 3/3] ati-vga: fix unsigned integer overflow in cursor bounds checks Date: Tue, 14 Apr 2026 15:20:59 +0200 Message-ID: <20260414132100.53861-4-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414132100.53861-1-philmd@linaro.org> References: <20260414132100.53861-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1776172914041158500 From: Junjie Cao The cursor bounds checks compare (srcoff + N) against vram_size, but both sides are uint32_t so the addition can wrap past UINT32_MAX when srcoff underflows from the cur_hv_offs subtraction, causing the check to be bypassed. Rewrite the checks as (srcoff > vram_size - N) to avoid the overflow-prone addition, matching the style already used in ati_mm_read() and ati_mm_write(). Cc: qemu-stable@nongnu.org Fixes: 2f1fbe6ee9b5 ("ati-vga: Make sure hardware cursor data is within vra= m") Signed-off-by: Junjie Cao Message-ID: <20260414141458.1076014-1-junjie.cao@intel.com> Reviewed-by: BALATON Zoltan Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ati.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/display/ati.c b/hw/display/ati.c index 88a5bbbf07a..0489995d00b 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -149,7 +149,7 @@ static void ati_cursor_define(ATIVGAState *s) /* FIXME handle cur_hv_offs correctly */ srcoff =3D s->regs.cur_offset - (s->regs.cur_hv_offs >> 16) - (s->regs.cur_hv_offs & 0xffff) * 16; - if (srcoff + 64 * 16 > s->vga.vram_size) { + if (srcoff > s->vga.vram_size - 64 * 16) { return; } for (int i =3D 0; i < 64; i++, srcoff +=3D 16) { @@ -206,7 +206,7 @@ static void ati_cursor_draw_line(VGACommonState *vga, u= int8_t *d, int scr_y) } /* FIXME handle cur_hv_offs correctly */ srcoff =3D s->cursor_offset + (scr_y - vga->hw_cursor_y) * 16; - if (srcoff + 16 > s->vga.vram_size) { + if (srcoff > s->vga.vram_size - 16) { return; } dp =3D &dp[vga->hw_cursor_x]; --=20 2.53.0