From patchwork Mon Mar 15 15:33:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 12139843 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 508BAC4332B for ; Mon, 15 Mar 2021 15:35:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2BCB664EEC for ; Mon, 15 Mar 2021 15:35:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232858AbhCOPfE (ORCPT ); Mon, 15 Mar 2021 11:35:04 -0400 Received: from foss.arm.com ([217.140.110.172]:50768 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232023AbhCOPeb (ORCPT ); Mon, 15 Mar 2021 11:34:31 -0400 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 6849E1FB; Mon, 15 Mar 2021 08:34:31 -0700 (PDT) Received: from localhost.localdomain (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 1C3FA3F792; Mon, 15 Mar 2021 08:34:29 -0700 (PDT) From: Andre Przywara To: Will Deacon , Julien Thierry Cc: Alexandru Elisei , kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, Marc Zyngier , Sami Mujawar Subject: [PATCH kvmtool v3 13/22] hw/serial: Refactor trap handler Date: Mon, 15 Mar 2021 15:33:41 +0000 Message-Id: <20210315153350.19988-14-andre.przywara@arm.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20210315153350.19988-1-andre.przywara@arm.com> References: <20210315153350.19988-1-andre.przywara@arm.com> Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org With the planned retirement of the special ioport emulation code, we need to provide an emulation function compatible with the MMIO prototype. Adjust the trap handler to use that new function, and provide shims to implement the old ioport interface, for now. Signed-off-by: Andre Przywara Reviewed-by: Alexandru Elisei --- hw/serial.c | 50 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/hw/serial.c b/hw/serial.c index b0465d99..3f797452 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -242,18 +242,14 @@ void serial8250__inject_sysrq(struct kvm *kvm, char sysrq) sysrq_pending = sysrq; } -static bool serial8250_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, - void *data, int size) +static bool serial8250_out(struct serial8250_device *dev, struct kvm_cpu *vcpu, + u16 offset, void *data) { - struct serial8250_device *dev = ioport->priv; - u16 offset; bool ret = true; char *addr = data; mutex_lock(&dev->mutex); - offset = port - dev->iobase; - switch (offset) { case UART_TX: if (dev->lcr & UART_LCR_DLAB) { @@ -336,16 +332,13 @@ static void serial8250_rx(struct serial8250_device *dev, void *data) } } -static bool serial8250_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) +static bool serial8250_in(struct serial8250_device *dev, struct kvm_cpu *vcpu, + u16 offset, void *data) { - struct serial8250_device *dev = ioport->priv; - u16 offset; bool ret = true; mutex_lock(&dev->mutex); - offset = port - dev->iobase; - switch (offset) { case UART_RX: if (dev->lcr & UART_LCR_DLAB) @@ -389,6 +382,37 @@ static bool serial8250_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, return ret; } +static void serial8250_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, + u8 is_write, void *ptr) +{ + struct serial8250_device *dev = ptr; + + if (is_write) + serial8250_out(dev, vcpu, addr - dev->iobase, data); + else + serial8250_in(dev, vcpu, addr - dev->iobase, data); +} + +static bool serial8250_ioport_out(struct ioport *ioport, struct kvm_cpu *vcpu, + u16 port, void *data, int size) +{ + struct serial8250_device *dev = ioport->priv; + + serial8250_mmio(vcpu, port, data, 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; + + serial8250_mmio(vcpu, port, data, 1, false, dev); + + return true; +} + #ifdef CONFIG_HAS_LIBFDT char *fdt_stdout_path = NULL; @@ -427,8 +451,8 @@ void serial8250_generate_fdt_node(void *fdt, struct device_header *dev_hdr, #endif static struct ioport_operations serial8250_ops = { - .io_in = serial8250_in, - .io_out = serial8250_out, + .io_in = serial8250_ioport_in, + .io_out = serial8250_ioport_out, }; static int serial8250__device_init(struct kvm *kvm,