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.3 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=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 03CBBC433DB for ; Tue, 16 Mar 2021 15:40:10 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 62E3B650F1 for ; Tue, 16 Mar 2021 15:40:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 62E3B650F1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id D5AA94B54B; Tue, 16 Mar 2021 11:40:08 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id s824HHtrBv+r; Tue, 16 Mar 2021 11:40:07 -0400 (EDT) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 952A74B3AB; Tue, 16 Mar 2021 11:40:07 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id C93CD4B1DB for ; Tue, 16 Mar 2021 11:40:06 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ts5cJPdOSmoP for ; Tue, 16 Mar 2021 11:40:05 -0400 (EDT) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 83B524B18F for ; Tue, 16 Mar 2021 11:40:05 -0400 (EDT) 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 DFFABD6E; Tue, 16 Mar 2021 08:40:04 -0700 (PDT) Received: from [192.168.0.110] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D30E23F792; Tue, 16 Mar 2021 08:40:03 -0700 (PDT) Subject: Re: [PATCH kvmtool v3 13/22] hw/serial: Refactor trap handler To: Andre Przywara , Will Deacon , Julien Thierry References: <20210315153350.19988-1-andre.przywara@arm.com> <20210315153350.19988-14-andre.przywara@arm.com> From: Alexandru Elisei Message-ID: <08350e12-76c7-2d3f-fd05-67356d21479b@arm.com> Date: Tue, 16 Mar 2021 15:40:17 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20210315153350.19988-14-andre.przywara@arm.com> Content-Language: en-US Cc: Marc Zyngier , Sami Mujawar , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu Hi Andre, On 3/15/21 3:33 PM, Andre Przywara wrote: > 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. The diff looks nice and tidy. I checked that the changes are functionally identical, also did a quick kvm-unit-tests run and booted an arm64 kernel: Reviewed-by: Alexandru Elisei Thanks, Alex > > Signed-off-by: Andre Przywara > --- > 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, _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm