From nobody Thu Apr 30 00:40:27 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=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1776099900; cv=none; d=zohomail.com; s=zohoarc; b=Y7kz1cCCJl5QohwUmSfXgdLq9CSUb5YLNOJdD9aW1Xj68hJz+mVcsna1uK1KNTk1iOfKE7XVppHk/pmDM3pfePSDmki2pGf0j+WQ43y9XXsAIF34mlUuX+JCXYgG1fWhi6OplSCDxiUr8YxRuMer1qVxOqrS+NzOAWfnhYYiU7s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776099900; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=0/fpAPP5PLzFLXvq8GPcE+h9tIAhBl3FyIhWttyKd5A=; b=Tb3x0SOPiNrlb8iwZAFIsao5Il3czR97tq8c7c5sweRTTnYUkDx/qec5PoMzOkI0N/94yFFU/9GHBeUZV5yPYsxU7HqRc9xlNzCLRMbbl4CO1WGx9raJhgAYqeK7EbVprwRgVdoYd45RehpgeOxRwU50ryK6l2EGLrAA53PDGEw= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776099900254273.31342282417006; Mon, 13 Apr 2026 10:05:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCKhv-0006wQ-DQ; Mon, 13 Apr 2026 13:04:20 -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 1wCKhu-0006wH-II for qemu-devel@nongnu.org; Mon, 13 Apr 2026 13:04:18 -0400 Received: from p-west3-cluster1-host10-snip4-10.eps.apple.com ([57.103.73.231] helo=outbound.ms.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCKhr-0000No-Qf for qemu-devel@nongnu.org; Mon, 13 Apr 2026 13:04:18 -0400 Received: from outbound.ms.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-west-3a-60-percent-3 (Postfix) with ESMTPS id B78AC18001DA; Mon, 13 Apr 2026 17:04:11 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.154.37]) by p00-icloudmta-asmtp-us-west-3a-60-percent-3 (Postfix) with ESMTPSA id 498C31800201; Mon, 13 Apr 2026 17:04:10 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1776099853; x=1778691853; bh=0/fpAPP5PLzFLXvq8GPcE+h9tIAhBl3FyIhWttyKd5A=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=FZ/7OKDs57Bae3EkzJYql/Y89gYWv5HL32/vAmKPeqeSV9q7XW0O2sX/dRg39gv+cFU/sEQ8vYoHKZlwWTX7iVaATT2aWM81NR3rBrQsMcQPNpskkB0KLmIQ7TD89EQszx0GX5MEaqJOPhkuH2Emj6Pps424YzEwpqcSqVfsC55rkBhg/uIHjcWKGVBaz1/MDSRmsHdoreLMls/ejEkF8WgTOdhaAII6gcj2x8PlGuHS+KI/MAHFANFY0LqlRwIqU2WH/NtEW3e6Qd1Xofg5xyNwdry5njynl/mA+HDaFjhpb85QyzRVYDIPjhPaikJDFBn4o/0AIqod4iA3wz06Fg== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , "Michael S. Tsirkin" , Mohamed Mediouni Subject: [PATCH] hw: q35: fix VGA text console with SMM disabled Date: Mon, 13 Apr 2026 19:04:07 +0200 Message-ID: <20260413170407.57574-1-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: soYKR_QXwpT_QwrzzNeaAMNN-TB-2PmN X-Authority-Info-Out: v=2.4 cv=NIfYOk6g c=1 sm=1 tr=0 ts=69dd220b cx=c_apl:c_pps:t_out a=qkKslKyYc0ctBTeLUVfTFg==:117 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=_ctWjzdLAAAA:8 a=p0WdMEafAAAA:8 a=WqM1to31ecf1YN0a6F4A:9 a=WoGCsytTnHKj16XvecxK:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDEzMDE2OCBTYWx0ZWRfX18FV+ZJk3EI4 Q2HphuByYe7TXjzG0GJqMcb9z+vVoBO078FlK3F+0eqHeqE+I0sXkvVrAYW1GnfJO7OgmkzBtoe hOguGI+K6Ga1Pt0OzM9+TGN0snZiHj46Qzrpagrvc8abv1+W4rCnSLFQ9YHPwTURmxIV+97/T52 VYVqo6z5HGsSQR6ftlrnC6HveRtNElKaZUjJftLEjWj/YKbrNkDfFsHKmB6UgT1w/eoOF3M6beh B0gsTPie4n7A2NK2RKHg5E7J55xGrZ0+NmetnGJENF5j4GVDO1B9aUXS9v8y3tIU2xqXjg591iv /9FIDC+/wiDeHXT5KEaxsDwIVya+eUZ/YVlFwiYDSge/4nXCh1j3046HdSv3nY= X-Proofpoint-GUID: soYKR_QXwpT_QwrzzNeaAMNN-TB-2PmN X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-13_03,2026-04-13_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 malwarescore=0 spamscore=0 mlxscore=0 adultscore=0 phishscore=0 clxscore=1030 mlxlogscore=999 lowpriorityscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2604130168 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=57.103.73.231; envelope-from=mohamed@unpredictable.fr; helo=outbound.ms.icloud.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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 @unpredictable.fr) X-ZM-MESSAGEID: 1776099903041154100 Content-Type: text/plain; charset="utf-8" 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 Reviewed-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 e85e4227b3..05ef5222f7 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.50.1 (Apple Git-155)