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 9803CC433E0 for ; Fri, 12 Feb 2021 17:51:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6E83F64DF0 for ; Fri, 12 Feb 2021 17:51:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231649AbhBLRvG (ORCPT ); Fri, 12 Feb 2021 12:51:06 -0500 Received: from foss.arm.com ([217.140.110.172]:40672 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229451AbhBLRu5 (ORCPT ); Fri, 12 Feb 2021 12:50:57 -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 DACB21063; Fri, 12 Feb 2021 09:50:12 -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 DFDAE3F73B; Fri, 12 Feb 2021 09:50:11 -0800 (PST) Subject: Re: [PATCH kvmtool 12/21] hw/vesa: Switch trap handling to use MMIO handler 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-13-andre.przywara@arm.com> From: Alexandru Elisei Message-ID: Date: Fri, 12 Feb 2021 17:50:28 +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-13-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: > To be able to use the VESA device with the new generic I/O trap handler, > we need to use the different MMIO handler callback routine. > > Replace the existing dummy in and out handlers with a joint dummy > MMIO handler, and register this using the new registration function. > > Signed-off-by: Andre Przywara > --- > hw/vesa.c | 19 +++++-------------- > 1 file changed, 5 insertions(+), 14 deletions(-) > > diff --git a/hw/vesa.c b/hw/vesa.c > index 8659a002..7f82cdb4 100644 > --- a/hw/vesa.c > +++ b/hw/vesa.c > @@ -43,21 +43,11 @@ static struct framebuffer vesafb = { > .mem_size = VESA_MEM_SIZE, > }; > > -static bool vesa_pci_io_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > +static void vesa_pci_io(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, > + u8 is_write, void *ptr) > { > - return true; > } > > -static bool vesa_pci_io_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > -{ > - return true; > -} > - > -static struct ioport_operations vesa_io_ops = { > - .io_in = vesa_pci_io_in, > - .io_out = vesa_pci_io_out, > -}; > - > static int vesa__bar_activate(struct kvm *kvm, struct pci_device_header *pci_hdr, > int bar_num, void *data) > { > @@ -82,7 +72,8 @@ struct framebuffer *vesa__init(struct kvm *kvm) > BUILD_BUG_ON(VESA_MEM_SIZE < VESA_BPP/8 * VESA_WIDTH * VESA_HEIGHT); > > vesa_base_addr = pci_get_io_port_block(PCI_IO_SIZE); > - r = ioport__register(kvm, vesa_base_addr, &vesa_io_ops, PCI_IO_SIZE, NULL); > + r = kvm__register_pio(kvm, vesa_base_addr, PCI_IO_SIZE, vesa_pci_io, > + NULL); > if (r < 0) > goto out_error; > > @@ -116,7 +107,7 @@ unmap_dev: > unregister_device: > device__unregister(&vesa_device); > unregister_ioport: > - ioport__unregister(kvm, vesa_base_addr); > + kvm__deregister_pio(kvm, vesa_base_addr); > out_error: > return ERR_PTR(r); > } Looks good: Reviewed-by: Alexandru Elisei Thanks, Alex