From nobody Thu May 11 20:06:47 2023 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 4QHNFz4VTHz49xRr; Thu, 11 May 2023 20:06:47 +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 4QHNFz3Vc3z3njZ; Thu, 11 May 2023 20:06:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835607; 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=81nEfv/JdhDqObL+LA/RpDTwhLIrEvWRwENohQjj4Rs=; b=E20covy0fbPoM9/Eh7oU/erjevMe7VLdrnsUP9sHOl3/kAxGh1ZdqItBen9VZtj2sWjBwH wAxYvUCF19+myPvDfkA8WBOf9VRJV0wmpL2pD92LkUPyQ8JO+xFmTfvLTidI7k9dWS5TC3 4CM22+VO5WDySDhDO+tm/v7iX/vCb7x6ypq/fzr1jH+fxkWT9GIF7vHxu+uXf9UsczO+Ts bfCt5sA6JOmiY8sWA8s54+oYunp8VViNRvuqIxjLxTeeSXndtAFtDMOSO83Gpg+ztu1LH5 7yjI6vG4olDx9gVW9k867vH/DZhu7v/8ztexWqddPLNLSbyZ5lEriwu1te3avQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835607; 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=81nEfv/JdhDqObL+LA/RpDTwhLIrEvWRwENohQjj4Rs=; b=HDPzg9EjumfeTx9om+eJ/GvHKdMKfYeBagRtn2kLfKZzu420ZYqHBAWW2i1U80rrWjp0Ej VewCUIsYnVxycJq3OMC6rLPa8Le1tzPb9qpceJINCqW0PtOLgFNHXyMtYpOB4lRl+tnjgg 0pugR1ckWS4OvrgU2exNXWRBfgQZaHSiYPdH9dv46uFcu8CSY0qEuzjOiI+bL6v6BiwaWQ 6tYrVM0Ou+ip+2TOc+H8TkT8C/klyd+oWKE9EpCr738Buqhs0lVjmO7kH9y2BddUmaiIKh zISqRM6xXK6v9Cqndu0Yq5lLBW+lp19A1avuPSBFpDkZAlfF/dJePXhLryeOfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683835607; a=rsa-sha256; cv=none; b=Hyx2hzeReR0+jawJUVmsx/iQZpqXXNNv8THtvKb29wsrcxlr2NltHHCg45HunjlTWE4t47 xLN0es9R5g0UnGtKV7cloYM5mptDYQ/J0q6MZbFQWEWNvWgEym+FnvQm5UYjRiWlh3OhJo Xd7YIg8EUSJVvdR+HI7M/KknnFrz6BPbHCzC8dXW3AOdwr/bkq114/PainEMfQfCrOGUHa XEhNzqEIXFyD5iHXDpIYLZbBUDA69o3/lwhKhHygwdfSoilbob5+24/jpA4HlRchAwwfEf rFyXRO114kvrJAUOwId97ov+HvrhRJS7VSvpsjxBBBkTRYsJU/PkVyAlrAjP0g== 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 4QHNFz1xbxz16Gm; Thu, 11 May 2023 20:06:47 +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 34BK6lNF019513; Thu, 11 May 2023 20:06:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BK6lp5019512; Thu, 11 May 2023 20:06:47 GMT (envelope-from git) Date: Thu, 11 May 2023 20:06:47 GMT Message-Id: <202305112006.34BK6lp5019512@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: f93416d67743 - main - stand: add comconsole backwards compatibility shim for aarch64 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f93416d677432f3a713c71b79fb68e89162baca9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f93416d677432f3a713c71b79fb68e89162baca9 commit f93416d677432f3a713c71b79fb68e89162baca9 Author: Warner Losh AuthorDate: 2023-05-11 20:03:30 +0000 Commit: Warner Losh CommitDate: 2023-05-11 20:06:03 +0000 stand: add comconsole backwards compatibility shim for aarch64 Add a compat shim for the "comconsole" name so that people with a "console=comconsole" in their loader.conf on aarch64 will continue to work (though with a warning). This is only aarch64: it will never be there for amd64 (where comconsole always means talk to the hardware directly). To do that is too hard. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D39983 --- stand/efi/loader/conf.c | 7 +++++++ stand/efi/loader/efiserialio.c | 25 +++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/stand/efi/loader/conf.c b/stand/efi/loader/conf.c index e9ae01d19270..e84d8b6c366d 100644 --- a/stand/efi/loader/conf.c +++ b/stand/efi/loader/conf.c @@ -81,6 +81,10 @@ struct netif_driver *netif_drivers[] = { extern struct console efi_console; extern struct console eficom; +#if defined(__aarch64__) && __FreeBSD_version < 1500000 +/* Hack for backward compatibility -- but only for a while */ +extern struct console comconsole; +#endif #if defined(__amd64__) || defined(__i386__) extern struct console comconsole; extern struct console nullconsole; @@ -90,6 +94,9 @@ extern struct console spinconsole; struct console *consoles[] = { &efi_console, &eficom, +#if defined(__aarch64__) && __FreeBSD_version < 1500000 + &comconsole, +#endif #if defined(__amd64__) || defined(__i386__) &comconsole, &nullconsole, diff --git a/stand/efi/loader/efiserialio.c b/stand/efi/loader/efiserialio.c index de4d6b3e34c1..16f28080f80e 100644 --- a/stand/efi/loader/efiserialio.c +++ b/stand/efi/loader/efiserialio.c @@ -81,6 +81,20 @@ struct console eficom = { .c_ready = comc_ischar, }; +#if defined(__aarch64__) && __FreeBSD_version < 1500000 +static void comc_probe_compat(struct console *); +struct console comconsole = { + .c_name = "comconsole", + .c_desc = "serial port", + .c_flags = 0, + .c_probe = comc_probe_compat, + .c_init = comc_init, + .c_out = comc_putchar, + .c_in = comc_getchar, + .c_ready = comc_ischar, +}; +#endif + static EFI_STATUS efi_serial_init(EFI_HANDLE **handlep, int *nhandles) { @@ -328,6 +342,17 @@ comc_probe(struct console *sc) } } +#if defined(__aarch64__) && __FreeBSD_version < 1500000 +static void +comc_probe_compat(struct console *sc) +{ + comc_probe(sc); + if (sc->c_flags & (C_PRESENTIN | C_PRESENTOUT)) { + printf("comconsole: comconsole device name is deprecated, switch to eficom\n"); + } +} +#endif + static int comc_init(int arg __unused) {