From nobody Thu May 2 14:54:33 2024 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=163.com ARC-Seal: i=1; a=rsa-sha256; t=1629896712; cv=none; d=zohomail.com; s=zohoarc; b=CFXgJWl5OWdwFK0CnehazLCNw1omOJzlRzOtY70quk5OmUIn9IBtlmAYWDTmpuX55Ug0+eIjMYbPtA81UXvtE7OjieT1A9nbX3Xr4L0zOEIx6CyNNTDO4ssVE8FiLWGgxO8i8Wq3hBdjJgwJ+FN82dA1ZngQfYQFm73hAPNLa2Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629896712; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=yXb10IBw2Dmsva37a/iIfP6RK98iu25Wb6MGYY97IB8=; b=OdzSmgrdxq6cc37TaA4kJI9rXoYNlJqRYY0pmwQHGOOEvW/sPhkN6ivES9ahbWnXS3KCArGtfHr8i2XomgpMIOfrJzdjO6ac3RIduzVbYbtD+OV9EzQOHvLmAT8mEL9EG3H1NXTJOkXCZyIM54rqCKN+O+xPEhw4NPFbJ+7/USQ= 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 16298967123771017.8129288766596; Wed, 25 Aug 2021 06:05:12 -0700 (PDT) Received: from localhost ([::1]:39130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIsZ2-0007yy-Sk for importer@patchew.org; Wed, 25 Aug 2021 09:03:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIoDK-0003sp-Ez; Wed, 25 Aug 2021 04:24:50 -0400 Received: from m12-13.163.com ([220.181.12.13]:48195) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIoDG-00042D-7A; Wed, 25 Aug 2021 04:24:49 -0400 Received: from localhost.localdomain (unknown [180.169.130.89]) by smtp9 (Coremail) with SMTP id DcCowABnCwWL+iVhtO7SAQ--.38418S4; Wed, 25 Aug 2021 16:08:50 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=yXb10IBw2Dmsva37a/ iIfP6RK98iu25Wb6MGYY97IB8=; b=Vu40xGlRcyfX6dUcuzurelRjrY8SMrYhXX havQSj4v4a4xFpARn7QD0GACH0ss94aAn+gJywQUACEUuwzrFD5ffOK5CInns5a3 XB+9C4xF1wCVkFK1eqmZ5CcgGt/bigGTBAAi224N3QTMAAyVAqzkE37YyxuGA9Sf fHq6qM+EY= From: chunming To: eric.auger@redhat.com, peter.maydell@linaro.org Subject: [PATCH v5 1/4] hw/arm/smmuv3: Support non PCI/PCIe device connect with SMMU v3 Date: Wed, 25 Aug 2021 16:08:39 +0800 Message-Id: <1629878922-173270-2-git-send-email-chunming_li1234@163.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1629878922-173270-1-git-send-email-chunming_li1234@163.com> References: <1629878922-173270-1-git-send-email-chunming_li1234@163.com> X-CM-TRANSID: DcCowABnCwWL+iVhtO7SAQ--.38418S4 X-Coremail-Antispam: 1Uf129KBjvJXoWxWr13ZF13CF48KrW5Zr4rGrg_yoWrCFWxpa s5AFn8Kr4UG3WfC3saqr1a9F15Xw1kGF18Kr1xGr93AF4UtryrJr4DK3WYgrykGrWvva13 uayxWa18ur17X3DanT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07bVKsbUUUUU= X-Originating-IP: [180.169.130.89] X-CM-SenderInfo: xfkx0zplqjszjlrsjki6rwjhhfrp/1tbiMBL5dlWByxaU2QAAsp 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=220.181.12.13; envelope-from=chunming_li1234@163.com; helo=m12-13.163.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, 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-Mailman-Approved-At: Wed, 25 Aug 2021 09:00:24 -0400 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: renwei.liu@verisilicon.com, qemu-arm@nongnu.org, jianxian.wen@verisilicon.com, qemu-devel@nongnu.org, chunming Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @163.com) X-ZM-MESSAGEID: 1629896713982100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: chunming . Add sid-map property to store non PCI/PCIe devices SID . Create IOMMU memory regions for non PCI/PCIe devices based on their SID . Update SID getting strategy for PCI/PCIe and non PCI/PCIe devices Signed-off-by: chunming --- hw/arm/smmuv3.c | 46 ++++++++++++++++++++++++++++++++++++ include/hw/arm/smmu-common.h | 7 +++++- include/hw/arm/smmuv3.h | 2 ++ 3 files changed, 54 insertions(+), 1 deletion(-) diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 01b60bee49..11d7fe8423 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -32,6 +32,7 @@ #include "hw/arm/smmuv3.h" #include "smmuv3-internal.h" #include "smmu-internal.h" +#include "hw/qdev-properties.h" =20 /** * smmuv3_trigger_irq - pulse @irq if enabled and update @@ -1430,6 +1431,19 @@ static void smmu_reset(DeviceState *dev) smmuv3_init_regs(s); } =20 +static SMMUDevice *smmu_find_peri_sdev(SMMUState *s, uint16_t sid) +{ + SMMUDevice *sdev; + + QLIST_FOREACH(sdev, &s->peri_sdev_list, next) { + if (smmu_get_sid(sdev) =3D=3D sid) { + return sdev; + } + } + + return NULL; +} + static void smmu_realize(DeviceState *d, Error **errp) { SMMUState *sys =3D ARM_SMMU(d); @@ -1437,6 +1451,9 @@ static void smmu_realize(DeviceState *d, Error **errp) SMMUv3Class *c =3D ARM_SMMUV3_GET_CLASS(s); SysBusDevice *dev =3D SYS_BUS_DEVICE(d); Error *local_err =3D NULL; + SMMUDevice *sdev; + char *name =3D NULL; + uint16_t sid =3D 0; =20 c->parent_realize(d, &local_err); if (local_err) { @@ -1454,6 +1471,28 @@ static void smmu_realize(DeviceState *d, Error **err= p) sysbus_init_mmio(dev, &sys->iomem); =20 smmu_init_irq(s, dev); + + /* Create IOMMU memory region for peripheral devices based on their SI= D */ + for (int i =3D 0; i < s->num_sid; i++) { + sid =3D s->sid_map[i]; + sdev =3D smmu_find_peri_sdev(sys, sid); + if (sdev) { + continue; + } + + sdev =3D g_new0(SMMUDevice, 1); + sdev->smmu =3D sys; + sdev->bus =3D NULL; + sdev->devfn =3D sid; + + name =3D g_strdup_printf("%s-peri-%d", sys->mrtypename, sid); + memory_region_init_iommu(&sdev->iommu, sizeof(sdev->iommu), + sys->mrtypename, + OBJECT(sys), name, 1ULL << SMMU_MAX_VA_BI= TS); + + QLIST_INSERT_HEAD(&sys->peri_sdev_list, sdev, next); + g_free(name); + } } =20 static const VMStateDescription vmstate_smmuv3_queue =3D { @@ -1506,6 +1545,12 @@ static void smmuv3_instance_init(Object *obj) /* Nothing much to do here as of now */ } =20 +static Property smmuv3_properties[] =3D { + DEFINE_PROP_ARRAY("sid-map", SMMUv3State, num_sid, sid_map, + qdev_prop_uint16, uint16_t), + DEFINE_PROP_END_OF_LIST(), +}; + static void smmuv3_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -1515,6 +1560,7 @@ static void smmuv3_class_init(ObjectClass *klass, voi= d *data) device_class_set_parent_reset(dc, smmu_reset, &c->parent_reset); c->parent_realize =3D dc->realize; dc->realize =3D smmu_realize; + device_class_set_props(dc, smmuv3_properties); } =20 static int smmuv3_notify_flag_changed(IOMMUMemoryRegion *iommu, diff --git a/include/hw/arm/smmu-common.h b/include/hw/arm/smmu-common.h index 706be3c6d0..95cd12a4b5 100644 --- a/include/hw/arm/smmu-common.h +++ b/include/hw/arm/smmu-common.h @@ -117,6 +117,7 @@ struct SMMUState { QLIST_HEAD(, SMMUDevice) devices_with_notifiers; uint8_t bus_num; PCIBus *primary_bus; + QLIST_HEAD(, SMMUDevice) peri_sdev_list; }; =20 struct SMMUBaseClass { @@ -138,7 +139,11 @@ SMMUPciBus *smmu_find_smmu_pcibus(SMMUState *s, uint8_= t bus_num); /* Return the stream ID of an SMMU device */ static inline uint16_t smmu_get_sid(SMMUDevice *sdev) { - return PCI_BUILD_BDF(pci_bus_num(sdev->bus), sdev->devfn); + if (sdev->bus =3D=3D NULL) { + return sdev->devfn; + } else { + return PCI_BUILD_BDF(pci_bus_num(sdev->bus), sdev->devfn); + } } =20 /** diff --git a/include/hw/arm/smmuv3.h b/include/hw/arm/smmuv3.h index c641e60735..32ba84990d 100644 --- a/include/hw/arm/smmuv3.h +++ b/include/hw/arm/smmuv3.h @@ -39,6 +39,8 @@ struct SMMUv3State { uint32_t features; uint8_t sid_size; uint8_t sid_split; + uint32_t num_sid; + uint16_t *sid_map; =20 uint32_t idr[6]; uint32_t iidr; --=20 2.30.2 From nobody Thu May 2 14:54:33 2024 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=163.com ARC-Seal: i=1; a=rsa-sha256; t=1629896848; cv=none; d=zohomail.com; s=zohoarc; b=NAGDem5e/E4lwqhZdPYjDs4RPpdk93lHJTFmRjtf/HM/LLLVQb8QfbSdxsnGny5Phxrne/CdB87uZuw47MG3RD5dHJAt53ZmMQPp8tJtH7TqXTVlvmjuocs3JaX5oZZBjliiX5bD/FunJBZjIjx26oTirgDuGq9C0bW77xpkp54= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629896848; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Hv+OoWC7Sexfnl1JdO2e84SRRthOhXXfF007eFefhFk=; b=PKcq1MkW6J8DzBA8CiucQbOO4ovu5Rq8FhqzqR2Q9vCM4OZUwk+Cv+FY1m9lzeGkBxZREaV79uOaTa2ukWYJ5OEYTzHCmjHdG7NL6T2e+rZmJRbNnbGGLA2fpIB2I3jrdnbB+U2KFRh5FPJTZAvZcfLnwzg3pcmeuPHNqaecQvA= 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 1629896848938141.3011361354537; Wed, 25 Aug 2021 06:07:28 -0700 (PDT) Received: from localhost ([::1]:53776 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIscp-0000z1-UB for importer@patchew.org; Wed, 25 Aug 2021 09:07:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIoDL-0003vr-62; Wed, 25 Aug 2021 04:24:51 -0400 Received: from m12-13.163.com ([220.181.12.13]:48194) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIoDH-00042H-VD; Wed, 25 Aug 2021 04:24:50 -0400 Received: from localhost.localdomain (unknown [180.169.130.89]) by smtp9 (Coremail) with SMTP id DcCowABnCwWL+iVhtO7SAQ--.38418S5; Wed, 25 Aug 2021 16:08:50 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=Hv+OoWC7Sexfnl1JdO 2e84SRRthOhXXfF007eFefhFk=; b=A8Md/xx02R6uhlSxwCOfKREhgKIKn4B46p bNBLZO8Csi4sXuHMivLJyzfAfDzMRnMs97Fd4SzkjT8LFzOvmEFIZu2PRXQMR48o ZxK/JHCusoCBvpyTMhr2waH7w1N2GJxdwR8dONhtnVpIVRyGN4vJ6Fnxd15hKNhG XhYDgTja4= From: chunming To: eric.auger@redhat.com, peter.maydell@linaro.org Subject: [PATCH v5 2/4] hw/arm/smmuv3: Update implementation of CFGI commands based on device SID Date: Wed, 25 Aug 2021 16:08:40 +0800 Message-Id: <1629878922-173270-3-git-send-email-chunming_li1234@163.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1629878922-173270-1-git-send-email-chunming_li1234@163.com> References: <1629878922-173270-1-git-send-email-chunming_li1234@163.com> X-CM-TRANSID: DcCowABnCwWL+iVhtO7SAQ--.38418S5 X-Coremail-Antispam: 1Uf129KBjvJXoWxXF17GFW7ur47AFykKw45KFg_yoW5Cr1kpa nrGr90gw4rCF1SyrnxKrW2krnIq34qgF10qryUWa9akw1UAryrXFWDK3Wrt34DJrW0yF47 ua4rWFs8XF17Z3DanT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07bTrcfUUUUU= X-Originating-IP: [180.169.130.89] X-CM-SenderInfo: xfkx0zplqjszjlrsjki6rwjhhfrp/xtbBrRL5dl75bWkJFwAAsN 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=220.181.12.13; envelope-from=chunming_li1234@163.com; helo=m12-13.163.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, 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-Mailman-Approved-At: Wed, 25 Aug 2021 09:00:24 -0400 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: renwei.liu@verisilicon.com, qemu-arm@nongnu.org, jianxian.wen@verisilicon.com, qemu-devel@nongnu.org, chunming Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @163.com) X-ZM-MESSAGEID: 1629896849341100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: chunming Replace "smmuv3_flush_config" with "g_hash_table_foreach_remove". "smmu_iommu_mr" function can't get MR according to SID for non PCI/PCIe dev= ices. Signed-off-by: chunming --- hw/arm/smmuv3.c | 35 ++++++++++------------------------- include/hw/arm/smmu-common.h | 5 ++++- 2 files changed, 14 insertions(+), 26 deletions(-) diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 11d7fe8423..9f3f13fb8e 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -613,14 +613,6 @@ static SMMUTransCfg *smmuv3_get_config(SMMUDevice *sde= v, SMMUEventInfo *event) return cfg; } =20 -static void smmuv3_flush_config(SMMUDevice *sdev) -{ - SMMUv3State *s =3D sdev->smmu; - SMMUState *bc =3D &s->smmu_state; - - trace_smmuv3_config_cache_inv(smmu_get_sid(sdev)); - g_hash_table_remove(bc->configs, sdev); -} =20 static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, IOMMUAccessFlags flag, int iommu_idx) @@ -964,22 +956,18 @@ static int smmuv3_cmdq_consume(SMMUv3State *s) case SMMU_CMD_CFGI_STE: { uint32_t sid =3D CMD_SID(&cmd); - IOMMUMemoryRegion *mr =3D smmu_iommu_mr(bs, sid); - SMMUDevice *sdev; + SMMUSIDRange sid_range; =20 if (CMD_SSEC(&cmd)) { cmd_error =3D SMMU_CERROR_ILL; break; } =20 - if (!mr) { - break; - } - + sid_range.start =3D sid; + sid_range.end =3D sid; trace_smmuv3_cmdq_cfgi_ste(sid); - sdev =3D container_of(mr, SMMUDevice, iommu); - smmuv3_flush_config(sdev); - + g_hash_table_foreach_remove(bs->configs, smmuv3_invalidate_ste, + &sid_range); break; } case SMMU_CMD_CFGI_STE_RANGE: /* same as SMMU_CMD_CFGI_ALL */ @@ -1006,21 +994,18 @@ static int smmuv3_cmdq_consume(SMMUv3State *s) case SMMU_CMD_CFGI_CD_ALL: { uint32_t sid =3D CMD_SID(&cmd); - IOMMUMemoryRegion *mr =3D smmu_iommu_mr(bs, sid); - SMMUDevice *sdev; + SMMUSIDRange sid_range; =20 if (CMD_SSEC(&cmd)) { cmd_error =3D SMMU_CERROR_ILL; break; } =20 - if (!mr) { - break; - } - + sid_range.start =3D sid; + sid_range.end =3D sid; trace_smmuv3_cmdq_cfgi_cd(sid); - sdev =3D container_of(mr, SMMUDevice, iommu); - smmuv3_flush_config(sdev); + g_hash_table_foreach_remove(bs->configs, smmuv3_invalidate_ste, + &sid_range); break; } case SMMU_CMD_TLBI_NH_ASID: diff --git a/include/hw/arm/smmu-common.h b/include/hw/arm/smmu-common.h index 95cd12a4b5..d016455d80 100644 --- a/include/hw/arm/smmu-common.h +++ b/include/hw/arm/smmu-common.h @@ -159,7 +159,10 @@ int smmu_ptw(SMMUTransCfg *cfg, dma_addr_t iova, IOMMU= AccessFlags perm, */ SMMUTransTableInfo *select_tt(SMMUTransCfg *cfg, dma_addr_t iova); =20 -/* Return the iommu mr associated to @sid, or NULL if none */ +/** + * Return the iommu mr associated to @sid, or NULL if none + * Only for PCI device, check smmu_find_peri_sdev for non PCI/PCIe device + */ IOMMUMemoryRegion *smmu_iommu_mr(SMMUState *s, uint32_t sid); =20 #define SMMU_IOTLB_MAX_SIZE 256 --=20 2.30.2 From nobody Thu May 2 14:54:33 2024 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=163.com ARC-Seal: i=1; a=rsa-sha256; t=1629896740; cv=none; d=zohomail.com; s=zohoarc; b=JwRd0sAwg4wTPddaIJbUeAiQO9GsvlVm/CwZ8oFUKjnK3LV7VD3TV/Gz3btk6NuM0w/J2JeT0QsVaubT6lcDiqSLk6pxALaOykIcRagCflBUQrk7Wd8BwEOYLHENihVEQ8I7/kXTg24Kbzg0ZAEzFDs5yo0dt3SXMdu8UzkXgyM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629896740; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=ZsBOUwcbt9HyG3oB0M/jgN+U6YGgQiivDFADOVfq6Hg=; b=md2rWHmB0A8CPuiXzUYT9L16LVdZMcAniX3Onk2ICdXKT/LnR0p1Yst6YiXrqsyiwErn/dluTNlUmwd8LK5CPbFMzJZ2gx1XBV7XkQ9M9PMWccCnctV7H7Tud6dfnM/Nj/6cHJv/XWecdghW4f34y+VEQ9LKRBVWD7DBWdgupTI= 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 1629896740068882.2381979115983; Wed, 25 Aug 2021 06:05:40 -0700 (PDT) Received: from localhost ([::1]:45480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIsb4-0003pW-Sz for importer@patchew.org; Wed, 25 Aug 2021 09:05:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIoDK-0003sT-9M; Wed, 25 Aug 2021 04:24:50 -0400 Received: from m12-13.163.com ([220.181.12.13]:48193) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIoDG-00042E-Gb; Wed, 25 Aug 2021 04:24:49 -0400 Received: from localhost.localdomain (unknown [180.169.130.89]) by smtp9 (Coremail) with SMTP id DcCowABnCwWL+iVhtO7SAQ--.38418S6; Wed, 25 Aug 2021 16:08:51 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=ZsBOUwcbt9HyG3oB0M /jgN+U6YGgQiivDFADOVfq6Hg=; b=X71kToX5cGE1pToGeuB9JZMY8HIQxJST0W Q8EYtaXXaBq/BBDpVB3IoaY+tPgd/ram3VbHkTeMGS0VyZjNo/019hz2nbiOlApL b4QL1+rfDc8Lxlj+uYrEuJq6kEFVVyuedqrbfHn10izFMr0awpoUOcUH866agOhP /e0iw2lG4= From: chunming To: eric.auger@redhat.com, peter.maydell@linaro.org Subject: [PATCH v5 3/4] hw/arm/virt: Update SMMU v3 creation to support non PCI/PCIe device connection Date: Wed, 25 Aug 2021 16:08:41 +0800 Message-Id: <1629878922-173270-4-git-send-email-chunming_li1234@163.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1629878922-173270-1-git-send-email-chunming_li1234@163.com> References: <1629878922-173270-1-git-send-email-chunming_li1234@163.com> X-CM-TRANSID: DcCowABnCwWL+iVhtO7SAQ--.38418S6 X-Coremail-Antispam: 1Uf129KBjvJXoW7WFyDCr1fXr1xCrykZw4ktFb_yoW8tFW3pF 4kGF1vgry5W3WfWrZ2qr13u3W5Gw4kGw1UKrs7uw4Syw17t34UXr4DKa1YkFWDWF1kuF13 ZFs2gF47WF4xXrJanT9S1TB71UUUUjUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07bS2-5UUUUU= X-Originating-IP: [180.169.130.89] X-CM-SenderInfo: xfkx0zplqjszjlrsjki6rwjhhfrp/1tbiNRP5dlrPdFx6owAAsN 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=220.181.12.13; envelope-from=chunming_li1234@163.com; helo=m12-13.163.com X-Spam_score_int: 1 X-Spam_score: 0.1 X-Spam_bar: / X-Spam_report: (0.1 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, 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-Mailman-Approved-At: Wed, 25 Aug 2021 09:00:24 -0400 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: renwei.liu@verisilicon.com, qemu-arm@nongnu.org, jianxian.wen@verisilicon.com, qemu-devel@nongnu.org, chunming Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @163.com) X-ZM-MESSAGEID: 1629896741227100003 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: chunming . Add "smmuv3_sidmap" to set non PCI/PCIe devices SID value . Pass non PCI/PCIe devices SID value to SMMU v3 model creation . Store SMMU v3 device in virtual machine then non PCI/PCIe can get its m= emory region later Signed-off-by: chunming --- hw/arm/virt.c | 18 +++++++++++++++++- include/hw/arm/virt.h | 2 ++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 81eda46b0b..c3fd30e071 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -204,6 +204,10 @@ static const char *valid_cpus[] =3D { ARM_CPU_TYPE_NAME("max"), }; =20 +static const uint16_t smmuv3_sidmap[] =3D { + +}; + static bool cpu_type_valid(const char *cpu) { int i; @@ -1223,7 +1227,7 @@ static void create_pcie_irq_map(const MachineState *m= s, 0x7 /* PCI irq */); } =20 -static void create_smmu(const VirtMachineState *vms, +static void create_smmu(VirtMachineState *vms, PCIBus *bus) { char *node; @@ -1244,6 +1248,16 @@ static void create_smmu(const VirtMachineState *vms, =20 object_property_set_link(OBJECT(dev), "primary-bus", OBJECT(bus), &error_abort); + + vms->smmuv3 =3D dev; + + qdev_prop_set_uint32(dev, "len-sid-map", ARRAY_SIZE(smmuv3_sidmap)); + + for (i =3D 0; i < ARRAY_SIZE(smmuv3_sidmap); i++) { + g_autofree char *propname =3D g_strdup_printf("sid-map[%d]", i); + qdev_prop_set_uint16(dev, propname, smmuv3_sidmap[i]); + } + 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++) { @@ -2762,6 +2776,8 @@ static void virt_instance_init(Object *obj) =20 vms->irqmap =3D a15irqmap; =20 + vms->sidmap =3D smmuv3_sidmap; + virt_flash_create(vms); =20 vms->oem_id =3D g_strndup(ACPI_BUILD_APPNAME6, 6); diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 9661c46699..d3402a43dd 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -167,6 +167,8 @@ struct VirtMachineState { PCIBus *bus; char *oem_id; char *oem_table_id; + DeviceState *smmuv3; + const uint16_t *sidmap; }; =20 #define VIRT_ECAM_ID(high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM) --=20 2.30.2 From nobody Thu May 2 14:54:33 2024 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=163.com ARC-Seal: i=1; a=rsa-sha256; t=1629896652; cv=none; d=zohomail.com; s=zohoarc; b=cowy7AUIfj7oEK9NXgDETcU4kIO1zJBkVbm7igms/E0mQn+pIG3dpfShudo0j0y6xlxxUVMxjKQw08ecKSQ4+EDUEqM0HKkRKzDvJwjq0pNj/eD9MOMYqZrZDu2UY+Di4E9/Q+WXP6eECX/LOgYB8FIq+f9TZtJtD6r1AiZMR1g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629896652; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=xQDjiNNhDJEqwuElL0ZuUGPrmvLwmBF1vqp0UAkFOsw=; b=jSF82jk6B2Mmh+m6kof3F0xQcXQP5UpeNvqT5zspDfzf7uI7prBbPoc689VjdaXUROO2JqqrT7lWvY+Nu8RblFO3wKPoBGnJmwSlQsZSifLfhTdt6sR+1U5kih85rlq6QeeI8IbXIHhol3p7I8o2uPVLSgqbgYSjgv+K+48grLQ= 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 1629896652399711.5015638305466; Wed, 25 Aug 2021 06:04:12 -0700 (PDT) Received: from localhost ([::1]:37716 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIsYn-00070e-DP for importer@patchew.org; Wed, 25 Aug 2021 09:03:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIoDL-0003wy-DE; Wed, 25 Aug 2021 04:24:51 -0400 Received: from m12-13.163.com ([220.181.12.13]:48191) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIoDH-00042G-8b; Wed, 25 Aug 2021 04:24:51 -0400 Received: from localhost.localdomain (unknown [180.169.130.89]) by smtp9 (Coremail) with SMTP id DcCowABnCwWL+iVhtO7SAQ--.38418S7; Wed, 25 Aug 2021 16:08:51 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=xQDjiNNhDJEqwuElL0 ZuUGPrmvLwmBF1vqp0UAkFOsw=; b=o0+PVsnqfiCqslEaZRMflrczFkxlmRjtQf ooj2gotzgrEcpPlphm0pd0nbaVMWQMHIn0BZW9avUqXWNmzjYCwZnltMz0dz/eiF 6fbqj5iMRSvOv11yLg2AuGuIvwwg2bWCmwF/2gmpGtz2GfrlmwABieYi9FyH6Lle diBhIFsyc= From: chunming To: eric.auger@redhat.com, peter.maydell@linaro.org Subject: [PATCH v5 4/4] hw/arm/virt: Add PL330 DMA controller and connect with SMMU v3 Date: Wed, 25 Aug 2021 16:08:42 +0800 Message-Id: <1629878922-173270-5-git-send-email-chunming_li1234@163.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1629878922-173270-1-git-send-email-chunming_li1234@163.com> References: <1629878922-173270-1-git-send-email-chunming_li1234@163.com> X-CM-TRANSID: DcCowABnCwWL+iVhtO7SAQ--.38418S7 X-Coremail-Antispam: 1Uf129KBjvJXoW3AFyrGw17JF47tr43Kr4rKrg_yoW7Aw1DpF W5CFs8WrW0qr1SqrWa9F1FkF1rAw1vk3WDGr4I93yxC3W8WryrXr48tasrKrWUW348X3Z8 Xa1DWFyvgwn7Wr7anT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07b4HqcUUUUU= X-Originating-IP: [180.169.130.89] X-CM-SenderInfo: xfkx0zplqjszjlrsjki6rwjhhfrp/xtbBDRP5dlaEE6kM2AAAst 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=220.181.12.13; envelope-from=chunming_li1234@163.com; helo=m12-13.163.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, 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-Mailman-Approved-At: Wed, 25 Aug 2021 09:00:24 -0400 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: renwei.liu@verisilicon.com, qemu-arm@nongnu.org, jianxian.wen@verisilicon.com, qemu-devel@nongnu.org, chunming Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @163.com) X-ZM-MESSAGEID: 1629896653526100003 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: chunming Add PL330 DMA controller to test SMMU v3 connection and function. The default SID for PL330 is 1 but we test other values, it works well. Signed-off-by: chunming --- hw/arm/virt.c | 92 ++++++++++++++++++++++++++++++++++++++++++- include/hw/arm/virt.h | 1 + 2 files changed, 92 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index c3fd30e071..8180e4a331 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -143,6 +143,7 @@ static const MemMapEntry base_memmap[] =3D { [VIRT_GIC_REDIST] =3D { 0x080A0000, 0x00F60000 }, [VIRT_UART] =3D { 0x09000000, 0x00001000 }, [VIRT_RTC] =3D { 0x09010000, 0x00001000 }, + [VIRT_DMA] =3D { 0x09011000, 0x00001000 }, [VIRT_FW_CFG] =3D { 0x09020000, 0x00000018 }, [VIRT_GPIO] =3D { 0x09030000, 0x00001000 }, [VIRT_SECURE_UART] =3D { 0x09040000, 0x00001000 }, @@ -188,6 +189,7 @@ static const int a15irqmap[] =3D { [VIRT_GPIO] =3D 7, [VIRT_SECURE_UART] =3D 8, [VIRT_ACPI_GED] =3D 9, + [VIRT_DMA] =3D 10, [VIRT_MMIO] =3D 16, /* ...to 16 + NUM_VIRTIO_TRANSPORTS - 1 */ [VIRT_GIC_V2M] =3D 48, /* ...to 48 + NUM_GICV2M_SPIS - 1 */ [VIRT_SMMU] =3D 74, /* ...to 74 + NUM_SMMU_IRQS - 1 */ @@ -205,7 +207,7 @@ static const char *valid_cpus[] =3D { }; =20 static const uint16_t smmuv3_sidmap[] =3D { - + [VIRT_DMA] =3D 1, }; =20 static bool cpu_type_valid(const char *cpu) @@ -793,6 +795,92 @@ static void create_uart(const VirtMachineState *vms, i= nt uart, g_free(nodename); } =20 +static void create_dma(const VirtMachineState *vms) +{ + int i; + char *nodename; + hwaddr base =3D vms->memmap[VIRT_DMA].base; + hwaddr size =3D vms->memmap[VIRT_DMA].size; + int irq =3D vms->irqmap[VIRT_DMA]; + int sid =3D vms->sidmap[VIRT_DMA]; + const char compat[] =3D "arm,pl330\0arm,primecell"; + const char irq_names[] =3D "abort\0dma0\0dma1\0dma2\0dma3\0dma4\0dma5\= 0dma6\0dma7"; + DeviceState *dev; + MachineState *ms =3D MACHINE(vms); + SysBusDevice *busdev; + DeviceState *smmuv3_dev; + SMMUState *smmuv3_sys; + Object *smmuv3_memory; + + dev =3D qdev_new("pl330"); + + if (vms->iommu =3D=3D VIRT_IOMMU_SMMUV3 && vms->iommu_phandle) { + smmuv3_dev =3D vms->smmuv3; + smmuv3_sys =3D ARM_SMMU(smmuv3_dev); + g_autofree char *memname =3D g_strdup_printf("%s-peri-%d[0]", + smmuv3_sys->mrtypename, + sid); + + smmuv3_memory =3D object_property_get_link(OBJECT(smmuv3_dev), + memname, &error_abort); + + object_property_set_link(OBJECT(dev), "memory", + OBJECT(smmuv3_memory), + &error_fatal); + } else { + object_property_set_link(OBJECT(dev), "memory", + OBJECT(get_system_memory()), + &error_fatal); + } + + qdev_prop_set_uint8(dev, "num_chnls", 8); + qdev_prop_set_uint8(dev, "num_periph_req", 4); + qdev_prop_set_uint8(dev, "num_events", 16); + qdev_prop_set_uint8(dev, "data_width", 64); + qdev_prop_set_uint8(dev, "wr_cap", 8); + qdev_prop_set_uint8(dev, "wr_q_dep", 16); + qdev_prop_set_uint8(dev, "rd_cap", 8); + qdev_prop_set_uint8(dev, "rd_q_dep", 16); + qdev_prop_set_uint16(dev, "data_buffer_dep", 256); + + busdev =3D SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(busdev, &error_fatal); + sysbus_mmio_map(busdev, 0, base); + + for (i =3D 0; i < 9; ++i) { + sysbus_connect_irq(busdev, i, qdev_get_gpio_in(vms->gic, irq + i)); + } + + nodename =3D g_strdup_printf("/pl330@%" PRIx64, base); + qemu_fdt_add_subnode(ms->fdt, nodename); + qemu_fdt_setprop(ms->fdt, nodename, "compatible", compat, sizeof(compa= t)); + qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg", + 2, base, 2, size); + qemu_fdt_setprop_cells(ms->fdt, nodename, "interrupts", + GIC_FDT_IRQ_TYPE_SPI, irq, GIC_FDT_IRQ_FLAGS_LEVEL_HI, + GIC_FDT_IRQ_TYPE_SPI, irq + 1, GIC_FDT_IRQ_FLAGS_LEVEL= _HI, + GIC_FDT_IRQ_TYPE_SPI, irq + 2, GIC_FDT_IRQ_FLAGS_LEVEL= _HI, + GIC_FDT_IRQ_TYPE_SPI, irq + 3, GIC_FDT_IRQ_FLAGS_LEVEL= _HI, + GIC_FDT_IRQ_TYPE_SPI, irq + 4, GIC_FDT_IRQ_FLAGS_LEVEL= _HI, + GIC_FDT_IRQ_TYPE_SPI, irq + 5, GIC_FDT_IRQ_FLAGS_LEVEL= _HI, + GIC_FDT_IRQ_TYPE_SPI, irq + 6, GIC_FDT_IRQ_FLAGS_LEVEL= _HI, + GIC_FDT_IRQ_TYPE_SPI, irq + 7, GIC_FDT_IRQ_FLAGS_LEVEL= _HI, + GIC_FDT_IRQ_TYPE_SPI, irq + 8, GIC_FDT_IRQ_FLAGS_LEVEL= _HI); + + qemu_fdt_setprop(ms->fdt, nodename, "interrupt-names", irq_names, + sizeof(irq_names)); + + qemu_fdt_setprop_cell(ms->fdt, nodename, "clocks", vms->clock_phandle); + qemu_fdt_setprop_string(ms->fdt, nodename, "clock-names", "apb_pclk"); + + if (vms->iommu =3D=3D VIRT_IOMMU_SMMUV3 && vms->iommu_phandle) { + qemu_fdt_setprop_cells(ms->fdt, nodename, "iommus", + vms->iommu_phandle, sid); + qemu_fdt_setprop(ms->fdt, nodename, "dma-coherent", NULL, 0); + } + + g_free(nodename); +} static void create_rtc(const VirtMachineState *vms) { char *nodename; @@ -2081,6 +2169,8 @@ static void machvirt_init(MachineState *machine) =20 create_pcie(vms); =20 + create_dma(vms); + if (has_ged && aarch64 && firmware_loaded && virt_is_acpi_enabled(vms)= ) { vms->acpi_dev =3D create_acpi_ged(vms); } else { diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index d3402a43dd..f307b26587 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -72,6 +72,7 @@ enum { VIRT_UART, VIRT_MMIO, VIRT_RTC, + VIRT_DMA, VIRT_FW_CFG, VIRT_PCIE, VIRT_PCIE_MMIO, --=20 2.30.2