From nobody Mon May 6 00:41:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1631269710; cv=none; d=zohomail.com; s=zohoarc; b=hy3dHPDfxvrWaSc8veNpKzRGICOz0+/FjJjL8aU5iCTiq3Zp1i8QNdDIbjUeuqOEnN9eDrZSEbtsi1CmjNdFCZ8gibyy7ADbdX0EW119VEfCwbS9QcEdKDxYs+iHpbFAWxt8YOgYuGBAxECYrIir0m3pYFI4tqiMWK1zAr0prIs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631269710; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/Z8y1TjvdEG2Wx21WRgDWgLRpXfPBMrRQpf0FnstdbU=; b=RYynzdFMnc5W0pMBlzlKX2M/DHU5foM9+eRN4Cdm7NXVuFYEhkaHdOkLUMk9Jb8WEOVVsne9Sj/yLyUQF37eAUdL/QSV1/+gRD/eEGtoU7HB1wAdGrK3uK/oFUqZadyailui/cxrW/0LLIp1MulWz6y6CL9DpvRbox64ZtZsVtc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631269710909758.3536503011564; Fri, 10 Sep 2021 03:28:30 -0700 (PDT) Received: from localhost ([::1]:50422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mOdll-00058h-OJ for importer@patchew.org; Fri, 10 Sep 2021 06:28:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35420) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOdgh-0007lk-Rt for qemu-devel@nongnu.org; Fri, 10 Sep 2021 06:23:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:53208) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOdge-0005xF-TQ for qemu-devel@nongnu.org; Fri, 10 Sep 2021 06:23:15 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-387-98CL85L9MQ2uYQX22FUPAQ-1; Fri, 10 Sep 2021 06:23:08 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C2FFF80006E; Fri, 10 Sep 2021 10:23:07 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C9EB118FD2; Fri, 10 Sep 2021 10:23:03 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id DADBA180038E; Fri, 10 Sep 2021 12:23:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631269392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/Z8y1TjvdEG2Wx21WRgDWgLRpXfPBMrRQpf0FnstdbU=; b=W/ocz5lZG0x2p1t5LgQmxgMrEAAa9QNXuGE4hUXlB35Gd3CnaFQlUBSwiaxplGoMW5ix7O b3OOvllrIzCwiCQOqW8PBDEzrAnWZ1AQUIKAjyKvXLl1nzPTjkCwYeEQ1w9TSZyVmMbq1S K3qqfjXPuMbVAMgUWr5SA/htpKDWRJc= X-MC-Unique: 98CL85L9MQ2uYQX22FUPAQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 1/3] ps2: use the whole ps2 buffer but keep queue size Date: Fri, 10 Sep 2021 12:22:58 +0200 Message-Id: <20210910102300.3589982-2-kraxel@redhat.com> In-Reply-To: <20210910102300.3589982-1-kraxel@redhat.com> References: <20210910102300.3589982-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.393, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Volker=20R=C3=BCmelin?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1631269712888100001 From: Volker R=C3=BCmelin Extend the used ps2 buffer size to the available buffer size but keep the maximum ps2 queue size. The next patch needs a few bytes of the larger buffer size. Signed-off-by: Volker R=C3=BCmelin Message-Id: <20210810133258.8231-1-vr_qemu@t-online.de> Signed-off-by: Gerd Hoffmann --- hw/input/ps2.c | 69 +++++++++++++++----------------------------------- 1 file changed, 20 insertions(+), 49 deletions(-) diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 8dd482c1f65b..23e7befee5bb 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -74,7 +74,12 @@ #define MOUSE_STATUS_ENABLED 0x20 #define MOUSE_STATUS_SCALE21 0x10 =20 -#define PS2_QUEUE_SIZE 16 /* Buffer size required by PS/2 protocol */ +/* + * PS/2 buffer size. Keep 256 bytes for compatibility with + * older QEMU versions. + */ +#define PS2_BUFFER_SIZE 256 +#define PS2_QUEUE_SIZE 16 /* Queue size required by PS/2 protocol */ =20 /* Bits for 'modifiers' field in PS2KbdState */ #define MOD_CTRL_L (1 << 0) @@ -85,9 +90,7 @@ #define MOD_ALT_R (1 << 5) =20 typedef struct { - /* Keep the data array 256 bytes long, which compatibility - with older qemu versions. */ - uint8_t data[256]; + uint8_t data[PS2_BUFFER_SIZE]; int rptr, wptr, count; } PS2Queue; =20 @@ -200,8 +203,9 @@ void ps2_queue_noirq(PS2State *s, int b) } =20 q->data[q->wptr] =3D b; - if (++q->wptr =3D=3D PS2_QUEUE_SIZE) + if (++q->wptr =3D=3D PS2_BUFFER_SIZE) { q->wptr =3D 0; + } q->count++; } =20 @@ -509,13 +513,15 @@ uint32_t ps2_read_data(PS2State *s) (needed for EMM386) */ /* XXX: need a timer to do things correctly */ index =3D q->rptr - 1; - if (index < 0) - index =3D PS2_QUEUE_SIZE - 1; + if (index < 0) { + index =3D PS2_BUFFER_SIZE - 1; + } val =3D q->data[index]; } else { val =3D q->data[q->rptr]; - if (++q->rptr =3D=3D PS2_QUEUE_SIZE) + if (++q->rptr =3D=3D PS2_BUFFER_SIZE) { q->rptr =3D 0; + } q->count--; /* reading deasserts IRQ */ s->update_irq(s->update_arg, 0); @@ -926,30 +932,17 @@ static void ps2_common_reset(PS2State *s) static void ps2_common_post_load(PS2State *s) { PS2Queue *q =3D &s->queue; - uint8_t i, size; - uint8_t tmp_data[PS2_QUEUE_SIZE]; =20 - /* set the useful data buffer queue size, < PS2_QUEUE_SIZE */ - size =3D q->count; + /* set the useful data buffer queue size <=3D PS2_QUEUE_SIZE */ if (q->count < 0) { - size =3D 0; + q->count =3D 0; } else if (q->count > PS2_QUEUE_SIZE) { - size =3D PS2_QUEUE_SIZE; + q->count =3D PS2_QUEUE_SIZE; } =20 - /* move the queue elements to the start of data array */ - for (i =3D 0; i < size; i++) { - if (q->rptr < 0 || q->rptr >=3D sizeof(q->data)) { - q->rptr =3D 0; - } - tmp_data[i] =3D q->data[q->rptr++]; - } - memcpy(q->data, tmp_data, size); - - /* reset rptr/wptr/count */ - q->rptr =3D 0; - q->wptr =3D (size =3D=3D PS2_QUEUE_SIZE) ? 0 : size; - q->count =3D size; + /* sanitize rptr and recalculate wptr */ + q->rptr =3D q->rptr & (PS2_BUFFER_SIZE - 1); + q->wptr =3D (q->rptr + q->count) & (PS2_BUFFER_SIZE - 1); } =20 static void ps2_kbd_reset(void *opaque) @@ -1053,22 +1046,11 @@ static int ps2_kbd_post_load(void* opaque, int vers= ion_id) return 0; } =20 -static int ps2_kbd_pre_save(void *opaque) -{ - PS2KbdState *s =3D (PS2KbdState *)opaque; - PS2State *ps2 =3D &s->common; - - ps2_common_post_load(ps2); - - return 0; -} - static const VMStateDescription vmstate_ps2_keyboard =3D { .name =3D "ps2kbd", .version_id =3D 3, .minimum_version_id =3D 2, .post_load =3D ps2_kbd_post_load, - .pre_save =3D ps2_kbd_pre_save, .fields =3D (VMStateField[]) { VMSTATE_STRUCT(common, PS2KbdState, 0, vmstate_ps2_common, PS2Stat= e), VMSTATE_INT32(scan_enabled, PS2KbdState), @@ -1093,22 +1075,11 @@ static int ps2_mouse_post_load(void *opaque, int ve= rsion_id) return 0; } =20 -static int ps2_mouse_pre_save(void *opaque) -{ - PS2MouseState *s =3D (PS2MouseState *)opaque; - PS2State *ps2 =3D &s->common; - - ps2_common_post_load(ps2); - - return 0; -} - static const VMStateDescription vmstate_ps2_mouse =3D { .name =3D "ps2mouse", .version_id =3D 2, .minimum_version_id =3D 2, .post_load =3D ps2_mouse_post_load, - .pre_save =3D ps2_mouse_pre_save, .fields =3D (VMStateField[]) { VMSTATE_STRUCT(common, PS2MouseState, 0, vmstate_ps2_common, PS2St= ate), VMSTATE_UINT8(mouse_status, PS2MouseState), --=20 2.31.1 From nobody Mon May 6 00:41:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1631269491; cv=none; d=zohomail.com; s=zohoarc; b=G9ApsltoeVZQn8nbz0cufl2Q47ScwUwvCA46HHl2Dd5HgecUVAQYxDITV1sI3pd0+fyZ6HQ9fkYJ9PGjmg34aYJS4fTSjgZKC+mrmBC1F/440prAAAh0eZYoShrYeSJhCjpEckqlx83PN3ReBCPyZGd0yP8fxpP9SwL1zpw+Y+s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631269491; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/Vn96GG6yxevAOcXv9267enk6jzF62vBtTocwyjUDcU=; b=lf8xfVpg2avJDX76S4ZkTSTmGvWcG/JqrGTgNvJKJG0U+Ef6CNsyQOaoXDZy5U8Z2/PSOcRa+aKVgruSx9YrN+6Iyf3NYe4oNRiz1pJjgGL/1g4jH6cE9qF1w8lv/EpAiBErHbVhDeexOJSAqykehzIZ/3KNx64HqJV1zlaKbZU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631269491446693.219151998813; Fri, 10 Sep 2021 03:24:51 -0700 (PDT) Received: from localhost ([::1]:45620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mOdiE-0001aq-93 for importer@patchew.org; Fri, 10 Sep 2021 06:24:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOdgl-0007pj-6N for qemu-devel@nongnu.org; Fri, 10 Sep 2021 06:23:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:45341) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOdgj-000610-9m for qemu-devel@nongnu.org; Fri, 10 Sep 2021 06:23:18 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-226-VU4ZgfpdPiKIOGjNRmeJCg-1; Fri, 10 Sep 2021 06:23:15 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3373A80196C; Fri, 10 Sep 2021 10:23:14 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D692460CD1; Fri, 10 Sep 2021 10:23:09 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E6B2C18003AA; Fri, 10 Sep 2021 12:23:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631269396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/Vn96GG6yxevAOcXv9267enk6jzF62vBtTocwyjUDcU=; b=EERG5U7Kw72g9n7fiMHJZnw/RMk32qWjedJJlWcIUaPbShdlG110j1U2Qp0+tAETwlO1Sl kSX3zGIuWLWFNwZpbwbwja+n+asPT9UdxsusJoUbJ3OB9/e0N2Nk4PAK8yPUP5hgqIBTsP FIq2VHDdsbyddNughvZA8psG3vplsTw= X-MC-Unique: VU4ZgfpdPiKIOGjNRmeJCg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 2/3] ps2: use a separate keyboard command reply queue Date: Fri, 10 Sep 2021 12:22:59 +0200 Message-Id: <20210910102300.3589982-3-kraxel@redhat.com> In-Reply-To: <20210910102300.3589982-1-kraxel@redhat.com> References: <20210910102300.3589982-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.393, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Volker=20R=C3=BCmelin?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1631269493508100001 From: Volker R=C3=BCmelin A PS/2 keyboard has a separate command reply queue that is independent of the key queue. This prevents that command replies and keyboard input mix. Keyboard command replies take precedence over queued keystrokes. A new keyboard command removes any remaining command replies from the command reply queue. Implement a separate keyboard command reply queue and clear the command reply queue before command execution. This brings the PS/2 keyboard emulation much closer to a real PS/2 keyboard. The command reply queue is located in a few free bytes directly in front of the scancode queue. Because the scancode queue has a maximum length of 16 bytes there are 240 bytes available for the command reply queue. At the moment only a maximum of 3 bytes are required. For compatibility reasons rptr, wptr and count kept their function. rptr is the start, wptr is the end and count is the length of the entire keyboard queue. The new variable cwptr is the end of the command reply queue or -1 if the queue is empty. To write to the command reply queue, rptr is moved backward by the number of required bytes and the command replies are written to the buffer starting at the new rptr position. After writing, cwptr is at the old rptr position. Copying cwptr to rptr clears the command reply queue. The command reply queue can't overflow because each new keyboard command clears the command reply queue. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/501 Resolves: https://gitlab.com/qemu-project/qemu/-/issues/502 Signed-off-by: Volker R=C3=BCmelin Message-Id: <20210810133258.8231-2-vr_qemu@t-online.de> Signed-off-by: Gerd Hoffmann --- hw/input/ps2.c | 115 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 84 insertions(+), 31 deletions(-) diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 23e7befee5bb..8c06fd7fb428 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -91,7 +91,7 @@ =20 typedef struct { uint8_t data[PS2_BUFFER_SIZE]; - int rptr, wptr, count; + int rptr, wptr, cwptr, count; } PS2Queue; =20 struct PS2State { @@ -186,6 +186,7 @@ static void ps2_reset_queue(PS2State *s) =20 q->rptr =3D 0; q->wptr =3D 0; + q->cwptr =3D -1; q->count =3D 0; } =20 @@ -198,7 +199,7 @@ void ps2_queue_noirq(PS2State *s, int b) { PS2Queue *q =3D &s->queue; =20 - if (q->count =3D=3D PS2_QUEUE_SIZE) { + if (q->count >=3D PS2_QUEUE_SIZE) { return; } =20 @@ -260,6 +261,63 @@ void ps2_queue_4(PS2State *s, int b1, int b2, int b3, = int b4) ps2_raise_irq(s); } =20 +static void ps2_cqueue_data(PS2Queue *q, int b) +{ + q->data[q->cwptr] =3D b; + if (++q->cwptr >=3D PS2_BUFFER_SIZE) { + q->cwptr =3D 0; + } + q->count++; +} + +static void ps2_cqueue_1(PS2State *s, int b1) +{ + PS2Queue *q =3D &s->queue; + + q->rptr =3D (q->rptr - 1) & (PS2_BUFFER_SIZE - 1); + q->cwptr =3D q->rptr; + ps2_cqueue_data(q, b1); + ps2_raise_irq(s); +} + +static void ps2_cqueue_2(PS2State *s, int b1, int b2) +{ + PS2Queue *q =3D &s->queue; + + q->rptr =3D (q->rptr - 2) & (PS2_BUFFER_SIZE - 1); + q->cwptr =3D q->rptr; + ps2_cqueue_data(q, b1); + ps2_cqueue_data(q, b2); + ps2_raise_irq(s); +} + +static void ps2_cqueue_3(PS2State *s, int b1, int b2, int b3) +{ + PS2Queue *q =3D &s->queue; + + q->rptr =3D (q->rptr - 3) & (PS2_BUFFER_SIZE - 1); + q->cwptr =3D q->rptr; + ps2_cqueue_data(q, b1); + ps2_cqueue_data(q, b2); + ps2_cqueue_data(q, b3); + ps2_raise_irq(s); +} + +static void ps2_cqueue_reset(PS2State *s) +{ + PS2Queue *q =3D &s->queue; + int ccount; + + if (q->cwptr =3D=3D -1) { + return; + } + + ccount =3D (q->cwptr - q->rptr) & (PS2_BUFFER_SIZE - 1); + q->count -=3D ccount; + q->rptr =3D q->cwptr; + q->cwptr =3D -1; +} + /* keycode is the untranslated scancode in the current scancode set. */ static void ps2_put_keycode(void *opaque, int keycode) { @@ -523,6 +581,10 @@ uint32_t ps2_read_data(PS2State *s) q->rptr =3D 0; } q->count--; + if (q->rptr =3D=3D q->cwptr) { + /* command reply queue is empty */ + q->cwptr =3D -1; + } /* reading deasserts IRQ */ s->update_irq(s->update_arg, 0); /* reassert IRQs if data left */ @@ -554,92 +616,83 @@ void ps2_write_keyboard(void *opaque, int val) PS2KbdState *s =3D (PS2KbdState *)opaque; =20 trace_ps2_write_keyboard(opaque, val); + ps2_cqueue_reset(&s->common); switch(s->common.write_cmd) { default: case -1: switch(val) { case 0x00: - ps2_queue(&s->common, KBD_REPLY_ACK); + ps2_cqueue_1(&s->common, KBD_REPLY_ACK); break; case 0x05: - ps2_queue(&s->common, KBD_REPLY_RESEND); + ps2_cqueue_1(&s->common, KBD_REPLY_RESEND); break; case KBD_CMD_GET_ID: /* We emulate a MF2 AT keyboard here */ - if (s->translate) - ps2_queue_3(&s->common, - KBD_REPLY_ACK, - KBD_REPLY_ID, - 0x41); - else - ps2_queue_3(&s->common, - KBD_REPLY_ACK, - KBD_REPLY_ID, - 0x83); + ps2_cqueue_3(&s->common, KBD_REPLY_ACK, KBD_REPLY_ID, + s->translate ? 0x41 : 0x83); break; case KBD_CMD_ECHO: - ps2_queue(&s->common, KBD_CMD_ECHO); + ps2_cqueue_1(&s->common, KBD_CMD_ECHO); break; case KBD_CMD_ENABLE: s->scan_enabled =3D 1; - ps2_queue(&s->common, KBD_REPLY_ACK); + ps2_cqueue_1(&s->common, KBD_REPLY_ACK); break; case KBD_CMD_SCANCODE: case KBD_CMD_SET_LEDS: case KBD_CMD_SET_RATE: case KBD_CMD_SET_MAKE_BREAK: s->common.write_cmd =3D val; - ps2_queue(&s->common, KBD_REPLY_ACK); + ps2_cqueue_1(&s->common, KBD_REPLY_ACK); break; case KBD_CMD_RESET_DISABLE: ps2_reset_keyboard(s); s->scan_enabled =3D 0; - ps2_queue(&s->common, KBD_REPLY_ACK); + ps2_cqueue_1(&s->common, KBD_REPLY_ACK); break; case KBD_CMD_RESET_ENABLE: ps2_reset_keyboard(s); s->scan_enabled =3D 1; - ps2_queue(&s->common, KBD_REPLY_ACK); + ps2_cqueue_1(&s->common, KBD_REPLY_ACK); break; case KBD_CMD_RESET: ps2_reset_keyboard(s); - ps2_queue_2(&s->common, + ps2_cqueue_2(&s->common, KBD_REPLY_ACK, KBD_REPLY_POR); break; case KBD_CMD_SET_TYPEMATIC: - ps2_queue(&s->common, KBD_REPLY_ACK); + ps2_cqueue_1(&s->common, KBD_REPLY_ACK); break; default: - ps2_queue(&s->common, KBD_REPLY_RESEND); + ps2_cqueue_1(&s->common, KBD_REPLY_RESEND); break; } break; case KBD_CMD_SET_MAKE_BREAK: - ps2_queue(&s->common, KBD_REPLY_ACK); + ps2_cqueue_1(&s->common, KBD_REPLY_ACK); s->common.write_cmd =3D -1; break; case KBD_CMD_SCANCODE: if (val =3D=3D 0) { - if (s->common.queue.count <=3D PS2_QUEUE_SIZE - 2) { - ps2_queue(&s->common, KBD_REPLY_ACK); - ps2_put_keycode(s, s->scancode_set); - } + ps2_cqueue_2(&s->common, KBD_REPLY_ACK, s->translate ? + translate_table[s->scancode_set] : s->scancode_set); } else if (val >=3D 1 && val <=3D 3) { s->scancode_set =3D val; - ps2_queue(&s->common, KBD_REPLY_ACK); + ps2_cqueue_1(&s->common, KBD_REPLY_ACK); } else { - ps2_queue(&s->common, KBD_REPLY_RESEND); + ps2_cqueue_1(&s->common, KBD_REPLY_RESEND); } s->common.write_cmd =3D -1; break; case KBD_CMD_SET_LEDS: ps2_set_ledstate(s, val); - ps2_queue(&s->common, KBD_REPLY_ACK); + ps2_cqueue_1(&s->common, KBD_REPLY_ACK); s->common.write_cmd =3D -1; break; case KBD_CMD_SET_RATE: - ps2_queue(&s->common, KBD_REPLY_ACK); + ps2_cqueue_1(&s->common, KBD_REPLY_ACK); s->common.write_cmd =3D -1; break; } --=20 2.31.1 From nobody Mon May 6 00:41:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1631269486; cv=none; d=zohomail.com; s=zohoarc; b=IJud9ChybwYpHX+uU+01m9hA08UNUpwWhF5sUzkTE3wlUOzx7ylO3j5OOFqn90BqqQM76uDakVkfd4BwMno6mpCzZCQIyf+4UZuG6mv5yp1NbW+xGAt5qCnPUxH8CXZt/aOOGn44QwpX+PAbu73H4dDk1j2Tkclins+Bgv1/mT4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631269486; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=o0i2rNPu+9dBRTAtS7pIfzLsNlXiswpb9xYy/+2w9SU=; b=P/xjP8kOdsXCrxnfgXsfPOyISjajwyDIuLtFSNXrhouOEsdcgg2zkweRVBx+vjQMQT/dS83MagmOI+oNODbZxHa+nEaB9R5poxjAd82sypZxPHzwws04rvQ7OrD7JbV3dKM973o5yfedyWkE5FU9/j1oUUTX8tdFiD7fvd1frxA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16312694864951008.2306728579947; Fri, 10 Sep 2021 03:24:46 -0700 (PDT) Received: from localhost ([::1]:45194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mOdi9-0001Je-5c for importer@patchew.org; Fri, 10 Sep 2021 06:24:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOdgi-0007ll-8f for qemu-devel@nongnu.org; Fri, 10 Sep 2021 06:23:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:45171) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOdgg-0005z1-PB for qemu-devel@nongnu.org; Fri, 10 Sep 2021 06:23:16 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-165-1XCCg3O8NpOBQ6aXSOadMg-1; Fri, 10 Sep 2021 06:23:12 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 34C631084680; Fri, 10 Sep 2021 10:23:11 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DEDC118FD2; Fri, 10 Sep 2021 10:23:10 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id F15A918003B6; Fri, 10 Sep 2021 12:23:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631269394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o0i2rNPu+9dBRTAtS7pIfzLsNlXiswpb9xYy/+2w9SU=; b=M4mYq40YBIyvJ6V4vPT6q8Myg/QyMkd123IXDnY1jjNsP5Q87lE4Yrzx4w6Dw7WAcmDRYB 7TWBlQuuC5UBYiB3dvR2baPW/N3eLsvFqEVSE80o/tlGWsnE8VBzPUya8rQF1cvHbi1gUU jlUSvj+NA1YDd9aJV1Ne98BcVtoY78U= X-MC-Unique: 1XCCg3O8NpOBQ6aXSOadMg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 3/3] ps2: migration support for command reply queue Date: Fri, 10 Sep 2021 12:23:00 +0200 Message-Id: <20210910102300.3589982-4-kraxel@redhat.com> In-Reply-To: <20210910102300.3589982-1-kraxel@redhat.com> References: <20210910102300.3589982-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.393, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Volker=20R=C3=BCmelin?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1631269487133100002 From: Volker R=C3=BCmelin Add migration support for the PS/2 keyboard command reply queue. Signed-off-by: Volker R=C3=BCmelin Message-Id: <20210810133258.8231-3-vr_qemu@t-online.de> Signed-off-by: Gerd Hoffmann --- hw/input/ps2.c | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 8c06fd7fb428..9376a8f4ce53 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -80,6 +80,7 @@ */ #define PS2_BUFFER_SIZE 256 #define PS2_QUEUE_SIZE 16 /* Queue size required by PS/2 protocol */ +#define PS2_QUEUE_HEADROOM 8 /* Queue size for keyboard command replies= */ =20 /* Bits for 'modifiers' field in PS2KbdState */ #define MOD_CTRL_L (1 << 0) @@ -985,17 +986,27 @@ static void ps2_common_reset(PS2State *s) static void ps2_common_post_load(PS2State *s) { PS2Queue *q =3D &s->queue; + int ccount =3D 0; =20 - /* set the useful data buffer queue size <=3D PS2_QUEUE_SIZE */ - if (q->count < 0) { - q->count =3D 0; - } else if (q->count > PS2_QUEUE_SIZE) { - q->count =3D PS2_QUEUE_SIZE; + /* limit the number of queued command replies to PS2_QUEUE_HEADROOM */ + if (q->cwptr !=3D -1) { + ccount =3D (q->cwptr - q->rptr) & (PS2_BUFFER_SIZE - 1); + if (ccount > PS2_QUEUE_HEADROOM) { + ccount =3D PS2_QUEUE_HEADROOM; + } } =20 - /* sanitize rptr and recalculate wptr */ + /* limit the scancode queue size to PS2_QUEUE_SIZE */ + if (q->count < ccount) { + q->count =3D ccount; + } else if (q->count > ccount + PS2_QUEUE_SIZE) { + q->count =3D ccount + PS2_QUEUE_SIZE; + } + + /* sanitize rptr and recalculate wptr and cwptr */ q->rptr =3D q->rptr & (PS2_BUFFER_SIZE - 1); q->wptr =3D (q->rptr + q->count) & (PS2_BUFFER_SIZE - 1); + q->cwptr =3D ccount ? (q->rptr + ccount) & (PS2_BUFFER_SIZE - 1) : -1; } =20 static void ps2_kbd_reset(void *opaque) @@ -1086,6 +1097,22 @@ static const VMStateDescription vmstate_ps2_keyboard= _need_high_bit =3D { } }; =20 +static bool ps2_keyboard_cqueue_needed(void *opaque) +{ + PS2KbdState *s =3D opaque; + + return s->common.queue.cwptr !=3D -1; /* the queue is mostly empty */ +} + +static const VMStateDescription vmstate_ps2_keyboard_cqueue =3D { + .name =3D "ps2kbd/command_reply_queue", + .needed =3D ps2_keyboard_cqueue_needed, + .fields =3D (VMStateField[]) { + VMSTATE_INT32(common.queue.cwptr, PS2KbdState), + VMSTATE_END_OF_LIST() + } +}; + static int ps2_kbd_post_load(void* opaque, int version_id) { PS2KbdState *s =3D (PS2KbdState*)opaque; @@ -1114,6 +1141,7 @@ static const VMStateDescription vmstate_ps2_keyboard = =3D { .subsections =3D (const VMStateDescription*[]) { &vmstate_ps2_keyboard_ledstate, &vmstate_ps2_keyboard_need_high_bit, + &vmstate_ps2_keyboard_cqueue, NULL } }; --=20 2.31.1