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,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 EC8D6C433DB for ; Wed, 17 Mar 2021 16:17:54 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 3CB3F64E83 for ; Wed, 17 Mar 2021 16:17:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3CB3F64E83 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 7E6B24B683; Wed, 17 Mar 2021 12:17:53 -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 AyKVZoe--Xjq; Wed, 17 Mar 2021 12:17:52 -0400 (EDT) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 3EF9D4B665; Wed, 17 Mar 2021 12:17:52 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 9EB434B662 for ; Wed, 17 Mar 2021 12:17:51 -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 UP0uTRuhpJW3 for ; Wed, 17 Mar 2021 12:17:48 -0400 (EDT) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mm01.cs.columbia.edu (Postfix) with ESMTP id B48DE4B415 for ; Wed, 17 Mar 2021 12:17:48 -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 2446ED6E; Wed, 17 Mar 2021 09:17:48 -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 213503F792; Wed, 17 Mar 2021 09:17:47 -0700 (PDT) Subject: Re: [PATCH kvmtool v3 21/22] hw/serial: ARM/arm64: Use MMIO at higher addresses To: Andre Przywara , Will Deacon , Julien Thierry References: <20210315153350.19988-1-andre.przywara@arm.com> <20210315153350.19988-22-andre.przywara@arm.com> From: Alexandru Elisei Message-ID: <7ce22c90-bf5c-b976-5698-85a7605bc1b7@arm.com> Date: Wed, 17 Mar 2021 16:17:32 +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-22-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: > Using the UART devices at their legacy I/O addresses as set by IBM in > 1981 was a kludge we used for simplicity on ARM platforms as well. > However this imposes problems due to their missing alignment and overlap > with the PCI I/O address space. > > Now that we can switch a device easily between using ioports and MMIO, > let's move the UARTs out of the first 4K of memory on ARM platforms. > > That should be transparent for well behaved guests, since the change is > naturally reflected in the device tree. Even "earlycon" keeps working, > as the stdout-path property is adjusted automatically. > > People providing direct earlycon parameters via the command line need to > adjust it to: "earlycon=uart,mmio,0x1000000". Checked and that's indeed the address of the first UART. > > Signed-off-by: Andre Przywara > --- > arm/include/arm-common/kvm-arch.h | 7 ++-- > hw/serial.c | 54 +++++++++++++++++++++---------- > 2 files changed, 42 insertions(+), 19 deletions(-) > > diff --git a/arm/include/arm-common/kvm-arch.h b/arm/include/arm-common/kvm-arch.h > index a2e32953..bf34d742 100644 > --- a/arm/include/arm-common/kvm-arch.h > +++ b/arm/include/arm-common/kvm-arch.h > @@ -13,8 +13,8 @@ > * 0 64K 16M 32M 48M 1GB 2GB > * +-------+----+-------+-------+--------+-----+---------+---...... > * | PCI |////| plat | | | | | > - * | I/O |////| MMIO | Flash | virtio | GIC | PCI | DRAM > - * | space |////| | | MMIO | | (AXI) | > + * | I/O |////| MMIO: | Flash | virtio | GIC | PCI | DRAM > + * | space |////| UART | | MMIO | | (AXI) | > * | |////| | | | | | > * +-------+----+-------+-------+--------+-----+---------+---...... > */ > @@ -28,6 +28,9 @@ > #define ARM_IOPORT_SIZE (1U << 16) > > > +#define ARM_UART_MMIO_BASE ARM_MMIO_AREA > +#define ARM_UART_MMIO_SIZE 0x10000 > + > #define KVM_FLASH_MMIO_BASE (ARM_MMIO_AREA + 0x1000000) > #define KVM_FLASH_MAX_SIZE 0x1000000 > > diff --git a/hw/serial.c b/hw/serial.c > index 16af493b..3d533623 100644 > --- a/hw/serial.c > +++ b/hw/serial.c > @@ -13,6 +13,24 @@ > > #include > > +#if defined(CONFIG_ARM) || defined(CONFIG_ARM64) > +#define serial_iobase(nr) (ARM_UART_MMIO_BASE + (nr) * 0x1000) > +#define serial_irq(nr) (32 + (nr)) > +#define SERIAL8250_BUS_TYPE DEVICE_BUS_MMIO > +#else > +#define serial_iobase_0 (KVM_IOPORT_AREA + 0x3f8) > +#define serial_iobase_1 (KVM_IOPORT_AREA + 0x2f8) > +#define serial_iobase_2 (KVM_IOPORT_AREA + 0x3e8) > +#define serial_iobase_3 (KVM_IOPORT_AREA + 0x2e8) > +#define serial_irq_0 4 > +#define serial_irq_1 3 > +#define serial_irq_2 4 > +#define serial_irq_3 3 > +#define serial_iobase(nr) serial_iobase_##nr > +#define serial_irq(nr) serial_irq_##nr > +#define SERIAL8250_BUS_TYPE DEVICE_BUS_IOPORT > +#endif > + > /* > * This fakes a U6_16550A. The fifo len needs to be 64 as the kernel > * expects that for autodetection. > @@ -27,7 +45,7 @@ struct serial8250_device { > struct mutex mutex; > u8 id; > > - u16 iobase; > + u32 iobase; > u8 irq; > u8 irq_state; > int txcnt; > @@ -65,56 +83,56 @@ static struct serial8250_device devices[] = { > /* ttyS0 */ > [0] = { > .dev_hdr = { > - .bus_type = DEVICE_BUS_IOPORT, > + .bus_type = SERIAL8250_BUS_TYPE, > .data = serial8250_generate_fdt_node, > }, > .mutex = MUTEX_INITIALIZER, > > .id = 0, > - .iobase = 0x3f8, > - .irq = 4, > + .iobase = serial_iobase(0), > + .irq = serial_irq(0), > > SERIAL_REGS_SETTING > }, > /* ttyS1 */ > [1] = { > .dev_hdr = { > - .bus_type = DEVICE_BUS_IOPORT, > + .bus_type = SERIAL8250_BUS_TYPE, > .data = serial8250_generate_fdt_node, > }, > .mutex = MUTEX_INITIALIZER, > > .id = 1, > - .iobase = 0x2f8, > - .irq = 3, > + .iobase = serial_iobase(1), > + .irq = serial_irq(1), > > SERIAL_REGS_SETTING > }, > /* ttyS2 */ > [2] = { > .dev_hdr = { > - .bus_type = DEVICE_BUS_IOPORT, > + .bus_type = SERIAL8250_BUS_TYPE, > .data = serial8250_generate_fdt_node, > }, > .mutex = MUTEX_INITIALIZER, > > .id = 2, > - .iobase = 0x3e8, > - .irq = 4, > + .iobase = serial_iobase(2), > + .irq = serial_irq(2), > > SERIAL_REGS_SETTING > }, > /* ttyS3 */ > [3] = { > .dev_hdr = { > - .bus_type = DEVICE_BUS_IOPORT, > + .bus_type = SERIAL8250_BUS_TYPE, > .data = serial8250_generate_fdt_node, > }, > .mutex = MUTEX_INITIALIZER, > > .id = 3, > - .iobase = 0x2e8, > - .irq = 3, > + .iobase = serial_iobase(3), > + .irq = serial_irq(3), > > SERIAL_REGS_SETTING > }, > @@ -407,7 +425,7 @@ void serial8250_generate_fdt_node(void *fdt, struct device_header *dev_hdr, > struct serial8250_device, > dev_hdr); > > - u64 addr = KVM_IOPORT_AREA + dev->iobase; > + u64 addr = dev->iobase; > u64 reg_prop[] = { > cpu_to_fdt64(addr), > cpu_to_fdt64(8), > @@ -440,7 +458,8 @@ static int serial8250__device_init(struct kvm *kvm, > return r; > > ioport__map_irq(&dev->irq); > - r = kvm__register_pio(kvm, dev->iobase, 8, serial8250_mmio, dev); > + r = kvm__register_iotrap(kvm, dev->iobase, 8, serial8250_mmio, dev, > + SERIAL8250_BUS_TYPE); > > return r; > } > @@ -463,7 +482,7 @@ cleanup: > for (j = 0; j <= i; j++) { > struct serial8250_device *dev = &devices[j]; > > - kvm__deregister_pio(kvm, dev->iobase); > + kvm__deregister_iotrap(kvm, dev->iobase, SERIAL8250_BUS_TYPE); > device__unregister(&dev->dev_hdr); > } > > @@ -479,7 +498,8 @@ int serial8250__exit(struct kvm *kvm) > for (i = 0; i < ARRAY_SIZE(devices); i++) { > struct serial8250_device *dev = &devices[i]; > > - r = kvm__deregister_pio(kvm, dev->iobase); > + r = kvm__deregister_iotrap(kvm, dev->iobase, > + SERIAL8250_BUS_TYPE); > if (r < 0) > return r; > device__unregister(&dev->dev_hdr); Looks good to me: Reviewed-by: Alexandru Elisei Thanks, Alex _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm