From: Robin Murphy <robin.murphy@arm.com>
To: Matthew Rosato <mjrosato@linux.ibm.com>, joro@8bytes.org
Cc: will@kernel.org, iommu@lists.linux.dev,
linux-arm-kernel@lists.infradead.org, baolu.lu@linux.intel.com,
suravee.suthikulpanit@amd.com, vasant.hegde@amd.com,
gerald.schaefer@linux.ibm.com, schnelle@linux.ibm.com,
linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 15/15] iommu: Clean up bus_set_iommu()
Date: Thu, 7 Jul 2022 15:58:38 +0100 [thread overview]
Message-ID: <8ad2fec1-8a51-dc35-39bb-a05a0d837ad9@arm.com> (raw)
In-Reply-To: <a6317b8e-87ea-122d-c1fe-c320f030a7f3@linux.ibm.com>
On 2022-07-07 13:54, Matthew Rosato wrote:
> On 7/7/22 8:49 AM, Matthew Rosato wrote:
>> On 7/5/22 1:08 PM, Robin Murphy wrote:
>>> Clean up the remaining trivial bus_set_iommu() callsites along
>>> with the implementation. Now drivers only have to know and care
>>> about iommu_device instances, phew!
>>>
>>> Signed-off-by: Robin Murphy <robin.murphy@arm.com>
>>> ---
>>>
>>> v3: Also catch Intel's cheeky open-coded assignment
>>>
>>
>> ...
>>
>>> diff --git a/drivers/iommu/s390-iommu.c b/drivers/iommu/s390-iommu.c
>>> index c898bcbbce11..dd957145fb81 100644
>>> --- a/drivers/iommu/s390-iommu.c
>>> +++ b/drivers/iommu/s390-iommu.c
>>> @@ -385,9 +385,3 @@ static const struct iommu_ops s390_iommu_ops = {
>>> .free = s390_domain_free,
>>> }
>>> };
>>> -
>>> -static int __init s390_iommu_init(void)
>>> -{
>>> - return bus_set_iommu(&pci_bus_type, &s390_iommu_ops);
>>> -}
>>> -subsys_initcall(s390_iommu_init);
>>
>> Previously s390_iommu_ops was only being set for pci_bus_type, but
>> with this series it will now also be set for platform_bus_type.
Ah, indeed I hadn't got as far as fully appreciating that to_zpci_dev()
isn't robust enough on its own. Thanks for the patch, I've pulled it in
and will include it in v4. Do I take it that all else works OK with this
fixed?
Cheers,
Robin.
>>
>> To tolerate that, this series needs a change along the lines of:
>>
>
> ... Sorry, let's try that again without a mangled diff:
>
> From: Matthew Rosato <mjrosato@linux.ibm.com>
> Date: Thu, 7 Jul 2022 08:45:44 -0400
> Subject: [PATCH] iommu/s390: fail probe for non-pci device
>
>
> s390-iommu only supports pci_bus_type today
>
>
> Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
> ---
> drivers/iommu/s390-iommu.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
>
> diff --git a/drivers/iommu/s390-iommu.c b/drivers/iommu/s390-iommu.c
> index dd957145fb81..762f892b4ec3 100644
> --- a/drivers/iommu/s390-iommu.c
> +++ b/drivers/iommu/s390-iommu.c
> @@ -185,7 +185,12 @@ static void s390_iommu_detach_device(struct
> iommu_domain *domain,
>
>
> static struct iommu_device *s390_iommu_probe_device(struct device *dev)
> {
> - struct zpci_dev *zdev = to_zpci_dev(dev);
> + struct zpci_dev *zdev;
> +
> + if (!dev_is_pci(dev))
> + return ERR_PTR(-ENODEV);
> +
> + zdev = to_zpci_dev(dev);
>
>
> return &zdev->iommu_dev;
> }
>
next prev parent reply other threads:[~2022-07-07 14:58 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-05 17:08 [PATCH v3 00/15] iommu: Retire bus_set_iommu() Robin Murphy
2022-07-05 17:08 ` [PATCH v3 01/15] iommu/vt-d: Handle race between registration and device probe Robin Murphy
2022-07-06 1:39 ` Baolu Lu
2022-07-07 6:51 ` Tian, Kevin
2022-07-08 7:52 ` Baolu Lu
2022-07-15 12:37 ` Robin Murphy
2022-07-19 0:06 ` Lu Baolu
2022-07-05 17:08 ` [PATCH v3 02/15] iommu/amd: " Robin Murphy
2022-07-05 17:08 ` [PATCH v3 03/15] iommu: Always register bus notifiers Robin Murphy
2022-07-06 1:53 ` Baolu Lu
2022-07-06 13:43 ` Robin Murphy
2022-07-07 0:20 ` Baolu Lu
2022-07-07 6:34 ` Tian, Kevin
2022-07-07 9:38 ` Robin Murphy
2022-07-07 6:31 ` Tian, Kevin
2022-07-07 9:58 ` Robin Murphy
2022-07-08 5:50 ` Tian, Kevin
2022-07-05 17:08 ` [PATCH v3 04/15] iommu: Move bus setup to IOMMU device registration Robin Murphy
2022-07-06 2:35 ` Baolu Lu
2022-07-06 14:37 ` Robin Murphy
2022-07-07 1:19 ` Baolu Lu
2022-07-07 6:51 ` Tian, Kevin
2022-07-07 10:58 ` Robin Murphy
2022-07-08 5:52 ` Tian, Kevin
2022-07-05 17:08 ` [PATCH v3 05/15] iommu/amd: Clean up bus_set_iommu() Robin Murphy
2022-07-05 17:08 ` [PATCH v3 06/15] iommu/arm-smmu: " Robin Murphy
2022-07-05 17:08 ` [PATCH v3 07/15] iommu/arm-smmu-v3: " Robin Murphy
2022-07-05 17:08 ` [PATCH v3 08/15] iommu/dart: " Robin Murphy
2022-07-05 17:08 ` [PATCH v3 09/15] iommu/exynos: " Robin Murphy
2022-07-05 17:08 ` [PATCH v3 10/15] iommu/ipmmu-vmsa: " Robin Murphy
2022-07-05 17:08 ` [PATCH v3 11/15] iommu/mtk: " Robin Murphy
2022-07-05 17:08 ` [PATCH v3 12/15] iommu/omap: " Robin Murphy
2022-07-05 17:08 ` [PATCH v3 13/15] iommu/tegra-smmu: " Robin Murphy
2022-07-05 17:08 ` [PATCH v3 14/15] iommu/virtio: " Robin Murphy
2022-07-05 17:08 ` [PATCH v3 15/15] iommu: " Robin Murphy
2022-07-07 7:45 ` Tian, Kevin
2022-07-07 12:49 ` Matthew Rosato
2022-07-07 12:54 ` Matthew Rosato
2022-07-07 14:58 ` Robin Murphy [this message]
2022-07-07 16:42 ` Matthew Rosato
2022-07-08 8:14 ` [PATCH] iommu/s390: fail probe for non-pci device Niklas Schnelle
2022-07-08 8:17 ` [PATCH v3 00/15] iommu: Retire bus_set_iommu() Niklas Schnelle
2022-07-15 13:12 ` Robin Murphy
2022-07-21 7:17 ` Tian, Kevin
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=8ad2fec1-8a51-dc35-39bb-a05a0d837ad9@arm.com \
--to=robin.murphy@arm.com \
--cc=baolu.lu@linux.intel.com \
--cc=gerald.schaefer@linux.ibm.com \
--cc=iommu@lists.linux.dev \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=mjrosato@linux.ibm.com \
--cc=schnelle@linux.ibm.com \
--cc=suravee.suthikulpanit@amd.com \
--cc=vasant.hegde@amd.com \
--cc=will@kernel.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).