From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robin Murphy Subject: Re: [PATCH v4 1/2] ARM: dma-mapping: Set proper DMA ops in arm_iommu_detach_device() Date: Thu, 31 May 2018 18:52:48 +0100 Message-ID: References: <20180530140625.21247-1-thierry.reding@gmail.com> <20180530140625.21247-2-thierry.reding@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180530140625.21247-2-thierry.reding@gmail.com> Content-Language: en-GB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Thierry Reding , Ben Skeggs , Christoph Hellwig , Russell King Cc: nouveau@lists.freedesktop.org, iommu@lists.linux-foundation.org, dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org, linux-arm-kernel@lists.infradead.org List-Id: iommu@lists.linux-foundation.org T24gMzAvMDUvMTggMTU6MDYsIFRoaWVycnkgUmVkaW5nIHdyb3RlOgo+IEZyb206IFRoaWVycnkg UmVkaW5nIDx0cmVkaW5nQG52aWRpYS5jb20+Cj4gCj4gSW5zdGVhZCBvZiBzZXR0aW5nIHRoZSBE TUEgb3BzIHBvaW50ZXIgdG8gTlVMTCwgc2V0IHRoZSBjb3JyZWN0LAo+IG5vbi1JT01NVSBvcHMg ZGVwZW5kaW5nIG9uIHRoZSBkZXZpY2UncyBjb2hlcmVuY3kgc2V0dGluZy4KCkl0IGxvb2tzIGxp a2UgaXQncyBwcm9iYWJseSBiZWVuIDQgb3IgNSB5ZWFycyBzaW5jZSB0aGF0IGJlY2FtZSBzdWJ0 bHkgCndyb25nIGJ5IHZpcnR1ZSBvZiB0aGUgbGFuZHNjYXBlIGNoYW5naW5nIGFyb3VuZCBpdCwg YnV0IGl0J3MgY2xlYXJseSAKbm90IGVub3VnaCBvZiBhIHByb2JsZW0gdG8gY29uc2lkZXIgc3Rh YmxlIGJhY2twb3J0cyA6KQoKUmV2aWV3ZWQtYnk6IFJvYmluIE11cnBoeSA8cm9iaW4ubXVycGh5 QGFybS5jb20+Cgo+IFNpZ25lZC1vZmYtYnk6IFRoaWVycnkgUmVkaW5nIDx0cmVkaW5nQG52aWRp YS5jb20+Cj4gLS0tCj4gQ2hhbmdlcyBpbiB2NDoKPiAtIG5ldyBwYXRjaCB0byBmaXggZXhpc3Rp bmcgYXJtX2lvbW11X2RldGFjaF9kZXZpY2UoKSB0byBkbyB3aGF0IHdlIG5lZWQKPiAKPiAgIGFy Y2gvYXJtL21tL2RtYS1tYXBwaW5nLmMgfCAxMiArKysrKystLS0tLS0KPiAgIDEgZmlsZSBjaGFu Z2VkLCA2IGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2Fy Y2gvYXJtL21tL2RtYS1tYXBwaW5nLmMgYi9hcmNoL2FybS9tbS9kbWEtbWFwcGluZy5jCj4gaW5k ZXggYWYyN2YxYzIyZDkzLi44N2EwMDM3NTc0ZTQgMTAwNjQ0Cj4gLS0tIGEvYXJjaC9hcm0vbW0v ZG1hLW1hcHBpbmcuYwo+ICsrKyBiL2FyY2gvYXJtL21tL2RtYS1tYXBwaW5nLmMKPiBAQCAtMTE1 MSw2ICsxMTUxLDExIEBAIGludCBhcm1fZG1hX3N1cHBvcnRlZChzdHJ1Y3QgZGV2aWNlICpkZXYs IHU2NCBtYXNrKQo+ICAgCXJldHVybiBfX2RtYV9zdXBwb3J0ZWQoZGV2LCBtYXNrLCBmYWxzZSk7 Cj4gICB9Cj4gICAKPiArc3RhdGljIGNvbnN0IHN0cnVjdCBkbWFfbWFwX29wcyAqYXJtX2dldF9k bWFfbWFwX29wcyhib29sIGNvaGVyZW50KQo+ICt7Cj4gKwlyZXR1cm4gY29oZXJlbnQgPyAmYXJt X2NvaGVyZW50X2RtYV9vcHMgOiAmYXJtX2RtYV9vcHM7Cj4gK30KPiArCj4gICAjaWZkZWYgQ09O RklHX0FSTV9ETUFfVVNFX0lPTU1VCj4gICAKPiAgIHN0YXRpYyBpbnQgX19kbWFfaW5mb190b19w cm90KGVudW0gZG1hX2RhdGFfZGlyZWN0aW9uIGRpciwgdW5zaWduZWQgbG9uZyBhdHRycykKPiBA QCAtMjI5Niw3ICsyMzAxLDcgQEAgdm9pZCBhcm1faW9tbXVfZGV0YWNoX2RldmljZShzdHJ1Y3Qg ZGV2aWNlICpkZXYpCj4gICAJaW9tbXVfZGV0YWNoX2RldmljZShtYXBwaW5nLT5kb21haW4sIGRl dik7Cj4gICAJa3JlZl9wdXQoJm1hcHBpbmctPmtyZWYsIHJlbGVhc2VfaW9tbXVfbWFwcGluZyk7 Cj4gICAJdG9fZG1hX2lvbW11X21hcHBpbmcoZGV2KSA9IE5VTEw7Cj4gLQlzZXRfZG1hX29wcyhk ZXYsIE5VTEwpOwo+ICsJc2V0X2RtYV9vcHMoZGV2LCBhcm1fZ2V0X2RtYV9tYXBfb3BzKGRldi0+ YXJjaGRhdGEuZG1hX2NvaGVyZW50KSk7Cj4gICAKPiAgIAlwcl9kZWJ1ZygiRGV0YWNoZWQgSU9N TVUgY29udHJvbGxlciBmcm9tICVzIGRldmljZS5cbiIsIGRldl9uYW1lKGRldikpOwo+ICAgfQo+ IEBAIC0yMzU3LDExICsyMzYyLDYgQEAgc3RhdGljIHZvaWQgYXJtX3RlYXJkb3duX2lvbW11X2Rt YV9vcHMoc3RydWN0IGRldmljZSAqZGV2KSB7IH0KPiAgIAo+ICAgI2VuZGlmCS8qIENPTkZJR19B Uk1fRE1BX1VTRV9JT01NVSAqLwo+ICAgCj4gLXN0YXRpYyBjb25zdCBzdHJ1Y3QgZG1hX21hcF9v cHMgKmFybV9nZXRfZG1hX21hcF9vcHMoYm9vbCBjb2hlcmVudCkKPiAtewo+IC0JcmV0dXJuIGNv aGVyZW50ID8gJmFybV9jb2hlcmVudF9kbWFfb3BzIDogJmFybV9kbWFfb3BzOwo+IC19Cj4gLQo+ ICAgdm9pZCBhcmNoX3NldHVwX2RtYV9vcHMoc3RydWN0IGRldmljZSAqZGV2LCB1NjQgZG1hX2Jh c2UsIHU2NCBzaXplLAo+ICAgCQkJY29uc3Qgc3RydWN0IGlvbW11X29wcyAqaW9tbXUsIGJvb2wg Y29oZXJlbnQpCj4gICB7Cj4gCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ry aS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: robin.murphy@arm.com (Robin Murphy) Date: Thu, 31 May 2018 18:52:48 +0100 Subject: [PATCH v4 1/2] ARM: dma-mapping: Set proper DMA ops in arm_iommu_detach_device() In-Reply-To: <20180530140625.21247-2-thierry.reding@gmail.com> References: <20180530140625.21247-1-thierry.reding@gmail.com> <20180530140625.21247-2-thierry.reding@gmail.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 30/05/18 15:06, Thierry Reding wrote: > From: Thierry Reding > > Instead of setting the DMA ops pointer to NULL, set the correct, > non-IOMMU ops depending on the device's coherency setting. It looks like it's probably been 4 or 5 years since that became subtly wrong by virtue of the landscape changing around it, but it's clearly not enough of a problem to consider stable backports :) Reviewed-by: Robin Murphy > Signed-off-by: Thierry Reding > --- > Changes in v4: > - new patch to fix existing arm_iommu_detach_device() to do what we need > > arch/arm/mm/dma-mapping.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c > index af27f1c22d93..87a0037574e4 100644 > --- a/arch/arm/mm/dma-mapping.c > +++ b/arch/arm/mm/dma-mapping.c > @@ -1151,6 +1151,11 @@ int arm_dma_supported(struct device *dev, u64 mask) > return __dma_supported(dev, mask, false); > } > > +static const struct dma_map_ops *arm_get_dma_map_ops(bool coherent) > +{ > + return coherent ? &arm_coherent_dma_ops : &arm_dma_ops; > +} > + > #ifdef CONFIG_ARM_DMA_USE_IOMMU > > static int __dma_info_to_prot(enum dma_data_direction dir, unsigned long attrs) > @@ -2296,7 +2301,7 @@ void arm_iommu_detach_device(struct device *dev) > iommu_detach_device(mapping->domain, dev); > kref_put(&mapping->kref, release_iommu_mapping); > to_dma_iommu_mapping(dev) = NULL; > - set_dma_ops(dev, NULL); > + set_dma_ops(dev, arm_get_dma_map_ops(dev->archdata.dma_coherent)); > > pr_debug("Detached IOMMU controller from %s device.\n", dev_name(dev)); > } > @@ -2357,11 +2362,6 @@ static void arm_teardown_iommu_dma_ops(struct device *dev) { } > > #endif /* CONFIG_ARM_DMA_USE_IOMMU */ > > -static const struct dma_map_ops *arm_get_dma_map_ops(bool coherent) > -{ > - return coherent ? &arm_coherent_dma_ops : &arm_dma_ops; > -} > - > void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, > const struct iommu_ops *iommu, bool coherent) > { >