From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: "Volker Rümelin" <vr_qemu@t-online.de>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org
Subject: Re: [PATCH 09/10] pckbd: correctly disable PS/2 communication
Date: Thu, 6 May 2021 08:27:53 +0200 [thread overview]
Message-ID: <5bb37b0e-6625-c356-e542-54fc29d4dfb5@redhat.com> (raw)
In-Reply-To: <20210505192133.7480-9-vr_qemu@t-online.de>
Hi Volker,
On 5/5/21 9:21 PM, Volker Rümelin wrote:
> Currently the PS/2 controller command KBD_CCMD_MOUSE_DISABLE
> doesn't disable the PS/2 mouse communication at all, and the
> PS/2 controller commands KBD_CCMD_KBD_DISABLE and
> KBD_CCMD_KBD_ENABLE disable and enable the keyboard interrupt,
> which is very different from what a real PS/2 controller does.
> A guest may notice the difference.
>
> Mask out pending data on disabled queues to correctly disable
> the PS/2 controller communication.
>
> Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
> ---
> hw/input/pckbd.c | 48 +++++++++++++++++++++++++++++++++++-------------
> 1 file changed, 35 insertions(+), 13 deletions(-)
> +static uint8_t kbd_pending(KBDState *s)
> +{
> + return s->pending & (~s->mode | ~(KBD_PENDING_KBD | KBD_PENDING_AUX));
> +}
Please introduce kbd_pending() in a preliminary patch.
> /* update irq and KBD_STAT_[MOUSE_]OBF */
> static void kbd_update_irq(KBDState *s)
> {
> + uint8_t pending = kbd_pending(s);
> +
> s->status &= ~(KBD_STAT_OBF | KBD_STAT_MOUSE_OBF);
> s->outport &= ~(KBD_OUT_OBF | KBD_OUT_MOUSE_OBF);
> - if (s->pending) {
> + if (pending) {
> s->status |= KBD_STAT_OBF;
> s->outport |= KBD_OUT_OBF;
> - if (s->pending & KBD_PENDING_CTRL_KBD) {
> + if (pending & KBD_PENDING_CTRL_KBD) {
> s->obsrc = KBD_OBSRC_CTRL;
next prev parent reply other threads:[~2021-05-06 6:36 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-05 19:20 [PATCH 00/10] PS/2 controller related fixes Volker Rümelin
2021-05-05 19:21 ` [PATCH 01/10] ps2: fix mouse stream corruption Volker Rümelin
2021-05-05 19:21 ` [PATCH 02/10] ps2: don't raise an interrupt if queue is full Volker Rümelin
2021-05-06 6:15 ` Philippe Mathieu-Daudé
2021-05-05 19:21 ` [PATCH 03/10] ps2: don't deassert irq twice if queue is empty Volker Rümelin
2021-05-06 6:32 ` Philippe Mathieu-Daudé
2021-05-05 19:21 ` [PATCH 04/10] pckbd: split out interrupt line changing code Volker Rümelin
2021-05-06 6:17 ` Philippe Mathieu-Daudé
2021-05-05 19:21 ` [PATCH 05/10] pckbd: don't update OBF flags if KBD_STAT_OBF is set Volker Rümelin
2021-05-05 19:21 ` [PATCH 06/10] pckbd: PS/2 keyboard throttle Volker Rümelin
2021-05-05 19:21 ` [PATCH 07/10] pckbd: add state variable for interrupt source Volker Rümelin
2021-05-05 19:21 ` [PATCH 08/10] pckbd: add controller response queue Volker Rümelin
2021-05-05 19:21 ` [PATCH 09/10] pckbd: correctly disable PS/2 communication Volker Rümelin
2021-05-06 6:27 ` Philippe Mathieu-Daudé [this message]
2021-05-06 18:06 ` Volker Rümelin
2021-05-05 19:21 ` [PATCH 10/10] pckbd: remove duplicated keyboard and mouse defines Volker Rümelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5bb37b0e-6625-c356-e542-54fc29d4dfb5@redhat.com \
--to=philmd@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=vr_qemu@t-online.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).