Skip to contentSkip to conversation

MMC: core - fix the use of hard coded timeout value.

PATCH In review Tomas Winkler 2 participants 2 messages Jul 9, 2008 – Jul 10, 2008 MMC, SD and SDIO

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 MMC: core - fix the use of hard coded timeout value.

From: Benzi Zbit <[email protected]>

This adds reading and using of enable_timeout from the CIS

---
 drivers/mmc/core/sdio_cis.c   |    6 ++++++
 drivers/mmc/core/sdio_io.c    |    6 +-----
 include/linux/mmc/sdio_func.h |    2 ++
 3 files changed, 9 insertions(+), 5 deletions(-)
drivers/mmc/core/sdio_cis.c +6 -0
index d5e51b1..956bd76 100644
@@ -129,6 +129,12 @@ static int cistpl_funce_func(struct sdio_func *func,
 	/* TPLFE_MAX_BLK_SIZE */
 	func->max_blksize = buf[12] | (buf[13] << 8);
 
+	/* TPLFE_ENABLE_TIMEOUT_VAL, present in ver 1.1 and above */
+	if (vsn > SDIO_SDIO_REV_1_00)
+		func->enable_timeout = (buf[28] | (buf[29] << 8)) * 10;
+	else
+		func->enable_timeout = jiffies_to_msecs(HZ);
+
 	return 0;
 }
 
drivers/mmc/core/sdio_io.c +1 -5
index 3ccf691..0888df6 100755
@@ -76,11 +76,7 @@ int sdio_enable_func(struct sdio_func *func)
 	if (ret)
 		goto err;
 
-	/*
-	 * FIXME: This should timeout based on information in the CIS,
-	 * but we don't have card to parse that yet.
-	 */
-	timeout = jiffies + HZ;
+	timeout = jiffies + msecs_to_jiffies(func->enable_timeout);
 
 	while (1) {
 		ret = mmc_io_rw_direct(func->card, 0, 0, SDIO_CCCR_IORx, 0, &reg);
include/linux/mmc/sdio_func.h +2 -0
index 28fb0a3..07bee4a 100755
@@ -46,6 +46,8 @@ struct sdio_func {
 	unsigned		max_blksize;	/* maximum block size */
 	unsigned		cur_blksize;	/* current block size */
 
+	unsigned		enable_timeout;	/* max enable timeout in msec */
+
 	unsigned int		state;		/* function state */
 #define SDIO_STATE_PRESENT	(1<<0)		/* present in sysfs */
 
Signature · 9 lines
1.5.4.1

---------------------------------------------------------------------
Intel Israel (74) Limited

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
#1 lore raw
Quoted 7 lines · On Thu, 10 Jul 2008 02:41:43 +0300 Tomas Winkler <[email protected]>…

From: Benzi Zbit <[email protected]>

This adds reading and using of enable_timeout from the CIS

---

Looks ok. Applied.

Signature · 9 lines
     -- Pierre Ossman

  Linux kernel, MMC maintainer        http://www.kernel.org
  rdesktop, core developer          http://www.rdesktop.org

  WARNING: This correspondence is being monitored by the
  Swedish government. Make sure your server uses encryption
  for SMTP traffic and consider using PGP for end-to-end
  encryption.