* [PATCH] pci: Add a quirk for the Ricoh 0xe22 SD card reader
@ 2012-12-01 18:21 Andy Lutomirski
2012-12-01 20:37 ` Andy Lutomirski
0 siblings, 1 reply; 5+ messages in thread
From: Andy Lutomirski @ 2012-12-01 18:21 UTC (permalink / raw)
To: Chris Ball, linux-mmc; +Cc: Andy Lutomirski, Manoj Iyer, stable
Otherwise it fails like this on cards like the Transcend 16GB SDHC card:
mmc0: new SDHC card at address b368
mmcblk0: mmc0:b368 SDC 15.0 GiB
mmcblk0: error -110 sending status command, retrying
mmcblk0: error -84 transferring data, sector 0, nr 8, cmd respons
e 0x900, card status 0xb0
Tested on my Lenovo x200 laptop.
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Cc: Manoj Iyer <manoj.iyer@canonical.com>
Cc: <stable@kernel.org>
---
drivers/pci/quirks.c | 7 +++++--
include/linux/pci_ids.h | 1 +
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 7a451ff..7165f2a 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2686,7 +2686,7 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
if (PCI_FUNC(dev->devfn))
return;
/*
- * RICOH 0xe823 SD/MMC card reader fails to recognize
+ * RICOH 0xe822 and 0xe823 SD/MMC card readers fails to recognize
* certain types of SD/MMC cards. Lowering the SD base
* clock frequency from 200Mhz to 50Mhz fixes this issue.
*
@@ -2697,7 +2697,8 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
* 0xf9 - Key register for 0x150
* 0xfc - key register for 0xe1
*/
- if (dev->device == PCI_DEVICE_ID_RICOH_R5CE823) {
+ if (dev->device == PCI_DEVICE_ID_RICOH_R5CE822 ||
+ dev->device == PCI_DEVICE_ID_RICOH_R5CE823) {
pci_write_config_byte(dev, 0xf9, 0xfc);
pci_write_config_byte(dev, 0x150, 0x10);
pci_write_config_byte(dev, 0xf9, 0x00);
@@ -2724,6 +2725,8 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
}
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE822, ricoh_mmc_fixup_r5c832);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE822, ricoh_mmc_fixup_r5c832);
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE823, ricoh_mmc_fixup_r5c832);
DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE823, ricoh_mmc_fixup_r5c832);
#endif /*CONFIG_MMC_RICOH_MMC*/
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 9d36b82..d16ad56 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1568,6 +1568,7 @@
#define PCI_DEVICE_ID_RICOH_RL5C476 0x0476
#define PCI_DEVICE_ID_RICOH_RL5C478 0x0478
#define PCI_DEVICE_ID_RICOH_R5C822 0x0822
+#define PCI_DEVICE_ID_RICOH_R5CE822 0xe822
#define PCI_DEVICE_ID_RICOH_R5CE823 0xe823
#define PCI_DEVICE_ID_RICOH_R5C832 0x0832
#define PCI_DEVICE_ID_RICOH_R5C843 0x0843
--
1.7.11.7
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] pci: Add a quirk for the Ricoh 0xe22 SD card reader
2012-12-01 18:21 [PATCH] pci: Add a quirk for the Ricoh 0xe22 SD card reader Andy Lutomirski
@ 2012-12-01 20:37 ` Andy Lutomirski
2012-12-12 2:38 ` [ping for 3.8 for pci tree] " Andy Lutomirski
2012-12-22 2:05 ` Chris Ball
0 siblings, 2 replies; 5+ messages in thread
From: Andy Lutomirski @ 2012-12-01 20:37 UTC (permalink / raw)
To: linux-pci, Bjorn Helgaas
Cc: Chris Ball, Andy Lutomirski, linux-mmc, Manoj Iyer, stable
Otherwise it fails like this on cards like the Transcend 16GB SDHC card:
mmc0: new SDHC card at address b368
mmcblk0: mmc0:b368 SDC 15.0 GiB
mmcblk0: error -110 sending status command, retrying
mmcblk0: error -84 transferring data, sector 0, nr 8, cmd respons
e 0x900, card status 0xb0
Tested on my Lenovo x200 laptop.
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Acked-by: Chris Ball <cjb@laptop.org>
Cc: linux-mmc@vger.kernel.org
Cc: Manoj Iyer <manoj.iyer@canonical.com>
Cc: <stable@kernel.org>
---
drivers/pci/quirks.c | 7 +++++--
include/linux/pci_ids.h | 1 +
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 7a451ff..7165f2a 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2686,7 +2686,7 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
if (PCI_FUNC(dev->devfn))
return;
/*
- * RICOH 0xe823 SD/MMC card reader fails to recognize
+ * RICOH 0xe822 and 0xe823 SD/MMC card readers fails to recognize
* certain types of SD/MMC cards. Lowering the SD base
* clock frequency from 200Mhz to 50Mhz fixes this issue.
*
@@ -2697,7 +2697,8 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
* 0xf9 - Key register for 0x150
* 0xfc - key register for 0xe1
*/
- if (dev->device == PCI_DEVICE_ID_RICOH_R5CE823) {
+ if (dev->device == PCI_DEVICE_ID_RICOH_R5CE822 ||
+ dev->device == PCI_DEVICE_ID_RICOH_R5CE823) {
pci_write_config_byte(dev, 0xf9, 0xfc);
pci_write_config_byte(dev, 0x150, 0x10);
pci_write_config_byte(dev, 0xf9, 0x00);
@@ -2724,6 +2725,8 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
}
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE822, ricoh_mmc_fixup_r5c832);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE822, ricoh_mmc_fixup_r5c832);
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE823, ricoh_mmc_fixup_r5c832);
DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE823, ricoh_mmc_fixup_r5c832);
#endif /*CONFIG_MMC_RICOH_MMC*/
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 9d36b82..d16ad56 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1568,6 +1568,7 @@
#define PCI_DEVICE_ID_RICOH_RL5C476 0x0476
#define PCI_DEVICE_ID_RICOH_RL5C478 0x0478
#define PCI_DEVICE_ID_RICOH_R5C822 0x0822
+#define PCI_DEVICE_ID_RICOH_R5CE822 0xe822
#define PCI_DEVICE_ID_RICOH_R5CE823 0xe823
#define PCI_DEVICE_ID_RICOH_R5C832 0x0832
#define PCI_DEVICE_ID_RICOH_R5C843 0x0843
--
1.7.11.7
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [ping for 3.8 for pci tree] Re: [PATCH] pci: Add a quirk for the Ricoh 0xe22 SD card reader
2012-12-01 20:37 ` Andy Lutomirski
@ 2012-12-12 2:38 ` Andy Lutomirski
2012-12-22 2:05 ` Chris Ball
1 sibling, 0 replies; 5+ messages in thread
From: Andy Lutomirski @ 2012-12-12 2:38 UTC (permalink / raw)
To: linux-pci, Bjorn Helgaas
Cc: Chris Ball, Andy Lutomirski, linux-mmc, Manoj Iyer, stable
Hi Bjorn-
I want to make sure this doesn't get lost. It's a patch for pci, not
for mmc, despite the subject.
--Andy
On Sat, Dec 1, 2012 at 12:37 PM, Andy Lutomirski <luto@amacapital.net> wrote:
> Otherwise it fails like this on cards like the Transcend 16GB SDHC card:
> mmc0: new SDHC card at address b368
> mmcblk0: mmc0:b368 SDC 15.0 GiB
> mmcblk0: error -110 sending status command, retrying
> mmcblk0: error -84 transferring data, sector 0, nr 8, cmd respons
> e 0x900, card status 0xb0
>
> Tested on my Lenovo x200 laptop.
>
> Signed-off-by: Andy Lutomirski <luto@amacapital.net>
> Acked-by: Chris Ball <cjb@laptop.org>
> Cc: linux-mmc@vger.kernel.org
> Cc: Manoj Iyer <manoj.iyer@canonical.com>
> Cc: <stable@kernel.org>
> ---
> drivers/pci/quirks.c | 7 +++++--
> include/linux/pci_ids.h | 1 +
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index 7a451ff..7165f2a 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -2686,7 +2686,7 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
> if (PCI_FUNC(dev->devfn))
> return;
> /*
> - * RICOH 0xe823 SD/MMC card reader fails to recognize
> + * RICOH 0xe822 and 0xe823 SD/MMC card readers fails to recognize
> * certain types of SD/MMC cards. Lowering the SD base
> * clock frequency from 200Mhz to 50Mhz fixes this issue.
> *
> @@ -2697,7 +2697,8 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
> * 0xf9 - Key register for 0x150
> * 0xfc - key register for 0xe1
> */
> - if (dev->device == PCI_DEVICE_ID_RICOH_R5CE823) {
> + if (dev->device == PCI_DEVICE_ID_RICOH_R5CE822 ||
> + dev->device == PCI_DEVICE_ID_RICOH_R5CE823) {
> pci_write_config_byte(dev, 0xf9, 0xfc);
> pci_write_config_byte(dev, 0x150, 0x10);
> pci_write_config_byte(dev, 0xf9, 0x00);
> @@ -2724,6 +2725,8 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
> }
> DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
> DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
> +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE822, ricoh_mmc_fixup_r5c832);
> +DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE822, ricoh_mmc_fixup_r5c832);
> DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE823, ricoh_mmc_fixup_r5c832);
> DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE823, ricoh_mmc_fixup_r5c832);
> #endif /*CONFIG_MMC_RICOH_MMC*/
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index 9d36b82..d16ad56 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -1568,6 +1568,7 @@
> #define PCI_DEVICE_ID_RICOH_RL5C476 0x0476
> #define PCI_DEVICE_ID_RICOH_RL5C478 0x0478
> #define PCI_DEVICE_ID_RICOH_R5C822 0x0822
> +#define PCI_DEVICE_ID_RICOH_R5CE822 0xe822
> #define PCI_DEVICE_ID_RICOH_R5CE823 0xe823
> #define PCI_DEVICE_ID_RICOH_R5C832 0x0832
> #define PCI_DEVICE_ID_RICOH_R5C843 0x0843
> --
> 1.7.11.7
>
--
Andy Lutomirski
AMA Capital Management, LLC
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] pci: Add a quirk for the Ricoh 0xe22 SD card reader
2012-12-01 20:37 ` Andy Lutomirski
2012-12-12 2:38 ` [ping for 3.8 for pci tree] " Andy Lutomirski
@ 2012-12-22 2:05 ` Chris Ball
2012-12-26 18:01 ` Bjorn Helgaas
1 sibling, 1 reply; 5+ messages in thread
From: Chris Ball @ 2012-12-22 2:05 UTC (permalink / raw)
To: Andy Lutomirski; +Cc: linux-pci, Bjorn Helgaas, linux-mmc, Manoj Iyer, stable
Hi Bjorn,
On Sat, Dec 01 2012, Andy Lutomirski wrote:
> Otherwise it fails like this on cards like the Transcend 16GB SDHC card:
> mmc0: new SDHC card at address b368
> mmcblk0: mmc0:b368 SDC 15.0 GiB
> mmcblk0: error -110 sending status command, retrying
> mmcblk0: error -84 transferring data, sector 0, nr 8, cmd respons
> e 0x900, card status 0xb0
>
> Tested on my Lenovo x200 laptop.
>
> Signed-off-by: Andy Lutomirski <luto@amacapital.net>
> Acked-by: Chris Ball <cjb@laptop.org>
Ping -- this is an important patch for getting SD cards working on
Thinkpads, please can you pick it up?
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] pci: Add a quirk for the Ricoh 0xe22 SD card reader
2012-12-22 2:05 ` Chris Ball
@ 2012-12-26 18:01 ` Bjorn Helgaas
0 siblings, 0 replies; 5+ messages in thread
From: Bjorn Helgaas @ 2012-12-26 18:01 UTC (permalink / raw)
To: Chris Ball
Cc: Andy Lutomirski, linux-pci@vger.kernel.org, linux-mmc, Manoj Iyer,
stable
On Fri, Dec 21, 2012 at 7:05 PM, Chris Ball <cjb@laptop.org> wrote:
> Hi Bjorn,
>
> On Sat, Dec 01 2012, Andy Lutomirski wrote:
>> Otherwise it fails like this on cards like the Transcend 16GB SDHC card:
>> mmc0: new SDHC card at address b368
>> mmcblk0: mmc0:b368 SDC 15.0 GiB
>> mmcblk0: error -110 sending status command, retrying
>> mmcblk0: error -84 transferring data, sector 0, nr 8, cmd respons
>> e 0x900, card status 0xb0
>>
>> Tested on my Lenovo x200 laptop.
>>
>> Signed-off-by: Andy Lutomirski <luto@amacapital.net>
>> Acked-by: Chris Ball <cjb@laptop.org>
>
> Ping -- this is an important patch for getting SD cards working on
> Thinkpads, please can you pick it up?
I put this in my for-linus branch, which will become part of v3.8.
Thanks for the reminder!
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-12-26 18:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-01 18:21 [PATCH] pci: Add a quirk for the Ricoh 0xe22 SD card reader Andy Lutomirski
2012-12-01 20:37 ` Andy Lutomirski
2012-12-12 2:38 ` [ping for 3.8 for pci tree] " Andy Lutomirski
2012-12-22 2:05 ` Chris Ball
2012-12-26 18:01 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox