[PATCH] Enable DMA for Ricoh reader on Lenovo laptops

[PATCH] Enable DMA for Ricoh reader on Lenovo laptops

[Vasily Khoruzhick]

[-- Attachment #1.1: Type: Text/Plain, Size: 201 bytes --]

Ricoh SD/MMC card reader on Lenovo laptops (3000 n100, 3000 n200) doesn't 
announce DMA capability, however it supports DMA. Without this patch audio 
clicks and cursor is jerky during card access.

[-- Attachment #1.2: 0001-Enable-DMA-for-Ricoh-reader-on-Lenovo-laptops.patch --]
[-- Type: text/x-patch, Size: 880 bytes --]

From 442d0b0234a20f442cacfd0844bc8128a81638bc Mon Sep 17 00:00:00 2001
From: Vasily Khoruzhick <anarsoul@gmail.com>
Date: Mon, 1 Feb 2010 10:55:55 +0200
Subject: [PATCH] Enable DMA for Ricoh reader on Lenovo laptops

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
 drivers/mmc/host/sdhci-pci.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index 5c3a176..ada9d10 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -87,6 +87,9 @@ static int ricoh_probe(struct sdhci_pci_chip *chip)
 	    chip->pdev->subsystem_vendor == PCI_VENDOR_ID_SONY)
 		chip->quirks |= SDHCI_QUIRK_NO_CARD_NO_RESET;
 
+	if (chip->pdev->subsystem_vendor == PCI_VENDOR_ID_LENOVO)
+		chip->quirks |= SDHCI_QUIRK_FORCE_DMA;
+
 	return 0;
 }
 
-- 
1.6.6.1


[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[PATCH v2] Enable DMA for Ricoh reader on Lenovo laptops

[Vasily Khoruzhick]

[-- Attachment #1.1: Type: Text/Plain, Size: 410 bytes --]

В сообщении от 1 февраля 2010 11:10:53 автор Vasily Khoruzhick написал:
> Ricoh SD/MMC card reader on Lenovo laptops (3000 n100, 3000 n200) doesn't
> announce DMA capability, however it supports DMA. Without this patch audio
> clicks and cursor is jerky during card access.

It seems that Ricoh R5C822 card reader on mentioned laptops need one more 
quirk. Here's updated patch.

[-- Attachment #1.2: 0001-Enable-DMA-for-Ricoh-reader-on-Lenovo-laptops.patch --]
[-- Type: text/x-patch, Size: 1219 bytes --]

From 3b93e891e0e37afefc1f1eca461dcfc3ded879f9 Mon Sep 17 00:00:00 2001
From: Vasily Khoruzhick <anarsoul@gmail.com>
Date: Tue, 2 Feb 2010 18:12:54 +0200
Subject: [PATCH v2] Enable DMA for Ricoh reader on Lenovo laptops

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
 drivers/mmc/host/sdhci-pci.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index 5c3a176..d49e5ff 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -80,13 +80,17 @@ struct sdhci_pci_chip {
 
 static int ricoh_probe(struct sdhci_pci_chip *chip)
 {
-	if (chip->pdev->subsystem_vendor == PCI_VENDOR_ID_IBM)
+	if (chip->pdev->subsystem_vendor == PCI_VENDOR_ID_IBM ||
+	    chip->pdev->subsystem_vendor == PCI_VENDOR_ID_LENOVO)
 		chip->quirks |= SDHCI_QUIRK_CLOCK_BEFORE_RESET;
 
 	if (chip->pdev->subsystem_vendor == PCI_VENDOR_ID_SAMSUNG ||
 	    chip->pdev->subsystem_vendor == PCI_VENDOR_ID_SONY)
 		chip->quirks |= SDHCI_QUIRK_NO_CARD_NO_RESET;
 
+	if (chip->pdev->subsystem_vendor == PCI_VENDOR_ID_LENOVO)
+		chip->quirks |= SDHCI_QUIRK_FORCE_DMA;
+
 	return 0;
 }
 
-- 
1.6.6.1


[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH v2] Enable DMA for Ricoh reader on Lenovo laptops

[Vasily Khoruzhick]

[-- Attachment #1: Type: Text/Plain, Size: 219 bytes --]

В сообщении от 2 февраля 2010 18:17:15 автор Vasily Khoruzhick написал:
> It seems that Ricoh R5C822 card reader on mentioned laptops need one more
> quirk. Here's updated patch.

Ping :)

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH v2] Enable DMA for Ricoh reader on Lenovo laptops

[Maxim Levitsky]

On Sun, 2010-02-14 at 00:38 +0200, Vasily Khoruzhick wrote: 
> В сообщении от 2 февраля 2010 18:17:15 автор Vasily Khoruzhick написал:
> > It seems that Ricoh R5C822 card reader on mentioned laptops need one more
> > quirk. Here's updated patch.
> 
> Ping :)

I am very interested in this patch.
I do have a ricoh reader, and SDHCI portion indeed works in PIO only.
If you need to read xD cards with this reader I have written a driver
for xD portion.

Best regards,
Maxim Levitsky

Re: [PATCH v2] Enable DMA for Ricoh reader on Lenovo laptops

[Vasily Khoruzhick]

[-- Attachment #1: Type: Text/Plain, Size: 546 bytes --]

В сообщении от 14 февраля 2010 18:39:08 Maxim Levitsky написал:
 
> I am very interested in this patch.

Is your reader integrated in some Lenovo's laptop? If it is, what is exact 
model of laptop? What about Acked-by/Tested-by if patch works for you?

> I do have a ricoh reader, and SDHCI portion indeed works in PIO only.
> If you need to read xD cards with this reader I have written a driver
> for xD portion.

Where patch for xD can be obtained? I'll test it once I find xD card :)

Regards,
Vasily

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH v2] Enable DMA for Ricoh reader on Lenovo laptops

[Maxim Levitsky]

On Mon, 2010-02-15 at 01:06 +0200, Vasily Khoruzhick wrote: 
> В сообщении от 14 февраля 2010 18:39:08 Maxim Levitsky написал:
>  
> > I am very interested in this patch.
> 
> Is your reader integrated in some Lenovo's laptop? If it is, what is exact 
> model of laptop? What about Acked-by/Tested-by if patch works for you?
Acer Aspire 5720. 
> 
> > I do have a ricoh reader, and SDHCI portion indeed works in PIO only.
> > If you need to read xD cards with this reader I have written a driver
> > for xD portion.
> 
> Where patch for xD can be obtained? I'll test it once I find xD card :)
I post the patch series regularly to linux-mtd.
Hope that it will be merged upstream soon.


Best regards,
Maxim Levitsky

Re: [PATCH v2] Enable DMA for Ricoh reader on Lenovo laptops

[Vasily Khoruzhick]

[-- Attachment #1: Type: Text/Plain, Size: 278 bytes --]

В сообщении от 15 февраля 2010 01:20:52 автор Maxim Levitsky написал:
 
> Acer Aspire 5720.

So my patch with quirk addition for Lenovo will not work for you. Maybe it'll 
be better to enable DMA by default on all Ricoh readers?
 
Regards,
Vasily

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH v2] Enable DMA for Ricoh reader on Lenovo laptops

[Maxim Levitsky]

On Mon, 2010-02-15 at 11:49 +0200, Vasily Khoruzhick wrote: 
> В сообщении от 15 февраля 2010 01:20:52 автор Maxim Levitsky написал:
>  
> > Acer Aspire 5720.
> 
> So my patch with quirk addition for Lenovo will not work for you. Maybe it'll 
> be better to enable DMA by default on all Ricoh readers?
>  
> Regards,
> Vasily

Yep, works for me.

I used this:

@@ -87,6 +87,8 @@ static int ricoh_probe(struct sdhci_pci_chip *chip)
            chip->pdev->subsystem_vendor == PCI_VENDOR_ID_SONY)
                chip->quirks |= SDHCI_QUIRK_NO_CARD_NO_RESET;

+       chip->quirks |= SDHCI_QUIRK_CLOCK_BEFORE_RESET;
+       chip->quirks |= SDHCI_QUIRK_FORCE_DMA;
        return 0;
}

Not sure if I need the SDHCI_QUIRK_CLOCK_BEFORE_RESET.


What I don't get is why DMA capability isn't advertised?

Since xD and memstick portions do support DMA, I can't belive that they
don't use DMA in SD/SDHCI portion.


Ah, I forgot that SDHCI is handled by microsoft driver.... Maybe it
doesn't test the DMA bits.

If we were to follow the way MS driver works, we wouldn't need the
quirks, right?

Best regards,
Maxim Levitsky

Re: [PATCH v2] Enable DMA for Ricoh reader on Lenovo laptops

[Vasily Khoruzhick]

[-- Attachment #1.1: Type: Text/Plain, Size: 686 bytes --]

В сообщении от 15 февраля 2010 17:58:24 автор Maxim Levitsky написал:
> Not sure if I need the SDHCI_QUIRK_CLOCK_BEFORE_RESET.

Driver sometimes doesn't detect card without this quirk for me.

> What I don't get is why DMA capability isn't advertised?
> 
> Since xD and memstick portions do support DMA, I can't belive that they
> don't use DMA in SD/SDHCI portion. 
> 
> Ah, I forgot that SDHCI is handled by microsoft driver.... Maybe it
> doesn't test the DMA bits.
> 
> If we were to follow the way MS driver works, we wouldn't need the
> quirks, right?

We need generic quirk for ricoh readers, see attached patch

Regards
Vasily

[-- Attachment #1.2: 0001-Enable-DMA-on-Ricoh-sdhci-reader-by-default.patch --]
[-- Type: text/x-patch, Size: 1336 bytes --]

From 9cbd6c6667d8a2fce583e1e2e7c253b75ec1b675 Mon Sep 17 00:00:00 2001
From: Vasily Khoruzhick <anarsoul@gmail.com>
Date: Mon, 15 Feb 2010 18:10:41 +0200
Subject: [PATCH] Enable DMA on Ricoh sdhci reader by default

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
 drivers/mmc/host/sdhci-pci.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index 5c3a176..12f5b09 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -80,9 +80,6 @@ struct sdhci_pci_chip {
 
 static int ricoh_probe(struct sdhci_pci_chip *chip)
 {
-	if (chip->pdev->subsystem_vendor == PCI_VENDOR_ID_IBM)
-		chip->quirks |= SDHCI_QUIRK_CLOCK_BEFORE_RESET;
-
 	if (chip->pdev->subsystem_vendor == PCI_VENDOR_ID_SAMSUNG ||
 	    chip->pdev->subsystem_vendor == PCI_VENDOR_ID_SONY)
 		chip->quirks |= SDHCI_QUIRK_NO_CARD_NO_RESET;
@@ -92,7 +89,9 @@ static int ricoh_probe(struct sdhci_pci_chip *chip)
 
 static const struct sdhci_pci_fixes sdhci_ricoh = {
 	.probe		= ricoh_probe,
-	.quirks		= SDHCI_QUIRK_32BIT_DMA_ADDR,
+	.quirks		= SDHCI_QUIRK_32BIT_DMA_ADDR |
+			  SDHCI_QUIRK_FORCE_DMA |
+			  SDHCI_QUIRK_CLOCK_BEFORE_RESET,
 };
 
 static const struct sdhci_pci_fixes sdhci_ene_712 = {
-- 
1.6.6.1


[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH v2] Enable DMA for Ricoh reader on Lenovo laptops

[Maxim Levitsky]

On Mon, 2010-02-15 at 18:20 +0200, Vasily Khoruzhick wrote: 
> В сообщении от 15 февраля 2010 17:58:24 автор Maxim Levitsky написал:
> > Not sure if I need the SDHCI_QUIRK_CLOCK_BEFORE_RESET.
> 
> Driver sometimes doesn't detect card without this quirk for me.
> 
> > What I don't get is why DMA capability isn't advertised?
> > 
> > Since xD and memstick portions do support DMA, I can't belive that they
> > don't use DMA in SD/SDHCI portion. 
> > 
> > Ah, I forgot that SDHCI is handled by microsoft driver.... Maybe it
> > doesn't test the DMA bits.
> > 
> > If we were to follow the way MS driver works, we wouldn't need the
> > quirks, right?
> 
> We need generic quirk for ricoh readers, see attached patch
> 
> Regards
> Vasily
Tested-by: Maxim Levitsky <maximlevitsky@gmail.com>

Best regards,
Maxim Levitsky

Re: [PATCH v2] Enable DMA for Ricoh reader on Lenovo laptops

[Vasily Khoruzhick]

[-- Attachment #1: Type: Text/Plain, Size: 178 bytes --]

On 15 February 2010 18:20:39 Vasily Khoruzhick wrote:

> We need generic quirk for ricoh readers, see attached patch

Ping :)
Any chance to merge this patch? Should I resend it?

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH v2] Enable DMA for Ricoh reader on Lenovo laptops

[Maxim Levitsky]

On Sat, 2010-02-20 at 10:49 +0200, Vasily Khoruzhick wrote: 
> On 15 February 2010 18:20:39 Vasily Khoruzhick wrote:
> 
> > We need generic quirk for ricoh readers, see attached patch
> 
> Ping :)
> Any chance to merge this patch? Should I resend it?

Since mmc system has no maintainer, maybe put that through -mm ?


Best regards,
Maxim Levitsky

Re: [PATCH v2] Enable DMA for Ricoh reader on Lenovo laptops

[Andrew Morton]

On Sun, 21 Feb 2010 00:21:45 +0200 Maxim Levitsky <maximlevitsky@gmail.com> wrote:

> On Sat, 2010-02-20 at 10:49 +0200, Vasily Khoruzhick wrote: 
> > On 15 February 2010 18:20:39 Vasily Khoruzhick wrote:
> > 
> > > We need generic quirk for ricoh readers, see attached patch
> > 
> > Ping :)
> > Any chance to merge this patch? Should I resend it?
> 
> Since mmc system has no maintainer, maybe put that through -mm ?
> 

Yup.

But I'm seeing two patches in this thread, neither of which have useful
changelogs.  Please redo, add a changelog which explains what the
problem was and how the patch fixes it.  Retain cc's, acked-by's,
tested-by's and resend, please.

[PATCH] Subject: MMC: Enable DMA on Ricoh sdhci reader by default

[Maxim Levitsky]

From: Vasily Khoruzhick <anarsoul@gmail.com>

This card reader doesn't advertise, however DMA works well.
Probably windows SDHCI driver assumes that all readers support DMA
and thus we see that bug.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Tested-by: Maxim Levitsky <maximlevitsky@gmail.com>
---
 drivers/mmc/host/sdhci-pci.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index 5c3a176..12f5b09 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -80,9 +80,6 @@ struct sdhci_pci_chip {
 
 static int ricoh_probe(struct sdhci_pci_chip *chip)
 {
-	if (chip->pdev->subsystem_vendor == PCI_VENDOR_ID_IBM)
-		chip->quirks |= SDHCI_QUIRK_CLOCK_BEFORE_RESET;
-
 	if (chip->pdev->subsystem_vendor == PCI_VENDOR_ID_SAMSUNG ||
 	    chip->pdev->subsystem_vendor == PCI_VENDOR_ID_SONY)
 		chip->quirks |= SDHCI_QUIRK_NO_CARD_NO_RESET;
@@ -92,7 +89,9 @@ static int ricoh_probe(struct sdhci_pci_chip *chip)
 
 static const struct sdhci_pci_fixes sdhci_ricoh = {
 	.probe		= ricoh_probe,
-	.quirks		= SDHCI_QUIRK_32BIT_DMA_ADDR,
+	.quirks		= SDHCI_QUIRK_32BIT_DMA_ADDR |
+			  SDHCI_QUIRK_FORCE_DMA |
+			  SDHCI_QUIRK_CLOCK_BEFORE_RESET,
 };
 
 static const struct sdhci_pci_fixes sdhci_ene_712 = {
-- 
1.6.3.3