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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 B0155CA9EB9 for ; Wed, 23 Oct 2019 22:59:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 80E5D20663 for ; Wed, 23 Oct 2019 22:59:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 80E5D20663 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNPay-0005TK-Mm for qemu-devel@archiver.kernel.org; Wed, 23 Oct 2019 18:59:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60025) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNPZq-0002jd-8z for qemu-devel@nongnu.org; Wed, 23 Oct 2019 18:58:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNPZo-0006s3-Ok for qemu-devel@nongnu.org; Wed, 23 Oct 2019 18:58:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49326) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNPZm-0006rc-QT for qemu-devel@nongnu.org; Wed, 23 Oct 2019 18:58:00 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4E5B985540 for ; Wed, 23 Oct 2019 22:57:57 +0000 (UTC) Received: by mail-wr1-f70.google.com with SMTP id c6so11810278wrp.3 for ; Wed, 23 Oct 2019 15:57:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=BazpvHYq6PyK/dknt5pLp0NK1GqFux09Ox3JHGYqZFs=; b=M3x68zmox/R7oAQUzVZNLB2wEUhHQrtjUgFzsl149ar6TwOBFc6ZIhFMIRde1va0Y1 rNC0Ox6wvxkN4gVzl1Q1ZrS+ip32mo4Q7b+WITDJeGR1Z5CR8qCY4SpbIgoQSxC9lNTN bt4YDx3GQGOrxfwq9DppCZ1gMbujlSa1zxjiNyw9FKV5HyCMZFOH3/V3rxZZPGzb5JHp e54gnCJgGm78J595wWAm45q8vqahJF6TJfbsxddey1an3/M7C5Br1ZkJlHXZNmZqYmI7 rXE6g9L91KjFtzgulK5ldU/q48vI19n7wP9WDG9GpMbcKJQFnT/tWLlGwAumG5SBud7v F3Tg== X-Gm-Message-State: APjAAAWrV+MeMbH9MMfFEczGvnuehttKDDysbn8wWbtCB0IteIg1565l qvOMjizQ/tCNC/5jpb4A7TOqfQ+0Erz/4EeYUH3Q1vSbVwvQwaGcsREHQHlQDf/VBevWlP1xPkC vpPNWHfxJySZ1xtU= X-Received: by 2002:adf:ea07:: with SMTP id q7mr950964wrm.78.1571871475973; Wed, 23 Oct 2019 15:57:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqzyNFEQG+gdO5bjDm+BGOVCe/ilqrknC/wT8WiVA8gymfb4dwfTvssiKK9nbnIOV3A51FQRiw== X-Received: by 2002:adf:ea07:: with SMTP id q7mr950924wrm.78.1571871475607; Wed, 23 Oct 2019 15:57:55 -0700 (PDT) Received: from [192.168.1.41] (129.red-83-57-174.dynamicip.rima-tde.net. [83.57.174.129]) by smtp.gmail.com with ESMTPSA id p5sm553253wmi.4.2019.10.23.15.57.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 23 Oct 2019 15:57:55 -0700 (PDT) Subject: Re: [PATCH v3 19/33] sm501: make SerialMM a child, export chardev property To: =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , qemu-devel@nongnu.org References: <20191023173154.30051-1-marcandre.lureau@redhat.com> <20191023173154.30051-20-marcandre.lureau@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: <0033fd98-f191-c3f5-4726-ba052254808a@redhat.com> Date: Thu, 24 Oct 2019 00:57:53 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 In-Reply-To: <20191023173154.30051-20-marcandre.lureau@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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: Corey Minyard , =?UTF-8?Q?Daniel_P=2e_Berrang=c3=a9?= , Eduardo Habkost , "Michael S. Tsirkin" , Peter Maydell , Magnus Damm , Jason Wang , qemu-ppc@nongnu.org, Mark Cave-Ayland , Fabien Chouteau , Aleksandar Rikalo , KONRAD Frederic , qemu-arm@nongnu.org, =?UTF-8?Q?Herv=c3=a9_Poussineau?= , Aurelien Jarno , Aleksandar Markovic , Paolo Bonzini , "Edgar E. Iglesias" , Paul Burton , Artyom Tarasenko , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 10/23/19 7:31 PM, Marc-Andr=C3=A9 Lureau wrote: > Embed the SerialMM sybus device, and re-export its "chardev" property. > That way, we can get rid of PROP_PTR "chr-state" and better track > devices relationship. >=20 > Signed-off-by: Marc-Andr=C3=A9 Lureau > --- > hw/display/sm501.c | 31 ++++++++++++++++++++++--------- > hw/sh4/r2d.c | 2 +- > 2 files changed, 23 insertions(+), 10 deletions(-) >=20 > diff --git a/hw/display/sm501.c b/hw/display/sm501.c > index 1f33c87e65..6efdf764c1 100644 > --- a/hw/display/sm501.c > +++ b/hw/display/sm501.c > @@ -1930,13 +1930,14 @@ typedef struct { > SM501State state; > uint32_t vram_size; > uint32_t base; > - void *chr_state; > + SerialMM serial; > } SM501SysBusState; > =20 > static void sm501_realize_sysbus(DeviceState *dev, Error **errp) > { > SM501SysBusState *s =3D SYSBUS_SM501(dev); > SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); > + SerialState *ss =3D &s->serial.serial; > DeviceState *usb_dev; > =20 > sm501_init(&s->state, dev, s->vram_size); > @@ -1958,17 +1959,18 @@ static void sm501_realize_sysbus(DeviceState *d= ev, Error **errp) > sysbus_pass_irq(sbd, SYS_BUS_DEVICE(usb_dev)); > =20 > /* bridge to serial emulation module */ > - if (s->chr_state) { > - serial_mm_init(&s->state.mmio_region, SM501_UART0, 2, > - NULL, /* TODO : chain irq to IRL */ > - 115200, s->chr_state, DEVICE_LITTLE_ENDIAN); > + if (qemu_chr_fe_backend_connected(&ss->chr)) { Oh, this is a Companion Chip (Northbridge + Southbridge), mostly=20 implementing the display part, that's why it is in hw/display/. The SM501_UART0 is always mapped here, no need to check for the backend. (Not related to your series goal, but cleaning this might simplify this=20 patch). > + MemoryRegion *mr; > + qdev_init_nofail(DEVICE(&s->serial)); > + mr =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->serial), 0); > + memory_region_add_subregion(&s->state.mmio_region, SM501_UART0= , mr); > + /* TODO : chain irq to IRL */ > } > } > =20 > static Property sm501_sysbus_properties[] =3D { > DEFINE_PROP_UINT32("vram-size", SM501SysBusState, vram_size, 0), > DEFINE_PROP_UINT32("base", SM501SysBusState, base, 0), > - DEFINE_PROP_PTR("chr-state", SM501SysBusState, chr_state), > DEFINE_PROP_END_OF_LIST(), > }; > =20 > @@ -1999,9 +2001,19 @@ static void sm501_sysbus_class_init(ObjectClass = *klass, void *data) > dc->props =3D sm501_sysbus_properties; > dc->reset =3D sm501_reset_sysbus; > dc->vmsd =3D &vmstate_sm501_sysbus; > - /* Note: pointer property "chr-state" may remain null, thus > - * no need for dc->user_creatable =3D false; > - */ > +} > + > +static void sm501_sysbus_init(Object *o) > +{ > + SM501SysBusState *self =3D SYSBUS_SM501(o); > + SerialMM *s =3D &self->serial; > + > + sysbus_init_child_obj(o, "serial", s, sizeof(SerialMM), TYPE_SERIA= L_MM); > + qdev_prop_set_int32(DEVICE(s), "instance-id", SM501_UART0); > + qdev_prop_set_uint8(DEVICE(s), "regshift", 2); > + qdev_prop_set_uint8(DEVICE(s), "endianness", DEVICE_LITTLE_ENDIAN)= ; > + > + object_property_add_alias(o, "chardev", OBJECT(s), "chardev", &err= or_abort); > } > =20 > static const TypeInfo sm501_sysbus_info =3D { > @@ -2009,6 +2021,7 @@ static const TypeInfo sm501_sysbus_info =3D { > .parent =3D TYPE_SYS_BUS_DEVICE, > .instance_size =3D sizeof(SM501SysBusState), > .class_init =3D sm501_sysbus_class_init, > + .instance_init =3D sm501_sysbus_init, > }; > =20 > #define TYPE_PCI_SM501 "sm501" > diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c > index ee0840f380..72bb5285cc 100644 > --- a/hw/sh4/r2d.c > +++ b/hw/sh4/r2d.c > @@ -272,7 +272,7 @@ static void r2d_init(MachineState *machine) > busdev =3D SYS_BUS_DEVICE(dev); > qdev_prop_set_uint32(dev, "vram-size", SM501_VRAM_SIZE); > qdev_prop_set_uint32(dev, "base", 0x10000000); > - qdev_prop_set_ptr(dev, "chr-state", serial_hd(2)); > + qdev_prop_set_chr(dev, "chardev", serial_hd(2)); > qdev_init_nofail(dev); > sysbus_mmio_map(busdev, 0, 0x10000000); > sysbus_mmio_map(busdev, 1, 0x13e00000); >=20