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 X-Spam-Level: X-Spam-Status: No, score=-15.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F323C433E0 for ; Mon, 18 Jan 2021 13:29:32 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 319A1206B5 for ; Mon, 18 Jan 2021 13:29:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 319A1206B5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=UdzTgEPFD5Z4GE3jeuS2F4fqhe2//WJ+9puyDUb4ywE=; b=SZaG64Aqq27xGqyU+e91g4UKP tys7REoINB8H1FFB2r+iJb/JIAhWCkzHRXJHCV1F3STDHmjBjnvu4iQ5nO+mMJYOwX1xcN7H4uQa5 xQ8IsXI8MopYRGDlVbcxHw95/7o3WKu7pq9Q2pYdgyPC3hepcdIqIdQtdodVEQDbp4tU7fJMInpGc iWOkz1qDhlHdiNUjBNy5i0GAQ5l3iK5zGjjQbe9BKRrsXUKYolaQ4IHvLbhbUU10ui8kiE4ZEZuK7 5r+v2PpFuNEalo2+TXFjYSGr2yH3p82YUK1AN33B3vkoyWJxycSpj2PGNtwYb0flK1g+9g9zW8zV+ gZLwN0A5w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1UZa-0000Ak-8k; Mon, 18 Jan 2021 13:27:58 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1UZX-0000A9-TA for linux-arm-kernel@lists.infradead.org; Mon, 18 Jan 2021 13:27:56 +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 3B94ED6E; Mon, 18 Jan 2021 05:27:46 -0800 (PST) Received: from [10.57.39.58] (unknown [10.57.39.58]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 716473F719; Mon, 18 Jan 2021 05:27:44 -0800 (PST) Subject: Re: [PATCH 1/2] of: device: Allow DMA range map to be set before of_dma_configure_id To: Paul Kocialkowski References: <20210115175831.1184260-1-paul.kocialkowski@bootlin.com> From: Robin Murphy Message-ID: <5c7946f3-b56e-da00-a750-be097c7ceb32@arm.com> Date: Mon, 18 Jan 2021 13:27:44 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Thunderbird/78.6.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-GB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210118_082756_023546_FEDD10FE X-CRM114-Status: GOOD ( 33.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Jernej Skrabec , Daniel Vetter , linux-kernel@vger.kernel.org, Maxime Ripard , Chen-Yu Tsai , Rob Herring , Thomas Petazzoni , Frank Rowand , linux-arm-kernel@lists.infradead.org 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 T24gMjAyMS0wMS0xNiAxNzowNywgUGF1bCBLb2NpYWxrb3dza2kgd3JvdGU6Cj4gSGkgUm9iaW4s Cj4gCj4gTGUgU2F0IDE2IEphbiAyMSwgMTQ6NTcsIFJvYmluIE11cnBoeSBhIMOpY3JpdCA6Cj4+ IE9uIDIwMjEtMDEtMTUgMTc6NTgsIFBhdWwgS29jaWFsa293c2tpIHdyb3RlOgo+Pj4gQSBtZWNo YW5pc20gd2FzIHJlY2VudGx5IGludHJvZHVjZWQgZm9yIHRoZSBzdW54aSBhcmNoaXRlY3R1cmUg d2hlcmUKPj4+IHRoZSBETUEgb2Zmc2V0IGZvciBzcGVjaWZpYyBkZXZpY2VzICh1bmRlciB0aGUg TUJVUykgaXMgc2V0IGJ5IGEgY29tbW9uCj4+PiBkcml2ZXIgKHN1bnhpX21idXMpLiBUaGlzIGRy aXZlciBjYWxscyBkbWFfZGlyZWN0X3NldF9vZmZzZXQgdG8gc2V0Cj4+PiB0aGUgZGV2aWNlJ3Mg ZG1hX3JhbmdlX21hcCBtYW51YWxseS4KPj4+Cj4+PiBIb3dldmVyIHRoaXMgaW5mb3JtYXRpb24g d2FzIG92ZXJ3cml0dGVuIGJ5IG9mX2RtYV9jb25maWd1cmVfaWQsIHdoaWNoCj4+PiBvYnRhaW5z IHRoZSBtYXAgZnJvbSBvZl9kbWFfZ2V0X3JhbmdlIChvciBrZWVwcyBpdCBOVUxMIHdoZW4gaXQg ZmFpbHMKPj4+IGFuZCB0aGUgZm9yY2VfZG1hIGFyZ3VtZW50IGlzIHRydWUsIHdoaWNoIGlzIHRo ZSBjYXNlIGZvciBwbGF0Zm9ybQo+Pj4gZGV2aWNlcykuCj4+Pgo+Pj4gQXMgYSByZXN1bHQsIHRo ZSBkbWFfcmFuZ2VfbWFwIHdhcyBhbHdheXMgb3ZlcndyaXR0ZW4gYW5kIHRoZSBtZWNoYW5pc20K Pj4+IGNvdWxkIG5vdCBjb3JyZWN0bHkgdGFrZSBlZmZlY3QuCj4+Pgo+Pj4gVGhpcyBhZGRzIGEg Y2hlY2sgdG8gZW5zdXJlIHRoYXQgbm8gcHJldmlvdXMgRE1BIHJhbmdlIG1hcCBpcwo+Pj4gb3Zl cndyaXR0ZW4gYW5kIHByaW50cyBhIHdhcm5pbmcgd2hlbiB0aGUgbWFwIHdhcyBhbHJlYWR5IHNl dCB3aGlsZQo+Pj4gYWxzbyBiZWluZyBhdmFpbGFibGUgZnJvbSBkdC4gSW4gdGhpcyBjYXNlLCB0 aGUgbWFwIHRoYXQgd2FzIGFscmVhZHkKPj4+IHNldCBpcyBrZXB0Lgo+Pgo+PiBIYW5nIG9uLCB0 aGUgaGFyZC1jb2RlZCBvZmZzZXQgaXMgb25seSBpbnRlbmRlZCB0byBiZSBpbnN0YWxsZWQgd2hl biB0aGVyZQo+PiAqaXNuJ3QqIGFueXRoaW5nIGRlc2NyaWJlZCBpbiBEVCwgaW4gd2hpY2ggY2Fz ZSBvZl9kbWFfZ2V0X3JhbmdlKCkgc2hvdWxkCj4+IGFsd2F5cyBiYWlsIG91dCBlYXJseSB3aXRo b3V0IHRvdWNoaW5nIGl0IGFueXdheS4gVGhpcyBzb3VuZHMgbGlrZQo+PiBzb21ldGhpbmcncyBu b3QgcXVpdGUgcmlnaHQgaW4gdGhlIE1CVVMgZHJpdmVyLCBzbyBJIGRvbid0IHRoaW5rIHdvcmtp bmcKPj4gYXJvdW5kIGl0IGluIGNvcmUgY29kZSBpcyByZWFsbHkgdGhlIHJpZ2h0IHRoaW5nIHRv IGRvLgo+IAo+IFRoYXQncyByaWdodCwgdGhlcmUgaXMgbm8gcHJhY3RpY2FsIGNhc2Ugd2hlcmUg dGhlIHR3byBhcmUgaW4gY29uZmxpY3QuCj4gVGhlIHByb2JsZW0gdGhhdCBJJ20gc29sdmluZyBo ZXJlIGlzIHRoYXQgZGV2LT5kbWFfcmFuZ2VfbWFwIGlzICphbHdheXMqCj4gYXNzaWduZWQsIGV2 ZW4gd2hlbiBvZl9kbWFfZ2V0X3JhbmdlIGJhaWxlZCBhbmQgbWFwIHN0aWxsIGlzIE5VTEwuCj4g Cj4gVGhpcyBoYXMgdGhlIGVmZmVjdCBvZiBhbHdheXMgb3ZlcndyaXRpbmcgd2hhdCB0aGUgTUJV UyBkcml2ZXIgZG9lcwo+IChhbmQgbGVha2luZyBpdHMgbWVtb3J5IHRvbykuCgpPaCwgSSBzaG91 bGQgaGF2ZSBsb29rZWQgY2xvc2VyIGF0IG9mX2RtYV9jb25maWd1cmVfaWQoKSBpdHNlbGYuIEkg d2FzIAphc3N1bWluZyB0aGF0IGI0YmRjNGZiZjhkMCBoYWQgYmVlbiB0ZXN0ZWQgYW5kIGF0IGxl YXN0ICpjb3VsZCogd29yaywgCmJ1dCBhcHBhcmVudGx5IG5vdCA6LwoKSW5kZWVkIGl0IHNlZW1z IHRoZXJlIHdhcyBhIGZ1bmRhbWVudGFsIG92ZXJzaWdodCBpbiBlMGQwNzI3ODJjNzMgCigiZG1h LW1hcHBpbmc6IGludHJvZHVjZSBETUEgcmFuZ2UgbWFwLCBzdXBwbGFudGluZyBkbWFfcGZuX29m ZnNldCIpLCAKZXF1aXZhbGVudCB0byB0aGUgc2FtZSBvbmUgSSBwcmV2aW91c2x5IG1hZGUgbXlz ZWxmIHdpdGggYnVzX2RtYV9tYXNrIAphbmQgZml4ZWQgaW4gNjc3OGJlNGU1MjA5ICgib2YvZGV2 aWNlOiBSZWFsbHkgb25seSBzZXQgYnVzIERNQSBtYXNrIHdoZW4gCmFwcHJvcHJpYXRlIikuIEkg dGhpbmsgc2FtZSBzaW1wbGVyIGZpeCBpcyB0aGUgcmlnaHQgb25lIGZvciB0aGlzIGNhc2UgCnRv bywgaS5lLiBqdXN0IG1vdmUgdGhlIGFzc2lnbm1lbnQgdG8gZGV2LT5kbWFfcmFuZ2VfbWFwIHVw IHVuZGVyIHRoZSAKImlmICghcmV0KSIgY29uZGl0aW9uLiBBc3NpZ25pbmcgaXQgdGhpcyBsYXRl IC0gYWZ0ZXIgdGhlIElPTU1VIGFuZCBhcmNoIApzZXR1cCAtIGxvb2tzIHdyb25nIGFueXdheSwg ZXZlbiBpZiBpdCBpc24ndCBjdXJyZW50bHkgYW4gaXNzdWUgaW4gCnByYWN0aWNlIChpbiBwcmlu Y2lwbGUgYW4gSU9NTVUgZHJpdmVyICpjb3VsZCogc3RhcnQgdHJ5aW5nIHRvIGZpZ3VyZSAKb3V0 IHJlc2VydmVkIHJlZ2lvbnMgYXJvdW5kIERNQSB3aW5kb3dzIGZvciBhIGRldmljZSBhcyBlYXJs eSBhcyBpdHMgCi5vZl94bGF0ZSBjYWxsYmFjaywgZXZlbiB0aG91Z2ggdGhhdCdzIG5vdCB0aGUg aW50ZW50IG9mIHRoZSBBUEkgZGVzaWduKS4KCkx1Y2tpbHkgZG1hX3JhbmdlX21hcCBoYXNuJ3Qg YmVlbiBob29rZWQgdXAgaW4gdGhlIGVxdWl2YWxlbnQgQUNQSSBwYXRoIAp5ZXQsIHNvIHlvdSdy ZSBvZmYgdGhlIGhvb2sgZm9yIGZpeGluZyB0aGF0IHRvbyA6KQoKQ2hlZXJzLApSb2Jpbi4KCj4+ IERvIHlvdSBoYXZlIGEgY2FzZSB3aGVyZSBvbmUgb2YgdGhlIHJlbGV2YW50IGRldmljZXMgaW5o ZXJpdHMgYSAiZG1hLXJhbmdlcyIKPj4gdmlhIHRoZSByZWd1bGFyIGhpZXJhcmNoeSB3aXRob3V0 IGluZGlyZWN0aW5nIHZpYSBhbiAiaW50ZXJjb25uZWN0cyIKPj4gcmVmZXJlbmNlPyBDdXJyZW50 bHkgeW91J3JlIG9ubHkgY2hlY2tpbmcgZm9yIHRoZSBsYXR0ZXIsIHNvIHRoYXQgd291bGQgYmUK Pj4gb25lIHdheSB0aGluZ3MgY291bGQgZ28gYXdyeSAoYWx0aG91Z2ggdG8gYmUgYSBwcm9ibGVt LCBzYWlkICJkbWEtcmFuZ2VzIgo+PiB3b3VsZCBhbHNvIGhhdmUgdG8gZW5jb2RlIHNvbWV0aGlu ZyAqb3RoZXIqIHRoYW4gdGhlIGFwcHJvcHJpYXRlIE1CVVMKPj4gb2Zmc2V0LCB3aGljaCBpbXBs aWVzIGFuIGluY29ycmVjdCBvciBhdCBsZWFzdCBpbmFjY3VyYXRlbHktc3RydWN0dXJlZCBEVCBh cwo+PiB3ZWxsKS4KPiAKPiBObywgSSB0aGluayB0aGluZ3MgYXJlIGdvb2QgaW4gdGhhdCByZWdh cmQuIE5vIG1lc3NlZCB1cCBkdCBvciBhbnl0aGluZyBsaWtlCj4gdGhhdCA6KQo+IAo+IENoZWVy cywKPiAKPiBQYXVsCj4gCj4+IFJvYmluLgo+Pgo+Pj4gRml4ZXM6IGI0YmRjNGZiZjhkMCAoInNv Yzogc3VueGk6IERlYWwgd2l0aCB0aGUgTUJVUyBETUEgb2Zmc2V0cyBpbiBhIGNlbnRyYWwgcGxh Y2UiKQo+Pj4gU2lnbmVkLW9mZi1ieTogUGF1bCBLb2NpYWxrb3dza2kgPHBhdWwua29jaWFsa293 c2tpQGJvb3RsaW4uY29tPgo+Pj4gLS0tCj4+PiAgICBkcml2ZXJzL29mL2RldmljZS5jIHwgOSAr KysrKysrKy0KPj4+ICAgIDEgZmlsZSBjaGFuZ2VkLCA4IGluc2VydGlvbnMoKyksIDEgZGVsZXRp b24oLSkKPj4+Cj4+PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9vZi9kZXZpY2UuYyBiL2RyaXZlcnMv b2YvZGV2aWNlLmMKPj4+IGluZGV4IGFlZGZhYWFmZDNlNy4uZGIxYjg2MzRjMmM3IDEwMDY0NAo+ Pj4gLS0tIGEvZHJpdmVycy9vZi9kZXZpY2UuYwo+Pj4gKysrIGIvZHJpdmVycy9vZi9kZXZpY2Uu Ywo+Pj4gQEAgLTE4MSw3ICsxODEsMTQgQEAgaW50IG9mX2RtYV9jb25maWd1cmVfaWQoc3RydWN0 IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlX25vZGUgKm5wLAo+Pj4gICAgCWFyY2hfc2V0dXBf ZG1hX29wcyhkZXYsIGRtYV9zdGFydCwgc2l6ZSwgaW9tbXUsIGNvaGVyZW50KTsKPj4+IC0JZGV2 LT5kbWFfcmFuZ2VfbWFwID0gbWFwOwo+Pj4gKwlpZiAoIWRldi0+ZG1hX3JhbmdlX21hcCkgewo+ Pj4gKwkJZGV2LT5kbWFfcmFuZ2VfbWFwID0gbWFwOwo+Pj4gKwl9IGVsc2UgaWYgKG1hcCkgewo+ Pj4gKwkJZGV2X3dhcm4oZGV2LAo+Pj4gKwkJCSAiRE1BIHJhbmdlIG1hcCB3YXMgYWxyZWFkeSBz ZXQsIGlnbm9yaW5nIHJhbmdlIG1hcCBmcm9tIGR0XG4iKTsKPj4+ICsJCWtmcmVlKG1hcCk7Cj4+ PiArCX0KPj4+ICsKPj4+ICAgIAlyZXR1cm4gMDsKPj4+ICAgIH0KPj4+ICAgIEVYUE9SVF9TWU1C T0xfR1BMKG9mX2RtYV9jb25maWd1cmVfaWQpOwo+Pj4KPiAKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0 CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFk ZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK 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 X-Spam-Level: X-Spam-Status: No, score=-15.4 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BDC16C433DB for ; Mon, 18 Jan 2021 14:01:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 80D7C22B47 for ; Mon, 18 Jan 2021 14:01:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392128AbhARNb5 (ORCPT ); Mon, 18 Jan 2021 08:31:57 -0500 Received: from foss.arm.com ([217.140.110.172]:36062 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390314AbhARN2c (ORCPT ); Mon, 18 Jan 2021 08:28:32 -0500 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 3B94ED6E; Mon, 18 Jan 2021 05:27:46 -0800 (PST) Received: from [10.57.39.58] (unknown [10.57.39.58]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 716473F719; Mon, 18 Jan 2021 05:27:44 -0800 (PST) Subject: Re: [PATCH 1/2] of: device: Allow DMA range map to be set before of_dma_configure_id To: Paul Kocialkowski Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jernej Skrabec , Daniel Vetter , Maxime Ripard , Chen-Yu Tsai , Rob Herring , Thomas Petazzoni , Frank Rowand References: <20210115175831.1184260-1-paul.kocialkowski@bootlin.com> From: Robin Murphy Message-ID: <5c7946f3-b56e-da00-a750-be097c7ceb32@arm.com> Date: Mon, 18 Jan 2021 13:27:44 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Thunderbird/78.6.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On 2021-01-16 17:07, Paul Kocialkowski wrote: > Hi Robin, > > Le Sat 16 Jan 21, 14:57, Robin Murphy a écrit : >> On 2021-01-15 17:58, Paul Kocialkowski wrote: >>> A mechanism was recently introduced for the sunxi architecture where >>> the DMA offset for specific devices (under the MBUS) is set by a common >>> driver (sunxi_mbus). This driver calls dma_direct_set_offset to set >>> the device's dma_range_map manually. >>> >>> However this information was overwritten by of_dma_configure_id, which >>> obtains the map from of_dma_get_range (or keeps it NULL when it fails >>> and the force_dma argument is true, which is the case for platform >>> devices). >>> >>> As a result, the dma_range_map was always overwritten and the mechanism >>> could not correctly take effect. >>> >>> This adds a check to ensure that no previous DMA range map is >>> overwritten and prints a warning when the map was already set while >>> also being available from dt. In this case, the map that was already >>> set is kept. >> >> Hang on, the hard-coded offset is only intended to be installed when there >> *isn't* anything described in DT, in which case of_dma_get_range() should >> always bail out early without touching it anyway. This sounds like >> something's not quite right in the MBUS driver, so I don't think working >> around it in core code is really the right thing to do. > > That's right, there is no practical case where the two are in conflict. > The problem that I'm solving here is that dev->dma_range_map is *always* > assigned, even when of_dma_get_range bailed and map still is NULL. > > This has the effect of always overwriting what the MBUS driver does > (and leaking its memory too). Oh, I should have looked closer at of_dma_configure_id() itself. I was assuming that b4bdc4fbf8d0 had been tested and at least *could* work, but apparently not :/ Indeed it seems there was a fundamental oversight in e0d072782c73 ("dma-mapping: introduce DMA range map, supplanting dma_pfn_offset"), equivalent to the same one I previously made myself with bus_dma_mask and fixed in 6778be4e5209 ("of/device: Really only set bus DMA mask when appropriate"). I think same simpler fix is the right one for this case too, i.e. just move the assignment to dev->dma_range_map up under the "if (!ret)" condition. Assigning it this late - after the IOMMU and arch setup - looks wrong anyway, even if it isn't currently an issue in practice (in principle an IOMMU driver *could* start trying to figure out reserved regions around DMA windows for a device as early as its .of_xlate callback, even though that's not the intent of the API design). Luckily dma_range_map hasn't been hooked up in the equivalent ACPI path yet, so you're off the hook for fixing that too :) Cheers, Robin. >> Do you have a case where one of the relevant devices inherits a "dma-ranges" >> via the regular hierarchy without indirecting via an "interconnects" >> reference? Currently you're only checking for the latter, so that would be >> one way things could go awry (although to be a problem, said "dma-ranges" >> would also have to encode something *other* than the appropriate MBUS >> offset, which implies an incorrect or at least inaccurately-structured DT as >> well). > > No, I think things are good in that regard. No messed up dt or anything like > that :) > > Cheers, > > Paul > >> Robin. >> >>> Fixes: b4bdc4fbf8d0 ("soc: sunxi: Deal with the MBUS DMA offsets in a central place") >>> Signed-off-by: Paul Kocialkowski >>> --- >>> drivers/of/device.c | 9 ++++++++- >>> 1 file changed, 8 insertions(+), 1 deletion(-) >>> >>> diff --git a/drivers/of/device.c b/drivers/of/device.c >>> index aedfaaafd3e7..db1b8634c2c7 100644 >>> --- a/drivers/of/device.c >>> +++ b/drivers/of/device.c >>> @@ -181,7 +181,14 @@ int of_dma_configure_id(struct device *dev, struct device_node *np, >>> arch_setup_dma_ops(dev, dma_start, size, iommu, coherent); >>> - dev->dma_range_map = map; >>> + if (!dev->dma_range_map) { >>> + dev->dma_range_map = map; >>> + } else if (map) { >>> + dev_warn(dev, >>> + "DMA range map was already set, ignoring range map from dt\n"); >>> + kfree(map); >>> + } >>> + >>> return 0; >>> } >>> EXPORT_SYMBOL_GPL(of_dma_configure_id); >>> >