From: Thierry Reding <thierry.reding@gmail.com>
To: Nicolin Chen <nicoleotsuka@gmail.com>
Cc: linux-kernel@vger.kernel.org, krzk@kernel.org,
jonathanh@nvidia.com, iommu@lists.linux-foundation.org,
linux-tegra@vger.kernel.org
Subject: Re: [PATCH 4/5] iommu/tegra-smmu: Add PCI support
Date: Mon, 28 Sep 2020 09:55:45 +0200 [thread overview]
Message-ID: <20200928075545.GG2837573@ulmo> (raw)
In-Reply-To: <20200926080719.6822-5-nicoleotsuka@gmail.com>
[-- Attachment #1.1: Type: text/plain, Size: 2159 bytes --]
On Sat, Sep 26, 2020 at 01:07:18AM -0700, Nicolin Chen wrote:
> This patch simply adds support for PCI devices.
>
> Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
> ---
> drivers/iommu/tegra-smmu.c | 17 ++++++++++++++++-
> 1 file changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
> index 97a7185b4578..9dbc5d7183cc 100644
> --- a/drivers/iommu/tegra-smmu.c
> +++ b/drivers/iommu/tegra-smmu.c
> @@ -15,6 +15,7 @@
> #include <linux/spinlock.h>
> #include <linux/dma-iommu.h>
> #include <linux/dma-mapping.h>
> +#include <linux/pci.h>
>
> #include <soc/tegra/ahb.h>
> #include <soc/tegra/mc.h>
> @@ -935,6 +936,7 @@ static struct iommu_group *tegra_smmu_device_group(struct device *dev)
> const struct tegra_smmu_group_soc *soc;
> struct tegra_smmu_group *group;
> int swgroup = fwspec->ids[0];
> + bool pci = dev_is_pci(dev);
> struct iommu_group *grp;
>
> /* Find group_soc associating with swgroup */
> @@ -961,7 +963,7 @@ static struct iommu_group *tegra_smmu_device_group(struct device *dev)
> group->smmu = smmu;
> group->soc = soc;
>
> - group->group = iommu_group_alloc();
> + group->group = pci ? pci_device_group(dev) : iommu_group_alloc();
> if (IS_ERR(group->group)) {
> devm_kfree(smmu->dev, group);
> mutex_unlock(&smmu->lock);
> @@ -1180,6 +1182,19 @@ struct tegra_smmu *tegra_smmu_probe(struct device *dev,
> return ERR_PTR(err);
> }
>
> +#ifdef CONFIG_PCI
> + if (!iommu_present(&pci_bus_type)) {
> + pci_request_acs();
> + err = bus_set_iommu(&pci_bus_type, &tegra_smmu_ops);
> + if (err < 0) {
> + bus_set_iommu(&platform_bus_type, NULL);
> + iommu_device_unregister(&smmu->iommu);
> + iommu_device_sysfs_remove(&smmu->iommu);
> + return ERR_PTR(err);
It might be worth factoring out the cleanup code now that there are
multiple failures from which we may need to clean up.
Also, it'd be great if somehow we could do this without the #ifdef,
but I guess since we're using the pci_bus_type global variable directly,
there isn't much we can do here?
Thierry
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 156 bytes --]
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2020-09-28 7:55 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-26 8:07 [PATCH 0/5] iommu/tegra-smmu: Adding PCI support and mappings debugfs node Nicolin Chen
2020-09-26 8:07 ` [PATCH 1/5] iommu/tegra-smmu: Unwrap tegra_smmu_group_get Nicolin Chen
2020-09-28 7:13 ` Thierry Reding
2020-09-28 19:33 ` Nicolin Chen
2020-09-26 8:07 ` [PATCH 2/5] iommu/tegra-smmu: Expend mutex protection range Nicolin Chen
2020-09-26 8:07 ` [PATCH 3/5] iommu/tegra-smmu: Use iommu_fwspec in .probe_/.attach_device() Nicolin Chen
2020-09-26 14:48 ` Dmitry Osipenko
2020-09-26 20:42 ` Nicolin Chen
2020-09-28 7:29 ` Thierry Reding
2020-09-28 7:52 ` Thierry Reding
2020-09-28 22:18 ` Nicolin Chen
2020-09-29 4:06 ` Dmitry Osipenko
2020-09-29 5:36 ` Nicolin Chen
2020-09-26 8:07 ` [PATCH 4/5] iommu/tegra-smmu: Add PCI support Nicolin Chen
2020-09-26 22:18 ` Dmitry Osipenko
2020-09-28 22:31 ` Nicolin Chen
2020-09-28 7:55 ` Thierry Reding [this message]
2020-09-28 22:33 ` Nicolin Chen
2020-09-26 8:07 ` [PATCH 5/5] iommu/tegra-smmu: Add pagetable mappings to debugfs Nicolin Chen
2020-09-26 14:48 ` Dmitry Osipenko
2020-09-26 20:47 ` Nicolin Chen
2020-09-26 21:41 ` Dmitry Osipenko
2020-09-26 21:24 ` Dmitry Osipenko
2020-09-26 21:37 ` Dmitry Osipenko
-- strict thread matches above, loose matches on Subject: below --
2019-01-16 20:50 [PATCH 1/5] iommu/tegra-smmu: Fix domain_alloc Navneet Kumar
[not found] ` <1547671814-30088-1-git-send-email-navneetk-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2019-01-16 20:50 ` [PATCH 4/5] iommu/tegra-smmu: Add PCI support Navneet Kumar
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=20200928075545.GG2837573@ulmo \
--to=thierry.reding@gmail.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jonathanh@nvidia.com \
--cc=krzk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=nicoleotsuka@gmail.com \
/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).