From mboxrd@z Thu Jan 1 00:00:00 1970 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=-15.4 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable 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 B633DC433DB for ; Fri, 12 Feb 2021 10:43:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7885164E6B for ; Fri, 12 Feb 2021 10:43:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230479AbhBLKn3 (ORCPT ); Fri, 12 Feb 2021 05:43:29 -0500 Received: from foss.arm.com ([217.140.110.172]:34888 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229906AbhBLKmB (ORCPT ); Fri, 12 Feb 2021 05:42:01 -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 BDF7D1063; Fri, 12 Feb 2021 02:41:08 -0800 (PST) Received: from [192.168.0.110] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C58D13F719; Fri, 12 Feb 2021 02:41:07 -0800 (PST) Subject: Re: [PATCH kvmtool 07/21] hw/i8042: Switch to new trap handlers To: Andre Przywara , Will Deacon , Julien Thierry Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Marc Zyngier References: <20201210142908.169597-1-andre.przywara@arm.com> <20201210142908.169597-8-andre.przywara@arm.com> From: Alexandru Elisei Message-ID: Date: Fri, 12 Feb 2021 10:41:20 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20201210142908.169597-8-andre.przywara@arm.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Hi Andre, On 12/10/20 2:28 PM, Andre Przywara wrote: > 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); I guess you are registering two addresses here to cover I8042_PORT_B_REG, right? Might be worth a comment. > 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); Shouldn't length be 1? The emulation should work only for address 0x64 (command/status register), right? Or am I missing something? Thanks, Alex > 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