 c2ac2ae44d
			
		
	
	
	c2ac2ae44d
	
	
	
		
			
			Core:
  - Improve runtime PM support, remove mmc_{suspend,resume}_host().
  - Add MMC_CAP_RUNTIME_RESUME, for delaying MMC resume until we're
    outside of the resume sequence (in runtime_resume) to decrease
    system resume time.
 
 Drivers:
  - dw_mmc: Support HS200 mode.
  - sdhci-eshdc-imx: Support SD3.0 SDR clock tuning, DDR on IMX6.
  - sdhci-pci: Add support for Intel Clovertrail and Merrifield.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.13 (GNU/Linux)
 
 iQIcBAABAgAGBQJSiDC6AAoJEHNBYZ7TNxYMlfUP/RReKYyFc5A6X/1WEkpc4jZ8
 tjJcoygrjhGc2lGg/ewZAHZ4oZJlHYwDe3cY+82X8MKuZdjQlWqHM0TpZB33d0NP
 jzTtjzT92A4BOlJ2jDOzLxPWR7Q/bpbycGJZ6w6rNxf3SOSom0JyCSBobB0Uwymi
 UI9EaMj4NS69GDPIk5IWjVPuYApVkmt16LKI0qB8bUbMWYcn9WwGknWe0uh+bKRn
 i3npn6JFMmmc03qhuhaRYL8FG5qJfnZbNL9mBRCt/D9InsJlcsN/isyvhoI9m9W6
 mYJtE6mJrnN+mVQJy90BnN7lSbDPpeDod8hB42We/kB+vzLpKGhGTsFPkdD0esHI
 CScHkpc1i3z+RdFqf/ZdL3mTk5DaIWyxBHZwqjWc1Cyf+O7xfYuTQwXWX7gDyDo+
 xKkttR5Hn9mJUkCUxww3ky7XDh3d7zeoIcQpnlJMIZZL8MG6QRnPJfVQLJXT+BF8
 2iQAj/qw47gt5+KMvkqHwB0iO1hlQoVoH3bRU7bywULe0zn5pGa2W4BFkN2nNJe/
 eKZsx3aB5ToaXHbZMIvw4zrVnPJfTp1A+GBTcztpHUk1weRseoqIzqNhSH/L+YGt
 JeyMhST/B6DGGXVkiO2kFhfqIppcN5vJgB/tyHzF0gkAq1K1GJSYeH+9AVL6QXeS
 G956hL5mY8CP0/ONNs93
 =JDGc
 -----END PGP SIGNATURE-----
Merge tag 'mmc-updates-for-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
Pull MMC updates from Chris Ball:
 "MMC highlights for 3.13:
  Core:
   - Improve runtime PM support, remove mmc_{suspend,resume}_host().
   - Add MMC_CAP_RUNTIME_RESUME, for delaying MMC resume until we're
     outside of the resume sequence (in runtime_resume) to decrease
     system resume time.
  Drivers:
   - dw_mmc: Support HS200 mode.
   - sdhci-eshdc-imx: Support SD3.0 SDR clock tuning, DDR on IMX6.
   - sdhci-pci: Add support for Intel Clovertrail and Merrifield"
* tag 'mmc-updates-for-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (108 commits)
  mmc: wbsd: Silence compiler warning
  mmc: core: Silence compiler warning in __mmc_switch
  mmc: sh_mmcif: Convert to clk_prepare|unprepare
  mmc: sh_mmcif: Convert to PM macros when defining dev_pm_ops
  mmc: dw_mmc: exynos: Revert the sdr_timing assignment
  mmc: sdhci: Avoid needless loop while handling SDIO interrupts in sdhci_irq
  mmc: core: Add MMC_CAP_RUNTIME_RESUME to resume at runtime_resume
  mmc: core: Improve runtime PM support during suspend/resume for sd/mmc
  mmc: core: Remove redundant mmc_power_up|off at runtime callbacks
  mmc: Don't force card to active state when entering suspend/shutdown
  MIPS: db1235: Don't use MMC_CLKGATE
  mmc: core: Remove deprecated mmc_suspend|resume_host APIs
  mmc: mmci: Move away from using deprecated APIs
  mmc: via-sdmmc: Move away from using deprecated APIs
  mmc: tmio: Move away from using deprecated APIs
  mmc: sh_mmcif: Move away from using deprecated APIs
  mmc: sdricoh_cs: Move away from using deprecated APIs
  mmc: rtsx: Remove redundant suspend and resume callbacks
  mmc: wbsd: Move away from using deprecated APIs
  mmc: pxamci: Remove redundant suspend and resume callbacks
  ...
		
	
			
		
			
				
	
	
		
			402 lines
		
	
	
	
		
			8.3 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			402 lines
		
	
	
	
		
			8.3 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  *  linux/drivers/mmc/core/bus.c
 | |
|  *
 | |
|  *  Copyright (C) 2003 Russell King, All Rights Reserved.
 | |
|  *  Copyright (C) 2007 Pierre Ossman
 | |
|  *
 | |
|  * This program is free software; you can redistribute it and/or modify
 | |
|  * it under the terms of the GNU General Public License version 2 as
 | |
|  * published by the Free Software Foundation.
 | |
|  *
 | |
|  *  MMC card bus driver model
 | |
|  */
 | |
| 
 | |
| #include <linux/export.h>
 | |
| #include <linux/device.h>
 | |
| #include <linux/err.h>
 | |
| #include <linux/slab.h>
 | |
| #include <linux/stat.h>
 | |
| #include <linux/pm_runtime.h>
 | |
| 
 | |
| #include <linux/mmc/card.h>
 | |
| #include <linux/mmc/host.h>
 | |
| 
 | |
| #include "core.h"
 | |
| #include "sdio_cis.h"
 | |
| #include "bus.h"
 | |
| 
 | |
| #define to_mmc_driver(d)	container_of(d, struct mmc_driver, drv)
 | |
| 
 | |
| static ssize_t type_show(struct device *dev,
 | |
| 	struct device_attribute *attr, char *buf)
 | |
| {
 | |
| 	struct mmc_card *card = mmc_dev_to_card(dev);
 | |
| 
 | |
| 	switch (card->type) {
 | |
| 	case MMC_TYPE_MMC:
 | |
| 		return sprintf(buf, "MMC\n");
 | |
| 	case MMC_TYPE_SD:
 | |
| 		return sprintf(buf, "SD\n");
 | |
| 	case MMC_TYPE_SDIO:
 | |
| 		return sprintf(buf, "SDIO\n");
 | |
| 	case MMC_TYPE_SD_COMBO:
 | |
| 		return sprintf(buf, "SDcombo\n");
 | |
| 	default:
 | |
| 		return -EFAULT;
 | |
| 	}
 | |
| }
 | |
| static DEVICE_ATTR_RO(type);
 | |
| 
 | |
| static struct attribute *mmc_dev_attrs[] = {
 | |
| 	&dev_attr_type.attr,
 | |
| 	NULL,
 | |
| };
 | |
| ATTRIBUTE_GROUPS(mmc_dev);
 | |
| 
 | |
| /*
 | |
|  * This currently matches any MMC driver to any MMC card - drivers
 | |
|  * themselves make the decision whether to drive this card in their
 | |
|  * probe method.
 | |
|  */
 | |
| static int mmc_bus_match(struct device *dev, struct device_driver *drv)
 | |
| {
 | |
| 	return 1;
 | |
| }
 | |
| 
 | |
| static int
 | |
| mmc_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
 | |
| {
 | |
| 	struct mmc_card *card = mmc_dev_to_card(dev);
 | |
| 	const char *type;
 | |
| 	int retval = 0;
 | |
| 
 | |
| 	switch (card->type) {
 | |
| 	case MMC_TYPE_MMC:
 | |
| 		type = "MMC";
 | |
| 		break;
 | |
| 	case MMC_TYPE_SD:
 | |
| 		type = "SD";
 | |
| 		break;
 | |
| 	case MMC_TYPE_SDIO:
 | |
| 		type = "SDIO";
 | |
| 		break;
 | |
| 	case MMC_TYPE_SD_COMBO:
 | |
| 		type = "SDcombo";
 | |
| 		break;
 | |
| 	default:
 | |
| 		type = NULL;
 | |
| 	}
 | |
| 
 | |
| 	if (type) {
 | |
| 		retval = add_uevent_var(env, "MMC_TYPE=%s", type);
 | |
| 		if (retval)
 | |
| 			return retval;
 | |
| 	}
 | |
| 
 | |
| 	retval = add_uevent_var(env, "MMC_NAME=%s", mmc_card_name(card));
 | |
| 	if (retval)
 | |
| 		return retval;
 | |
| 
 | |
| 	/*
 | |
| 	 * Request the mmc_block device.  Note: that this is a direct request
 | |
| 	 * for the module it carries no information as to what is inserted.
 | |
| 	 */
 | |
| 	retval = add_uevent_var(env, "MODALIAS=mmc:block");
 | |
| 
 | |
| 	return retval;
 | |
| }
 | |
| 
 | |
| static int mmc_bus_probe(struct device *dev)
 | |
| {
 | |
| 	struct mmc_driver *drv = to_mmc_driver(dev->driver);
 | |
| 	struct mmc_card *card = mmc_dev_to_card(dev);
 | |
| 
 | |
| 	return drv->probe(card);
 | |
| }
 | |
| 
 | |
| static int mmc_bus_remove(struct device *dev)
 | |
| {
 | |
| 	struct mmc_driver *drv = to_mmc_driver(dev->driver);
 | |
| 	struct mmc_card *card = mmc_dev_to_card(dev);
 | |
| 
 | |
| 	drv->remove(card);
 | |
| 
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| static void mmc_bus_shutdown(struct device *dev)
 | |
| {
 | |
| 	struct mmc_driver *drv = to_mmc_driver(dev->driver);
 | |
| 	struct mmc_card *card = mmc_dev_to_card(dev);
 | |
| 	struct mmc_host *host = card->host;
 | |
| 	int ret;
 | |
| 
 | |
| 	if (dev->driver && drv->shutdown)
 | |
| 		drv->shutdown(card);
 | |
| 
 | |
| 	if (host->bus_ops->shutdown) {
 | |
| 		ret = host->bus_ops->shutdown(host);
 | |
| 		if (ret)
 | |
| 			pr_warn("%s: error %d during shutdown\n",
 | |
| 				mmc_hostname(host), ret);
 | |
| 	}
 | |
| }
 | |
| 
 | |
| #ifdef CONFIG_PM_SLEEP
 | |
| static int mmc_bus_suspend(struct device *dev)
 | |
| {
 | |
| 	struct mmc_driver *drv = to_mmc_driver(dev->driver);
 | |
| 	struct mmc_card *card = mmc_dev_to_card(dev);
 | |
| 	struct mmc_host *host = card->host;
 | |
| 	int ret;
 | |
| 
 | |
| 	if (dev->driver && drv->suspend) {
 | |
| 		ret = drv->suspend(card);
 | |
| 		if (ret)
 | |
| 			return ret;
 | |
| 	}
 | |
| 
 | |
| 	ret = host->bus_ops->suspend(host);
 | |
| 	return ret;
 | |
| }
 | |
| 
 | |
| static int mmc_bus_resume(struct device *dev)
 | |
| {
 | |
| 	struct mmc_driver *drv = to_mmc_driver(dev->driver);
 | |
| 	struct mmc_card *card = mmc_dev_to_card(dev);
 | |
| 	struct mmc_host *host = card->host;
 | |
| 	int ret;
 | |
| 
 | |
| 	ret = host->bus_ops->resume(host);
 | |
| 	if (ret)
 | |
| 		pr_warn("%s: error %d during resume (card was removed?)\n",
 | |
| 			mmc_hostname(host), ret);
 | |
| 
 | |
| 	if (dev->driver && drv->resume)
 | |
| 		ret = drv->resume(card);
 | |
| 
 | |
| 	return ret;
 | |
| }
 | |
| #endif
 | |
| 
 | |
| #ifdef CONFIG_PM_RUNTIME
 | |
| 
 | |
| static int mmc_runtime_suspend(struct device *dev)
 | |
| {
 | |
| 	struct mmc_card *card = mmc_dev_to_card(dev);
 | |
| 	struct mmc_host *host = card->host;
 | |
| 	int ret = 0;
 | |
| 
 | |
| 	if (host->bus_ops->runtime_suspend)
 | |
| 		ret = host->bus_ops->runtime_suspend(host);
 | |
| 
 | |
| 	return ret;
 | |
| }
 | |
| 
 | |
| static int mmc_runtime_resume(struct device *dev)
 | |
| {
 | |
| 	struct mmc_card *card = mmc_dev_to_card(dev);
 | |
| 	struct mmc_host *host = card->host;
 | |
| 	int ret = 0;
 | |
| 
 | |
| 	if (host->bus_ops->runtime_resume)
 | |
| 		ret = host->bus_ops->runtime_resume(host);
 | |
| 
 | |
| 	return ret;
 | |
| }
 | |
| 
 | |
| static int mmc_runtime_idle(struct device *dev)
 | |
| {
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| #endif /* !CONFIG_PM_RUNTIME */
 | |
| 
 | |
| static const struct dev_pm_ops mmc_bus_pm_ops = {
 | |
| 	SET_RUNTIME_PM_OPS(mmc_runtime_suspend, mmc_runtime_resume,
 | |
| 			mmc_runtime_idle)
 | |
| 	SET_SYSTEM_SLEEP_PM_OPS(mmc_bus_suspend, mmc_bus_resume)
 | |
| };
 | |
| 
 | |
| static struct bus_type mmc_bus_type = {
 | |
| 	.name		= "mmc",
 | |
| 	.dev_groups	= mmc_dev_groups,
 | |
| 	.match		= mmc_bus_match,
 | |
| 	.uevent		= mmc_bus_uevent,
 | |
| 	.probe		= mmc_bus_probe,
 | |
| 	.remove		= mmc_bus_remove,
 | |
| 	.shutdown	= mmc_bus_shutdown,
 | |
| 	.pm		= &mmc_bus_pm_ops,
 | |
| };
 | |
| 
 | |
| int mmc_register_bus(void)
 | |
| {
 | |
| 	return bus_register(&mmc_bus_type);
 | |
| }
 | |
| 
 | |
| void mmc_unregister_bus(void)
 | |
| {
 | |
| 	bus_unregister(&mmc_bus_type);
 | |
| }
 | |
| 
 | |
| /**
 | |
|  *	mmc_register_driver - register a media driver
 | |
|  *	@drv: MMC media driver
 | |
|  */
 | |
| int mmc_register_driver(struct mmc_driver *drv)
 | |
| {
 | |
| 	drv->drv.bus = &mmc_bus_type;
 | |
| 	return driver_register(&drv->drv);
 | |
| }
 | |
| 
 | |
| EXPORT_SYMBOL(mmc_register_driver);
 | |
| 
 | |
| /**
 | |
|  *	mmc_unregister_driver - unregister a media driver
 | |
|  *	@drv: MMC media driver
 | |
|  */
 | |
| void mmc_unregister_driver(struct mmc_driver *drv)
 | |
| {
 | |
| 	drv->drv.bus = &mmc_bus_type;
 | |
| 	driver_unregister(&drv->drv);
 | |
| }
 | |
| 
 | |
| EXPORT_SYMBOL(mmc_unregister_driver);
 | |
| 
 | |
| static void mmc_release_card(struct device *dev)
 | |
| {
 | |
| 	struct mmc_card *card = mmc_dev_to_card(dev);
 | |
| 
 | |
| 	sdio_free_common_cis(card);
 | |
| 
 | |
| 	kfree(card->info);
 | |
| 
 | |
| 	kfree(card);
 | |
| }
 | |
| 
 | |
| /*
 | |
|  * Allocate and initialise a new MMC card structure.
 | |
|  */
 | |
| struct mmc_card *mmc_alloc_card(struct mmc_host *host, struct device_type *type)
 | |
| {
 | |
| 	struct mmc_card *card;
 | |
| 
 | |
| 	card = kzalloc(sizeof(struct mmc_card), GFP_KERNEL);
 | |
| 	if (!card)
 | |
| 		return ERR_PTR(-ENOMEM);
 | |
| 
 | |
| 	card->host = host;
 | |
| 
 | |
| 	device_initialize(&card->dev);
 | |
| 
 | |
| 	card->dev.parent = mmc_classdev(host);
 | |
| 	card->dev.bus = &mmc_bus_type;
 | |
| 	card->dev.release = mmc_release_card;
 | |
| 	card->dev.type = type;
 | |
| 
 | |
| 	return card;
 | |
| }
 | |
| 
 | |
| /*
 | |
|  * Register a new MMC card with the driver model.
 | |
|  */
 | |
| int mmc_add_card(struct mmc_card *card)
 | |
| {
 | |
| 	int ret;
 | |
| 	const char *type;
 | |
| 	const char *uhs_bus_speed_mode = "";
 | |
| 	static const char *const uhs_speeds[] = {
 | |
| 		[UHS_SDR12_BUS_SPEED] = "SDR12 ",
 | |
| 		[UHS_SDR25_BUS_SPEED] = "SDR25 ",
 | |
| 		[UHS_SDR50_BUS_SPEED] = "SDR50 ",
 | |
| 		[UHS_SDR104_BUS_SPEED] = "SDR104 ",
 | |
| 		[UHS_DDR50_BUS_SPEED] = "DDR50 ",
 | |
| 	};
 | |
| 
 | |
| 
 | |
| 	dev_set_name(&card->dev, "%s:%04x", mmc_hostname(card->host), card->rca);
 | |
| 
 | |
| 	switch (card->type) {
 | |
| 	case MMC_TYPE_MMC:
 | |
| 		type = "MMC";
 | |
| 		break;
 | |
| 	case MMC_TYPE_SD:
 | |
| 		type = "SD";
 | |
| 		if (mmc_card_blockaddr(card)) {
 | |
| 			if (mmc_card_ext_capacity(card))
 | |
| 				type = "SDXC";
 | |
| 			else
 | |
| 				type = "SDHC";
 | |
| 		}
 | |
| 		break;
 | |
| 	case MMC_TYPE_SDIO:
 | |
| 		type = "SDIO";
 | |
| 		break;
 | |
| 	case MMC_TYPE_SD_COMBO:
 | |
| 		type = "SD-combo";
 | |
| 		if (mmc_card_blockaddr(card))
 | |
| 			type = "SDHC-combo";
 | |
| 		break;
 | |
| 	default:
 | |
| 		type = "?";
 | |
| 		break;
 | |
| 	}
 | |
| 
 | |
| 	if (mmc_card_uhs(card) &&
 | |
| 		(card->sd_bus_speed < ARRAY_SIZE(uhs_speeds)))
 | |
| 		uhs_bus_speed_mode = uhs_speeds[card->sd_bus_speed];
 | |
| 
 | |
| 	if (mmc_host_is_spi(card->host)) {
 | |
| 		pr_info("%s: new %s%s%s card on SPI\n",
 | |
| 			mmc_hostname(card->host),
 | |
| 			mmc_card_highspeed(card) ? "high speed " : "",
 | |
| 			mmc_card_ddr_mode(card) ? "DDR " : "",
 | |
| 			type);
 | |
| 	} else {
 | |
| 		pr_info("%s: new %s%s%s%s%s card at address %04x\n",
 | |
| 			mmc_hostname(card->host),
 | |
| 			mmc_card_uhs(card) ? "ultra high speed " :
 | |
| 			(mmc_card_highspeed(card) ? "high speed " : ""),
 | |
| 			(mmc_card_hs200(card) ? "HS200 " : ""),
 | |
| 			mmc_card_ddr_mode(card) ? "DDR " : "",
 | |
| 			uhs_bus_speed_mode, type, card->rca);
 | |
| 	}
 | |
| 
 | |
| #ifdef CONFIG_DEBUG_FS
 | |
| 	mmc_add_card_debugfs(card);
 | |
| #endif
 | |
| 	mmc_init_context_info(card->host);
 | |
| 
 | |
| 	ret = device_add(&card->dev);
 | |
| 	if (ret)
 | |
| 		return ret;
 | |
| 
 | |
| 	mmc_card_set_present(card);
 | |
| 
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| /*
 | |
|  * Unregister a new MMC card with the driver model, and
 | |
|  * (eventually) free it.
 | |
|  */
 | |
| void mmc_remove_card(struct mmc_card *card)
 | |
| {
 | |
| #ifdef CONFIG_DEBUG_FS
 | |
| 	mmc_remove_card_debugfs(card);
 | |
| #endif
 | |
| 
 | |
| 	if (mmc_card_present(card)) {
 | |
| 		if (mmc_host_is_spi(card->host)) {
 | |
| 			pr_info("%s: SPI card removed\n",
 | |
| 				mmc_hostname(card->host));
 | |
| 		} else {
 | |
| 			pr_info("%s: card %04x removed\n",
 | |
| 				mmc_hostname(card->host), card->rca);
 | |
| 		}
 | |
| 		device_del(&card->dev);
 | |
| 	}
 | |
| 
 | |
| 	put_device(&card->dev);
 | |
| }
 | |
| 
 |