* [PATCH] powerpc/esdhc: enable the card insert/remove interrupt @ 2012-10-23 7:01 r66093 2012-10-23 8:26 ` Anton Vorontsov 0 siblings, 1 reply; 15+ messages in thread From: r66093 @ 2012-10-23 7:01 UTC (permalink / raw) To: linux-mmc; +Cc: Jerry Huang, Anton Vorontsov, Chris Ball From: Jerry Huang <Chang-Ming.Huang@freescale.com> The current eSDHC driver use the poll mode to detect if the SD/MMC card is inserted or removed, which will generate many interrupts and impact the performance. Therefore, change the default card detect to interrupt mode, if the board can't support this mode, we still use the poll mode. Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com> CC: Anton Vorontsov <cbouatmailru@gmail.com> CC: Chris Ball <cjb@laptop.org> --- drivers/mmc/host/sdhci-of-esdhc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c index ffc1226..5dc362f 100644 --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c @@ -196,6 +196,11 @@ static void esdhc_of_detect_limitation(struct platform_device *pdev, if (vvn == VENDOR_V_22) pdata->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23; + /* P4080DS and MPC837XMDS board don't support interrupt mode */ + if (of_machine_is_compatible("fsl,mpc837xmds") || + of_machine_is_compatible("fsl,P4080DS")) + pdata->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION; + iounmap(ioaddr); end: return; @@ -223,7 +228,7 @@ static struct sdhci_pltfm_data sdhci_esdhc_pdata = { * card detection could be handled via GPIO * eSDHC cannot support End Attribute in NOP ADMA descriptor */ - .quirks = ESDHC_DEFAULT_QUIRKS | SDHCI_QUIRK_BROKEN_CARD_DETECTION + .quirks = ESDHC_DEFAULT_QUIRKS | SDHCI_QUIRK_NO_CARD_NO_RESET | SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, .ops = &sdhci_esdhc_ops, -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH] powerpc/esdhc: enable the card insert/remove interrupt 2012-10-23 7:01 [PATCH] powerpc/esdhc: enable the card insert/remove interrupt r66093 @ 2012-10-23 8:26 ` Anton Vorontsov 0 siblings, 0 replies; 15+ messages in thread From: Anton Vorontsov @ 2012-10-23 8:26 UTC (permalink / raw) To: r66093; +Cc: linux-mmc, Jerry Huang, Chris Ball, Kumar Gala, linuxppc-dev On Tue, Oct 23, 2012 at 03:01:17PM +0800, r66093@freescale.com wrote: > From: Jerry Huang <Chang-Ming.Huang@freescale.com> > > The current eSDHC driver use the poll mode to detect > if the SD/MMC card is inserted or removed, which will generate > many interrupts and impact the performance. > Therefore, change the default card detect to interrupt mode, > if the board can't support this mode, we still use the poll mode. > > Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com> > CC: Anton Vorontsov <cbouatmailru@gmail.com> > CC: Chris Ball <cjb@laptop.org> > --- IIRC, the card detection is broken SOC-revision-wise, not board-wise. So the change seems wrong. Also, take a look at this: http://lkml.org/lkml/2010/7/14/127 I started the work but never finished, unfortunately it caused some regressions for non-FSL hardware... > drivers/mmc/host/sdhci-of-esdhc.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c > index ffc1226..5dc362f 100644 > --- a/drivers/mmc/host/sdhci-of-esdhc.c > +++ b/drivers/mmc/host/sdhci-of-esdhc.c > @@ -196,6 +196,11 @@ static void esdhc_of_detect_limitation(struct platform_device *pdev, > if (vvn == VENDOR_V_22) > pdata->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23; > > + /* P4080DS and MPC837XMDS board don't support interrupt mode */ > + if (of_machine_is_compatible("fsl,mpc837xmds") || > + of_machine_is_compatible("fsl,P4080DS")) > + pdata->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION; > + > iounmap(ioaddr); > end: > return; > @@ -223,7 +228,7 @@ static struct sdhci_pltfm_data sdhci_esdhc_pdata = { > * card detection could be handled via GPIO > * eSDHC cannot support End Attribute in NOP ADMA descriptor > */ > - .quirks = ESDHC_DEFAULT_QUIRKS | SDHCI_QUIRK_BROKEN_CARD_DETECTION > + .quirks = ESDHC_DEFAULT_QUIRKS > | SDHCI_QUIRK_NO_CARD_NO_RESET > | SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, > .ops = &sdhci_esdhc_ops, > -- > 1.7.9.5 ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] powerpc/esdhc: enable the card insert/remove interrupt @ 2012-10-23 8:26 ` Anton Vorontsov 0 siblings, 0 replies; 15+ messages in thread From: Anton Vorontsov @ 2012-10-23 8:26 UTC (permalink / raw) To: r66093; +Cc: Jerry Huang, Chris Ball, linux-mmc, linuxppc-dev On Tue, Oct 23, 2012 at 03:01:17PM +0800, r66093@freescale.com wrote: > From: Jerry Huang <Chang-Ming.Huang@freescale.com> > > The current eSDHC driver use the poll mode to detect > if the SD/MMC card is inserted or removed, which will generate > many interrupts and impact the performance. > Therefore, change the default card detect to interrupt mode, > if the board can't support this mode, we still use the poll mode. > > Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com> > CC: Anton Vorontsov <cbouatmailru@gmail.com> > CC: Chris Ball <cjb@laptop.org> > --- IIRC, the card detection is broken SOC-revision-wise, not board-wise. So the change seems wrong. Also, take a look at this: http://lkml.org/lkml/2010/7/14/127 I started the work but never finished, unfortunately it caused some regressions for non-FSL hardware... > drivers/mmc/host/sdhci-of-esdhc.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c > index ffc1226..5dc362f 100644 > --- a/drivers/mmc/host/sdhci-of-esdhc.c > +++ b/drivers/mmc/host/sdhci-of-esdhc.c > @@ -196,6 +196,11 @@ static void esdhc_of_detect_limitation(struct platform_device *pdev, > if (vvn == VENDOR_V_22) > pdata->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23; > > + /* P4080DS and MPC837XMDS board don't support interrupt mode */ > + if (of_machine_is_compatible("fsl,mpc837xmds") || > + of_machine_is_compatible("fsl,P4080DS")) > + pdata->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION; > + > iounmap(ioaddr); > end: > return; > @@ -223,7 +228,7 @@ static struct sdhci_pltfm_data sdhci_esdhc_pdata = { > * card detection could be handled via GPIO > * eSDHC cannot support End Attribute in NOP ADMA descriptor > */ > - .quirks = ESDHC_DEFAULT_QUIRKS | SDHCI_QUIRK_BROKEN_CARD_DETECTION > + .quirks = ESDHC_DEFAULT_QUIRKS > | SDHCI_QUIRK_NO_CARD_NO_RESET > | SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, > .ops = &sdhci_esdhc_ops, > -- > 1.7.9.5 ^ permalink raw reply [flat|nested] 15+ messages in thread
* RE: [PATCH] powerpc/esdhc: enable the card insert/remove interrupt 2012-10-23 8:26 ` Anton Vorontsov @ 2012-10-23 8:39 ` Huang Changming-R66093 -1 siblings, 0 replies; 15+ messages in thread From: Huang Changming-R66093 @ 2012-10-23 8:39 UTC (permalink / raw) To: Anton Vorontsov Cc: linux-mmc@vger.kernel.org, Chris Ball, Kumar Gala, linuxppc-dev@lists.ozlabs.org Hi, Anton For FSL SOCs, the interrupt mode is support for card detect. For some reasons, some board can't support this feature, such as mpc837xmds board, but mpc837xrdb board support it. I see your links, it is about the DMA (the first version of p2020 don't support DMA, need to enable the PIO mode, but the later version has fixed this issue). Best Regards Jerry Huang > -----Original Message----- > From: linux-mmc-owner@vger.kernel.org [mailto:linux-mmc- > owner@vger.kernel.org] On Behalf Of Anton Vorontsov > Sent: Tuesday, October 23, 2012 4:27 PM > To: Huang Changming-R66093 > Cc: linux-mmc@vger.kernel.org; Huang Changming-R66093; Chris Ball; Kumar > Gala; linuxppc-dev@lists.ozlabs.org > Subject: Re: [PATCH] powerpc/esdhc: enable the card insert/remove > interrupt > > On Tue, Oct 23, 2012 at 03:01:17PM +0800, r66093@freescale.com wrote: > > From: Jerry Huang <Chang-Ming.Huang@freescale.com> > > > > The current eSDHC driver use the poll mode to detect if the SD/MMC > > card is inserted or removed, which will generate many interrupts and > > impact the performance. > > Therefore, change the default card detect to interrupt mode, if the > > board can't support this mode, we still use the poll mode. > > > > Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com> > > CC: Anton Vorontsov <cbouatmailru@gmail.com> > > CC: Chris Ball <cjb@laptop.org> > > --- > > IIRC, the card detection is broken SOC-revision-wise, not board-wise. So > the change seems wrong. > > Also, take a look at this: > > http://lkml.org/lkml/2010/7/14/127 > > I started the work but never finished, unfortunately it caused some > regressions for non-FSL hardware... > > > drivers/mmc/host/sdhci-of-esdhc.c | 7 ++++++- > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/mmc/host/sdhci-of-esdhc.c > > b/drivers/mmc/host/sdhci-of-esdhc.c > > index ffc1226..5dc362f 100644 > > --- a/drivers/mmc/host/sdhci-of-esdhc.c > > +++ b/drivers/mmc/host/sdhci-of-esdhc.c > > @@ -196,6 +196,11 @@ static void esdhc_of_detect_limitation(struct > platform_device *pdev, > > if (vvn == VENDOR_V_22) > > pdata->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23; > > > > + /* P4080DS and MPC837XMDS board don't support interrupt mode */ > > + if (of_machine_is_compatible("fsl,mpc837xmds") || > > + of_machine_is_compatible("fsl,P4080DS")) > > + pdata->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION; > > + > > iounmap(ioaddr); > > end: > > return; > > @@ -223,7 +228,7 @@ static struct sdhci_pltfm_data sdhci_esdhc_pdata = > { > > * card detection could be handled via GPIO > > * eSDHC cannot support End Attribute in NOP ADMA descriptor > > */ > > - .quirks = ESDHC_DEFAULT_QUIRKS | SDHCI_QUIRK_BROKEN_CARD_DETECTION > > + .quirks = ESDHC_DEFAULT_QUIRKS > > | SDHCI_QUIRK_NO_CARD_NO_RESET > > | SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, > > .ops = &sdhci_esdhc_ops, > > -- > > 1.7.9.5 > -- > To unsubscribe from this list: send the line "unsubscribe linux-mmc" in > the body of a message to majordomo@vger.kernel.org More majordomo info at > http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 15+ messages in thread
* RE: [PATCH] powerpc/esdhc: enable the card insert/remove interrupt @ 2012-10-23 8:39 ` Huang Changming-R66093 0 siblings, 0 replies; 15+ messages in thread From: Huang Changming-R66093 @ 2012-10-23 8:39 UTC (permalink / raw) To: Anton Vorontsov Cc: linuxppc-dev@lists.ozlabs.org, Chris Ball, linux-mmc@vger.kernel.org SGksIEFudG9uDQpGb3IgRlNMIFNPQ3MsIHRoZSBpbnRlcnJ1cHQgbW9kZSBpcyBzdXBwb3J0IGZv ciBjYXJkIGRldGVjdC4NCkZvciBzb21lIHJlYXNvbnMsIHNvbWUgYm9hcmQgY2FuJ3Qgc3VwcG9y dCB0aGlzIGZlYXR1cmUsIHN1Y2ggYXMgbXBjODM3eG1kcyBib2FyZCwNCmJ1dCBtcGM4Mzd4cmRi IGJvYXJkIHN1cHBvcnQgaXQuDQoNCkkgc2VlIHlvdXIgbGlua3MsIGl0IGlzIGFib3V0IHRoZSBE TUEgKHRoZSBmaXJzdCB2ZXJzaW9uIG9mIHAyMDIwIGRvbid0IHN1cHBvcnQgRE1BLCBuZWVkIHRv IGVuYWJsZSB0aGUgUElPIG1vZGUsIGJ1dCB0aGUgbGF0ZXIgdmVyc2lvbiBoYXMgZml4ZWQgdGhp cyBpc3N1ZSkuDQoNCkJlc3QgUmVnYXJkcw0KSmVycnkgSHVhbmcNCg0KDQo+IC0tLS0tT3JpZ2lu YWwgTWVzc2FnZS0tLS0tDQo+IEZyb206IGxpbnV4LW1tYy1vd25lckB2Z2VyLmtlcm5lbC5vcmcg W21haWx0bzpsaW51eC1tbWMtDQo+IG93bmVyQHZnZXIua2VybmVsLm9yZ10gT24gQmVoYWxmIE9m IEFudG9uIFZvcm9udHNvdg0KPiBTZW50OiBUdWVzZGF5LCBPY3RvYmVyIDIzLCAyMDEyIDQ6Mjcg UE0NCj4gVG86IEh1YW5nIENoYW5nbWluZy1SNjYwOTMNCj4gQ2M6IGxpbnV4LW1tY0B2Z2VyLmtl cm5lbC5vcmc7IEh1YW5nIENoYW5nbWluZy1SNjYwOTM7IENocmlzIEJhbGw7IEt1bWFyDQo+IEdh bGE7IGxpbnV4cHBjLWRldkBsaXN0cy5vemxhYnMub3JnDQo+IFN1YmplY3Q6IFJlOiBbUEFUQ0hd IHBvd2VycGMvZXNkaGM6IGVuYWJsZSB0aGUgY2FyZCBpbnNlcnQvcmVtb3ZlDQo+IGludGVycnVw dA0KPiANCj4gT24gVHVlLCBPY3QgMjMsIDIwMTIgYXQgMDM6MDE6MTdQTSArMDgwMCwgcjY2MDkz QGZyZWVzY2FsZS5jb20gd3JvdGU6DQo+ID4gRnJvbTogSmVycnkgSHVhbmcgPENoYW5nLU1pbmcu SHVhbmdAZnJlZXNjYWxlLmNvbT4NCj4gPg0KPiA+IFRoZSBjdXJyZW50IGVTREhDIGRyaXZlciB1 c2UgdGhlIHBvbGwgbW9kZSB0byBkZXRlY3QgaWYgdGhlIFNEL01NQw0KPiA+IGNhcmQgaXMgaW5z ZXJ0ZWQgb3IgcmVtb3ZlZCwgd2hpY2ggd2lsbCBnZW5lcmF0ZSBtYW55IGludGVycnVwdHMgYW5k DQo+ID4gaW1wYWN0IHRoZSBwZXJmb3JtYW5jZS4NCj4gPiBUaGVyZWZvcmUsIGNoYW5nZSB0aGUg ZGVmYXVsdCBjYXJkIGRldGVjdCB0byBpbnRlcnJ1cHQgbW9kZSwgaWYgdGhlDQo+ID4gYm9hcmQg Y2FuJ3Qgc3VwcG9ydCB0aGlzIG1vZGUsIHdlIHN0aWxsIHVzZSB0aGUgcG9sbCBtb2RlLg0KPiA+ DQo+ID4gU2lnbmVkLW9mZi1ieTogSmVycnkgSHVhbmcgPENoYW5nLU1pbmcuSHVhbmdAZnJlZXNj YWxlLmNvbT4NCj4gPiBDQzogQW50b24gVm9yb250c292IDxjYm91YXRtYWlscnVAZ21haWwuY29t Pg0KPiA+IENDOiBDaHJpcyBCYWxsIDxjamJAbGFwdG9wLm9yZz4NCj4gPiAtLS0NCj4gDQo+IElJ UkMsIHRoZSBjYXJkIGRldGVjdGlvbiBpcyBicm9rZW4gU09DLXJldmlzaW9uLXdpc2UsIG5vdCBi b2FyZC13aXNlLiBTbw0KPiB0aGUgY2hhbmdlIHNlZW1zIHdyb25nLg0KPiANCj4gQWxzbywgdGFr ZSBhIGxvb2sgYXQgdGhpczoNCj4gDQo+IAlodHRwOi8vbGttbC5vcmcvbGttbC8yMDEwLzcvMTQv MTI3DQo+IA0KPiBJIHN0YXJ0ZWQgdGhlIHdvcmsgYnV0IG5ldmVyIGZpbmlzaGVkLCB1bmZvcnR1 bmF0ZWx5IGl0IGNhdXNlZCBzb21lDQo+IHJlZ3Jlc3Npb25zIGZvciBub24tRlNMIGhhcmR3YXJl Li4uDQo+IA0KPiA+ICBkcml2ZXJzL21tYy9ob3N0L3NkaGNpLW9mLWVzZGhjLmMgfCAgICA3ICsr KysrKy0NCj4gPiAgMSBmaWxlIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigt KQ0KPiA+DQo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbW1jL2hvc3Qvc2RoY2ktb2YtZXNkaGMu Yw0KPiA+IGIvZHJpdmVycy9tbWMvaG9zdC9zZGhjaS1vZi1lc2RoYy5jDQo+ID4gaW5kZXggZmZj MTIyNi4uNWRjMzYyZiAxMDA2NDQNCj4gPiAtLS0gYS9kcml2ZXJzL21tYy9ob3N0L3NkaGNpLW9m LWVzZGhjLmMNCj4gPiArKysgYi9kcml2ZXJzL21tYy9ob3N0L3NkaGNpLW9mLWVzZGhjLmMNCj4g PiBAQCAtMTk2LDYgKzE5NiwxMSBAQCBzdGF0aWMgdm9pZCBlc2RoY19vZl9kZXRlY3RfbGltaXRh dGlvbihzdHJ1Y3QNCj4gcGxhdGZvcm1fZGV2aWNlICpwZGV2LA0KPiA+ICAJaWYgKHZ2biA9PSBW RU5ET1JfVl8yMikNCj4gPiAgCQlwZGF0YS0+cXVpcmtzMiB8PSBTREhDSV9RVUlSSzJfSE9TVF9O T19DTUQyMzsNCj4gPg0KPiA+ICsJLyogUDQwODBEUyBhbmQgTVBDODM3WE1EUyBib2FyZCBkb24n dCBzdXBwb3J0IGludGVycnVwdCBtb2RlICovDQo+ID4gKwlpZiAob2ZfbWFjaGluZV9pc19jb21w YXRpYmxlKCJmc2wsbXBjODM3eG1kcyIpIHx8DQo+ID4gKwkgICAgb2ZfbWFjaGluZV9pc19jb21w YXRpYmxlKCJmc2wsUDQwODBEUyIpKQ0KPiA+ICsJCXBkYXRhLT5xdWlya3MgfD0gU0RIQ0lfUVVJ UktfQlJPS0VOX0NBUkRfREVURUNUSU9OOw0KPiA+ICsNCj4gPiAgCWlvdW5tYXAoaW9hZGRyKTsN Cj4gPiAgZW5kOg0KPiA+ICAJcmV0dXJuOw0KPiA+IEBAIC0yMjMsNyArMjI4LDcgQEAgc3RhdGlj IHN0cnVjdCBzZGhjaV9wbHRmbV9kYXRhIHNkaGNpX2VzZGhjX3BkYXRhID0NCj4gew0KPiA+ICAJ ICogY2FyZCBkZXRlY3Rpb24gY291bGQgYmUgaGFuZGxlZCB2aWEgR1BJTw0KPiA+ICAJICogZVNE SEMgY2Fubm90IHN1cHBvcnQgRW5kIEF0dHJpYnV0ZSBpbiBOT1AgQURNQSBkZXNjcmlwdG9yDQo+ ID4gIAkgKi8NCj4gPiAtCS5xdWlya3MgPSBFU0RIQ19ERUZBVUxUX1FVSVJLUyB8IFNESENJX1FV SVJLX0JST0tFTl9DQVJEX0RFVEVDVElPTg0KPiA+ICsJLnF1aXJrcyA9IEVTREhDX0RFRkFVTFRf UVVJUktTDQo+ID4gIAkJfCBTREhDSV9RVUlSS19OT19DQVJEX05PX1JFU0VUDQo+ID4gIAkJfCBT REhDSV9RVUlSS19OT19FTkRBVFRSX0lOX05PUERFU0MsDQo+ID4gIAkub3BzID0gJnNkaGNpX2Vz ZGhjX29wcywNCj4gPiAtLQ0KPiA+IDEuNy45LjUNCj4gLS0NCj4gVG8gdW5zdWJzY3JpYmUgZnJv bSB0aGlzIGxpc3Q6IHNlbmQgdGhlIGxpbmUgInVuc3Vic2NyaWJlIGxpbnV4LW1tYyIgaW4NCj4g dGhlIGJvZHkgb2YgYSBtZXNzYWdlIHRvIG1ham9yZG9tb0B2Z2VyLmtlcm5lbC5vcmcgTW9yZSBt YWpvcmRvbW8gaW5mbyBhdA0KPiBodHRwOi8vdmdlci5rZXJuZWwub3JnL21ham9yZG9tby1pbmZv Lmh0bWwNCg0K ^ permalink raw reply [flat|nested] 15+ messages in thread
* RE: [PATCH] powerpc/esdhc: enable the card insert/remove interrupt 2012-10-23 8:39 ` Huang Changming-R66093 @ 2012-10-25 10:05 ` Huang Changming-R66093 -1 siblings, 0 replies; 15+ messages in thread From: Huang Changming-R66093 @ 2012-10-25 10:05 UTC (permalink / raw) To: Anton Vorontsov Cc: linux-mmc@vger.kernel.org, Chris Ball, Kumar Gala, linuxppc-dev@lists.ozlabs.org Hi, Anton. Could you have any comment about it? If not, I will resend this patch with v2. Best Regards Jerry Huang > -----Original Message----- > From: linux-mmc-owner@vger.kernel.org [mailto:linux-mmc- > owner@vger.kernel.org] On Behalf Of Huang Changming-R66093 > Sent: Tuesday, October 23, 2012 4:40 PM > To: Anton Vorontsov > Cc: linux-mmc@vger.kernel.org; Chris Ball; Kumar Gala; linuxppc- > dev@lists.ozlabs.org > Subject: RE: [PATCH] powerpc/esdhc: enable the card insert/remove > interrupt > > Hi, Anton > For FSL SOCs, the interrupt mode is support for card detect. > For some reasons, some board can't support this feature, such as > mpc837xmds board, but mpc837xrdb board support it. > > I see your links, it is about the DMA (the first version of p2020 don't > support DMA, need to enable the PIO mode, but the later version has fixed > this issue). > > Best Regards > Jerry Huang > > > > -----Original Message----- > > From: linux-mmc-owner@vger.kernel.org [mailto:linux-mmc- > > owner@vger.kernel.org] On Behalf Of Anton Vorontsov > > Sent: Tuesday, October 23, 2012 4:27 PM > > To: Huang Changming-R66093 > > Cc: linux-mmc@vger.kernel.org; Huang Changming-R66093; Chris Ball; > > Kumar Gala; linuxppc-dev@lists.ozlabs.org > > Subject: Re: [PATCH] powerpc/esdhc: enable the card insert/remove > > interrupt > > > > On Tue, Oct 23, 2012 at 03:01:17PM +0800, r66093@freescale.com wrote: > > > From: Jerry Huang <Chang-Ming.Huang@freescale.com> > > > > > > The current eSDHC driver use the poll mode to detect if the SD/MMC > > > card is inserted or removed, which will generate many interrupts and > > > impact the performance. > > > Therefore, change the default card detect to interrupt mode, if the > > > board can't support this mode, we still use the poll mode. > > > > > > Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com> > > > CC: Anton Vorontsov <cbouatmailru@gmail.com> > > > CC: Chris Ball <cjb@laptop.org> > > > --- > > > > IIRC, the card detection is broken SOC-revision-wise, not board-wise. > > So the change seems wrong. > > > > Also, take a look at this: > > > > http://lkml.org/lkml/2010/7/14/127 > > > > I started the work but never finished, unfortunately it caused some > > regressions for non-FSL hardware... > > > > > drivers/mmc/host/sdhci-of-esdhc.c | 7 ++++++- > > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > > > diff --git a/drivers/mmc/host/sdhci-of-esdhc.c > > > b/drivers/mmc/host/sdhci-of-esdhc.c > > > index ffc1226..5dc362f 100644 > > > --- a/drivers/mmc/host/sdhci-of-esdhc.c > > > +++ b/drivers/mmc/host/sdhci-of-esdhc.c > > > @@ -196,6 +196,11 @@ static void esdhc_of_detect_limitation(struct > > platform_device *pdev, > > > if (vvn == VENDOR_V_22) > > > pdata->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23; > > > > > > + /* P4080DS and MPC837XMDS board don't support interrupt mode */ > > > + if (of_machine_is_compatible("fsl,mpc837xmds") || > > > + of_machine_is_compatible("fsl,P4080DS")) > > > + pdata->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION; > > > + > > > iounmap(ioaddr); > > > end: > > > return; > > > @@ -223,7 +228,7 @@ static struct sdhci_pltfm_data sdhci_esdhc_pdata > > > = > > { > > > * card detection could be handled via GPIO > > > * eSDHC cannot support End Attribute in NOP ADMA descriptor > > > */ > > > - .quirks = ESDHC_DEFAULT_QUIRKS | SDHCI_QUIRK_BROKEN_CARD_DETECTION > > > + .quirks = ESDHC_DEFAULT_QUIRKS > > > | SDHCI_QUIRK_NO_CARD_NO_RESET > > > | SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, > > > .ops = &sdhci_esdhc_ops, > > > -- > > > 1.7.9.5 > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-mmc" > > in the body of a message to majordomo@vger.kernel.org More majordomo > > info at http://vger.kernel.org/majordomo-info.html > > N r y b X ǧv ^ ){.n + { g" ^n r z \x1a h & \x1e G h > \x03( 階 ݢj" \x1a ^[m z ޖ f h ~ m ^ permalink raw reply [flat|nested] 15+ messages in thread
* RE: [PATCH] powerpc/esdhc: enable the card insert/remove interrupt @ 2012-10-25 10:05 ` Huang Changming-R66093 0 siblings, 0 replies; 15+ messages in thread From: Huang Changming-R66093 @ 2012-10-25 10:05 UTC (permalink / raw) To: Anton Vorontsov Cc: linuxppc-dev@lists.ozlabs.org, Chris Ball, linux-mmc@vger.kernel.org SGksIEFudG9uLg0KQ291bGQgeW91IGhhdmUgYW55IGNvbW1lbnQgYWJvdXQgaXQ/DQpJZiBub3Qs IEkgd2lsbCByZXNlbmQgdGhpcyBwYXRjaCB3aXRoIHYyLg0KDQpCZXN0IFJlZ2FyZHMNCkplcnJ5 IEh1YW5nDQoNCg0KPiAtLS0tLU9yaWdpbmFsIE1lc3NhZ2UtLS0tLQ0KPiBGcm9tOiBsaW51eC1t bWMtb3duZXJAdmdlci5rZXJuZWwub3JnIFttYWlsdG86bGludXgtbW1jLQ0KPiBvd25lckB2Z2Vy Lmtlcm5lbC5vcmddIE9uIEJlaGFsZiBPZiBIdWFuZyBDaGFuZ21pbmctUjY2MDkzDQo+IFNlbnQ6 IFR1ZXNkYXksIE9jdG9iZXIgMjMsIDIwMTIgNDo0MCBQTQ0KPiBUbzogQW50b24gVm9yb250c292 DQo+IENjOiBsaW51eC1tbWNAdmdlci5rZXJuZWwub3JnOyBDaHJpcyBCYWxsOyBLdW1hciBHYWxh OyBsaW51eHBwYy0NCj4gZGV2QGxpc3RzLm96bGFicy5vcmcNCj4gU3ViamVjdDogUkU6IFtQQVRD SF0gcG93ZXJwYy9lc2RoYzogZW5hYmxlIHRoZSBjYXJkIGluc2VydC9yZW1vdmUNCj4gaW50ZXJy dXB0DQo+IA0KPiBIaSwgQW50b24NCj4gRm9yIEZTTCBTT0NzLCB0aGUgaW50ZXJydXB0IG1vZGUg aXMgc3VwcG9ydCBmb3IgY2FyZCBkZXRlY3QuDQo+IEZvciBzb21lIHJlYXNvbnMsIHNvbWUgYm9h cmQgY2FuJ3Qgc3VwcG9ydCB0aGlzIGZlYXR1cmUsIHN1Y2ggYXMNCj4gbXBjODM3eG1kcyBib2Fy ZCwgYnV0IG1wYzgzN3hyZGIgYm9hcmQgc3VwcG9ydCBpdC4NCj4gDQo+IEkgc2VlIHlvdXIgbGlu a3MsIGl0IGlzIGFib3V0IHRoZSBETUEgKHRoZSBmaXJzdCB2ZXJzaW9uIG9mIHAyMDIwIGRvbid0 DQo+IHN1cHBvcnQgRE1BLCBuZWVkIHRvIGVuYWJsZSB0aGUgUElPIG1vZGUsIGJ1dCB0aGUgbGF0 ZXIgdmVyc2lvbiBoYXMgZml4ZWQNCj4gdGhpcyBpc3N1ZSkuDQo+IA0KPiBCZXN0IFJlZ2FyZHMN Cj4gSmVycnkgSHVhbmcNCj4gDQo+IA0KPiA+IC0tLS0tT3JpZ2luYWwgTWVzc2FnZS0tLS0tDQo+ ID4gRnJvbTogbGludXgtbW1jLW93bmVyQHZnZXIua2VybmVsLm9yZyBbbWFpbHRvOmxpbnV4LW1t Yy0NCj4gPiBvd25lckB2Z2VyLmtlcm5lbC5vcmddIE9uIEJlaGFsZiBPZiBBbnRvbiBWb3JvbnRz b3YNCj4gPiBTZW50OiBUdWVzZGF5LCBPY3RvYmVyIDIzLCAyMDEyIDQ6MjcgUE0NCj4gPiBUbzog SHVhbmcgQ2hhbmdtaW5nLVI2NjA5Mw0KPiA+IENjOiBsaW51eC1tbWNAdmdlci5rZXJuZWwub3Jn OyBIdWFuZyBDaGFuZ21pbmctUjY2MDkzOyBDaHJpcyBCYWxsOw0KPiA+IEt1bWFyIEdhbGE7IGxp bnV4cHBjLWRldkBsaXN0cy5vemxhYnMub3JnDQo+ID4gU3ViamVjdDogUmU6IFtQQVRDSF0gcG93 ZXJwYy9lc2RoYzogZW5hYmxlIHRoZSBjYXJkIGluc2VydC9yZW1vdmUNCj4gPiBpbnRlcnJ1cHQN Cj4gPg0KPiA+IE9uIFR1ZSwgT2N0IDIzLCAyMDEyIGF0IDAzOjAxOjE3UE0gKzA4MDAsIHI2NjA5 M0BmcmVlc2NhbGUuY29tIHdyb3RlOg0KPiA+ID4gRnJvbTogSmVycnkgSHVhbmcgPENoYW5nLU1p bmcuSHVhbmdAZnJlZXNjYWxlLmNvbT4NCj4gPiA+DQo+ID4gPiBUaGUgY3VycmVudCBlU0RIQyBk cml2ZXIgdXNlIHRoZSBwb2xsIG1vZGUgdG8gZGV0ZWN0IGlmIHRoZSBTRC9NTUMNCj4gPiA+IGNh cmQgaXMgaW5zZXJ0ZWQgb3IgcmVtb3ZlZCwgd2hpY2ggd2lsbCBnZW5lcmF0ZSBtYW55IGludGVy cnVwdHMgYW5kDQo+ID4gPiBpbXBhY3QgdGhlIHBlcmZvcm1hbmNlLg0KPiA+ID4gVGhlcmVmb3Jl LCBjaGFuZ2UgdGhlIGRlZmF1bHQgY2FyZCBkZXRlY3QgdG8gaW50ZXJydXB0IG1vZGUsIGlmIHRo ZQ0KPiA+ID4gYm9hcmQgY2FuJ3Qgc3VwcG9ydCB0aGlzIG1vZGUsIHdlIHN0aWxsIHVzZSB0aGUg cG9sbCBtb2RlLg0KPiA+ID4NCj4gPiA+IFNpZ25lZC1vZmYtYnk6IEplcnJ5IEh1YW5nIDxDaGFu Zy1NaW5nLkh1YW5nQGZyZWVzY2FsZS5jb20+DQo+ID4gPiBDQzogQW50b24gVm9yb250c292IDxj Ym91YXRtYWlscnVAZ21haWwuY29tPg0KPiA+ID4gQ0M6IENocmlzIEJhbGwgPGNqYkBsYXB0b3Au b3JnPg0KPiA+ID4gLS0tDQo+ID4NCj4gPiBJSVJDLCB0aGUgY2FyZCBkZXRlY3Rpb24gaXMgYnJv a2VuIFNPQy1yZXZpc2lvbi13aXNlLCBub3QgYm9hcmQtd2lzZS4NCj4gPiBTbyB0aGUgY2hhbmdl IHNlZW1zIHdyb25nLg0KPiA+DQo+ID4gQWxzbywgdGFrZSBhIGxvb2sgYXQgdGhpczoNCj4gPg0K PiA+IAlodHRwOi8vbGttbC5vcmcvbGttbC8yMDEwLzcvMTQvMTI3DQo+ID4NCj4gPiBJIHN0YXJ0 ZWQgdGhlIHdvcmsgYnV0IG5ldmVyIGZpbmlzaGVkLCB1bmZvcnR1bmF0ZWx5IGl0IGNhdXNlZCBz b21lDQo+ID4gcmVncmVzc2lvbnMgZm9yIG5vbi1GU0wgaGFyZHdhcmUuLi4NCj4gPg0KPiA+ID4g IGRyaXZlcnMvbW1jL2hvc3Qvc2RoY2ktb2YtZXNkaGMuYyB8ICAgIDcgKysrKysrLQ0KPiA+ID4g IDEgZmlsZSBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkNCj4gPiA+DQo+ ID4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9tbWMvaG9zdC9zZGhjaS1vZi1lc2RoYy5jDQo+ID4g PiBiL2RyaXZlcnMvbW1jL2hvc3Qvc2RoY2ktb2YtZXNkaGMuYw0KPiA+ID4gaW5kZXggZmZjMTIy Ni4uNWRjMzYyZiAxMDA2NDQNCj4gPiA+IC0tLSBhL2RyaXZlcnMvbW1jL2hvc3Qvc2RoY2ktb2Yt ZXNkaGMuYw0KPiA+ID4gKysrIGIvZHJpdmVycy9tbWMvaG9zdC9zZGhjaS1vZi1lc2RoYy5jDQo+ ID4gPiBAQCAtMTk2LDYgKzE5NiwxMSBAQCBzdGF0aWMgdm9pZCBlc2RoY19vZl9kZXRlY3RfbGlt aXRhdGlvbihzdHJ1Y3QNCj4gPiBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYsDQo+ID4gPiAgCWlmICh2 dm4gPT0gVkVORE9SX1ZfMjIpDQo+ID4gPiAgCQlwZGF0YS0+cXVpcmtzMiB8PSBTREhDSV9RVUlS SzJfSE9TVF9OT19DTUQyMzsNCj4gPiA+DQo+ID4gPiArCS8qIFA0MDgwRFMgYW5kIE1QQzgzN1hN RFMgYm9hcmQgZG9uJ3Qgc3VwcG9ydCBpbnRlcnJ1cHQgbW9kZSAqLw0KPiA+ID4gKwlpZiAob2Zf bWFjaGluZV9pc19jb21wYXRpYmxlKCJmc2wsbXBjODM3eG1kcyIpIHx8DQo+ID4gPiArCSAgICBv Zl9tYWNoaW5lX2lzX2NvbXBhdGlibGUoImZzbCxQNDA4MERTIikpDQo+ID4gPiArCQlwZGF0YS0+ cXVpcmtzIHw9IFNESENJX1FVSVJLX0JST0tFTl9DQVJEX0RFVEVDVElPTjsNCj4gPiA+ICsNCj4g PiA+ICAJaW91bm1hcChpb2FkZHIpOw0KPiA+ID4gIGVuZDoNCj4gPiA+ICAJcmV0dXJuOw0KPiA+ ID4gQEAgLTIyMyw3ICsyMjgsNyBAQCBzdGF0aWMgc3RydWN0IHNkaGNpX3BsdGZtX2RhdGEgc2Ro Y2lfZXNkaGNfcGRhdGENCj4gPiA+ID0NCj4gPiB7DQo+ID4gPiAgCSAqIGNhcmQgZGV0ZWN0aW9u IGNvdWxkIGJlIGhhbmRsZWQgdmlhIEdQSU8NCj4gPiA+ICAJICogZVNESEMgY2Fubm90IHN1cHBv cnQgRW5kIEF0dHJpYnV0ZSBpbiBOT1AgQURNQSBkZXNjcmlwdG9yDQo+ID4gPiAgCSAqLw0KPiA+ ID4gLQkucXVpcmtzID0gRVNESENfREVGQVVMVF9RVUlSS1MgfCBTREhDSV9RVUlSS19CUk9LRU5f Q0FSRF9ERVRFQ1RJT04NCj4gPiA+ICsJLnF1aXJrcyA9IEVTREhDX0RFRkFVTFRfUVVJUktTDQo+ ID4gPiAgCQl8IFNESENJX1FVSVJLX05PX0NBUkRfTk9fUkVTRVQNCj4gPiA+ICAJCXwgU0RIQ0lf UVVJUktfTk9fRU5EQVRUUl9JTl9OT1BERVNDLA0KPiA+ID4gIAkub3BzID0gJnNkaGNpX2VzZGhj X29wcywNCj4gPiA+IC0tDQo+ID4gPiAxLjcuOS41DQo+ID4gLS0NCj4gPiBUbyB1bnN1YnNjcmli ZSBmcm9tIHRoaXMgbGlzdDogc2VuZCB0aGUgbGluZSAidW5zdWJzY3JpYmUgbGludXgtbW1jIg0K PiA+IGluIHRoZSBib2R5IG9mIGEgbWVzc2FnZSB0byBtYWpvcmRvbW9Admdlci5rZXJuZWwub3Jn IE1vcmUgbWFqb3Jkb21vDQo+ID4gaW5mbyBhdCBodHRwOi8vdmdlci5rZXJuZWwub3JnL21ham9y ZG9tby1pbmZvLmh0bWwNCj4gDQo+IE4gICAgIHIgIHkgICBiIFggIMendiBeICneunsubiArICAg IHsgIGciICBebiByICAgeiAaICBoICAgICYgIB4gRyAgIGgNCj4gAygg6ZqOIN2iaiIgIBogG20g ICAgIHog3pYgICBmICAgaCAgIH4gbQ0K ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] powerpc/esdhc: enable the card insert/remove interrupt 2012-10-25 10:05 ` Huang Changming-R66093 @ 2012-10-25 10:30 ` Anton Vorontsov -1 siblings, 0 replies; 15+ messages in thread From: Anton Vorontsov @ 2012-10-25 10:30 UTC (permalink / raw) To: Huang Changming-R66093 Cc: linux-mmc@vger.kernel.org, Chris Ball, Kumar Gala, linuxppc-dev@lists.ozlabs.org On Thu, Oct 25, 2012 at 10:05:44AM +0000, Huang Changming-R66093 wrote: > Hi, Anton. > Could you have any comment about it? > If not, I will resend this patch with v2. Technically, the patch looks fine. But again, as far as I recall, the card detection logic was broken on the SOC level (it's actually very hard to break it on the board level -- it would either work or not, but in the eSDHC case it was just unreliable, again, if I recall everything correctly -- I might be wrong). Of course you know the hardware much better, so your words weight more, so you don't need my ack on the patch. :) Although there's a second issue: for P4080DS and mpc837x boards you still have the same problem with polling method, right? It is causing performance drops/freezes every like 100 ms, and that's why you want to avoid the polling. So, you've "fixed" some boards, but left others to suffer. Ideally, the best fix would be to also make the card polling cheap. Anyways, using (d) clause of the "Reviewer's statement of oversight", I can easily give this: Reviewed-by: Anton Vorontsov <cbouatmailru@gmail.com> :) Thanks! [...] > > > IIRC, the card detection is broken SOC-revision-wise, not board-wise. > > > So the change seems wrong. > > > > > > Also, take a look at this: > > > > > > http://lkml.org/lkml/2010/7/14/127 > > > > > > I started the work but never finished, unfortunately it caused some > > > regressions for non-FSL hardware... > > > > > > > drivers/mmc/host/sdhci-of-esdhc.c | 7 ++++++- > > > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > > > > > diff --git a/drivers/mmc/host/sdhci-of-esdhc.c > > > > b/drivers/mmc/host/sdhci-of-esdhc.c > > > > index ffc1226..5dc362f 100644 > > > > --- a/drivers/mmc/host/sdhci-of-esdhc.c > > > > +++ b/drivers/mmc/host/sdhci-of-esdhc.c > > > > @@ -196,6 +196,11 @@ static void esdhc_of_detect_limitation(struct > > > platform_device *pdev, > > > > if (vvn == VENDOR_V_22) > > > > pdata->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23; > > > > > > > > + /* P4080DS and MPC837XMDS board don't support interrupt mode */ > > > > + if (of_machine_is_compatible("fsl,mpc837xmds") || > > > > + of_machine_is_compatible("fsl,P4080DS")) > > > > + pdata->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION; > > > > + > > > > iounmap(ioaddr); > > > > end: > > > > return; > > > > @@ -223,7 +228,7 @@ static struct sdhci_pltfm_data sdhci_esdhc_pdata > > > > = > > > { > > > > * card detection could be handled via GPIO > > > > * eSDHC cannot support End Attribute in NOP ADMA descriptor > > > > */ > > > > - .quirks = ESDHC_DEFAULT_QUIRKS | SDHCI_QUIRK_BROKEN_CARD_DETECTION > > > > + .quirks = ESDHC_DEFAULT_QUIRKS > > > > | SDHCI_QUIRK_NO_CARD_NO_RESET > > > > | SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, > > > > .ops = &sdhci_esdhc_ops, > > > > -- > > > > 1.7.9.5 ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] powerpc/esdhc: enable the card insert/remove interrupt @ 2012-10-25 10:30 ` Anton Vorontsov 0 siblings, 0 replies; 15+ messages in thread From: Anton Vorontsov @ 2012-10-25 10:30 UTC (permalink / raw) To: Huang Changming-R66093 Cc: linuxppc-dev@lists.ozlabs.org, Chris Ball, linux-mmc@vger.kernel.org On Thu, Oct 25, 2012 at 10:05:44AM +0000, Huang Changming-R66093 wrote: > Hi, Anton. > Could you have any comment about it? > If not, I will resend this patch with v2. Technically, the patch looks fine. But again, as far as I recall, the card detection logic was broken on the SOC level (it's actually very hard to break it on the board level -- it would either work or not, but in the eSDHC case it was just unreliable, again, if I recall everything correctly -- I might be wrong). Of course you know the hardware much better, so your words weight more, so you don't need my ack on the patch. :) Although there's a second issue: for P4080DS and mpc837x boards you still have the same problem with polling method, right? It is causing performance drops/freezes every like 100 ms, and that's why you want to avoid the polling. So, you've "fixed" some boards, but left others to suffer. Ideally, the best fix would be to also make the card polling cheap. Anyways, using (d) clause of the "Reviewer's statement of oversight", I can easily give this: Reviewed-by: Anton Vorontsov <cbouatmailru@gmail.com> :) Thanks! [...] > > > IIRC, the card detection is broken SOC-revision-wise, not board-wise. > > > So the change seems wrong. > > > > > > Also, take a look at this: > > > > > > http://lkml.org/lkml/2010/7/14/127 > > > > > > I started the work but never finished, unfortunately it caused some > > > regressions for non-FSL hardware... > > > > > > > drivers/mmc/host/sdhci-of-esdhc.c | 7 ++++++- > > > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > > > > > diff --git a/drivers/mmc/host/sdhci-of-esdhc.c > > > > b/drivers/mmc/host/sdhci-of-esdhc.c > > > > index ffc1226..5dc362f 100644 > > > > --- a/drivers/mmc/host/sdhci-of-esdhc.c > > > > +++ b/drivers/mmc/host/sdhci-of-esdhc.c > > > > @@ -196,6 +196,11 @@ static void esdhc_of_detect_limitation(struct > > > platform_device *pdev, > > > > if (vvn == VENDOR_V_22) > > > > pdata->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23; > > > > > > > > + /* P4080DS and MPC837XMDS board don't support interrupt mode */ > > > > + if (of_machine_is_compatible("fsl,mpc837xmds") || > > > > + of_machine_is_compatible("fsl,P4080DS")) > > > > + pdata->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION; > > > > + > > > > iounmap(ioaddr); > > > > end: > > > > return; > > > > @@ -223,7 +228,7 @@ static struct sdhci_pltfm_data sdhci_esdhc_pdata > > > > = > > > { > > > > * card detection could be handled via GPIO > > > > * eSDHC cannot support End Attribute in NOP ADMA descriptor > > > > */ > > > > - .quirks = ESDHC_DEFAULT_QUIRKS | SDHCI_QUIRK_BROKEN_CARD_DETECTION > > > > + .quirks = ESDHC_DEFAULT_QUIRKS > > > > | SDHCI_QUIRK_NO_CARD_NO_RESET > > > > | SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, > > > > .ops = &sdhci_esdhc_ops, > > > > -- > > > > 1.7.9.5 ^ permalink raw reply [flat|nested] 15+ messages in thread
* RE: [PATCH] powerpc/esdhc: enable the card insert/remove interrupt 2012-10-25 10:30 ` Anton Vorontsov @ 2012-10-26 2:42 ` Huang Changming-R66093 -1 siblings, 0 replies; 15+ messages in thread From: Huang Changming-R66093 @ 2012-10-26 2:42 UTC (permalink / raw) To: Anton Vorontsov Cc: linux-mmc@vger.kernel.org, Chris Ball, Kumar Gala, linuxppc-dev@lists.ozlabs.org [-- Attachment #1: Type: text/plain, Size: 4836 bytes --] Hi, Anton, For the current polling mode, driver will send CMD13 to poll the card status periodically , which will cause too many interrupts. Once I sent patches to detect the card when using polling mode last year: read the state register, instead of send CMD13. But, these patches were not accepted. Now I attach them for you. Because these patches are not accepted, I think about the interrupt mode to detect card. Of course, you are right, the p4080ds and mpc837xmds are still using polling mode, which just fix some boards. The best way is for all. Then, I will back to my previous patches, for FSL eSDHC, don't send CMD13, and just read state register to check it. For all FSL silicones, the state bit is updated when card inserting or removing. Now I have two ways to resolve this issue, I prefer to the polling mode (unfortunately, they are not accepted). I will be greatly appreciated if you review these attachment patches again and give your comment. If you think the attachment patches are OK, I will resend them to mail list. If you don't, I will continue to work on the interrupt mode for FSL eSDHC. Thanks. > -----Original Message----- > From: linux-mmc-owner@vger.kernel.org [mailto:linux-mmc- > owner@vger.kernel.org] On Behalf Of Anton Vorontsov > Sent: Thursday, October 25, 2012 6:31 PM > To: Huang Changming-R66093 > Cc: linux-mmc@vger.kernel.org; Chris Ball; Kumar Gala; linuxppc- > dev@lists.ozlabs.org > Subject: Re: [PATCH] powerpc/esdhc: enable the card insert/remove > interrupt > > On Thu, Oct 25, 2012 at 10:05:44AM +0000, Huang Changming-R66093 wrote: > > Hi, Anton. > > Could you have any comment about it? > > If not, I will resend this patch with v2. > > Technically, the patch looks fine. > > But again, as far as I recall, the card detection logic was broken on the > SOC level (it's actually very hard to break it on the board level -- it > would either work or not, but in the eSDHC case it was just unreliable, > again, if I recall everything correctly -- I might be wrong). > > Of course you know the hardware much better, so your words weight more, > so you don't need my ack on the patch. :) > > Although there's a second issue: for P4080DS and mpc837x boards you still > have the same problem with polling method, right? It is causing > performance drops/freezes every like 100 ms, and that's why you want to > avoid the polling. > > So, you've "fixed" some boards, but left others to suffer. Ideally, the > best fix would be to also make the card polling cheap. > > Anyways, using (d) clause of the "Reviewer's statement of oversight", I > can easily give this: > > Reviewed-by: Anton Vorontsov <cbouatmailru@gmail.com> > > :) > > Thanks! > > [...] > > > > IIRC, the card detection is broken SOC-revision-wise, not board- > wise. > > > > So the change seems wrong. > > > > > > > > Also, take a look at this: > > > > > > > > http://lkml.org/lkml/2010/7/14/127 > > > > > > > > I started the work but never finished, unfortunately it caused > > > > some regressions for non-FSL hardware... > > > > > > > > > drivers/mmc/host/sdhci-of-esdhc.c | 7 ++++++- > > > > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > > > > > > > diff --git a/drivers/mmc/host/sdhci-of-esdhc.c > > > > > b/drivers/mmc/host/sdhci-of-esdhc.c > > > > > index ffc1226..5dc362f 100644 > > > > > --- a/drivers/mmc/host/sdhci-of-esdhc.c > > > > > +++ b/drivers/mmc/host/sdhci-of-esdhc.c > > > > > @@ -196,6 +196,11 @@ static void > > > > > esdhc_of_detect_limitation(struct > > > > platform_device *pdev, > > > > > if (vvn == VENDOR_V_22) > > > > > pdata->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23; > > > > > > > > > > + /* P4080DS and MPC837XMDS board don't support interrupt mode > */ > > > > > + if (of_machine_is_compatible("fsl,mpc837xmds") || > > > > > + of_machine_is_compatible("fsl,P4080DS")) > > > > > + pdata->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION; > > > > > + > > > > > iounmap(ioaddr); > > > > > end: > > > > > return; > > > > > @@ -223,7 +228,7 @@ static struct sdhci_pltfm_data > > > > > sdhci_esdhc_pdata = > > > > { > > > > > * card detection could be handled via GPIO > > > > > * eSDHC cannot support End Attribute in NOP ADMA descriptor > > > > > */ > > > > > - .quirks = ESDHC_DEFAULT_QUIRKS | > SDHCI_QUIRK_BROKEN_CARD_DETECTION > > > > > + .quirks = ESDHC_DEFAULT_QUIRKS > > > > > | SDHCI_QUIRK_NO_CARD_NO_RESET > > > > > | SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, > > > > > .ops = &sdhci_esdhc_ops, > > > > > -- > > > > > 1.7.9.5 > -- > To unsubscribe from this list: send the line "unsubscribe linux-mmc" in > the body of a message to majordomo@vger.kernel.org More majordomo info at > http://vger.kernel.org/majordomo-info.html [-- Attachment #2: 0002-MMC-SD-Add-callback-function-to-detect-card.patch --] [-- Type: application/octet-stream, Size: 2094 bytes --] From bd9be632c2ebf77ba067dbb52a8c4bd73be1697b Mon Sep 17 00:00:00 2001 From: Jerry Huang <Chang-Ming.Huang@freescale.com> Date: Tue, 6 Dec 2011 17:22:27 +0800 Subject: [PATCH 2/4 v4] MMC/SD: Add callback function to detect card In order to check whether the card has been removed, the function mmc_send_status() will send command CMD13 to card and ask the card to send its status register to sdhc driver, which will generate many interrupts repeatedly and make the system performance bad. Therefore, add callback function get_cd() to check whether the card has been removed when the driver has this callback function. If the card is present, 1 will return, if the card is absent, 0 will return. If the controller will not support this feature, -ENOSYS will return. Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com> CC: Chris Ball <cjb@laptop.org> --- changes for v2: - when controller don't support get_cd, return -ENOSYS - add the CC changes for v3: - enalbe the controller clock in platform, instead of core changes for v4: - move the detect code to core.c according to the new structure drivers/mmc/core/core.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 6db6621..d570c72 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2060,7 +2060,7 @@ static int mmc_rescan_try_freq(struct mmc_host *host, unsigned freq) int _mmc_detect_card_removed(struct mmc_host *host) { - int ret; + int ret = -ENOSYS; if ((host->caps & MMC_CAP_NONREMOVABLE) || !host->bus_ops->alive) return 0; @@ -2068,7 +2068,13 @@ int _mmc_detect_card_removed(struct mmc_host *host) if (!host->card || mmc_card_removed(host->card)) return 1; - ret = host->bus_ops->alive(host); + if (host->ops->get_cd) { + ret = host->ops->get_cd(host); + if (ret >= 0) + ret = !ret; + } + if (ret < 0) + ret = host->bus_ops->alive(host); if (ret) { mmc_card_set_removed(host->card); pr_debug("%s: card remove detected\n", mmc_hostname(host)); -- 1.7.5.4 [-- Attachment #3: 0003-SDHCI-add-sdhci_get_cd-callback-to-detect-the-card.patch --] [-- Type: application/octet-stream, Size: 3102 bytes --] From c029b98325733ea0225389612eb7b9f0f0b722cd Mon Sep 17 00:00:00 2001 From: Jerry Huang <Chang-Ming.Huang@freescale.com> Date: Wed, 7 Dec 2011 10:41:49 +0800 Subject: [PATCH 3/4 v5] SDHCI: add sdhci_get_cd callback to detect the card Add callback function sdhci_get_cd to detect the card. And one new callback added to implement the card detect in sdhci struncture. If special platform has the card detect callback, it will return the card state, the value zero is for absent cardi and one is for present card. If the controller don't support card detect, sdhci_get_cd will return -ENOSYS. Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com> CC: Chris Ball <cjb@laptop.org> --- changes for v2: - when controller don't support get_cd, return -ENOSYS - add new callback for sdhci to detect the card - add the CC changes for v3: - use pin_lock only when get_cd defined changes for v4: - enalbe the controller clock in platform, instead of core changes for v5: - remove the copyright drivers/mmc/host/sdhci.c | 21 ++++++++++++++++++++++ drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 6d8eea3..fbe2f46 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1518,6 +1519,26 @@ static int sdhci_get_ro(struct mmc_host *mmc) return ret; } +/* Return values for the sdjco_get_cd callback: + * 0 for a absent card + * 1 for a present card + * -ENOSYS when not supported (equal to NULL callback) + */ +static int sdhci_get_cd(struct mmc_host *mmc) +{ + struct sdhci_host *host = mmc_priv(mmc); + unsigned long flags; + int present = -ENOSYS; + + if (host->ops->get_cd) { + spin_lock_irqsave(&host->lock, flags); + present = host->ops->get_cd(host); + spin_unlock_irqrestore(&host->lock, flags); + } + + return present; +} + static void sdhci_enable_sdio_irq_nolock(struct sdhci_host *host, int enable) { if (host->flags & SDHCI_DEVICE_DEAD) @@ -1884,6 +1905,7 @@ static const struct mmc_host_ops sdhci_ops = { .request = sdhci_request, .set_ios = sdhci_set_ios, .get_ro = sdhci_get_ro, + .get_cd = sdhci_get_cd, .hw_reset = sdhci_hw_reset, .enable_sdio_irq = sdhci_enable_sdio_irq, .start_signal_voltage_switch = sdhci_start_signal_voltage_switch, diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 0a5b654..82f4d27 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -69,6 +69,7 @@ #define SDHCI_SPACE_AVAILABLE 0x00000400 #define SDHCI_DATA_AVAILABLE 0x00000800 #define SDHCI_CARD_PRESENT 0x00010000 +#define SDHCI_CARD_CDPL 0x00040000 #define SDHCI_WRITE_PROTECT 0x00080000 #define SDHCI_DATA_LVL_MASK 0x00F00000 #define SDHCI_DATA_LVL_SHIFT 20 @@ -261,6 +262,7 @@ struct sdhci_ops { void (*set_clock)(struct sdhci_host *host, unsigned int clock); + int (*get_cd)(struct sdhci_host *host); int (*enable_dma)(struct sdhci_host *host); unsigned int (*get_max_clock)(struct sdhci_host *host); unsigned int (*get_min_clock)(struct sdhci_host *host); -- 1.7.5.4 [-- Attachment #4: 0004-ESDHC-add-callback-esdhc_of_get_cd-to-detect-card.patch --] [-- Type: application/octet-stream, Size: 2480 bytes --] From 99e41c1bacbad5e9a3418bcac2b5f778516efe6d Mon Sep 17 00:00:00 2001 From: Jerry Huang <Chang-Ming.Huang@freescale.com> Date: Fri, 9 Dec 2011 11:06:58 +0800 Subject: [PATCH 4/4 v3] ESDHC: add callback esdhc_of_get_cd to detect card In order to check if the card is present, we will read the PRESENT STATE register and check the bit13(Card detect pin level) and bit15(CINS). Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com> CC: Chris Ball <cjb@laptop.org> --- changes for v2: - add new callback for esdhc to detect the card state - add the CC changes for v3: - enable the controller clock when detect the card state, not core drivers/mmc/host/sdhci-of-esdhc.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c index 59e9d00..40da8f4 100644 --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c @@ -1,7 +1,7 @@ /* * Freescale eSDHC controller driver. * - * Copyright (c) 2007, 2010 Freescale Semiconductor, Inc. + * Copyright (c) 2007, 2010-2011 Freescale Semiconductor, Inc. * Copyright (c) 2009 MontaVista Software, Inc. * * Authors: Xiaobo Xie <X.Xie@freescale.com> @@ -82,6 +82,28 @@ static unsigned int esdhc_of_get_min_clock(struct sdhci_host *host) return pltfm_host->clock / 256 / 16; } +/* Return: none zero - the card is presetn; 0 - card is absent */ +static int esdhc_of_get_cd(struct sdhci_host *host) +{ + int present; + + if (host->flags & SDHCI_DEVICE_DEAD) + present = 0; + else { + int sysctl = sdhci_be32bs_readl(host, SDHCI_CLOCK_CONTROL); + /* Enable the controller clock to update the present state */ + sdhci_be32bs_writel(host, sysctl | SDHCI_CLOCK_INT_EN, + SDHCI_CLOCK_CONTROL); + /* Detect the card present or absent */ + present = sdhci_be32bs_readl(host, SDHCI_PRESENT_STATE); + present &= (SDHCI_CARD_PRESENT | SDHCI_CARD_CDPL); + /* Resve the previous to System control register */ + sdhci_be32bs_writel(host, sysctl, SDHCI_CLOCK_CONTROL); + } + + return present; +} + static struct sdhci_ops sdhci_esdhc_ops = { .read_l = sdhci_be32bs_readl, .read_w = esdhc_readw, @@ -93,6 +115,7 @@ static struct sdhci_ops sdhci_esdhc_ops = { .enable_dma = esdhc_of_enable_dma, .get_max_clock = esdhc_of_get_max_clock, .get_min_clock = esdhc_of_get_min_clock, + .get_cd = esdhc_of_get_cd, }; static struct sdhci_pltfm_data sdhci_esdhc_pdata = { -- 1.7.5.4 [-- Attachment #5: 0001-MMC-core-Add-f_min-to-mmc_power_on.patch --] [-- Type: application/octet-stream, Size: 1072 bytes --] From 5abfc594fd26198df957a5710c026d8be6de4f5e Mon Sep 17 00:00:00 2001 From: Jerry Huang <Chang-Ming.Huang@freescale.com> Date: Mon, 5 Dec 2011 14:28:31 +0800 Subject: [PATCH 1/4 v3] MMC/core: Add f_min to mmc_power_on() When f_init is zero, the SDHC can't work correctly. So f_min will replace f_init, when f_init is zero. Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com> CC: Chris Ball <cjb@laptop.org> --- changes for v2: - add the CC changes for v3: - enalbe the controller clock in platform, instead of core drivers/mmc/core/core.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index a08e6b1..2d40c04 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1253,7 +1253,10 @@ static void mmc_power_up(struct mmc_host *host) */ mmc_delay(10); - host->ios.clock = host->f_init; + if (host->f_init) + host->ios.clock = host->f_init; + else + host->ios.clock = host->f_min; host->ios.power_mode = MMC_POWER_ON; mmc_set_ios(host); -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* RE: [PATCH] powerpc/esdhc: enable the card insert/remove interrupt @ 2012-10-26 2:42 ` Huang Changming-R66093 0 siblings, 0 replies; 15+ messages in thread From: Huang Changming-R66093 @ 2012-10-26 2:42 UTC (permalink / raw) To: Anton Vorontsov Cc: linuxppc-dev@lists.ozlabs.org, Chris Ball, linux-mmc@vger.kernel.org [-- Attachment #1: Type: text/plain, Size: 4836 bytes --] Hi, Anton, For the current polling mode, driver will send CMD13 to poll the card status periodically , which will cause too many interrupts. Once I sent patches to detect the card when using polling mode last year: read the state register, instead of send CMD13. But, these patches were not accepted. Now I attach them for you. Because these patches are not accepted, I think about the interrupt mode to detect card. Of course, you are right, the p4080ds and mpc837xmds are still using polling mode, which just fix some boards. The best way is for all. Then, I will back to my previous patches, for FSL eSDHC, don't send CMD13, and just read state register to check it. For all FSL silicones, the state bit is updated when card inserting or removing. Now I have two ways to resolve this issue, I prefer to the polling mode (unfortunately, they are not accepted). I will be greatly appreciated if you review these attachment patches again and give your comment. If you think the attachment patches are OK, I will resend them to mail list. If you don't, I will continue to work on the interrupt mode for FSL eSDHC. Thanks. > -----Original Message----- > From: linux-mmc-owner@vger.kernel.org [mailto:linux-mmc- > owner@vger.kernel.org] On Behalf Of Anton Vorontsov > Sent: Thursday, October 25, 2012 6:31 PM > To: Huang Changming-R66093 > Cc: linux-mmc@vger.kernel.org; Chris Ball; Kumar Gala; linuxppc- > dev@lists.ozlabs.org > Subject: Re: [PATCH] powerpc/esdhc: enable the card insert/remove > interrupt > > On Thu, Oct 25, 2012 at 10:05:44AM +0000, Huang Changming-R66093 wrote: > > Hi, Anton. > > Could you have any comment about it? > > If not, I will resend this patch with v2. > > Technically, the patch looks fine. > > But again, as far as I recall, the card detection logic was broken on the > SOC level (it's actually very hard to break it on the board level -- it > would either work or not, but in the eSDHC case it was just unreliable, > again, if I recall everything correctly -- I might be wrong). > > Of course you know the hardware much better, so your words weight more, > so you don't need my ack on the patch. :) > > Although there's a second issue: for P4080DS and mpc837x boards you still > have the same problem with polling method, right? It is causing > performance drops/freezes every like 100 ms, and that's why you want to > avoid the polling. > > So, you've "fixed" some boards, but left others to suffer. Ideally, the > best fix would be to also make the card polling cheap. > > Anyways, using (d) clause of the "Reviewer's statement of oversight", I > can easily give this: > > Reviewed-by: Anton Vorontsov <cbouatmailru@gmail.com> > > :) > > Thanks! > > [...] > > > > IIRC, the card detection is broken SOC-revision-wise, not board- > wise. > > > > So the change seems wrong. > > > > > > > > Also, take a look at this: > > > > > > > > http://lkml.org/lkml/2010/7/14/127 > > > > > > > > I started the work but never finished, unfortunately it caused > > > > some regressions for non-FSL hardware... > > > > > > > > > drivers/mmc/host/sdhci-of-esdhc.c | 7 ++++++- > > > > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > > > > > > > diff --git a/drivers/mmc/host/sdhci-of-esdhc.c > > > > > b/drivers/mmc/host/sdhci-of-esdhc.c > > > > > index ffc1226..5dc362f 100644 > > > > > --- a/drivers/mmc/host/sdhci-of-esdhc.c > > > > > +++ b/drivers/mmc/host/sdhci-of-esdhc.c > > > > > @@ -196,6 +196,11 @@ static void > > > > > esdhc_of_detect_limitation(struct > > > > platform_device *pdev, > > > > > if (vvn == VENDOR_V_22) > > > > > pdata->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23; > > > > > > > > > > + /* P4080DS and MPC837XMDS board don't support interrupt mode > */ > > > > > + if (of_machine_is_compatible("fsl,mpc837xmds") || > > > > > + of_machine_is_compatible("fsl,P4080DS")) > > > > > + pdata->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION; > > > > > + > > > > > iounmap(ioaddr); > > > > > end: > > > > > return; > > > > > @@ -223,7 +228,7 @@ static struct sdhci_pltfm_data > > > > > sdhci_esdhc_pdata = > > > > { > > > > > * card detection could be handled via GPIO > > > > > * eSDHC cannot support End Attribute in NOP ADMA descriptor > > > > > */ > > > > > - .quirks = ESDHC_DEFAULT_QUIRKS | > SDHCI_QUIRK_BROKEN_CARD_DETECTION > > > > > + .quirks = ESDHC_DEFAULT_QUIRKS > > > > > | SDHCI_QUIRK_NO_CARD_NO_RESET > > > > > | SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, > > > > > .ops = &sdhci_esdhc_ops, > > > > > -- > > > > > 1.7.9.5 > -- > To unsubscribe from this list: send the line "unsubscribe linux-mmc" in > the body of a message to majordomo@vger.kernel.org More majordomo info at > http://vger.kernel.org/majordomo-info.html [-- Attachment #2: 0002-MMC-SD-Add-callback-function-to-detect-card.patch --] [-- Type: application/octet-stream, Size: 2094 bytes --] From bd9be632c2ebf77ba067dbb52a8c4bd73be1697b Mon Sep 17 00:00:00 2001 From: Jerry Huang <Chang-Ming.Huang@freescale.com> Date: Tue, 6 Dec 2011 17:22:27 +0800 Subject: [PATCH 2/4 v4] MMC/SD: Add callback function to detect card In order to check whether the card has been removed, the function mmc_send_status() will send command CMD13 to card and ask the card to send its status register to sdhc driver, which will generate many interrupts repeatedly and make the system performance bad. Therefore, add callback function get_cd() to check whether the card has been removed when the driver has this callback function. If the card is present, 1 will return, if the card is absent, 0 will return. If the controller will not support this feature, -ENOSYS will return. Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com> CC: Chris Ball <cjb@laptop.org> --- changes for v2: - when controller don't support get_cd, return -ENOSYS - add the CC changes for v3: - enalbe the controller clock in platform, instead of core changes for v4: - move the detect code to core.c according to the new structure drivers/mmc/core/core.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 6db6621..d570c72 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2060,7 +2060,7 @@ static int mmc_rescan_try_freq(struct mmc_host *host, unsigned freq) int _mmc_detect_card_removed(struct mmc_host *host) { - int ret; + int ret = -ENOSYS; if ((host->caps & MMC_CAP_NONREMOVABLE) || !host->bus_ops->alive) return 0; @@ -2068,7 +2068,13 @@ int _mmc_detect_card_removed(struct mmc_host *host) if (!host->card || mmc_card_removed(host->card)) return 1; - ret = host->bus_ops->alive(host); + if (host->ops->get_cd) { + ret = host->ops->get_cd(host); + if (ret >= 0) + ret = !ret; + } + if (ret < 0) + ret = host->bus_ops->alive(host); if (ret) { mmc_card_set_removed(host->card); pr_debug("%s: card remove detected\n", mmc_hostname(host)); -- 1.7.5.4 [-- Attachment #3: 0003-SDHCI-add-sdhci_get_cd-callback-to-detect-the-card.patch --] [-- Type: application/octet-stream, Size: 3102 bytes --] From c029b98325733ea0225389612eb7b9f0f0b722cd Mon Sep 17 00:00:00 2001 From: Jerry Huang <Chang-Ming.Huang@freescale.com> Date: Wed, 7 Dec 2011 10:41:49 +0800 Subject: [PATCH 3/4 v5] SDHCI: add sdhci_get_cd callback to detect the card Add callback function sdhci_get_cd to detect the card. And one new callback added to implement the card detect in sdhci struncture. If special platform has the card detect callback, it will return the card state, the value zero is for absent cardi and one is for present card. If the controller don't support card detect, sdhci_get_cd will return -ENOSYS. Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com> CC: Chris Ball <cjb@laptop.org> --- changes for v2: - when controller don't support get_cd, return -ENOSYS - add new callback for sdhci to detect the card - add the CC changes for v3: - use pin_lock only when get_cd defined changes for v4: - enalbe the controller clock in platform, instead of core changes for v5: - remove the copyright drivers/mmc/host/sdhci.c | 21 ++++++++++++++++++++++ drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 6d8eea3..fbe2f46 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1518,6 +1519,26 @@ static int sdhci_get_ro(struct mmc_host *mmc) return ret; } +/* Return values for the sdjco_get_cd callback: + * 0 for a absent card + * 1 for a present card + * -ENOSYS when not supported (equal to NULL callback) + */ +static int sdhci_get_cd(struct mmc_host *mmc) +{ + struct sdhci_host *host = mmc_priv(mmc); + unsigned long flags; + int present = -ENOSYS; + + if (host->ops->get_cd) { + spin_lock_irqsave(&host->lock, flags); + present = host->ops->get_cd(host); + spin_unlock_irqrestore(&host->lock, flags); + } + + return present; +} + static void sdhci_enable_sdio_irq_nolock(struct sdhci_host *host, int enable) { if (host->flags & SDHCI_DEVICE_DEAD) @@ -1884,6 +1905,7 @@ static const struct mmc_host_ops sdhci_ops = { .request = sdhci_request, .set_ios = sdhci_set_ios, .get_ro = sdhci_get_ro, + .get_cd = sdhci_get_cd, .hw_reset = sdhci_hw_reset, .enable_sdio_irq = sdhci_enable_sdio_irq, .start_signal_voltage_switch = sdhci_start_signal_voltage_switch, diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 0a5b654..82f4d27 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -69,6 +69,7 @@ #define SDHCI_SPACE_AVAILABLE 0x00000400 #define SDHCI_DATA_AVAILABLE 0x00000800 #define SDHCI_CARD_PRESENT 0x00010000 +#define SDHCI_CARD_CDPL 0x00040000 #define SDHCI_WRITE_PROTECT 0x00080000 #define SDHCI_DATA_LVL_MASK 0x00F00000 #define SDHCI_DATA_LVL_SHIFT 20 @@ -261,6 +262,7 @@ struct sdhci_ops { void (*set_clock)(struct sdhci_host *host, unsigned int clock); + int (*get_cd)(struct sdhci_host *host); int (*enable_dma)(struct sdhci_host *host); unsigned int (*get_max_clock)(struct sdhci_host *host); unsigned int (*get_min_clock)(struct sdhci_host *host); -- 1.7.5.4 [-- Attachment #4: 0004-ESDHC-add-callback-esdhc_of_get_cd-to-detect-card.patch --] [-- Type: application/octet-stream, Size: 2480 bytes --] From 99e41c1bacbad5e9a3418bcac2b5f778516efe6d Mon Sep 17 00:00:00 2001 From: Jerry Huang <Chang-Ming.Huang@freescale.com> Date: Fri, 9 Dec 2011 11:06:58 +0800 Subject: [PATCH 4/4 v3] ESDHC: add callback esdhc_of_get_cd to detect card In order to check if the card is present, we will read the PRESENT STATE register and check the bit13(Card detect pin level) and bit15(CINS). Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com> CC: Chris Ball <cjb@laptop.org> --- changes for v2: - add new callback for esdhc to detect the card state - add the CC changes for v3: - enable the controller clock when detect the card state, not core drivers/mmc/host/sdhci-of-esdhc.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c index 59e9d00..40da8f4 100644 --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c @@ -1,7 +1,7 @@ /* * Freescale eSDHC controller driver. * - * Copyright (c) 2007, 2010 Freescale Semiconductor, Inc. + * Copyright (c) 2007, 2010-2011 Freescale Semiconductor, Inc. * Copyright (c) 2009 MontaVista Software, Inc. * * Authors: Xiaobo Xie <X.Xie@freescale.com> @@ -82,6 +82,28 @@ static unsigned int esdhc_of_get_min_clock(struct sdhci_host *host) return pltfm_host->clock / 256 / 16; } +/* Return: none zero - the card is presetn; 0 - card is absent */ +static int esdhc_of_get_cd(struct sdhci_host *host) +{ + int present; + + if (host->flags & SDHCI_DEVICE_DEAD) + present = 0; + else { + int sysctl = sdhci_be32bs_readl(host, SDHCI_CLOCK_CONTROL); + /* Enable the controller clock to update the present state */ + sdhci_be32bs_writel(host, sysctl | SDHCI_CLOCK_INT_EN, + SDHCI_CLOCK_CONTROL); + /* Detect the card present or absent */ + present = sdhci_be32bs_readl(host, SDHCI_PRESENT_STATE); + present &= (SDHCI_CARD_PRESENT | SDHCI_CARD_CDPL); + /* Resve the previous to System control register */ + sdhci_be32bs_writel(host, sysctl, SDHCI_CLOCK_CONTROL); + } + + return present; +} + static struct sdhci_ops sdhci_esdhc_ops = { .read_l = sdhci_be32bs_readl, .read_w = esdhc_readw, @@ -93,6 +115,7 @@ static struct sdhci_ops sdhci_esdhc_ops = { .enable_dma = esdhc_of_enable_dma, .get_max_clock = esdhc_of_get_max_clock, .get_min_clock = esdhc_of_get_min_clock, + .get_cd = esdhc_of_get_cd, }; static struct sdhci_pltfm_data sdhci_esdhc_pdata = { -- 1.7.5.4 [-- Attachment #5: 0001-MMC-core-Add-f_min-to-mmc_power_on.patch --] [-- Type: application/octet-stream, Size: 1072 bytes --] From 5abfc594fd26198df957a5710c026d8be6de4f5e Mon Sep 17 00:00:00 2001 From: Jerry Huang <Chang-Ming.Huang@freescale.com> Date: Mon, 5 Dec 2011 14:28:31 +0800 Subject: [PATCH 1/4 v3] MMC/core: Add f_min to mmc_power_on() When f_init is zero, the SDHC can't work correctly. So f_min will replace f_init, when f_init is zero. Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com> CC: Chris Ball <cjb@laptop.org> --- changes for v2: - add the CC changes for v3: - enalbe the controller clock in platform, instead of core drivers/mmc/core/core.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index a08e6b1..2d40c04 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1253,7 +1253,10 @@ static void mmc_power_up(struct mmc_host *host) */ mmc_delay(10); - host->ios.clock = host->f_init; + if (host->f_init) + host->ios.clock = host->f_init; + else + host->ios.clock = host->f_min; host->ios.power_mode = MMC_POWER_ON; mmc_set_ios(host); -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH] powerpc/esdhc: enable the card insert/remove interrupt 2012-10-26 2:42 ` Huang Changming-R66093 @ 2012-10-27 1:12 ` Anton Vorontsov -1 siblings, 0 replies; 15+ messages in thread From: Anton Vorontsov @ 2012-10-27 1:12 UTC (permalink / raw) To: Huang Changming-R66093 Cc: linux-mmc@vger.kernel.org, Chris Ball, Kumar Gala, linuxppc-dev@lists.ozlabs.org Hello Huang, On Fri, Oct 26, 2012 at 02:42:36AM +0000, Huang Changming-R66093 wrote: > For the current polling mode, driver will send CMD13 to poll the card status periodically , which will cause too many interrupts. > Once I sent patches to detect the card when using polling mode last year: read the state register, instead of send CMD13. But, these patches were not accepted. Now I attach them for you. Was there any specific reason why the patches didn't get accepted? I very briefly looked at them, and they seem to be OK (there are a few cosmetic details I'd comment on, tho -- but please send them in a normal way (i.e. not as attachments). Thanks, Anton. ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] powerpc/esdhc: enable the card insert/remove interrupt @ 2012-10-27 1:12 ` Anton Vorontsov 0 siblings, 0 replies; 15+ messages in thread From: Anton Vorontsov @ 2012-10-27 1:12 UTC (permalink / raw) To: Huang Changming-R66093 Cc: linuxppc-dev@lists.ozlabs.org, Chris Ball, linux-mmc@vger.kernel.org Hello Huang, On Fri, Oct 26, 2012 at 02:42:36AM +0000, Huang Changming-R66093 wrote: > For the current polling mode, driver will send CMD13 to poll the card status periodically , which will cause too many interrupts. > Once I sent patches to detect the card when using polling mode last year: read the state register, instead of send CMD13. But, these patches were not accepted. Now I attach them for you. Was there any specific reason why the patches didn't get accepted? I very briefly looked at them, and they seem to be OK (there are a few cosmetic details I'd comment on, tho -- but please send them in a normal way (i.e. not as attachments). Thanks, Anton. ^ permalink raw reply [flat|nested] 15+ messages in thread
* RE: [PATCH] powerpc/esdhc: enable the card insert/remove interrupt 2012-10-27 1:12 ` Anton Vorontsov @ 2012-10-29 1:40 ` Huang Changming-R66093 -1 siblings, 0 replies; 15+ messages in thread From: Huang Changming-R66093 @ 2012-10-29 1:40 UTC (permalink / raw) To: Anton Vorontsov Cc: linux-mmc@vger.kernel.org, Chris Ball, Kumar Gala, linuxppc-dev@lists.ozlabs.org > Hello Huang, > > On Fri, Oct 26, 2012 at 02:42:36AM +0000, Huang Changming-R66093 wrote: > > For the current polling mode, driver will send CMD13 to poll the card > status periodically , which will cause too many interrupts. > > Once I sent patches to detect the card when using polling mode last > year: read the state register, instead of send CMD13. But, these patches > were not accepted. Now I attach them for you. > > Was there any specific reason why the patches didn't get accepted? > > I very briefly looked at them, and they seem to be OK (there are a few > cosmetic details I'd comment on, tho -- but please send them in a normal > way (i.e. not as attachments). > Thanks, Anton. I don't know why. I will resend these patches based on latest kernel. ^ permalink raw reply [flat|nested] 15+ messages in thread
* RE: [PATCH] powerpc/esdhc: enable the card insert/remove interrupt @ 2012-10-29 1:40 ` Huang Changming-R66093 0 siblings, 0 replies; 15+ messages in thread From: Huang Changming-R66093 @ 2012-10-29 1:40 UTC (permalink / raw) To: Anton Vorontsov Cc: linuxppc-dev@lists.ozlabs.org, Chris Ball, linux-mmc@vger.kernel.org PiBIZWxsbyBIdWFuZywNCj4gDQo+IE9uIEZyaSwgT2N0IDI2LCAyMDEyIGF0IDAyOjQyOjM2QU0g KzAwMDAsIEh1YW5nIENoYW5nbWluZy1SNjYwOTMgd3JvdGU6DQo+ID4gRm9yIHRoZSBjdXJyZW50 IHBvbGxpbmcgbW9kZSwgZHJpdmVyIHdpbGwgc2VuZCBDTUQxMyB0byBwb2xsIHRoZSBjYXJkDQo+ IHN0YXR1cyBwZXJpb2RpY2FsbHkgLCB3aGljaCB3aWxsIGNhdXNlIHRvbyBtYW55IGludGVycnVw dHMuDQo+ID4gT25jZSBJIHNlbnQgcGF0Y2hlcyB0byBkZXRlY3QgdGhlIGNhcmQgd2hlbiB1c2lu ZyBwb2xsaW5nIG1vZGUgbGFzdA0KPiB5ZWFyOiByZWFkIHRoZSBzdGF0ZSByZWdpc3RlciwgaW5z dGVhZCBvZiBzZW5kIENNRDEzLiBCdXQsIHRoZXNlIHBhdGNoZXMNCj4gd2VyZSBub3QgYWNjZXB0 ZWQuIE5vdyBJIGF0dGFjaCB0aGVtIGZvciB5b3UuDQo+IA0KPiBXYXMgdGhlcmUgYW55IHNwZWNp ZmljIHJlYXNvbiB3aHkgdGhlIHBhdGNoZXMgZGlkbid0IGdldCBhY2NlcHRlZD8NCj4gDQo+IEkg dmVyeSBicmllZmx5IGxvb2tlZCBhdCB0aGVtLCBhbmQgdGhleSBzZWVtIHRvIGJlIE9LICh0aGVy ZSBhcmUgYSBmZXcNCj4gY29zbWV0aWMgZGV0YWlscyBJJ2QgY29tbWVudCBvbiwgdGhvIC0tIGJ1 dCBwbGVhc2Ugc2VuZCB0aGVtIGluIGEgbm9ybWFsDQo+IHdheSAoaS5lLiBub3QgYXMgYXR0YWNo bWVudHMpLg0KPiANCg0KVGhhbmtzLCBBbnRvbi4NCkkgZG9uJ3Qga25vdyB3aHkuDQpJIHdpbGwg cmVzZW5kIHRoZXNlIHBhdGNoZXMgYmFzZWQgb24gbGF0ZXN0IGtlcm5lbC4NCg0K ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2012-10-29 1:40 UTC | newest] Thread overview: 15+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-10-23 7:01 [PATCH] powerpc/esdhc: enable the card insert/remove interrupt r66093 2012-10-23 8:26 ` Anton Vorontsov 2012-10-23 8:26 ` Anton Vorontsov 2012-10-23 8:39 ` Huang Changming-R66093 2012-10-23 8:39 ` Huang Changming-R66093 2012-10-25 10:05 ` Huang Changming-R66093 2012-10-25 10:05 ` Huang Changming-R66093 2012-10-25 10:30 ` Anton Vorontsov 2012-10-25 10:30 ` Anton Vorontsov 2012-10-26 2:42 ` Huang Changming-R66093 2012-10-26 2:42 ` Huang Changming-R66093 2012-10-27 1:12 ` Anton Vorontsov 2012-10-27 1:12 ` Anton Vorontsov 2012-10-29 1:40 ` Huang Changming-R66093 2012-10-29 1:40 ` Huang Changming-R66093
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.