From nobody Fri Apr 26 19:54:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1620147276; cv=none; d=zohomail.com; s=zohoarc; b=mUAISqPwDayDdfBqXkrYMxvYarHd5wPZ072emhtpzR5YIR4oP9PrNaZI3CijMChxFDFsFMhNoA9TWw9bIKke12Rj1r7BRx8+gpxRVYwh8iw7rsOVcvigyZ8mx2W6H1Zy2kaXFsl5LfABUIyWq2anTItSVesHJvCYzXrxlWniUBo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620147276; 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=GItDIgX5IxHTLGTu4YPKLRMhwzCW6SKSzwAheXo2OwM=; b=JdNvfe0vw8hC0xSDfAJ4tOSXlITaUk6ufwQueuEkpHpYRL9Hb9MGB+51NbnojO1QilOP0mnLpchsX7wKFEUveS33fd5yLm8dhSA2CE7QpidD8WF6GG2hhcSnZCr6AJMJQd7afkryxU+szVZgjCWtSj73HvA5RkHc9VSm01BqjiA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162014727629652.79683204488026; Tue, 4 May 2021 09:54:36 -0700 (PDT) Received: from localhost ([::1]:45454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldyJe-0003rW-UP for importer@patchew.org; Tue, 04 May 2021 12:54:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldx5L-0008W3-OU; Tue, 04 May 2021 11:35:43 -0400 Received: from beetle.greensocs.com ([5.135.226.135]:43534) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldx53-0004PP-OW; Tue, 04 May 2021 11:35:43 -0400 Received: from cygnus.fritz.box (b2b-109-90-5-113.unitymedia.biz [109.90.5.113]) by beetle.greensocs.com (Postfix) with ESMTPSA id C32662076C; Tue, 4 May 2021 15:35:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greensocs.com; s=mail; t=1620142523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GItDIgX5IxHTLGTu4YPKLRMhwzCW6SKSzwAheXo2OwM=; b=vemSBEqExjrwR8KspH2dXb8+peFkCcxgOf4CmzUlBF6YShrN89xTDPNeyBOaasZFL7BxTX 5WTNrcxtKiluLOxvYuq0V6S4lGe6Xjj40zXijiR79zZQt9wuI3Pq2WCj4SDdKs9es6rJNz l7AlKXvgywmloSBmhn3nh0KBKBp2Rdk= From: =?UTF-8?q?Lukas=20J=C3=BCnger?= To: qemu-devel@nongnu.org Subject: [PATCH 1/2] Consistent function names for sifive uart read and write function Date: Tue, 4 May 2021 17:34:55 +0200 Message-Id: <20210504153456.927083-2-lukas.juenger@greensocs.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210504153456.927083-1-lukas.juenger@greensocs.com> References: <20210504153456.927083-1-lukas.juenger@greensocs.com> 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=5.135.226.135; envelope-from=lukas.juenger@greensocs.com; helo=beetle.greensocs.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 04 May 2021 12:32:36 -0400 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: qemu-riscv@nongnu.org, bin.meng@windriver.com, mark.burton@greensocs.com, marcandre.lureau@redhat.com, palmer@dabbelt.com, pbonzini@redhat.com, alistair.francis@wdc.com, =?UTF-8?q?Lukas=20J=C3=BCnger?= , luc.michel@greensocs.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: Lukas J=C3=BCnger Reviewed-by: Alistair Francis Reviewed-by: Luc Michel --- hw/char/sifive_uart.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/char/sifive_uart.c b/hw/char/sifive_uart.c index 3a00ba7f00..cb70374ead 100644 --- a/hw/char/sifive_uart.c +++ b/hw/char/sifive_uart.c @@ -65,7 +65,7 @@ static void update_irq(SiFiveUARTState *s) } =20 static uint64_t -uart_read(void *opaque, hwaddr addr, unsigned int size) +sifive_uart_read(void *opaque, hwaddr addr, unsigned int size) { SiFiveUARTState *s =3D opaque; unsigned char r; @@ -101,8 +101,8 @@ uart_read(void *opaque, hwaddr addr, unsigned int size) } =20 static void -uart_write(void *opaque, hwaddr addr, - uint64_t val64, unsigned int size) +sifive_uart_write(void *opaque, hwaddr addr, + uint64_t val64, unsigned int size) { SiFiveUARTState *s =3D opaque; uint32_t value =3D val64; @@ -131,9 +131,9 @@ uart_write(void *opaque, hwaddr addr, __func__, (int)addr, (int)value); } =20 -static const MemoryRegionOps uart_ops =3D { - .read =3D uart_read, - .write =3D uart_write, +static const MemoryRegionOps sifive_uart_ops =3D { + .read =3D sifive_uart_read, + .write =3D sifive_uart_write, .endianness =3D DEVICE_NATIVE_ENDIAN, .valid =3D { .min_access_size =3D 4, @@ -187,7 +187,7 @@ SiFiveUARTState *sifive_uart_create(MemoryRegion *addre= ss_space, hwaddr base, qemu_chr_fe_init(&s->chr, chr, &error_abort); qemu_chr_fe_set_handlers(&s->chr, uart_can_rx, uart_rx, uart_event, uart_be_change, s, NULL, true); - memory_region_init_io(&s->mmio, NULL, &uart_ops, s, + memory_region_init_io(&s->mmio, NULL, &sifive_uart_ops, s, TYPE_SIFIVE_UART, SIFIVE_UART_MAX); memory_region_add_subregion(address_space, base, &s->mmio); return s; --=20 2.30.2 From nobody Fri Apr 26 19:54:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1620146640; cv=none; d=zohomail.com; s=zohoarc; b=QH9qnt+GOlPqSfH/9gAsYxR2G9HKUZEY23tk1eLNv5vmk7E9ty+Gg1hmiZS9u8b0AGA+KbDB68Ao8uh9YCy/mIfk8nU51fqlzSKY/YzeV9JLxtSMQR8EYy5WjvDQKq5tx7g7BUYN8MnBvEcb5EqPzwhBsHZUXOM8c3YffW2nQVc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620146640; 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=M4+/2Rk3XJiRUycqdoILSnGtuThtymrg+mhdfpTqTWM=; b=UAW1vplbsEWlOOxAMZ+UeKzG6C5LFbLWt4hhOWYaQnGFiYxe0pOzDoJqMQjjL1azw1CVH3DUDQTqiK/dwTH8B42cviPrLxEWkuSuaKZgu2wTyevVeHJemcOe31J1n8vufSVGcakLnoOO6130591d3PKU2AlCV1B7HXdSeJkUnj0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620146640006163.39109217562373; Tue, 4 May 2021 09:44:00 -0700 (PDT) Received: from localhost ([::1]:58966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldy9O-0005GH-LB for importer@patchew.org; Tue, 04 May 2021 12:43:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldx5H-0008Qi-Mc; Tue, 04 May 2021 11:35:41 -0400 Received: from beetle.greensocs.com ([5.135.226.135]:43558) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldx58-0004R2-Ch; Tue, 04 May 2021 11:35:39 -0400 Received: from cygnus.fritz.box (b2b-109-90-5-113.unitymedia.biz [109.90.5.113]) by beetle.greensocs.com (Postfix) with ESMTPSA id BD2A621C39; Tue, 4 May 2021 15:35:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greensocs.com; s=mail; t=1620142526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=M4+/2Rk3XJiRUycqdoILSnGtuThtymrg+mhdfpTqTWM=; b=YdpAHeEvmi3do3MkaKEjcA6c7fzn7p0xsQbKk3cKEFYKSOKm4npZQ7grLNND5baxOTfS6j APUTmmqnlKY8QUTbfrfW91QYENNcFBrLfGs44a4r936bWsH6ceSou/inzbs0NloLuaLj8U Squn34LJDac6hMGw3BoRCQ5SI4LUofM= From: =?UTF-8?q?Lukas=20J=C3=BCnger?= To: qemu-devel@nongnu.org Subject: [PATCH 2/2] QOMify sifive_uart model Date: Tue, 4 May 2021 17:34:56 +0200 Message-Id: <20210504153456.927083-3-lukas.juenger@greensocs.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210504153456.927083-1-lukas.juenger@greensocs.com> References: <20210504153456.927083-1-lukas.juenger@greensocs.com> 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=5.135.226.135; envelope-from=lukas.juenger@greensocs.com; helo=beetle.greensocs.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 04 May 2021 12:32:36 -0400 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: qemu-riscv@nongnu.org, bin.meng@windriver.com, mark.burton@greensocs.com, marcandre.lureau@redhat.com, palmer@dabbelt.com, pbonzini@redhat.com, alistair.francis@wdc.com, =?UTF-8?q?Lukas=20J=C3=BCnger?= , luc.michel@greensocs.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: Lukas J=C3=BCnger Reviewed-by: Luc Michel --- include/hw/char/sifive_uart.h | 6 +-- hw/char/sifive_uart.c | 72 ++++++++++++++++++++++++++++++----- 2 files changed, 65 insertions(+), 13 deletions(-) diff --git a/include/hw/char/sifive_uart.h b/include/hw/char/sifive_uart.h index 3e962be659..45d66b1db5 100644 --- a/include/hw/char/sifive_uart.h +++ b/include/hw/char/sifive_uart.h @@ -21,6 +21,7 @@ #define HW_SIFIVE_UART_H =20 #include "chardev/char-fe.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "qom/object.h" =20 @@ -51,10 +52,7 @@ enum { #define SIFIVE_UART_GET_RXCNT(rxctrl) ((rxctrl >> 16) & 0x7) =20 #define TYPE_SIFIVE_UART "riscv.sifive.uart" - -typedef struct SiFiveUARTState SiFiveUARTState; -DECLARE_INSTANCE_CHECKER(SiFiveUARTState, SIFIVE_UART, - TYPE_SIFIVE_UART) +OBJECT_DECLARE_SIMPLE_TYPE(SiFiveUARTState, SIFIVE_UART) =20 struct SiFiveUARTState { /*< private >*/ diff --git a/hw/char/sifive_uart.c b/hw/char/sifive_uart.c index cb70374ead..0307568d0a 100644 --- a/hw/char/sifive_uart.c +++ b/hw/char/sifive_uart.c @@ -25,6 +25,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/char/sifive_uart.h" +#include "hw/qdev-properties-system.h" =20 /* * Not yet implemented: @@ -176,19 +177,72 @@ static int uart_be_change(void *opaque) return 0; } =20 +static Property sifive_uart_properties[] =3D { + DEFINE_PROP_CHR("chardev", SiFiveUARTState, chr), + DEFINE_PROP_END_OF_LIST(), +}; + +static void sifive_uart_init(Object *obj) +{ + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + SiFiveUARTState *s =3D SIFIVE_UART(obj); + + memory_region_init_io(&s->mmio, OBJECT(s), &sifive_uart_ops, s, + TYPE_SIFIVE_UART, SIFIVE_UART_MAX); + sysbus_init_mmio(sbd, &s->mmio); + sysbus_init_irq(sbd, &s->irq); +} + +static void sifive_uart_realize(DeviceState *dev, Error **errp) +{ + SiFiveUARTState *s =3D SIFIVE_UART(dev); + + qemu_chr_fe_set_handlers(&s->chr, uart_can_rx, uart_rx, uart_event, + uart_be_change, s, NULL, true); + +} + +static void sifive_uart_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(oc); + + dc->realize =3D sifive_uart_realize; + device_class_set_props(dc, sifive_uart_properties); +} + +static const TypeInfo sifive_uart_info =3D { + .name =3D TYPE_SIFIVE_UART, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(SiFiveUARTState), + .instance_init =3D sifive_uart_init, + .class_init =3D sifive_uart_class_init, +}; + +static void sifive_uart_register_types(void) +{ + type_register_static(&sifive_uart_info); +} + +type_init(sifive_uart_register_types) + /* * Create UART device. */ SiFiveUARTState *sifive_uart_create(MemoryRegion *address_space, hwaddr ba= se, Chardev *chr, qemu_irq irq) { - SiFiveUARTState *s =3D g_malloc0(sizeof(SiFiveUARTState)); - s->irq =3D irq; - qemu_chr_fe_init(&s->chr, chr, &error_abort); - qemu_chr_fe_set_handlers(&s->chr, uart_can_rx, uart_rx, uart_event, - uart_be_change, s, NULL, true); - memory_region_init_io(&s->mmio, NULL, &sifive_uart_ops, s, - TYPE_SIFIVE_UART, SIFIVE_UART_MAX); - memory_region_add_subregion(address_space, base, &s->mmio); - return s; + DeviceState *dev; + SysBusDevice *s; + SiFiveUARTState *r; + + dev =3D qdev_new("riscv.sifive.uart"); + s =3D SYS_BUS_DEVICE(dev); + qdev_prop_set_chr(dev, "chardev", chr); + sysbus_realize_and_unref(s, &error_fatal); + memory_region_add_subregion(address_space, base, + sysbus_mmio_get_region(s, 0)); + sysbus_connect_irq(s, 0, irq); + + r =3D SIFIVE_UART(dev); + return r; } --=20 2.30.2