From nobody Fri Dec 19 07:02:02 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zohomail.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=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1590599173; cv=none; d=zohomail.com; s=zohoarc; b=R+JGRb6del/qZ2LOvfi0c3WK3Mqwn3oM2rdJD6fujXD/I1eqGWJxtYkwBT+lM95LdXtx+oo9m+dkmQSmYGSY2C/t+7zy7NpqfCxNQGGUqwHmZwR624bR3E181T9kDchPEUNEHZ4S567Ewoy2p86RTULk2oVRX2UHF10WaEtVfl8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590599173; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+HQf6IKo4WZTyAoc4wH3d3M3T5lhOF7byYijZzr8NRU=; b=Q6D3c/pFCs0X2P0tzk4wihCKTHmwC/bQYVszGcC2fD7sbr9RvwSitT+Pz0SOvSmWcZ8RVPGIPrMTlGuuuX1rXmk1iqSvHfreWtBjZHQx/SVrGYtM32OPzjRuohEB2yxEWcEI3+r21BTIvG191mTV5fnYDkmtW9DYA7RkvVsyM1U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zohomail.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1590599173772631.2634144071794; Wed, 27 May 2020 10:06:13 -0700 (PDT) Received: from localhost ([::1]:36550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jdzVM-0004KS-Ip for importer@patchew.org; Wed, 27 May 2020 13:06:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jdzOf-0002GT-5Q; Wed, 27 May 2020 12:59:17 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:63672) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jdzOe-0002MX-0Q; Wed, 27 May 2020 12:59:16 -0400 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 28 May 2020 00:59:14 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 May 2020 09:48:31 -0700 Received: from 71vjjc2.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.57.96]) by uls-op-cesaip01.wdc.com with ESMTP; 27 May 2020 09:59:14 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1590598756; x=1622134756; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=J6jGr0+YJ7cXlecgOOQm6t/fd9FbxppC8Hh5YeUeVt4=; b=QhNpxD5A1IWxkzYdtnVDC79yr9dS2/mkKcmj3rgpln6pXjJ2rXSzLZlz zao/BjzVI/40WYZ1dQv6nUQPefSduty+jGuaQr52qePVtiCu/UuJt26dy xNY4c3IEGp24z1UFoS3OzSty4kKN8UrRGly8v2ojIrsXQIO5fI+wNpuZ5 wDjwQLpqHaio0i2+XQG5OzbejSOcElQ2umfdJCel1nVAPAhn2/jFI/VA2 O1fFtIZ99BqdMuSyzt4Js5HncW/iULRnq0D7g5h1OrIHDyg3X8kllF7yX s1lbAXKjc16tYzw3VQ20bg3tHPAjjNQuH8kRSaKR5+TX74fZx98K4eQgp w==; IronPort-SDR: zpJUZM0PaDGUfM1KRcVUj4SV41E7lpVH9T/vO0C2JDg70vrTKuZek2LMvHNCz0IdcWchVzWRbQ 9DxNI1GjwGxSqDRWzJjV3E3qOTvD/iqnizt6BNw4sWAKJU8ozadbtXNHUHH297zb/wLKP6cnQo oKwRxXhNkKJCwqyWQfw0YNqNx8v3aaRSaRtdynnEdFtrHWprSbQ6fwsW3nkX1NHW9liUfKukVx rNHrW7ryqjq5JHclkbPp+Jqnqkib92IC/8JMHYtT8sCbm5Iti1WEbHm3UDKzSYN02dGF7PCaF/ aNI= X-IronPort-AV: E=Sophos;i="5.73,442,1583164800"; d="scan'208";a="140062138" IronPort-SDR: CqAF9OiC5vhkhvsee3L812rCMdxH+oA5I/jUolZ86xKiB65aeY1mokP0x/NQW4Qvy/LTpiUj0E IG4hk4tpIkmTHC/OApxKi7vL9eahumV3s= IronPort-SDR: C9/SQ0N/OM3LBWaMoRLQQpJzWI4VHuUdUgLkyoiEW87ShefIOdaNwNupSwrRrm1vkvZ3VJusdr xOYiflTM7Gqw== WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v4 09/10] riscv/opentitan: Connect the UART device Date: Wed, 27 May 2020 09:50:39 -0700 Message-Id: <411322bc2870c735e4657bf27f5123bcc42b30ea.1590598125.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=216.71.154.45; envelope-from=prvs=40961fbaf=alistair.francis@wdc.com; helo=esa6.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/27 12:58:55 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair.francis@wdc.com, bmeng.cn@gmail.com, palmer@dabbelt.com, alistair23@gmail.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Signed-off-by: Alistair Francis Reviewed-by: Bin Meng Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/riscv/opentitan.h | 13 +++++++++++++ hw/riscv/opentitan.c | 24 ++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/include/hw/riscv/opentitan.h b/include/hw/riscv/opentitan.h index 8d6a09b696..825a3610bc 100644 --- a/include/hw/riscv/opentitan.h +++ b/include/hw/riscv/opentitan.h @@ -21,6 +21,7 @@ =20 #include "hw/riscv/riscv_hart.h" #include "hw/intc/ibex_plic.h" +#include "hw/char/ibex_uart.h" =20 #define TYPE_RISCV_IBEX_SOC "riscv.lowrisc.ibex.soc" #define RISCV_IBEX_SOC(obj) \ @@ -33,6 +34,7 @@ typedef struct LowRISCIbexSoCState { /*< public >*/ RISCVHartArrayState cpus; IbexPlicState plic; + IbexUartState uart; =20 MemoryRegion flash_mem; MemoryRegion rom; @@ -63,4 +65,15 @@ enum { IBEX_USBDEV, }; =20 +enum { + IBEX_UART_RX_PARITY_ERR_IRQ =3D 0x28, + IBEX_UART_RX_TIMEOUT_IRQ =3D 0x27, + IBEX_UART_RX_BREAK_ERR_IRQ =3D 0x26, + IBEX_UART_RX_FRAME_ERR_IRQ =3D 0x25, + IBEX_UART_RX_OVERFLOW_IRQ =3D 0x24, + IBEX_UART_TX_EMPTY_IRQ =3D 0x23, + IBEX_UART_RX_WATERMARK_IRQ =3D 0x22, + IBEX_UART_TX_WATERMARK_IRQ =3D 0x21 +}; + #endif diff --git a/hw/riscv/opentitan.c b/hw/riscv/opentitan.c index 3926321d8c..a6c0b949ca 100644 --- a/hw/riscv/opentitan.c +++ b/hw/riscv/opentitan.c @@ -96,6 +96,9 @@ static void riscv_lowrisc_ibex_soc_init(Object *obj) =20 sysbus_init_child_obj(obj, "plic", &s->plic, sizeof(s->plic), TYPE_IBEX_PLIC); + + sysbus_init_child_obj(obj, "uart", &s->uart, + sizeof(s->uart), TYPE_IBEX_UART); } =20 static void riscv_lowrisc_ibex_soc_realize(DeviceState *dev_soc, Error **e= rrp) @@ -137,8 +140,25 @@ static void riscv_lowrisc_ibex_soc_realize(DeviceState= *dev_soc, Error **errp) busdev =3D SYS_BUS_DEVICE(dev); sysbus_mmio_map(busdev, 0, memmap[IBEX_PLIC].base); =20 - create_unimplemented_device("riscv.lowrisc.ibex.uart", - memmap[IBEX_UART].base, memmap[IBEX_UART].size); + /* UART */ + dev =3D DEVICE(&(s->uart)); + qdev_prop_set_chr(dev, "chardev", serial_hd(0)); + object_property_set_bool(OBJECT(&s->uart), true, "realized", &err); + if (err !=3D NULL) { + error_propagate(errp, err); + return; + } + busdev =3D SYS_BUS_DEVICE(dev); + sysbus_mmio_map(busdev, 0, memmap[IBEX_UART].base); + sysbus_connect_irq(busdev, 0, qdev_get_gpio_in(DEVICE(&s->plic), + IBEX_UART_TX_WATERMARK_IRQ)); + sysbus_connect_irq(busdev, 1, qdev_get_gpio_in(DEVICE(&s->plic), + IBEX_UART_RX_WATERMARK_IRQ)); + sysbus_connect_irq(busdev, 2, qdev_get_gpio_in(DEVICE(&s->plic), + IBEX_UART_TX_EMPTY_IRQ)); + sysbus_connect_irq(busdev, 3, qdev_get_gpio_in(DEVICE(&s->plic), + IBEX_UART_RX_OVERFLOW_IRQ)); + create_unimplemented_device("riscv.lowrisc.ibex.gpio", memmap[IBEX_GPIO].base, memmap[IBEX_GPIO].size); create_unimplemented_device("riscv.lowrisc.ibex.spi", --=20 2.26.2