From nobody Thu May 16 10:50:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1627950269; cv=none; d=zohomail.com; s=zohoarc; b=NNJWp1owOq16JIkfDiSfwLAJj9Jtw77YMg8/J/GsixmFA4SBBVugaejwsS9OGL6OvYvVvxw2vb973WqCwLTbNPUS/UW0tnYOS/0Zl+hIvfklTI/VC4u65YGYMzNo+kI5CEZokDgsS7VEN+39mK7iNw60p/F0giBhn4jhRcAJ8xc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1627950269; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=/FmUIrPE00nX8DnmdVs884V/lclxD8sCEx+5MSh4azo=; b=c+nwwe8sYX8e5EBl8By5lYQ7BcQ6zQcOYngPcpXRofNP9iS1CvV19TGo0QXQxJxrCFHxiFiwvZEnPg7YSggh19FWIeLVjgRNqQaX0A0Nmpho5F0WYCQTX497ODskCpMyEiqDgq0OYVfKxdi3QRV724LxY1Fcidi5nWU4ihcCIUk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1627950269747711.4876210357744; Mon, 2 Aug 2021 17:24:29 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.163206.299021 (Exim 4.92) (envelope-from ) id 1mAiE9-0001FI-I3; Tue, 03 Aug 2021 00:24:13 +0000 Received: by outflank-mailman (output) from mailman id 163206.299021; Tue, 03 Aug 2021 00:24:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mAiE9-0001FB-F1; Tue, 03 Aug 2021 00:24:13 +0000 Received: by outflank-mailman (input) for mailman id 163206; Tue, 03 Aug 2021 00:24:12 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mAiE8-0001EV-Hw for xen-devel@lists.xenproject.org; Tue, 03 Aug 2021 00:24:12 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id fbd2d587-2e74-4be6-b71c-ac81efe59a70; Tue, 03 Aug 2021 00:24:11 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 7ED9B60EB5; Tue, 3 Aug 2021 00:24:10 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: fbd2d587-2e74-4be6-b71c-ac81efe59a70 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627950250; bh=Nq3WENT04Jv2WVQpnaz0jZGl+pYE7uv2I5GgVFteS7M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sT4m9OCcgomc3a3DfTaquUZHwPFNtC3Fyw9TCjHOmMGu7keZvtgssi5c41zI1rAIS tCrJOnMlK52KCneFHVvVJgx+L8YFT2y9fZr2mz4wjHZ+OpOBt/wlq2csORiLXuosRP YHzy172L8QRDkyHqoEjr6A/J98YDCXtbjfrHWuzk1oKZDOyHNkuaZQhQfLAt0MJE2B M74kUD7px9PmS4o6WXv5PtwR5tAQXTbKMB0Lr/Yps6a2AoYl8vNCY/wJEr+KI6Y6Xt K6gOc6yE07fW56MGCqJkG71Y3UM+3jmxmf8D07STNUrFym0XYQSEmOjgd1uMAcVqye jrIn8nzc/1DAg== From: Stefano Stabellini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, julien@xen.org, Bertrand.Marquis@arm.com, Volodymyr_Babchuk@epam.com, rahul.singh@arm.com, brian.woods@xilinx.com, Stefano Stabellini Subject: [PATCH v6 1/4] arm,smmu: switch to using iommu_fwspec functions Date: Mon, 2 Aug 2021 17:24:06 -0700 Message-Id: <20210803002409.19406-1-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1627950270788100003 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Brian Woods Modify the smmu driver so that it uses the iommu_fwspec helper functions. This means both ARM IOMMU drivers will both use the iommu_fwspec helper functions, making enabling generic device tree bindings in the SMMU driver much cleaner. Signed-off-by: Brian Woods Signed-off-by: Stefano Stabellini Reviewed-by: Rahul Singh Acked-by: Julien Grall --- Changes in v5: - moved iommu_add_dt_device change to a separate patch --- xen/drivers/passthrough/arm/smmu.c | 75 ++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 24 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/a= rm/smmu.c index 658c40433c..09773702c3 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -32,6 +32,9 @@ * - 4k and 64k pages, with contiguous pte hints. * - Up to 48-bit addressing (dependent on VA_BITS) * - Context fault reporting + * + * Changes compared to Linux driver: + * - support for fwspec */ =20 =20 @@ -49,6 +52,7 @@ #include #include #include +#include #include =20 /* Xen: The below defines are redefined within the file. Undef it */ @@ -617,13 +621,11 @@ struct arm_smmu_smr { =20 struct arm_smmu_master_cfg { struct arm_smmu_device *smmu; - int num_streamids; - u16 streamids[MAX_MASTER_STREAMIDS]; s16 smendx[MAX_MASTER_STREAMIDS]; }; #define INVALID_SMENDX -1 -#define for_each_cfg_sme(cfg, i, idx) \ - for (i =3D 0; idx =3D cfg->smendx[i], i < cfg->num_streamids; ++i) +#define for_each_cfg_sme(cfg, i, idx, num) \ + for (i =3D 0; idx =3D cfg->smendx[i], i < num; ++i) =20 struct arm_smmu_master { struct device_node *of_node; @@ -713,6 +715,14 @@ static struct arm_smmu_option_prop arm_smmu_options[] = =3D { { 0, NULL}, }; =20 +static inline struct iommu_fwspec * +arm_smmu_get_fwspec(struct arm_smmu_master_cfg *cfg) +{ + struct arm_smmu_master *master =3D container_of(cfg, + struct arm_smmu_master, cfg); + return dev_iommu_fwspec_get(&master->of_node->dev); +} + static void parse_driver_options(struct arm_smmu_device *smmu) { int i =3D 0; @@ -806,8 +816,9 @@ static int register_smmu_master(struct arm_smmu_device = *smmu, struct device *dev, struct of_phandle_args *masterspec) { - int i; + int i, ret =3D 0; struct arm_smmu_master *master; + struct iommu_fwspec *fwspec; =20 master =3D find_smmu_master(smmu, masterspec->np); if (master) { @@ -817,24 +828,30 @@ static int register_smmu_master(struct arm_smmu_devic= e *smmu, return -EBUSY; } =20 - if (masterspec->args_count > MAX_MASTER_STREAMIDS) { - dev_err(dev, - "reached maximum number (%d) of stream IDs for master device %s\n", - MAX_MASTER_STREAMIDS, masterspec->np->name); - return -ENOSPC; - } - master =3D devm_kzalloc(dev, sizeof(*master), GFP_KERNEL); if (!master) return -ENOMEM; + master->of_node =3D masterspec->np; =20 - master->of_node =3D masterspec->np; - master->cfg.num_streamids =3D masterspec->args_count; + ret =3D iommu_fwspec_init(&master->of_node->dev, smmu->dev); + if (ret) { + kfree(master); + return ret; + } + + /* adding the ids here */ + ret =3D iommu_fwspec_add_ids(&masterspec->np->dev, + masterspec->args, + masterspec->args_count); + if (ret) + return ret; + + fwspec =3D dev_iommu_fwspec_get(dev); =20 /* Xen: Let Xen know that the device is protected by an SMMU */ dt_device_set_protected(masterspec->np); =20 - for (i =3D 0; i < master->cfg.num_streamids; ++i) { + for (i =3D 0; i < fwspec->num_ids; ++i) { u16 streamid =3D masterspec->args[i]; =20 if (!(smmu->features & ARM_SMMU_FEAT_STREAM_MATCH) && @@ -844,7 +861,6 @@ static int register_smmu_master(struct arm_smmu_device = *smmu, masterspec->np->name, smmu->num_mapping_groups); return -ERANGE; } - master->cfg.streamids[i] =3D streamid; master->cfg.smendx[i] =3D INVALID_SMENDX; } return insert_smmu_master(smmu, master); @@ -1500,22 +1516,23 @@ static int arm_smmu_master_alloc_smes(struct device= *dev) struct arm_smmu_device *smmu =3D cfg->smmu; struct arm_smmu_smr *smrs =3D smmu->smrs; int i, idx, ret; + struct iommu_fwspec *fwspec =3D arm_smmu_get_fwspec(cfg); =20 spin_lock(&smmu->stream_map_lock); /* Figure out a viable stream map entry allocation */ - for_each_cfg_sme(cfg, i, idx) { + for_each_cfg_sme(cfg, i, idx, fwspec->num_ids) { if (idx !=3D INVALID_SMENDX) { ret =3D -EEXIST; goto out_err; } =20 - ret =3D arm_smmu_find_sme(smmu, cfg->streamids[i], 0); + ret =3D arm_smmu_find_sme(smmu, fwspec->ids[i], 0); if (ret < 0) goto out_err; =20 idx =3D ret; if (smrs && smmu->s2crs[idx].count =3D=3D 0) { - smrs[idx].id =3D cfg->streamids[i]; + smrs[idx].id =3D fwspec->ids[i]; smrs[idx].mask =3D 0; /* We don't currently share SMRs */ smrs[idx].valid =3D true; } @@ -1524,7 +1541,7 @@ static int arm_smmu_master_alloc_smes(struct device *= dev) } =20 /* It worked! Now, poke the actual hardware */ - for_each_cfg_sme(cfg, i, idx) { + for_each_cfg_sme(cfg, i, idx, fwspec->num_ids) { arm_smmu_write_sme(smmu, idx); } =20 @@ -1544,9 +1561,10 @@ static void arm_smmu_master_free_smes(struct arm_smm= u_master_cfg *cfg) { struct arm_smmu_device *smmu =3D cfg->smmu; int i, idx; + struct iommu_fwspec *fwspec =3D arm_smmu_get_fwspec(cfg); =20 spin_lock(&smmu->stream_map_lock); - for_each_cfg_sme(cfg, i, idx) { + for_each_cfg_sme(cfg, i, idx, fwspec->num_ids) { if (arm_smmu_free_sme(smmu, idx)) arm_smmu_write_sme(smmu, idx); cfg->smendx[i] =3D INVALID_SMENDX; @@ -1562,8 +1580,9 @@ static int arm_smmu_domain_add_master(struct arm_smmu= _domain *smmu_domain, enum arm_smmu_s2cr_type type =3D S2CR_TYPE_TRANS; u8 cbndx =3D smmu_domain->cfg.cbndx; int i, idx; + struct iommu_fwspec *fwspec =3D arm_smmu_get_fwspec(cfg); =20 - for_each_cfg_sme(cfg, i, idx) { + for_each_cfg_sme(cfg, i, idx, fwspec->num_ids) { if (type =3D=3D s2cr[idx].type && cbndx =3D=3D s2cr[idx].cbndx) continue; =20 @@ -1962,6 +1981,7 @@ static int arm_smmu_add_device(struct device *dev) struct arm_smmu_master_cfg *cfg; struct iommu_group *group; void (*releasefn)(void *) =3D NULL; + int ret; =20 smmu =3D find_smmu_for_device(dev); if (!smmu) @@ -1969,19 +1989,26 @@ static int arm_smmu_add_device(struct device *dev) =20 if (dev_is_pci(dev)) { struct pci_dev *pdev =3D to_pci_dev(dev); + struct iommu_fwspec *fwspec; =20 cfg =3D kzalloc(sizeof(*cfg), GFP_KERNEL); if (!cfg) { return -ENOMEM; } =20 - cfg->num_streamids =3D 1; + ret =3D iommu_fwspec_init(dev, smmu->dev); + if (ret) { + kfree(cfg); + return ret; + } + fwspec =3D dev_iommu_fwspec_get(dev); + /* * Assume Stream ID =3D=3D Requester ID for now. * We need a way to describe the ID mappings in FDT. */ pci_for_each_dma_alias(pdev, __arm_smmu_get_pci_sid, - &cfg->streamids[0]); + &fwspec->ids[0]); releasefn =3D __arm_smmu_release_pci_iommudata; cfg->smmu =3D smmu; } else { --=20 2.17.1 From nobody Thu May 16 10:50:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1627950268; cv=none; d=zohomail.com; s=zohoarc; b=jrz2YP8bIuojXx7g6a3lTyONb7tnRkJD9dkdv+OraBezH7FLd4nHrOYwlLH0HRLtus9u7UK7Pb7CUUijRhwP6AeTfekCzz4XT/u7vtxsprZSXYGdKrgZk8kl4M7EEExI0pHrre1cM0EToycbhoXyQNY+6ShSv43vL3ZwHWOfFDA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1627950268; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=A+iPVDqWENfLf7s3yrHUE+0AWPlVhwunUrErxnh7ZDg=; b=Uyu2icbIzVO+e24KxLfcrCvmtHMOxG/sVa96XlVtsUptd5xS4wsnDApLnvMWN41DiBMihlJ83r4hauacIujOMcq517uq7vURjBe5h8Oz5zTB6gAsD7xHFp0YvnPPJFFcnSyAQOyUJ8Tse6FDjoH+HS0S02rHWUf+hTlukO+tJns= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1627950268354867.8869742007387; Mon, 2 Aug 2021 17:24:28 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.163207.299033 (Exim 4.92) (envelope-from ) id 1mAiEA-0001Wr-RY; Tue, 03 Aug 2021 00:24:14 +0000 Received: by outflank-mailman (output) from mailman id 163207.299033; Tue, 03 Aug 2021 00:24:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mAiEA-0001Wk-O1; Tue, 03 Aug 2021 00:24:14 +0000 Received: by outflank-mailman (input) for mailman id 163207; Tue, 03 Aug 2021 00:24:12 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mAiE8-0001CH-NU for xen-devel@lists.xenproject.org; Tue, 03 Aug 2021 00:24:12 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 20207176-f3f1-11eb-9a7d-12813bfff9fa; Tue, 03 Aug 2021 00:24:12 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 0B59760EFD; Tue, 3 Aug 2021 00:24:11 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 20207176-f3f1-11eb-9a7d-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627950251; bh=PDVGbqlEdV9Ni6L4dSAvkSyR5v0MfCHLBfpJr6Xi6wE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z2ptlm2X8O1GUrholYR0NLEX5GRURTRo+o3AYkdqS0pN3tPzVxWNj3vMG5EIZVb4F BQk0mvEwFaNkU4PAmYPjC18ukHXk4Pj86wG7N9xAEk+t3vhhNEVJerfWyaxfMKKDsd geaOSBZvpDiUmIiflGzx2f1DOP6LJNdep/zDy5yjaZsn0jcsL57yzjDywC7yWW/S3p 6EdtPGCjVHqRYttM7ZKz8M5Pe+4kdKJvL2wK1ZDCWLZqElhlw/CFBj1cCSQ3WlcvvT +oytpDcA9D09zzGh1q7utVQPYqcIdVeo82IaRt/VG3zCw74XegJRL0k7SDvQ7RQsJ9 frY+cfreZ53WA== From: Stefano Stabellini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, julien@xen.org, Bertrand.Marquis@arm.com, Volodymyr_Babchuk@epam.com, rahul.singh@arm.com, brian.woods@xilinx.com, Stefano Stabellini Subject: [PATCH v6 2/4] xen: do not return -EEXIST if iommu_add_dt_device is called twice Date: Mon, 2 Aug 2021 17:24:07 -0700 Message-Id: <20210803002409.19406-2-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1627950270629100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" iommu_add_dt_device() returns -EEXIST if the device was already registered. At the moment, this can only happen if the device was already assigned to a domain (either dom0 at boot or via XEN_DOMCTL_assign_device). In a follow-up patch, we will convert the SMMU driver to use the FW spec. When the legacy bindings are used, all the devices will be registered at probe. Therefore, iommu_add_dt_device() will always returns -EEXIST. Currently, one caller (XEN_DOMCTL_assign_device) will check the return and ignore -EEXIST. All the other will fail because it was technically a programming error. However, there is no harm to call iommu_add_dt_device() twice, so we can simply return 0. With that in place the caller doesn't need to check -EEXIST anymore, so remove the check. Signed-off-by: Stefano Stabellini Acked-by: Julien Grall --- Changes in v6: - improve in-code comment - improve commit message - remove stale in-code comment Changes in v5: - new patch --- xen/drivers/passthrough/device_tree.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/xen/drivers/passthrough/device_tree.c b/xen/drivers/passthroug= h/device_tree.c index 999b831d90..9249f21c01 100644 --- a/xen/drivers/passthrough/device_tree.c +++ b/xen/drivers/passthrough/device_tree.c @@ -140,8 +140,12 @@ int iommu_add_dt_device(struct dt_device_node *np) if ( !ops ) return -EINVAL; =20 + /* + * The device may already have been registered. As there is no harm in + * it just return success early. + */ if ( dev_iommu_fwspec_get(dev) ) - return -EEXIST; + return 0; =20 /* * According to the Documentation/devicetree/bindings/iommu/iommu.txt @@ -249,12 +253,7 @@ int iommu_do_dt_domctl(struct xen_domctl *domctl, stru= ct domain *d, return -EINVAL; =20 ret =3D iommu_add_dt_device(dev); - /* - * Ignore "-EEXIST" error code as it would mean that the device is - * already added to the IOMMU (positive result). Such happens after - * re-creating guest domain. - */ - if ( ret < 0 && ret !=3D -EEXIST ) + if ( ret < 0 ) { printk(XENLOG_G_ERR "Failed to add %s to the IOMMU\n", dt_node_full_name(dev)); --=20 2.17.1 From nobody Thu May 16 10:50:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1627950272; cv=none; d=zohomail.com; s=zohoarc; b=lLXGhXHXJbIwp3lyN2MCsjsaQ30r1coX9YubIfQzWSB+0ld9zDRU4LSIhGxz3c8Vn283JWOVI+R2LyJR8TjXZOlM9mg19WucHhCNZYnkYMZIxz0KVe9KNjnHRtiM0t5X7tPqhiEBSNSBE4GXLQsvOzDoW0KGS9L22Woe0KOIElQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1627950272; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=E7MaqfElVxr31TuPt12UpYFhxweyJuek32ryUq16V6Y=; b=BWAEhzs5nc4McqJl7fgexkySmkQ1jQPLnXxrDJifOTvS17mgZyEN0W+x064n+oF6Iw/0oYTx/BGmnZAvxx75IvR1R/c97LQ/Q3xsOupKGw/gPIQPFFDRs0/VMLa9wRGl7S62AOJz9p4P+kr5eoDuVkJsuhemf6EJswVeyOHLo7c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1627950272200722.2836433713242; Mon, 2 Aug 2021 17:24:32 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.163209.299046 (Exim 4.92) (envelope-from ) id 1mAiEE-0001tU-6J; Tue, 03 Aug 2021 00:24:18 +0000 Received: by outflank-mailman (output) from mailman id 163209.299046; Tue, 03 Aug 2021 00:24:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mAiEE-0001tH-1g; Tue, 03 Aug 2021 00:24:18 +0000 Received: by outflank-mailman (input) for mailman id 163209; Tue, 03 Aug 2021 00:24:17 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mAiED-0001EV-EV for xen-devel@lists.xenproject.org; Tue, 03 Aug 2021 00:24:17 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 9e41c88f-e36e-4799-8268-55a2e5ff27d8; Tue, 03 Aug 2021 00:24:12 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 9F6BA60EEA; Tue, 3 Aug 2021 00:24:11 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9e41c88f-e36e-4799-8268-55a2e5ff27d8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627950252; bh=6TReV4Pdjfx3WD5lh4CLVkGlPCvVlrwBPMhSYNdvOVM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u6AYJiOemVm2ui/WtPSWgDQ1kaCuzVG1OV4BdwPKy2DD+H+oxqXYdTmbqdIEFvAXK nt3RvwF9mLIrbfR4fEhVncrHvso1jo63kmZv60SErNBLPR5cU67jpMewu87tWWmcg2 ECObi5QZdsMhurOif7pmhNg9EF2+am9LQjEZUx6Nw2QnEaHtbJcePawpoYHUIjATpT 71EeyHUP8HFoBuMWnfrdjpy7FMirjdgaFjzP4mgjwVE4wgc67JsSEuuArOIzaKF1J+ i3gNy5slDgOkDGWhS8hnkUzxE/4eJ9G2EXVisCrA0upGdf7TpNJWPoUoQKv0rR3kE8 LMd3JQ2x6sf4Q== From: Stefano Stabellini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, julien@xen.org, Bertrand.Marquis@arm.com, Volodymyr_Babchuk@epam.com, rahul.singh@arm.com, brian.woods@xilinx.com, Stefano Stabellini Subject: [PATCH v6 3/4] arm,smmu: restructure code in preparation to new bindings support Date: Mon, 2 Aug 2021 17:24:08 -0700 Message-Id: <20210803002409.19406-3-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1627950272688100005 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Brian Woods Restructure some of the code and add supporting functions for adding generic device tree (DT) binding support. This will allow for using current Linux device trees with just modifying the chosen field to enable Xen. Signed-off-by: Brian Woods Signed-off-by: Stefano Stabellini Reviewed-by: Rahul Singh Acked-by: Julien Grall --- xen/drivers/passthrough/arm/smmu.c | 62 ++++++++++++++++-------------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/a= rm/smmu.c index 09773702c3..4aa3ecec57 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -812,53 +812,36 @@ static int insert_smmu_master(struct arm_smmu_device = *smmu, return 0; } =20 -static int register_smmu_master(struct arm_smmu_device *smmu, - struct device *dev, - struct of_phandle_args *masterspec) +static int arm_smmu_dt_add_device_legacy(struct arm_smmu_device *smmu, + struct device *dev, + struct iommu_fwspec *fwspec) { - int i, ret =3D 0; + int i; struct arm_smmu_master *master; - struct iommu_fwspec *fwspec; + struct device_node *dev_node =3D dev_get_dev_node(dev); =20 - master =3D find_smmu_master(smmu, masterspec->np); + master =3D find_smmu_master(smmu, dev_node); if (master) { dev_err(dev, "rejecting multiple registrations for master device %s\n", - masterspec->np->name); + dev_node->name); return -EBUSY; } =20 master =3D devm_kzalloc(dev, sizeof(*master), GFP_KERNEL); if (!master) return -ENOMEM; - master->of_node =3D masterspec->np; - - ret =3D iommu_fwspec_init(&master->of_node->dev, smmu->dev); - if (ret) { - kfree(master); - return ret; - } - - /* adding the ids here */ - ret =3D iommu_fwspec_add_ids(&masterspec->np->dev, - masterspec->args, - masterspec->args_count); - if (ret) - return ret; - - fwspec =3D dev_iommu_fwspec_get(dev); + master->of_node =3D dev_node; =20 /* Xen: Let Xen know that the device is protected by an SMMU */ - dt_device_set_protected(masterspec->np); + dt_device_set_protected(dev_node); =20 for (i =3D 0; i < fwspec->num_ids; ++i) { - u16 streamid =3D masterspec->args[i]; - if (!(smmu->features & ARM_SMMU_FEAT_STREAM_MATCH) && - (streamid >=3D smmu->num_mapping_groups)) { + (fwspec->ids[i] >=3D smmu->num_mapping_groups)) { dev_err(dev, "stream ID for master device %s greater than maximum allowed (%d)\n", - masterspec->np->name, smmu->num_mapping_groups); + dev_node->name, smmu->num_mapping_groups); return -ERANGE; } master->cfg.smendx[i] =3D INVALID_SMENDX; @@ -866,6 +849,29 @@ static int register_smmu_master(struct arm_smmu_device= *smmu, return insert_smmu_master(smmu, master); } =20 +static int register_smmu_master(struct arm_smmu_device *smmu, + struct device *dev, + struct of_phandle_args *masterspec) +{ + int ret =3D 0; + struct iommu_fwspec *fwspec; + + ret =3D iommu_fwspec_init(&masterspec->np->dev, smmu->dev); + if (ret) + return ret; + + ret =3D iommu_fwspec_add_ids(&masterspec->np->dev, + masterspec->args, + masterspec->args_count); + if (ret) + return ret; + + fwspec =3D dev_iommu_fwspec_get(&masterspec->np->dev); + return arm_smmu_dt_add_device_legacy(smmu, + &masterspec->np->dev, + fwspec); +} + static struct arm_smmu_device *find_smmu_for_device(struct device *dev) { struct arm_smmu_device *smmu; --=20 2.17.1 From nobody Thu May 16 10:50:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1627950276; cv=none; d=zohomail.com; s=zohoarc; b=QzlTbPbIx8CXdN7780mam6t1qiZze9bwe9q84NZt7TIhpeyAPlfMUKuUMT6Je+mEPNZ94xaS31zTk8LJgp57r9MaFI0vvBLEgBi7C/G4I8V3sQjH+VgbjksLyguxtSvq1dZDB4ntiwlKLbqMfLYLswQ64guY+2H2QPVu066vFLY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1627950276; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=0y0t5XKLLwL9zvBJg+hYhWXQo3Tw4yd6XOMImXLIA1g=; b=lKp3GgimymkD1qVvIVvA+M/B3AZIFR5kiThWqHLiAPRsU1Nnqx+vuAXp3+XRRzXK8LgRvA2YL5d1vNuQpySZYTzXz+/eqL3dPpxMjX4lbyJ7yKN2Uz9jOagU5pazZKcAaHiK5xS9AhZqJHGXfD0enTXORSR8+OFgAnRJrY0QSek= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1627950276313495.18022566712034; Mon, 2 Aug 2021 17:24:36 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.163212.299058 (Exim 4.92) (envelope-from ) id 1mAiEJ-0002Lk-GM; Tue, 03 Aug 2021 00:24:23 +0000 Received: by outflank-mailman (output) from mailman id 163212.299058; Tue, 03 Aug 2021 00:24:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mAiEJ-0002LZ-Cp; Tue, 03 Aug 2021 00:24:23 +0000 Received: by outflank-mailman (input) for mailman id 163212; Tue, 03 Aug 2021 00:24:22 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mAiEI-0001EV-EX for xen-devel@lists.xenproject.org; Tue, 03 Aug 2021 00:24:22 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 8821dc9d-bb27-477e-9c4f-5fe612abc26d; Tue, 03 Aug 2021 00:24:13 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 4B14A60F11; Tue, 3 Aug 2021 00:24:12 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8821dc9d-bb27-477e-9c4f-5fe612abc26d DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627950252; bh=Fhw/OAINyMd6WdnbOn4NtALR4OovCkQXG7dyHkj549U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VtLeXDlUfQUJEvy6/uPiVfdDNL8nQLK46o6juyovE15m9052qQIHeaWgQNBASxm9y u6bdufv1LXTr2W7Djf5MpygylzJjlvbW2594PJEYBxmUS7aDginuVarzZWZ1xfiA/R 0TZ+pUKJUDO2vLQr1ALzRoy6NUeLR7TF2PbZDud6RjpSMRou1SOfiBREf/jdIxJzdH aJYRVxEfH7QM5OEOpN8iWmOXWzVFFBVS/Nzd4/0HgTNEPnvaNXMoZqcoeevHh2W2oR yJ4WPc847VBTf+L2mjIVQITlpczJNcRDmTdbTZsJH3ghL9iUcxuLed4T/F70FkZxoj CcGGUKheI1n1w== From: Stefano Stabellini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, julien@xen.org, Bertrand.Marquis@arm.com, Volodymyr_Babchuk@epam.com, rahul.singh@arm.com, brian.woods@xilinx.com, Stefano Stabellini Subject: [PATCH v6 4/4] arm,smmu: add support for generic DT bindings. Implement add_device and dt_xlate. Date: Mon, 2 Aug 2021 17:24:09 -0700 Message-Id: <20210803002409.19406-4-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1627950276942100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Brian Woods For the legacy path, arm_smmu_dt_add_device_legacy is called by register_smmu_master scanning mmu-masters (a fwspec entry is also created.) For the generic path, arm_smmu_dt_add_device_generic gets called instead. Then, arm_smmu_dt_add_device_generic calls arm_smmu_dt_add_device_legacy afterwards, shared with the legacy path. This way most of the low level implementation is shared between the two paths. If both legacy bindings and generic bindings are present in device tree, the legacy bindings are the ones that are used. That's because mmu-masters is parsed by xen/drivers/passthrough/arm/smmu.c:arm_smmu_device_dt_probe which is called by arm_smmu_dt_init. It happens very early. iommus is parsed by xen/drivers/passthrough/device_tree.c:iommu_add_dt_device which is called by xen/arch/arm/domain_build.c:handle_device and happens afterwards. arm_smmu_dt_xlate_generic is a verbatim copy from Linux (drivers/iommu/arm/arm-smmu/arm-smmu.c:arm_smmu_of_xlate, version v5.10). A workaround was introduced by cf4af9d6d6c (xen/arm: boot with device trees with "mmu-masters" and "iommus") because the SMMU driver only supported the legacy bindings. Remove it now. Signed-off-by: Brian Woods Signed-off-by: Stefano Stabellini Reviewed-by: Rahul Singh Acked-by: Julien Grall --- Changes in v5: - add Acked-by --- xen/drivers/passthrough/arm/smmu.c | 40 ++++++++++++++++++++++++++- xen/drivers/passthrough/device_tree.c | 17 +----------- 2 files changed, 40 insertions(+), 17 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/a= rm/smmu.c index 4aa3ecec57..c234ad9c7f 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -256,6 +256,8 @@ struct iommu_group atomic_t ref; }; =20 +static struct arm_smmu_device *find_smmu(const struct device *dev); + static struct iommu_group *iommu_group_alloc(void) { struct iommu_group *group =3D xzalloc(struct iommu_group); @@ -444,6 +446,8 @@ static struct iommu_group *iommu_group_get(struct devic= e *dev) #define SMR_VALID (1U << 31) #define SMR_MASK_SHIFT 16 #define SMR_ID_SHIFT 0 +#define SMR_ID_MASK 0x7fff +#define SMR_MASK_MASK 0x7fff =20 #define ARM_SMMU_GR0_S2CR(n) (0xc00 + ((n) << 2)) #define S2CR_CBNDX_SHIFT 0 @@ -872,6 +876,38 @@ static int register_smmu_master(struct arm_smmu_device= *smmu, fwspec); } =20 +static int arm_smmu_dt_add_device_generic(u8 devfn, struct device *dev) +{ + struct arm_smmu_device *smmu; + struct iommu_fwspec *fwspec; + + fwspec =3D dev_iommu_fwspec_get(dev); + if (fwspec =3D=3D NULL) + return -ENXIO; + + smmu =3D find_smmu(fwspec->iommu_dev); + if (smmu =3D=3D NULL) + return -ENXIO; + + return arm_smmu_dt_add_device_legacy(smmu, dev, fwspec); +} + +static int arm_smmu_dt_xlate_generic(struct device *dev, + const struct dt_phandle_args *spec) +{ + uint32_t mask, fwid =3D 0; + + if (spec->args_count > 0) + fwid |=3D (SMR_ID_MASK & spec->args[0]) << SMR_ID_SHIFT; + + if (spec->args_count > 1) + fwid |=3D (SMR_MASK_MASK & spec->args[1]) << SMR_MASK_SHIFT; + else if (!of_property_read_u32(spec->np, "stream-match-mask", &mask)) + fwid |=3D (SMR_MASK_MASK & mask) << SMR_MASK_SHIFT; + + return iommu_fwspec_add_ids(dev, &fwid, 1); +} + static struct arm_smmu_device *find_smmu_for_device(struct device *dev) { struct arm_smmu_device *smmu; @@ -2837,6 +2873,7 @@ static void arm_smmu_iommu_domain_teardown(struct dom= ain *d) static const struct iommu_ops arm_smmu_iommu_ops =3D { .init =3D arm_smmu_iommu_domain_init, .hwdom_init =3D arm_smmu_iommu_hwdom_init, + .add_device =3D arm_smmu_dt_add_device_generic, .teardown =3D arm_smmu_iommu_domain_teardown, .iotlb_flush =3D arm_smmu_iotlb_flush, .iotlb_flush_all =3D arm_smmu_iotlb_flush_all, @@ -2844,9 +2881,10 @@ static const struct iommu_ops arm_smmu_iommu_ops =3D= { .reassign_device =3D arm_smmu_reassign_dev, .map_page =3D arm_iommu_map_page, .unmap_page =3D arm_iommu_unmap_page, + .dt_xlate =3D arm_smmu_dt_xlate_generic, }; =20 -static __init const struct arm_smmu_device *find_smmu(const struct device = *dev) +static struct arm_smmu_device *find_smmu(const struct device *dev) { struct arm_smmu_device *smmu; bool found =3D false; diff --git a/xen/drivers/passthrough/device_tree.c b/xen/drivers/passthroug= h/device_tree.c index 9249f21c01..98f2aa0dad 100644 --- a/xen/drivers/passthrough/device_tree.c +++ b/xen/drivers/passthrough/device_tree.c @@ -159,22 +159,7 @@ int iommu_add_dt_device(struct dt_device_node *np) * these callback implemented. */ if ( !ops->add_device || !ops->dt_xlate ) - { - /* - * Some Device Trees may expose both legacy SMMU and generic - * IOMMU bindings together. However, the SMMU driver is only - * supporting the former and will protect them during the - * initialization. So we need to skip them and not return - * error here. - * - * XXX: This can be dropped when the SMMU is able to deal - * with generic bindings. - */ - if ( dt_device_is_protected(np) ) - return 0; - else - return -EINVAL; - } + return -EINVAL; =20 if ( !dt_device_is_available(iommu_spec.np) ) break; --=20 2.17.1