From nobody Tue Feb 10 03:56:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632576861; cv=none; d=zohomail.com; s=zohoarc; b=ktjbY7ro4IhTR8aLFoqEQw+lNxJtYUGWXPrqtQFrCq3ujFUD3nl5QzF1llttPYnnBFnlb4vU+ZTi8cGEwH03r0vu/K+/09BfVcNSQX4ytp1zAYj3AP1jXKM3sD0n6hjjVl8jm+i1Y9B7a36mOXFAu/R7zZl8Rs5wabijlJzIfSE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632576861; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=614XFzlTEarTRy3LGVUK4v93mZwN/uZLaywbdLBpLD4=; b=WGpAAnWCX+fal0fZSYsbjuc3ZOMhmsddJs8iTotz3f8Bnh1In5M2bH37TAXYNAqxqdKo+QD310dNoylsurKWmYVf4FQbjXTNUBbkA4rkBsqR/7wWTVIjn6xke5RIGZTRxV0GfN54J11V2zGiM30nT5GtIc00U2fnK0NPh7u+YdA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 163257686149880.71470230164641; Sat, 25 Sep 2021 06:34:21 -0700 (PDT) Received: by mail-wr1-f45.google.com with SMTP id i23so36136802wrb.2 for ; Sat, 25 Sep 2021 06:34:20 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id u6sm13140224wrp.0.2021.09.25.06.34.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 06:34:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=614XFzlTEarTRy3LGVUK4v93mZwN/uZLaywbdLBpLD4=; b=Tq5xiyopZSoBQTEKkjZaHU+1BqPjUQrcHksLvyWg5E0XfgqoP8tT64SHTWuIVEWOuF hQqvwTtByOXTZjeOOScHyQhD2qtDlA872IvjSfxM8Fqfjx3nN6ID3AIK8A2qWzhtJ2LA Ap8qjF2sMzL6nrWJYqv9bMFfN6nBvYtTcJGrTC0/5KGm59w9ufWvHGsHP3wA+hFgMp97 jlevRe2jDLtTLlLwC2pAdK1rApuSwClh5Y7gMZJWD1uZXacllD/kKcH+2VhAOJAR45NQ 7RAk3TkofTXBJ52B/CSA8lpZ+E/d5DqLx76zvApRxi+vwYn3/ZifIl5vAGB07S7UkViQ U2WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=614XFzlTEarTRy3LGVUK4v93mZwN/uZLaywbdLBpLD4=; b=E0oXQKU5TGtEDdR4tfSepIr9Jlulh4A933YbzYDnmbG+/2TmxVZ9RuQfwnbxBCQ2Ek c8ud1xkKZE3dO1fX1RhpgvIIOXbvBdAvpaDC6Jc0KZN+wi1LI+OmebW4o7GDDxu+ltmK ATj9T2gpE1t+yAYQ6UdsAWQr39EAbE1iW/VwIOmmTu1z4nRROpb2UF9oRCgiuigixItI oiX1jJWNJQuYlGv8giaQIuZF9nUxOM99B4Q+GxYr8TKj8uchBoUuArdwCYAlQ5S+Ozi8 m8+JfdzuqTtGa0li3YFLmckhTsIHerbfNxj9U/i7ftt2SR+4zsH3JxnK4qOr/134BVK6 Tohg== X-Gm-Message-State: AOAM531AnLOkLlAMPO0nykJqexNdFm5ikwBSnaSJEZLdjDbTVj9nHVrJ 4PKUDshPKqwt6FYgRpYdLGE= X-Google-Smtp-Source: ABdhPJz4ZgC1WiLqx+H12UHTcskiozWwfHMksJZwZMReybNsr+yQIpuYAtl/cwVHe4gBcC7je+nmXQ== X-Received: by 2002:a7b:c4d5:: with SMTP id g21mr6818808wmk.47.1632576859677; Sat, 25 Sep 2021 06:34:19 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Bin Meng , Alistair Francis , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/3] hw/char/mchp_pfsoc_mmuart: Use a MemoryRegion container Date: Sat, 25 Sep 2021 15:34:06 +0200 Message-Id: <20210925133407.1259392-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925133407.1259392-1-f4bug@amsat.org> References: <20210925133407.1259392-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632576863507100001 Our device have 2 different I/O regions: - a 16550 UART mapped for 32-bit accesses - 13 extra registers Instead of mapping each region on the main bus, introduce a container, map the 2 devices regions on the container, and map the container on the main bus. Before: (qemu) info mtree ... 0000000020100000-000000002010001f (prio 0, i/o): serial 0000000020100020-000000002010101f (prio 0, i/o): mchp.pfsoc.mmuart 0000000020102000-000000002010201f (prio 0, i/o): serial 0000000020102020-000000002010301f (prio 0, i/o): mchp.pfsoc.mmuart 0000000020104000-000000002010401f (prio 0, i/o): serial 0000000020104020-000000002010501f (prio 0, i/o): mchp.pfsoc.mmuart 0000000020106000-000000002010601f (prio 0, i/o): serial 0000000020106020-000000002010701f (prio 0, i/o): mchp.pfsoc.mmuart After: (qemu) info mtree ... 0000000020100000-0000000020100fff (prio 0, i/o): mchp.pfsoc.mmuart 0000000020100000-000000002010001f (prio 0, i/o): serial 0000000020100020-0000000020100fff (prio 0, i/o): mchp.pfsoc.mmuart.re= gs 0000000020102000-0000000020102fff (prio 0, i/o): mchp.pfsoc.mmuart 0000000020102000-000000002010201f (prio 0, i/o): serial 0000000020102020-0000000020102fff (prio 0, i/o): mchp.pfsoc.mmuart.re= gs 0000000020104000-0000000020104fff (prio 0, i/o): mchp.pfsoc.mmuart 0000000020104000-000000002010401f (prio 0, i/o): serial 0000000020104020-0000000020104fff (prio 0, i/o): mchp.pfsoc.mmuart.re= gs 0000000020106000-0000000020106fff (prio 0, i/o): mchp.pfsoc.mmuart 0000000020106000-000000002010601f (prio 0, i/o): serial 0000000020106020-0000000020106fff (prio 0, i/o): mchp.pfsoc.mmuart.re= gs Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Reviewed-by: Bin Meng Tested-by: Bin Meng --- include/hw/char/mchp_pfsoc_mmuart.h | 1 + hw/char/mchp_pfsoc_mmuart.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/hw/char/mchp_pfsoc_mmuart.h b/include/hw/char/mchp_pfs= oc_mmuart.h index 9c012e6c977..864ac1a36b5 100644 --- a/include/hw/char/mchp_pfsoc_mmuart.h +++ b/include/hw/char/mchp_pfsoc_mmuart.h @@ -33,6 +33,7 @@ #define MCHP_PFSOC_MMUART_REG_COUNT 13 =20 typedef struct MchpPfSoCMMUartState { + MemoryRegion container; MemoryRegion iomem; hwaddr base; qemu_irq irq; diff --git a/hw/char/mchp_pfsoc_mmuart.c b/hw/char/mchp_pfsoc_mmuart.c index 584e7fec17c..ea586559761 100644 --- a/hw/char/mchp_pfsoc_mmuart.c +++ b/hw/char/mchp_pfsoc_mmuart.c @@ -25,6 +25,8 @@ #include "chardev/char.h" #include "hw/char/mchp_pfsoc_mmuart.h" =20 +#define REGS_OFFSET 0x20 + static uint64_t mchp_pfsoc_mmuart_read(void *opaque, hwaddr addr, unsigned= size) { MchpPfSoCMMUartState *s =3D opaque; @@ -72,16 +74,19 @@ MchpPfSoCMMUartState *mchp_pfsoc_mmuart_create(MemoryRe= gion *sysmem, =20 s =3D g_new0(MchpPfSoCMMUartState, 1); =20 + memory_region_init(&s->container, NULL, "mchp.pfsoc.mmuart", 0x1000); + memory_region_init_io(&s->iomem, NULL, &mchp_pfsoc_mmuart_ops, s, - "mchp.pfsoc.mmuart", 0x1000); + "mchp.pfsoc.mmuart.regs", 0x1000 - REGS_OFFSET); + memory_region_add_subregion(&s->container, REGS_OFFSET, &s->iomem); =20 s->base =3D base; s->irq =3D irq; =20 - s->serial =3D serial_mm_init(sysmem, base, 2, irq, 399193, chr, + s->serial =3D serial_mm_init(&s->container, 0, 2, irq, 399193, chr, DEVICE_LITTLE_ENDIAN); =20 - memory_region_add_subregion(sysmem, base + 0x20, &s->iomem); + memory_region_add_subregion(sysmem, base, &s->container); =20 return s; } --=20 2.31.1