From nobody Wed Nov 27 16:03:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1731070658; cv=none; d=zohomail.com; s=zohoarc; b=h5rXUUyVp9vAf9VNXxUcNJTYteUbsCMkvcNIErFf5bmYTfugOFul1ywykLWnI2L1qkCfxGbo1K9SlOg16BMLqU/S+QMxqCDz0udDgR5s9GcSKLucNINRT2OtWzzS36OSC1huvtydCJMY++/GUUhZ2KjXCCKt32CKbU5Yrgdcbt0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731070658; h=Content-Type:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=A09JVFHB8G5OKaEal3CPE/qNr5xpG7FBbBhYSoNPJVw=; b=l9GkNIYpnFbMiFXLxPqi4/YRe6dzDo92QJ7/Vc3R4DhoMlNAsPlAFZznB7anzCe6+S4cGuY/9PlE9atj72WzIC3aqx9UlrBE7ynVB/m5kf2YiJV9zhfjpX9EAK5ZCRzt6bZqGiQeb75KaQoEf10eADILx2Sc3yeiFB5+3mpePC8= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1731070658821917.6826886709498; Fri, 8 Nov 2024 04:57:38 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t9OX4-000508-6N; Fri, 08 Nov 2024 07:56:10 -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 1t9OWy-0004yD-0t; Fri, 08 Nov 2024 07:56:05 -0500 Received: from frasgout.his.huawei.com ([185.176.79.56]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t9OWv-0006fg-FK; Fri, 08 Nov 2024 07:56:03 -0500 Received: from mail.maildlp.com (unknown [172.18.186.31]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4XlJl32gKPz6J76j; Fri, 8 Nov 2024 20:53:03 +0800 (CST) Received: from frapeml500008.china.huawei.com (unknown [7.182.85.71]) by mail.maildlp.com (Postfix) with ESMTPS id 0A519140133; Fri, 8 Nov 2024 20:55:57 +0800 (CST) Received: from A2303104131.china.huawei.com (10.203.177.241) by frapeml500008.china.huawei.com (7.182.85.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Fri, 8 Nov 2024 13:55:50 +0100 To: , CC: , , , , , , , , , Subject: [RFC PATCH 2/5] hw/arm/smmuv3: Add initial support for SMMUv3 Nested device Date: Fri, 8 Nov 2024 12:52:39 +0000 Message-ID: <20241108125242.60136-3-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20241108125242.60136-1-shameerali.kolothum.thodi@huawei.com> References: <20241108125242.60136-1-shameerali.kolothum.thodi@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.203.177.241] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To frapeml500008.china.huawei.com (7.182.85.71) 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=185.176.79.56; envelope-from=shameerali.kolothum.thodi@huawei.com; helo=frasgout.his.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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: , Reply-to: Shameer Kolothum From: Shameer Kolothum via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1731070659678116600 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Based on SMMUv3 as a parent device, add a user-creatable smmuv3-nested device. Subsequent patches will add support to specify a PCI bus for this device. Currently only supported for "virt", so hook up the sybus mem & irq for that as well. No FDT support is added for now. Signed-off-by: Shameer Kolothum --- hw/arm/smmuv3.c | 34 ++++++++++++++++++++++++++++++++++ hw/arm/virt.c | 31 +++++++++++++++++++++++++++++-- hw/core/sysbus-fdt.c | 1 + include/hw/arm/smmuv3.h | 15 +++++++++++++++ include/hw/arm/virt.h | 6 ++++++ 5 files changed, 85 insertions(+), 2 deletions(-) diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 2101031a8f..0033eb8125 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -2201,6 +2201,19 @@ static void smmu_realize(DeviceState *d, Error **err= p) smmu_init_irq(s, dev); } =20 +static void smmu_nested_realize(DeviceState *d, Error **errp) +{ + SMMUv3NestedState *s_nested =3D ARM_SMMUV3_NESTED(d); + SMMUv3NestedClass *c =3D ARM_SMMUV3_NESTED_GET_CLASS(s_nested); + Error *local_err =3D NULL; + + c->parent_realize(d, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } +} + static const VMStateDescription vmstate_smmuv3_queue =3D { .name =3D "smmuv3_queue", .version_id =3D 1, @@ -2299,6 +2312,18 @@ static void smmuv3_class_init(ObjectClass *klass, vo= id *data) device_class_set_props(dc, smmuv3_properties); } =20 +static void smmuv3_nested_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + SMMUv3NestedClass *c =3D ARM_SMMUV3_NESTED_CLASS(klass); + + dc->vmsd =3D &vmstate_smmuv3; + device_class_set_parent_realize(dc, smmu_nested_realize, + &c->parent_realize); + dc->user_creatable =3D true; + dc->hotpluggable =3D false; +} + static int smmuv3_notify_flag_changed(IOMMUMemoryRegion *iommu, IOMMUNotifierFlag old, IOMMUNotifierFlag new, @@ -2337,6 +2362,14 @@ static void smmuv3_iommu_memory_region_class_init(Ob= jectClass *klass, imrc->notify_flag_changed =3D smmuv3_notify_flag_changed; } =20 +static const TypeInfo smmuv3_nested_type_info =3D { + .name =3D TYPE_ARM_SMMUV3_NESTED, + .parent =3D TYPE_ARM_SMMUV3, + .instance_size =3D sizeof(SMMUv3NestedState), + .class_size =3D sizeof(SMMUv3NestedClass), + .class_init =3D smmuv3_nested_class_init, +}; + static const TypeInfo smmuv3_type_info =3D { .name =3D TYPE_ARM_SMMUV3, .parent =3D TYPE_ARM_SMMU, @@ -2355,6 +2388,7 @@ static const TypeInfo smmuv3_iommu_memory_region_info= =3D { static void smmuv3_register_types(void) { type_register(&smmuv3_type_info); + type_register(&smmuv3_nested_type_info); type_register(&smmuv3_iommu_memory_region_info); } =20 diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 780bcff77c..38075f9ab2 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -181,6 +181,7 @@ static const MemMapEntry base_memmap[] =3D { [VIRT_PVTIME] =3D { 0x090a0000, 0x00010000 }, [VIRT_SECURE_GPIO] =3D { 0x090b0000, 0x00001000 }, [VIRT_MMIO] =3D { 0x0a000000, 0x00000200 }, + [VIRT_SMMU_NESTED] =3D { 0x0b000000, 0x01000000 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that siz= e */ [VIRT_PLATFORM_BUS] =3D { 0x0c000000, 0x02000000 }, [VIRT_SECURE_MEM] =3D { 0x0e000000, 0x01000000 }, @@ -226,6 +227,7 @@ static const int a15irqmap[] =3D { [VIRT_GIC_V2M] =3D 48, /* ...to 48 + NUM_GICV2M_SPIS - 1 */ [VIRT_SMMU] =3D 74, /* ...to 74 + NUM_SMMU_IRQS - 1 */ [VIRT_PLATFORM_BUS] =3D 112, /* ...to 112 + PLATFORM_BUS_NUM_IRQS -1 */ + [VIRT_SMMU_NESTED] =3D 200, }; =20 static void create_randomness(MachineState *ms, const char *node) @@ -2883,10 +2885,34 @@ static void virt_machine_device_plug_cb(HotplugHand= ler *hotplug_dev, DeviceState *dev, Error **errp) { VirtMachineState *vms =3D VIRT_MACHINE(hotplug_dev); + MachineClass *mc =3D MACHINE_GET_CLASS(vms); =20 - if (vms->platform_bus_dev) { - MachineClass *mc =3D MACHINE_GET_CLASS(vms); + /* For smmuv3-nested devices we need to set the mem & irq */ + if (device_is_dynamic_sysbus(mc, dev) && + object_dynamic_cast(OBJECT(dev), TYPE_ARM_SMMUV3_NESTED)) { + hwaddr base =3D vms->memmap[VIRT_SMMU_NESTED].base; + int irq =3D vms->irqmap[VIRT_SMMU_NESTED]; + + if (vms->smmu_nested_count >=3D MAX_SMMU_NESTED) { + error_setg(errp, "smmuv3-nested max count reached!"); + return; + } + + base +=3D (vms->smmu_nested_count * SMMU_IO_LEN); + irq +=3D (vms->smmu_nested_count * NUM_SMMU_IRQS); =20 + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); + for (int i =3D 0; i < 4; i++) { + sysbus_connect_irq(SYS_BUS_DEVICE(dev), i, + qdev_get_gpio_in(vms->gic, irq + i)); + } + if (vms->iommu !=3D VIRT_IOMMU_SMMUV3_NESTED) { + vms->iommu =3D VIRT_IOMMU_SMMUV3_NESTED; + } + vms->smmu_nested_count++; + } + + if (vms->platform_bus_dev) { if (device_is_dynamic_sysbus(mc, dev)) { platform_bus_link_device(PLATFORM_BUS_DEVICE(vms->platform_bus= _dev), SYS_BUS_DEVICE(dev)); @@ -3067,6 +3093,7 @@ static void virt_machine_class_init(ObjectClass *oc, = void *data) machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_AMD_XGBE); machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE); machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_PLATFORM); + machine_class_allow_dynamic_sysbus_dev(mc, TYPE_ARM_SMMUV3_NESTED); #ifdef CONFIG_TPM machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS); #endif diff --git a/hw/core/sysbus-fdt.c b/hw/core/sysbus-fdt.c index eebcd28f9a..0f0d0b3e58 100644 --- a/hw/core/sysbus-fdt.c +++ b/hw/core/sysbus-fdt.c @@ -489,6 +489,7 @@ static const BindingEntry bindings[] =3D { #ifdef CONFIG_LINUX TYPE_BINDING(TYPE_VFIO_CALXEDA_XGMAC, add_calxeda_midway_xgmac_fdt_nod= e), TYPE_BINDING(TYPE_VFIO_AMD_XGBE, add_amd_xgbe_fdt_node), + TYPE_BINDING("arm-smmuv3-nested", no_fdt_node), VFIO_PLATFORM_BINDING("amd,xgbe-seattle-v1a", add_amd_xgbe_fdt_node), #endif #ifdef CONFIG_TPM diff --git a/include/hw/arm/smmuv3.h b/include/hw/arm/smmuv3.h index d183a62766..87e628be7a 100644 --- a/include/hw/arm/smmuv3.h +++ b/include/hw/arm/smmuv3.h @@ -84,6 +84,21 @@ struct SMMUv3Class { #define TYPE_ARM_SMMUV3 "arm-smmuv3" OBJECT_DECLARE_TYPE(SMMUv3State, SMMUv3Class, ARM_SMMUV3) =20 +#define TYPE_ARM_SMMUV3_NESTED "arm-smmuv3-nested" +OBJECT_DECLARE_TYPE(SMMUv3NestedState, SMMUv3NestedClass, ARM_SMMUV3_NESTE= D) + +struct SMMUv3NestedState { + SMMUv3State smmuv3_state; +}; + +struct SMMUv3NestedClass { + /*< private >*/ + SMMUv3Class smmuv3_class; + /*< public >*/ + + DeviceRealize parent_realize; +}; + #define STAGE1_SUPPORTED(s) FIELD_EX32(s->idr[0], IDR0, S1P) #define STAGE2_SUPPORTED(s) FIELD_EX32(s->idr[0], IDR0, S2P) =20 diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 46f48fe561..50e47a4ef3 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -50,6 +50,9 @@ /* MMIO region size for SMMUv3 */ #define SMMU_IO_LEN 0x20000 =20 +/* Max supported nested SMMUv3 */ +#define MAX_SMMU_NESTED 128 + enum { VIRT_FLASH, VIRT_MEM, @@ -62,6 +65,7 @@ enum { VIRT_GIC_ITS, VIRT_GIC_REDIST, VIRT_SMMU, + VIRT_SMMU_NESTED, VIRT_UART0, VIRT_MMIO, VIRT_RTC, @@ -92,6 +96,7 @@ enum { typedef enum VirtIOMMUType { VIRT_IOMMU_NONE, VIRT_IOMMU_SMMUV3, + VIRT_IOMMU_SMMUV3_NESTED, VIRT_IOMMU_VIRTIO, } VirtIOMMUType; =20 @@ -155,6 +160,7 @@ struct VirtMachineState { bool mte; bool dtb_randomness; bool second_ns_uart_present; + int smmu_nested_count; OnOffAuto acpi; VirtGICType gic_version; VirtIOMMUType iommu; --=20 2.34.1