From nobody Thu May 25 04:34:04 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 4QRZvK17rfz4Cd0m; Thu, 25 May 2023 04:34:05 +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 4QRZvK0d3jz49Tk; Thu, 25 May 2023 04:34:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684989245; 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=WXzVFN/a1lNkD7pxrfCjCW5VkZGKNNraSM5Na6jxqFE=; b=liCH0XVXtnl8l/urozmg7eAjLevK0F5nW4bCTBUc3O4TzkQ/fusR0P4rFZ009WooHWepYQ y6+sXXYpWPsIk+YLXYAzGPfmndHy8DiN7vdzFijOLID0VgbhEyr4X0w8+F07Gxl7UxltSE rxu7ekVPcAeZle/G07tbJLqlfVW+Tph4ZYuSs2YLqyO6P4QO8tz0hqFIpPq9l64YCZRep8 tHAQbjSMLB1fwl4/rtxC4E6lpEAJTJ21ceB8W8wIdj8lMBc+U5dkZAhFkmilZHOzLUvYLm 0m3E8E/Y2zaEG8G0A9JGaN7oMLQcxI0yLhqj7SOxGLz6hV+lsmw6sXWKF7WwNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684989245; 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=WXzVFN/a1lNkD7pxrfCjCW5VkZGKNNraSM5Na6jxqFE=; b=uqpPWm3vhjjLY0P8pocafv3CWyFPamU9OAXocLuo15mFo+XaXBBKJh6cINwS3MvJNR0ZVH mZBR3TWpJ+U6hydW76BVeYksH6jvbNzJO6uzgmogflWCWkgxTLKZ7VEZ+pCf2JOmVWwHGG mhxweYjd3ir19HaNN/3ehEsUo9ligCVSlMM7NNVWX+s2n4O5zBCIJwZJ/gAqIJZkAlzjhB mjNVm3jfGhANLAh0nUsyoihDdNI9bxhoJnnhfdYTHigJTpxsOyvWGS8n8KzHbokX63QHMY +Nfem3uwvBmXBmmJ79wVWpCEqvEE8s09qjf/1O25sh4af9ydc0af0TMFWO6crQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684989245; a=rsa-sha256; cv=none; b=xoWFcvMHWE4d2IC6uOn5kskDBhIT1XHVRMbMXYLVZlkEvshQoTDiDKSYpF8hNCocBQ0s+v bqnXb2v0EwxODWJM/iaeZ9FzDsCpfAPWpjZjq9dsA6ygt2FzuZMVCRVa+DfDpbbiLC73qr 9hluRuUJU+5AlTNqED/MfPs0Od8NdR0e0cRCbJbmxUxblTRgDGP4ke04w2IiNXqBg0AjFR NOnkMGAi3QAyiwMxj37Urb8XyJPzHQNtxPMth8zCAAQkRkuNrr1fleBtYCmqDmKeuZVH/1 LzbpolF5O1HrgVdJlULwf1/6uuTO1ucv/HwWY3T76nJ8m+RRvWB96tR1X2H+xg== 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 4QRZvJ6qjbz19Lp; Thu, 25 May 2023 04:34:04 +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 34P4Y4lH089326; Thu, 25 May 2023 04:34:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34P4Y4db089325; Thu, 25 May 2023 04:34:04 GMT (envelope-from git) Date: Thu, 25 May 2023 04:34:04 GMT Message-Id: <202305250434.34P4Y4db089325@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: e5d4e036f247 - main - stand/efi/eficom: Make aarch64 compat code probe correctly 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: e5d4e036f2476927369615d4c29651dd2eb3b8a1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e5d4e036f2476927369615d4c29651dd2eb3b8a1 commit e5d4e036f2476927369615d4c29651dd2eb3b8a1 Author: Warner Losh AuthorDate: 2023-05-24 22:34:44 +0000 Commit: Warner Losh CommitDate: 2023-05-25 04:33:53 +0000 stand/efi/eficom: Make aarch64 compat code probe correctly Make the compat code more correct by probing using the eficom console structure, not the comconsole one. Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D40222 --- stand/efi/libefi/eficom.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/stand/efi/libefi/eficom.c b/stand/efi/libefi/eficom.c index 586202efee00..6ff8512dedd7 100644 --- a/stand/efi/libefi/eficom.c +++ b/stand/efi/libefi/eficom.c @@ -362,10 +362,13 @@ comc_probe(struct console *sc) static void comc_probe_compat(struct console *sc) { - comc_probe(sc); - if (sc->c_flags & (C_PRESENTIN | C_PRESENTOUT)) { + comc_probe(&eficom); + if (eficom.c_flags & (C_PRESENTIN | C_PRESENTOUT)) { printf("comconsole: comconsole device name is deprecated, switch to eficom\n"); } + /* + * Note: We leave the present bits unset in sc to avoid ghosting. + */ } #endif