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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 8AB8FC2BB40 for ; Thu, 10 Dec 2020 19:05:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5A95323440 for ; Thu, 10 Dec 2020 19:05:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729160AbgLJObT (ORCPT ); Thu, 10 Dec 2020 09:31:19 -0500 Received: from foss.arm.com ([217.140.110.172]:45102 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390473AbgLJObD (ORCPT ); Thu, 10 Dec 2020 09:31:03 -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 7919A152B; Thu, 10 Dec 2020 06:29:40 -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 5F6B13F718; Thu, 10 Dec 2020 06:29:39 -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 14/21] hw/serial: Switch to new trap handlers Date: Thu, 10 Dec 2020 14:29:01 +0000 Message-Id: <20201210142908.169597-15-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 serial device 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. Signed-off-by: Andre Przywara --- hw/serial.c | 36 +++--------------------------------- 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/hw/serial.c b/hw/serial.c index 2907089c..d840eebc 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -397,31 +397,6 @@ static void serial8250_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, } } -static bool serial8250_ioport_out(struct ioport *ioport, struct kvm_cpu *vcpu, - u16 port, void *data, int size) -{ - struct serial8250_device *dev = ioport->priv; - u8 value = ioport__read8(data); - - serial8250_mmio(vcpu, port, &value, 1, true, dev); - - return true; -} - -static bool serial8250_ioport_in(struct ioport *ioport, struct kvm_cpu *vcpu, - u16 port, void *data, int size) -{ - struct serial8250_device *dev = ioport->priv; - u8 value = 0; - - - serial8250_mmio(vcpu, port, &value, 1, false, dev); - - ioport__write8(data, value); - - return true; -} - #ifdef CONFIG_HAS_LIBFDT char *fdt_stdout_path = NULL; @@ -459,11 +434,6 @@ void serial8250_generate_fdt_node(void *fdt, struct device_header *dev_hdr, } #endif -static struct ioport_operations serial8250_ops = { - .io_in = serial8250_ioport_in, - .io_out = serial8250_ioport_out, -}; - static int serial8250__device_init(struct kvm *kvm, struct serial8250_device *dev) { @@ -474,7 +444,7 @@ static int serial8250__device_init(struct kvm *kvm, return r; ioport__map_irq(&dev->irq); - r = ioport__register(kvm, dev->iobase, &serial8250_ops, 8, dev); + r = kvm__register_pio(kvm, dev->iobase, 8, serial8250_mmio, dev); return r; } @@ -497,7 +467,7 @@ cleanup: for (j = 0; j <= i; j++) { struct serial8250_device *dev = &devices[j]; - ioport__unregister(kvm, dev->iobase); + kvm__deregister_pio(kvm, dev->iobase); device__unregister(&dev->dev_hdr); } @@ -513,7 +483,7 @@ int serial8250__exit(struct kvm *kvm) for (i = 0; i < ARRAY_SIZE(devices); i++) { struct serial8250_device *dev = &devices[i]; - r = ioport__unregister(kvm, dev->iobase); + r = kvm__deregister_pio(kvm, dev->iobase); if (r < 0) return r; device__unregister(&dev->dev_hdr); -- 2.17.1