From nobody Tue Feb 10 01:15:40 2026 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