| Message ID | 1399560990-1402858-2-git-send-email-arnd@arndb.de (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Vinod Koul |
| Headers | show |
T24gVGh1LCAyMDE0LTA1LTA4IGF0IDE2OjU2ICswMjAwLCBBcm5kIEJlcmdtYW5uIHdyb3RlOg0K PiBUaGUgc2ExMXgwX2RtYV9wbV9vcHMgdW5jb25kaXRpb25hbGx5IHJlZmVyZW5jZSBzYTExeDBf ZG1hX3Jlc3VtZQ0KPiBhbmQgc2ExMXgwX2RtYV9zdXNwZW5kLCB3aGljaCBjdXJyZW50bHkgYnJl YWtzIGlmIENPTkZJR19QTV9TTEVFUA0KPiBpcyBkaXNhYmxlZC4NCj4gDQo+IFRoZXJlIGlzIHBy b2JhYmx5IGEgYmV0dGVyIHdheSB0byByZW1vdmUgdGhlIHJlZmVyZW5jZSBpbiB0aGlzDQo+IGNh c2UsIGJ1dCB0aGUgc2FmZSBjaG9pY2UgaXMgdG8gaGF2ZSB0aGUgc3VzcGVuZC9yZXN1bWUgY29k ZSBhbHdheXMNCj4gYnVpbHQgaW4gdGhlIGRyaXZlci4NCg0KTWF5YmUgeW91IGNvdWxkIGNyZWF0 ZSBhIG1hY3JvIGluIHBtLmggZm9yICpfbm9pcnEgdmVyc2lvbiBvZg0Kc3VzcGVuZC9yZXN1bWU/ IEhvd2V2ZXIsIGxpa2Ugd2UgZGlzY3Vzc2VkIHdpdGggVmlub2QgaXQncyBtdWNoIGJldHRlcg0K dG8gdXNlIHN1c3BlbmRfbGF0ZS9yZXN1bWVfZWFybHkgZm9yIERNQUMgZGV2aWNlIGRyaXZlcnMs IHRob3VnaCBJIGhhdmUNCm5vIGlkZWEgaWYgaXQgd29ya3MgZm9yIHNhMTF4MC4NCg0KPiANCj4g U2lnbmVkLW9mZi1ieTogQXJuZCBCZXJnbWFubiA8YXJuZEBhcm5kYi5kZT4NCj4gQ2M6IFJ1c3Nl bGwgS2luZyA8bGludXhAYXJtLmxpbnV4Lm9yZy51az4NCj4gQ2M6IGRtYWVuZ2luZUB2Z2VyLmtl cm5lbC5vcmcNCj4gQ2M6IFZpbm9kIEtvdWwgPHZpbm9kLmtvdWxAaW50ZWwuY29tPg0KPiBDYzog RGFuIFdpbGxpYW1zIDxkYW4uai53aWxsaWFtc0BpbnRlbC5jb20+DQo+IC0tLQ0KPiAgZHJpdmVy cy9kbWEvc2ExMXgwLWRtYS5jIHwgNCAtLS0tDQo+ICAxIGZpbGUgY2hhbmdlZCwgNCBkZWxldGlv bnMoLSkNCj4gDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2RtYS9zYTExeDAtZG1hLmMgYi9kcml2 ZXJzL2RtYS9zYTExeDAtZG1hLmMNCj4gaW5kZXggYWIyNmQ0Ni4uNWViZGZiYyAxMDA2NDQNCj4g LS0tIGEvZHJpdmVycy9kbWEvc2ExMXgwLWRtYS5jDQo+ICsrKyBiL2RyaXZlcnMvZG1hL3NhMTF4 MC1kbWEuYw0KPiBAQCAtMTEzLDExICsxMTMsOSBAQCBzdHJ1Y3Qgc2ExMXgwX2RtYV9waHkgew0K PiAgCXN0cnVjdCBzYTExeDBfZG1hX2Rlc2MJKnR4ZF9sb2FkOw0KPiAgCXVuc2lnbmVkCQlzZ19k b25lOw0KPiAgCXN0cnVjdCBzYTExeDBfZG1hX2Rlc2MJKnR4ZF9kb25lOw0KPiAtI2lmZGVmIENP TkZJR19QTV9TTEVFUA0KPiAgCXUzMgkJCWRic1syXTsNCj4gIAl1MzIJCQlkYnRbMl07DQo+ICAJ dTMyCQkJZGNzcjsNCj4gLSNlbmRpZg0KPiAgfTsNCj4gIA0KPiAgc3RydWN0IHNhMTF4MF9kbWFf ZGV2IHsNCj4gQEAgLTk4NCw3ICs5ODIsNiBAQCBzdGF0aWMgaW50IHNhMTF4MF9kbWFfcmVtb3Zl KHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpDQo+ICAJcmV0dXJuIDA7DQo+ICB9DQo+ICAN Cj4gLSNpZmRlZiBDT05GSUdfUE1fU0xFRVANCj4gIHN0YXRpYyBpbnQgc2ExMXgwX2RtYV9zdXNw ZW5kKHN0cnVjdCBkZXZpY2UgKmRldikNCj4gIHsNCj4gIAlzdHJ1Y3Qgc2ExMXgwX2RtYV9kZXYg KmQgPSBkZXZfZ2V0X2RydmRhdGEoZGV2KTsNCj4gQEAgLTEwNTQsNyArMTA1MSw2IEBAIHN0YXRp YyBpbnQgc2ExMXgwX2RtYV9yZXN1bWUoc3RydWN0IGRldmljZSAqZGV2KQ0KPiAgDQo+ICAJcmV0 dXJuIDA7DQo+ICB9DQo+IC0jZW5kaWYNCj4gIA0KPiAgc3RhdGljIGNvbnN0IHN0cnVjdCBkZXZf cG1fb3BzIHNhMTF4MF9kbWFfcG1fb3BzID0gew0KPiAgCS5zdXNwZW5kX25vaXJxID0gc2ExMXgw X2RtYV9zdXNwZW5kLA0KDQoNCi0tIA0KQW5keSBTaGV2Y2hlbmtvIDxhbmRyaXkuc2hldmNoZW5r b0BpbnRlbC5jb20+DQpJbnRlbCBGaW5sYW5kIE95DQotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KSW50ZWwgRmlubGFu ZCBPeQpSZWdpc3RlcmVkIEFkZHJlc3M6IFBMIDI4MSwgMDAxODEgSGVsc2lua2kgCkJ1c2luZXNz IElkZW50aXR5IENvZGU6IDAzNTc2MDYgLSA0IApEb21pY2lsZWQgaW4gSGVsc2lua2kgCgpUaGlz IGUtbWFpbCBhbmQgYW55IGF0dGFjaG1lbnRzIG1heSBjb250YWluIGNvbmZpZGVudGlhbCBtYXRl cmlhbCBmb3IKdGhlIHNvbGUgdXNlIG9mIHRoZSBpbnRlbmRlZCByZWNpcGllbnQocykuIEFueSBy ZXZpZXcgb3IgZGlzdHJpYnV0aW9uCmJ5IG90aGVycyBpcyBzdHJpY3RseSBwcm9oaWJpdGVkLiBJ ZiB5b3UgYXJlIG5vdCB0aGUgaW50ZW5kZWQKcmVjaXBpZW50LCBwbGVhc2UgY29udGFjdCB0aGUg c2VuZGVyIGFuZCBkZWxldGUgYWxsIGNvcGllcy4K -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, May 08, 2014 at 09:38:37PM +0530, Shevchenko, Andriy wrote: > On Thu, 2014-05-08 at 16:56 +0200, Arnd Bergmann wrote: > > The sa11x0_dma_pm_ops unconditionally reference sa11x0_dma_resume > > and sa11x0_dma_suspend, which currently breaks if CONFIG_PM_SLEEP > > is disabled. > > > > There is probably a better way to remove the reference in this > > case, but the safe choice is to have the suspend/resume code always > > built in the driver. > > Maybe you could create a macro in pm.h for *_noirq version of > suspend/resume? However, like we discussed with Vinod it's much better > to use suspend_late/resume_early for DMAC device drivers, though I have > no idea if it works for sa11x0. It should work as the guidance is not client/controller specfic. But I think thats not the point here as the fix is not related to how suspend is implemented..
diff --git a/drivers/dma/sa11x0-dma.c b/drivers/dma/sa11x0-dma.c index ab26d46..5ebdfbc 100644 --- a/drivers/dma/sa11x0-dma.c +++ b/drivers/dma/sa11x0-dma.c @@ -113,11 +113,9 @@ struct sa11x0_dma_phy { struct sa11x0_dma_desc *txd_load; unsigned sg_done; struct sa11x0_dma_desc *txd_done; -#ifdef CONFIG_PM_SLEEP u32 dbs[2]; u32 dbt[2]; u32 dcsr; -#endif }; struct sa11x0_dma_dev { @@ -984,7 +982,6 @@ static int sa11x0_dma_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM_SLEEP static int sa11x0_dma_suspend(struct device *dev) { struct sa11x0_dma_dev *d = dev_get_drvdata(dev); @@ -1054,7 +1051,6 @@ static int sa11x0_dma_resume(struct device *dev) return 0; } -#endif static const struct dev_pm_ops sa11x0_dma_pm_ops = { .suspend_noirq = sa11x0_dma_suspend,
The sa11x0_dma_pm_ops unconditionally reference sa11x0_dma_resume and sa11x0_dma_suspend, which currently breaks if CONFIG_PM_SLEEP is disabled. There is probably a better way to remove the reference in this case, but the safe choice is to have the suspend/resume code always built in the driver. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Russell King <linux@arm.linux.org.uk> Cc: dmaengine@vger.kernel.org Cc: Vinod Koul <vinod.koul@intel.com> Cc: Dan Williams <dan.j.williams@intel.com> --- drivers/dma/sa11x0-dma.c | 4 ---- 1 file changed, 4 deletions(-)