From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Shevchenko, Andriy" Subject: Re: [PATCH V3] dma: add channel request API that supports deferred probe Date: Tue, 26 Nov 2013 13:59:53 +0000 Message-ID: <1385474368.1871.6.camel@smile> References: <1385416039-3170-1-git-send-email-swarren@wwwdotorg.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1385416039-3170-1-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> Content-Language: en-US Content-ID: <7195894634AE7949872C15B48B4A82E1-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> Sender: linux-tegra-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Stephen Warren Cc: "Williams, Dan J" , "Koul, Vinod" , "treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org" , "pdeschrijver-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org" , "linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" , "dmaengine-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" List-Id: linux-tegra@vger.kernel.org T24gTW9uLCAyMDEzLTExLTI1IGF0IDE0OjQ3IC0wNzAwLCBTdGVwaGVuIFdhcnJlbiB3cm90ZToN Cj4gRnJvbTogU3RlcGhlbiBXYXJyZW4gPHN3YXJyZW5AbnZpZGlhLmNvbT4NCj4gDQo+IGRtYV9y ZXF1ZXN0X3NsYXZlX2NoYW5uZWwoKSBzaW1wbHkgcmV0dXJucyBOVUxMIHdoZW5ldmVyIERNQSBj aGFubmVsDQo+IGxvb2t1cCBmYWlscy4gTG9va3VwIGNvdWxkIGZhaWwgZm9yIHR3byBkaXN0aW5j dCByZWFzb25zOg0KPiANCj4gYSkgTm8gRE1BIHNwZWNpZmljYXRpb24gZXhpc3RzIGZvciB0aGUg Y2hhbm5lbCBuYW1lLg0KPiAgICBUaGlzIGluY2x1ZGVzIHNpdHVhdGlvbnMgd2hlcmUgbm8gRE1B IHNwZWNpZmljYXRpb25zIGV4aXN0IGF0IGFsbCwgb3INCj4gICAgb3RoZXIgZ2VuZXJhbCBsb29r dXAgcHJvYmxlbXMuDQo+IA0KPiBiKSBBIERNQSBzcGVjaWZpY2F0aW9uIGRvZXMgZXhpc3QsIHll dCB0aGUgZHJpdmVyIGZvciB0aGF0IGNoYW5uZWwgaXMgbm90DQo+ICAgIHlldCByZWdpc3RlcmVk Lg0KPiANCj4gQ2FzZSAoYikgc2hvdWxkIHRyaWdnZXIgZGVmZXJyZWQgcHJvYmUgaW4gY2xpZW50 IGRyaXZlcnMuIEhvd2V2ZXIsIHNpbmNlDQo+IHRoZXkgaGF2ZSBubyB3YXkgdG8gZGlmZmVyZW50 aWF0ZSB0aGUgdHdvIHNpdHVhdGlvbnMsIGl0IGNhbm5vdC4NCj4gDQo+IEltcGxlbWVudCBuZXcg ZnVuY3Rpb24gZG1hX3JlcXVlc3Rfc2xhdmVfY2hhbm5lbF9vcl9lcnIoKSwgd2hpY2ggcGVyZm9y bXMNCj4gaWRlbnRpY2FsbHkgdG8gZG1hX3JlcXVlc3Rfc2xhdmVfY2hhbm5lbCgpLCBleGNlcHQg dGhhdCBpdCByZXR1cm5zIGFuDQo+IGVycm9yLXBvaW50ZXIgcmF0aGVyIHRoYW4gTlVMTCwgd2hp Y2ggYWxsb3dzIGNhbGxlcnMgdG8gZGV0ZWN0IHdoZW4NCj4gZGVmZXJyZWQgcHJvYmUgc2hvdWxk IG9jY3VyLg0KPiANCj4gRXZlbnR1YWxseSwgYWxsIGRyaXZlcnMgc2hvdWxkIGJlIGNvbnZlcnRl ZCB0byB0aGlzIG5ldyBBUEksIHRoZSBvbGQgQVBJDQo+IHJlbW92ZWQsIGFuZCB0aGUgbmV3IEFQ SSByZW5hbWVkIHRvIHRoZSBtb3JlIGRlc2lyYWJsZSBuYW1lLiBUaGlzIHBhdGNoDQo+IGRvZXNu J3QgY29udmVydCB0aGUgZXhpc3RpbmcgQVBJIGFuZCBhbGwgZHJpdmVycyBpbiBvbmUgZ28sIHNp bmNlIHNvbWUNCj4gZHJpdmVycyBjYWxsIGRtYV9yZXF1ZXN0X3NsYXZlX2NoYW5uZWwoKSB0aGVu IGRtYV9yZXF1ZXN0X2NoYW5uZWwoKSBpZg0KPiB0aGF0IGZhaWxzLiBUaGF0IHdvdWxkIHJlcXVp cmUgZWl0aGVyIG1vZGlmeWluZyBkbWFfcmVxdWVzdF9jaGFubmVsKCkgaW4NCj4gdGhlIHNhbWUg d2F5LCBvciBhZGRpbmcgZXh0cmEgZXJyb3ItaGFuZGxpbmcgY29kZSB0byBhbGwgYWZmZWN0ZWQN Cj4gZHJpdmVycywgYW5kIHRoZXJlIGFyZSBjbG9zZSB0byAxMDAgZHJpdmVycyB1c2luZyB0aGUg b3RoZXIgQVBJLCByYXRoZXINCj4gdGhhbiBqdXN0IHRoZSAxNS0yMCBvciBzbyB0aGF0IHVzZSBk bWFfcmVxdWVzdF9zbGF2ZV9jaGFubmVsKCksIHdoaWNoDQo+IG1pZ2h0IGJlIHRlbmFibGUgaW4g YSBzaW5nbGUgcGF0Y2guDQo+IA0KPiBhY3BpX2RtYV9yZXF1ZXN0X3NsYXZlX2NoYW5fYnlfbmFt ZSgpIGRvZXNuJ3QgY3VycmVudGx5IGltcGxlbWVudA0KPiBkZWZlcnJlZCBwcm9iZS4gSXQgc2hv dWxkLCBidXQgdGhpcyB3aWxsIGJlIGFkZHJlc3NlZCBsYXRlci4NCg0KQ291cGxlIG9mIGNvbW1l bnRzIGJlbG93Lg0KDQpbXQ0KDQo+IC0tLSBhL2RyaXZlcnMvZG1hL29mLWRtYS5jDQo+ICsrKyBi L2RyaXZlcnMvZG1hL29mLWRtYS5jDQoNCltdDQoNCj4gQEAgLTE1MiwxNyArMTUyLDE4IEBAIHN0 cnVjdCBkbWFfY2hhbiAqb2ZfZG1hX3JlcXVlc3Rfc2xhdmVfY2hhbm5lbChzdHJ1Y3QgZGV2aWNl X25vZGUgKm5wLA0KPiAgCXN0cnVjdCBvZl9kbWEJCSpvZmRtYTsNCj4gIAlzdHJ1Y3QgZG1hX2No YW4JCSpjaGFuOw0KPiAgCWludAkJCWNvdW50LCBpOw0KPiArCWludAkJCXJldF9ub19jaGFubmVs ID0gLUVOT0RFVjsNCg0KQ291bGQgd2UgcmUtdXNlIGNoYW4gZm9yIHRoZSBlcnJvciBhcyB3ZWxs Pw0KDQo+ICAJaWYgKCFucCB8fCAhbmFtZSkgew0KPiAgCQlwcl9lcnIoIiVzOiBub3QgZW5vdWdo IGluZm9ybWF0aW9uIHByb3ZpZGVkXG4iLCBfX2Z1bmNfXyk7DQo+IC0JCXJldHVybiBOVUxMOw0K PiArCQlyZXR1cm4gRVJSX1BUUigtRU5PREVWKTsNCj4gIAl9DQo+ICANCj4gIAljb3VudCA9IG9m X3Byb3BlcnR5X2NvdW50X3N0cmluZ3MobnAsICJkbWEtbmFtZXMiKTsNCj4gIAlpZiAoY291bnQg PCAwKSB7DQo+ICAJCXByX2VycigiJXM6IGRtYS1uYW1lcyBwcm9wZXJ0eSBvZiBub2RlICclcycg bWlzc2luZyBvciBlbXB0eVxuIiwNCj4gIAkJCV9fZnVuY19fLCBucC0+ZnVsbF9uYW1lKTsNCj4g LQkJcmV0dXJuIE5VTEw7DQo+ICsJCXJldHVybiBFUlJfUFRSKC1FTk9ERVYpOw0KPiAgCX0NCj4g IA0KPiAgCWZvciAoaSA9IDA7IGkgPCBjb3VudDsgaSsrKSB7DQo+IEBAIC0xNzQsOCArMTc1LDEw IEBAIHN0cnVjdCBkbWFfY2hhbiAqb2ZfZG1hX3JlcXVlc3Rfc2xhdmVfY2hhbm5lbChzdHJ1Y3Qg ZGV2aWNlX25vZGUgKm5wLA0KPiAgDQo+ICAJCWlmIChvZmRtYSkNCg0KaWYgKG9mZG1hKSB7DQou Li4NCg0KPiAgCQkJY2hhbiA9IG9mZG1hLT5vZl9kbWFfeGxhdGUoJmRtYV9zcGVjLCBvZmRtYSk7 DQo+IC0JCWVsc2UNCj4gKwkJZWxzZSB7DQoNCn0gZWxzZSB7DQoNCnRvIGtlZXAgc3R5bGUuDQoN Cj4gKwkJCXJldF9ub19jaGFubmVsID0gLUVQUk9CRV9ERUZFUjsNCj4gIAkJCWNoYW4gPSBOVUxM Ow0KPiArCQl9DQo+ICANCj4gIAkJbXV0ZXhfdW5sb2NrKCZvZl9kbWFfbG9jayk7DQo+ICANCj4g QEAgLTE4NSw3ICsxODgsNyBAQCBzdHJ1Y3QgZG1hX2NoYW4gKm9mX2RtYV9yZXF1ZXN0X3NsYXZl X2NoYW5uZWwoc3RydWN0IGRldmljZV9ub2RlICpucCwNCj4gIAkJCXJldHVybiBjaGFuOw0KPiAg CX0NCj4gIA0KPiAtCXJldHVybiBOVUxMOw0KPiArCXJldHVybiBFUlJfUFRSKHJldF9ub19jaGFu bmVsKTsNCj4gIH0NCg0KDQotLSANCkFuZHkgU2hldmNoZW5rbyA8YW5kcml5LnNoZXZjaGVua29A aW50ZWwuY29tPg0KSW50ZWwgRmlubGFuZCBPeQ0KLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCkludGVsIEZpbmxhbmQg T3kKUmVnaXN0ZXJlZCBBZGRyZXNzOiBQTCAyODEsIDAwMTgxIEhlbHNpbmtpIApCdXNpbmVzcyBJ ZGVudGl0eSBDb2RlOiAwMzU3NjA2IC0gNCAKRG9taWNpbGVkIGluIEhlbHNpbmtpIAoKVGhpcyBl LW1haWwgYW5kIGFueSBhdHRhY2htZW50cyBtYXkgY29udGFpbiBjb25maWRlbnRpYWwgbWF0ZXJp YWwgZm9yCnRoZSBzb2xlIHVzZSBvZiB0aGUgaW50ZW5kZWQgcmVjaXBpZW50KHMpLiBBbnkgcmV2 aWV3IG9yIGRpc3RyaWJ1dGlvbgpieSBvdGhlcnMgaXMgc3RyaWN0bHkgcHJvaGliaXRlZC4gSWYg eW91IGFyZSBub3QgdGhlIGludGVuZGVkCnJlY2lwaWVudCwgcGxlYXNlIGNvbnRhY3QgdGhlIHNl bmRlciBhbmQgZGVsZXRlIGFsbCBjb3BpZXMuCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: andriy.shevchenko@intel.com (Shevchenko, Andriy) Date: Tue, 26 Nov 2013 13:59:53 +0000 Subject: [PATCH V3] dma: add channel request API that supports deferred probe In-Reply-To: <1385416039-3170-1-git-send-email-swarren@wwwdotorg.org> References: <1385416039-3170-1-git-send-email-swarren@wwwdotorg.org> Message-ID: <1385474368.1871.6.camel@smile> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, 2013-11-25 at 14:47 -0700, Stephen Warren wrote: > From: Stephen Warren > > dma_request_slave_channel() simply returns NULL whenever DMA channel > lookup fails. Lookup could fail for two distinct reasons: > > a) No DMA specification exists for the channel name. > This includes situations where no DMA specifications exist at all, or > other general lookup problems. > > b) A DMA specification does exist, yet the driver for that channel is not > yet registered. > > Case (b) should trigger deferred probe in client drivers. However, since > they have no way to differentiate the two situations, it cannot. > > Implement new function dma_request_slave_channel_or_err(), which performs > identically to dma_request_slave_channel(), except that it returns an > error-pointer rather than NULL, which allows callers to detect when > deferred probe should occur. > > Eventually, all drivers should be converted to this new API, the old API > removed, and the new API renamed to the more desirable name. This patch > doesn't convert the existing API and all drivers in one go, since some > drivers call dma_request_slave_channel() then dma_request_channel() if > that fails. That would require either modifying dma_request_channel() in > the same way, or adding extra error-handling code to all affected > drivers, and there are close to 100 drivers using the other API, rather > than just the 15-20 or so that use dma_request_slave_channel(), which > might be tenable in a single patch. > > acpi_dma_request_slave_chan_by_name() doesn't currently implement > deferred probe. It should, but this will be addressed later. Couple of comments below. [] > --- a/drivers/dma/of-dma.c > +++ b/drivers/dma/of-dma.c [] > @@ -152,17 +152,18 @@ struct dma_chan *of_dma_request_slave_channel(struct device_node *np, > struct of_dma *ofdma; > struct dma_chan *chan; > int count, i; > + int ret_no_channel = -ENODEV; Could we re-use chan for the error as well? > if (!np || !name) { > pr_err("%s: not enough information provided\n", __func__); > - return NULL; > + return ERR_PTR(-ENODEV); > } > > count = of_property_count_strings(np, "dma-names"); > if (count < 0) { > pr_err("%s: dma-names property of node '%s' missing or empty\n", > __func__, np->full_name); > - return NULL; > + return ERR_PTR(-ENODEV); > } > > for (i = 0; i < count; i++) { > @@ -174,8 +175,10 @@ struct dma_chan *of_dma_request_slave_channel(struct device_node *np, > > if (ofdma) if (ofdma) { ... > chan = ofdma->of_dma_xlate(&dma_spec, ofdma); > - else > + else { } else { to keep style. > + ret_no_channel = -EPROBE_DEFER; > chan = NULL; > + } > > mutex_unlock(&of_dma_lock); > > @@ -185,7 +188,7 @@ struct dma_chan *of_dma_request_slave_channel(struct device_node *np, > return chan; > } > > - return NULL; > + return ERR_PTR(ret_no_channel); > } -- Andy Shevchenko Intel Finland Oy --------------------------------------------------------------------- Intel Finland Oy Registered Address: PL 281, 00181 Helsinki Business Identity Code: 0357606 - 4 Domiciled in Helsinki This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.