From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12798C43334 for ; Thu, 7 Jul 2022 14:59:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236264AbiGGO7q (ORCPT ); Thu, 7 Jul 2022 10:59:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235817AbiGGO7Z (ORCPT ); Thu, 7 Jul 2022 10:59:25 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 69A6159258; Thu, 7 Jul 2022 07:58:46 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 34AA71063; Thu, 7 Jul 2022 07:58:46 -0700 (PDT) Received: from [10.57.85.108] (unknown [10.57.85.108]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id EFB303F792; Thu, 7 Jul 2022 07:58:43 -0700 (PDT) Message-ID: <8ad2fec1-8a51-dc35-39bb-a05a0d837ad9@arm.com> Date: Thu, 7 Jul 2022 15:58:38 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH v3 15/15] iommu: Clean up bus_set_iommu() Content-Language: en-GB To: Matthew Rosato , 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 References: <4c25e3ad-0eb6-5c41-48b2-7c10e745bd5d@linux.ibm.com> From: Robin Murphy In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 >>> --- >>> >>> 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 > 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 > --- >  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; >  } > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3D932C433EF for ; Thu, 7 Jul 2022 15:00:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=czPLQPMnnnzuUHVWWMoBjnynqokYW9UzQLdg2fgi+10=; b=0CZnTxT5OZJO93 Kg2SffCDd5pQSL8XUEX855fbWjsJxkoUBvxO/9un5A5yGjCLiaob/CzY/rygG0Cc/yknoeBe570/I LRjyCy4tpVGzcDyBnu5NbIEITxYtAtg5VehnYgC7xP5hj9dDC8tpt2UCPK06b75r3VWaHKQqVB2UB C01fe25EJukt+Rll1hat9Ago167J9Pn/fRzoUUM8VTqgajba2gfGosAgqG3FnsAqtp9+H+QBnPtFO mjSBdYHoRMTvfR2kY7vgMALaiPuLQtHokVjsb9+3wXMxusBpKPHHYH9UNT+AczOHBAIETmMLdOgJJ Q6wk88nBSN1g+2cLAO/A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o9Sxv-00Gf5T-6D; Thu, 07 Jul 2022 14:58:51 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o9Sxr-00Gf4S-Ui for linux-arm-kernel@lists.infradead.org; Thu, 07 Jul 2022 14:58:49 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 34AA71063; Thu, 7 Jul 2022 07:58:46 -0700 (PDT) Received: from [10.57.85.108] (unknown [10.57.85.108]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id EFB303F792; Thu, 7 Jul 2022 07:58:43 -0700 (PDT) Message-ID: <8ad2fec1-8a51-dc35-39bb-a05a0d837ad9@arm.com> Date: Thu, 7 Jul 2022 15:58:38 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH v3 15/15] iommu: Clean up bus_set_iommu() Content-Language: en-GB To: Matthew Rosato , 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 References: <4c25e3ad-0eb6-5c41-48b2-7c10e745bd5d@linux.ibm.com> From: Robin Murphy In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220707_075848_073930_0CDDA60F X-CRM114-Status: GOOD ( 21.22 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: base64 Content-Type: text/plain; charset="utf-8"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org T24gMjAyMi0wNy0wNyAxMzo1NCwgTWF0dGhldyBSb3NhdG8gd3JvdGU6Cj4gT24gNy83LzIyIDg6 NDkgQU0sIE1hdHRoZXcgUm9zYXRvIHdyb3RlOgo+PiBPbiA3LzUvMjIgMTowOCBQTSwgUm9iaW4g TXVycGh5IHdyb3RlOgo+Pj4gQ2xlYW4gdXAgdGhlIHJlbWFpbmluZyB0cml2aWFsIGJ1c19zZXRf aW9tbXUoKSBjYWxsc2l0ZXMgYWxvbmcKPj4+IHdpdGggdGhlIGltcGxlbWVudGF0aW9uLiBOb3cg ZHJpdmVycyBvbmx5IGhhdmUgdG8ga25vdyBhbmQgY2FyZQo+Pj4gYWJvdXQgaW9tbXVfZGV2aWNl IGluc3RhbmNlcywgcGhldyEKPj4+Cj4+PiBTaWduZWQtb2ZmLWJ5OiBSb2JpbiBNdXJwaHkgPHJv YmluLm11cnBoeUBhcm0uY29tPgo+Pj4gLS0tCj4+Pgo+Pj4gdjM6IEFsc28gY2F0Y2ggSW50ZWwn cyBjaGVla3kgb3Blbi1jb2RlZCBhc3NpZ25tZW50Cj4+Pgo+Pgo+PiAuLi4KPj4KPj4+IGRpZmYg LS1naXQgYS9kcml2ZXJzL2lvbW11L3MzOTAtaW9tbXUuYyBiL2RyaXZlcnMvaW9tbXUvczM5MC1p b21tdS5jCj4+PiBpbmRleCBjODk4YmNiYmNlMTEuLmRkOTU3MTQ1ZmI4MSAxMDA2NDQKPj4+IC0t LSBhL2RyaXZlcnMvaW9tbXUvczM5MC1pb21tdS5jCj4+PiArKysgYi9kcml2ZXJzL2lvbW11L3Mz OTAtaW9tbXUuYwo+Pj4gQEAgLTM4NSw5ICszODUsMyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGlv bW11X29wcyBzMzkwX2lvbW11X29wcyA9IHsKPj4+IMKgwqDCoMKgwqDCoMKgwqDCoCAuZnJlZcKg wqDCoMKgwqDCoMKgID0gczM5MF9kb21haW5fZnJlZSwKPj4+IMKgwqDCoMKgwqAgfQo+Pj4gwqAg fTsKPj4+IC0KPj4+IC1zdGF0aWMgaW50IF9faW5pdCBzMzkwX2lvbW11X2luaXQodm9pZCkKPj4+ IC17Cj4+PiAtwqDCoMKgIHJldHVybiBidXNfc2V0X2lvbW11KCZwY2lfYnVzX3R5cGUsICZzMzkw X2lvbW11X29wcyk7Cj4+PiAtfQo+Pj4gLXN1YnN5c19pbml0Y2FsbChzMzkwX2lvbW11X2luaXQp Owo+Pgo+PiBQcmV2aW91c2x5IHMzOTBfaW9tbXVfb3BzIHdhcyBvbmx5IGJlaW5nIHNldCBmb3Ig cGNpX2J1c190eXBlLCBidXQgCj4+IHdpdGggdGhpcyBzZXJpZXMgaXQgd2lsbCBub3cgYWxzbyBi ZSBzZXQgZm9yIHBsYXRmb3JtX2J1c190eXBlLgoKQWgsIGluZGVlZCBJIGhhZG4ndCBnb3QgYXMg ZmFyIGFzIGZ1bGx5IGFwcHJlY2lhdGluZyB0aGF0IHRvX3pwY2lfZGV2KCkgCmlzbid0IHJvYnVz dCBlbm91Z2ggb24gaXRzIG93bi4gVGhhbmtzIGZvciB0aGUgcGF0Y2gsIEkndmUgcHVsbGVkIGl0 IGluIAphbmQgd2lsbCBpbmNsdWRlIGl0IGluIHY0LiBEbyBJIHRha2UgaXQgdGhhdCBhbGwgZWxz ZSB3b3JrcyBPSyB3aXRoIHRoaXMgCmZpeGVkPwoKQ2hlZXJzLApSb2Jpbi4KCj4+Cj4+IFRvIHRv bGVyYXRlIHRoYXQsIHRoaXMgc2VyaWVzIG5lZWRzIGEgY2hhbmdlIGFsb25nIHRoZSBsaW5lcyBv ZjoKPj4KPiAKPiAuLi7CoCBTb3JyeSwgbGV0J3MgdHJ5IHRoYXQgYWdhaW4gd2l0aG91dCBhIG1h bmdsZWQgZGlmZjoKPiAKPiBGcm9tOiBNYXR0aGV3IFJvc2F0byA8bWpyb3NhdG9AbGludXguaWJt LmNvbT4KPiBEYXRlOiBUaHUsIDcgSnVsIDIwMjIgMDg6NDU6NDQgLTA0MDAKPiBTdWJqZWN0OiBb UEFUQ0hdIGlvbW11L3MzOTA6IGZhaWwgcHJvYmUgZm9yIG5vbi1wY2kgZGV2aWNlCj4gCj4gCj4g czM5MC1pb21tdSBvbmx5IHN1cHBvcnRzIHBjaV9idXNfdHlwZSB0b2RheQo+IAo+IAo+IFNpZ25l ZC1vZmYtYnk6IE1hdHRoZXcgUm9zYXRvIDxtanJvc2F0b0BsaW51eC5pYm0uY29tPgo+IC0tLQo+ ICDCoGRyaXZlcnMvaW9tbXUvczM5MC1pb21tdS5jIHwgNyArKysrKystCj4gIMKgMSBmaWxlIGNo YW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQo+IAo+IAo+IGRpZmYgLS1naXQg YS9kcml2ZXJzL2lvbW11L3MzOTAtaW9tbXUuYyBiL2RyaXZlcnMvaW9tbXUvczM5MC1pb21tdS5j Cj4gaW5kZXggZGQ5NTcxNDVmYjgxLi43NjJmODkyYjRlYzMgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVy cy9pb21tdS9zMzkwLWlvbW11LmMKPiArKysgYi9kcml2ZXJzL2lvbW11L3MzOTAtaW9tbXUuYwo+ IEBAIC0xODUsNyArMTg1LDEyIEBAIHN0YXRpYyB2b2lkIHMzOTBfaW9tbXVfZGV0YWNoX2Rldmlj ZShzdHJ1Y3QgCj4gaW9tbXVfZG9tYWluICpkb21haW4sCj4gCj4gCj4gIMKgc3RhdGljIHN0cnVj dCBpb21tdV9kZXZpY2UgKnMzOTBfaW9tbXVfcHJvYmVfZGV2aWNlKHN0cnVjdCBkZXZpY2UgKmRl dikKPiAgwqB7Cj4gLcKgwqDCoMKgwqDCoCBzdHJ1Y3QgenBjaV9kZXYgKnpkZXYgPSB0b196cGNp X2RldihkZXYpOwo+ICvCoMKgwqDCoMKgwqAgc3RydWN0IHpwY2lfZGV2ICp6ZGV2Owo+ICsKPiAr wqDCoMKgwqDCoMKgIGlmICghZGV2X2lzX3BjaShkZXYpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgIHJldHVybiBFUlJfUFRSKC1FTk9ERVYpOwo+ICsKPiArwqDCoMKgwqDCoMKgIHpk ZXYgPSB0b196cGNpX2RldihkZXYpOwo+IAo+IAo+ICDCoMKgwqDCoMKgwqDCoCByZXR1cm4gJnpk ZXYtPmlvbW11X2RldjsKPiAgwqB9Cj4gCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0t a2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFp bG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==