From nobody Tue Oct 31 20:52:42 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 4SKj564nb3z4ysHC; Tue, 31 Oct 2023 20:52:42 +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 4SKj564G6dz4V8M; Tue, 31 Oct 2023 20:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698785562; 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=kafurGtXYi3lWpoOlBwcBSnaGGvg5bDng1xYsMh78Vk=; b=hdFnopwdtBNlK3DSJVHmc2EMMikpcmd5knsrTWmPgZOuvNJX8O8/X2oauRnAbs5A1EpKjZ 3lhjiAJZ0uqze1OnQht16wCOK+e5XkOhAXk1fOPgFlOftrQ6VdMbPjjRhflDSxySjxxOKk ufYNjlx42kxW/OTPh4m08Ei2VX2UFn9+vPIKd/pcQ7RLYExvxVuMimxzmgDJ2liHZ4nyNO HAi9XY1G7vODV/Mkh2gfR0e7LR4kaTSy9I+kFNW29bkyxH0slGQfaViYlDNOx2erAQ+3Bz qJsw0XFZKB3w5oyRvOJEjsSA5rvDLFUr604VM9kw3FPDHN/Xco803JlnGFG/pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698785562; 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=kafurGtXYi3lWpoOlBwcBSnaGGvg5bDng1xYsMh78Vk=; b=BdW9w75vwIEdH2ROT2hVVY1VhJEny4+OA6Oj05wW4lOpY2kQHhHHT7lG8Mb/+++t+vG67G msLOfxVhY39mfQMIqARdP8UC+S4i3wJ11t3tJQAL1PX0NJ7GfgT5zusI676BMk+Rf7eQ1S cVR//5/fASf6GuyXgSq6JJFAOupFcXW+Z+dE4vH2EyjHNEaXc9wGvYI491uAGx5D29TvTf sFniXwIqj/h9kTws1jFYOxlIvtC/Fw/EOiE84OncoGGEW1rK5+/nhjt6fSg37GUNilFnOg lRm54gHjzbHeKKbkocV26rskytCxcZHuyF3R1ZaMHDBH8X/mpuAA+thl1DPnfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698785562; a=rsa-sha256; cv=none; b=YmjOH7NUeRVtd7/Jsr61yQn1C2VP+XJYE1m56Gi4cViYT+vw4yLa9VK9cMEhSPJnSFyDn8 Syl0j2kXCa1X52MM2GP5yiDpGNIpKQHOhyJtSChc7OEiJuyWFWADhB0Jff4plb28P5HKvv X/ls5Z9GIK5lCYcB7AJ5wC4PtyiM7cH59W9BRZYFuM8qCtfRTsq45pgpTMFyE6JYJdUx1l h4NMFi7gfRhSURtbaNKfQF6rbPgEvi26Kuny/viSJA1UiI/8pDjOrsKw8b4AS7wfltXPhe PgheoAIKoargYiaPFbpLYKf+V89N5mmW/SkVwpReVQPp9+WENc25tQ0t35NW+Q== 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 4SKj563Kgpz3rH; Tue, 31 Oct 2023 20:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39VKqgwH030304; Tue, 31 Oct 2023 20:52:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39VKqgxd030301; Tue, 31 Oct 2023 20:52:42 GMT (envelope-from git) Date: Tue, 31 Oct 2023 20:52:42 GMT Message-Id: <202310312052.39VKqgxd030301@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: 1fc478fb48e9 - main - bhyve: ps2 implement command 0xf6 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: 1fc478fb48e9a3ca31f9715164dac47038497a7e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1fc478fb48e9a3ca31f9715164dac47038497a7e commit 1fc478fb48e9a3ca31f9715164dac47038497a7e Author: Warner Losh AuthorDate: 2023-10-31 20:03:32 +0000 Commit: Warner Losh CommitDate: 2023-10-31 20:52:22 +0000 bhyve: ps2 implement command 0xf6 Implement PS2 Keyboard command 0xf6, which is "SET DEFAULTS". This is the same as 0xf5 (DISABLE KEYBOARD), but without disabling the keyboard (since that resets all the defaults as a side effect). Normally, we clear the fifo when we re-enable the keyboard. However, since this leaves the keyboard enabled, clear the fifo as part of this command and send an ack. Linux's keyboard driver sends this command on reboot. Other commands enable / reset the kebyoard, so it doesn't matter too much this isn't implemented for booting, eg ubuntu. Sponsored by: Netflix Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D42384 --- usr.sbin/bhyve/amd64/ps2kbd.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/usr.sbin/bhyve/amd64/ps2kbd.c b/usr.sbin/bhyve/amd64/ps2kbd.c index 6fe36dbc4a55..c9e122b8bbd3 100644 --- a/usr.sbin/bhyve/amd64/ps2kbd.c +++ b/usr.sbin/bhyve/amd64/ps2kbd.c @@ -53,6 +53,7 @@ /* keyboard device commands */ #define PS2KC_RESET_DEV 0xff +#define PS2KC_SET_DEFAULTS 0xf6 #define PS2KC_DISABLE 0xf5 #define PS2KC_ENABLE 0xf4 #define PS2KC_SET_TYPEMATIC 0xf3 @@ -300,6 +301,10 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val) fifo_put(sc, PS2KC_ACK); fifo_put(sc, PS2KC_BAT_SUCCESS); break; + case PS2KC_SET_DEFAULTS: + fifo_reset(sc); + fifo_put(sc, PS2KC_ACK); + break; case PS2KC_DISABLE: sc->enabled = false; fifo_put(sc, PS2KC_ACK);