From nobody Sat May 18 14:54:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615573741; cv=none; d=zohomail.com; s=zohoarc; b=HLkpmU4cTSKzOgVu6jbf7x/Az7wKTAYm5Tgfu1PvQ7J6oYnPeX+oSF1vrYP+HDzyQ0hBcBjyjO7koT9LvfbSadOP07sMelJEcF5k4sJLCsFX0DYz3diwQnjr9gwLDyaOv5Nefz3wv3FOB1OA33lxXZ22jDlakV7iKRERvee75IM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615573741; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9MjJyVV/hMhFIu1Hswys1HIyZDTyxmxZhi30bZ2BoFk=; b=kRu5dzM17lSaEBEnH1vXtU+g76nuN2APtscsRKdILQ6tDuBI6ZPYZnGheAoCAAwYt4sc2qmGp7yw+E7j8jyq4hK8cFCieEkxNgXAIoKKx5GS6xtRNhLCwyQZTV/WcnJE8h6VOPV1si+nbuJ5gKgwZAsKX+Ob/n69sbq06OEgxPI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1615573741298988.0053897953583; Fri, 12 Mar 2021 10:29:01 -0800 (PST) Received: by mail-wr1-f52.google.com with SMTP id e10so5323457wro.12 for ; Fri, 12 Mar 2021 10:29:00 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id f22sm3013964wmc.33.2021.03.12.10.28.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 10:28:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9MjJyVV/hMhFIu1Hswys1HIyZDTyxmxZhi30bZ2BoFk=; b=GrTyctvg6diIqExCQcxbWffDQdHX8KVQZumxnsK/j3fM7Hg7CJs6xlAYzscwRpyT4N mkKXAJR+m3d2dtN0Si0HInZ/D4DdsCsMEkM36p6ScmNyHwwQEQrSP/ZEuaxo711pO9ih 4XsHhXn7unePstbgu3QYuabpQxpYe6THsFQcGb29Gn0/LEUdyWskmL7XZxoGEdCh9mMu psATY9d0se6uTSu//UcnkZIhmSnxLKPDdY7d7oJh5tFKLxhyET+ASLJBNXzq3rdep9Sm EoaSSrXxJUF8bsTmywam+ffKLYu4zir9G98y537ACSlT6jnu/fXnXW85T1r7xK6uPqsx T7Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9MjJyVV/hMhFIu1Hswys1HIyZDTyxmxZhi30bZ2BoFk=; b=n3382DOfSFCHH+5h99ffeYmovdTbFtsDd8zZUeQJUFI/h9du3VZ6eigbxWLkPzpRcW uBY+khDhs7FHUWdl74IZK7L3NNcV3huuJN2ae2fh0Pu6fuiK4Mgsxv2yiUAhdszlFU4U +8dqDLtacnPiIoxOZLyKNIIBZJuD1u5xLIkXaY5AY56OCHCwOXUs4JQdOTEPXjasNFIl zkWFPnAxNLXfO7fK7OLmajBe6cE6cI4Yoom2DAnLR/d7/YkAnoWPWIC6cbyoWgJS2sz4 s64+SB6vO8LGc5Ke5/DlFkRkiOJ9I5KXqb+tJFwl15iXCYVnkqzBvqcebzykrTMYC0w+ H3eg== X-Gm-Message-State: AOAM531QDTIuJQEAa5jJECDERytRgurad2URiw6WXJEnFtGantxXo++1 b07cLg8hN01H0KWq2oaiayM= X-Google-Smtp-Source: ABdhPJzP84qOkAaGfhRxvOkhoTcolHtBz+XnGVQOcTkffpWZPHqLggjGsz1tK8hTBh9v66Uqk3Bf0Q== X-Received: by 2002:adf:fd91:: with SMTP id d17mr15531540wrr.0.1615573739465; Fri, 12 Mar 2021 10:28:59 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Greg Kurz , qemu-arm@nongnu.org, Peter Xu , Andrew Jeffery , Alistair Francis , Joel Stanley , Paolo Bonzini , qemu-ppc@nongnu.org, David Gibson , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/5] hw/arm/aspeed: Do not directly map ram container onto main address bus Date: Fri, 12 Mar 2021 19:28:47 +0100 Message-Id: <20210312182851.1922972-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210312182851.1922972-1-f4bug@amsat.org> References: <20210312182851.1922972-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) The RAM container is exposed as an AddressSpace. AddressSpaces root MemoryRegion must not be mapped into other MemoryRegion, therefore map the RAM container using an alias. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/aspeed.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index a17b75f4940..daeef5b32a2 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -40,6 +40,7 @@ struct AspeedMachineState { =20 AspeedSoCState soc; MemoryRegion ram_container; + MemoryRegion ram_container_alias; MemoryRegion max_ram; bool mmio_exec; char *fmc_model; @@ -339,9 +340,12 @@ static void aspeed_machine_init(MachineState *machine) } qdev_realize(DEVICE(&bmc->soc), NULL, &error_abort); =20 + memory_region_init_alias(&bmc->ram_container_alias, NULL, + "ram-container-alias", &bmc->ram_container, 0, + memory_region_size(&bmc->ram_container)); memory_region_add_subregion(get_system_memory(), sc->memmap[ASPEED_DEV_SDRAM], - &bmc->ram_container); + &bmc->ram_container_alias); =20 max_ram_size =3D object_property_get_uint(OBJECT(&bmc->soc), "max-ram-= size", &error_abort); --=20 2.26.2 From nobody Sat May 18 14:54:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615573746; cv=none; d=zohomail.com; s=zohoarc; b=kwRAdf8wkxfYM331Ay4XgsnhwzUlPKGZTA+5Ss51xjcwvBxbD5YcyZQRgfhWHHatpfqXrtZnqlnKeqYN4s9OjlWRXjA5cUenykvJYMGjma8sPmu0BT9PcADEqbUCZ7duaANL5aXEU6ZDM/s33oRV0LsSwbFIlrjwRQ0T7m008yo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615573746; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9tJp0u8EkF/DAA9zO9gGqV8fJY+V8VUWnyEVu07oRsU=; b=jR2VBvxH1wkcMY7j1/9mFS2qqiQxeJkVuOAQbTpVZApKE71zSJ9ncFHvn9LKNq8ZKZfq/bJotSPN0QVYzgrohKcgupQAt6vkda630v5TYxagQj6dJT/3zfEKWpAaPd6sxbr/a5obisUj/WfRS4GTanfbqx1Nk9sDgBCQZqMYwIw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1615573746691308.96414392446866; Fri, 12 Mar 2021 10:29:06 -0800 (PST) Received: by mail-wr1-f50.google.com with SMTP id l11so5333382wrp.7 for ; Fri, 12 Mar 2021 10:29:06 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id j11sm8494397wrm.13.2021.03.12.10.29.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 10:29:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9tJp0u8EkF/DAA9zO9gGqV8fJY+V8VUWnyEVu07oRsU=; b=D4vLJqQyOFpCuz45zqLrkOqIezWkBmmZA6sCZs5wd+E9a+q76yyxoMXjTQLKk8DLTF T7cDt9CiZuIt0duYmAOcS7DA2UXzHms3jgYxPyQpapTwKPsfe3uX+GFv/YdI2EyxQ4qp iOSWDpVm7iVc9SpyvGB1putYGOoSx31MjZ/W+lGamX7B80noAS6waTeIkJrtreCvhA66 q1M1Yx6+4Uph4BXgZQ/77tGYFQ32M3ztmxBtvwYP49mACpmSZrQdw7gEnVzNSODDFKV8 PMlUCxxAWHi6Kc0Mct3lpzWDlXh7TFddBWu3l39t4jsQecqMXvDRtcoMaOQjnfhpMoFE kmRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9tJp0u8EkF/DAA9zO9gGqV8fJY+V8VUWnyEVu07oRsU=; b=mRsVD4aWzQ7rBqmr3wZTv+bGu9kYNpD1Du/cOLl9FCtYwn1Dz1hcDQI1IHoOMgKQnT ZUWiSPjycAOrG0iEbxwAxzZeZrKd72ell6z3N0KoNsiIO+UPpzjHwWXYAXPz0ZhH9OuB SVOfrYNtfPBIfVj6dc9+yEq6FAvZyeJWqzVQhl1r1/H9mw202rsHUD/qfcADbfRw3679 sb4PhtRNuWcYUtL/Nd/4CkTxLi4Q5zlFdLNmKPtKBco/Pe/EggSTGYzBIkbOoQgAm2fK ylsHRWNm4KgqQdk9ix5yQQGBtMX8KCScpcihuNaVRAbEF/5D4QkgOTBMnu+O1ACfxu/s 7TUQ== X-Gm-Message-State: AOAM530AJAH7UVEvfndXkqEHuqtni5TjRpZ+DgCpmxTCScZLzRNDlb3k 9CeIFb1BGwlEgbHRqDGkQHc= X-Google-Smtp-Source: ABdhPJw0X6cG3IBekwtztTFo0R627GOg0kkqW4JcehgXqIdlD+gObeIqPhRoRmb1VvX6ZKy1yNn/hA== X-Received: by 2002:adf:e84f:: with SMTP id d15mr15382841wrn.394.1615573744919; Fri, 12 Mar 2021 10:29:04 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Greg Kurz , qemu-arm@nongnu.org, Peter Xu , Andrew Jeffery , Alistair Francis , Joel Stanley , Paolo Bonzini , qemu-ppc@nongnu.org, David Gibson , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/5] hw/arm/aspeed: Do not sysbus-map mmio flash region directly, use alias Date: Fri, 12 Mar 2021 19:28:48 +0100 Message-Id: <20210312182851.1922972-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210312182851.1922972-1-f4bug@amsat.org> References: <20210312182851.1922972-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) The flash mmio region is exposed as an AddressSpace. AddressSpaces must not be sysbus-mapped, therefore map the region using an alias. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/ssi/aspeed_smc.h | 1 + hw/ssi/aspeed_smc.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/hw/ssi/aspeed_smc.h b/include/hw/ssi/aspeed_smc.h index 16c03fe64f3..e3c96cecbd8 100644 --- a/include/hw/ssi/aspeed_smc.h +++ b/include/hw/ssi/aspeed_smc.h @@ -84,6 +84,7 @@ struct AspeedSMCState { =20 MemoryRegion mmio; MemoryRegion mmio_flash; + MemoryRegion mmio_flash_alias; =20 qemu_irq irq; int irqline; diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index 16addee4dc8..aa26578bdac 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -1386,7 +1386,9 @@ static void aspeed_smc_realize(DeviceState *dev, Erro= r **errp) memory_region_init_io(&s->mmio_flash, OBJECT(s), &aspeed_smc_flash_default_ops, s, name, s->ctrl->flash_window_size); - sysbus_init_mmio(sbd, &s->mmio_flash); + memory_region_init_alias(&s->mmio_flash_alias, OBJECT(s), name, + &s->mmio_flash, 0, s->ctrl->flash_window_size= ); + sysbus_init_mmio(sbd, &s->mmio_flash_alias); =20 s->flashes =3D g_new0(AspeedSMCFlash, s->ctrl->max_peripherals); =20 --=20 2.26.2 From nobody Sat May 18 14:54:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) client-ip=209.85.128.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1615573751; cv=none; d=zohomail.com; s=zohoarc; b=RhUm5ADq+YzglmOiPa5vkk1Jv451qlgQjs3ss3n6aS2ooK3EbueqshWv2NHxYIHeJsIE1SNz39sTdGW4GA15x8I14h59kUiwsgLS8SrmbWgoAU34y9FrnlgT7Sne/SDB8fWZVz2PDMgRk7eplQcOiVfk6JjQHGKCpxtOLXb82/M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615573751; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qIcXZtBMSY7WdLGhZgrXmgrdR0gt1Xm1ku0prQAncBw=; b=dBA5D+6HCymHPMUuMfjbgkGV5w36wFaLduDMlPYFQEKsdOGXeCm+93D9cGiJ4oBEqWWak0Otl5uenZKAC/AtE9sEtgvhFiu2QTFUy5XWh43jCoF/6YwNqvEV77rnqx+nW5dz29KtpW0bCN90IXKDysFNoKzS12b5zp/k9D2KvBs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.zohomail.com with SMTPS id 1615573751744108.4071760666011; Fri, 12 Mar 2021 10:29:11 -0800 (PST) Received: by mail-wm1-f54.google.com with SMTP id r10-20020a05600c35cab029010c946c95easo15711465wmq.4 for ; Fri, 12 Mar 2021 10:29:11 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id j14sm8946589wrw.69.2021.03.12.10.29.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 10:29:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qIcXZtBMSY7WdLGhZgrXmgrdR0gt1Xm1ku0prQAncBw=; b=upx6kE0FvZScn1zsi7b3F3azwotDuEqN1ElJX4jYPvwGCAzXROnzixckn55/tjiIyt gZSEYgxJwQQ8Eyq8WjBT7Rp5xSUbvaIXJQfAuOFhyCW6KgWYiopY83igYv/XM9cW6i0t HcBYIQ8HJoCK7jkF03HlBEPXjPRHsl0arQZP5MmarUejKHWPWyIGDXA4XtAegSNB7+wH DSJ/mIbYyW/24VZbZ8eCtc6zGNUuMtNAfepNKHrodzcl625iAUPE1MKFlvP1ZuIuYKSt 0+iGbVl5L25w/CbuU2RYzlkLvvI+2O19mS5LYw0O9OP+sPxaMpXSpcnig7P+CppIT+bG biBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=qIcXZtBMSY7WdLGhZgrXmgrdR0gt1Xm1ku0prQAncBw=; b=q4tX8IllzN/fnsbmeX05XsUuysam6M9yFCg5W1uRqIKkhlQkNwkjiIqzZr3rLzRmed i42tEy67zOFrySGQoZDPjCean136ZlXtofc3Hqu2kSg26S4LM6B8vztN8Tza6LsHgdTV 6/smi4q1OOWRW/38HVFCFVQn1UD8A8UehA2QJS6IepeZjyWJM1XWudoOCNqjATiAX+E1 w2jSQ1GjdEFh7dOaWzzGavsS6oq8IqVrjpXrdctajMaIZpHYXJIXZS5iWafTTnVgAkmQ r+cGZByUyR4kBDaCSmveFUih4TFs21O4O4WIu/YwZ/N3FqWHD7m9WGSwDWZ/g9h5SDuk VIUw== X-Gm-Message-State: AOAM530l1fg14b8ZIL5L4fhrQ1aU8yZfMZnldaYOZwS96mkxoInEmoDa j+5syTjOWms7qcELci0rto8= X-Google-Smtp-Source: ABdhPJwF3LNiiuFOlpBxuoky2PI7H5mj0PPPFzJZyyxa2rsN03n/7rvz6er8LXYzsCiO1EleLsV9pA== X-Received: by 2002:a1c:2857:: with SMTP id o84mr14286897wmo.181.1615573750064; Fri, 12 Mar 2021 10:29:10 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Greg Kurz , qemu-arm@nongnu.org, Peter Xu , Andrew Jeffery , Alistair Francis , Joel Stanley , Paolo Bonzini , qemu-ppc@nongnu.org, David Gibson , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 3/5] hw/pci-host/prep: Remove unuseful memory region mapping Date: Fri, 12 Mar 2021 19:28:49 +0100 Message-Id: <20210312182851.1922972-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210312182851.1922972-1-f4bug@amsat.org> References: <20210312182851.1922972-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) The pci_io_non_contiguous region is mapped on top of pci_io with higher priority, but simply dispatch into this region address space. Simplify by directly registering the former region in place, and adapt the address space dispatch offsets. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/prep.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 0a9162fba97..00a28c2d18c 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -159,8 +159,7 @@ static uint64_t raven_io_read(void *opaque, hwaddr addr, uint8_t buf[4]; =20 addr =3D raven_io_address(s, addr); - address_space_read(&s->pci_io_as, addr + 0x80000000, - MEMTXATTRS_UNSPECIFIED, buf, size); + address_space_read(&s->pci_io_as, addr, MEMTXATTRS_UNSPECIFIED, buf, s= ize); =20 if (size =3D=3D 1) { return buf[0]; @@ -191,8 +190,7 @@ static void raven_io_write(void *opaque, hwaddr addr, g_assert_not_reached(); } =20 - address_space_write(&s->pci_io_as, addr + 0x80000000, - MEMTXATTRS_UNSPECIFIED, buf, size); + address_space_write(&s->pci_io_as, addr, MEMTXATTRS_UNSPECIFIED, buf, = size); } =20 static const MemoryRegionOps raven_io_ops =3D { @@ -294,9 +292,8 @@ static void raven_pcihost_initfn(Object *obj) address_space_init(&s->pci_io_as, &s->pci_io, "raven-io"); =20 /* CPU address space */ - memory_region_add_subregion(address_space_mem, 0x80000000, &s->pci_io); - memory_region_add_subregion_overlap(address_space_mem, 0x80000000, - &s->pci_io_non_contiguous, 1); + memory_region_add_subregion(address_space_mem, 0x80000000, + &s->pci_io_non_contiguous); memory_region_add_subregion(address_space_mem, 0xc0000000, &s->pci_mem= ory); pci_root_bus_new_inplace(&s->pci_bus, sizeof(s->pci_bus), DEVICE(obj),= NULL, &s->pci_memory, &s->pci_io, 0, TYPE_PCI_BUS); --=20 2.26.2 From nobody Sat May 18 14:54:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615573757; cv=none; d=zohomail.com; s=zohoarc; b=jm5YHJpVvnHYaVwwIOy2UtReYrR6mp2SocANYiT/oB5zGTfiNaZPZU2ikgzIFhluddRFCa33EIGvgxDVQEj1Lpt1bb9Dj1c3lBxmzoPMLFMRKJCdhcgx9Dnv6fU/drpEBQI+gCIWGllzZBHevtyGU+eFCpjcmxRbbm8JOPMqqps= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615573757; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=laYl2bj4VYIIjPf+lFqCAsk0iqOK5GAGgW7ZwBfFasU=; b=PhI7ejHSPFZP2lIK1JmcVcbPiYCKInt2asGme/k/wwwgyLICZkcark9zOej15dHLRsl5LumOX+nM/WKptwSgTI3a0NCWLVxvkmTDUWUL/leqqhSKL05DJhhdhqsEoFciyd5qrKCeWuCZYbQTiq5adh/rVGvRQ2z/4R5ev0pIsrs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 16155737570261006.1997395085782; Fri, 12 Mar 2021 10:29:17 -0800 (PST) Received: by mail-wr1-f50.google.com with SMTP id d15so5334740wrv.5 for ; Fri, 12 Mar 2021 10:29:16 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id f22sm3014694wmc.33.2021.03.12.10.29.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 10:29:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=laYl2bj4VYIIjPf+lFqCAsk0iqOK5GAGgW7ZwBfFasU=; b=RdxUL7pmUjhJexoJR9+F9AovB2IWM6CcUkYI22Kr2XL/srJvIzRw0CHpEsE2KTbcFQ BltrpA+YX7Qo13eDpgnyXzSJ9LRzgzg8b80mrNj6lYw0qLJ3cjxvdhEt6ojNsv7TPXEk V5fvM0CEHDmGdETP3wL+oNxw4F2Ou9l8VdcmBbBn1Du+MaKxZs/rgP4HFu1HZBAWjYhS X/F6sJqc6Z+a3F7TlNv6ucVNArvRBziFF8gYmMyj/UCSY3FniOUFp0WpzQVI0sCtgOBE wlCqiTgerL67ElSpoE2pN16+RNfVHGKP1WhBT2T+z6TmDrJ4oZsrx26REibvhvTmpmFY rgGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=laYl2bj4VYIIjPf+lFqCAsk0iqOK5GAGgW7ZwBfFasU=; b=JyCJ6rKsk2bQgdTtOk4fkDCw5W13wa/qn9hcKoiGl/SyyY0T+6z5tab1QpDctJJdFo NGY6/UDHLHsHQINlgEEY6Y3kEN0SHQmg3yTFn42be7gZxO1mqv/8ACgrQY8JM9zP+Ghv jhfXiEX4PKDBXCj0JfIoA17/v+dtPS2+9ctOHaORmU2Lgtki2y8Q4zs7LSlrdFRzyySv 3f7bTMKVKV4DII+SGxQ0ySzXwtZnWi1nNUPa6JYvQGCbNAbPUP50aKwShYpxZcHm9wpa x00OYUk5shG0sfo5OZgfYO0blhJ2A5cyxsKQ57rKTYrKpQtsDyVQnN1wFQ9y0q5L5PcB Kq9w== X-Gm-Message-State: AOAM532yZ/vkuw5fCSgYnhJZdc0LbX1cS18UFf15S/QE0YosGvFOCYwX H/79UZixoChFpI5kbSf3FW8= X-Google-Smtp-Source: ABdhPJx3MhjStovYaB1Za+DaHnbaTt1yIa9jPvQTKkSDjLtf9LgqJ3H8h0o6raahjdOQsnF2k8b6nQ== X-Received: by 2002:a5d:47ab:: with SMTP id 11mr15448396wrb.153.1615573755317; Fri, 12 Mar 2021 10:29:15 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Greg Kurz , qemu-arm@nongnu.org, Peter Xu , Andrew Jeffery , Alistair Francis , Joel Stanley , Paolo Bonzini , qemu-ppc@nongnu.org, David Gibson , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 4/5] hw/pci-host/prep: Do not directly map bus-master region onto main bus Date: Fri, 12 Mar 2021 19:28:50 +0100 Message-Id: <20210312182851.1922972-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210312182851.1922972-1-f4bug@amsat.org> References: <20210312182851.1922972-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) The raven bus-master memory region is exposed as an AddressSpace. AddressSpaces root MemoryRegion must not be mapped into other MemoryRegion, therefore map the region using its alias. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: David Gibson --- hw/pci-host/prep.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 00a28c2d18c..6eaf9242bd8 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -295,8 +295,6 @@ static void raven_pcihost_initfn(Object *obj) memory_region_add_subregion(address_space_mem, 0x80000000, &s->pci_io_non_contiguous); memory_region_add_subregion(address_space_mem, 0xc0000000, &s->pci_mem= ory); - pci_root_bus_new_inplace(&s->pci_bus, sizeof(s->pci_bus), DEVICE(obj),= NULL, - &s->pci_memory, &s->pci_io, 0, TYPE_PCI_BUS); =20 /* Bus master address space */ memory_region_init(&s->bm, obj, "bm-raven", 4 * GiB); @@ -308,6 +306,10 @@ static void raven_pcihost_initfn(Object *obj) memory_region_add_subregion(&s->bm, 0 , &s->bm_pci_memory_alia= s); memory_region_add_subregion(&s->bm, 0x80000000, &s->bm_ram_alias); address_space_init(&s->bm_as, &s->bm, "raven-bm"); + + pci_root_bus_new_inplace(&s->pci_bus, sizeof(s->pci_bus), DEVICE(obj),= NULL, + &s->bm_pci_memory_alias, &s->pci_io, 0, + TYPE_PCI_BUS); pci_setup_iommu(&s->pci_bus, raven_pcihost_set_iommu, s); =20 h->bus =3D &s->pci_bus; --=20 2.26.2 From nobody Sat May 18 14:54:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) client-ip=209.85.128.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615573762; cv=none; d=zohomail.com; s=zohoarc; b=McKZsNkIPpR9t2cOODAvry6mIOvKVCoHjQUHuQFKInsI5+3LVARRPy6ZSNCoKR4iQBuzS5kGqQp0snJg7zbwQ1KrUjgeC3UCs7vaaueaVrxVmu/pPwLn8cnLkfx2AqicEBwX8Wn3DUU0ooYH3uRJC9FbtUiUVay3A85hyCcJDvM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615573762; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7eAW6nzndJ8SRLf0zYMWILankRA6VcV8J/YafiY9oXc=; b=OI1RX++DqzSeCmj4Qjr0DUSdug3DoJ8Xyq00OW/TZzr/erEtO2o3d3HJspwEZKFL+Y1pef9vaBYVj84vsN1nSfRLqakT2UMxQXW1k9rjmnCDntKSd+bGH7IXkSqo2kIgcnI3GhQqcKNyM//FKpULbPVqfwqz4zYEmZILo9tmj/g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.zohomail.com with SMTPS id 16155737622911008.8569941145056; Fri, 12 Mar 2021 10:29:22 -0800 (PST) Received: by mail-wm1-f42.google.com with SMTP id y124-20020a1c32820000b029010c93864955so16365799wmy.5 for ; Fri, 12 Mar 2021 10:29:21 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id p14sm2968968wmc.30.2021.03.12.10.29.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 10:29:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7eAW6nzndJ8SRLf0zYMWILankRA6VcV8J/YafiY9oXc=; b=FI6l6XSJzAjCcMe7tv4CLouB+9PJdZqR0BUgFK+y7dF/knVZRKZCVtWZCXlCSXAbLK nBqQYZ2PPNWvIydrKFVEJAhCHB2djN6EpsdKjYf69NTyXcipOhV58PFrUkVSJs2G/jZB Bfrto53rudP4ooShM7hIxSPxuQTsImq7Wq11YfRWhy5VIQNiMIotDDqzcJb8n2lxapPW rXMhgUPqqfbT03pCtc+TwfnETgT5s0ZZuRVcZn+hbewT8ryoXTudb3Lm4Ox9XMixMrd3 f06eYAk+ylIAgv6M4Hmc3j/6cYLwlgYorL0Pw+nxxSacTV7CqdKgFeJRlL+gpJf7o6i/ eF8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=7eAW6nzndJ8SRLf0zYMWILankRA6VcV8J/YafiY9oXc=; b=leNoBX+ZVuub39bH4HOf+PczPVQTChxCF6gJ+cw9p9JZCBRZOvWGM31jPMRyNSy18n a67YMsaYQbXnEKuF3diP+78zAbHxik0eA90CpWl2zQXbCki7F1ZwJFxcDNINgOFRJMJM ZWvobFpuXIbD4U6VnStHI8BzgU/y3nIea8Q+Kodyv5NoSttmTZPPTKWBnyA3EB/6YK7X +8OG2fJeScZhm80lWQMFPAArrwG4GYNVXDosSjPkmNLlB91E6+PsGq4vwkMg/SHIE+iN da90lmS+Z3QwZ7thtTBfABfQigpHAFvoxmlLSpPSDL8GQWT3+0dE4YbuzJjEDgk0JU/1 X2aA== X-Gm-Message-State: AOAM5339pxpsZYJnjpUb5VC3yj3iPRUN7qhrqGR2vtFsZmWFzxTWrwVP LlpZQzGmtxiHg/LTsX+kTy8= X-Google-Smtp-Source: ABdhPJxtD4Q5mbcqFrFpTUAWmhr5KZnz9Cjo4IvOjeui6TuYcoX2s5UfUcgNaP7LHMxtNG9ha6vrCg== X-Received: by 2002:a1c:67d6:: with SMTP id b205mr14538656wmc.118.1615573760597; Fri, 12 Mar 2021 10:29:20 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Greg Kurz , qemu-arm@nongnu.org, Peter Xu , Andrew Jeffery , Alistair Francis , Joel Stanley , Paolo Bonzini , qemu-ppc@nongnu.org, David Gibson , Peter Maydell Subject: [PATCH 5/5] memory: Make sure root MR won't be added as subregion Date: Fri, 12 Mar 2021 19:28:51 +0100 Message-Id: <20210312182851.1922972-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210312182851.1922972-1-f4bug@amsat.org> References: <20210312182851.1922972-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Content-Type: text/plain; charset="utf-8" From: Peter Xu Add a bool for MR to mark whether this MR is a root MR of an AS. We bail o= ut asap if this MR is added as a subregion of another MR. Signed-off-by: Peter Xu --- include/exec/memory.h | 1 + softmmu/memory.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/include/exec/memory.h b/include/exec/memory.h index 54ccf1a5f09..8137ad3a9f6 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -477,6 +477,7 @@ struct MemoryRegion { bool ram_device; bool enabled; bool warning_printed; /* For reservations */ + bool is_root_mr; uint8_t vga_logging_count; MemoryRegion *alias; hwaddr alias_offset; diff --git a/softmmu/memory.c b/softmmu/memory.c index 9db47b7db6b..ce322ff3d6e 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -2442,6 +2442,7 @@ static void memory_region_add_subregion_common(Memory= Region *mr, MemoryRegion *subregion) { assert(!subregion->container); + assert(!subregion->is_root_mr); subregion->container =3D mr; subregion->addr =3D offset; memory_region_update_container_subregions(subregion); @@ -2819,6 +2820,7 @@ void address_space_init(AddressSpace *as, MemoryRegio= n *root, const char *name) { memory_region_ref(root); as->root =3D root; + root->is_root_mr =3D true; as->current_map =3D NULL; as->ioeventfd_nb =3D 0; as->ioeventfds =3D NULL; --=20 2.26.2