Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753668Ab0A2QeN (ORCPT ); Fri, 29 Jan 2010 11:34:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753445Ab0A2QeL (ORCPT ); Fri, 29 Jan 2010 11:34:11 -0500 Received: from metis.ext.pengutronix.de ([92.198.50.35]:39750 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752108Ab0A2QeG (ORCPT ); Fri, 29 Jan 2010 11:34:06 -0500 Date: Fri, 29 Jan 2010 17:33:38 +0100 From: Wolfram Sang To: Maxim Levitsky Cc: Andrew Morton , Philip Langdale , Pierre Ossman , linux-kernel , linux-mmc@vger.kernel.org Subject: Re: [PATCH v3] port ricoh_mmc to pci quirk Message-ID: <20100129163338.GL7812@pengutronix.de> References: <1259192401.15916.48.camel@maxim-laptop> <20091125173019.74d0ddb9@fido2.homeip.net> <1259279520.3991.5.camel@maxim-laptop> <1259279584.3991.6.camel@maxim-laptop> <20091126235551.2db699e3@fido2.homeip.net> <1262964284.12577.27.camel@maxim-laptop> <20100108074001.5df6c997@fido2.homeip.net> <20100112154350.8fa96829.akpm@linux-foundation.org> <20100113064657.GB10955@pengutronix.de> <1264772255.4620.3.camel@maxim-laptop> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="QAdlk5ze2izLk3Ap" Content-Disposition: inline In-Reply-To: <1264772255.4620.3.camel@maxim-laptop> User-Agent: Mutt/1.5.18 (2008-05-17) X-SA-Exim-Connect-IP: 2001:6f8:1178:2:221:70ff:fe71:1890 X-SA-Exim-Mail-From: w.sang@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 16930 Lines: 537 --QAdlk5ze2izLk3Ap Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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. >=20 > This adds some > 80 chars lines, but I hope that is ok. Some cosmetic issues, other than that: Acked-by: Wolfram Sang >=20 > --- >=20 > >From 9b208770b2421eae50e46d826f08a4084c2bcdb9 Mon Sep 17 00:00:00 2001 > From: Maxim Levitsky > Date: Fri, 29 Jan 2010 15:30:46 +0200 > Subject: [PATCH] Port ricoh_mmc to pci quirk >=20 > 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 n= ow wrong idea > about these devices. >=20 > To fix this issue, this patch moves the driver into pci quirk section, th= us it > is executed before the pci is enumerated, and therefore solve that issue, > also the same is preformed on resume for same reasons. >=20 > Also regardless of the above, this way is cleaner. >=20 > You still need to set CONFIG_MMC_RICOH_MMC > to enable this quirk >=20 > Signed-off-by: Maxim Levitsky > --- > 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 >=20 > 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. > =20 > 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. > =20 > - > - To compile this driver as a module, choose M here: > - the module will be called ricoh_mmc. > - > If unsure, say Y. > =20 > 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) +=3D imxmmc.o > obj-$(CONFIG_MMC_MXC) +=3D mxcmmc.o > obj-$(CONFIG_MMC_SDHCI) +=3D sdhci.o > obj-$(CONFIG_MMC_SDHCI_PCI) +=3D sdhci-pci.o > -obj-$(CONFIG_MMC_RICOH_MMC) +=3D ricoh_mmc.o > obj-$(CONFIG_MMC_SDHCI_PLTFM) +=3D sdhci-pltfm.o > obj-$(CONFIG_MMC_SDHCI_S3C) +=3D sdhci-s3c.o > obj-$(CONFIG_MMC_WBSD) +=3D 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 w= ay > - * the Ricoh multi-function chips (R5CXXX) work. These chips implement > - * the four main memory card controllers (SD, MMC, MS, xD) and one or bo= th > - * 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 se= es > - * them. To get around this, we must disable the useless MMC controller. > - * At that point, the SDHCI controller will start seeing them. As a bonu= s, > - * 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 con= troller > - * or the firewire controller, depending on the particular chip in quest= ion. As > - * such, it makes what this driver has to do unavoidably ugly. Such is l= ife. > - */ > - > -#include > - > -#define DRIVER_NAME "ricoh-mmc" > - > -static const struct pci_device_id pci_ids[] __devinitdata =3D { > - { > - .vendor =3D PCI_VENDOR_ID_RICOH, > - .device =3D PCI_DEVICE_ID_RICOH_R5C843, > - .subvendor =3D PCI_ANY_ID, > - .subdevice =3D 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 =3D=3D 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 =3D=3D 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 =3D 0; > - > - struct pci_dev *fw_dev =3D NULL; > - > - BUG_ON(pdev =3D=3D NULL); > - BUG_ON(ent =3D=3D 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 =3D > - pci_get_device(PCI_VENDOR_ID_RICOH, > - PCI_DEVICE_ID_RICOH_RL5C476, fw_dev))) { > - if (PCI_SLOT(pdev->devfn) =3D=3D PCI_SLOT(fw_dev->devfn) && > - PCI_FUNC(fw_dev->devfn) =3D=3D 0 && > - pdev->bus =3D=3D fw_dev->bus) { > - if (ricoh_mmc_disable(fw_dev) !=3D 0) > - return -ENODEV; > - > - pci_set_drvdata(pdev, fw_dev); > - > - ++ctrlfound; > - break; > - } > - } > - > - fw_dev =3D NULL; > - > - while (!ctrlfound && > - (fw_dev =3D pci_get_device(PCI_VENDOR_ID_RICOH, > - PCI_DEVICE_ID_RICOH_R5C832, fw_dev))) { > - if (PCI_SLOT(pdev->devfn) =3D=3D PCI_SLOT(fw_dev->devfn) && > - PCI_FUNC(fw_dev->devfn) =3D=3D 0 && > - pdev->bus =3D=3D fw_dev->bus) { > - if (ricoh_mmc_disable(fw_dev) !=3D 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 =3D NULL; > - > - fw_dev =3D pci_get_drvdata(pdev); > - BUG_ON(fw_dev =3D=3D NULL); > - > - ricoh_mmc_enable(fw_dev); > - > - pci_set_drvdata(pdev, NULL); > -} > - > -static int ricoh_mmc_suspend_late(struct pci_dev *pdev, pm_message_t sta= te) > -{ > - struct pci_dev *fw_dev =3D NULL; > - > - fw_dev =3D pci_get_drvdata(pdev); > - BUG_ON(fw_dev =3D=3D 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 =3D NULL; > - > - fw_dev =3D pci_get_drvdata(pdev); > - BUG_ON(fw_dev =3D=3D NULL); > - > - printk(KERN_INFO DRIVER_NAME ": Resuming.\n"); > - > - ricoh_mmc_disable(fw_dev); > - > - return 0; > -} > - > -static struct pci_driver ricoh_mmc_driver =3D { > - .name =3D DRIVER_NAME, > - .id_table =3D pci_ids, > - .probe =3D ricoh_mmc_probe, > - .remove =3D __devexit_p(ricoh_mmc_remove), > - .suspend_late =3D ricoh_mmc_suspend_late, > - .resume_early =3D 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 "); > -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, 0x15= 0d, quirk_i82576_sriov); > =20 > #endif /* CONFIG_PCI_IOV */ > =20 > +/* > + * 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 se= es > + * 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 con= troller > + * or the firewire controller, depending on the particular chip in quest= ion 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 cont= roller > + * other pci functions shift up one level, e.g. function #2 becomes func= tion > + * #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 c= ardbus function)\n"); > + dev_notice(&dev->dev, "MMC cards are now supported by standard SDHCI co= ntroller\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 f= irewire function)\n"); > + dev_notice(&dev->dev, "MMC cards are now supported by standard SDHCI co= ntroller\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) > { > --=20 > 1.6.3.3 >=20 >=20 >=20 > -- > 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 --=20 Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ | --QAdlk5ze2izLk3Ap Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAktjDeIACgkQD27XaX1/VRtaFACgq90g5K4ibTnOMHbuwC//CDWX 9xAAoK1G1x+Djv98N+uzhcJrtrmbSOVq =PATm -----END PGP SIGNATURE----- --QAdlk5ze2izLk3Ap-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/