From nobody Tue Feb 10 19:53:15 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1656268493088230.1271353628124; Sun, 26 Jun 2022 11:34:53 -0700 (PDT) Received: from localhost ([::1]:54752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o5X5w-0006BA-3U for importer@patchew.org; Sun, 26 Jun 2022 14:34:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o5WSM-00060d-3P for qemu-devel@nongnu.org; Sun, 26 Jun 2022 13:53:58 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:45324) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o5WSK-0000yS-MJ for qemu-devel@nongnu.org; Sun, 26 Jun 2022 13:53:57 -0400 Received: from [2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1o5WMH-0007KY-Oh; Sun, 26 Jun 2022 18:47:45 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=pt/hGxz5VqBEMrPCCaTXmyaZIii4IoWMyH/2nE3n1Uo=; b=gY9BR+UwlBu1VBGhjNl6fI5jtJ 4+hm7slav2RuDJ5ns2tRX1EAQ2D2FxsDMj2FusYdGcM+rOVfK5C/3aY7pEEF6m167BgCHfff5jQGq 4dFj4Ze68RFiqLkOvbrk+h4LtDQ3Y30sOe08QHhMvxNsXfTLT+OQipK6QGs8G7nvwgq6+1EkTjNyq kh+I1U+GpSwMsV6dEP+21e++WOcB3X649MCByB3sNLLmW2Vw6+7FtBCZcubVrWfwFlYA/tcT7hQPF Eupr4bBQccEGveuaEi9Pncfzuhe2Pb9nHNrNUtowZ7hVVwHphU/mXb/CadekQbKtCQYF6TM9U7HCk 2tQIZpNN/Yk2NSiWcmmH6eyH9geiolLdpmjxIVhO8vfGhiFmy0SYAbelds8Rq4Nmu+Yqg+QGqthnW gQ0w5pUK1gQwfBG5pTys2NupSA7liukqB5+2jK1j297OAluZyrDWf114KcdwbkSvy59PtYMvV/hi1 9rUS6OnsDLOUBn1qhAh3zV4PDdQOF6KfMT5TEMVicAXcDO3iMoX9w2VnGX5CyjSopHB8sLF6oFqcE YozQY9oN54dCJspzXHXiTsvaKI8a5iON8R5zv/zlBmOlc8Ghs9pVApjBlPaxZ1fT7d+eunHA7Ri89 R/H8jkfRXJJCWxkPuCk3HN5MPOQg4FGH/9GRCeE2c=; From: Mark Cave-Ayland To: richard.henderson@linaro.org, qemu-devel@nongnu.org Date: Sun, 26 Jun 2022 18:45:28 +0100 Message-Id: <20220626174531.969187-53-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220626174531.969187-1-mark.cave-ayland@ilande.co.uk> References: <20220626174531.969187-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PULL 52/55] pckbd: switch I8042 device from update_irq() function to PS2 device gpio X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1656268495262100001 Content-Type: text/plain; charset="utf-8" Define a new qdev input gpio for handling incoming PS2 IRQs, and then wire = up the PS2 keyboard and mouse devices to use it. At the same time set update_irq()= and update_arg to NULL in ps2_kbd_init() and ps2_mouse_init() to ensure that any accidental attempt to use the legacy update_irq() function will cause a NULL pointer dereference. Signed-off-by: Mark Cave-Ayland Acked-by: Helge Deller Reviewed-by: Peter Maydell Message-Id: <20220624134109.881989-53-mark.cave-ayland@ilande.co.uk> --- hw/input/pckbd.c | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index ff76c0636d..18f27abc58 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -808,6 +808,23 @@ static const MemoryRegionOps i8042_cmd_ops =3D { .endianness =3D DEVICE_LITTLE_ENDIAN, }; =20 +static void i8042_set_kbd_irq(void *opaque, int n, int level) +{ + ISAKBDState *s =3D I8042(opaque); + KBDState *ks =3D &s->kbd; + + kbd_update_kbd_irq(ks, level); +} + +static void i8042_set_mouse_irq(void *opaque, int n, int level) +{ + ISAKBDState *s =3D I8042(opaque); + KBDState *ks =3D &s->kbd; + + kbd_update_aux_irq(ks, level); +} + + static void i8042_reset(DeviceState *dev) { ISAKBDState *s =3D I8042(dev); @@ -827,6 +844,12 @@ static void i8042_initfn(Object *obj) "i8042-cmd", 1); =20 qdev_init_gpio_out_named(DEVICE(obj), &s->a20_out, I8042_A20_LINE, 1); + + qdev_init_gpio_out(DEVICE(obj), s->irqs, 2); + qdev_init_gpio_in_named(DEVICE(obj), i8042_set_kbd_irq, + "ps2-kbd-input-irq", 1); + qdev_init_gpio_in_named(DEVICE(obj), i8042_set_mouse_irq, + "ps2-mouse-input-irq", 1); } =20 static void i8042_realizefn(DeviceState *dev, Error **errp) @@ -847,14 +870,20 @@ static void i8042_realizefn(DeviceState *dev, Error *= *errp) return; } =20 - s->irqs[I8042_KBD_IRQ] =3D isa_get_irq(isadev, isa_s->kbd_irq); - s->irqs[I8042_MOUSE_IRQ] =3D isa_get_irq(isadev, isa_s->mouse_irq); + isa_connect_gpio_out(isadev, I8042_KBD_IRQ, isa_s->kbd_irq); + isa_connect_gpio_out(isadev, I8042_MOUSE_IRQ, isa_s->mouse_irq); =20 isa_register_ioport(isadev, isa_s->io + 0, 0x60); isa_register_ioport(isadev, isa_s->io + 1, 0x64); =20 - s->kbd =3D ps2_kbd_init(kbd_update_kbd_irq, s); - s->mouse =3D ps2_mouse_init(kbd_update_aux_irq, s); + s->kbd =3D ps2_kbd_init(NULL, NULL); + qdev_connect_gpio_out(DEVICE(s->kbd), PS2_DEVICE_IRQ, + qdev_get_gpio_in_named(dev, "ps2-kbd-input-irq", + 0)); + s->mouse =3D ps2_mouse_init(NULL, NULL); + qdev_connect_gpio_out(DEVICE(s->mouse), PS2_DEVICE_IRQ, + qdev_get_gpio_in_named(dev, "ps2-mouse-input-irq= ", + 0)); if (isa_s->kbd_throttle && !isa_s->kbd.extended_state) { warn_report(TYPE_I8042 ": can't enable kbd-throttle without" " extended-state, disabling kbd-throttle"); --=20 2.30.2