* The work of ricoh_mmc isn't detected by pci core @ 2009-11-24 0:13 Maxim Levitsky 2009-11-24 0:21 ` Philip Langdale 0 siblings, 1 reply; 25+ messages in thread From: Maxim Levitsky @ 2009-11-24 0:13 UTC (permalink / raw) To: linux-kernel; +Cc: philipl Hi, I noticed that usage of ricoh_mmc will lead to this 07:00.1 SD Host controller: Ricoh Co Ltd R5C822 SD/SDIO/MMC/MS/MSPro Host Adapter (rev 22) 07:00.2 System peripheral: Ricoh Co Ltd R5C843 MMC Host Controller (rev 12) 07:00.3 System peripheral: Ricoh Co Ltd R5C592 Memory Stick Bus Host Adapter (rev 12) 07:00.4 System peripheral: Ricoh Co Ltd xD-Picture Card Controller (rev ff) I don't have yet an MMC card to test if the driver itself working, but what happens is that once disabled, all pci functions shift one level, but kernel doesn't pick that up. If one implements drivers for XD and memstick parts, this would break everything. (And I have some plans for XD part) ricoh_mmc is built-in, but this doesn't help. Best regards, Maxim Levitsky ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: The work of ricoh_mmc isn't detected by pci core 2009-11-24 0:13 The work of ricoh_mmc isn't detected by pci core Maxim Levitsky @ 2009-11-24 0:21 ` Philip Langdale 2009-11-25 14:55 ` Maxim Levitsky 0 siblings, 1 reply; 25+ messages in thread From: Philip Langdale @ 2009-11-24 0:21 UTC (permalink / raw) To: Maxim Levitsky; +Cc: linux-kernel, philipl On Tue, 24 Nov 2009 02:13:03 +0200 Maxim Levitsky <maximlevitsky@gmail.com> wrote: > Hi, > > I noticed that usage of ricoh_mmc will lead to this > > > 07:00.1 SD Host controller: Ricoh Co Ltd R5C822 SD/SDIO/MMC/MS/MSPro > Host Adapter (rev 22) 07:00.2 System peripheral: Ricoh Co Ltd R5C843 > MMC Host Controller (rev 12) 07:00.3 System peripheral: Ricoh Co Ltd > R5C592 Memory Stick Bus Host Adapter (rev 12) 07:00.4 System > peripheral: Ricoh Co Ltd xD-Picture Card Controller (rev ff) > > > I don't have yet an MMC card to test if the driver itself working, > but what happens is that once disabled, all pci functions shift > one level, but kernel doesn't pick that up. > > If one implements drivers for XD and memstick parts, this would break > everything. (And I have some plans for XD part) > > ricoh_mmc is built-in, but this doesn't help. > > Best regards, > Maxim Levitsky Hmm, yes, that's true (and if you do a warn reboot, the effect is sticky and then MMC is missing). I don't know how to make the pci core re-enumerate devices, but maybe there is a way. I'm not in a position to do this myself in the near future; so I'm afraid that if you need this fixed, you'll have to do the digging. Is it sufficient to call pci_rescan_bus at the end of the disable/enable routine in ricoh_mmc? --phil ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: The work of ricoh_mmc isn't detected by pci core 2009-11-24 0:21 ` Philip Langdale @ 2009-11-25 14:55 ` Maxim Levitsky 2009-11-25 14:58 ` [PATCH] Port ricoh_mmc from driver to pci quirk Maxim Levitsky 0 siblings, 1 reply; 25+ messages in thread From: Maxim Levitsky @ 2009-11-25 14:55 UTC (permalink / raw) To: Philip Langdale; +Cc: linux-kernel, philipl I converted your driver input pci quirk, and this works very well. MMC device disappears without any trace. Suspend/resume works fine. 07:00.0 FireWire (IEEE 1394): Ricoh Co Ltd R5C832 IEEE 1394 Controller (rev 05) 07:00.1 SD Host controller: Ricoh Co Ltd R5C822 SD/SDIO/MMC/MS/MSPro Host Adapter (rev 22) 07:00.2 System peripheral: Ricoh Co Ltd R5C592 Memory Stick Bus Host Adapter (rev 12) 07:00.3 System peripheral: Ricoh Co Ltd xD-Picture Card Controller (rev 12) Best regards, Maxim Levitsky ^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH] Port ricoh_mmc from driver to pci quirk. 2009-11-25 14:55 ` Maxim Levitsky @ 2009-11-25 14:58 ` Maxim Levitsky 2009-11-25 16:53 ` Philip Langdale 0 siblings, 1 reply; 25+ messages in thread From: Maxim Levitsky @ 2009-11-25 14:58 UTC (permalink / raw) To: Philip Langdale; +Cc: linux-kernel, philipl >From 5c5e6f5ab1a5a09a430f410cab4b160a5e65501c Mon Sep 17 00:00:00 2001 From: Maxim Levitsky <maximlevitsky@gmail.com> Date: Wed, 25 Nov 2009 16:37:46 +0200 Subject: [PATCH] Port ricoh_mmc from driver to pci quirk. This is much cleaner and correct solution Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com> --- drivers/mmc/host/Kconfig | 17 --- drivers/mmc/host/Makefile | 1 - drivers/mmc/host/ricoh_mmc.c | 262 ------------------------------------------ drivers/pci/quirks.c | 77 ++++++++++++ 4 files changed, 77 insertions(+), 280 deletions(-) delete mode 100644 drivers/mmc/host/ricoh_mmc.c diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 432ae83..4edce18 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -55,23 +55,6 @@ config MMC_SDHCI_PCI If unsure, say N. -config MMC_RICOH_MMC - tristate "Ricoh MMC Controller Disabler (EXPERIMENTAL)" - depends on MMC_SDHCI_PCI - help - This selects the disabler for the Ricoh MMC Controller. This - proprietary controller is unnecessary because the SDHCI driver - supports MMC cards on the SD controller, but if it is not - disabled, it will steal the MMC cards away - rendering them - useless. It is safe to select this driver even if you don't - have a Ricoh based card reader. - - - To compile this driver as a module, choose M here: - the module will be called ricoh_mmc. - - If unsure, say Y. - config MMC_SDHCI_OF tristate "SDHCI support on OpenFirmware platforms" depends on MMC_SDHCI && PPC_OF diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile index abcb040..7b82394 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -12,7 +12,6 @@ obj-$(CONFIG_MMC_IMX) += imxmmc.o obj-$(CONFIG_MMC_MXC) += mxcmmc.o obj-$(CONFIG_MMC_SDHCI) += sdhci.o obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o -obj-$(CONFIG_MMC_RICOH_MMC) += ricoh_mmc.o obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-pltfm.o obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o diff --git a/drivers/mmc/host/ricoh_mmc.c b/drivers/mmc/host/ricoh_mmc.c deleted file mode 100644 index f627905..0000000 --- a/drivers/mmc/host/ricoh_mmc.c +++ /dev/null @@ -1,262 +0,0 @@ -/* - * ricoh_mmc.c - Dummy driver to disable the Rioch MMC controller. - * - * Copyright (C) 2007 Philip Langdale, All Rights Reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. - */ - -/* - * This is a conceptually ridiculous driver, but it is required by the way - * the Ricoh multi-function chips (R5CXXX) work. These chips implement - * the four main memory card controllers (SD, MMC, MS, xD) and one or both - * of cardbus or firewire. It happens that they implement SD and MMC - * support as separate controllers (and PCI functions). The linux SDHCI - * driver supports MMC cards but the chip detects MMC cards in hardware - * and directs them to the MMC controller - so the SDHCI driver never sees - * them. To get around this, we must disable the useless MMC controller. - * At that point, the SDHCI controller will start seeing them. As a bonus, - * a detection event occurs immediately, even if the MMC card is already - * in the reader. - * - * It seems to be the case that the relevant PCI registers to deactivate the - * MMC controller live on PCI function 0, which might be the cardbus controller - * or the firewire controller, depending on the particular chip in question. As - * such, it makes what this driver has to do unavoidably ugly. Such is life. - */ - -#include <linux/pci.h> - -#define DRIVER_NAME "ricoh-mmc" - -static const struct pci_device_id pci_ids[] __devinitdata = { - { - .vendor = PCI_VENDOR_ID_RICOH, - .device = PCI_DEVICE_ID_RICOH_R5C843, - .subvendor = PCI_ANY_ID, - .subdevice = PCI_ANY_ID, - }, - { /* end: all zeroes */ }, -}; - -MODULE_DEVICE_TABLE(pci, pci_ids); - -static int ricoh_mmc_disable(struct pci_dev *fw_dev) -{ - u8 write_enable; - u8 write_target; - u8 disable; - - if (fw_dev->device == PCI_DEVICE_ID_RICOH_RL5C476) { - /* via RL5C476 */ - - pci_read_config_byte(fw_dev, 0xB7, &disable); - if (disable & 0x02) { - printk(KERN_INFO DRIVER_NAME - ": Controller already disabled. " \ - "Nothing to do.\n"); - return -ENODEV; - } - - pci_read_config_byte(fw_dev, 0x8E, &write_enable); - pci_write_config_byte(fw_dev, 0x8E, 0xAA); - pci_read_config_byte(fw_dev, 0x8D, &write_target); - pci_write_config_byte(fw_dev, 0x8D, 0xB7); - pci_write_config_byte(fw_dev, 0xB7, disable | 0x02); - pci_write_config_byte(fw_dev, 0x8E, write_enable); - pci_write_config_byte(fw_dev, 0x8D, write_target); - } else { - /* via R5C832 */ - - pci_read_config_byte(fw_dev, 0xCB, &disable); - if (disable & 0x02) { - printk(KERN_INFO DRIVER_NAME - ": Controller already disabled. " \ - "Nothing to do.\n"); - return -ENODEV; - } - - pci_read_config_byte(fw_dev, 0xCA, &write_enable); - pci_write_config_byte(fw_dev, 0xCA, 0x57); - pci_write_config_byte(fw_dev, 0xCB, disable | 0x02); - pci_write_config_byte(fw_dev, 0xCA, write_enable); - } - - printk(KERN_INFO DRIVER_NAME - ": Controller is now disabled.\n"); - - return 0; -} - -static int ricoh_mmc_enable(struct pci_dev *fw_dev) -{ - u8 write_enable; - u8 write_target; - u8 disable; - - if (fw_dev->device == PCI_DEVICE_ID_RICOH_RL5C476) { - /* via RL5C476 */ - - pci_read_config_byte(fw_dev, 0x8E, &write_enable); - pci_write_config_byte(fw_dev, 0x8E, 0xAA); - pci_read_config_byte(fw_dev, 0x8D, &write_target); - pci_write_config_byte(fw_dev, 0x8D, 0xB7); - pci_read_config_byte(fw_dev, 0xB7, &disable); - pci_write_config_byte(fw_dev, 0xB7, disable & ~0x02); - pci_write_config_byte(fw_dev, 0x8E, write_enable); - pci_write_config_byte(fw_dev, 0x8D, write_target); - } else { - /* via R5C832 */ - - pci_read_config_byte(fw_dev, 0xCA, &write_enable); - pci_read_config_byte(fw_dev, 0xCB, &disable); - pci_write_config_byte(fw_dev, 0xCA, 0x57); - pci_write_config_byte(fw_dev, 0xCB, disable & ~0x02); - pci_write_config_byte(fw_dev, 0xCA, write_enable); - } - - printk(KERN_INFO DRIVER_NAME - ": Controller is now re-enabled.\n"); - - return 0; -} - -static int __devinit ricoh_mmc_probe(struct pci_dev *pdev, - const struct pci_device_id *ent) -{ - u8 rev; - u8 ctrlfound = 0; - - struct pci_dev *fw_dev = NULL; - - BUG_ON(pdev == NULL); - BUG_ON(ent == NULL); - - pci_read_config_byte(pdev, PCI_CLASS_REVISION, &rev); - - printk(KERN_INFO DRIVER_NAME - ": Ricoh MMC controller found at %s [%04x:%04x] (rev %x)\n", - pci_name(pdev), (int)pdev->vendor, (int)pdev->device, - (int)rev); - - while ((fw_dev = - pci_get_device(PCI_VENDOR_ID_RICOH, - PCI_DEVICE_ID_RICOH_RL5C476, fw_dev))) { - if (PCI_SLOT(pdev->devfn) == PCI_SLOT(fw_dev->devfn) && - PCI_FUNC(fw_dev->devfn) == 0 && - pdev->bus == fw_dev->bus) { - if (ricoh_mmc_disable(fw_dev) != 0) - return -ENODEV; - - pci_set_drvdata(pdev, fw_dev); - - ++ctrlfound; - break; - } - } - - fw_dev = NULL; - - while (!ctrlfound && - (fw_dev = pci_get_device(PCI_VENDOR_ID_RICOH, - PCI_DEVICE_ID_RICOH_R5C832, fw_dev))) { - if (PCI_SLOT(pdev->devfn) == PCI_SLOT(fw_dev->devfn) && - PCI_FUNC(fw_dev->devfn) == 0 && - pdev->bus == fw_dev->bus) { - if (ricoh_mmc_disable(fw_dev) != 0) - return -ENODEV; - - pci_set_drvdata(pdev, fw_dev); - - ++ctrlfound; - } - } - - if (!ctrlfound) { - printk(KERN_WARNING DRIVER_NAME - ": Main Ricoh function not found. Cannot disable controller.\n"); - return -ENODEV; - } - - return 0; -} - -static void __devexit ricoh_mmc_remove(struct pci_dev *pdev) -{ - struct pci_dev *fw_dev = NULL; - - fw_dev = pci_get_drvdata(pdev); - BUG_ON(fw_dev == NULL); - - ricoh_mmc_enable(fw_dev); - - pci_set_drvdata(pdev, NULL); -} - -static int ricoh_mmc_suspend_late(struct pci_dev *pdev, pm_message_t state) -{ - struct pci_dev *fw_dev = NULL; - - fw_dev = pci_get_drvdata(pdev); - BUG_ON(fw_dev == NULL); - - printk(KERN_INFO DRIVER_NAME ": Suspending.\n"); - - ricoh_mmc_enable(fw_dev); - - return 0; -} - -static int ricoh_mmc_resume_early(struct pci_dev *pdev) -{ - struct pci_dev *fw_dev = NULL; - - fw_dev = pci_get_drvdata(pdev); - BUG_ON(fw_dev == NULL); - - printk(KERN_INFO DRIVER_NAME ": Resuming.\n"); - - ricoh_mmc_disable(fw_dev); - - return 0; -} - -static struct pci_driver ricoh_mmc_driver = { - .name = DRIVER_NAME, - .id_table = pci_ids, - .probe = ricoh_mmc_probe, - .remove = __devexit_p(ricoh_mmc_remove), - .suspend_late = ricoh_mmc_suspend_late, - .resume_early = ricoh_mmc_resume_early, -}; - -/*****************************************************************************\ - * * - * Driver init/exit * - * * -\*****************************************************************************/ - -static int __init ricoh_mmc_drv_init(void) -{ - printk(KERN_INFO DRIVER_NAME - ": Ricoh MMC Controller disabling driver\n"); - printk(KERN_INFO DRIVER_NAME ": Copyright(c) Philip Langdale\n"); - - return pci_register_driver(&ricoh_mmc_driver); -} - -static void __exit ricoh_mmc_drv_exit(void) -{ - pci_unregister_driver(&ricoh_mmc_driver); -} - -module_init(ricoh_mmc_drv_init); -module_exit(ricoh_mmc_drv_exit); - -MODULE_AUTHOR("Philip Langdale <philipl@alumni.utexas.net>"); -MODULE_DESCRIPTION("Ricoh MMC Controller disabling driver"); -MODULE_LICENSE("GPL"); - diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 245d2cd..a53197e 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -2516,6 +2516,83 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x150d, quirk_i82576_sriov); #endif /* CONFIG_PCI_IOV */ +/* + * This is a quirk for Ricoh MMC controller found as a part of + * multifunction chip. + * It is very similiar and based on ricoh_mmc driver written by Philip Langdale + * Thanks for these magic sequences. + * These chips implement the four main memory card + * controllers (SD, MMC, MS, xD) and one or both + * of cardbus or firewire. It happens that they implement SD and MMC + * support as separate controllers (and PCI functions). The linux SDHCI + * driver supports MMC cards but the chip detects MMC cards in hardware + * and directs them to the MMC controller - so the SDHCI driver never sees + * them. To get around this, we must disable the useless MMC controller. + * At that point, the SDHCI controller will start seeing them + * It seems to be the case that the relevant PCI registers to deactivate the + * MMC controller live on PCI function 0, which might be the cardbus controller + * or the firewire controller, depending on the particular chip in question + */ + +static void ricoh_mmc_fixup_rl5c476(struct pci_dev *dev) +{ + /* disable via cardbus interface */ + u8 write_enable; + u8 write_target; + u8 disable; + + /* disable must be done via function #0 */ + if (PCI_FUNC(dev->devfn)) + return; + + pci_read_config_byte(dev, 0xB7, &disable); + if (disable & 0x02) + return; + + pci_read_config_byte(dev, 0x8E, &write_enable); + pci_write_config_byte(dev, 0x8E, 0xAA); + pci_read_config_byte(dev, 0x8D, &write_target); + pci_write_config_byte(dev, 0x8D, 0xB7); + pci_write_config_byte(dev, 0xB7, disable | 0x02); + pci_write_config_byte(dev, 0x8E, write_enable); + pci_write_config_byte(dev, 0x8D, write_target); +} + +static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev) +{ + /* disable via firewire interface */ + u8 write_enable; + u8 disable; + + /* disable must be done via function #0 */ + if (PCI_FUNC(dev->devfn)) + return; + + pci_read_config_byte(dev, 0xCB, &disable); + + if (disable & 0x02) + return; + + pci_read_config_byte(dev, 0xCA, &write_enable); + pci_write_config_byte(dev, 0xCA, 0x57); + pci_write_config_byte(dev, 0xCB, disable | 0x02); + pci_write_config_byte(dev, 0xCA, write_enable); +} + +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C476, + ricoh_mmc_fixup_rl5c476); + +DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C476, + ricoh_mmc_fixup_rl5c476); + + +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); + + static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end) { -- 1.6.3.3 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [PATCH] Port ricoh_mmc from driver to pci quirk. 2009-11-25 14:58 ` [PATCH] Port ricoh_mmc from driver to pci quirk Maxim Levitsky @ 2009-11-25 16:53 ` Philip Langdale 2009-11-25 19:35 ` Andrew Morton 2009-11-25 20:30 ` [PATCH] Port ricoh_mmc from driver " Pierre Ossman 0 siblings, 2 replies; 25+ messages in thread From: Philip Langdale @ 2009-11-25 16:53 UTC (permalink / raw) To: Maxim Levitsky, Pierre Ossman; +Cc: linux-kernel On Wed, 25 Nov 2009 16:58:41 +0200 Maxim Levitsky <maximlevitsky@gmail.com> wrote: > >From 5c5e6f5ab1a5a09a430f410cab4b160a5e65501c Mon Sep 17 00:00:00 > >2001 > From: Maxim Levitsky <maximlevitsky@gmail.com> > Date: Wed, 25 Nov 2009 16:37:46 +0200 > Subject: [PATCH] Port ricoh_mmc from driver to pci quirk. > This is much cleaner and correct solution I'm fine with the concept, but when I originally started work on Ricoh support, Pierre specifically didn't want a pci quirk. Pierre wrote: > I'd rather we didn't. The current style of quirks are bad enough, > making them even more vendor or device specific is a bit more than I'm > willing to accept right now (seriously, how hard can it be to follow > the damn spec?). Pierre's not officially the maintainer anymore but I still respect his opinions here. Given that a pci quirk solves this problem so simply, I think it's justified at this point. Pierre, do you want to comment? > Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com> > --- > drivers/mmc/host/Kconfig | 17 --- > drivers/mmc/host/Makefile | 1 - > drivers/mmc/host/ricoh_mmc.c | 262 > ------------------------------------------ > drivers/pci/quirks.c | 77 ++++++++++++ 4 files changed, 77 > insertions(+), 280 deletions(-) delete mode 100644 > drivers/mmc/host/ricoh_mmc.c > > diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig > index 432ae83..4edce18 100644 > --- a/drivers/mmc/host/Kconfig > +++ b/drivers/mmc/host/Kconfig > @@ -55,23 +55,6 @@ config MMC_SDHCI_PCI > > If unsure, say N. > > -config MMC_RICOH_MMC > - tristate "Ricoh MMC Controller Disabler (EXPERIMENTAL)" > - depends on MMC_SDHCI_PCI > - help > - This selects the disabler for the Ricoh MMC Controller. > This > - proprietary controller is unnecessary because the SDHCI > driver > - supports MMC cards on the SD controller, but if it is not > - disabled, it will steal the MMC cards away - rendering them > - useless. It is safe to select this driver even if you don't > - have a Ricoh based card reader. > - > - > - To compile this driver as a module, choose M here: > - the module will be called ricoh_mmc. > - > - If unsure, say Y. > - > config MMC_SDHCI_OF > tristate "SDHCI support on OpenFirmware platforms" > depends on MMC_SDHCI && PPC_OF > diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile > index abcb040..7b82394 100644 > --- a/drivers/mmc/host/Makefile > +++ b/drivers/mmc/host/Makefile > @@ -12,7 +12,6 @@ obj-$(CONFIG_MMC_IMX) += imxmmc.o > obj-$(CONFIG_MMC_MXC) += mxcmmc.o > obj-$(CONFIG_MMC_SDHCI) += sdhci.o > obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o > -obj-$(CONFIG_MMC_RICOH_MMC) += ricoh_mmc.o > obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o > obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-pltfm.o > obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o > diff --git a/drivers/mmc/host/ricoh_mmc.c > b/drivers/mmc/host/ricoh_mmc.c deleted file mode 100644 > index f627905..0000000 > --- a/drivers/mmc/host/ricoh_mmc.c > +++ /dev/null > @@ -1,262 +0,0 @@ > -/* > - * ricoh_mmc.c - Dummy driver to disable the Rioch MMC controller. > - * > - * Copyright (C) 2007 Philip Langdale, All Rights Reserved. > - * > - * This program is free software; you can redistribute it and/or > modify > - * it under the terms of the GNU General Public License as published > by > - * the Free Software Foundation; either version 2 of the License, or > (at > - * your option) any later version. > - */ > - > -/* > - * This is a conceptually ridiculous driver, but it is required by > the way > - * the Ricoh multi-function chips (R5CXXX) work. These chips > implement > - * the four main memory card controllers (SD, MMC, MS, xD) and one > or both > - * of cardbus or firewire. It happens that they implement SD and MMC > - * support as separate controllers (and PCI functions). The linux > SDHCI > - * driver supports MMC cards but the chip detects MMC cards in > hardware > - * and directs them to the MMC controller - so the SDHCI driver > never sees > - * them. To get around this, we must disable the useless MMC > controller. > - * At that point, the SDHCI controller will start seeing them. As a > bonus, > - * a detection event occurs immediately, even if the MMC card is > already > - * in the reader. > - * > - * It seems to be the case that the relevant PCI registers to > deactivate the > - * MMC controller live on PCI function 0, which might be the cardbus > controller > - * or the firewire controller, depending on the particular chip in > question. As > - * such, it makes what this driver has to do unavoidably ugly. Such > is life. > - */ > - > -#include <linux/pci.h> > - > -#define DRIVER_NAME "ricoh-mmc" > - > -static const struct pci_device_id pci_ids[] __devinitdata = { > - { > - .vendor = PCI_VENDOR_ID_RICOH, > - .device = PCI_DEVICE_ID_RICOH_R5C843, > - .subvendor = PCI_ANY_ID, > - .subdevice = PCI_ANY_ID, > - }, > - { /* end: all zeroes */ }, > -}; > - > -MODULE_DEVICE_TABLE(pci, pci_ids); > - > -static int ricoh_mmc_disable(struct pci_dev *fw_dev) > -{ > - u8 write_enable; > - u8 write_target; > - u8 disable; > - > - if (fw_dev->device == PCI_DEVICE_ID_RICOH_RL5C476) { > - /* via RL5C476 */ > - > - pci_read_config_byte(fw_dev, 0xB7, &disable); > - if (disable & 0x02) { > - printk(KERN_INFO DRIVER_NAME > - ": Controller already disabled. " \ > - "Nothing to do.\n"); > - return -ENODEV; > - } > - > - pci_read_config_byte(fw_dev, 0x8E, &write_enable); > - pci_write_config_byte(fw_dev, 0x8E, 0xAA); > - pci_read_config_byte(fw_dev, 0x8D, &write_target); > - pci_write_config_byte(fw_dev, 0x8D, 0xB7); > - pci_write_config_byte(fw_dev, 0xB7, disable | 0x02); > - pci_write_config_byte(fw_dev, 0x8E, write_enable); > - pci_write_config_byte(fw_dev, 0x8D, write_target); > - } else { > - /* via R5C832 */ > - > - pci_read_config_byte(fw_dev, 0xCB, &disable); > - if (disable & 0x02) { > - printk(KERN_INFO DRIVER_NAME > - ": Controller already disabled. " \ > - "Nothing to do.\n"); > - return -ENODEV; > - } > - > - pci_read_config_byte(fw_dev, 0xCA, &write_enable); > - pci_write_config_byte(fw_dev, 0xCA, 0x57); > - pci_write_config_byte(fw_dev, 0xCB, disable | 0x02); > - pci_write_config_byte(fw_dev, 0xCA, write_enable); > - } > - > - printk(KERN_INFO DRIVER_NAME > - ": Controller is now disabled.\n"); > - > - return 0; > -} > - > -static int ricoh_mmc_enable(struct pci_dev *fw_dev) > -{ > - u8 write_enable; > - u8 write_target; > - u8 disable; > - > - if (fw_dev->device == PCI_DEVICE_ID_RICOH_RL5C476) { > - /* via RL5C476 */ > - > - pci_read_config_byte(fw_dev, 0x8E, &write_enable); > - pci_write_config_byte(fw_dev, 0x8E, 0xAA); > - pci_read_config_byte(fw_dev, 0x8D, &write_target); > - pci_write_config_byte(fw_dev, 0x8D, 0xB7); > - pci_read_config_byte(fw_dev, 0xB7, &disable); > - pci_write_config_byte(fw_dev, 0xB7, disable & ~0x02); > - pci_write_config_byte(fw_dev, 0x8E, write_enable); > - pci_write_config_byte(fw_dev, 0x8D, write_target); > - } else { > - /* via R5C832 */ > - > - pci_read_config_byte(fw_dev, 0xCA, &write_enable); > - pci_read_config_byte(fw_dev, 0xCB, &disable); > - pci_write_config_byte(fw_dev, 0xCA, 0x57); > - pci_write_config_byte(fw_dev, 0xCB, disable & ~0x02); > - pci_write_config_byte(fw_dev, 0xCA, write_enable); > - } > - > - printk(KERN_INFO DRIVER_NAME > - ": Controller is now re-enabled.\n"); > - > - return 0; > -} > - > -static int __devinit ricoh_mmc_probe(struct pci_dev *pdev, > - const struct pci_device_id *ent) > -{ > - u8 rev; > - u8 ctrlfound = 0; > - > - struct pci_dev *fw_dev = NULL; > - > - BUG_ON(pdev == NULL); > - BUG_ON(ent == NULL); > - > - pci_read_config_byte(pdev, PCI_CLASS_REVISION, &rev); > - > - printk(KERN_INFO DRIVER_NAME > - ": Ricoh MMC controller found at %s [%04x:%04x] (rev > %x)\n", > - pci_name(pdev), (int)pdev->vendor, (int)pdev->device, > - (int)rev); > - > - while ((fw_dev = > - pci_get_device(PCI_VENDOR_ID_RICOH, > - PCI_DEVICE_ID_RICOH_RL5C476, fw_dev))) { > - if (PCI_SLOT(pdev->devfn) == PCI_SLOT(fw_dev->devfn) > && > - PCI_FUNC(fw_dev->devfn) == 0 && > - pdev->bus == fw_dev->bus) { > - if (ricoh_mmc_disable(fw_dev) != 0) > - return -ENODEV; > - > - pci_set_drvdata(pdev, fw_dev); > - > - ++ctrlfound; > - break; > - } > - } > - > - fw_dev = NULL; > - > - while (!ctrlfound && > - (fw_dev = pci_get_device(PCI_VENDOR_ID_RICOH, > - PCI_DEVICE_ID_RICOH_R5C832, > fw_dev))) { > - if (PCI_SLOT(pdev->devfn) == PCI_SLOT(fw_dev->devfn) > && > - PCI_FUNC(fw_dev->devfn) == 0 && > - pdev->bus == fw_dev->bus) { > - if (ricoh_mmc_disable(fw_dev) != 0) > - return -ENODEV; > - > - pci_set_drvdata(pdev, fw_dev); > - > - ++ctrlfound; > - } > - } > - > - if (!ctrlfound) { > - printk(KERN_WARNING DRIVER_NAME > - ": Main Ricoh function not found. Cannot > disable controller.\n"); > - return -ENODEV; > - } > - > - return 0; > -} > - > -static void __devexit ricoh_mmc_remove(struct pci_dev *pdev) > -{ > - struct pci_dev *fw_dev = NULL; > - > - fw_dev = pci_get_drvdata(pdev); > - BUG_ON(fw_dev == NULL); > - > - ricoh_mmc_enable(fw_dev); > - > - pci_set_drvdata(pdev, NULL); > -} > - > -static int ricoh_mmc_suspend_late(struct pci_dev *pdev, pm_message_t > state) -{ > - struct pci_dev *fw_dev = NULL; > - > - fw_dev = pci_get_drvdata(pdev); > - BUG_ON(fw_dev == NULL); > - > - printk(KERN_INFO DRIVER_NAME ": Suspending.\n"); > - > - ricoh_mmc_enable(fw_dev); > - > - return 0; > -} > - > -static int ricoh_mmc_resume_early(struct pci_dev *pdev) > -{ > - struct pci_dev *fw_dev = NULL; > - > - fw_dev = pci_get_drvdata(pdev); > - BUG_ON(fw_dev == NULL); > - > - printk(KERN_INFO DRIVER_NAME ": Resuming.\n"); > - > - ricoh_mmc_disable(fw_dev); > - > - return 0; > -} > - > -static struct pci_driver ricoh_mmc_driver = { > - .name = DRIVER_NAME, > - .id_table = pci_ids, > - .probe = ricoh_mmc_probe, > - .remove = __devexit_p(ricoh_mmc_remove), > - .suspend_late = ricoh_mmc_suspend_late, > - .resume_early = ricoh_mmc_resume_early, > -}; > - > -/*****************************************************************************\ > - > * > * > - * Driver > init/exit * > - > * > * > -\*****************************************************************************/ > - -static int __init ricoh_mmc_drv_init(void) -{ > - printk(KERN_INFO DRIVER_NAME > - ": Ricoh MMC Controller disabling driver\n"); > - printk(KERN_INFO DRIVER_NAME ": Copyright(c) Philip > Langdale\n"); - > - return pci_register_driver(&ricoh_mmc_driver); > -} > - > -static void __exit ricoh_mmc_drv_exit(void) > -{ > - pci_unregister_driver(&ricoh_mmc_driver); > -} > - > -module_init(ricoh_mmc_drv_init); > -module_exit(ricoh_mmc_drv_exit); > - > -MODULE_AUTHOR("Philip Langdale <philipl@alumni.utexas.net>"); > -MODULE_DESCRIPTION("Ricoh MMC Controller disabling driver"); > -MODULE_LICENSE("GPL"); > - > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c > index 245d2cd..a53197e 100644 > --- a/drivers/pci/quirks.c > +++ b/drivers/pci/quirks.c > @@ -2516,6 +2516,83 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, > 0x150d, quirk_i82576_sriov); > #endif /* CONFIG_PCI_IOV */ > > +/* > + * This is a quirk for Ricoh MMC controller found as a part of > + * multifunction chip. > + * It is very similiar and based on ricoh_mmc driver written by > Philip Langdale > + * Thanks for these magic sequences. > + * These chips implement the four main memory card > + * controllers (SD, MMC, MS, xD) and one or both > + * of cardbus or firewire. It happens that they implement SD and MMC > + * support as separate controllers (and PCI functions). The linux > SDHCI > + * driver supports MMC cards but the chip detects MMC cards in > hardware > + * and directs them to the MMC controller - so the SDHCI driver > never sees > + * them. To get around this, we must disable the useless MMC > controller. > + * At that point, the SDHCI controller will start seeing them > + * It seems to be the case that the relevant PCI registers to > deactivate the > + * MMC controller live on PCI function 0, which might be the cardbus > controller > + * or the firewire controller, depending on the particular chip in > question > + */ > + > +static void ricoh_mmc_fixup_rl5c476(struct pci_dev *dev) > +{ > + /* disable via cardbus interface */ > + u8 write_enable; > + u8 write_target; > + u8 disable; > + > + /* disable must be done via function #0 */ > + if (PCI_FUNC(dev->devfn)) > + return; > + > + pci_read_config_byte(dev, 0xB7, &disable); > + if (disable & 0x02) > + return; > + > + pci_read_config_byte(dev, 0x8E, &write_enable); > + pci_write_config_byte(dev, 0x8E, 0xAA); > + pci_read_config_byte(dev, 0x8D, &write_target); > + pci_write_config_byte(dev, 0x8D, 0xB7); > + pci_write_config_byte(dev, 0xB7, disable | 0x02); > + pci_write_config_byte(dev, 0x8E, write_enable); > + pci_write_config_byte(dev, 0x8D, write_target); > +} > + > +static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev) > +{ > + /* disable via firewire interface */ > + u8 write_enable; > + u8 disable; > + > + /* disable must be done via function #0 */ > + if (PCI_FUNC(dev->devfn)) > + return; > + > + pci_read_config_byte(dev, 0xCB, &disable); > + > + if (disable & 0x02) > + return; > + > + pci_read_config_byte(dev, 0xCA, &write_enable); > + pci_write_config_byte(dev, 0xCA, 0x57); > + pci_write_config_byte(dev, 0xCB, disable | 0x02); > + pci_write_config_byte(dev, 0xCA, write_enable); > +} > + > +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, > PCI_DEVICE_ID_RICOH_RL5C476, > + ricoh_mmc_fixup_rl5c476); > + > +DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, > PCI_DEVICE_ID_RICOH_RL5C476, > + ricoh_mmc_fixup_rl5c476); > + > + > +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); > + > + > static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, > struct pci_fixup *end) > { I would at least suggest a printk so ensure people know this is happening - otherwise there's no visible evidence that the system even has an MMC controller that's been disabled. Thanks, --phil ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH] Port ricoh_mmc from driver to pci quirk. 2009-11-25 16:53 ` Philip Langdale @ 2009-11-25 19:35 ` Andrew Morton 2009-11-25 23:40 ` Maxim Levitsky 2009-11-25 20:30 ` [PATCH] Port ricoh_mmc from driver " Pierre Ossman 1 sibling, 1 reply; 25+ messages in thread From: Andrew Morton @ 2009-11-25 19:35 UTC (permalink / raw) To: Philip Langdale; +Cc: Maxim Levitsky, Pierre Ossman, linux-kernel On Wed, 25 Nov 2009 08:53:24 -0800 Philip Langdale <philipl@overt.org> wrote: > On Wed, 25 Nov 2009 16:58:41 +0200 > Maxim Levitsky <maximlevitsky@gmail.com> wrote: > > > >From 5c5e6f5ab1a5a09a430f410cab4b160a5e65501c Mon Sep 17 00:00:00 > > >2001 > > From: Maxim Levitsky <maximlevitsky@gmail.com> > > Date: Wed, 25 Nov 2009 16:37:46 +0200 > > Subject: [PATCH] Port ricoh_mmc from driver to pci quirk. > > This is much cleaner and correct solution This patch actually fixes a bug but the changelog forgot to tell us this important fact. > I'm fine with the concept, but when I originally started work on > Ricoh support, Pierre specifically didn't want a pci quirk. > > Pierre wrote: > > I'd rather we didn't. The current style of quirks are bad enough, > > making them even more vendor or device specific is a bit more than I'm > > willing to accept right now (seriously, how hard can it be to follow > > the damn spec?). Can the bug be fixed by other means, within ricoh_mmc.c? It's a bit sad to add a lump of code to everyone's kernel like this - what percentage of those machines actually have a ricoh mmc controller? ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH] Port ricoh_mmc from driver to pci quirk. 2009-11-25 19:35 ` Andrew Morton @ 2009-11-25 23:40 ` Maxim Levitsky 2009-11-26 1:30 ` Philip Langdale 0 siblings, 1 reply; 25+ messages in thread From: Maxim Levitsky @ 2009-11-25 23:40 UTC (permalink / raw) To: Andrew Morton; +Cc: Philip Langdale, Pierre Ossman, linux-kernel On Wed, 2009-11-25 at 11:35 -0800, Andrew Morton wrote: > On Wed, 25 Nov 2009 08:53:24 -0800 > Philip Langdale <philipl@overt.org> wrote: > > > On Wed, 25 Nov 2009 16:58:41 +0200 > > Maxim Levitsky <maximlevitsky@gmail.com> wrote: > > > > > >From 5c5e6f5ab1a5a09a430f410cab4b160a5e65501c Mon Sep 17 00:00:00 > > > >2001 > > > From: Maxim Levitsky <maximlevitsky@gmail.com> > > > Date: Wed, 25 Nov 2009 16:37:46 +0200 > > > Subject: [PATCH] Port ricoh_mmc from driver to pci quirk. > > > This is much cleaner and correct solution > > This patch actually fixes a bug but the changelog forgot to tell us > this important fact. > > > I'm fine with the concept, but when I originally started work on > > Ricoh support, Pierre specifically didn't want a pci quirk. > > > > Pierre wrote: > > > I'd rather we didn't. The current style of quirks are bad enough, > > > making them even more vendor or device specific is a bit more than I'm > > > willing to accept right now (seriously, how hard can it be to follow > > > the damn spec?). > > Can the bug be fixed by other means, within ricoh_mmc.c? > > It's a bit sad to add a lump of code to everyone's kernel like this - > what percentage of those machines actually have a ricoh mmc controller? You have valid point here. However let me explain the situation: We have a device with 5 functions, One of the functions is propertary MMC contoller that writing driver for will be a coolosal waste of time, because it can be disabled. However, when it is disabled, it actually vanishes, and all pci functions that belong to controller decrease by one. Example: 07:00.0 FireWire (IEEE 1394): Ricoh Co Ltd R5C832 IEEE 1394 Controller (rev 05) 07:00.1 SD Host controller: Ricoh Co Ltd R5C822 SD/SDIO/MMC/MS/MSPro Host Adapter (rev 22) 07:00.2 System peripheral: Ricoh Co Ltd R5C843 MMC Host Controller (rev 12) 07:00.3 System peripheral: Ricoh Co Ltd R5C592 Memory Stick Bus Host Adapter (rev 12) 07:00.4 System peripheral: Ricoh Co Ltd xD-Picture Card Controller (rev ff) However the correct listing is: 07:00.0 FireWire (IEEE 1394): Ricoh Co Ltd R5C832 IEEE 1394 Controller (rev 05) 07:00.1 SD Host controller: Ricoh Co Ltd R5C822 SD/SDIO/MMC/MS/MSPro Host Adapter (rev 22) 07:00.2 System peripheral: Ricoh Co Ltd R5C592 Memory Stick Bus Host Adapter (rev 12) 07:00.3 System peripheral: Ricoh Co Ltd xD-Picture Card Controller (rev 12) PCI core can handle hotplug, but it sure can't handle the sudden shift in function numbers. Thus the disable step should be done before it enumerates the device, as my patch does, and unfortunately this can't be module. Up to now this driver did work, because both functions whose numbers are affected didn't have a driver, but I am going soon to implement one driver, and maybe another too. Of course, I can put that under config condition, that users that are sure that have no such device could save few hundreds of bytes. However a distro probably will enable this option. I also agree that I need to print some notice to user about device being disabled. Aside from being almost an 1:1 copy of original driver, this patch was sort of RFC, so I update it soon. Best regards, Maxim Levitsky ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH] Port ricoh_mmc from driver to pci quirk. 2009-11-25 23:40 ` Maxim Levitsky @ 2009-11-26 1:30 ` Philip Langdale 2009-11-26 23:51 ` Maxim Levitsky 0 siblings, 1 reply; 25+ messages in thread From: Philip Langdale @ 2009-11-26 1:30 UTC (permalink / raw) To: Maxim Levitsky; +Cc: Andrew Morton, Pierre Ossman, linux-kernel On Thu, 26 Nov 2009 01:40:01 +0200 Maxim Levitsky <maximlevitsky@gmail.com> wrote: > Of course, I can put that under config condition, that users that are > sure that have no such device could save few hundreds of bytes. > However a distro probably will enable this option. Yeah, this is the only way I can think of to make it optional - and i guess we could actually reuse the current CONFIG value to make it transparent. I kind of like this, but there's no precedent for it in PCI quirks as far as I can tell. > I also agree that I need to print some notice to user about device > being disabled. > > Aside from being almost an 1:1 copy of original driver, this patch was > sort of RFC, so I update it soon. Thanks! --phil ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH] Port ricoh_mmc from driver to pci quirk. 2009-11-26 1:30 ` Philip Langdale @ 2009-11-26 23:51 ` Maxim Levitsky 2009-11-26 23:53 ` [PATCH v2] port ricoh_mmc to be " Maxim Levitsky 0 siblings, 1 reply; 25+ messages in thread From: Maxim Levitsky @ 2009-11-26 23:51 UTC (permalink / raw) To: Philip Langdale; +Cc: Andrew Morton, Pierre Ossman, linux-kernel I send now an updated version, and hope it addresses most of the issues. I added proper changelog, put the quirk under kconfig define (same as was before) and added a message to kernel log about the disablement. I must note that this wasn't tested with real mmc card. It should work correctly though. What does work for sure is that MMC device disappears just like it did before, but now pci understands this. Best regards, Maxim Levitsky ^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH v2] port ricoh_mmc to be pci quirk 2009-11-26 23:51 ` Maxim Levitsky @ 2009-11-26 23:53 ` Maxim Levitsky 2009-11-27 7:55 ` Philip Langdale 0 siblings, 1 reply; 25+ messages in thread From: Maxim Levitsky @ 2009-11-26 23:53 UTC (permalink / raw) To: Philip Langdale; +Cc: Andrew Morton, Pierre Ossman, linux-kernel >From 2d3002e29c329d76ca4e26d9f427814151a9648c Mon Sep 17 00:00:00 2001 From: Maxim Levitsky <maximlevitsky@gmail.com> Date: Fri, 27 Nov 2009 00:53:28 +0200 Subject: [PATCH] port ricoh_mmc to be pci quirk This patch solves nasty problem original driver has. Original goal of the ricoh_mmc was to disable this device because then, mmc cards can be read using standard SDHCI controller, thus avoiding writing of yet another driver. However, the act of disablement, makes other pci functions that belong to this controller (xD and memstick) shift up one level, thus pci core has now wrong idea about these devices. To fix this issue, this patch moves the driver into pci quirk section, thus it is executes before the pci is enumerated, and therefore solving that issue, also same sequence of commands is performed on resume for same reasons. Also regardless of the above, this way is cleaner. You still need to set CONFIG_MMC_RICOH_MMC to enable this quirk Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com> --- drivers/mmc/host/Kconfig | 10 +- drivers/mmc/host/Makefile | 1 - drivers/mmc/host/ricoh_mmc.c | 262 ------------------------------------------ drivers/pci/quirks.c | 92 +++++++++++++++ 4 files changed, 95 insertions(+), 270 deletions(-) delete mode 100644 drivers/mmc/host/ricoh_mmc.c diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 432ae83..5cf4beb 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -56,20 +56,16 @@ config MMC_SDHCI_PCI If unsure, say N. config MMC_RICOH_MMC - tristate "Ricoh MMC Controller Disabler (EXPERIMENTAL)" + bool "Ricoh MMC Controller Disabler (EXPERIMENTAL)" depends on MMC_SDHCI_PCI help - This selects the disabler for the Ricoh MMC Controller. This + This adds a pci quirk to disable Ricoh MMC Controller. This proprietary controller is unnecessary because the SDHCI driver supports MMC cards on the SD controller, but if it is not disabled, it will steal the MMC cards away - rendering them - useless. It is safe to select this driver even if you don't + useless. It is safe to select this even if you don't have a Ricoh based card reader. - - To compile this driver as a module, choose M here: - the module will be called ricoh_mmc. - If unsure, say Y. config MMC_SDHCI_OF diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile index abcb040..7b82394 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -12,7 +12,6 @@ obj-$(CONFIG_MMC_IMX) += imxmmc.o obj-$(CONFIG_MMC_MXC) += mxcmmc.o obj-$(CONFIG_MMC_SDHCI) += sdhci.o obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o -obj-$(CONFIG_MMC_RICOH_MMC) += ricoh_mmc.o obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-pltfm.o obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o diff --git a/drivers/mmc/host/ricoh_mmc.c b/drivers/mmc/host/ricoh_mmc.c deleted file mode 100644 index f627905..0000000 --- a/drivers/mmc/host/ricoh_mmc.c +++ /dev/null @@ -1,262 +0,0 @@ -/* - * ricoh_mmc.c - Dummy driver to disable the Rioch MMC controller. - * - * Copyright (C) 2007 Philip Langdale, All Rights Reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. - */ - -/* - * This is a conceptually ridiculous driver, but it is required by the way - * the Ricoh multi-function chips (R5CXXX) work. These chips implement - * the four main memory card controllers (SD, MMC, MS, xD) and one or both - * of cardbus or firewire. It happens that they implement SD and MMC - * support as separate controllers (and PCI functions). The linux SDHCI - * driver supports MMC cards but the chip detects MMC cards in hardware - * and directs them to the MMC controller - so the SDHCI driver never sees - * them. To get around this, we must disable the useless MMC controller. - * At that point, the SDHCI controller will start seeing them. As a bonus, - * a detection event occurs immediately, even if the MMC card is already - * in the reader. - * - * It seems to be the case that the relevant PCI registers to deactivate the - * MMC controller live on PCI function 0, which might be the cardbus controller - * or the firewire controller, depending on the particular chip in question. As - * such, it makes what this driver has to do unavoidably ugly. Such is life. - */ - -#include <linux/pci.h> - -#define DRIVER_NAME "ricoh-mmc" - -static const struct pci_device_id pci_ids[] __devinitdata = { - { - .vendor = PCI_VENDOR_ID_RICOH, - .device = PCI_DEVICE_ID_RICOH_R5C843, - .subvendor = PCI_ANY_ID, - .subdevice = PCI_ANY_ID, - }, - { /* end: all zeroes */ }, -}; - -MODULE_DEVICE_TABLE(pci, pci_ids); - -static int ricoh_mmc_disable(struct pci_dev *fw_dev) -{ - u8 write_enable; - u8 write_target; - u8 disable; - - if (fw_dev->device == PCI_DEVICE_ID_RICOH_RL5C476) { - /* via RL5C476 */ - - pci_read_config_byte(fw_dev, 0xB7, &disable); - if (disable & 0x02) { - printk(KERN_INFO DRIVER_NAME - ": Controller already disabled. " \ - "Nothing to do.\n"); - return -ENODEV; - } - - pci_read_config_byte(fw_dev, 0x8E, &write_enable); - pci_write_config_byte(fw_dev, 0x8E, 0xAA); - pci_read_config_byte(fw_dev, 0x8D, &write_target); - pci_write_config_byte(fw_dev, 0x8D, 0xB7); - pci_write_config_byte(fw_dev, 0xB7, disable | 0x02); - pci_write_config_byte(fw_dev, 0x8E, write_enable); - pci_write_config_byte(fw_dev, 0x8D, write_target); - } else { - /* via R5C832 */ - - pci_read_config_byte(fw_dev, 0xCB, &disable); - if (disable & 0x02) { - printk(KERN_INFO DRIVER_NAME - ": Controller already disabled. " \ - "Nothing to do.\n"); - return -ENODEV; - } - - pci_read_config_byte(fw_dev, 0xCA, &write_enable); - pci_write_config_byte(fw_dev, 0xCA, 0x57); - pci_write_config_byte(fw_dev, 0xCB, disable | 0x02); - pci_write_config_byte(fw_dev, 0xCA, write_enable); - } - - printk(KERN_INFO DRIVER_NAME - ": Controller is now disabled.\n"); - - return 0; -} - -static int ricoh_mmc_enable(struct pci_dev *fw_dev) -{ - u8 write_enable; - u8 write_target; - u8 disable; - - if (fw_dev->device == PCI_DEVICE_ID_RICOH_RL5C476) { - /* via RL5C476 */ - - pci_read_config_byte(fw_dev, 0x8E, &write_enable); - pci_write_config_byte(fw_dev, 0x8E, 0xAA); - pci_read_config_byte(fw_dev, 0x8D, &write_target); - pci_write_config_byte(fw_dev, 0x8D, 0xB7); - pci_read_config_byte(fw_dev, 0xB7, &disable); - pci_write_config_byte(fw_dev, 0xB7, disable & ~0x02); - pci_write_config_byte(fw_dev, 0x8E, write_enable); - pci_write_config_byte(fw_dev, 0x8D, write_target); - } else { - /* via R5C832 */ - - pci_read_config_byte(fw_dev, 0xCA, &write_enable); - pci_read_config_byte(fw_dev, 0xCB, &disable); - pci_write_config_byte(fw_dev, 0xCA, 0x57); - pci_write_config_byte(fw_dev, 0xCB, disable & ~0x02); - pci_write_config_byte(fw_dev, 0xCA, write_enable); - } - - printk(KERN_INFO DRIVER_NAME - ": Controller is now re-enabled.\n"); - - return 0; -} - -static int __devinit ricoh_mmc_probe(struct pci_dev *pdev, - const struct pci_device_id *ent) -{ - u8 rev; - u8 ctrlfound = 0; - - struct pci_dev *fw_dev = NULL; - - BUG_ON(pdev == NULL); - BUG_ON(ent == NULL); - - pci_read_config_byte(pdev, PCI_CLASS_REVISION, &rev); - - printk(KERN_INFO DRIVER_NAME - ": Ricoh MMC controller found at %s [%04x:%04x] (rev %x)\n", - pci_name(pdev), (int)pdev->vendor, (int)pdev->device, - (int)rev); - - while ((fw_dev = - pci_get_device(PCI_VENDOR_ID_RICOH, - PCI_DEVICE_ID_RICOH_RL5C476, fw_dev))) { - if (PCI_SLOT(pdev->devfn) == PCI_SLOT(fw_dev->devfn) && - PCI_FUNC(fw_dev->devfn) == 0 && - pdev->bus == fw_dev->bus) { - if (ricoh_mmc_disable(fw_dev) != 0) - return -ENODEV; - - pci_set_drvdata(pdev, fw_dev); - - ++ctrlfound; - break; - } - } - - fw_dev = NULL; - - while (!ctrlfound && - (fw_dev = pci_get_device(PCI_VENDOR_ID_RICOH, - PCI_DEVICE_ID_RICOH_R5C832, fw_dev))) { - if (PCI_SLOT(pdev->devfn) == PCI_SLOT(fw_dev->devfn) && - PCI_FUNC(fw_dev->devfn) == 0 && - pdev->bus == fw_dev->bus) { - if (ricoh_mmc_disable(fw_dev) != 0) - return -ENODEV; - - pci_set_drvdata(pdev, fw_dev); - - ++ctrlfound; - } - } - - if (!ctrlfound) { - printk(KERN_WARNING DRIVER_NAME - ": Main Ricoh function not found. Cannot disable controller.\n"); - return -ENODEV; - } - - return 0; -} - -static void __devexit ricoh_mmc_remove(struct pci_dev *pdev) -{ - struct pci_dev *fw_dev = NULL; - - fw_dev = pci_get_drvdata(pdev); - BUG_ON(fw_dev == NULL); - - ricoh_mmc_enable(fw_dev); - - pci_set_drvdata(pdev, NULL); -} - -static int ricoh_mmc_suspend_late(struct pci_dev *pdev, pm_message_t state) -{ - struct pci_dev *fw_dev = NULL; - - fw_dev = pci_get_drvdata(pdev); - BUG_ON(fw_dev == NULL); - - printk(KERN_INFO DRIVER_NAME ": Suspending.\n"); - - ricoh_mmc_enable(fw_dev); - - return 0; -} - -static int ricoh_mmc_resume_early(struct pci_dev *pdev) -{ - struct pci_dev *fw_dev = NULL; - - fw_dev = pci_get_drvdata(pdev); - BUG_ON(fw_dev == NULL); - - printk(KERN_INFO DRIVER_NAME ": Resuming.\n"); - - ricoh_mmc_disable(fw_dev); - - return 0; -} - -static struct pci_driver ricoh_mmc_driver = { - .name = DRIVER_NAME, - .id_table = pci_ids, - .probe = ricoh_mmc_probe, - .remove = __devexit_p(ricoh_mmc_remove), - .suspend_late = ricoh_mmc_suspend_late, - .resume_early = ricoh_mmc_resume_early, -}; - -/*****************************************************************************\ - * * - * Driver init/exit * - * * -\*****************************************************************************/ - -static int __init ricoh_mmc_drv_init(void) -{ - printk(KERN_INFO DRIVER_NAME - ": Ricoh MMC Controller disabling driver\n"); - printk(KERN_INFO DRIVER_NAME ": Copyright(c) Philip Langdale\n"); - - return pci_register_driver(&ricoh_mmc_driver); -} - -static void __exit ricoh_mmc_drv_exit(void) -{ - pci_unregister_driver(&ricoh_mmc_driver); -} - -module_init(ricoh_mmc_drv_init); -module_exit(ricoh_mmc_drv_exit); - -MODULE_AUTHOR("Philip Langdale <philipl@alumni.utexas.net>"); -MODULE_DESCRIPTION("Ricoh MMC Controller disabling driver"); -MODULE_LICENSE("GPL"); - diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 245d2cd..c8b0f0f 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -2516,6 +2516,98 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x150d, quirk_i82576_sriov); #endif /* CONFIG_PCI_IOV */ +/* + * This is a quirk for Ricoh MMC controller found as a part of + * mulifunction chip. + + * This is very similiar and based on ricoh_mmc driver + * written by Philip Langdale. Thank you for these magic sequencies. + + * These chips implement the four main memory card + * controllers (SD, MMC, MS, xD) and one or both + * of cardbus or firewire. It happens that they implement SD and MMC + * support as separate controllers (and PCI functions). The linux SDHCI + * driver supports MMC cards but the chip detects MMC cards in hardware + * and directs them to the MMC controller - so the SDHCI driver never sees + * them. To get around this, we must disable the useless MMC controller. + * At that point, the SDHCI controller will start seeing them + * It seems to be the case that the relevant PCI registers to deactivate the + * MMC controller live on PCI function 0, which might be the cardbus controller + * or the firewire controller, depending on the particular chip in question + + * This has to be done early, because as soon as we disable the MMC controller + * other pci functions shift up one level, e.g. function #2 becames function + * #1, and therefore is confusing the pci core. + */ + +#ifdef CONFIG_MMC_RICOH_MMC +static void ricoh_mmc_fixup_rl5c476(struct pci_dev *dev) +{ + /* disable via cardbus interface */ + u8 write_enable; + u8 write_target; + u8 disable; + + /* disable must be done via function #0 */ + if (PCI_FUNC(dev->devfn)) + return; + + pci_read_config_byte(dev, 0xB7, &disable); + if (disable & 0x02) + return; + + pci_read_config_byte(dev, 0x8E, &write_enable); + pci_write_config_byte(dev, 0x8E, 0xAA); + pci_read_config_byte(dev, 0x8D, &write_target); + pci_write_config_byte(dev, 0x8D, 0xB7); + pci_write_config_byte(dev, 0xB7, disable | 0x02); + pci_write_config_byte(dev, 0x8E, write_enable); + pci_write_config_byte(dev, 0x8D, write_target); + + printk(KERN_NOTICE "pci: Ricoh MMC controller disabled\n"); + printk(KERN_NOTICE "pci: mmc cards will be supported through SDHCI\n"); +} + +static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev) +{ + /* disable via firewire interface */ + u8 write_enable; + u8 disable; + + /* disable must be done via function #0 */ + if (PCI_FUNC(dev->devfn)) + return; + + pci_read_config_byte(dev, 0xCB, &disable); + + if (disable & 0x02) + return; + + pci_read_config_byte(dev, 0xCA, &write_enable); + pci_write_config_byte(dev, 0xCA, 0x57); + pci_write_config_byte(dev, 0xCB, disable | 0x02); + pci_write_config_byte(dev, 0xCA, write_enable); + + printk(KERN_NOTICE "pci: Ricoh MMC controller disabled\n"); + printk(KERN_NOTICE "pci: mmc cards will be supported through SDHCI\n"); +} + +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C476, + ricoh_mmc_fixup_rl5c476); + +DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C476, + ricoh_mmc_fixup_rl5c476); + + +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); + +#endif /*CONFIG_MMC_RICOH_MMC*/ + + static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end) { -- 1.6.3.3 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [PATCH v2] port ricoh_mmc to be pci quirk 2009-11-26 23:53 ` [PATCH v2] port ricoh_mmc to be " Maxim Levitsky @ 2009-11-27 7:55 ` Philip Langdale 2010-01-08 15:24 ` Maxim Levitsky 0 siblings, 1 reply; 25+ messages in thread From: Philip Langdale @ 2009-11-27 7:55 UTC (permalink / raw) To: Maxim Levitsky; +Cc: Andrew Morton, Pierre Ossman, linux-kernel On Fri, 27 Nov 2009 01:53:04 +0200 Maxim Levitsky <maximlevitsky@gmail.com> wrote: > >From 2d3002e29c329d76ca4e26d9f427814151a9648c Mon Sep 17 00:00:00 > >2001 > From: Maxim Levitsky <maximlevitsky@gmail.com> > Date: Fri, 27 Nov 2009 00:53:28 +0200 > Subject: [PATCH] port ricoh_mmc to be pci quirk > > This patch solves nasty problem original driver has. > Original goal of the ricoh_mmc was to disable this device because > then, mmc cards can be read using standard SDHCI controller, > thus avoiding writing of yet another driver. > However, the act of disablement, makes other pci functions that > belong to this controller (xD and memstick) shift up one level, thus > pci core has now wrong idea about these devices. > > To fix this issue, this patch moves the driver into pci quirk > section, thus it is executes before the pci is enumerated, and > therefore solving that issue, also same sequence of commands is > performed on resume for same reasons. > > Also regardless of the above, this way is cleaner. > > You still need to set CONFIG_MMC_RICOH_MMC > to enable this quirk I like it. Only comment is that I'd like the printks to identify which controller is involved. If Andrew is happy with the CONFIG mechanism, then you've got an ack from me. Thanks for doing this. --phil > Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com> > --- > drivers/mmc/host/Kconfig | 10 +- > drivers/mmc/host/Makefile | 1 - > drivers/mmc/host/ricoh_mmc.c | 262 > ------------------------------------------ > drivers/pci/quirks.c | 92 +++++++++++++++ 4 files changed, > 95 insertions(+), 270 deletions(-) delete mode 100644 > drivers/mmc/host/ricoh_mmc.c > > diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig > index 432ae83..5cf4beb 100644 > --- a/drivers/mmc/host/Kconfig > +++ b/drivers/mmc/host/Kconfig > @@ -56,20 +56,16 @@ config MMC_SDHCI_PCI > If unsure, say N. > > config MMC_RICOH_MMC > - tristate "Ricoh MMC Controller Disabler (EXPERIMENTAL)" > + bool "Ricoh MMC Controller Disabler (EXPERIMENTAL)" > depends on MMC_SDHCI_PCI > help > - This selects the disabler for the Ricoh MMC Controller. > This > + This adds a pci quirk to disable Ricoh MMC Controller. This > proprietary controller is unnecessary because the SDHCI > driver supports MMC cards on the SD controller, but if it is not > disabled, it will steal the MMC cards away - rendering them > - useless. It is safe to select this driver even if you don't > + useless. It is safe to select this even if you don't > have a Ricoh based card reader. > > - > - To compile this driver as a module, choose M here: > - the module will be called ricoh_mmc. > - > If unsure, say Y. > > config MMC_SDHCI_OF > diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile > index abcb040..7b82394 100644 > --- a/drivers/mmc/host/Makefile > +++ b/drivers/mmc/host/Makefile > @@ -12,7 +12,6 @@ obj-$(CONFIG_MMC_IMX) += imxmmc.o > obj-$(CONFIG_MMC_MXC) += mxcmmc.o > obj-$(CONFIG_MMC_SDHCI) += sdhci.o > obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o > -obj-$(CONFIG_MMC_RICOH_MMC) += ricoh_mmc.o > obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o > obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-pltfm.o > obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o > diff --git a/drivers/mmc/host/ricoh_mmc.c > b/drivers/mmc/host/ricoh_mmc.c deleted file mode 100644 > index f627905..0000000 > --- a/drivers/mmc/host/ricoh_mmc.c > +++ /dev/null > @@ -1,262 +0,0 @@ > -/* > - * ricoh_mmc.c - Dummy driver to disable the Rioch MMC controller. > - * > - * Copyright (C) 2007 Philip Langdale, All Rights Reserved. > - * > - * This program is free software; you can redistribute it and/or > modify > - * it under the terms of the GNU General Public License as published > by > - * the Free Software Foundation; either version 2 of the License, or > (at > - * your option) any later version. > - */ > - > -/* > - * This is a conceptually ridiculous driver, but it is required by > the way > - * the Ricoh multi-function chips (R5CXXX) work. These chips > implement > - * the four main memory card controllers (SD, MMC, MS, xD) and one > or both > - * of cardbus or firewire. It happens that they implement SD and MMC > - * support as separate controllers (and PCI functions). The linux > SDHCI > - * driver supports MMC cards but the chip detects MMC cards in > hardware > - * and directs them to the MMC controller - so the SDHCI driver > never sees > - * them. To get around this, we must disable the useless MMC > controller. > - * At that point, the SDHCI controller will start seeing them. As a > bonus, > - * a detection event occurs immediately, even if the MMC card is > already > - * in the reader. > - * > - * It seems to be the case that the relevant PCI registers to > deactivate the > - * MMC controller live on PCI function 0, which might be the cardbus > controller > - * or the firewire controller, depending on the particular chip in > question. As > - * such, it makes what this driver has to do unavoidably ugly. Such > is life. > - */ > - > -#include <linux/pci.h> > - > -#define DRIVER_NAME "ricoh-mmc" > - > -static const struct pci_device_id pci_ids[] __devinitdata = { > - { > - .vendor = PCI_VENDOR_ID_RICOH, > - .device = PCI_DEVICE_ID_RICOH_R5C843, > - .subvendor = PCI_ANY_ID, > - .subdevice = PCI_ANY_ID, > - }, > - { /* end: all zeroes */ }, > -}; > - > -MODULE_DEVICE_TABLE(pci, pci_ids); > - > -static int ricoh_mmc_disable(struct pci_dev *fw_dev) > -{ > - u8 write_enable; > - u8 write_target; > - u8 disable; > - > - if (fw_dev->device == PCI_DEVICE_ID_RICOH_RL5C476) { > - /* via RL5C476 */ > - > - pci_read_config_byte(fw_dev, 0xB7, &disable); > - if (disable & 0x02) { > - printk(KERN_INFO DRIVER_NAME > - ": Controller already disabled. " \ > - "Nothing to do.\n"); > - return -ENODEV; > - } > - > - pci_read_config_byte(fw_dev, 0x8E, &write_enable); > - pci_write_config_byte(fw_dev, 0x8E, 0xAA); > - pci_read_config_byte(fw_dev, 0x8D, &write_target); > - pci_write_config_byte(fw_dev, 0x8D, 0xB7); > - pci_write_config_byte(fw_dev, 0xB7, disable | 0x02); > - pci_write_config_byte(fw_dev, 0x8E, write_enable); > - pci_write_config_byte(fw_dev, 0x8D, write_target); > - } else { > - /* via R5C832 */ > - > - pci_read_config_byte(fw_dev, 0xCB, &disable); > - if (disable & 0x02) { > - printk(KERN_INFO DRIVER_NAME > - ": Controller already disabled. " \ > - "Nothing to do.\n"); > - return -ENODEV; > - } > - > - pci_read_config_byte(fw_dev, 0xCA, &write_enable); > - pci_write_config_byte(fw_dev, 0xCA, 0x57); > - pci_write_config_byte(fw_dev, 0xCB, disable | 0x02); > - pci_write_config_byte(fw_dev, 0xCA, write_enable); > - } > - > - printk(KERN_INFO DRIVER_NAME > - ": Controller is now disabled.\n"); > - > - return 0; > -} > - > -static int ricoh_mmc_enable(struct pci_dev *fw_dev) > -{ > - u8 write_enable; > - u8 write_target; > - u8 disable; > - > - if (fw_dev->device == PCI_DEVICE_ID_RICOH_RL5C476) { > - /* via RL5C476 */ > - > - pci_read_config_byte(fw_dev, 0x8E, &write_enable); > - pci_write_config_byte(fw_dev, 0x8E, 0xAA); > - pci_read_config_byte(fw_dev, 0x8D, &write_target); > - pci_write_config_byte(fw_dev, 0x8D, 0xB7); > - pci_read_config_byte(fw_dev, 0xB7, &disable); > - pci_write_config_byte(fw_dev, 0xB7, disable & ~0x02); > - pci_write_config_byte(fw_dev, 0x8E, write_enable); > - pci_write_config_byte(fw_dev, 0x8D, write_target); > - } else { > - /* via R5C832 */ > - > - pci_read_config_byte(fw_dev, 0xCA, &write_enable); > - pci_read_config_byte(fw_dev, 0xCB, &disable); > - pci_write_config_byte(fw_dev, 0xCA, 0x57); > - pci_write_config_byte(fw_dev, 0xCB, disable & ~0x02); > - pci_write_config_byte(fw_dev, 0xCA, write_enable); > - } > - > - printk(KERN_INFO DRIVER_NAME > - ": Controller is now re-enabled.\n"); > - > - return 0; > -} > - > -static int __devinit ricoh_mmc_probe(struct pci_dev *pdev, > - const struct pci_device_id *ent) > -{ > - u8 rev; > - u8 ctrlfound = 0; > - > - struct pci_dev *fw_dev = NULL; > - > - BUG_ON(pdev == NULL); > - BUG_ON(ent == NULL); > - > - pci_read_config_byte(pdev, PCI_CLASS_REVISION, &rev); > - > - printk(KERN_INFO DRIVER_NAME > - ": Ricoh MMC controller found at %s [%04x:%04x] (rev > %x)\n", > - pci_name(pdev), (int)pdev->vendor, (int)pdev->device, > - (int)rev); > - > - while ((fw_dev = > - pci_get_device(PCI_VENDOR_ID_RICOH, > - PCI_DEVICE_ID_RICOH_RL5C476, fw_dev))) { > - if (PCI_SLOT(pdev->devfn) == PCI_SLOT(fw_dev->devfn) > && > - PCI_FUNC(fw_dev->devfn) == 0 && > - pdev->bus == fw_dev->bus) { > - if (ricoh_mmc_disable(fw_dev) != 0) > - return -ENODEV; > - > - pci_set_drvdata(pdev, fw_dev); > - > - ++ctrlfound; > - break; > - } > - } > - > - fw_dev = NULL; > - > - while (!ctrlfound && > - (fw_dev = pci_get_device(PCI_VENDOR_ID_RICOH, > - PCI_DEVICE_ID_RICOH_R5C832, > fw_dev))) { > - if (PCI_SLOT(pdev->devfn) == PCI_SLOT(fw_dev->devfn) > && > - PCI_FUNC(fw_dev->devfn) == 0 && > - pdev->bus == fw_dev->bus) { > - if (ricoh_mmc_disable(fw_dev) != 0) > - return -ENODEV; > - > - pci_set_drvdata(pdev, fw_dev); > - > - ++ctrlfound; > - } > - } > - > - if (!ctrlfound) { > - printk(KERN_WARNING DRIVER_NAME > - ": Main Ricoh function not found. Cannot > disable controller.\n"); > - return -ENODEV; > - } > - > - return 0; > -} > - > -static void __devexit ricoh_mmc_remove(struct pci_dev *pdev) > -{ > - struct pci_dev *fw_dev = NULL; > - > - fw_dev = pci_get_drvdata(pdev); > - BUG_ON(fw_dev == NULL); > - > - ricoh_mmc_enable(fw_dev); > - > - pci_set_drvdata(pdev, NULL); > -} > - > -static int ricoh_mmc_suspend_late(struct pci_dev *pdev, pm_message_t > state) -{ > - struct pci_dev *fw_dev = NULL; > - > - fw_dev = pci_get_drvdata(pdev); > - BUG_ON(fw_dev == NULL); > - > - printk(KERN_INFO DRIVER_NAME ": Suspending.\n"); > - > - ricoh_mmc_enable(fw_dev); > - > - return 0; > -} > - > -static int ricoh_mmc_resume_early(struct pci_dev *pdev) > -{ > - struct pci_dev *fw_dev = NULL; > - > - fw_dev = pci_get_drvdata(pdev); > - BUG_ON(fw_dev == NULL); > - > - printk(KERN_INFO DRIVER_NAME ": Resuming.\n"); > - > - ricoh_mmc_disable(fw_dev); > - > - return 0; > -} > - > -static struct pci_driver ricoh_mmc_driver = { > - .name = DRIVER_NAME, > - .id_table = pci_ids, > - .probe = ricoh_mmc_probe, > - .remove = __devexit_p(ricoh_mmc_remove), > - .suspend_late = ricoh_mmc_suspend_late, > - .resume_early = ricoh_mmc_resume_early, > -}; > - > -/*****************************************************************************\ > - > * > * > - * Driver > init/exit * > - > * > * > -\*****************************************************************************/ > - -static int __init ricoh_mmc_drv_init(void) -{ > - printk(KERN_INFO DRIVER_NAME > - ": Ricoh MMC Controller disabling driver\n"); > - printk(KERN_INFO DRIVER_NAME ": Copyright(c) Philip > Langdale\n"); - > - return pci_register_driver(&ricoh_mmc_driver); > -} > - > -static void __exit ricoh_mmc_drv_exit(void) > -{ > - pci_unregister_driver(&ricoh_mmc_driver); > -} > - > -module_init(ricoh_mmc_drv_init); > -module_exit(ricoh_mmc_drv_exit); > - > -MODULE_AUTHOR("Philip Langdale <philipl@alumni.utexas.net>"); > -MODULE_DESCRIPTION("Ricoh MMC Controller disabling driver"); > -MODULE_LICENSE("GPL"); > - > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c > index 245d2cd..c8b0f0f 100644 > --- a/drivers/pci/quirks.c > +++ b/drivers/pci/quirks.c > @@ -2516,6 +2516,98 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, > 0x150d, quirk_i82576_sriov); > #endif /* CONFIG_PCI_IOV */ > > +/* > + * This is a quirk for Ricoh MMC controller found as a part of > + * mulifunction chip. > + > + * This is very similiar and based on ricoh_mmc driver > + * written by Philip Langdale. Thank you for these magic sequencies. > + > + * These chips implement the four main memory card > + * controllers (SD, MMC, MS, xD) and one or both > + * of cardbus or firewire. It happens that they implement SD and MMC > + * support as separate controllers (and PCI functions). The linux > SDHCI > + * driver supports MMC cards but the chip detects MMC cards in > hardware > + * and directs them to the MMC controller - so the SDHCI driver > never sees > + * them. To get around this, we must disable the useless MMC > controller. > + * At that point, the SDHCI controller will start seeing them > + * It seems to be the case that the relevant PCI registers to > deactivate the > + * MMC controller live on PCI function 0, which might be the cardbus > controller > + * or the firewire controller, depending on the particular chip in > question + > + * This has to be done early, because as soon as we disable the MMC > controller > + * other pci functions shift up one level, e.g. function #2 becames > function > + * #1, and therefore is confusing the pci core. > + */ > + > +#ifdef CONFIG_MMC_RICOH_MMC > +static void ricoh_mmc_fixup_rl5c476(struct pci_dev *dev) > +{ > + /* disable via cardbus interface */ > + u8 write_enable; > + u8 write_target; > + u8 disable; > + > + /* disable must be done via function #0 */ > + if (PCI_FUNC(dev->devfn)) > + return; > + > + pci_read_config_byte(dev, 0xB7, &disable); > + if (disable & 0x02) > + return; > + > + pci_read_config_byte(dev, 0x8E, &write_enable); > + pci_write_config_byte(dev, 0x8E, 0xAA); > + pci_read_config_byte(dev, 0x8D, &write_target); > + pci_write_config_byte(dev, 0x8D, 0xB7); > + pci_write_config_byte(dev, 0xB7, disable | 0x02); > + pci_write_config_byte(dev, 0x8E, write_enable); > + pci_write_config_byte(dev, 0x8D, write_target); > + > + printk(KERN_NOTICE "pci: Ricoh MMC controller disabled\n"); > + printk(KERN_NOTICE "pci: mmc cards will be supported through > SDHCI\n"); +} > + > +static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev) > +{ > + /* disable via firewire interface */ > + u8 write_enable; > + u8 disable; > + > + /* disable must be done via function #0 */ > + if (PCI_FUNC(dev->devfn)) > + return; > + > + pci_read_config_byte(dev, 0xCB, &disable); > + > + if (disable & 0x02) > + return; > + > + pci_read_config_byte(dev, 0xCA, &write_enable); > + pci_write_config_byte(dev, 0xCA, 0x57); > + pci_write_config_byte(dev, 0xCB, disable | 0x02); > + pci_write_config_byte(dev, 0xCA, write_enable); > + > + printk(KERN_NOTICE "pci: Ricoh MMC controller disabled\n"); > + printk(KERN_NOTICE "pci: mmc cards will be supported through > SDHCI\n"); +} > + > +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, > PCI_DEVICE_ID_RICOH_RL5C476, > + ricoh_mmc_fixup_rl5c476); > + > +DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, > PCI_DEVICE_ID_RICOH_RL5C476, > + ricoh_mmc_fixup_rl5c476); > + > + > +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); > + > +#endif /*CONFIG_MMC_RICOH_MMC*/ > + > + > static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, > struct pci_fixup *end) > { --phil ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH v2] port ricoh_mmc to be pci quirk 2009-11-27 7:55 ` Philip Langdale @ 2010-01-08 15:24 ` Maxim Levitsky 2010-01-08 15:40 ` Philip Langdale 0 siblings, 1 reply; 25+ messages in thread From: Maxim Levitsky @ 2010-01-08 15:24 UTC (permalink / raw) To: Philip Langdale; +Cc: Andrew Morton, Pierre Ossman, linux-kernel On Thu, 2009-11-26 at 23:55 -0800, Philip Langdale wrote: > On Fri, 27 Nov 2009 01:53:04 +0200 > Maxim Levitsky <maximlevitsky@gmail.com> wrote: > > > >From 2d3002e29c329d76ca4e26d9f427814151a9648c Mon Sep 17 00:00:00 > > >2001 > > From: Maxim Levitsky <maximlevitsky@gmail.com> > > Date: Fri, 27 Nov 2009 00:53:28 +0200 > > Subject: [PATCH] port ricoh_mmc to be pci quirk > > > > This patch solves nasty problem original driver has. > > Original goal of the ricoh_mmc was to disable this device because > > then, mmc cards can be read using standard SDHCI controller, > > thus avoiding writing of yet another driver. > > However, the act of disablement, makes other pci functions that > > belong to this controller (xD and memstick) shift up one level, thus > > pci core has now wrong idea about these devices. > > > > To fix this issue, this patch moves the driver into pci quirk > > section, thus it is executes before the pci is enumerated, and > > therefore solving that issue, also same sequence of commands is > > performed on resume for same reasons. > > > > Also regardless of the above, this way is cleaner. > > > > You still need to set CONFIG_MMC_RICOH_MMC > > to enable this quirk > > I like it. Only comment is that I'd like the printks to identify which > controller is involved. If Andrew is happy with the CONFIG mechanism, > then you've got an ack from me. > > Thanks for doing this. Hi, do you plan to include this patch in the kernel? BTW, I did write successfully the driver for the xD controller, so now this is a real problem. Best regards, Maxim Levitsky ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH v2] port ricoh_mmc to be pci quirk 2010-01-08 15:24 ` Maxim Levitsky @ 2010-01-08 15:40 ` Philip Langdale 2010-01-12 23:43 ` Andrew Morton 0 siblings, 1 reply; 25+ messages in thread From: Philip Langdale @ 2010-01-08 15:40 UTC (permalink / raw) To: Maxim Levitsky; +Cc: Andrew Morton, Pierre Ossman, linux-kernel On Fri, 08 Jan 2010 17:24:44 +0200 Maxim Levitsky <maximlevitsky@gmail.com> wrote: > On Thu, 2009-11-26 at 23:55 -0800, Philip Langdale wrote: > > On Fri, 27 Nov 2009 01:53:04 +0200 > > Maxim Levitsky <maximlevitsky@gmail.com> wrote: > > > > > >From 2d3002e29c329d76ca4e26d9f427814151a9648c Mon Sep 17 00:00:00 > > > >2001 > > > From: Maxim Levitsky <maximlevitsky@gmail.com> > > > Date: Fri, 27 Nov 2009 00:53:28 +0200 > > > Subject: [PATCH] port ricoh_mmc to be pci quirk > > > > > > This patch solves nasty problem original driver has. > > > Original goal of the ricoh_mmc was to disable this device because > > > then, mmc cards can be read using standard SDHCI controller, > > > thus avoiding writing of yet another driver. > > > However, the act of disablement, makes other pci functions that > > > belong to this controller (xD and memstick) shift up one level, > > > thus pci core has now wrong idea about these devices. > > > > > > To fix this issue, this patch moves the driver into pci quirk > > > section, thus it is executes before the pci is enumerated, and > > > therefore solving that issue, also same sequence of commands is > > > performed on resume for same reasons. > > > > > > Also regardless of the above, this way is cleaner. > > > > > > You still need to set CONFIG_MMC_RICOH_MMC > > > to enable this quirk > > > > I like it. Only comment is that I'd like the printks to identify > > which controller is involved. If Andrew is happy with the CONFIG > > mechanism, then you've got an ack from me. > > > > Thanks for doing this. > > Hi, do you plan to include this patch in the kernel? That's Andrew's call, but to the extent that my opinion matters, I support it being included. --phil ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH v2] port ricoh_mmc to be pci quirk 2010-01-08 15:40 ` Philip Langdale @ 2010-01-12 23:43 ` Andrew Morton 2010-01-13 1:23 ` Philip Langdale 2010-01-13 6:46 ` Wolfram Sang 0 siblings, 2 replies; 25+ messages in thread From: Andrew Morton @ 2010-01-12 23:43 UTC (permalink / raw) To: Philip Langdale; +Cc: Maxim Levitsky, Pierre Ossman, linux-kernel, linux-mmc (cc linux-mmc) On Fri, 8 Jan 2010 07:40:01 -0800 Philip Langdale <philipl@overt.org> wrote: > On Fri, 08 Jan 2010 17:24:44 +0200 > Maxim Levitsky <maximlevitsky@gmail.com> wrote: > > > On Thu, 2009-11-26 at 23:55 -0800, Philip Langdale wrote: > > > On Fri, 27 Nov 2009 01:53:04 +0200 > > > Maxim Levitsky <maximlevitsky@gmail.com> wrote: > > > > > > > >From 2d3002e29c329d76ca4e26d9f427814151a9648c Mon Sep 17 00:00:00 > > > > >2001 > > > > From: Maxim Levitsky <maximlevitsky@gmail.com> > > > > Date: Fri, 27 Nov 2009 00:53:28 +0200 > > > > Subject: [PATCH] port ricoh_mmc to be pci quirk > > > > > > > > This patch solves nasty problem original driver has. > > > > Original goal of the ricoh_mmc was to disable this device because > > > > then, mmc cards can be read using standard SDHCI controller, > > > > thus avoiding writing of yet another driver. > > > > However, the act of disablement, makes other pci functions that > > > > belong to this controller (xD and memstick) shift up one level, > > > > thus pci core has now wrong idea about these devices. > > > > > > > > To fix this issue, this patch moves the driver into pci quirk > > > > section, thus it is executes before the pci is enumerated, and > > > > therefore solving that issue, also same sequence of commands is > > > > performed on resume for same reasons. > > > > > > > > Also regardless of the above, this way is cleaner. > > > > > > > > You still need to set CONFIG_MMC_RICOH_MMC > > > > to enable this quirk > > > > > > I like it. Only comment is that I'd like the printks to identify > > > which controller is involved. If Andrew is happy with the CONFIG > > > mechanism, then you've got an ack from me. > > > > > > Thanks for doing this. > > > > Hi, do you plan to include this patch in the kernel? > > That's Andrew's call, but to the extent that my opinion matters, I > support it being included. > I have a note here that Pierre had issues with the patch. I'm uncertain whether those are now resolved? From: Maxim Levitsky <maximlevitsky@gmail.com> This patch solves nasty problem original driver has. Original goal of the ricoh_mmc was to disable this device because then, mmc cards can be read using standard SDHCI controller, thus avoiding writing of yet another driver. However, the act of disablement, makes other pci functions that belong to this controller (xD and memstick) shift up one level, thus pci core has now wrong idea about these devices. To fix this issue, this patch moves the driver into the pci quirk section, thus it is executes before the pci is enumerated, and therefore solving that issue, also same sequence of commands is performed on resume for same reasons. Also regardless of the above, this way is cleaner. You still need to set CONFIG_MMC_RICOH_MMC to enable this quirk Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com> Cc: Philip Langdale <philipl@overt.org> Cc: <linux-mmc@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> --- drivers/mmc/host/Kconfig | 10 - drivers/mmc/host/Makefile | 1 drivers/mmc/host/ricoh_mmc.c | 262 --------------------------------- drivers/pci/quirks.c | 92 +++++++++++ 4 files changed, 95 insertions(+), 270 deletions(-) diff -puN drivers/mmc/host/Kconfig~ricoh_mmc-port-from-driver-to-pci-quirk drivers/mmc/host/Kconfig --- a/drivers/mmc/host/Kconfig~ricoh_mmc-port-from-driver-to-pci-quirk +++ a/drivers/mmc/host/Kconfig @@ -69,20 +69,16 @@ config MMC_SDHCI_PCI If unsure, say N. config MMC_RICOH_MMC - tristate "Ricoh MMC Controller Disabler (EXPERIMENTAL)" + bool "Ricoh MMC Controller Disabler (EXPERIMENTAL)" depends on MMC_SDHCI_PCI help - This selects the disabler for the Ricoh MMC Controller. This + This adds a pci quirk to disable Ricoh MMC Controller. This proprietary controller is unnecessary because the SDHCI driver supports MMC cards on the SD controller, but if it is not disabled, it will steal the MMC cards away - rendering them - useless. It is safe to select this driver even if you don't + useless. It is safe to select this even if you don't have a Ricoh based card reader. - - To compile this driver as a module, choose M here: - the module will be called ricoh_mmc. - If unsure, say Y. config MMC_SDHCI_OF diff -puN drivers/mmc/host/Makefile~ricoh_mmc-port-from-driver-to-pci-quirk drivers/mmc/host/Makefile --- a/drivers/mmc/host/Makefile~ricoh_mmc-port-from-driver-to-pci-quirk +++ a/drivers/mmc/host/Makefile @@ -12,7 +12,6 @@ obj-$(CONFIG_MMC_IMX) += imxmmc.o obj-$(CONFIG_MMC_MXC) += mxcmmc.o obj-$(CONFIG_MMC_SDHCI) += sdhci.o obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o -obj-$(CONFIG_MMC_RICOH_MMC) += ricoh_mmc.o obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-pltfm.o obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o obj-$(CONFIG_MMC_WBSD) += wbsd.o diff -puN drivers/mmc/host/ricoh_mmc.c~ricoh_mmc-port-from-driver-to-pci-quirk /dev/null --- a/drivers/mmc/host/ricoh_mmc.c +++ /dev/null @@ -1,262 +0,0 @@ -/* - * ricoh_mmc.c - Dummy driver to disable the Rioch MMC controller. - * - * Copyright (C) 2007 Philip Langdale, All Rights Reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. - */ - -/* - * This is a conceptually ridiculous driver, but it is required by the way - * the Ricoh multi-function chips (R5CXXX) work. These chips implement - * the four main memory card controllers (SD, MMC, MS, xD) and one or both - * of cardbus or firewire. It happens that they implement SD and MMC - * support as separate controllers (and PCI functions). The linux SDHCI - * driver supports MMC cards but the chip detects MMC cards in hardware - * and directs them to the MMC controller - so the SDHCI driver never sees - * them. To get around this, we must disable the useless MMC controller. - * At that point, the SDHCI controller will start seeing them. As a bonus, - * a detection event occurs immediately, even if the MMC card is already - * in the reader. - * - * It seems to be the case that the relevant PCI registers to deactivate the - * MMC controller live on PCI function 0, which might be the cardbus controller - * or the firewire controller, depending on the particular chip in question. As - * such, it makes what this driver has to do unavoidably ugly. Such is life. - */ - -#include <linux/pci.h> - -#define DRIVER_NAME "ricoh-mmc" - -static const struct pci_device_id pci_ids[] __devinitdata = { - { - .vendor = PCI_VENDOR_ID_RICOH, - .device = PCI_DEVICE_ID_RICOH_R5C843, - .subvendor = PCI_ANY_ID, - .subdevice = PCI_ANY_ID, - }, - { /* end: all zeroes */ }, -}; - -MODULE_DEVICE_TABLE(pci, pci_ids); - -static int ricoh_mmc_disable(struct pci_dev *fw_dev) -{ - u8 write_enable; - u8 write_target; - u8 disable; - - if (fw_dev->device == PCI_DEVICE_ID_RICOH_RL5C476) { - /* via RL5C476 */ - - pci_read_config_byte(fw_dev, 0xB7, &disable); - if (disable & 0x02) { - printk(KERN_INFO DRIVER_NAME - ": Controller already disabled. " \ - "Nothing to do.\n"); - return -ENODEV; - } - - pci_read_config_byte(fw_dev, 0x8E, &write_enable); - pci_write_config_byte(fw_dev, 0x8E, 0xAA); - pci_read_config_byte(fw_dev, 0x8D, &write_target); - pci_write_config_byte(fw_dev, 0x8D, 0xB7); - pci_write_config_byte(fw_dev, 0xB7, disable | 0x02); - pci_write_config_byte(fw_dev, 0x8E, write_enable); - pci_write_config_byte(fw_dev, 0x8D, write_target); - } else { - /* via R5C832 */ - - pci_read_config_byte(fw_dev, 0xCB, &disable); - if (disable & 0x02) { - printk(KERN_INFO DRIVER_NAME - ": Controller already disabled. " \ - "Nothing to do.\n"); - return -ENODEV; - } - - pci_read_config_byte(fw_dev, 0xCA, &write_enable); - pci_write_config_byte(fw_dev, 0xCA, 0x57); - pci_write_config_byte(fw_dev, 0xCB, disable | 0x02); - pci_write_config_byte(fw_dev, 0xCA, write_enable); - } - - printk(KERN_INFO DRIVER_NAME - ": Controller is now disabled.\n"); - - return 0; -} - -static int ricoh_mmc_enable(struct pci_dev *fw_dev) -{ - u8 write_enable; - u8 write_target; - u8 disable; - - if (fw_dev->device == PCI_DEVICE_ID_RICOH_RL5C476) { - /* via RL5C476 */ - - pci_read_config_byte(fw_dev, 0x8E, &write_enable); - pci_write_config_byte(fw_dev, 0x8E, 0xAA); - pci_read_config_byte(fw_dev, 0x8D, &write_target); - pci_write_config_byte(fw_dev, 0x8D, 0xB7); - pci_read_config_byte(fw_dev, 0xB7, &disable); - pci_write_config_byte(fw_dev, 0xB7, disable & ~0x02); - pci_write_config_byte(fw_dev, 0x8E, write_enable); - pci_write_config_byte(fw_dev, 0x8D, write_target); - } else { - /* via R5C832 */ - - pci_read_config_byte(fw_dev, 0xCA, &write_enable); - pci_read_config_byte(fw_dev, 0xCB, &disable); - pci_write_config_byte(fw_dev, 0xCA, 0x57); - pci_write_config_byte(fw_dev, 0xCB, disable & ~0x02); - pci_write_config_byte(fw_dev, 0xCA, write_enable); - } - - printk(KERN_INFO DRIVER_NAME - ": Controller is now re-enabled.\n"); - - return 0; -} - -static int __devinit ricoh_mmc_probe(struct pci_dev *pdev, - const struct pci_device_id *ent) -{ - u8 rev; - u8 ctrlfound = 0; - - struct pci_dev *fw_dev = NULL; - - BUG_ON(pdev == NULL); - BUG_ON(ent == NULL); - - pci_read_config_byte(pdev, PCI_CLASS_REVISION, &rev); - - printk(KERN_INFO DRIVER_NAME - ": Ricoh MMC controller found at %s [%04x:%04x] (rev %x)\n", - pci_name(pdev), (int)pdev->vendor, (int)pdev->device, - (int)rev); - - while ((fw_dev = - pci_get_device(PCI_VENDOR_ID_RICOH, - PCI_DEVICE_ID_RICOH_RL5C476, fw_dev))) { - if (PCI_SLOT(pdev->devfn) == PCI_SLOT(fw_dev->devfn) && - PCI_FUNC(fw_dev->devfn) == 0 && - pdev->bus == fw_dev->bus) { - if (ricoh_mmc_disable(fw_dev) != 0) - return -ENODEV; - - pci_set_drvdata(pdev, fw_dev); - - ++ctrlfound; - break; - } - } - - fw_dev = NULL; - - while (!ctrlfound && - (fw_dev = pci_get_device(PCI_VENDOR_ID_RICOH, - PCI_DEVICE_ID_RICOH_R5C832, fw_dev))) { - if (PCI_SLOT(pdev->devfn) == PCI_SLOT(fw_dev->devfn) && - PCI_FUNC(fw_dev->devfn) == 0 && - pdev->bus == fw_dev->bus) { - if (ricoh_mmc_disable(fw_dev) != 0) - return -ENODEV; - - pci_set_drvdata(pdev, fw_dev); - - ++ctrlfound; - } - } - - if (!ctrlfound) { - printk(KERN_WARNING DRIVER_NAME - ": Main Ricoh function not found. Cannot disable controller.\n"); - return -ENODEV; - } - - return 0; -} - -static void __devexit ricoh_mmc_remove(struct pci_dev *pdev) -{ - struct pci_dev *fw_dev = NULL; - - fw_dev = pci_get_drvdata(pdev); - BUG_ON(fw_dev == NULL); - - ricoh_mmc_enable(fw_dev); - - pci_set_drvdata(pdev, NULL); -} - -static int ricoh_mmc_suspend_late(struct pci_dev *pdev, pm_message_t state) -{ - struct pci_dev *fw_dev = NULL; - - fw_dev = pci_get_drvdata(pdev); - BUG_ON(fw_dev == NULL); - - printk(KERN_INFO DRIVER_NAME ": Suspending.\n"); - - ricoh_mmc_enable(fw_dev); - - return 0; -} - -static int ricoh_mmc_resume_early(struct pci_dev *pdev) -{ - struct pci_dev *fw_dev = NULL; - - fw_dev = pci_get_drvdata(pdev); - BUG_ON(fw_dev == NULL); - - printk(KERN_INFO DRIVER_NAME ": Resuming.\n"); - - ricoh_mmc_disable(fw_dev); - - return 0; -} - -static struct pci_driver ricoh_mmc_driver = { - .name = DRIVER_NAME, - .id_table = pci_ids, - .probe = ricoh_mmc_probe, - .remove = __devexit_p(ricoh_mmc_remove), - .suspend_late = ricoh_mmc_suspend_late, - .resume_early = ricoh_mmc_resume_early, -}; - -/*****************************************************************************\ - * * - * Driver init/exit * - * * -\*****************************************************************************/ - -static int __init ricoh_mmc_drv_init(void) -{ - printk(KERN_INFO DRIVER_NAME - ": Ricoh MMC Controller disabling driver\n"); - printk(KERN_INFO DRIVER_NAME ": Copyright(c) Philip Langdale\n"); - - return pci_register_driver(&ricoh_mmc_driver); -} - -static void __exit ricoh_mmc_drv_exit(void) -{ - pci_unregister_driver(&ricoh_mmc_driver); -} - -module_init(ricoh_mmc_drv_init); -module_exit(ricoh_mmc_drv_exit); - -MODULE_AUTHOR("Philip Langdale <philipl@alumni.utexas.net>"); -MODULE_DESCRIPTION("Ricoh MMC Controller disabling driver"); -MODULE_LICENSE("GPL"); - diff -puN drivers/pci/quirks.c~ricoh_mmc-port-from-driver-to-pci-quirk drivers/pci/quirks.c --- a/drivers/pci/quirks.c~ricoh_mmc-port-from-driver-to-pci-quirk +++ a/drivers/pci/quirks.c @@ -2515,6 +2515,98 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I #endif /* CONFIG_PCI_IOV */ +/* + * This is a quirk for Ricoh MMC controller found as a part of + * mulifunction chip. + + * This is very similiar and based on ricoh_mmc driver + * written by Philip Langdale. Thank you for these magic sequencies. + + * These chips implement the four main memory card + * controllers (SD, MMC, MS, xD) and one or both + * of cardbus or firewire. It happens that they implement SD and MMC + * support as separate controllers (and PCI functions). The linux SDHCI + * driver supports MMC cards but the chip detects MMC cards in hardware + * and directs them to the MMC controller - so the SDHCI driver never sees + * them. To get around this, we must disable the useless MMC controller. + * At that point, the SDHCI controller will start seeing them + * It seems to be the case that the relevant PCI registers to deactivate the + * MMC controller live on PCI function 0, which might be the cardbus controller + * or the firewire controller, depending on the particular chip in question + + * This has to be done early, because as soon as we disable the MMC controller + * other pci functions shift up one level, e.g. function #2 becames function + * #1, and therefore is confusing the pci core. + */ + +#ifdef CONFIG_MMC_RICOH_MMC +static void ricoh_mmc_fixup_rl5c476(struct pci_dev *dev) +{ + /* disable via cardbus interface */ + u8 write_enable; + u8 write_target; + u8 disable; + + /* disable must be done via function #0 */ + if (PCI_FUNC(dev->devfn)) + return; + + pci_read_config_byte(dev, 0xB7, &disable); + if (disable & 0x02) + return; + + pci_read_config_byte(dev, 0x8E, &write_enable); + pci_write_config_byte(dev, 0x8E, 0xAA); + pci_read_config_byte(dev, 0x8D, &write_target); + pci_write_config_byte(dev, 0x8D, 0xB7); + pci_write_config_byte(dev, 0xB7, disable | 0x02); + pci_write_config_byte(dev, 0x8E, write_enable); + pci_write_config_byte(dev, 0x8D, write_target); + + printk(KERN_NOTICE "pci: Ricoh MMC controller disabled\n"); + printk(KERN_NOTICE "pci: mmc cards will be supported through SDHCI\n"); +} + +static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev) +{ + /* disable via firewire interface */ + u8 write_enable; + u8 disable; + + /* disable must be done via function #0 */ + if (PCI_FUNC(dev->devfn)) + return; + + pci_read_config_byte(dev, 0xCB, &disable); + + if (disable & 0x02) + return; + + pci_read_config_byte(dev, 0xCA, &write_enable); + pci_write_config_byte(dev, 0xCA, 0x57); + pci_write_config_byte(dev, 0xCB, disable | 0x02); + pci_write_config_byte(dev, 0xCA, write_enable); + + printk(KERN_NOTICE "pci: Ricoh MMC controller disabled\n"); + printk(KERN_NOTICE "pci: mmc cards will be supported through SDHCI\n"); +} + +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C476, + ricoh_mmc_fixup_rl5c476); + +DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C476, + ricoh_mmc_fixup_rl5c476); + + +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); + +#endif /*CONFIG_MMC_RICOH_MMC*/ + + static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end) { _ ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH v2] port ricoh_mmc to be pci quirk 2010-01-12 23:43 ` Andrew Morton @ 2010-01-13 1:23 ` Philip Langdale 2010-01-13 6:46 ` Wolfram Sang 1 sibling, 0 replies; 25+ messages in thread From: Philip Langdale @ 2010-01-13 1:23 UTC (permalink / raw) To: Andrew Morton; +Cc: Maxim Levitsky, Pierre Ossman, linux-kernel, linux-mmc On Tue, 12 Jan 2010 15:43:50 -0800 Andrew Morton <akpm@linux-foundation.org> wrote: > (cc linux-mmc) > > On Fri, 8 Jan 2010 07:40:01 -0800 > Philip Langdale <philipl@overt.org> wrote: > > > On Fri, 08 Jan 2010 17:24:44 +0200 > > Maxim Levitsky <maximlevitsky@gmail.com> wrote: > > > > > On Thu, 2009-11-26 at 23:55 -0800, Philip Langdale wrote: > > > > On Fri, 27 Nov 2009 01:53:04 +0200 > > > > Maxim Levitsky <maximlevitsky@gmail.com> wrote: > > > > > > > > > >From 2d3002e29c329d76ca4e26d9f427814151a9648c Mon Sep 17 > > > > > >00:00:00 2001 > > > > > From: Maxim Levitsky <maximlevitsky@gmail.com> > > > > > Date: Fri, 27 Nov 2009 00:53:28 +0200 > > > > > Subject: [PATCH] port ricoh_mmc to be pci quirk > > > > > > > > > > This patch solves nasty problem original driver has. > > > > > Original goal of the ricoh_mmc was to disable this device > > > > > because then, mmc cards can be read using standard SDHCI > > > > > controller, thus avoiding writing of yet another driver. > > > > > However, the act of disablement, makes other pci functions > > > > > that belong to this controller (xD and memstick) shift up one > > > > > level, thus pci core has now wrong idea about these devices. > > > > > > > > > > To fix this issue, this patch moves the driver into pci quirk > > > > > section, thus it is executes before the pci is enumerated, and > > > > > therefore solving that issue, also same sequence of commands > > > > > is performed on resume for same reasons. > > > > > > > > > > Also regardless of the above, this way is cleaner. > > > > > > > > > > You still need to set CONFIG_MMC_RICOH_MMC > > > > > to enable this quirk > > > > > > > > I like it. Only comment is that I'd like the printks to identify > > > > which controller is involved. If Andrew is happy with the CONFIG > > > > mechanism, then you've got an ack from me. > > > > > > > > Thanks for doing this. > > > > > > Hi, do you plan to include this patch in the kernel? > > > > That's Andrew's call, but to the extent that my opinion matters, I > > support it being included. > > > > I have a note here that Pierre had issues with the patch. I'm > uncertain whether those are now resolved? The last comment from Pierre I have is from the 25th of November and says: > I have no objections to this patch. :-) --phil ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH v2] port ricoh_mmc to be pci quirk 2010-01-12 23:43 ` Andrew Morton 2010-01-13 1:23 ` Philip Langdale @ 2010-01-13 6:46 ` Wolfram Sang 2010-01-29 13:37 ` [PATCH v3] port ricoh_mmc to " Maxim Levitsky 1 sibling, 1 reply; 25+ messages in thread From: Wolfram Sang @ 2010-01-13 6:46 UTC (permalink / raw) To: Andrew Morton Cc: Philip Langdale, Maxim Levitsky, Pierre Ossman, linux-kernel, linux-mmc [-- Attachment #1: Type: text/plain, Size: 16275 bytes --] On Tue, Jan 12, 2010 at 03:43:50PM -0800, Andrew Morton wrote: > I have a note here that Pierre had issues with the patch. I'm > uncertain whether those are now resolved? Looks good in general, minor things I noticed: > From: Maxim Levitsky <maximlevitsky@gmail.com> > > This patch solves nasty problem original driver has. > > Original goal of the ricoh_mmc was to disable this device because then, > mmc cards can be read using standard SDHCI controller, thus avoiding > writing of yet another driver. > > However, the act of disablement, makes other pci functions that belong to > this controller (xD and memstick) shift up one level, thus pci core has > now wrong idea about these devices. > > To fix this issue, this patch moves the driver into the pci quirk section, > thus it is executes before the pci is enumerated, and therefore solving > that issue, also same sequence of commands is performed on resume for same > reasons. > > Also regardless of the above, this way is cleaner. You still need to set > CONFIG_MMC_RICOH_MMC to enable this quirk > > Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com> > Cc: Philip Langdale <philipl@overt.org> > Cc: <linux-mmc@vger.kernel.org> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org> > --- > > drivers/mmc/host/Kconfig | 10 - > drivers/mmc/host/Makefile | 1 > drivers/mmc/host/ricoh_mmc.c | 262 --------------------------------- > drivers/pci/quirks.c | 92 +++++++++++ > 4 files changed, 95 insertions(+), 270 deletions(-) > > diff -puN drivers/mmc/host/Kconfig~ricoh_mmc-port-from-driver-to-pci-quirk drivers/mmc/host/Kconfig > --- a/drivers/mmc/host/Kconfig~ricoh_mmc-port-from-driver-to-pci-quirk > +++ a/drivers/mmc/host/Kconfig > @@ -69,20 +69,16 @@ config MMC_SDHCI_PCI > If unsure, say N. > > config MMC_RICOH_MMC > - tristate "Ricoh MMC Controller Disabler (EXPERIMENTAL)" > + bool "Ricoh MMC Controller Disabler (EXPERIMENTAL)" > depends on MMC_SDHCI_PCI > help > - This selects the disabler for the Ricoh MMC Controller. This > + This adds a pci quirk to disable Ricoh MMC Controller. This > proprietary controller is unnecessary because the SDHCI driver > supports MMC cards on the SD controller, but if it is not > disabled, it will steal the MMC cards away - rendering them > - useless. It is safe to select this driver even if you don't > + useless. It is safe to select this even if you don't > have a Ricoh based card reader. > > - > - To compile this driver as a module, choose M here: > - the module will be called ricoh_mmc. > - > If unsure, say Y. > > config MMC_SDHCI_OF > diff -puN drivers/mmc/host/Makefile~ricoh_mmc-port-from-driver-to-pci-quirk drivers/mmc/host/Makefile > --- a/drivers/mmc/host/Makefile~ricoh_mmc-port-from-driver-to-pci-quirk > +++ a/drivers/mmc/host/Makefile > @@ -12,7 +12,6 @@ obj-$(CONFIG_MMC_IMX) += imxmmc.o > obj-$(CONFIG_MMC_MXC) += mxcmmc.o > obj-$(CONFIG_MMC_SDHCI) += sdhci.o > obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o > -obj-$(CONFIG_MMC_RICOH_MMC) += ricoh_mmc.o > obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-pltfm.o > obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o > obj-$(CONFIG_MMC_WBSD) += wbsd.o > diff -puN drivers/mmc/host/ricoh_mmc.c~ricoh_mmc-port-from-driver-to-pci-quirk /dev/null > --- a/drivers/mmc/host/ricoh_mmc.c > +++ /dev/null > @@ -1,262 +0,0 @@ > -/* > - * ricoh_mmc.c - Dummy driver to disable the Rioch MMC controller. > - * > - * Copyright (C) 2007 Philip Langdale, All Rights Reserved. > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; either version 2 of the License, or (at > - * your option) any later version. > - */ > - > -/* > - * This is a conceptually ridiculous driver, but it is required by the way > - * the Ricoh multi-function chips (R5CXXX) work. These chips implement > - * the four main memory card controllers (SD, MMC, MS, xD) and one or both > - * of cardbus or firewire. It happens that they implement SD and MMC > - * support as separate controllers (and PCI functions). The linux SDHCI > - * driver supports MMC cards but the chip detects MMC cards in hardware > - * and directs them to the MMC controller - so the SDHCI driver never sees > - * them. To get around this, we must disable the useless MMC controller. > - * At that point, the SDHCI controller will start seeing them. As a bonus, > - * a detection event occurs immediately, even if the MMC card is already > - * in the reader. > - * > - * It seems to be the case that the relevant PCI registers to deactivate the > - * MMC controller live on PCI function 0, which might be the cardbus controller > - * or the firewire controller, depending on the particular chip in question. As > - * such, it makes what this driver has to do unavoidably ugly. Such is life. > - */ > - > -#include <linux/pci.h> > - > -#define DRIVER_NAME "ricoh-mmc" > - > -static const struct pci_device_id pci_ids[] __devinitdata = { > - { > - .vendor = PCI_VENDOR_ID_RICOH, > - .device = PCI_DEVICE_ID_RICOH_R5C843, > - .subvendor = PCI_ANY_ID, > - .subdevice = PCI_ANY_ID, > - }, > - { /* end: all zeroes */ }, > -}; > - > -MODULE_DEVICE_TABLE(pci, pci_ids); > - > -static int ricoh_mmc_disable(struct pci_dev *fw_dev) > -{ > - u8 write_enable; > - u8 write_target; > - u8 disable; > - > - if (fw_dev->device == PCI_DEVICE_ID_RICOH_RL5C476) { > - /* via RL5C476 */ > - > - pci_read_config_byte(fw_dev, 0xB7, &disable); > - if (disable & 0x02) { > - printk(KERN_INFO DRIVER_NAME > - ": Controller already disabled. " \ > - "Nothing to do.\n"); > - return -ENODEV; > - } > - > - pci_read_config_byte(fw_dev, 0x8E, &write_enable); > - pci_write_config_byte(fw_dev, 0x8E, 0xAA); > - pci_read_config_byte(fw_dev, 0x8D, &write_target); > - pci_write_config_byte(fw_dev, 0x8D, 0xB7); > - pci_write_config_byte(fw_dev, 0xB7, disable | 0x02); > - pci_write_config_byte(fw_dev, 0x8E, write_enable); > - pci_write_config_byte(fw_dev, 0x8D, write_target); > - } else { > - /* via R5C832 */ > - > - pci_read_config_byte(fw_dev, 0xCB, &disable); > - if (disable & 0x02) { > - printk(KERN_INFO DRIVER_NAME > - ": Controller already disabled. " \ > - "Nothing to do.\n"); > - return -ENODEV; > - } > - > - pci_read_config_byte(fw_dev, 0xCA, &write_enable); > - pci_write_config_byte(fw_dev, 0xCA, 0x57); > - pci_write_config_byte(fw_dev, 0xCB, disable | 0x02); > - pci_write_config_byte(fw_dev, 0xCA, write_enable); > - } > - > - printk(KERN_INFO DRIVER_NAME > - ": Controller is now disabled.\n"); > - > - return 0; > -} > - > -static int ricoh_mmc_enable(struct pci_dev *fw_dev) > -{ > - u8 write_enable; > - u8 write_target; > - u8 disable; > - > - if (fw_dev->device == PCI_DEVICE_ID_RICOH_RL5C476) { > - /* via RL5C476 */ > - > - pci_read_config_byte(fw_dev, 0x8E, &write_enable); > - pci_write_config_byte(fw_dev, 0x8E, 0xAA); > - pci_read_config_byte(fw_dev, 0x8D, &write_target); > - pci_write_config_byte(fw_dev, 0x8D, 0xB7); > - pci_read_config_byte(fw_dev, 0xB7, &disable); > - pci_write_config_byte(fw_dev, 0xB7, disable & ~0x02); > - pci_write_config_byte(fw_dev, 0x8E, write_enable); > - pci_write_config_byte(fw_dev, 0x8D, write_target); > - } else { > - /* via R5C832 */ > - > - pci_read_config_byte(fw_dev, 0xCA, &write_enable); > - pci_read_config_byte(fw_dev, 0xCB, &disable); > - pci_write_config_byte(fw_dev, 0xCA, 0x57); > - pci_write_config_byte(fw_dev, 0xCB, disable & ~0x02); > - pci_write_config_byte(fw_dev, 0xCA, write_enable); > - } > - > - printk(KERN_INFO DRIVER_NAME > - ": Controller is now re-enabled.\n"); > - > - return 0; > -} > - > -static int __devinit ricoh_mmc_probe(struct pci_dev *pdev, > - const struct pci_device_id *ent) > -{ > - u8 rev; > - u8 ctrlfound = 0; > - > - struct pci_dev *fw_dev = NULL; > - > - BUG_ON(pdev == NULL); > - BUG_ON(ent == NULL); > - > - pci_read_config_byte(pdev, PCI_CLASS_REVISION, &rev); > - > - printk(KERN_INFO DRIVER_NAME > - ": Ricoh MMC controller found at %s [%04x:%04x] (rev %x)\n", > - pci_name(pdev), (int)pdev->vendor, (int)pdev->device, > - (int)rev); > - > - while ((fw_dev = > - pci_get_device(PCI_VENDOR_ID_RICOH, > - PCI_DEVICE_ID_RICOH_RL5C476, fw_dev))) { > - if (PCI_SLOT(pdev->devfn) == PCI_SLOT(fw_dev->devfn) && > - PCI_FUNC(fw_dev->devfn) == 0 && > - pdev->bus == fw_dev->bus) { > - if (ricoh_mmc_disable(fw_dev) != 0) > - return -ENODEV; > - > - pci_set_drvdata(pdev, fw_dev); > - > - ++ctrlfound; > - break; > - } > - } > - > - fw_dev = NULL; > - > - while (!ctrlfound && > - (fw_dev = pci_get_device(PCI_VENDOR_ID_RICOH, > - PCI_DEVICE_ID_RICOH_R5C832, fw_dev))) { > - if (PCI_SLOT(pdev->devfn) == PCI_SLOT(fw_dev->devfn) && > - PCI_FUNC(fw_dev->devfn) == 0 && > - pdev->bus == fw_dev->bus) { > - if (ricoh_mmc_disable(fw_dev) != 0) > - return -ENODEV; > - > - pci_set_drvdata(pdev, fw_dev); > - > - ++ctrlfound; > - } > - } > - > - if (!ctrlfound) { > - printk(KERN_WARNING DRIVER_NAME > - ": Main Ricoh function not found. Cannot disable controller.\n"); > - return -ENODEV; > - } > - > - return 0; > -} > - > -static void __devexit ricoh_mmc_remove(struct pci_dev *pdev) > -{ > - struct pci_dev *fw_dev = NULL; > - > - fw_dev = pci_get_drvdata(pdev); > - BUG_ON(fw_dev == NULL); > - > - ricoh_mmc_enable(fw_dev); > - > - pci_set_drvdata(pdev, NULL); > -} > - > -static int ricoh_mmc_suspend_late(struct pci_dev *pdev, pm_message_t state) > -{ > - struct pci_dev *fw_dev = NULL; > - > - fw_dev = pci_get_drvdata(pdev); > - BUG_ON(fw_dev == NULL); > - > - printk(KERN_INFO DRIVER_NAME ": Suspending.\n"); > - > - ricoh_mmc_enable(fw_dev); > - > - return 0; > -} > - > -static int ricoh_mmc_resume_early(struct pci_dev *pdev) > -{ > - struct pci_dev *fw_dev = NULL; > - > - fw_dev = pci_get_drvdata(pdev); > - BUG_ON(fw_dev == NULL); > - > - printk(KERN_INFO DRIVER_NAME ": Resuming.\n"); > - > - ricoh_mmc_disable(fw_dev); > - > - return 0; > -} > - > -static struct pci_driver ricoh_mmc_driver = { > - .name = DRIVER_NAME, > - .id_table = pci_ids, > - .probe = ricoh_mmc_probe, > - .remove = __devexit_p(ricoh_mmc_remove), > - .suspend_late = ricoh_mmc_suspend_late, > - .resume_early = ricoh_mmc_resume_early, > -}; > - > -/*****************************************************************************\ > - * * > - * Driver init/exit * > - * * > -\*****************************************************************************/ > - > -static int __init ricoh_mmc_drv_init(void) > -{ > - printk(KERN_INFO DRIVER_NAME > - ": Ricoh MMC Controller disabling driver\n"); > - printk(KERN_INFO DRIVER_NAME ": Copyright(c) Philip Langdale\n"); > - > - return pci_register_driver(&ricoh_mmc_driver); > -} > - > -static void __exit ricoh_mmc_drv_exit(void) > -{ > - pci_unregister_driver(&ricoh_mmc_driver); > -} > - > -module_init(ricoh_mmc_drv_init); > -module_exit(ricoh_mmc_drv_exit); > - > -MODULE_AUTHOR("Philip Langdale <philipl@alumni.utexas.net>"); > -MODULE_DESCRIPTION("Ricoh MMC Controller disabling driver"); > -MODULE_LICENSE("GPL"); > - > diff -puN drivers/pci/quirks.c~ricoh_mmc-port-from-driver-to-pci-quirk drivers/pci/quirks.c > --- a/drivers/pci/quirks.c~ricoh_mmc-port-from-driver-to-pci-quirk > +++ a/drivers/pci/quirks.c > @@ -2515,6 +2515,98 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I > > #endif /* CONFIG_PCI_IOV */ > > +/* > + * This is a quirk for Ricoh MMC controller found as a part of > + * mulifunction chip. > + > + * This is very similiar and based on ricoh_mmc driver > + * written by Philip Langdale. Thank you for these magic sequencies. "sequences" > + > + * These chips implement the four main memory card > + * controllers (SD, MMC, MS, xD) and one or both Reformat the paragraph? > + * of cardbus or firewire. It happens that they implement SD and MMC > + * support as separate controllers (and PCI functions). The linux SDHCI > + * driver supports MMC cards but the chip detects MMC cards in hardware > + * and directs them to the MMC controller - so the SDHCI driver never sees > + * them. To get around this, we must disable the useless MMC controller. > + * At that point, the SDHCI controller will start seeing them > + * It seems to be the case that the relevant PCI registers to deactivate the > + * MMC controller live on PCI function 0, which might be the cardbus controller > + * or the firewire controller, depending on the particular chip in question > + > + * This has to be done early, because as soon as we disable the MMC controller > + * other pci functions shift up one level, e.g. function #2 becames function "becomes" > + * #1, and therefore is confusing the pci core. > + */ > + > +#ifdef CONFIG_MMC_RICOH_MMC > +static void ricoh_mmc_fixup_rl5c476(struct pci_dev *dev) > +{ > + /* disable via cardbus interface */ > + u8 write_enable; > + u8 write_target; > + u8 disable; > + > + /* disable must be done via function #0 */ > + if (PCI_FUNC(dev->devfn)) > + return; > + > + pci_read_config_byte(dev, 0xB7, &disable); > + if (disable & 0x02) > + return; > + > + pci_read_config_byte(dev, 0x8E, &write_enable); > + pci_write_config_byte(dev, 0x8E, 0xAA); > + pci_read_config_byte(dev, 0x8D, &write_target); > + pci_write_config_byte(dev, 0x8D, 0xB7); > + pci_write_config_byte(dev, 0xB7, disable | 0x02); > + pci_write_config_byte(dev, 0x8E, write_enable); > + pci_write_config_byte(dev, 0x8D, write_target); > + > + printk(KERN_NOTICE "pci: Ricoh MMC controller disabled\n"); > + printk(KERN_NOTICE "pci: mmc cards will be supported through SDHCI\n"); dev_notice? I'd prefer it and all other quirks use dev_*, too. > +} > + > +static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev) > +{ > + /* disable via firewire interface */ > + u8 write_enable; > + u8 disable; > + > + /* disable must be done via function #0 */ > + if (PCI_FUNC(dev->devfn)) > + return; > + > + pci_read_config_byte(dev, 0xCB, &disable); > + > + if (disable & 0x02) > + return; > + > + pci_read_config_byte(dev, 0xCA, &write_enable); > + pci_write_config_byte(dev, 0xCA, 0x57); > + pci_write_config_byte(dev, 0xCB, disable | 0x02); > + pci_write_config_byte(dev, 0xCA, write_enable); > + > + printk(KERN_NOTICE "pci: Ricoh MMC controller disabled\n"); > + printk(KERN_NOTICE "pci: mmc cards will be supported through SDHCI\n"); dev_notice? > +} > + > +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C476, > + ricoh_mmc_fixup_rl5c476); > + > +DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C476, > + ricoh_mmc_fixup_rl5c476); > + > + > +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); Like the other quirks, the declare statements should be directly after the corresponding fixup-function. > + > +#endif /*CONFIG_MMC_RICOH_MMC*/ > + > + > static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, > struct pci_fixup *end) > { > _ > > -- > 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 Thanks for the work! Wolfram -- Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ | [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 197 bytes --] ^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH v3] port ricoh_mmc to pci quirk 2010-01-13 6:46 ` Wolfram Sang @ 2010-01-29 13:37 ` Maxim Levitsky 2010-01-29 16:06 ` Philip Langdale ` (2 more replies) 0 siblings, 3 replies; 25+ messages in thread From: Maxim Levitsky @ 2010-01-29 13:37 UTC (permalink / raw) To: Wolfram Sang Cc: Andrew Morton, Philip Langdale, Pierre Ossman, linux-kernel, linux-mmc Here, updated patch with your comments addressed. This is also tested with real MMC card. This adds some > 80 chars lines, but I hope that is ok. --- >From 9b208770b2421eae50e46d826f08a4084c2bcdb9 Mon Sep 17 00:00:00 2001 From: Maxim Levitsky <maximlevitsky@gmail.com> Date: Fri, 29 Jan 2010 15:30:46 +0200 Subject: [PATCH] Port ricoh_mmc to pci quirk This patch solves nasty problem original driver had. Original goal of the ricoh_mmc, was to disable this device because then, mmc cards can be read using standard SDHCI controller, thus avoiding the need in yet another driver. However, the act of disablement, makes other pci functions that belong to this controller (xD and memstick) shift up one level, thus pci core has now wrong idea about these devices. To fix this issue, this patch moves the driver into pci quirk section, thus it is executed before the pci is enumerated, and therefore solve that issue, also the same is preformed on resume for same reasons. Also regardless of the above, this way is cleaner. You still need to set CONFIG_MMC_RICOH_MMC to enable this quirk Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com> --- drivers/mmc/host/Kconfig | 10 +- drivers/mmc/host/Makefile | 1 - drivers/mmc/host/ricoh_mmc.c | 262 ------------------------------------------ drivers/pci/quirks.c | 82 +++++++++++++ 4 files changed, 85 insertions(+), 270 deletions(-) delete mode 100644 drivers/mmc/host/ricoh_mmc.c diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index ce1d288..6bc3ecb 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -69,20 +69,16 @@ config MMC_SDHCI_PCI If unsure, say N. config MMC_RICOH_MMC - tristate "Ricoh MMC Controller Disabler (EXPERIMENTAL)" + bool "Ricoh MMC Controller Disabler (EXPERIMENTAL)" depends on MMC_SDHCI_PCI help - This selects the disabler for the Ricoh MMC Controller. This + This adds a pci quirk to disable Ricoh MMC Controller. This proprietary controller is unnecessary because the SDHCI driver supports MMC cards on the SD controller, but if it is not disabled, it will steal the MMC cards away - rendering them - useless. It is safe to select this driver even if you don't + useless. It is safe to select this even if you don't have a Ricoh based card reader. - - To compile this driver as a module, choose M here: - the module will be called ricoh_mmc. - If unsure, say Y. config MMC_SDHCI_OF diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile index 3d253dd..f480397 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -12,7 +12,6 @@ obj-$(CONFIG_MMC_IMX) += imxmmc.o obj-$(CONFIG_MMC_MXC) += mxcmmc.o obj-$(CONFIG_MMC_SDHCI) += sdhci.o obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o -obj-$(CONFIG_MMC_RICOH_MMC) += ricoh_mmc.o obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-pltfm.o obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o obj-$(CONFIG_MMC_WBSD) += wbsd.o diff --git a/drivers/mmc/host/ricoh_mmc.c b/drivers/mmc/host/ricoh_mmc.c deleted file mode 100644 index f627905..0000000 --- a/drivers/mmc/host/ricoh_mmc.c +++ /dev/null @@ -1,262 +0,0 @@ -/* - * ricoh_mmc.c - Dummy driver to disable the Rioch MMC controller. - * - * Copyright (C) 2007 Philip Langdale, All Rights Reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. - */ - -/* - * This is a conceptually ridiculous driver, but it is required by the way - * the Ricoh multi-function chips (R5CXXX) work. These chips implement - * the four main memory card controllers (SD, MMC, MS, xD) and one or both - * of cardbus or firewire. It happens that they implement SD and MMC - * support as separate controllers (and PCI functions). The linux SDHCI - * driver supports MMC cards but the chip detects MMC cards in hardware - * and directs them to the MMC controller - so the SDHCI driver never sees - * them. To get around this, we must disable the useless MMC controller. - * At that point, the SDHCI controller will start seeing them. As a bonus, - * a detection event occurs immediately, even if the MMC card is already - * in the reader. - * - * It seems to be the case that the relevant PCI registers to deactivate the - * MMC controller live on PCI function 0, which might be the cardbus controller - * or the firewire controller, depending on the particular chip in question. As - * such, it makes what this driver has to do unavoidably ugly. Such is life. - */ - -#include <linux/pci.h> - -#define DRIVER_NAME "ricoh-mmc" - -static const struct pci_device_id pci_ids[] __devinitdata = { - { - .vendor = PCI_VENDOR_ID_RICOH, - .device = PCI_DEVICE_ID_RICOH_R5C843, - .subvendor = PCI_ANY_ID, - .subdevice = PCI_ANY_ID, - }, - { /* end: all zeroes */ }, -}; - -MODULE_DEVICE_TABLE(pci, pci_ids); - -static int ricoh_mmc_disable(struct pci_dev *fw_dev) -{ - u8 write_enable; - u8 write_target; - u8 disable; - - if (fw_dev->device == PCI_DEVICE_ID_RICOH_RL5C476) { - /* via RL5C476 */ - - pci_read_config_byte(fw_dev, 0xB7, &disable); - if (disable & 0x02) { - printk(KERN_INFO DRIVER_NAME - ": Controller already disabled. " \ - "Nothing to do.\n"); - return -ENODEV; - } - - pci_read_config_byte(fw_dev, 0x8E, &write_enable); - pci_write_config_byte(fw_dev, 0x8E, 0xAA); - pci_read_config_byte(fw_dev, 0x8D, &write_target); - pci_write_config_byte(fw_dev, 0x8D, 0xB7); - pci_write_config_byte(fw_dev, 0xB7, disable | 0x02); - pci_write_config_byte(fw_dev, 0x8E, write_enable); - pci_write_config_byte(fw_dev, 0x8D, write_target); - } else { - /* via R5C832 */ - - pci_read_config_byte(fw_dev, 0xCB, &disable); - if (disable & 0x02) { - printk(KERN_INFO DRIVER_NAME - ": Controller already disabled. " \ - "Nothing to do.\n"); - return -ENODEV; - } - - pci_read_config_byte(fw_dev, 0xCA, &write_enable); - pci_write_config_byte(fw_dev, 0xCA, 0x57); - pci_write_config_byte(fw_dev, 0xCB, disable | 0x02); - pci_write_config_byte(fw_dev, 0xCA, write_enable); - } - - printk(KERN_INFO DRIVER_NAME - ": Controller is now disabled.\n"); - - return 0; -} - -static int ricoh_mmc_enable(struct pci_dev *fw_dev) -{ - u8 write_enable; - u8 write_target; - u8 disable; - - if (fw_dev->device == PCI_DEVICE_ID_RICOH_RL5C476) { - /* via RL5C476 */ - - pci_read_config_byte(fw_dev, 0x8E, &write_enable); - pci_write_config_byte(fw_dev, 0x8E, 0xAA); - pci_read_config_byte(fw_dev, 0x8D, &write_target); - pci_write_config_byte(fw_dev, 0x8D, 0xB7); - pci_read_config_byte(fw_dev, 0xB7, &disable); - pci_write_config_byte(fw_dev, 0xB7, disable & ~0x02); - pci_write_config_byte(fw_dev, 0x8E, write_enable); - pci_write_config_byte(fw_dev, 0x8D, write_target); - } else { - /* via R5C832 */ - - pci_read_config_byte(fw_dev, 0xCA, &write_enable); - pci_read_config_byte(fw_dev, 0xCB, &disable); - pci_write_config_byte(fw_dev, 0xCA, 0x57); - pci_write_config_byte(fw_dev, 0xCB, disable & ~0x02); - pci_write_config_byte(fw_dev, 0xCA, write_enable); - } - - printk(KERN_INFO DRIVER_NAME - ": Controller is now re-enabled.\n"); - - return 0; -} - -static int __devinit ricoh_mmc_probe(struct pci_dev *pdev, - const struct pci_device_id *ent) -{ - u8 rev; - u8 ctrlfound = 0; - - struct pci_dev *fw_dev = NULL; - - BUG_ON(pdev == NULL); - BUG_ON(ent == NULL); - - pci_read_config_byte(pdev, PCI_CLASS_REVISION, &rev); - - printk(KERN_INFO DRIVER_NAME - ": Ricoh MMC controller found at %s [%04x:%04x] (rev %x)\n", - pci_name(pdev), (int)pdev->vendor, (int)pdev->device, - (int)rev); - - while ((fw_dev = - pci_get_device(PCI_VENDOR_ID_RICOH, - PCI_DEVICE_ID_RICOH_RL5C476, fw_dev))) { - if (PCI_SLOT(pdev->devfn) == PCI_SLOT(fw_dev->devfn) && - PCI_FUNC(fw_dev->devfn) == 0 && - pdev->bus == fw_dev->bus) { - if (ricoh_mmc_disable(fw_dev) != 0) - return -ENODEV; - - pci_set_drvdata(pdev, fw_dev); - - ++ctrlfound; - break; - } - } - - fw_dev = NULL; - - while (!ctrlfound && - (fw_dev = pci_get_device(PCI_VENDOR_ID_RICOH, - PCI_DEVICE_ID_RICOH_R5C832, fw_dev))) { - if (PCI_SLOT(pdev->devfn) == PCI_SLOT(fw_dev->devfn) && - PCI_FUNC(fw_dev->devfn) == 0 && - pdev->bus == fw_dev->bus) { - if (ricoh_mmc_disable(fw_dev) != 0) - return -ENODEV; - - pci_set_drvdata(pdev, fw_dev); - - ++ctrlfound; - } - } - - if (!ctrlfound) { - printk(KERN_WARNING DRIVER_NAME - ": Main Ricoh function not found. Cannot disable controller.\n"); - return -ENODEV; - } - - return 0; -} - -static void __devexit ricoh_mmc_remove(struct pci_dev *pdev) -{ - struct pci_dev *fw_dev = NULL; - - fw_dev = pci_get_drvdata(pdev); - BUG_ON(fw_dev == NULL); - - ricoh_mmc_enable(fw_dev); - - pci_set_drvdata(pdev, NULL); -} - -static int ricoh_mmc_suspend_late(struct pci_dev *pdev, pm_message_t state) -{ - struct pci_dev *fw_dev = NULL; - - fw_dev = pci_get_drvdata(pdev); - BUG_ON(fw_dev == NULL); - - printk(KERN_INFO DRIVER_NAME ": Suspending.\n"); - - ricoh_mmc_enable(fw_dev); - - return 0; -} - -static int ricoh_mmc_resume_early(struct pci_dev *pdev) -{ - struct pci_dev *fw_dev = NULL; - - fw_dev = pci_get_drvdata(pdev); - BUG_ON(fw_dev == NULL); - - printk(KERN_INFO DRIVER_NAME ": Resuming.\n"); - - ricoh_mmc_disable(fw_dev); - - return 0; -} - -static struct pci_driver ricoh_mmc_driver = { - .name = DRIVER_NAME, - .id_table = pci_ids, - .probe = ricoh_mmc_probe, - .remove = __devexit_p(ricoh_mmc_remove), - .suspend_late = ricoh_mmc_suspend_late, - .resume_early = ricoh_mmc_resume_early, -}; - -/*****************************************************************************\ - * * - * Driver init/exit * - * * -\*****************************************************************************/ - -static int __init ricoh_mmc_drv_init(void) -{ - printk(KERN_INFO DRIVER_NAME - ": Ricoh MMC Controller disabling driver\n"); - printk(KERN_INFO DRIVER_NAME ": Copyright(c) Philip Langdale\n"); - - return pci_register_driver(&ricoh_mmc_driver); -} - -static void __exit ricoh_mmc_drv_exit(void) -{ - pci_unregister_driver(&ricoh_mmc_driver); -} - -module_init(ricoh_mmc_drv_init); -module_exit(ricoh_mmc_drv_exit); - -MODULE_AUTHOR("Philip Langdale <philipl@alumni.utexas.net>"); -MODULE_DESCRIPTION("Ricoh MMC Controller disabling driver"); -MODULE_LICENSE("GPL"); - diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index c746943..df08a2c 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -2520,6 +2520,88 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x150d, quirk_i82576_sriov); #endif /* CONFIG_PCI_IOV */ +/* + * This is a quirk for Ricoh MMC controller found as a part of + * multifunction chip. + + * This is very similar and based on ricoh_mmc driver written by + * Philip Langdale. Thank you for these magic sequences. + * + * These chips implement the four main memory card + * controllers (SD, MMC, MS, xD) and one or both + * of cardbus or firewire. It happens that they implement SD and MMC + * support as separate controllers (and PCI functions). The linux SDHCI + * driver supports MMC cards but the chip detects MMC cards in hardware + * and directs them to the MMC controller - so the SDHCI driver never sees + * them. To get around this, we must disable the useless MMC controller. + * At that point, the SDHCI controller will start seeing them + * It seems to be the case that the relevant PCI registers to deactivate the + * MMC controller live on PCI function 0, which might be the cardbus controller + * or the firewire controller, depending on the particular chip in question + + * This has to be done early, because as soon as we disable the MMC controller + * other pci functions shift up one level, e.g. function #2 becomes function + * #1, and this will confuse the pci core. + */ + +#ifdef CONFIG_MMC_RICOH_MMC +static void ricoh_mmc_fixup_rl5c476(struct pci_dev *dev) +{ + /* disable via cardbus interface */ + u8 write_enable; + u8 write_target; + u8 disable; + + /* disable must be done via function #0 */ + if (PCI_FUNC(dev->devfn)) + return; + + pci_read_config_byte(dev, 0xB7, &disable); + if (disable & 0x02) + return; + + pci_read_config_byte(dev, 0x8E, &write_enable); + pci_write_config_byte(dev, 0x8E, 0xAA); + pci_read_config_byte(dev, 0x8D, &write_target); + pci_write_config_byte(dev, 0x8D, 0xB7); + pci_write_config_byte(dev, 0xB7, disable | 0x02); + pci_write_config_byte(dev, 0x8E, write_enable); + pci_write_config_byte(dev, 0x8D, write_target); + + dev_notice(&dev->dev, "proprietary Ricoh mmc controller disabled (via cardbus function)\n"); + dev_notice(&dev->dev, "MMC cards are now supported by standard SDHCI controller\n"); +} +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C476, ricoh_mmc_fixup_rl5c476); +DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C476, ricoh_mmc_fixup_rl5c476); + +static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev) +{ + /* disable via firewire interface */ + u8 write_enable; + u8 disable; + + /* disable must be done via function #0 */ + if (PCI_FUNC(dev->devfn)) + return; + + pci_read_config_byte(dev, 0xCB, &disable); + + if (disable & 0x02) + return; + + pci_read_config_byte(dev, 0xCA, &write_enable); + pci_write_config_byte(dev, 0xCA, 0x57); + pci_write_config_byte(dev, 0xCB, disable | 0x02); + pci_write_config_byte(dev, 0xCA, write_enable); + + dev_notice(&dev->dev, "proprietary Ricoh mmc controller disabled (via firewire function)\n"); + dev_notice(&dev->dev, "MMC cards are now supported by standard SDHCI controller\n"); +} +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); +#endif /*CONFIG_MMC_RICOH_MMC*/ + + static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end) { -- 1.6.3.3 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [PATCH v3] port ricoh_mmc to pci quirk 2010-01-29 13:37 ` [PATCH v3] port ricoh_mmc to " Maxim Levitsky @ 2010-01-29 16:06 ` Philip Langdale 2010-01-29 22:10 ` Maxim Levitsky 2010-01-29 16:33 ` Wolfram Sang 2010-01-30 21:28 ` [PATCH] Port " Maxim Levitsky 2 siblings, 1 reply; 25+ messages in thread From: Philip Langdale @ 2010-01-29 16:06 UTC (permalink / raw) To: Maxim Levitsky Cc: Wolfram Sang, Andrew Morton, Pierre Ossman, linux-kernel, linux-mmc On Fri, 29 Jan 2010 15:37:35 +0200 Maxim Levitsky <maximlevitsky@gmail.com> wrote: > Here, updated patch with your comments addressed. > This is also tested with real MMC card. Actual code gets my thumbs up. > This adds some > 80 chars lines, but I hope that is ok. It's against the coding style and as far as I can see, the only lines that are > 80 are the dev_notice and DECLARE_FIXUP lines - both of which can be trivially split across multiple lines, so please just do that. Thanks, --phil > --- > > >From 9b208770b2421eae50e46d826f08a4084c2bcdb9 Mon Sep 17 00:00:00 > >2001 > From: Maxim Levitsky <maximlevitsky@gmail.com> > Date: Fri, 29 Jan 2010 15:30:46 +0200 > Subject: [PATCH] Port ricoh_mmc to pci quirk > > This patch solves nasty problem original driver had. > Original goal of the ricoh_mmc, was to disable this device because > then, mmc cards can be read using standard SDHCI controller, > thus avoiding the need in yet another driver. > However, the act of disablement, makes other pci functions that > belong to this controller (xD and memstick) shift up one level, thus > pci core has now wrong idea about these devices. > > To fix this issue, this patch moves the driver into pci quirk > section, thus it is executed before the pci is enumerated, and > therefore solve that issue, also the same is preformed on resume for > same reasons. > > Also regardless of the above, this way is cleaner. > > You still need to set CONFIG_MMC_RICOH_MMC > to enable this quirk > > Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com> > --- > drivers/mmc/host/Kconfig | 10 +- > drivers/mmc/host/Makefile | 1 - > drivers/mmc/host/ricoh_mmc.c | 262 > ------------------------------------------ > drivers/pci/quirks.c | 82 +++++++++++++ 4 files changed, 85 > insertions(+), 270 deletions(-) delete mode 100644 > drivers/mmc/host/ricoh_mmc.c > > diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig > index ce1d288..6bc3ecb 100644 > --- a/drivers/mmc/host/Kconfig > +++ b/drivers/mmc/host/Kconfig > @@ -69,20 +69,16 @@ config MMC_SDHCI_PCI > If unsure, say N. > > config MMC_RICOH_MMC > - tristate "Ricoh MMC Controller Disabler (EXPERIMENTAL)" > + bool "Ricoh MMC Controller Disabler (EXPERIMENTAL)" > depends on MMC_SDHCI_PCI > help > - This selects the disabler for the Ricoh MMC Controller. > This > + This adds a pci quirk to disable Ricoh MMC Controller. This > proprietary controller is unnecessary because the SDHCI > driver supports MMC cards on the SD controller, but if it is not > disabled, it will steal the MMC cards away - rendering them > - useless. It is safe to select this driver even if you don't > + useless. It is safe to select this even if you don't > have a Ricoh based card reader. > > - > - To compile this driver as a module, choose M here: > - the module will be called ricoh_mmc. > - > If unsure, say Y. > > config MMC_SDHCI_OF > diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile > index 3d253dd..f480397 100644 > --- a/drivers/mmc/host/Makefile > +++ b/drivers/mmc/host/Makefile > @@ -12,7 +12,6 @@ obj-$(CONFIG_MMC_IMX) += imxmmc.o > obj-$(CONFIG_MMC_MXC) += mxcmmc.o > obj-$(CONFIG_MMC_SDHCI) += sdhci.o > obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o > -obj-$(CONFIG_MMC_RICOH_MMC) += ricoh_mmc.o > obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-pltfm.o > obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o > obj-$(CONFIG_MMC_WBSD) += wbsd.o > diff --git a/drivers/mmc/host/ricoh_mmc.c > b/drivers/mmc/host/ricoh_mmc.c deleted file mode 100644 > index f627905..0000000 > --- a/drivers/mmc/host/ricoh_mmc.c > +++ /dev/null > @@ -1,262 +0,0 @@ > -/* > - * ricoh_mmc.c - Dummy driver to disable the Rioch MMC controller. > - * > - * Copyright (C) 2007 Philip Langdale, All Rights Reserved. > - * > - * This program is free software; you can redistribute it and/or > modify > - * it under the terms of the GNU General Public License as published > by > - * the Free Software Foundation; either version 2 of the License, or > (at > - * your option) any later version. > - */ > - > -/* > - * This is a conceptually ridiculous driver, but it is required by > the way > - * the Ricoh multi-function chips (R5CXXX) work. These chips > implement > - * the four main memory card controllers (SD, MMC, MS, xD) and one > or both > - * of cardbus or firewire. It happens that they implement SD and MMC > - * support as separate controllers (and PCI functions). The linux > SDHCI > - * driver supports MMC cards but the chip detects MMC cards in > hardware > - * and directs them to the MMC controller - so the SDHCI driver > never sees > - * them. To get around this, we must disable the useless MMC > controller. > - * At that point, the SDHCI controller will start seeing them. As a > bonus, > - * a detection event occurs immediately, even if the MMC card is > already > - * in the reader. > - * > - * It seems to be the case that the relevant PCI registers to > deactivate the > - * MMC controller live on PCI function 0, which might be the cardbus > controller > - * or the firewire controller, depending on the particular chip in > question. As > - * such, it makes what this driver has to do unavoidably ugly. Such > is life. > - */ > - > -#include <linux/pci.h> > - > -#define DRIVER_NAME "ricoh-mmc" > - > -static const struct pci_device_id pci_ids[] __devinitdata = { > - { > - .vendor = PCI_VENDOR_ID_RICOH, > - .device = PCI_DEVICE_ID_RICOH_R5C843, > - .subvendor = PCI_ANY_ID, > - .subdevice = PCI_ANY_ID, > - }, > - { /* end: all zeroes */ }, > -}; > - > -MODULE_DEVICE_TABLE(pci, pci_ids); > - > -static int ricoh_mmc_disable(struct pci_dev *fw_dev) > -{ > - u8 write_enable; > - u8 write_target; > - u8 disable; > - > - if (fw_dev->device == PCI_DEVICE_ID_RICOH_RL5C476) { > - /* via RL5C476 */ > - > - pci_read_config_byte(fw_dev, 0xB7, &disable); > - if (disable & 0x02) { > - printk(KERN_INFO DRIVER_NAME > - ": Controller already disabled. " \ > - "Nothing to do.\n"); > - return -ENODEV; > - } > - > - pci_read_config_byte(fw_dev, 0x8E, &write_enable); > - pci_write_config_byte(fw_dev, 0x8E, 0xAA); > - pci_read_config_byte(fw_dev, 0x8D, &write_target); > - pci_write_config_byte(fw_dev, 0x8D, 0xB7); > - pci_write_config_byte(fw_dev, 0xB7, disable | 0x02); > - pci_write_config_byte(fw_dev, 0x8E, write_enable); > - pci_write_config_byte(fw_dev, 0x8D, write_target); > - } else { > - /* via R5C832 */ > - > - pci_read_config_byte(fw_dev, 0xCB, &disable); > - if (disable & 0x02) { > - printk(KERN_INFO DRIVER_NAME > - ": Controller already disabled. " \ > - "Nothing to do.\n"); > - return -ENODEV; > - } > - > - pci_read_config_byte(fw_dev, 0xCA, &write_enable); > - pci_write_config_byte(fw_dev, 0xCA, 0x57); > - pci_write_config_byte(fw_dev, 0xCB, disable | 0x02); > - pci_write_config_byte(fw_dev, 0xCA, write_enable); > - } > - > - printk(KERN_INFO DRIVER_NAME > - ": Controller is now disabled.\n"); > - > - return 0; > -} > - > -static int ricoh_mmc_enable(struct pci_dev *fw_dev) > -{ > - u8 write_enable; > - u8 write_target; > - u8 disable; > - > - if (fw_dev->device == PCI_DEVICE_ID_RICOH_RL5C476) { > - /* via RL5C476 */ > - > - pci_read_config_byte(fw_dev, 0x8E, &write_enable); > - pci_write_config_byte(fw_dev, 0x8E, 0xAA); > - pci_read_config_byte(fw_dev, 0x8D, &write_target); > - pci_write_config_byte(fw_dev, 0x8D, 0xB7); > - pci_read_config_byte(fw_dev, 0xB7, &disable); > - pci_write_config_byte(fw_dev, 0xB7, disable & ~0x02); > - pci_write_config_byte(fw_dev, 0x8E, write_enable); > - pci_write_config_byte(fw_dev, 0x8D, write_target); > - } else { > - /* via R5C832 */ > - > - pci_read_config_byte(fw_dev, 0xCA, &write_enable); > - pci_read_config_byte(fw_dev, 0xCB, &disable); > - pci_write_config_byte(fw_dev, 0xCA, 0x57); > - pci_write_config_byte(fw_dev, 0xCB, disable & ~0x02); > - pci_write_config_byte(fw_dev, 0xCA, write_enable); > - } > - > - printk(KERN_INFO DRIVER_NAME > - ": Controller is now re-enabled.\n"); > - > - return 0; > -} > - > -static int __devinit ricoh_mmc_probe(struct pci_dev *pdev, > - const struct pci_device_id *ent) > -{ > - u8 rev; > - u8 ctrlfound = 0; > - > - struct pci_dev *fw_dev = NULL; > - > - BUG_ON(pdev == NULL); > - BUG_ON(ent == NULL); > - > - pci_read_config_byte(pdev, PCI_CLASS_REVISION, &rev); > - > - printk(KERN_INFO DRIVER_NAME > - ": Ricoh MMC controller found at %s [%04x:%04x] (rev > %x)\n", > - pci_name(pdev), (int)pdev->vendor, (int)pdev->device, > - (int)rev); > - > - while ((fw_dev = > - pci_get_device(PCI_VENDOR_ID_RICOH, > - PCI_DEVICE_ID_RICOH_RL5C476, fw_dev))) { > - if (PCI_SLOT(pdev->devfn) == PCI_SLOT(fw_dev->devfn) > && > - PCI_FUNC(fw_dev->devfn) == 0 && > - pdev->bus == fw_dev->bus) { > - if (ricoh_mmc_disable(fw_dev) != 0) > - return -ENODEV; > - > - pci_set_drvdata(pdev, fw_dev); > - > - ++ctrlfound; > - break; > - } > - } > - > - fw_dev = NULL; > - > - while (!ctrlfound && > - (fw_dev = pci_get_device(PCI_VENDOR_ID_RICOH, > - PCI_DEVICE_ID_RICOH_R5C832, > fw_dev))) { > - if (PCI_SLOT(pdev->devfn) == PCI_SLOT(fw_dev->devfn) > && > - PCI_FUNC(fw_dev->devfn) == 0 && > - pdev->bus == fw_dev->bus) { > - if (ricoh_mmc_disable(fw_dev) != 0) > - return -ENODEV; > - > - pci_set_drvdata(pdev, fw_dev); > - > - ++ctrlfound; > - } > - } > - > - if (!ctrlfound) { > - printk(KERN_WARNING DRIVER_NAME > - ": Main Ricoh function not found. Cannot > disable controller.\n"); > - return -ENODEV; > - } > - > - return 0; > -} > - > -static void __devexit ricoh_mmc_remove(struct pci_dev *pdev) > -{ > - struct pci_dev *fw_dev = NULL; > - > - fw_dev = pci_get_drvdata(pdev); > - BUG_ON(fw_dev == NULL); > - > - ricoh_mmc_enable(fw_dev); > - > - pci_set_drvdata(pdev, NULL); > -} > - > -static int ricoh_mmc_suspend_late(struct pci_dev *pdev, pm_message_t > state) -{ > - struct pci_dev *fw_dev = NULL; > - > - fw_dev = pci_get_drvdata(pdev); > - BUG_ON(fw_dev == NULL); > - > - printk(KERN_INFO DRIVER_NAME ": Suspending.\n"); > - > - ricoh_mmc_enable(fw_dev); > - > - return 0; > -} > - > -static int ricoh_mmc_resume_early(struct pci_dev *pdev) > -{ > - struct pci_dev *fw_dev = NULL; > - > - fw_dev = pci_get_drvdata(pdev); > - BUG_ON(fw_dev == NULL); > - > - printk(KERN_INFO DRIVER_NAME ": Resuming.\n"); > - > - ricoh_mmc_disable(fw_dev); > - > - return 0; > -} > - > -static struct pci_driver ricoh_mmc_driver = { > - .name = DRIVER_NAME, > - .id_table = pci_ids, > - .probe = ricoh_mmc_probe, > - .remove = __devexit_p(ricoh_mmc_remove), > - .suspend_late = ricoh_mmc_suspend_late, > - .resume_early = ricoh_mmc_resume_early, > -}; > - > -/*****************************************************************************\ > - > * > * > - * Driver > init/exit * > - > * > * > -\*****************************************************************************/ > - -static int __init ricoh_mmc_drv_init(void) -{ > - printk(KERN_INFO DRIVER_NAME > - ": Ricoh MMC Controller disabling driver\n"); > - printk(KERN_INFO DRIVER_NAME ": Copyright(c) Philip > Langdale\n"); - > - return pci_register_driver(&ricoh_mmc_driver); > -} > - > -static void __exit ricoh_mmc_drv_exit(void) > -{ > - pci_unregister_driver(&ricoh_mmc_driver); > -} > - > -module_init(ricoh_mmc_drv_init); > -module_exit(ricoh_mmc_drv_exit); > - > -MODULE_AUTHOR("Philip Langdale <philipl@alumni.utexas.net>"); > -MODULE_DESCRIPTION("Ricoh MMC Controller disabling driver"); > -MODULE_LICENSE("GPL"); > - > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c > index c746943..df08a2c 100644 > --- a/drivers/pci/quirks.c > +++ b/drivers/pci/quirks.c > @@ -2520,6 +2520,88 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, > 0x150d, quirk_i82576_sriov); > #endif /* CONFIG_PCI_IOV */ > > +/* > + * This is a quirk for Ricoh MMC controller found as a part of > + * multifunction chip. > + > + * This is very similar and based on ricoh_mmc driver written by > + * Philip Langdale. Thank you for these magic sequences. > + * > + * These chips implement the four main memory card > + * controllers (SD, MMC, MS, xD) and one or both > + * of cardbus or firewire. It happens that they implement SD and MMC > + * support as separate controllers (and PCI functions). The linux > SDHCI > + * driver supports MMC cards but the chip detects MMC cards in > hardware > + * and directs them to the MMC controller - so the SDHCI driver > never sees > + * them. To get around this, we must disable the useless MMC > controller. > + * At that point, the SDHCI controller will start seeing them > + * It seems to be the case that the relevant PCI registers to > deactivate the > + * MMC controller live on PCI function 0, which might be the cardbus > controller > + * or the firewire controller, depending on the particular chip in > question + > + * This has to be done early, because as soon as we disable the MMC > controller > + * other pci functions shift up one level, e.g. function #2 becomes > function > + * #1, and this will confuse the pci core. > + */ > + > +#ifdef CONFIG_MMC_RICOH_MMC > +static void ricoh_mmc_fixup_rl5c476(struct pci_dev *dev) > +{ > + /* disable via cardbus interface */ > + u8 write_enable; > + u8 write_target; > + u8 disable; > + > + /* disable must be done via function #0 */ > + if (PCI_FUNC(dev->devfn)) > + return; > + > + pci_read_config_byte(dev, 0xB7, &disable); > + if (disable & 0x02) > + return; > + > + pci_read_config_byte(dev, 0x8E, &write_enable); > + pci_write_config_byte(dev, 0x8E, 0xAA); > + pci_read_config_byte(dev, 0x8D, &write_target); > + pci_write_config_byte(dev, 0x8D, 0xB7); > + pci_write_config_byte(dev, 0xB7, disable | 0x02); > + pci_write_config_byte(dev, 0x8E, write_enable); > + pci_write_config_byte(dev, 0x8D, write_target); > + > + dev_notice(&dev->dev, "proprietary Ricoh mmc controller > disabled (via cardbus function)\n"); > + dev_notice(&dev->dev, "MMC cards are now supported by > standard SDHCI controller\n"); +} > +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, > PCI_DEVICE_ID_RICOH_RL5C476, ricoh_mmc_fixup_rl5c476); > +DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, > PCI_DEVICE_ID_RICOH_RL5C476, ricoh_mmc_fixup_rl5c476); + +static void > ricoh_mmc_fixup_r5c832(struct pci_dev *dev) +{ > + /* disable via firewire interface */ > + u8 write_enable; > + u8 disable; > + > + /* disable must be done via function #0 */ > + if (PCI_FUNC(dev->devfn)) > + return; > + > + pci_read_config_byte(dev, 0xCB, &disable); > + > + if (disable & 0x02) > + return; > + > + pci_read_config_byte(dev, 0xCA, &write_enable); > + pci_write_config_byte(dev, 0xCA, 0x57); > + pci_write_config_byte(dev, 0xCB, disable | 0x02); > + pci_write_config_byte(dev, 0xCA, write_enable); > + > + dev_notice(&dev->dev, "proprietary Ricoh mmc controller > disabled (via firewire function)\n"); > + dev_notice(&dev->dev, "MMC cards are now supported by > standard SDHCI controller\n"); +} > +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); > +#endif /*CONFIG_MMC_RICOH_MMC*/ + + > static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, > struct pci_fixup *end) > { --phil ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH v3] port ricoh_mmc to pci quirk 2010-01-29 16:06 ` Philip Langdale @ 2010-01-29 22:10 ` Maxim Levitsky 2010-01-30 2:18 ` Philip Langdale 0 siblings, 1 reply; 25+ messages in thread From: Maxim Levitsky @ 2010-01-29 22:10 UTC (permalink / raw) To: Philip Langdale Cc: Wolfram Sang, Andrew Morton, Pierre Ossman, linux-kernel, linux-mmc On Fri, 2010-01-29 at 08:06 -0800, Philip Langdale wrote: > On Fri, 29 Jan 2010 15:37:35 +0200 > Maxim Levitsky <maximlevitsky@gmail.com> wrote: > > > Here, updated patch with your comments addressed. > > This is also tested with real MMC card. > > Actual code gets my thumbs up. > > > This adds some > 80 chars lines, but I hope that is ok. > > It's against the coding style and as far as I can see, the only > lines that are > 80 are the dev_notice and DECLARE_FIXUP lines - both > of which can be trivially split across multiple lines, so please just > do that. Well, I have nothing against this, but, even Linus himself stated that he dislikes broken printk lines. I also noticed that some DECLARE_FIXUP in this file are longer that 80, and since breaking this doesn't add any value, I thought that is ok. Remember that main purpose of 80 char limit is to make code simpler. However, I don't really care if you insist. Best regards, Maxim Levitsky ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH v3] port ricoh_mmc to pci quirk 2010-01-29 22:10 ` Maxim Levitsky @ 2010-01-30 2:18 ` Philip Langdale 0 siblings, 0 replies; 25+ messages in thread From: Philip Langdale @ 2010-01-30 2:18 UTC (permalink / raw) To: Maxim Levitsky Cc: Wolfram Sang, Andrew Morton, Pierre Ossman, linux-kernel, linux-mmc On Sat, 30 Jan 2010 00:10:33 +0200 Maxim Levitsky <maximlevitsky@gmail.com> wrote: > Well, I have nothing against this, but, even Linus himself stated that > he dislikes broken printk lines. > > I also noticed that some DECLARE_FIXUP in this file are longer that > 80, and since breaking this doesn't add any value, I thought that is > ok. Remember that main purpose of 80 char limit is to make code > simpler. > > However, I don't really care if you insist. I don't want to be obnoxious either - if no one else is concerned about the lines, I won't kick up a fuss. And thanks for sticking with this patch - I want to see it in soon too; I'd like to sort out the new PCI-e Ricoh parts which are going to need a new magic sequence. --phil ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH v3] port ricoh_mmc to pci quirk 2010-01-29 13:37 ` [PATCH v3] port ricoh_mmc to " Maxim Levitsky 2010-01-29 16:06 ` Philip Langdale @ 2010-01-29 16:33 ` Wolfram Sang 2010-01-29 22:13 ` Maxim Levitsky 2010-01-30 21:28 ` [PATCH] Port " Maxim Levitsky 2 siblings, 1 reply; 25+ messages in thread From: Wolfram Sang @ 2010-01-29 16:33 UTC (permalink / raw) To: Maxim Levitsky Cc: Andrew Morton, Philip Langdale, Pierre Ossman, linux-kernel, linux-mmc [-- Attachment #1: Type: text/plain, Size: 16436 bytes --] On Fri, Jan 29, 2010 at 03:37:35PM +0200, Maxim Levitsky wrote: > Here, updated patch with your comments addressed. > This is also tested with real MMC card. > > This adds some > 80 chars lines, but I hope that is ok. Some cosmetic issues, other than that: Acked-by: Wolfram Sang <w.sang@pengutronix.de> > > --- > > >From 9b208770b2421eae50e46d826f08a4084c2bcdb9 Mon Sep 17 00:00:00 2001 > From: Maxim Levitsky <maximlevitsky@gmail.com> > Date: Fri, 29 Jan 2010 15:30:46 +0200 > Subject: [PATCH] Port ricoh_mmc to pci quirk > > This patch solves nasty problem original driver had. > Original goal of the ricoh_mmc, was to disable this device because > then, mmc cards can be read using standard SDHCI controller, > thus avoiding the need in yet another driver. > However, the act of disablement, makes other pci functions that belong to > this controller (xD and memstick) shift up one level, thus pci core has now wrong idea > about these devices. > > To fix this issue, this patch moves the driver into pci quirk section, thus it > is executed before the pci is enumerated, and therefore solve that issue, > also the same is preformed on resume for same reasons. > > Also regardless of the above, this way is cleaner. > > You still need to set CONFIG_MMC_RICOH_MMC > to enable this quirk > > Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com> > --- > drivers/mmc/host/Kconfig | 10 +- > drivers/mmc/host/Makefile | 1 - > drivers/mmc/host/ricoh_mmc.c | 262 ------------------------------------------ > drivers/pci/quirks.c | 82 +++++++++++++ > 4 files changed, 85 insertions(+), 270 deletions(-) > delete mode 100644 drivers/mmc/host/ricoh_mmc.c > > diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig > index ce1d288..6bc3ecb 100644 > --- a/drivers/mmc/host/Kconfig > +++ b/drivers/mmc/host/Kconfig > @@ -69,20 +69,16 @@ config MMC_SDHCI_PCI > If unsure, say N. > > config MMC_RICOH_MMC > - tristate "Ricoh MMC Controller Disabler (EXPERIMENTAL)" > + bool "Ricoh MMC Controller Disabler (EXPERIMENTAL)" > depends on MMC_SDHCI_PCI > help > - This selects the disabler for the Ricoh MMC Controller. This > + This adds a pci quirk to disable Ricoh MMC Controller. This > proprietary controller is unnecessary because the SDHCI driver > supports MMC cards on the SD controller, but if it is not > disabled, it will steal the MMC cards away - rendering them > - useless. It is safe to select this driver even if you don't > + useless. It is safe to select this even if you don't > have a Ricoh based card reader. > > - > - To compile this driver as a module, choose M here: > - the module will be called ricoh_mmc. > - > If unsure, say Y. > > config MMC_SDHCI_OF > diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile > index 3d253dd..f480397 100644 > --- a/drivers/mmc/host/Makefile > +++ b/drivers/mmc/host/Makefile > @@ -12,7 +12,6 @@ obj-$(CONFIG_MMC_IMX) += imxmmc.o > obj-$(CONFIG_MMC_MXC) += mxcmmc.o > obj-$(CONFIG_MMC_SDHCI) += sdhci.o > obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o > -obj-$(CONFIG_MMC_RICOH_MMC) += ricoh_mmc.o > obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-pltfm.o > obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o > obj-$(CONFIG_MMC_WBSD) += wbsd.o > diff --git a/drivers/mmc/host/ricoh_mmc.c b/drivers/mmc/host/ricoh_mmc.c > deleted file mode 100644 > index f627905..0000000 > --- a/drivers/mmc/host/ricoh_mmc.c > +++ /dev/null > @@ -1,262 +0,0 @@ > -/* > - * ricoh_mmc.c - Dummy driver to disable the Rioch MMC controller. > - * > - * Copyright (C) 2007 Philip Langdale, All Rights Reserved. > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; either version 2 of the License, or (at > - * your option) any later version. > - */ > - > -/* > - * This is a conceptually ridiculous driver, but it is required by the way > - * the Ricoh multi-function chips (R5CXXX) work. These chips implement > - * the four main memory card controllers (SD, MMC, MS, xD) and one or both > - * of cardbus or firewire. It happens that they implement SD and MMC > - * support as separate controllers (and PCI functions). The linux SDHCI > - * driver supports MMC cards but the chip detects MMC cards in hardware > - * and directs them to the MMC controller - so the SDHCI driver never sees > - * them. To get around this, we must disable the useless MMC controller. > - * At that point, the SDHCI controller will start seeing them. As a bonus, > - * a detection event occurs immediately, even if the MMC card is already > - * in the reader. > - * > - * It seems to be the case that the relevant PCI registers to deactivate the > - * MMC controller live on PCI function 0, which might be the cardbus controller > - * or the firewire controller, depending on the particular chip in question. As > - * such, it makes what this driver has to do unavoidably ugly. Such is life. > - */ > - > -#include <linux/pci.h> > - > -#define DRIVER_NAME "ricoh-mmc" > - > -static const struct pci_device_id pci_ids[] __devinitdata = { > - { > - .vendor = PCI_VENDOR_ID_RICOH, > - .device = PCI_DEVICE_ID_RICOH_R5C843, > - .subvendor = PCI_ANY_ID, > - .subdevice = PCI_ANY_ID, > - }, > - { /* end: all zeroes */ }, > -}; > - > -MODULE_DEVICE_TABLE(pci, pci_ids); > - > -static int ricoh_mmc_disable(struct pci_dev *fw_dev) > -{ > - u8 write_enable; > - u8 write_target; > - u8 disable; > - > - if (fw_dev->device == PCI_DEVICE_ID_RICOH_RL5C476) { > - /* via RL5C476 */ > - > - pci_read_config_byte(fw_dev, 0xB7, &disable); > - if (disable & 0x02) { > - printk(KERN_INFO DRIVER_NAME > - ": Controller already disabled. " \ > - "Nothing to do.\n"); > - return -ENODEV; > - } > - > - pci_read_config_byte(fw_dev, 0x8E, &write_enable); > - pci_write_config_byte(fw_dev, 0x8E, 0xAA); > - pci_read_config_byte(fw_dev, 0x8D, &write_target); > - pci_write_config_byte(fw_dev, 0x8D, 0xB7); > - pci_write_config_byte(fw_dev, 0xB7, disable | 0x02); > - pci_write_config_byte(fw_dev, 0x8E, write_enable); > - pci_write_config_byte(fw_dev, 0x8D, write_target); > - } else { > - /* via R5C832 */ > - > - pci_read_config_byte(fw_dev, 0xCB, &disable); > - if (disable & 0x02) { > - printk(KERN_INFO DRIVER_NAME > - ": Controller already disabled. " \ > - "Nothing to do.\n"); > - return -ENODEV; > - } > - > - pci_read_config_byte(fw_dev, 0xCA, &write_enable); > - pci_write_config_byte(fw_dev, 0xCA, 0x57); > - pci_write_config_byte(fw_dev, 0xCB, disable | 0x02); > - pci_write_config_byte(fw_dev, 0xCA, write_enable); > - } > - > - printk(KERN_INFO DRIVER_NAME > - ": Controller is now disabled.\n"); > - > - return 0; > -} > - > -static int ricoh_mmc_enable(struct pci_dev *fw_dev) > -{ > - u8 write_enable; > - u8 write_target; > - u8 disable; > - > - if (fw_dev->device == PCI_DEVICE_ID_RICOH_RL5C476) { > - /* via RL5C476 */ > - > - pci_read_config_byte(fw_dev, 0x8E, &write_enable); > - pci_write_config_byte(fw_dev, 0x8E, 0xAA); > - pci_read_config_byte(fw_dev, 0x8D, &write_target); > - pci_write_config_byte(fw_dev, 0x8D, 0xB7); > - pci_read_config_byte(fw_dev, 0xB7, &disable); > - pci_write_config_byte(fw_dev, 0xB7, disable & ~0x02); > - pci_write_config_byte(fw_dev, 0x8E, write_enable); > - pci_write_config_byte(fw_dev, 0x8D, write_target); > - } else { > - /* via R5C832 */ > - > - pci_read_config_byte(fw_dev, 0xCA, &write_enable); > - pci_read_config_byte(fw_dev, 0xCB, &disable); > - pci_write_config_byte(fw_dev, 0xCA, 0x57); > - pci_write_config_byte(fw_dev, 0xCB, disable & ~0x02); > - pci_write_config_byte(fw_dev, 0xCA, write_enable); > - } > - > - printk(KERN_INFO DRIVER_NAME > - ": Controller is now re-enabled.\n"); > - > - return 0; > -} > - > -static int __devinit ricoh_mmc_probe(struct pci_dev *pdev, > - const struct pci_device_id *ent) > -{ > - u8 rev; > - u8 ctrlfound = 0; > - > - struct pci_dev *fw_dev = NULL; > - > - BUG_ON(pdev == NULL); > - BUG_ON(ent == NULL); > - > - pci_read_config_byte(pdev, PCI_CLASS_REVISION, &rev); > - > - printk(KERN_INFO DRIVER_NAME > - ": Ricoh MMC controller found at %s [%04x:%04x] (rev %x)\n", > - pci_name(pdev), (int)pdev->vendor, (int)pdev->device, > - (int)rev); > - > - while ((fw_dev = > - pci_get_device(PCI_VENDOR_ID_RICOH, > - PCI_DEVICE_ID_RICOH_RL5C476, fw_dev))) { > - if (PCI_SLOT(pdev->devfn) == PCI_SLOT(fw_dev->devfn) && > - PCI_FUNC(fw_dev->devfn) == 0 && > - pdev->bus == fw_dev->bus) { > - if (ricoh_mmc_disable(fw_dev) != 0) > - return -ENODEV; > - > - pci_set_drvdata(pdev, fw_dev); > - > - ++ctrlfound; > - break; > - } > - } > - > - fw_dev = NULL; > - > - while (!ctrlfound && > - (fw_dev = pci_get_device(PCI_VENDOR_ID_RICOH, > - PCI_DEVICE_ID_RICOH_R5C832, fw_dev))) { > - if (PCI_SLOT(pdev->devfn) == PCI_SLOT(fw_dev->devfn) && > - PCI_FUNC(fw_dev->devfn) == 0 && > - pdev->bus == fw_dev->bus) { > - if (ricoh_mmc_disable(fw_dev) != 0) > - return -ENODEV; > - > - pci_set_drvdata(pdev, fw_dev); > - > - ++ctrlfound; > - } > - } > - > - if (!ctrlfound) { > - printk(KERN_WARNING DRIVER_NAME > - ": Main Ricoh function not found. Cannot disable controller.\n"); > - return -ENODEV; > - } > - > - return 0; > -} > - > -static void __devexit ricoh_mmc_remove(struct pci_dev *pdev) > -{ > - struct pci_dev *fw_dev = NULL; > - > - fw_dev = pci_get_drvdata(pdev); > - BUG_ON(fw_dev == NULL); > - > - ricoh_mmc_enable(fw_dev); > - > - pci_set_drvdata(pdev, NULL); > -} > - > -static int ricoh_mmc_suspend_late(struct pci_dev *pdev, pm_message_t state) > -{ > - struct pci_dev *fw_dev = NULL; > - > - fw_dev = pci_get_drvdata(pdev); > - BUG_ON(fw_dev == NULL); > - > - printk(KERN_INFO DRIVER_NAME ": Suspending.\n"); > - > - ricoh_mmc_enable(fw_dev); > - > - return 0; > -} > - > -static int ricoh_mmc_resume_early(struct pci_dev *pdev) > -{ > - struct pci_dev *fw_dev = NULL; > - > - fw_dev = pci_get_drvdata(pdev); > - BUG_ON(fw_dev == NULL); > - > - printk(KERN_INFO DRIVER_NAME ": Resuming.\n"); > - > - ricoh_mmc_disable(fw_dev); > - > - return 0; > -} > - > -static struct pci_driver ricoh_mmc_driver = { > - .name = DRIVER_NAME, > - .id_table = pci_ids, > - .probe = ricoh_mmc_probe, > - .remove = __devexit_p(ricoh_mmc_remove), > - .suspend_late = ricoh_mmc_suspend_late, > - .resume_early = ricoh_mmc_resume_early, > -}; > - > -/*****************************************************************************\ > - * * > - * Driver init/exit * > - * * > -\*****************************************************************************/ > - > -static int __init ricoh_mmc_drv_init(void) > -{ > - printk(KERN_INFO DRIVER_NAME > - ": Ricoh MMC Controller disabling driver\n"); > - printk(KERN_INFO DRIVER_NAME ": Copyright(c) Philip Langdale\n"); > - > - return pci_register_driver(&ricoh_mmc_driver); > -} > - > -static void __exit ricoh_mmc_drv_exit(void) > -{ > - pci_unregister_driver(&ricoh_mmc_driver); > -} > - > -module_init(ricoh_mmc_drv_init); > -module_exit(ricoh_mmc_drv_exit); > - > -MODULE_AUTHOR("Philip Langdale <philipl@alumni.utexas.net>"); > -MODULE_DESCRIPTION("Ricoh MMC Controller disabling driver"); > -MODULE_LICENSE("GPL"); > - > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c > index c746943..df08a2c 100644 > --- a/drivers/pci/quirks.c > +++ b/drivers/pci/quirks.c > @@ -2520,6 +2520,88 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x150d, quirk_i82576_sriov); > > #endif /* CONFIG_PCI_IOV */ > > +/* > + * This is a quirk for Ricoh MMC controller found as a part of for the Ricoh... > + * multifunction chip. some multifunction chips. > + > + * This is very similar and based on ricoh_mmc driver written by on the ricoh_mmc... > + * Philip Langdale. Thank you for these magic sequences. > + * > + * These chips implement the four main memory card > + * controllers (SD, MMC, MS, xD) and one or both > + * of cardbus or firewire. It happens that they implement SD and MMC > + * support as separate controllers (and PCI functions). The linux SDHCI > + * driver supports MMC cards but the chip detects MMC cards in hardware > + * and directs them to the MMC controller - so the SDHCI driver never sees > + * them. To get around this, we must disable the useless MMC controller. > + * At that point, the SDHCI controller will start seeing them > + * It seems to be the case that the relevant PCI registers to deactivate the > + * MMC controller live on PCI function 0, which might be the cardbus controller > + * or the firewire controller, depending on the particular chip in question These paragraphs would benefit a lot from reformatting ('gqip' in vim, other editors surely have such a function, too ;)). > + > + * This has to be done early, because as soon as we disable the MMC controller > + * other pci functions shift up one level, e.g. function #2 becomes function > + * #1, and this will confuse the pci core. > + */ > + > +#ifdef CONFIG_MMC_RICOH_MMC > +static void ricoh_mmc_fixup_rl5c476(struct pci_dev *dev) > +{ > + /* disable via cardbus interface */ > + u8 write_enable; > + u8 write_target; > + u8 disable; > + > + /* disable must be done via function #0 */ > + if (PCI_FUNC(dev->devfn)) > + return; > + > + pci_read_config_byte(dev, 0xB7, &disable); > + if (disable & 0x02) > + return; > + > + pci_read_config_byte(dev, 0x8E, &write_enable); > + pci_write_config_byte(dev, 0x8E, 0xAA); > + pci_read_config_byte(dev, 0x8D, &write_target); > + pci_write_config_byte(dev, 0x8D, 0xB7); > + pci_write_config_byte(dev, 0xB7, disable | 0x02); > + pci_write_config_byte(dev, 0x8E, write_enable); > + pci_write_config_byte(dev, 0x8D, write_target); > + > + dev_notice(&dev->dev, "proprietary Ricoh mmc controller disabled (via cardbus function)\n"); > + dev_notice(&dev->dev, "MMC cards are now supported by standard SDHCI controller\n"); 1st line is 'mmc', second is 'MMC'. I'd prefer always MMC. > +} > +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C476, ricoh_mmc_fixup_rl5c476); > +DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C476, ricoh_mmc_fixup_rl5c476); > + > +static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev) > +{ > + /* disable via firewire interface */ > + u8 write_enable; > + u8 disable; > + > + /* disable must be done via function #0 */ > + if (PCI_FUNC(dev->devfn)) > + return; > + > + pci_read_config_byte(dev, 0xCB, &disable); > + > + if (disable & 0x02) > + return; > + > + pci_read_config_byte(dev, 0xCA, &write_enable); > + pci_write_config_byte(dev, 0xCA, 0x57); > + pci_write_config_byte(dev, 0xCB, disable | 0x02); > + pci_write_config_byte(dev, 0xCA, write_enable); > + > + dev_notice(&dev->dev, "proprietary Ricoh mmc controller disabled (via firewire function)\n"); > + dev_notice(&dev->dev, "MMC cards are now supported by standard SDHCI controller\n"); ditto. > +} > +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); > +#endif /*CONFIG_MMC_RICOH_MMC*/ > + > + > static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, > struct pci_fixup *end) > { > -- > 1.6.3.3 > > > > -- > 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 -- Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ | [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 197 bytes --] ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH v3] port ricoh_mmc to pci quirk 2010-01-29 16:33 ` Wolfram Sang @ 2010-01-29 22:13 ` Maxim Levitsky 0 siblings, 0 replies; 25+ messages in thread From: Maxim Levitsky @ 2010-01-29 22:13 UTC (permalink / raw) To: Wolfram Sang Cc: Andrew Morton, Philip Langdale, Pierre Ossman, linux-kernel, linux-mmc On Fri, 2010-01-29 at 17:33 +0100, Wolfram Sang wrote: > On Fri, Jan 29, 2010 at 03:37:35PM +0200, Maxim Levitsky wrote: > > Here, updated patch with your comments addressed. > > This is also tested with real MMC card. > > > > This adds some > 80 chars lines, but I hope that is ok. > > Some cosmetic issues, other than that: I guess I introduced more spelling & grammar errors in this version that I fixed... Anyway will try to be more careful now. English isn't my best subject. Best regards, Maxim Levitsky ^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH] Port ricoh_mmc to pci quirk 2010-01-29 13:37 ` [PATCH v3] port ricoh_mmc to " Maxim Levitsky 2010-01-29 16:06 ` Philip Langdale 2010-01-29 16:33 ` Wolfram Sang @ 2010-01-30 21:28 ` Maxim Levitsky 2010-02-01 15:45 ` Maxim Levitsky 2 siblings, 1 reply; 25+ messages in thread From: Maxim Levitsky @ 2010-01-30 21:28 UTC (permalink / raw) To: Wolfram Sang Cc: Andrew Morton, Philip Langdale, Pierre Ossman, linux-kernel, linux-mmc, Maxim Levitsky This patch solves nasty problem original driver had. Original goal of the ricoh_mmc, was to disable this device because then, mmc cards can be read using standard SDHCI controller, thus avoiding the need in yet another driver. However, the act of disablement, makes other pci functions that belong to this controller (xD and memstick) shift up one level, thus pci core has now wrong idea about these devices. To fix this issue, this patch moves the driver into pci quirk section, thus it is executed before the pci is enumerated, and therefore solve that issue, also the same is preformed on resume for same reasons. Also regardless of the above, this way is cleaner. You still need to set CONFIG_MMC_RICOH_MMC to enable this quirk Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com> --- drivers/mmc/host/Kconfig | 10 +- drivers/mmc/host/Makefile | 1 - drivers/mmc/host/ricoh_mmc.c | 262 ------------------------------------------ drivers/pci/quirks.c | 85 ++++++++++++++ 4 files changed, 88 insertions(+), 270 deletions(-) delete mode 100644 drivers/mmc/host/ricoh_mmc.c diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index ce1d288..6bc3ecb 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -69,20 +69,16 @@ config MMC_SDHCI_PCI If unsure, say N. config MMC_RICOH_MMC - tristate "Ricoh MMC Controller Disabler (EXPERIMENTAL)" + bool "Ricoh MMC Controller Disabler (EXPERIMENTAL)" depends on MMC_SDHCI_PCI help - This selects the disabler for the Ricoh MMC Controller. This + This adds a pci quirk to disable Ricoh MMC Controller. This proprietary controller is unnecessary because the SDHCI driver supports MMC cards on the SD controller, but if it is not disabled, it will steal the MMC cards away - rendering them - useless. It is safe to select this driver even if you don't + useless. It is safe to select this even if you don't have a Ricoh based card reader. - - To compile this driver as a module, choose M here: - the module will be called ricoh_mmc. - If unsure, say Y. config MMC_SDHCI_OF diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile index 3d253dd..f480397 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -12,7 +12,6 @@ obj-$(CONFIG_MMC_IMX) += imxmmc.o obj-$(CONFIG_MMC_MXC) += mxcmmc.o obj-$(CONFIG_MMC_SDHCI) += sdhci.o obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o -obj-$(CONFIG_MMC_RICOH_MMC) += ricoh_mmc.o obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-pltfm.o obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o obj-$(CONFIG_MMC_WBSD) += wbsd.o diff --git a/drivers/mmc/host/ricoh_mmc.c b/drivers/mmc/host/ricoh_mmc.c deleted file mode 100644 index f627905..0000000 --- a/drivers/mmc/host/ricoh_mmc.c +++ /dev/null @@ -1,262 +0,0 @@ -/* - * ricoh_mmc.c - Dummy driver to disable the Rioch MMC controller. - * - * Copyright (C) 2007 Philip Langdale, All Rights Reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. - */ - -/* - * This is a conceptually ridiculous driver, but it is required by the way - * the Ricoh multi-function chips (R5CXXX) work. These chips implement - * the four main memory card controllers (SD, MMC, MS, xD) and one or both - * of cardbus or firewire. It happens that they implement SD and MMC - * support as separate controllers (and PCI functions). The linux SDHCI - * driver supports MMC cards but the chip detects MMC cards in hardware - * and directs them to the MMC controller - so the SDHCI driver never sees - * them. To get around this, we must disable the useless MMC controller. - * At that point, the SDHCI controller will start seeing them. As a bonus, - * a detection event occurs immediately, even if the MMC card is already - * in the reader. - * - * It seems to be the case that the relevant PCI registers to deactivate the - * MMC controller live on PCI function 0, which might be the cardbus controller - * or the firewire controller, depending on the particular chip in question. As - * such, it makes what this driver has to do unavoidably ugly. Such is life. - */ - -#include <linux/pci.h> - -#define DRIVER_NAME "ricoh-mmc" - -static const struct pci_device_id pci_ids[] __devinitdata = { - { - .vendor = PCI_VENDOR_ID_RICOH, - .device = PCI_DEVICE_ID_RICOH_R5C843, - .subvendor = PCI_ANY_ID, - .subdevice = PCI_ANY_ID, - }, - { /* end: all zeroes */ }, -}; - -MODULE_DEVICE_TABLE(pci, pci_ids); - -static int ricoh_mmc_disable(struct pci_dev *fw_dev) -{ - u8 write_enable; - u8 write_target; - u8 disable; - - if (fw_dev->device == PCI_DEVICE_ID_RICOH_RL5C476) { - /* via RL5C476 */ - - pci_read_config_byte(fw_dev, 0xB7, &disable); - if (disable & 0x02) { - printk(KERN_INFO DRIVER_NAME - ": Controller already disabled. " \ - "Nothing to do.\n"); - return -ENODEV; - } - - pci_read_config_byte(fw_dev, 0x8E, &write_enable); - pci_write_config_byte(fw_dev, 0x8E, 0xAA); - pci_read_config_byte(fw_dev, 0x8D, &write_target); - pci_write_config_byte(fw_dev, 0x8D, 0xB7); - pci_write_config_byte(fw_dev, 0xB7, disable | 0x02); - pci_write_config_byte(fw_dev, 0x8E, write_enable); - pci_write_config_byte(fw_dev, 0x8D, write_target); - } else { - /* via R5C832 */ - - pci_read_config_byte(fw_dev, 0xCB, &disable); - if (disable & 0x02) { - printk(KERN_INFO DRIVER_NAME - ": Controller already disabled. " \ - "Nothing to do.\n"); - return -ENODEV; - } - - pci_read_config_byte(fw_dev, 0xCA, &write_enable); - pci_write_config_byte(fw_dev, 0xCA, 0x57); - pci_write_config_byte(fw_dev, 0xCB, disable | 0x02); - pci_write_config_byte(fw_dev, 0xCA, write_enable); - } - - printk(KERN_INFO DRIVER_NAME - ": Controller is now disabled.\n"); - - return 0; -} - -static int ricoh_mmc_enable(struct pci_dev *fw_dev) -{ - u8 write_enable; - u8 write_target; - u8 disable; - - if (fw_dev->device == PCI_DEVICE_ID_RICOH_RL5C476) { - /* via RL5C476 */ - - pci_read_config_byte(fw_dev, 0x8E, &write_enable); - pci_write_config_byte(fw_dev, 0x8E, 0xAA); - pci_read_config_byte(fw_dev, 0x8D, &write_target); - pci_write_config_byte(fw_dev, 0x8D, 0xB7); - pci_read_config_byte(fw_dev, 0xB7, &disable); - pci_write_config_byte(fw_dev, 0xB7, disable & ~0x02); - pci_write_config_byte(fw_dev, 0x8E, write_enable); - pci_write_config_byte(fw_dev, 0x8D, write_target); - } else { - /* via R5C832 */ - - pci_read_config_byte(fw_dev, 0xCA, &write_enable); - pci_read_config_byte(fw_dev, 0xCB, &disable); - pci_write_config_byte(fw_dev, 0xCA, 0x57); - pci_write_config_byte(fw_dev, 0xCB, disable & ~0x02); - pci_write_config_byte(fw_dev, 0xCA, write_enable); - } - - printk(KERN_INFO DRIVER_NAME - ": Controller is now re-enabled.\n"); - - return 0; -} - -static int __devinit ricoh_mmc_probe(struct pci_dev *pdev, - const struct pci_device_id *ent) -{ - u8 rev; - u8 ctrlfound = 0; - - struct pci_dev *fw_dev = NULL; - - BUG_ON(pdev == NULL); - BUG_ON(ent == NULL); - - pci_read_config_byte(pdev, PCI_CLASS_REVISION, &rev); - - printk(KERN_INFO DRIVER_NAME - ": Ricoh MMC controller found at %s [%04x:%04x] (rev %x)\n", - pci_name(pdev), (int)pdev->vendor, (int)pdev->device, - (int)rev); - - while ((fw_dev = - pci_get_device(PCI_VENDOR_ID_RICOH, - PCI_DEVICE_ID_RICOH_RL5C476, fw_dev))) { - if (PCI_SLOT(pdev->devfn) == PCI_SLOT(fw_dev->devfn) && - PCI_FUNC(fw_dev->devfn) == 0 && - pdev->bus == fw_dev->bus) { - if (ricoh_mmc_disable(fw_dev) != 0) - return -ENODEV; - - pci_set_drvdata(pdev, fw_dev); - - ++ctrlfound; - break; - } - } - - fw_dev = NULL; - - while (!ctrlfound && - (fw_dev = pci_get_device(PCI_VENDOR_ID_RICOH, - PCI_DEVICE_ID_RICOH_R5C832, fw_dev))) { - if (PCI_SLOT(pdev->devfn) == PCI_SLOT(fw_dev->devfn) && - PCI_FUNC(fw_dev->devfn) == 0 && - pdev->bus == fw_dev->bus) { - if (ricoh_mmc_disable(fw_dev) != 0) - return -ENODEV; - - pci_set_drvdata(pdev, fw_dev); - - ++ctrlfound; - } - } - - if (!ctrlfound) { - printk(KERN_WARNING DRIVER_NAME - ": Main Ricoh function not found. Cannot disable controller.\n"); - return -ENODEV; - } - - return 0; -} - -static void __devexit ricoh_mmc_remove(struct pci_dev *pdev) -{ - struct pci_dev *fw_dev = NULL; - - fw_dev = pci_get_drvdata(pdev); - BUG_ON(fw_dev == NULL); - - ricoh_mmc_enable(fw_dev); - - pci_set_drvdata(pdev, NULL); -} - -static int ricoh_mmc_suspend_late(struct pci_dev *pdev, pm_message_t state) -{ - struct pci_dev *fw_dev = NULL; - - fw_dev = pci_get_drvdata(pdev); - BUG_ON(fw_dev == NULL); - - printk(KERN_INFO DRIVER_NAME ": Suspending.\n"); - - ricoh_mmc_enable(fw_dev); - - return 0; -} - -static int ricoh_mmc_resume_early(struct pci_dev *pdev) -{ - struct pci_dev *fw_dev = NULL; - - fw_dev = pci_get_drvdata(pdev); - BUG_ON(fw_dev == NULL); - - printk(KERN_INFO DRIVER_NAME ": Resuming.\n"); - - ricoh_mmc_disable(fw_dev); - - return 0; -} - -static struct pci_driver ricoh_mmc_driver = { - .name = DRIVER_NAME, - .id_table = pci_ids, - .probe = ricoh_mmc_probe, - .remove = __devexit_p(ricoh_mmc_remove), - .suspend_late = ricoh_mmc_suspend_late, - .resume_early = ricoh_mmc_resume_early, -}; - -/*****************************************************************************\ - * * - * Driver init/exit * - * * -\*****************************************************************************/ - -static int __init ricoh_mmc_drv_init(void) -{ - printk(KERN_INFO DRIVER_NAME - ": Ricoh MMC Controller disabling driver\n"); - printk(KERN_INFO DRIVER_NAME ": Copyright(c) Philip Langdale\n"); - - return pci_register_driver(&ricoh_mmc_driver); -} - -static void __exit ricoh_mmc_drv_exit(void) -{ - pci_unregister_driver(&ricoh_mmc_driver); -} - -module_init(ricoh_mmc_drv_init); -module_exit(ricoh_mmc_drv_exit); - -MODULE_AUTHOR("Philip Langdale <philipl@alumni.utexas.net>"); -MODULE_DESCRIPTION("Ricoh MMC Controller disabling driver"); -MODULE_LICENSE("GPL"); - diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index c746943..df921db 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -2520,6 +2520,91 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x150d, quirk_i82576_sriov); #endif /* CONFIG_PCI_IOV */ +/* + * This is a quirk for the Ricoh MMC controller found as a part of + * some mulifunction chips. + + * This is very similiar and based on the ricoh_mmc driver written by + * Philip Langdale. Thank you for these magic sequences. + * + * These chips implement the four main memory card controllers (SD, MMC, MS, xD) + * and one or both of cardbus or firewire. + * + * It happens that they implement SD and MMC + * support as separate controllers (and PCI functions). The linux SDHCI + * driver supports MMC cards but the chip detects MMC cards in hardware + * and directs them to the MMC controller - so the SDHCI driver never sees + * them. + * + * To get around this, we must disable the useless MMC controller. + * At that point, the SDHCI controller will start seeing them + * It seems to be the case that the relevant PCI registers to deactivate the + * MMC controller live on PCI function 0, which might be the cardbus controller + * or the firewire controller, depending on the particular chip in question + * + * This has to be done early, because as soon as we disable the MMC controller + * other pci functions shift up one level, e.g. function #2 becomes function + * #1, and this will confuse the pci core. + */ + +#ifdef CONFIG_MMC_RICOH_MMC +static void ricoh_mmc_fixup_rl5c476(struct pci_dev *dev) +{ + /* disable via cardbus interface */ + u8 write_enable; + u8 write_target; + u8 disable; + + /* disable must be done via function #0 */ + if (PCI_FUNC(dev->devfn)) + return; + + pci_read_config_byte(dev, 0xB7, &disable); + if (disable & 0x02) + return; + + pci_read_config_byte(dev, 0x8E, &write_enable); + pci_write_config_byte(dev, 0x8E, 0xAA); + pci_read_config_byte(dev, 0x8D, &write_target); + pci_write_config_byte(dev, 0x8D, 0xB7); + pci_write_config_byte(dev, 0xB7, disable | 0x02); + pci_write_config_byte(dev, 0x8E, write_enable); + pci_write_config_byte(dev, 0x8D, write_target); + + dev_notice(&dev->dev, "proprietary Ricoh MMC controller disabled (via cardbus function)\n"); + dev_notice(&dev->dev, "MMC cards are now supported by standard SDHCI controller\n"); +} +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C476, ricoh_mmc_fixup_rl5c476); +DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C476, ricoh_mmc_fixup_rl5c476); + +static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev) +{ + /* disable via firewire interface */ + u8 write_enable; + u8 disable; + + /* disable must be done via function #0 */ + if (PCI_FUNC(dev->devfn)) + return; + + pci_read_config_byte(dev, 0xCB, &disable); + + if (disable & 0x02) + return; + + pci_read_config_byte(dev, 0xCA, &write_enable); + pci_write_config_byte(dev, 0xCA, 0x57); + pci_write_config_byte(dev, 0xCB, disable | 0x02); + pci_write_config_byte(dev, 0xCA, write_enable); + + dev_notice(&dev->dev, "proprietary Ricoh MMC controller disabled (via firewire function)\n"); + dev_notice(&dev->dev, "MMC cards are now supported by standard SDHCI controller\n"); +} +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); +#endif /*CONFIG_MMC_RICOH_MMC*/ + + static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end) { -- 1.6.3.3 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [PATCH] Port ricoh_mmc to pci quirk 2010-01-30 21:28 ` [PATCH] Port " Maxim Levitsky @ 2010-02-01 15:45 ` Maxim Levitsky 0 siblings, 0 replies; 25+ messages in thread From: Maxim Levitsky @ 2010-02-01 15:45 UTC (permalink / raw) To: Wolfram Sang Cc: Andrew Morton, Philip Langdale, Pierre Ossman, linux-kernel, linux-mmc On Sat, 2010-01-30 at 23:28 +0200, Maxim Levitsky wrote: > This patch solves nasty problem original driver had. > Original goal of the ricoh_mmc, was to disable this device because > then, mmc cards can be read using standard SDHCI controller, > thus avoiding the need in yet another driver. > However, the act of disablement, makes other pci functions that belong to > this controller (xD and memstick) shift up one level, thus pci core has now wrong idea > about these devices. > > To fix this issue, this patch moves the driver into pci quirk section, thus it > is executed before the pci is enumerated, and therefore solve that issue, > also the same is preformed on resume for same reasons. > > Also regardless of the above, this way is cleaner. You probably didn't notice that patch, because I used git-send-email, and forgot to set subject properly. This meant to be next version of this patch. Best regards, Maxim Levitsky ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH] Port ricoh_mmc from driver to pci quirk. 2009-11-25 16:53 ` Philip Langdale 2009-11-25 19:35 ` Andrew Morton @ 2009-11-25 20:30 ` Pierre Ossman 1 sibling, 0 replies; 25+ messages in thread From: Pierre Ossman @ 2009-11-25 20:30 UTC (permalink / raw) To: Philip Langdale; +Cc: Maxim Levitsky, linux-kernel [-- Attachment #1: Type: text/plain, Size: 1753 bytes --] On Wed, 25 Nov 2009 08:53:24 -0800 Philip Langdale <philipl@overt.org> wrote: > On Wed, 25 Nov 2009 16:58:41 +0200 > Maxim Levitsky <maximlevitsky@gmail.com> wrote: > > > >From 5c5e6f5ab1a5a09a430f410cab4b160a5e65501c Mon Sep 17 00:00:00 > > >2001 > > From: Maxim Levitsky <maximlevitsky@gmail.com> > > Date: Wed, 25 Nov 2009 16:37:46 +0200 > > Subject: [PATCH] Port ricoh_mmc from driver to pci quirk. > > This is much cleaner and correct solution > > I'm fine with the concept, but when I originally started work on > Ricoh support, Pierre specifically didn't want a pci quirk. > > Pierre wrote: > > I'd rather we didn't. The current style of quirks are bad enough, > > making them even more vendor or device specific is a bit more than I'm > > willing to accept right now (seriously, how hard can it be to follow > > the damn spec?). > > Pierre's not officially the maintainer anymore but I still respect his > opinions here. Given that a pci quirk solves this problem so simply, > I think it's justified at this point. > > Pierre, do you want to comment? > I was talking about the quirks mechanism in sdhci, not pci quirks. :) I have no objections to this patch. > > I would at least suggest a printk so ensure people know this is > happening - otherwise there's no visible evidence that the system > even has an MMC controller that's been disabled. > Agreed. There might be cases where we cause problems since we don't fully understand this hardware. Rgds -- -- Pierre Ossman WARNING: This correspondence is being monitored by FRA, a Swedish intelligence agency. Make sure your server uses encryption for SMTP traffic and consider using PGP for end-to-end encryption. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 198 bytes --] ^ permalink raw reply [flat|nested] 25+ messages in thread
end of thread, other threads:[~2010-02-01 15:45 UTC | newest] Thread overview: 25+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2009-11-24 0:13 The work of ricoh_mmc isn't detected by pci core Maxim Levitsky 2009-11-24 0:21 ` Philip Langdale 2009-11-25 14:55 ` Maxim Levitsky 2009-11-25 14:58 ` [PATCH] Port ricoh_mmc from driver to pci quirk Maxim Levitsky 2009-11-25 16:53 ` Philip Langdale 2009-11-25 19:35 ` Andrew Morton 2009-11-25 23:40 ` Maxim Levitsky 2009-11-26 1:30 ` Philip Langdale 2009-11-26 23:51 ` Maxim Levitsky 2009-11-26 23:53 ` [PATCH v2] port ricoh_mmc to be " Maxim Levitsky 2009-11-27 7:55 ` Philip Langdale 2010-01-08 15:24 ` Maxim Levitsky 2010-01-08 15:40 ` Philip Langdale 2010-01-12 23:43 ` Andrew Morton 2010-01-13 1:23 ` Philip Langdale 2010-01-13 6:46 ` Wolfram Sang 2010-01-29 13:37 ` [PATCH v3] port ricoh_mmc to " Maxim Levitsky 2010-01-29 16:06 ` Philip Langdale 2010-01-29 22:10 ` Maxim Levitsky 2010-01-30 2:18 ` Philip Langdale 2010-01-29 16:33 ` Wolfram Sang 2010-01-29 22:13 ` Maxim Levitsky 2010-01-30 21:28 ` [PATCH] Port " Maxim Levitsky 2010-02-01 15:45 ` Maxim Levitsky 2009-11-25 20:30 ` [PATCH] Port ricoh_mmc from driver " Pierre Ossman
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox