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=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 CF86EC432C0 for ; Thu, 21 Nov 2019 14:06:10 +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 98481206B6 for ; Thu, 21 Nov 2019 14:06:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="VHBFlWQs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 98481206B6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXn61-00013e-Kp for qemu-devel@archiver.kernel.org; Thu, 21 Nov 2019 09:06:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35792) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXn1G-0005DT-1z for qemu-devel@nongnu.org; Thu, 21 Nov 2019 09:01:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iXn1A-0005Na-Ly for qemu-devel@nongnu.org; Thu, 21 Nov 2019 09:01:13 -0500 Received: from mail-ot1-x344.google.com ([2607:f8b0:4864:20::344]:40992) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iXn18-0005L1-QI for qemu-devel@nongnu.org; Thu, 21 Nov 2019 09:01:07 -0500 Received: by mail-ot1-x344.google.com with SMTP id 94so2967863oty.8 for ; Thu, 21 Nov 2019 06:01:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=Gw93ZwefuKr6qMDEckosBjdiTdqqhrNcg6f+ut6K9Sc=; b=VHBFlWQsVZvJalElNT8uXHo62KrnEjWBTyDpm5aDzPo5F/CZzYxGA+P1ZDtv2Pt0EF dxomboSCSr3oQGwGqrgISEtvxe7bBt8Bh3p3dSPiixR22fr/HIRU+hND+s6ptNQzx04H jCV4hRhCXsrkLUPLGxA6W+AZ3EmFdXWkuC8pczqcOGMOa2H+Jdg+J8l4DgcpgbWSz/yl qb9CQT8q1Z0Zw18qRUKHoZOTIFzEk4byF30TiQhMiMzkcqhPSmqCL143HoQt8g6SWinN AYAUxg9e71KyEKn0hiCRKGUC+Gb+9Jx/o9ZnVvqF8Yg6rRnAy5C2WeDB3p/qMb0t+e5A efrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=Gw93ZwefuKr6qMDEckosBjdiTdqqhrNcg6f+ut6K9Sc=; b=N9hMJJcfM3a2ETrax+nX+LWqaNrMiBOLEVSSm6v/+wje4bsl4f1sRyd+V5Up6nRztr iXrYhMMj3HGcbLkoQnQZtcbBH1RwlbIfC0I50VtX2TnFOzaqy1uuZfvA0OYtPFvdKqEP 5yrpOovwBswPgTlIUIbvU6lgMAZ2NwcEqC6NBu+XjvR6BMOFUOsXoI2iq9P2u3c5hPYo foYU0Uxmz7EsWK+DZjLSq9HC/k3Y4ahOOU0Cf+h+cKNHm+bCrprWqLxGYxKvln8HVVRn jUzCDmkg2/36ISEj1H38sah02KPTryF2ljvv7E9V8ByU55MGPV8vxlrNo0xUj0TX14qQ KP7Q== X-Gm-Message-State: APjAAAWbkI5KlDbHzpAFwQsaXb/bWzKcMc0Vdrp+yh7PHHfDcfjxCH7A G2E/mUs2O5fMRnpsBsskMWdC3hO5q/M/NGZ9EhcSAA== X-Google-Smtp-Source: APXvYqx90NDedUJRKizfuy4rm6DomktJlowFm7K6+3e+zmo6usw/7tAavIkmURENCqKL5Kbb2XTJL8aH6q2jO2uOtAE= X-Received: by 2002:a9d:12d2:: with SMTP id g76mr6860299otg.232.1574344865138; Thu, 21 Nov 2019 06:01:05 -0800 (PST) MIME-Version: 1.0 References: <20191120152442.26657-1-marcandre.lureau@redhat.com> <20191120152442.26657-22-marcandre.lureau@redhat.com> In-Reply-To: <20191120152442.26657-22-marcandre.lureau@redhat.com> From: Peter Maydell Date: Thu, 21 Nov 2019 14:00:54 +0000 Message-ID: Subject: Re: [PATCH v4 21/37] sm501: make SerialMM a child, export chardev property To: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::344 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-ppc , Magnus Damm , QEMU Developers , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, 20 Nov 2019 at 15:31, 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. > > Signed-off-by: Marc-Andr=C3=A9 Lureau > --- > hw/display/sm501.c | 33 ++++++++++++++++++++++++--------- > hw/sh4/r2d.c | 2 +- > 2 files changed, 25 insertions(+), 10 deletions(-) > > diff --git a/hw/display/sm501.c b/hw/display/sm501.c > index 1f33c87e65..c4445b28f9 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; > > 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; > > sm501_init(&s->state, dev, s->vram_size); > @@ -1958,17 +1959,19 @@ static void sm501_realize_sysbus(DeviceState *dev= , Error **errp) > sysbus_pass_irq(sbd, SYS_BUS_DEVICE(usb_dev)); > > /* 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); > + /* FIXME: SM501_UART0 is always mapped, no need to check for the bac= kend */ > + if (qemu_chr_fe_backend_connected(&ss->chr)) { > + 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 */ > } I don't really understand what the FIXME is trying to tell me here. If we don't need to check for the backend, why is the code checking for it ? It means we have to fish around inside the SerialMM's implementation, which seems odd. Only mapping the UART registers if there happens to be a backend connected also doesn't conceptually seem like the right behaviour, because the registers should always exist. Since commit 12051d82f004024d5d the chardev mid-layer has correctly handled the backend not being connected (ie having a NULL chardev), so there's no longer any need for board/device code to special case the lack of a chardev. > } > > 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(), > }; > > @@ -1999,9 +2002,20 @@ static void sm501_sysbus_class_init(ObjectClass *k= lass, 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 *sm501 =3D SYSBUS_SM501(o); > + SerialMM *smm =3D &sm501->serial; > + > + sysbus_init_child_obj(o, "serial", smm, sizeof(SerialMM), TYPE_SERIA= L_MM); > + qdev_set_legacy_instance_id(DEVICE(smm), SM501_UART0, 2); The only board we use the sm501 sysbus device is the sh4 r2d board, and we don't care about migration compatibility there (indeed I would be unsurprised to find that it doesn't even work ;-)) So I think we can reasonably not set the legacy-instance-ID and just declare in the commit message that this is a migration compat break for that board. > + qdev_prop_set_uint8(DEVICE(smm), "regshift", 2); > + qdev_prop_set_uint8(DEVICE(smm), "endianness", DEVICE_LITTLE_ENDIAN)= ; > + > + object_property_add_alias(o, "chardev", > + OBJECT(smm), "chardev", &error_abort); > } > > static const TypeInfo sm501_sysbus_info =3D { > @@ -2009,6 +2023,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, > }; > > #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); > -- > 2.24.0 thanks -- PMM