From nobody Sun Dec 14 06:36:32 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1765491481; cv=none; d=zohomail.com; s=zohoarc; b=WA8eUev6gVxDJrnuXhjLFOzNZUrZvSdXd0zDY8gtlYL/D/XQODjquW/V9YpNgURmz5QXEZ+YPs0VtIIvuOaqG9bOjnN/qEAIj8S1jYdQwyuRVP+fgp2PaFqRbR01FkG3Nbar4GRIdgT0tfCzgKUz6oElj/WyGsvCgheixvrbOTo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765491481; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=W62vxMIQunx3gV5FI+x0umwU13xGfudN88vJGwV26To=; b=dVL9yfbtEqAYJ4YnLxOCx2rezuiP0gSaDk7xdl0P9Xa0bvhKKmxWAT+2klEARtRyB/krdJgPN8TJIF6mhMCBZacKK4Yg8LuqHyoLr1qcDrjYDpDMGMDyoFplIKcFZei+Jbu87GP3+h0coeZaPBfdx/31zLME/3ViHVI9IAWEE0g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1765491481429833.6345026049262; Thu, 11 Dec 2025 14:18:01 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vToya-0004wE-Qr; Thu, 11 Dec 2025 17:17:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vToyX-0004vB-8I for qemu-devel@nongnu.org; Thu, 11 Dec 2025 17:17:29 -0500 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vToyU-0002MM-BL for qemu-devel@nongnu.org; Thu, 11 Dec 2025 17:17:29 -0500 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-2981f9ce15cso6758815ad.1 for ; Thu, 11 Dec 2025 14:17:25 -0800 (PST) Received: from pc.taild8403c.ts.net (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29eea06dfbfsm33467785ad.100.2025.12.11.14.17.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Dec 2025 14:17:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765491445; x=1766096245; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=W62vxMIQunx3gV5FI+x0umwU13xGfudN88vJGwV26To=; b=Vb3Cdc4vapsRbyiSWxFHFb8a2I3h9yQlAST54zI1IC25OZ9kTJpb81396Ca2x7oKts K8HdNZ+ILvBT/S1UyJ0iidWiT1Yv7dDpxLqviDrjayEDRSTTirgyk66hpkAiCKVDU+6r 7XvxniLrj4gNi6IjyQD9hDtbROtq5DFeQhL+QCu0GuMAQU3bAcBKlHbkDvpwfs3y6Zbh lzjvJZ4iHZ3s6BI9ew/Snmhb2JkfEI0kpI+95gKsMv31A5EEcskDHTFUN7tngYVcOO02 1LfBp/hJj9nlqe9TKJAsPuHuVJ+9474Tdhi5Z4nrw1HSE+qzUyb3ch6ABEXIVfZiNedi Lu1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765491445; x=1766096245; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=W62vxMIQunx3gV5FI+x0umwU13xGfudN88vJGwV26To=; b=lB1Mfe7DlRaBPv0H3cLVvZYHKCgGTdk4V96nyoWxGnMtuIkwUtrahPC9OIMzMCZErq 1AVtdfZWugo2XLsfFQZOzT+NYtclKIzaWRBRU9H5F8qnPtaGiX0mo4tuNk1z/G77YmVz Q4K0amp3HXtQ0NsFx7nJy2LOBUKA8iW0Ch1kjC/GC53ClOlbEFpkf8+RgJmMzwUXaul3 cX6lzdxcrwMH6UVBqIl/pnUSk+ubhPueX2Vr7Kq9aKkUSPEsyp5OKTst0cKsLak7RVZv BjaqN1p2mk81T5T4/40y/X2kf+UTpHcjXam6Skc0lcLdLqj3tCplMULwNIWNm+UMxBrE nD0g== X-Gm-Message-State: AOJu0YyW2vbzP93x7KBKCMdF7VfIW6XdmCvgxW40XO9qfmH9SKRb5oYx BpknRFLgihodRs1H5WptYMdX7H9Pc8vKaPk7xyha42hDW00+GxBGDEcEVVlGgdHSfMK9eYyYwi0 wZzej/R5qsQ== X-Gm-Gg: AY/fxX78YhMD6X3R+KTDLUI9QSQcx3j3rKPU7Dmdre7tPFg09eKljcW9jOs6IUyJ0r3 wG/KgmG2r3xIlaYWLo7aoQ+yyKlkW2nW4tfRJrcg4iZcarEjYlzjON5QBGDY2S//uypKMbyCTFr WHJCJlrbFG8FAKH7CXB2MH0gkp9rPCDZydhfUw0iYgCboITDkhfr5BLAlx76xmXvbcpx9pLlQOE J9MZRigQkM1whRzAK/fAhiFZnRGnjhgsdZTFzdc33GPXJoQ2eJS3o6OfkqpmBaXlXLRXU+zcIla 0jpBVvBwiBJAXr7JLEC16waDUr9t6lERHl87sZuntz7SkkWWTG+o+nSmi7TMcTzaOtEPdtSFvP3 tBLrlyQKB8O9vpo5rmMEhi5OQcdfEph+gIgjfN7v9IRDsFU9+H+eLs+nZVmyZd/JqoFRDMagYSv PGzxoS4mR1Omt/GRFdH9nxzW1Smitb/Q29Mkew4nmtLuqZ/YUTtjnYjR3of3tNvzqjkfO1SFWiB g== X-Google-Smtp-Source: AGHT+IEriQaTmfjNcAUSWM+4nPjehY65P7lYZx9cKCuz1BEYtJUBAZf1PrKYhNiBqM7m9NgzYqB5rQ== X-Received: by 2002:a17:903:17c7:b0:297:cf96:45bd with SMTP id d9443c01a7336-29f23b52fa2mr1160845ad.19.1765491444712; Thu, 11 Dec 2025 14:17:24 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Leif Lindholm , tangtao1634@phytium.com.cn, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Eric Auger , Peter Maydell , Richard Henderson , Radoslaw Biernacki , Pierrick Bouvier Subject: [PATCH] hw/arm/smmu: add memory regions as property for an SMMU instance Date: Thu, 11 Dec 2025 14:17:15 -0800 Message-ID: <20251211221715.2206662-1-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 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=2607:f8b0:4864:20::636; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x636.google.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1765491483482158500 Content-Type: text/plain; charset="utf-8" This will be used to access non-secure and secure memory. Secure support and Granule Protection Check (for RME) for SMMU need to access secure memory. As well, it allows to remove usage of global address_space_memory, allowing different SMMU instances to have a specific view of memory. Signed-off-by: Pierrick Bouvier --- include/hw/arm/smmu-common.h | 4 ++++ hw/arm/sbsa-ref.c | 16 ++++++++++++---- hw/arm/smmu-common.c | 24 ++++++++++++++++++++++++ hw/arm/virt.c | 16 +++++++++++----- 4 files changed, 51 insertions(+), 9 deletions(-) diff --git a/include/hw/arm/smmu-common.h b/include/hw/arm/smmu-common.h index a6bdb67a983..0f08ae080c9 100644 --- a/include/hw/arm/smmu-common.h +++ b/include/hw/arm/smmu-common.h @@ -227,6 +227,10 @@ struct SMMUState { uint8_t bus_num; PCIBus *primary_bus; bool smmu_per_bus; /* SMMU is specific to the primary_bus */ + MemoryRegion *memory; + AddressSpace as_memory; + MemoryRegion *secure_memory; + AddressSpace as_secure_memory; }; =20 struct SMMUBaseClass { diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 45d2e3e946d..840b1a216f4 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -616,7 +616,9 @@ static void create_xhci(const SBSAMachineState *sms) sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, qdev_get_gpio_in(sms->gic, = irq)); } =20 -static void create_smmu(const SBSAMachineState *sms, PCIBus *bus) +static void create_smmu(const SBSAMachineState *sms, PCIBus *bus, + MemoryRegion *sysmem, + MemoryRegion *secure_sysmem) { hwaddr base =3D sbsa_ref_memmap[SBSA_SMMU].base; int irq =3D sbsa_ref_irqmap[SBSA_SMMU]; @@ -628,6 +630,10 @@ static void create_smmu(const SBSAMachineState *sms, P= CIBus *bus) object_property_set_str(OBJECT(dev), "stage", "nested", &error_abort); object_property_set_link(OBJECT(dev), "primary-bus", OBJECT(bus), &error_abort); + object_property_set_link(OBJECT(dev), "memory", OBJECT(sysmem), + &error_abort); + object_property_set_link(OBJECT(dev), "secure-memory", OBJECT(secure_s= ysmem), + &error_abort); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); for (i =3D 0; i < NUM_SMMU_IRQS; i++) { @@ -636,7 +642,9 @@ static void create_smmu(const SBSAMachineState *sms, PC= IBus *bus) } } =20 -static void create_pcie(SBSAMachineState *sms) +static void create_pcie(SBSAMachineState *sms, + MemoryRegion *sysmem, + MemoryRegion *secure_sysmem) { hwaddr base_ecam =3D sbsa_ref_memmap[SBSA_PCIE_ECAM].base; hwaddr size_ecam =3D sbsa_ref_memmap[SBSA_PCIE_ECAM].size; @@ -692,7 +700,7 @@ static void create_pcie(SBSAMachineState *sms) =20 pci_create_simple(pci->bus, -1, "bochs-display"); =20 - create_smmu(sms, pci->bus); + create_smmu(sms, pci->bus, sysmem, secure_sysmem); } =20 static void *sbsa_ref_dtb(const struct arm_boot_info *binfo, int *fdt_size) @@ -831,7 +839,7 @@ static void sbsa_ref_init(MachineState *machine) =20 create_xhci(sms); =20 - create_pcie(sms); + create_pcie(sms, sysmem, secure_sysmem); =20 create_secure_ec(secure_sysmem); =20 diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c index 66367adc2a4..5fbfe825fd0 100644 --- a/hw/arm/smmu-common.c +++ b/hw/arm/smmu-common.c @@ -1171,6 +1171,12 @@ static void smmu_base_realize(DeviceState *dev, Erro= r **errp) return; } =20 + g_assert(s->memory); + address_space_init(&s->as_memory, s->memory, "memory"); + if (s->secure_memory) { + address_space_init(&s->as_secure_memory, s->secure_memory, "secure= -memory"); + } + /* * We only allow default PCIe Root Complex(pcie.0) or pxb-pcie based e= xtra * root complexes to be associated with SMMU. @@ -1235,10 +1241,28 @@ static void smmu_base_class_init(ObjectClass *klass= , const void *data) rc->phases.exit =3D smmu_base_reset_exit; } =20 +static void smmu_base_instance_init(Object *obj) +{ + SMMUState *s =3D ARM_SMMU(obj); + + object_property_add_link(obj, "memory", + TYPE_MEMORY_REGION, + (Object **)&s->memory, + qdev_prop_allow_set_link_before_realize, + OBJ_PROP_LINK_STRONG); + + object_property_add_link(obj, "secure-memory", + TYPE_MEMORY_REGION, + (Object **)&s->secure_memory, + qdev_prop_allow_set_link_before_realize, + OBJ_PROP_LINK_STRONG); +} + static const TypeInfo smmu_base_info =3D { .name =3D TYPE_ARM_SMMU, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(SMMUState), + .instance_init =3D smmu_base_instance_init, .class_data =3D NULL, .class_size =3D sizeof(SMMUBaseClass), .class_init =3D smmu_base_class_init, diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 5d205eff3a1..d446c3349e9 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1514,8 +1514,9 @@ static void create_smmuv3_dev_dtb(VirtMachineState *v= ms, 0x0, vms->iommu_phandle, 0x0, 0x10000); } =20 -static void create_smmu(const VirtMachineState *vms, - PCIBus *bus) +static void create_smmu(const VirtMachineState *vms, PCIBus *bus, + MemoryRegion *sysmem, + MemoryRegion *secure_sysmem) { VirtMachineClass *vmc =3D VIRT_MACHINE_GET_CLASS(vms); int irq =3D vms->irqmap[VIRT_SMMU]; @@ -1549,6 +1550,10 @@ static void create_smmu(const VirtMachineState *vms, object_property_set_str(OBJECT(dev), "stage", stage, &error_fatal); object_property_set_link(OBJECT(dev), "primary-bus", OBJECT(bus), &error_abort); + object_property_set_link(OBJECT(dev), "memory", OBJECT(sysmem), + &error_abort); + object_property_set_link(OBJECT(dev), "secure-memory", OBJECT(secure_s= ysmem), + &error_abort); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); for (i =3D 0; i < NUM_SMMU_IRQS; i++) { @@ -1587,7 +1592,8 @@ static void create_virtio_iommu_dt_bindings(VirtMachi= neState *vms) } } =20 -static void create_pcie(VirtMachineState *vms) +static void create_pcie(VirtMachineState *vms, + MemoryRegion *sysmem, MemoryRegion *secure_sysmem) { hwaddr base_mmio =3D vms->memmap[VIRT_PCIE_MMIO].base; hwaddr size_mmio =3D vms->memmap[VIRT_PCIE_MMIO].size; @@ -1706,7 +1712,7 @@ static void create_pcie(VirtMachineState *vms) =20 switch (vms->iommu) { case VIRT_IOMMU_SMMUV3: - create_smmu(vms, vms->bus); + create_smmu(vms, vms->bus, sysmem, secure_sysmem); if (!vms->default_bus_bypass_iommu) { qemu_fdt_setprop_cells(ms->fdt, nodename, "iommu-map", 0x0, vms->iommu_phandle, 0x0, 0x100= 00); @@ -2520,7 +2526,7 @@ static void machvirt_init(MachineState *machine) =20 create_rtc(vms); =20 - create_pcie(vms); + create_pcie(vms, sysmem, secure_sysmem); create_cxl_host_reg_region(vms); =20 if (aarch64 && firmware_loaded && virt_is_acpi_enabled(vms)) { --=20 2.47.3