From nobody Thu Mar 17 13:31:01 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7E1E81A366BE; Thu, 17 Mar 2022 13:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KK7M934tlz55yv; Thu, 17 Mar 2022 13:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647523861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4vcP/NzrWB2Ft3M61DBbtsFGHlkiWNMMBXzQUOspGGw=; b=jO6dRIFUnbP2Zoxv3wv/9YdfUfFj8WmKpJk0mC0JBR3IXFvJfVF5zxGX/SF3xnp6Ggvi1E Nqr0aKF8gqsfymVInLb+w5ij7d5551sbaIzS6YNTbrw+gEsC25kXuxB5TCEawUUBjdEVAQ 4frCaq1cyssCYg0wb3Ri+rb64wOKXHlRvN5yoQuw4x903uD5j/Wo5B+EnM/YAaq1B9U70d vnchrYt2UaRjDfaDaastlYFxWZDsTtrY/xdOQOK9yInrlRcfBDUBpbOhb7LNVUwQDb58C9 gVJrcmQeAfSt7IE7xolrTpDZwDN3aPrXZmf+MqrWFtbLMeOk9QX+iNk3vlzH3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 49A7E303E; Thu, 17 Mar 2022 13:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22HDV1R6076308; Thu, 17 Mar 2022 13:31:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22HDV1Cd076307; Thu, 17 Mar 2022 13:31:01 GMT (envelope-from git) Date: Thu, 17 Mar 2022 13:31:01 GMT Message-Id: <202203171331.22HDV1Cd076307@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger Pau Monn=C3=A9?= Subject: git: 0518832011ca - main - vt/vga: ignore ACPI_FADT_NO_VGA unless running virtualized List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0518832011caba1e9dcee054d7884797ed8a74c2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647523861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4vcP/NzrWB2Ft3M61DBbtsFGHlkiWNMMBXzQUOspGGw=; b=bPOC385XvyLqdIsS31aQCpB5FQRb49+pbrKz7DYFUqdDqK4eGZ438FXvqBET3cZNcb/mBM qlMX7S2oaMWzFBhDILHgB6I/Z+850OSLKYimPOq/3kQA4bGVFthwslsYPeTFd+Gkn5ZzAC 14N5LtfjzYtlrm/OmoJ5bropUSRSdy0dMeY4vw2pKiqO1QbCZbMRbVshv4BhOHfNp0OHCb p9+lwZULk0Uj25srsV5Ig1VwA2UpEKSvvcGTz3m/+z9/7PuUS2WDwBIsJh+lo/ADL/BB48 j+1nySKuRRUfo5uQFuaGssC8v2P8fAgTeM/6nziS/XaXnt2RpDQ/VuKQV3UATg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647523861; a=rsa-sha256; cv=none; b=mXnIUkDAK7TE1FOORjhxkl46dGR6UuYE0hA2n/QZKvYshS89X6zttB+01g+jVqid/zVLgM nbnxAJJEeaKFrKOa3RzoaxVjQbIwOY3/idFXXzLMo3k0xHXESS1DRlRJX4CoGrUvEWoSVf 5lkeiGm3Q57z3Kg9zm2rzQ2QYz5Tsqxxd9OkdPMynMEogpkToaPgJ96UK1qbrHSSYl869B DBgzurXUpIrPwvoIo2iVMvX8wK3850bIoqoijWSuj//XR4rv7qMoknLBVzplPGREDFaT36 vIwehEIh/768qw6GPLko/ftmbxZZMXBe3msg8r7UCqBTdp7lhr4VOtkzLdcQUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=0518832011caba1e9dcee054d7884797ed8a74c2 commit 0518832011caba1e9dcee054d7884797ed8a74c2 Author: Roger Pau Monné AuthorDate: 2022-02-24 15:53:30 +0000 Commit: Roger Pau Monné CommitDate: 2022-03-17 13:30:39 +0000 vt/vga: ignore ACPI_FADT_NO_VGA unless running virtualized There's too many broken hardware out there that wrongly has the ACPI_FADT_NO_VGA bit set. Ignore it unless running as a virtualized guest, as then the expectation would be that the hypervisor does provide correct ACPI tables. Reviewed by: emaste, 0mp, eugen MFC: 3 days Sponsored by: Citrix Systems R&D PR: 230172 Differential revision: https://reviews.freebsd.org/D34392 --- share/man/man4/vt.4 | 5 ++++- sys/dev/vt/hw/vga/vt_vga.c | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4 index 68ac90908636..dbe079fbe452 100644 --- a/share/man/man4/vt.4 +++ b/share/man/man4/vt.4 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 4, 2022 +.Dd March 17, 2022 .Dt "VT" 4 .Os .Sh NAME @@ -204,6 +204,9 @@ graphics mode. Set to 1 to force the usage of the VGA driver regardless of whether ACPI IAPC_BOOT_ARCH signals no VGA support. Can be used to workaround firmware bugs in the ACPI tables. +Note no VGA support is only acknowledged when running virtualized. +There is too many broken firmware that wrongly reports no VGA support on +physical hardware. .It Va kern.vty Set this value to .Ql vt diff --git a/sys/dev/vt/hw/vga/vt_vga.c b/sys/dev/vt/hw/vga/vt_vga.c index bac8f3eb7b97..d457f8c7b31d 100644 --- a/sys/dev/vt/hw/vga/vt_vga.c +++ b/sys/dev/vt/hw/vga/vt_vga.c @@ -1261,7 +1261,11 @@ vga_acpi_disabled(void) uint16_t flags; int ignore; - ignore = 0; + /* + * Ignore the flag on real hardware: there's a lot of buggy firmware + * that will wrongly set it. + */ + ignore = (vm_guest == VM_GUEST_NO); TUNABLE_INT_FETCH("hw.vga.acpi_ignore_no_vga", &ignore); if (ignore || !acpi_get_fadt_bootflags(&flags)) return (false);