Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mmc: Disabler for Ricoh MMC controller

Thanks to Matt Domsch and Rezwanul Kabir at Dell, we know how to disable the
MMC controller on the multi-function Ricoh R5C832. The MMC controller needs
to be disabled or it will steal MMC cards from the SD controller where they
would otherwise be supported by the Linux SDHCI driver.

Signed-off-by: Philipl Langdale <philipl@overt.org>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

authored by

Philip Langdale and committed by
Pierre Ossman
5ae70296 6f4285d1

+171
+17
drivers/mmc/host/Kconfig
··· 35 35 36 36 If unsure, say N. 37 37 38 + config MMC_RICOH_MMC 39 + tristate "Ricoh MMC Controller Disabler (EXPERIMENTAL)" 40 + depends on PCI && EXPERIMENTAL && MMC_SDHCI 41 + help 42 + This selects the disabler for the Ricoh MMC Controller. This 43 + proprietary controller is unnecessary because the SDHCI driver 44 + supports MMC cards on the SD controller, but if it is not 45 + disabled, it will steal the MMC cards away - rendering them 46 + useless. It is safe to select this driver even if you don't 47 + have a Ricoh based card reader. 48 + 49 + 50 + To compile this driver as a module, choose M here: 51 + the module will be called ricoh_mmc. 52 + 53 + If unsure, say Y. 54 + 38 55 config MMC_OMAP 39 56 tristate "TI OMAP Multimedia Card Interface support" 40 57 depends on ARCH_OMAP
+1
drivers/mmc/host/Makefile
··· 10 10 obj-$(CONFIG_MMC_PXA) += pxamci.o 11 11 obj-$(CONFIG_MMC_IMX) += imxmmc.o 12 12 obj-$(CONFIG_MMC_SDHCI) += sdhci.o 13 + obj-$(CONFIG_MMC_RICOH_MMC) += ricoh_mmc.o 13 14 obj-$(CONFIG_MMC_WBSD) += wbsd.o 14 15 obj-$(CONFIG_MMC_AU1X) += au1xmmc.o 15 16 obj-$(CONFIG_MMC_OMAP) += omap.o
+151
drivers/mmc/host/ricoh_mmc.c
··· 1 + /* 2 + * ricoh_mmc.c - Dummy driver to disable the Rioch MMC controller. 3 + * 4 + * Copyright (C) 2007 Philip Langdale, All Rights Reserved. 5 + * 6 + * This program is free software; you can redistribute it and/or modify 7 + * it under the terms of the GNU General Public License as published by 8 + * the Free Software Foundation; either version 2 of the License, or (at 9 + * your option) any later version. 10 + */ 11 + 12 + /* 13 + * This is a conceptually ridiculous driver, but it is required by the way 14 + * the Ricoh multi-function R5C832 works. This chip implements firewire 15 + * and four different memory card controllers. Two of those controllers are 16 + * an SDHCI controller and a proprietary MMC controller. The linux SDHCI 17 + * driver supports MMC cards but the chip detects MMC cards in hardware 18 + * and directs them to the MMC controller - so the SDHCI driver never sees 19 + * them. To get around this, we must disable the useless MMC controller. 20 + * At that point, the SDHCI controller will start seeing them. As a bonus, 21 + * a detection event occurs immediately, even if the MMC card is already 22 + * in the reader. 23 + * 24 + * The relevant registers live on the firewire function, so this is unavoidably 25 + * ugly. Such is life. 26 + */ 27 + 28 + #include <linux/pci.h> 29 + 30 + #define DRIVER_NAME "ricoh-mmc" 31 + 32 + static const struct pci_device_id pci_ids[] __devinitdata = { 33 + { 34 + .vendor = PCI_VENDOR_ID_RICOH, 35 + .device = PCI_DEVICE_ID_RICOH_R5C843, 36 + .subvendor = PCI_ANY_ID, 37 + .subdevice = PCI_ANY_ID, 38 + }, 39 + { /* end: all zeroes */ }, 40 + }; 41 + 42 + MODULE_DEVICE_TABLE(pci, pci_ids); 43 + 44 + static int __devinit ricoh_mmc_probe(struct pci_dev *pdev, 45 + const struct pci_device_id *ent) 46 + { 47 + u8 rev; 48 + 49 + struct pci_dev *fw_dev = NULL; 50 + 51 + BUG_ON(pdev == NULL); 52 + BUG_ON(ent == NULL); 53 + 54 + pci_read_config_byte(pdev, PCI_CLASS_REVISION, &rev); 55 + 56 + printk(KERN_INFO DRIVER_NAME 57 + ": Ricoh MMC controller found at %s [%04x:%04x] (rev %x)\n", 58 + pci_name(pdev), (int)pdev->vendor, (int)pdev->device, 59 + (int)rev); 60 + 61 + while ((fw_dev = pci_get_device(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, fw_dev))) { 62 + if (PCI_SLOT(pdev->devfn) == PCI_SLOT(fw_dev->devfn) && 63 + pdev->bus == fw_dev->bus) { 64 + u8 write_enable; 65 + u8 disable; 66 + 67 + pci_read_config_byte(fw_dev, 0xCB, &disable); 68 + if (disable & 0x02) { 69 + printk(KERN_INFO DRIVER_NAME 70 + ": Controller already disabled. Nothing to do.\n"); 71 + return -ENODEV; 72 + } 73 + 74 + pci_read_config_byte(fw_dev, 0xCA, &write_enable); 75 + pci_write_config_byte(fw_dev, 0xCA, 0x57); 76 + pci_write_config_byte(fw_dev, 0xCB, disable | 0x02); 77 + pci_write_config_byte(fw_dev, 0xCA, write_enable); 78 + 79 + pci_set_drvdata(pdev, fw_dev); 80 + 81 + printk(KERN_INFO DRIVER_NAME 82 + ": Controller is now disabled.\n"); 83 + 84 + break; 85 + } 86 + } 87 + 88 + if (pci_get_drvdata(pdev) == NULL) { 89 + printk(KERN_WARNING DRIVER_NAME 90 + ": Main firewire function not found. Cannot disable controller.\n"); 91 + return -ENODEV; 92 + } 93 + 94 + return 0; 95 + } 96 + 97 + static void __devexit ricoh_mmc_remove(struct pci_dev *pdev) 98 + { 99 + u8 write_enable; 100 + u8 disable; 101 + struct pci_dev *fw_dev = NULL; 102 + 103 + fw_dev = pci_get_drvdata(pdev); 104 + BUG_ON(fw_dev == NULL); 105 + 106 + pci_read_config_byte(fw_dev, 0xCA, &write_enable); 107 + pci_read_config_byte(fw_dev, 0xCB, &disable); 108 + pci_write_config_byte(fw_dev, 0xCA, 0x57); 109 + pci_write_config_byte(fw_dev, 0xCB, disable & ~0x02); 110 + pci_write_config_byte(fw_dev, 0xCA, write_enable); 111 + 112 + printk(KERN_INFO DRIVER_NAME 113 + ": Controller is now re-enabled.\n"); 114 + 115 + pci_set_drvdata(pdev, NULL); 116 + } 117 + 118 + static struct pci_driver ricoh_mmc_driver = { 119 + .name = DRIVER_NAME, 120 + .id_table = pci_ids, 121 + .probe = ricoh_mmc_probe, 122 + .remove = __devexit_p(ricoh_mmc_remove), 123 + }; 124 + 125 + /*****************************************************************************\ 126 + * * 127 + * Driver init/exit * 128 + * * 129 + \*****************************************************************************/ 130 + 131 + static int __init ricoh_mmc_drv_init(void) 132 + { 133 + printk(KERN_INFO DRIVER_NAME 134 + ": Ricoh MMC Controller disabling driver\n"); 135 + printk(KERN_INFO DRIVER_NAME ": Copyright(c) Philip Langdale\n"); 136 + 137 + return pci_register_driver(&ricoh_mmc_driver); 138 + } 139 + 140 + static void __exit ricoh_mmc_drv_exit(void) 141 + { 142 + pci_unregister_driver(&ricoh_mmc_driver); 143 + } 144 + 145 + module_init(ricoh_mmc_drv_init); 146 + module_exit(ricoh_mmc_drv_exit); 147 + 148 + MODULE_AUTHOR("Philip Langdale <philipl@alumni.utexas.net>"); 149 + MODULE_DESCRIPTION("Ricoh MMC Controller disabling driver"); 150 + MODULE_LICENSE("GPL"); 151 +
+2
include/linux/pci_ids.h
··· 1471 1471 #define PCI_DEVICE_ID_RICOH_RL5C476 0x0476 1472 1472 #define PCI_DEVICE_ID_RICOH_RL5C478 0x0478 1473 1473 #define PCI_DEVICE_ID_RICOH_R5C822 0x0822 1474 + #define PCI_DEVICE_ID_RICOH_R5C832 0x0832 1475 + #define PCI_DEVICE_ID_RICOH_R5C843 0x0843 1474 1476 1475 1477 #define PCI_VENDOR_ID_DLINK 0x1186 1476 1478 #define PCI_DEVICE_ID_DLINK_DGE510T 0x4c00