From nobody Thu May 25 04:34:03 2023 X-Original-To: dev-commits-src-all@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 4QRZvJ0J1gz4CcxR; Thu, 25 May 2023 04:34:04 +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 4QRZvH6rsFz49QZ; Thu, 25 May 2023 04:34:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684989244; 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=jufPJ6kD1xWBijmeyfwKivTD6XeKuq/qeQbjYmGuDWI=; b=Odp1ApHZojEH3V/vPDb47mEoNzsN7gOQmQvf8s1mz1nNVYKIQjdWFWo+/sDAUFlB5tX+jk U0YcXrnYPNtZVyQzSPeWXQW6n1M5hI6a29OWyV90J9KQoE2bHwZ8GnycfjbeTHOBAYnN1d 0mNh1RwLkJvaabQdZwoPDgEOUqd6vE7P8YXh4Ou9UhXHG3M3VSCH74YJ8Wo80ECrKFG32H Jdvfyu5STWF8a+BjttdtGbw+zqUW7ZK6N0wcEhC8ngOWYfvnmaDZD22OvMBqCSzL0UIvk7 dN7eWuop4xsSjpQHR82e5Dnuadchxe7IlJ6RAbx/hO0kZ9Xyj7C+98iuYjL6dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684989244; 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=jufPJ6kD1xWBijmeyfwKivTD6XeKuq/qeQbjYmGuDWI=; b=nFR9AubW56ykG97esIu4MxUZWyG0z/39mMkcaYcVsEZrzZBQXu8hXtR0N8gp3LEGd+5x9v pF8CovpHNrZ6gLRmVfQaL1Mha7HcTzDijKOMgwyuFc3pr5nxBkmXxQGi8GSRmi81gzkqwg EzCuLVgx6mbslQkUwG9u9SkwR/dDRnVCxNVakeUg2ddDfPnTrvHp37RguKrku2CeUV1JFy vG/jNyQ3T3tWFLPlLUawqynh1NW+gkN2KrI6qPOJwH+02bDMq+juQuTxKkq7z/VAjnUmcR HXEhNNwPWmnLgJz0cPHKnpGsfkFh1rAcYJxSoJJRcM7R3EPX9SoLSHsK+z+Z1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684989244; a=rsa-sha256; cv=none; b=fXOBpMU9qnFSuK6zdJbJZNjZWCoeWeYVd6SLEAuviTWL/n+vayYUfULTftLVHtbFnBJKlU ce0vkr7IkEEEHbje9u54pGo7Ia6cqpNW8i0sOq0k2gEGGp9qMr4d5uCP/kY37xOIJPpsRY a2pYbth+7O9MHJZZnotPoucvc/7WesL9G7Qse2hOyCtjFlpKUx2i1CQxFMkRNhMRUg75uB x/9B7aW4iAtddYltSQQx8E/1r4ntSGYRd/fJlHGe1VywOYfCa9BhBdAafsr3Whmw53sxXf Mc/idvg6J8JGprRCGrZrXSyxrs/03XqhRl++is7BH1aFzpFD0DlhP27xg9ppqA== 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 4QRZvH5xpyz19X8; Thu, 25 May 2023 04:34:03 +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 34P4Y38U089302; Thu, 25 May 2023 04:34:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34P4Y3N5089301; Thu, 25 May 2023 04:34:03 GMT (envelope-from git) Date: Thu, 25 May 2023 04:34:03 GMT Message-Id: <202305250434.34P4Y3N5089301@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 42b0b7a926e3 - main - stand/efi/eficom: Don't allow this for !HYPERV machines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42b0b7a926e3e4834dda923a0751f312e008ad92 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=42b0b7a926e3e4834dda923a0751f312e008ad92 commit 42b0b7a926e3e4834dda923a0751f312e008ad92 Author: Warner Losh AuthorDate: 2023-05-24 22:34:37 +0000 Commit: Warner Losh CommitDate: 2023-05-25 04:33:53 +0000 stand/efi/eficom: Don't allow this for !HYPERV machines If the machine isn't hyperv on amd64, then this driver fails the probe and will do nothing further now, even if explicitly listed in a config. Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D40221 --- stand/efi/libefi/eficom.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/stand/efi/libefi/eficom.c b/stand/efi/libefi/eficom.c index ca08458c2ca2..586202efee00 100644 --- a/stand/efi/libefi/eficom.c +++ b/stand/efi/libefi/eficom.c @@ -254,6 +254,11 @@ comc_get_con_serial_handle(const char *name) return (NULL); } +/* + * Called from cons_probe() to see if this device is available. + * Return immediately on x86, except for hyperv, since it interferes with + * common configurations otherwise (yes, this is just firewalling the bug). + */ static void comc_probe(struct console *sc) { @@ -265,6 +270,18 @@ comc_probe(struct console *sc) char *env, *buf, *ep; size_t sz; +#ifdef __amd64__ + /* + * This driver tickles issues on a number of different firmware loads. + * It is only required for HyperV, and is only known to work on HyperV, + * so only allow it on HyperV. + */ + env = getenv("smbios.bios.version"); + if (env == NULL || strncmp(env, "Hyper-V", 7) != 0) { + return; + } +#endif + if (comc_port == NULL) { comc_port = calloc(1, sizeof (struct serial)); if (comc_port == NULL)