From patchwork Thu Feb 21 18:57:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 158954 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp854554jaa; Thu, 21 Feb 2019 11:19:45 -0800 (PST) X-Google-Smtp-Source: AHgI3IYFXXWUHcX7TDZME6fQvSmU7rZnXenvz1WU63qB4moGVhxwCO27yFXLHITi/XTi+B6YaWVB X-Received: by 2002:a25:ddc7:: with SMTP id u190mr93290ybg.203.1550776785715; Thu, 21 Feb 2019 11:19:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550776785; cv=none; d=google.com; s=arc-20160816; b=qDqOLlNUT/jfeCC2mMChxxkBNNnqfF3vEcxfFviX2YnqP2/lBmszjoXxCg6ea8yqAp eFR41amAsFMIDMmekQydb3K+ONHLa2MyMQzgLvdfEKrHxk1j0s3EkQvYnxT7XZpvI4ms D+XqUPIjqZFjpHOHs46tGqz5yJfZj2rV/aFF2SdczwTuK+XQzEUejyjDXm4+nOlcAlKB hRLSO3EVQPZk7F9KI39h5S/U6ZKXmOcxtaSZRBpO/BHc6vIJjKpW9REfTxqR2fxR1Zi1 +FBehQGnp123Cu5DjljrDFqUoe7kMLZQXjDHx1KUsa9HIDsmeBpRA/9Exj6q8OWQnc9a JGaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=MceNF6rI0cHSh+l+WwLKDv+xTRefeJ/wcYYF2JEwE+8=; b=aUu+efKih/aqjutq8mUD3/4R/aMBDwNpNV/SlIDHKqtl886YTtT/Bbt3zXIOunHkDl U+j02myLn7JE+cwWssvStClc1ybfIjVTMFyTBuLroDvQQJ0xe0xdJxiA0yNKSl64Ocxd CSgR8OIQTZ+KUVJ7z+/JHg/nDp3UjgsGbnAzg5tc9gcIIUP7SOCy+yJr5D3IzAby4YYm n/ZrI7XaXjDhxh4D147ireI8hfY8Bt3QPDSd85vwNOJWBxrAwr7vAG7dZrfgZBkZopU7 rHlfq8cC385Tnn5u39Y7LZ91sHuHBKyn37Ue9Quga+5pUpp7Wx6MLCbg8WaU9MchIIPB dVnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qGSmbDyr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u4si13781843ywb.107.2019.02.21.11.19.45 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 21 Feb 2019 11:19:45 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qGSmbDyr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:37181 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwtsn-0001nD-6W for patch@linaro.org; Thu, 21 Feb 2019 14:19:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwtXu-00006F-FU for qemu-devel@nongnu.org; Thu, 21 Feb 2019 13:58:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwtXs-0007Wc-SJ for qemu-devel@nongnu.org; Thu, 21 Feb 2019 13:58:10 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:51170) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gwtXs-0007W1-Ja for qemu-devel@nongnu.org; Thu, 21 Feb 2019 13:58:08 -0500 Received: by mail-wm1-x334.google.com with SMTP id x7so10568189wmj.0 for ; Thu, 21 Feb 2019 10:58:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=MceNF6rI0cHSh+l+WwLKDv+xTRefeJ/wcYYF2JEwE+8=; b=qGSmbDyrALlHfyrJQGO5bTn9BsrFbl2LyR9cYrPi7VDSoFQixd0r9CQwyLJoEeCcE0 4guktbU/A4KQIuJmfExSZVnD9xUZ/gMHYWn8duASA0QD67MNtjLS5DtnDa1hrEVF8Z3F LE6UQXiVVrX3F6rfK7QkssEK82wGO0KDSQs5lnK9Z63EGyGynj3zmxn2TCungcZhrY5l 4p0CICNWwAXgf8vpjnGjZhMc3+snT3VLaHrj0Ocnnytp1x5Du/TlcVh9H/RqoNndGq11 jWq3RHQ5NhjsZF7kf2xiTcyEsRZa8bxUVK7KhxZpE21YJOkmK0+ma/lsoBQxWV/5DZDE H50A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MceNF6rI0cHSh+l+WwLKDv+xTRefeJ/wcYYF2JEwE+8=; b=LK3hCjnyTqB1ZuaA0YqbLMyJuM40LwlZ+cOSzWQjk5v0N6drYxSGsvU+fx1eVMEhXQ 1kPQpqnXSz0LjFbGmKjz5kRSeD2Qh5Q/apwFcRj0CODept+J1DbrHDF/APPArJ7WELHY XUjX8qvLG5APq7sMfaaKJ3ttyTiRF8G5VmATNOrbARgIge1BTU9i3VCLwTwdAWpMKOAk VuR+Wmff1Ov0k5EkZuOAyqnwgPg85sf1qXv6F0EQKaZ0dmzP6Zn7FtY7yyeSAlnkIi5e d/L3Wmnzj8OL3nnPDf8EGR+lDW3hiescJ5L7B8oDiDMazyouyXUmE4csYtcxsF4f3pE9 KSlg== X-Gm-Message-State: AHQUAub5LeIi5FO9n+eSUM7sfxIJ8Ookhiz9EPbUy3ttNkbwGmWENQEv nv6x8wVGycmBkHt/f/mWG40XkZFoKPI= X-Received: by 2002:a1c:a9d0:: with SMTP id s199mr9209wme.142.1550775487266; Thu, 21 Feb 2019 10:58:07 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c18sm29065085wre.32.2019.02.21.10.58.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Feb 2019 10:58:06 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 21 Feb 2019 18:57:38 +0000 Message-Id: <20190221185739.25362-21-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190221185739.25362-1-peter.maydell@linaro.org> References: <20190221185739.25362-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 Subject: [Qemu-devel] [PULL 20/21] 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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(-) -- 2.20.1 diff --git a/hw/arm/musca.c b/hw/arm/musca.c index 378912b7385..23aff43f4bc 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); } +static MemoryRegion *make_uart(MuscaMachineState *mms, void *opaque, + const char *name, hwaddr size) +{ + PL011State *uart = opaque; + int i = uart - &mms->uart[0]; + int irqbase = 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 = SYS_BUS_DEVICE(uart); + sysbus_connect_irq(s, 0, get_sse_irq_in(mms, irqbase + 5)); /* combined */ + 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 *opaque, const char *name, hwaddr size) { @@ -300,8 +324,8 @@ static MemoryRegion *make_musca_a_devs(MuscaMachineState *mms, void *opaque, MemoryRegion *container = &mms->container; const PPCPortInfo devices[] = { - { "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, 0x1000 }, - { "uart1", make_unimp_dev, &mms->uart[1], 0x40106000, 0x1000 }, + { "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 },