From patchwork Thu Dec 10 14:28:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 11965961 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A7C3C4361B for ; Thu, 10 Dec 2020 19:09:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4E3D623C18 for ; Thu, 10 Dec 2020 19:09:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393294AbgLJTIT (ORCPT ); Thu, 10 Dec 2020 14:08:19 -0500 Received: from foss.arm.com ([217.140.110.172]:45080 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390461AbgLJObA (ORCPT ); Thu, 10 Dec 2020 09:31:00 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 455FA1474; Thu, 10 Dec 2020 06:29:31 -0800 (PST) Received: from donnerap.arm.com (donnerap.cambridge.arm.com [10.1.195.35]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 2BA443F718; Thu, 10 Dec 2020 06:29:30 -0800 (PST) From: Andre Przywara To: Will Deacon , Julien Thierry Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Alexandru Elisei , Marc Zyngier Subject: [PATCH kvmtool 07/21] hw/i8042: Switch to new trap handlers Date: Thu, 10 Dec 2020 14:28:54 +0000 Message-Id: <20201210142908.169597-8-andre.przywara@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201210142908.169597-1-andre.przywara@arm.com> References: <20201210142908.169597-1-andre.przywara@arm.com> Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Now that the PC keyboard has a trap handler adhering to the MMIO fault handler prototype, let's switch over to the joint registration routine. This allows us to get rid of the ioport shim routines. Make the kbd_init() function static on the way. Signed-off-by: Andre Przywara --- hw/i8042.c | 30 ++++-------------------------- include/kvm/i8042.h | 1 - 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/hw/i8042.c b/hw/i8042.c index eb1f9d28..91d79dc4 100644 --- a/hw/i8042.c +++ b/hw/i8042.c @@ -325,40 +325,18 @@ static void kbd_io(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, ioport__write8(data, value); } -/* - * Called when the OS has written to one of the keyboard's ports (0x60 or 0x64) - */ -static bool kbd_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) -{ - kbd_io(vcpu, port, data, size, false, NULL); - - return true; -} - -static bool kbd_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) -{ - kbd_io(vcpu, port, data, size, true, NULL); - - return true; -} - -static struct ioport_operations kbd_ops = { - .io_in = kbd_in, - .io_out = kbd_out, -}; - -int kbd__init(struct kvm *kvm) +static int kbd__init(struct kvm *kvm) { int r; kbd_reset(); state.kvm = kvm; - r = ioport__register(kvm, I8042_DATA_REG, &kbd_ops, 2, NULL); + r = kvm__register_pio(kvm, I8042_DATA_REG, 2, kbd_io, NULL); if (r < 0) return r; - r = ioport__register(kvm, I8042_COMMAND_REG, &kbd_ops, 2, NULL); + r = kvm__register_pio(kvm, I8042_COMMAND_REG, 2, kbd_io, NULL); if (r < 0) { - ioport__unregister(kvm, I8042_DATA_REG); + kvm__deregister_pio(kvm, I8042_DATA_REG); return r; } diff --git a/include/kvm/i8042.h b/include/kvm/i8042.h index 3b4ab688..cd4ae6bb 100644 --- a/include/kvm/i8042.h +++ b/include/kvm/i8042.h @@ -7,6 +7,5 @@ struct kvm; void mouse_queue(u8 c); void kbd_queue(u8 c); -int kbd__init(struct kvm *kvm); #endif