From nobody Sat Nov 8 10:42:30 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15501499927827.050733751414782; Thu, 14 Feb 2019 05:13:12 -0800 (PST) Received: from localhost ([127.0.0.1]:48412 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guGpB-0003El-OI for importer@patchew.org; Thu, 14 Feb 2019 08:13:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49928) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guGeQ-00034K-JP for qemu-devel@nongnu.org; Thu, 14 Feb 2019 08:02:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1guGUc-00070P-DB for qemu-devel@nongnu.org; Thu, 14 Feb 2019 07:51:56 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:35105) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1guGUa-0006jM-Bl for qemu-devel@nongnu.org; Thu, 14 Feb 2019 07:51:54 -0500 Received: by mail-wr1-x443.google.com with SMTP id t18so6381125wrx.2 for ; Thu, 14 Feb 2019 04:51:26 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id j3sm1488073wmb.39.2019.02.14.04.51.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 04:51:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7g9zWEgPnQ1/3e/7FE39QU99XF4zWTWG/yRPa1dvYJ4=; b=L9Ajd4o6Pgb6p4DcApMyojBNs9E6icveqCja/w7bkw12ndkmgLBvoUw4QhfXU1wvOr LQan0eZiJUA5nXl+sFcUbHdHmEaXV2uTteAytSPuM0aHhd+3Z12bK0gtodDpli/kwYEC L2S6OHfQsllwdeLRH0kuXwv0x2ARSJxViyFN/cRlsspPzEat+N4j5dthn4dgYbj5SUET YdnP8ON+n23dxzaCEP4S+jBkavrftozrRnv+DLHGmq0pJ68nqOh+kOtjLOYScepBHYUv Ez7qfNwfEW1wlKz03WmJPP/NSJaBxhpxnHnsXzIrsfVaI7HnhSv+boTtrcn99f6rKLlq TcFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7g9zWEgPnQ1/3e/7FE39QU99XF4zWTWG/yRPa1dvYJ4=; b=JOCnUhlSI8KxiQ1C8bUTEXUx4rLfVbs9937tb3fVG58f0JU1uZzQH6k+9KyRgkUehP R+QPEymIj44VMW/BXOZS8DIGspFQ8fMqLFOWHhG91KbwrKnfmjtb+t0XbPMA6V4gBmuc Jm6J8vFqmZ4AcGBG8vAgByE72f9U0hgj3m9C6aSuDr4ZZFmYgXXwtm1T60pM0spzUDww sBrFSoOyCYqfHDJrp+uDb2leNAGqbq5ZnDN3BkdXA9OMHW1YORgh6Qpk1RwFYciQyNF5 7dVXU+av68bM3gmZ0yMolzBUMXf+UfAbZzi5WvWwAl4m/daUEyL8JXaNBY/6/YvB8nmB 3agw== X-Gm-Message-State: AHQUAuYaDyEz6AQYLTvXMNqDmxZVwRKuJy+Gx/1CKKf8pasccklyha/z nUrpjtGl4t297dJ5fjLbzTDzeRKb0F792w== X-Google-Smtp-Source: AHgI3IbZ6vjOb50UZ5Am2kF8GzOc9x30M/qDdswoDLgh12yziXtxBknfDecvSx5K5B3gSzow5XaUww== X-Received: by 2002:a05:6000:1287:: with SMTP id f7mr2882462wrx.203.1550148686149; Thu, 14 Feb 2019 04:51:26 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Date: Thu, 14 Feb 2019 12:51:07 +0000 Message-Id: <20190214125107.22178-15-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190214125107.22178-1-peter.maydell@linaro.org> References: <20190214125107.22178-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH 14/14] hw/arm/musca: Wire up PL011 UARTs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: patches@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Wire up the two PL011 UARTs in the Musca board. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- hw/arm/musca.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/hw/arm/musca.c b/hw/arm/musca.c index ec8dfee1964..e9701533d20 100644 --- a/hw/arm/musca.c +++ b/hw/arm/musca.c @@ -23,9 +23,11 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "exec/address-spaces.h" +#include "sysemu/sysemu.h" #include "hw/arm/arm.h" #include "hw/arm/armsse.h" #include "hw/boards.h" +#include "hw/char/pl011.h" #include "hw/core/split-irq.h" #include "hw/misc/tz-mpc.h" #include "hw/misc/tz-ppc.h" @@ -69,7 +71,7 @@ typedef struct { UnimplementedDeviceState mhu[2]; UnimplementedDeviceState pwm[3]; UnimplementedDeviceState i2s; - UnimplementedDeviceState uart[2]; + PL011State uart[2]; UnimplementedDeviceState i2c[2]; UnimplementedDeviceState spi; UnimplementedDeviceState scc; @@ -285,6 +287,28 @@ static MemoryRegion *make_rtc(MuscaMachineState *mms, = void *opaque, return sysbus_mmio_get_region(SYS_BUS_DEVICE(rtc), 0); } =20 +static MemoryRegion *make_uart(MuscaMachineState *mms, void *opaque, + const char *name, hwaddr size) +{ + PL011State *uart =3D opaque; + int i =3D uart - &mms->uart[0]; + int irqbase =3D 7 + i * 6; + SysBusDevice *s; + + sysbus_init_child_obj(OBJECT(mms), name, uart, sizeof(mms->uart[0]), + TYPE_PL011); + qdev_prop_set_chr(DEVICE(uart), "chardev", serial_hd(i)); + object_property_set_bool(OBJECT(uart), true, "realized", &error_fatal); + s =3D SYS_BUS_DEVICE(uart); + sysbus_connect_irq(s, 0, get_sse_irq_in(mms, irqbase + 5)); /* combine= d */ + sysbus_connect_irq(s, 1, get_sse_irq_in(mms, irqbase + 0)); /* RX */ + sysbus_connect_irq(s, 2, get_sse_irq_in(mms, irqbase + 1)); /* TX */ + sysbus_connect_irq(s, 3, get_sse_irq_in(mms, irqbase + 2)); /* RT */ + sysbus_connect_irq(s, 4, get_sse_irq_in(mms, irqbase + 3)); /* MS */ + sysbus_connect_irq(s, 5, get_sse_irq_in(mms, irqbase + 4)); /* E */ + return sysbus_mmio_get_region(SYS_BUS_DEVICE(uart), 0); +} + static MemoryRegion *make_musca_a_devs(MuscaMachineState *mms, void *opaqu= e, const char *name, hwaddr size) { @@ -300,8 +324,8 @@ static MemoryRegion *make_musca_a_devs(MuscaMachineStat= e *mms, void *opaque, MemoryRegion *container =3D &mms->container; =20 const PPCPortInfo devices[] =3D { - { "uart0", make_unimp_dev, &mms->uart[0], 0x1000, 0x1000 }, - { "uart1", make_unimp_dev, &mms->uart[1], 0x2000, 0x1000 }, + { "uart0", make_uart, &mms->uart[0], 0x1000, 0x1000 }, + { "uart1", make_uart, &mms->uart[1], 0x2000, 0x1000 }, { "spi", make_unimp_dev, &mms->spi, 0x3000, 0x1000 }, { "i2c0", make_unimp_dev, &mms->i2c[0], 0x4000, 0x1000 }, { "i2c1", make_unimp_dev, &mms->i2c[1], 0x5000, 0x1000 }, @@ -460,8 +484,8 @@ static void musca_init(MachineState *machine) { "pwm1", make_unimp_dev, &mms->pwm[1], 0x40102000, 0x1000= }, { "pwm2", make_unimp_dev, &mms->pwm[2], 0x40103000, 0x1000= }, { "i2s", make_unimp_dev, &mms->i2s, 0x40104000, 0x1000 }, - { "uart0", make_unimp_dev, &mms->uart[0], 0x40105000, 0x10= 00 }, - { "uart1", make_unimp_dev, &mms->uart[1], 0x40106000, 0x10= 00 }, + { "uart0", make_uart, &mms->uart[0], 0x40105000, 0x1000 }, + { "uart1", make_uart, &mms->uart[1], 0x40106000, 0x1000 }, { "i2c0", make_unimp_dev, &mms->i2c[0], 0x40108000, 0x1000= }, { "i2c1", make_unimp_dev, &mms->i2c[1], 0x40109000, 0x1000= }, { "spi", make_unimp_dev, &mms->spi, 0x4010a000, 0x1000 }, --=20 2.20.1