Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a053e8c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: (42 commits)
  atmel-mci: fix sdc_reg typo
  tmio_mmc: add maintainer
  mmc: Add OpenFirmware bindings for SDHCI driver
  sdhci: Add quirk for forcing maximum block size to 2048 bytes
  sdhci: Add quirk for controllers that need IRQ re-init after reset
  sdhci: Add quirk for controllers that need small delays for PIO
  sdhci: Add set_clock callback and a quirk for nonstandard clocks
  sdhci: Add get_{max,timeout}_clock callbacks
  sdhci: Add support for hosts reporting inverted write-protect state
  sdhci: Add support for card-detection polling
  sdhci: Enable only relevant (DMA/PIO) interrupts during transfers
  sdhci: Split card-detection IRQs management from sdhci_init()
  sdhci: Add support for bus-specific IO memory accessors
  mmc_spi: adjust for delayed data token response
  omap_hsmmc: Wait for SDBP
  omap_hsmmc: Fix MMC3 dma
  omap_hsmmc: Disable SDBP at suspend
  omap_hsmmc: Do not prefix slot name
  omap_hsmmc: Allow cover switch to cause rescan
  omap_hsmmc: Add 8-bit bus width mode support
  ...
parents 601cc11d 32ab83a5

MAINTAINERS

+19 −1
Original line number Diff line number Diff line
@@ -2924,6 +2924,12 @@ M: buytenh@marvell.com 
L:	netdev@vger.kernel.org

S:	Supported



MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER

P:	Nicolas Pitre

M:	nico@cam.org

L:	linux-kernel@vger.kernel.org

S:	Maintained



MARVELL YUKON / SYSKONNECT DRIVER

P:	Mirko Lindner

M:	mlindner@syskonnect.de
@@ -3916,7 +3922,14 @@ S: Maintained 
SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER

P:	Pierre Ossman

M:	drzeus-sdhci@drzeus.cx

L:	sdhci-devel@list.drzeus.cx

L:	sdhci-devel@lists.ossman.eu

S:	Maintained



SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)

P:	Anton Vorontsov

M:	avorontsov@ru.mvista.com

L:	linuxppc-dev@ozlabs.org

L:	sdhci-devel@lists.ossman.eu

S:	Maintained



SECURITY SUBSYSTEM
@@ -4394,6 +4407,11 @@ L: tlinux-users@tce.toshiba-dme.co.jp 
W:	http://www.buzzard.org.uk/toshiba/

S:	Maintained



TMIO MMC DRIVER

P:	Ian Molton

M:	ian@mnementh.co.uk

S:	Maintained



TPM DEVICE DRIVER

P:	Debora Velarde

M:	debora@linux.vnet.ibm.com

drivers/mmc/card/block.c

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ 


#include "queue.h"



MODULE_ALIAS("mmc:block");



/*

 * max 8 partitions per card

 */

drivers/mmc/core/bus.c

+8 −0
Original line number Diff line number Diff line
@@ -84,6 +84,14 @@ mmc_bus_uevent(struct device *dev, struct kobj_uevent_env *env) 
	}



	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;

}

drivers/mmc/core/core.c

+18 −0
Original line number Diff line number Diff line
@@ -298,6 +298,21 @@ void mmc_set_data_timeout(struct mmc_data *data, const struct mmc_card *card) 
			data->timeout_clks = 0;

		}

	}

	/*

	 * Some cards need very high timeouts if driven in SPI mode.

	 * The worst observed timeout was 900ms after writing a

	 * continuous stream of data until the internal logic

	 * overflowed.

	 */

	if (mmc_host_is_spi(card->host)) {

		if (data->flags & MMC_DATA_WRITE) {

			if (data->timeout_ns < 1000000000)

				data->timeout_ns = 1000000000;	/* 1s */

		} else {

			if (data->timeout_ns < 100000000)

				data->timeout_ns =  100000000;	/* 100ms */

		}

	}

}

EXPORT_SYMBOL(mmc_set_data_timeout);
@@ -915,6 +930,7 @@ void mmc_stop_host(struct mmc_host *host) 
	spin_unlock_irqrestore(&host->lock, flags);

#endif



	cancel_delayed_work(&host->detect);

	mmc_flush_scheduled_work();



	mmc_bus_get(host);
@@ -942,6 +958,7 @@ void mmc_stop_host(struct mmc_host *host) 
 */

int mmc_suspend_host(struct mmc_host *host, pm_message_t state)

{

	cancel_delayed_work(&host->detect);

	mmc_flush_scheduled_work();



	mmc_bus_get(host);
@@ -975,6 +992,7 @@ int mmc_resume_host(struct mmc_host *host) 
	mmc_bus_get(host);

	if (host->bus_ops && !host->bus_dead) {

		mmc_power_up(host);

		mmc_select_voltage(host, host->ocr);

		BUG_ON(!host->bus_ops->resume);

		host->bus_ops->resume(host);

	}

drivers/mmc/core/debugfs.c

+67 −0
Original line number Diff line number Diff line
@@ -184,6 +184,68 @@ static int mmc_dbg_card_status_get(void *data, u64 *val) 
DEFINE_SIMPLE_ATTRIBUTE(mmc_dbg_card_status_fops, mmc_dbg_card_status_get,

		NULL, "%08llx\n");



#define EXT_CSD_STR_LEN 1025



static int mmc_ext_csd_open(struct inode *inode, struct file *filp)

{

	struct mmc_card *card = inode->i_private;

	char *buf;

	ssize_t n = 0;

	u8 *ext_csd;

	int err, i;



	buf = kmalloc(EXT_CSD_STR_LEN + 1, GFP_KERNEL);

	if (!buf)

		return -ENOMEM;



	ext_csd = kmalloc(512, GFP_KERNEL);

	if (!ext_csd) {

		err = -ENOMEM;

		goto out_free;

	}



	mmc_claim_host(card->host);

	err = mmc_send_ext_csd(card, ext_csd);

	mmc_release_host(card->host);

	if (err)

		goto out_free;



	for (i = 511; i >= 0; i--)

		n += sprintf(buf + n, "%02x", ext_csd[i]);

	n += sprintf(buf + n, "\n");

	BUG_ON(n != EXT_CSD_STR_LEN);



	filp->private_data = buf;

	kfree(ext_csd);

	return 0;



out_free:

	kfree(buf);

	kfree(ext_csd);

	return err;

}



static ssize_t mmc_ext_csd_read(struct file *filp, char __user *ubuf,

				size_t cnt, loff_t *ppos)

{

	char *buf = filp->private_data;



	return simple_read_from_buffer(ubuf, cnt, ppos,

				       buf, EXT_CSD_STR_LEN);

}



static int mmc_ext_csd_release(struct inode *inode, struct file *file)

{

	kfree(file->private_data);

	return 0;

}



static struct file_operations mmc_dbg_ext_csd_fops = {

	.open		= mmc_ext_csd_open,

	.read		= mmc_ext_csd_read,

	.release	= mmc_ext_csd_release,

};



void mmc_add_card_debugfs(struct mmc_card *card)

{

	struct mmc_host	*host = card->host;
@@ -211,6 +273,11 @@ void mmc_add_card_debugfs(struct mmc_card *card) 
					&mmc_dbg_card_status_fops))

			goto err;



	if (mmc_card_mmc(card))

		if (!debugfs_create_file("ext_csd", S_IRUSR, root, card,

					&mmc_dbg_ext_csd_fops))

			goto err;



	return;



err: