From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [4/7] dmaengine: sprd: Add device validation to support multiple controllers From: Vinod Koul Message-Id: <20190430082954.GQ3845@vkoul-mobl.Dlink> Date: Tue, 30 Apr 2019 13:59:54 +0530 To: Baolin Wang Cc: Dan Williams , eric.long@unisoc.com, Orson Zhai , Chunyan Zhang , Mark Brown , dmaengine@vger.kernel.org, LKML List-ID: T24gMzAtMDQtMTksIDEzOjMwLCBCYW9saW4gV2FuZyB3cm90ZToKPiBPbiBNb24sIDI5IEFwciAy MDE5IGF0IDIyOjA1LCBWaW5vZCBLb3VsIDx2a291bEBrZXJuZWwub3JnPiB3cm90ZToKPiA+Cj4g PiBPbiAyOS0wNC0xOSwgMjA6MjAsIEJhb2xpbiBXYW5nIHdyb3RlOgo+ID4gPiBPbiBNb24sIDI5 IEFwciAyMDE5IGF0IDE5OjU3LCBWaW5vZCBLb3VsIDx2a291bEBrZXJuZWwub3JnPiB3cm90ZToK PiA+ID4gPgo+ID4gPiA+IE9uIDE1LTA0LTE5LCAyMDoxNCwgQmFvbGluIFdhbmcgd3JvdGU6Cj4g PiA+ID4gPiBGcm9tOiBFcmljIExvbmcgPGVyaWMubG9uZ0B1bmlzb2MuY29tPgo+ID4gPiA+ID4K PiA+ID4gPiA+IFNpbmNlIHdlIGNhbiBzdXBwb3J0IG11bHRpcGxlIERNQSBlbmdpbmUgY29udHJv bGxlcnMsIHdlIHNob3VsZCBhZGQKPiA+ID4gPiA+IGRldmljZSB2YWxpZGF0aW9uIGluIGZpbHRl ciBmdW5jdGlvbiB0byBjaGVjayBpZiB0aGUgY29ycmVjdCBjb250cm9sbGVyCj4gPiA+ID4gPiB0 byBiZSByZXF1ZXN0ZWQuCj4gPiA+ID4gPgo+ID4gPiA+ID4gU2lnbmVkLW9mZi1ieTogRXJpYyBM b25nIDxlcmljLmxvbmdAdW5pc29jLmNvbT4KPiA+ID4gPiA+IFNpZ25lZC1vZmYtYnk6IEJhb2xp biBXYW5nIDxiYW9saW4ud2FuZ0BsaW5hcm8ub3JnPgo+ID4gPiA+ID4gLS0tCj4gPiA+ID4gPiAg ZHJpdmVycy9kbWEvc3ByZC1kbWEuYyB8ICAgIDUgKysrKysKPiA+ID4gPiA+ICAxIGZpbGUgY2hh bmdlZCwgNSBpbnNlcnRpb25zKCspCj4gPiA+ID4gPgo+ID4gPiA+ID4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZG1hL3NwcmQtZG1hLmMgYi9kcml2ZXJzL2RtYS9zcHJkLWRtYS5jCj4gPiA+ID4gPiBp bmRleCAwZjkyZTYwLi45Zjk5ZDRiIDEwMDY0NAo+ID4gPiA+ID4gLS0tIGEvZHJpdmVycy9kbWEv c3ByZC1kbWEuYwo+ID4gPiA+ID4gKysrIGIvZHJpdmVycy9kbWEvc3ByZC1kbWEuYwo+ID4gPiA+ ID4gQEAgLTEwMjAsOCArMTAyMCwxMyBAQCBzdGF0aWMgdm9pZCBzcHJkX2RtYV9mcmVlX2Rlc2Mo c3RydWN0IHZpcnRfZG1hX2Rlc2MgKnZkKQo+ID4gPiA+ID4gIHN0YXRpYyBib29sIHNwcmRfZG1h X2ZpbHRlcl9mbihzdHJ1Y3QgZG1hX2NoYW4gKmNoYW4sIHZvaWQgKnBhcmFtKQo+ID4gPiA+ID4g IHsKPiA+ID4gPiA+ICAgICAgIHN0cnVjdCBzcHJkX2RtYV9jaG4gKnNjaGFuID0gdG9fc3ByZF9k bWFfY2hhbihjaGFuKTsKPiA+ID4gPiA+ICsgICAgIHN0cnVjdCBvZl9waGFuZGxlX2FyZ3MgKmRt YV9zcGVjID0KPiA+ID4gPiA+ICsgICAgICAgICAgICAgY29udGFpbmVyX29mKHBhcmFtLCBzdHJ1 Y3Qgb2ZfcGhhbmRsZV9hcmdzLCBhcmdzWzBdKTsKPiA+ID4gPiA+ICAgICAgIHUzMiBzbGF2ZV9p ZCA9ICoodTMyICopcGFyYW07Cj4gPiA+ID4gPgo+ID4gPiA+ID4gKyAgICAgaWYgKGNoYW4tPmRl dmljZS0+ZGV2LT5vZl9ub2RlICE9IGRtYV9zcGVjLT5ucCkKPiA+ID4gPgo+ID4gPiA+IEFyZSB5 b3Ugbm90IHVzaW5nIG9mX2RtYV9maW5kX2NvbnRyb2xsZXIoKSB0aGF0IGRvZXMgdGhpcywgc28g dGhpcyB3b3VsZAo+ID4gPiA+IGJlIHVzZWxlc3MhCj4gPiA+Cj4gPiA+IFllcywgd2UgY2FuIHVz ZSBvZl9kbWFfZmluZF9jb250cm9sbGVyKCksIGJ1dCB0aGF0IHdpbGwgYmUgYSBsaXR0bGUKPiA+ ID4gY29tcGxpY2F0ZWQgdGhhbiBjdXJyZW50IHNvbHV0aW9uLiBTaW5jZSB3ZSBuZWVkIGludHJv ZHVjZSBvbmUKPiA+ID4gc3RydWN0dXJlIHRvIHNhdmUgdGhlIG5vZGUgdG8gdmFsaWRhdGUgaW4g dGhlIGZpbHRlciBmdW5jdGlvbiBsaWtlCj4gPiA+IGJlbG93LCB3aGljaCBzZWVtcyBtYWtlIHRo aW5ncyBjb21wbGljYXRlZC4gQnV0IGlmIHlvdSBzdGlsbCBsaWtlIHRvCj4gPiA+IHVzZSBvZl9k bWFfZmluZF9jb250cm9sbGVyKCksIEkgY2FuIGNoYW5nZSB0byB1c2UgaXQgaW4gbmV4dCB2ZXJz aW9uLgo+ID4KPiA+IFNvcnJ5IEkgc2hvdWxkIGhhdmUgY2xhcmlmaWVkIG1vcmUuLgo+ID4KPiA+ IG9mX2RtYV9maW5kX2NvbnRyb2xsZXIoKSBpcyBjYWxsZWQgYnkgeGxhdGUsIHNvIHlvdSBhbHJl YWR5IHJ1biB0aGlzCj4gPiBjaGVjaywgc28gd2h5IHVzZSB0aGlzIDopCj4gCj4gVGhlIG9mX2Rt YV9maW5kX2NvbnRyb2xsZXIoKSBjYW4gc2F2ZSB0aGUgcmVxdWVzdGVkIGRldmljZSBub2RlIGlu dG8KPiBkbWFfc3BlYywgYW5kIGluIHRoZSBvZl9kbWFfc2ltcGxlX3hsYXRlKCkgZnVuY3Rpb24s IGl0IHdpbGwgY2FsbAo+IGRtYV9yZXF1ZXN0X2NoYW5uZWwoKSB0byByZXF1ZXN0IG9uZSBjaGFu bmVsLCBidXQgaXQgZGlkIG5vdCB2YWxpZGF0ZQo+IHRoZSBkZXZpY2Ugbm9kZSB0byBmaW5kIHRo ZSBjb3JyZXNwb25kaW5nIGRtYSBkZXZpY2UgaW4KPiBkbWFfcmVxdWVzdF9jaGFubmVsKCkuIFNv IHdlIHNob3VsZCBpbiBvdXIgZmlsdGVyIGZ1bmN0aW9uIHRvIHZhbGlkYXRlCj4gdGhlIGRldmlj ZSBub2RlIHdpdGggdGhlIGRldmljZSBub2RlIHNwZWNpZmllZCBieSB0aGUgZG1hX3NwZWMuIEhv cGUgSQo+IG1ha2UgdGhpbmdzIGNsZWFyLgoKQnV0IGRtYV9yZXF1ZXN0X2NoYW5uZWwoKSBjYWxs cyBvZl9kbWFfcmVxdWVzdF9zbGF2ZV9jaGFubmVsKCkgd2hpY2gKaW52b2tlcyBvZl9kbWFfZmlu ZF9jb250cm9sbGVyKCkgd2h5IGlzIGl0IGJyb2tlbiBmb3IgeW91IGlmIHRoYXQgaXMgdGhlCmNh c2UuLgo= 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=-8.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_MUTT 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 534AFC43219 for ; Tue, 30 Apr 2019 08:30:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 22B27216FD for ; Tue, 30 Apr 2019 08:30:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556613005; bh=L44o5mnTaulGd8/A/x404M3tsCXjrGsZL4cOq+2J79A=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=mmkLz1Pph49VAKC7Qmc9MlHlOIHCm/B9EDKxbDpVul7LOn1Hr1sgGxKRNXHvCvnI0 a9wWgkaL1httm3gMEOivohKe532iZy0SspnL7KR8+WRK66z9uFN1rwJTHAXll51oH9 OigAq2ZtkjxfV1BYpVPfe5vXnzkBqEDGzOdkF/yU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726012AbfD3IaE (ORCPT ); Tue, 30 Apr 2019 04:30:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:53528 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725769AbfD3IaE (ORCPT ); Tue, 30 Apr 2019 04:30:04 -0400 Received: from localhost (unknown [171.76.113.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DA0212080C; Tue, 30 Apr 2019 08:30:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556613003; bh=L44o5mnTaulGd8/A/x404M3tsCXjrGsZL4cOq+2J79A=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=a19ABJwBx7uM7bDncmxkYDjL+4cW9Ip/BQrprS8FSfQXXRboeP3bVIE7U/mJ7wvQH LSOn92WOL65zOTtCmoez8V+TLqEfF7jttCeJsLxHHQ4H94Vy5XrzNSf5NV4yuwfyAA bcyUr4NhvaYKPTR0QXQWeLm61SIpN7FfUmFvhlw4= Date: Tue, 30 Apr 2019 13:59:54 +0530 From: Vinod Koul To: Baolin Wang Cc: Dan Williams , eric.long@unisoc.com, Orson Zhai , Chunyan Zhang , Mark Brown , dmaengine@vger.kernel.org, LKML Subject: Re: [PATCH 4/7] dmaengine: sprd: Add device validation to support multiple controllers Message-ID: <20190430082954.GQ3845@vkoul-mobl.Dlink> References: <20190429115723.GK3845@vkoul-mobl.Dlink> <20190429140537.GN3845@vkoul-mobl.Dlink> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.3 (2019-02-01) Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org Message-ID: <20190430082954.bUKybPmseJWGz6yYHdywFyjnpyDIlYLgNLkiW1LlbzI@z> On 30-04-19, 13:30, Baolin Wang wrote: > On Mon, 29 Apr 2019 at 22:05, Vinod Koul wrote: > > > > On 29-04-19, 20:20, Baolin Wang wrote: > > > On Mon, 29 Apr 2019 at 19:57, Vinod Koul wrote: > > > > > > > > On 15-04-19, 20:14, Baolin Wang wrote: > > > > > From: Eric Long > > > > > > > > > > Since we can support multiple DMA engine controllers, we should add > > > > > device validation in filter function to check if the correct controller > > > > > to be requested. > > > > > > > > > > Signed-off-by: Eric Long > > > > > Signed-off-by: Baolin Wang > > > > > --- > > > > > drivers/dma/sprd-dma.c | 5 +++++ > > > > > 1 file changed, 5 insertions(+) > > > > > > > > > > diff --git a/drivers/dma/sprd-dma.c b/drivers/dma/sprd-dma.c > > > > > index 0f92e60..9f99d4b 100644 > > > > > --- a/drivers/dma/sprd-dma.c > > > > > +++ b/drivers/dma/sprd-dma.c > > > > > @@ -1020,8 +1020,13 @@ static void sprd_dma_free_desc(struct virt_dma_desc *vd) > > > > > static bool sprd_dma_filter_fn(struct dma_chan *chan, void *param) > > > > > { > > > > > struct sprd_dma_chn *schan = to_sprd_dma_chan(chan); > > > > > + struct of_phandle_args *dma_spec = > > > > > + container_of(param, struct of_phandle_args, args[0]); > > > > > u32 slave_id = *(u32 *)param; > > > > > > > > > > + if (chan->device->dev->of_node != dma_spec->np) > > > > > > > > Are you not using of_dma_find_controller() that does this, so this would > > > > be useless! > > > > > > Yes, we can use of_dma_find_controller(), but that will be a little > > > complicated than current solution. Since we need introduce one > > > structure to save the node to validate in the filter function like > > > below, which seems make things complicated. But if you still like to > > > use of_dma_find_controller(), I can change to use it in next version. > > > > Sorry I should have clarified more.. > > > > of_dma_find_controller() is called by xlate, so you already run this > > check, so why use this :) > > The of_dma_find_controller() can save the requested device node into > dma_spec, and in the of_dma_simple_xlate() function, it will call > dma_request_channel() to request one channel, but it did not validate > the device node to find the corresponding dma device in > dma_request_channel(). So we should in our filter function to validate > the device node with the device node specified by the dma_spec. Hope I > make things clear. But dma_request_channel() calls of_dma_request_slave_channel() which invokes of_dma_find_controller() why is it broken for you if that is the case.. -- ~Vinod