From: Rahul Singh <Rahul.Singh@arm.com>
To: Stefano Stabellini <sstabellini@kernel.org>
Cc: xen-devel <xen-devel@lists.xenproject.org>,
Julien Grall <julien@xen.org>,
Bertrand Marquis <Bertrand.Marquis@arm.com>,
"Volodymyr_Babchuk@epam.com" <Volodymyr_Babchuk@epam.com>,
"brian.woods@xilinx.com" <brian.woods@xilinx.com>,
Stefano Stabellini <stefano.stabellini@xilinx.com>
Subject: Re: [PATCH v3 2/3] arm,smmu: restructure code in preparation to new bindings support
Date: Tue, 2 Feb 2021 16:09:14 +0000 [thread overview]
Message-ID: <36D1F0B5-C811-4A21-97F5-7C233649FEBF@arm.com> (raw)
In-Reply-To: <20210126225836.6017-2-sstabellini@kernel.org>
Hello Stefano,
> On 26 Jan 2021, at 10:58 pm, Stefano Stabellini <sstabellini@kernel.org> wrote:
>
> From: Brian Woods <brian.woods@xilinx.com>
>
> 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 <brian.woods@xilinx.com>
> Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Reviewed-by: Rahul Singh <rahul.singh@arm.com>
Tested-by: Rahul Singh <rahul.singh@arm.com>
Regards,
Rahul
> ---
> Changes in v3:
> - split patch
> ---
> xen/drivers/passthrough/arm/smmu.c | 60 +++++++++++++++++-------------
> 1 file changed, 35 insertions(+), 25 deletions(-)
>
> diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c
> index 3898d1d737..9687762283 100644
> --- a/xen/drivers/passthrough/arm/smmu.c
> +++ b/xen/drivers/passthrough/arm/smmu.c
> @@ -782,50 +782,36 @@ static int insert_smmu_master(struct arm_smmu_device *smmu,
> return 0;
> }
>
> -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 = 0;
> + int i;
> struct arm_smmu_master *master;
> - struct iommu_fwspec *fwspec;
> + struct device_node *dev_node = dev_get_dev_node(dev);
>
> - master = find_smmu_master(smmu, masterspec->np);
> + master = 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;
> }
>
> master = devm_kzalloc(dev, sizeof(*master), GFP_KERNEL);
> if (!master)
> return -ENOMEM;
> - master->of_node = masterspec->np;
> -
> - ret = iommu_fwspec_init(&master->of_node->dev, smmu->dev);
> - if (ret) {
> - kfree(master);
> - return ret;
> - }
> - fwspec = dev_iommu_fwspec_get(dev);
> -
> - /* adding the ids here */
> - ret = iommu_fwspec_add_ids(&masterspec->np->dev,
> - masterspec->args,
> - masterspec->args_count);
> - if (ret)
> - return ret;
> + master->of_node = dev_node;
>
> /* Xen: Let Xen know that the device is protected by an SMMU */
> - dt_device_set_protected(masterspec->np);
> + dt_device_set_protected(dev_node);
>
> if (!(smmu->features & ARM_SMMU_FEAT_STREAM_MATCH)) {
> for (i = 0; i < fwspec->num_ids; ++i) {
> - if (masterspec->args[i] >= smmu->num_mapping_groups) {
> + if (fwspec->ids[i] >= 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;
> }
> }
> @@ -833,6 +819,30 @@ static int register_smmu_master(struct arm_smmu_device *smmu,
> return insert_smmu_master(smmu, master);
> }
>
> +static int register_smmu_master(struct arm_smmu_device *smmu,
> + struct device *dev,
> + struct of_phandle_args *masterspec)
> +{
> + int ret = 0;
> + struct iommu_fwspec *fwspec;
> +
> + ret = iommu_fwspec_init(&masterspec->np->dev, smmu->dev);
> + if (ret)
> + return ret;
> +
> + fwspec = dev_iommu_fwspec_get(&masterspec->np->dev);
> +
> + ret = iommu_fwspec_add_ids(&masterspec->np->dev,
> + masterspec->args,
> + masterspec->args_count);
> + if (ret)
> + return ret;
> +
> + 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;
> --
> 2.17.1
>
>
next prev parent reply other threads:[~2021-02-02 16:10 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-26 22:58 [PATCH v3 0/3] Generic SMMU Bindings Stefano Stabellini
2021-01-26 22:58 ` [PATCH v3 1/3] arm,smmu: switch to using iommu_fwspec functions Stefano Stabellini
2021-02-02 16:07 ` Rahul Singh
2021-01-26 22:58 ` [PATCH v3 2/3] arm,smmu: restructure code in preparation to new bindings support Stefano Stabellini
2021-02-02 16:09 ` Rahul Singh [this message]
2021-01-26 22:58 ` [PATCH v3 3/3] arm,smmu: add support for generic DT bindings. Implement add_device and dt_xlate Stefano Stabellini
2021-02-02 16:09 ` Rahul Singh
2021-02-02 16:07 ` [PATCH v3 0/3] Generic SMMU Bindings Rahul Singh
2021-02-02 17:44 ` Stefano Stabellini
2021-02-02 17:50 ` Julien Grall
2021-02-02 18:27 ` Stefano Stabellini
2021-02-02 18:43 ` Julien Grall
2021-02-03 17:14 ` Rahul Singh
2021-04-05 15:23 ` Julien Grall
2021-04-06 23:59 ` Stefano Stabellini
2021-04-07 15:43 ` Rahul Singh
2021-04-10 0:27 ` Stefano Stabellini
2021-04-12 10:20 ` Rahul Singh
2021-04-13 0:27 ` Stefano Stabellini
2021-04-14 10:42 ` Rahul Singh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=36D1F0B5-C811-4A21-97F5-7C233649FEBF@arm.com \
--to=rahul.singh@arm.com \
--cc=Bertrand.Marquis@arm.com \
--cc=Volodymyr_Babchuk@epam.com \
--cc=brian.woods@xilinx.com \
--cc=julien@xen.org \
--cc=sstabellini@kernel.org \
--cc=stefano.stabellini@xilinx.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).