Skip to contentSkip to conversation

mg_disk: remove prohibited sleep operation

PATCH In review unsik Kim 2 participants 3 messages Jul 23, 2009 – Jul 27, 2009 Block layer

lore
Share & tools
lore

unsik Kim

author
#0 lore raw

PATCH 1/2 mg_disk: remove prohibited sleep operation

mflash's polling driver operate in standard request_fn_proc's context, sleep in this isn't permitted.

---
 drivers/block/mg_disk.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/block/mg_disk.c +0 -2
index 64f90f5..26371d5 100644
@@ -244,8 +244,6 @@ static unsigned int mg_wait(struct mg_host *host, u32 expect, u32 msec)
 			mg_dump_status("not ready", status, host);
 			return MG_ERR_INV_STAT;
 		}
-		if (prv_data->use_polling)
-			msleep(1);
 
 		status = inb((unsigned long)host->dev_base + MG_REG_STATUS);
 	} while (time_before(cur_jiffies, expire));
Signature · 1 line
1.6.0.6
author
#1 lore raw

PATCH 2/2 mg_disk: fix reading invalid status when use polling driver

When using polling driver, little delay is required to access status register. Without this, host might read invalid status.

---
 drivers/block/mg_disk.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
drivers/block/mg_disk.c +10 -0
index 26371d5..6d7fbaa 100644
@@ -218,6 +218,16 @@ static unsigned int mg_wait(struct mg_host *host, u32 expect, u32 msec)
 	host->error = MG_ERR_NONE;
 	expire = jiffies + msecs_to_jiffies(msec);
 
+	/* These 2 times dummy status read prevents reading invalid
+	 * status. A very little time (3 times of mflash operating clk)
+	 * is required for busy bit is set. Use dummy read instead of
+	 * busy wait, because mflash's PLL is machine dependent.
+	 */
+	if (prv_data->use_polling) {
+		status = inb((unsigned long)host->dev_base + MG_REG_STATUS);
+		status = inb((unsigned long)host->dev_base + MG_REG_STATUS);
+	}
+
 	status = inb((unsigned long)host->dev_base + MG_REG_STATUS);
 
 	do {
Signature · 1 line
1.6.0.6
#2 lore raw
In reply to unsik Kim
Quoted 12 lines · On Thu, 23 Jul 2009 13:57:45 +0900 unsik Kim <[email protected]> wrote:

mflash's polling driver operate in standard request_fn_proc's context, sleep in this isn't permitted.

---
 drivers/block/mg_disk.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/block/mg_disk.c +0 -0
index 64f90f5..26371d5 100644

drivers/block/mg_disk.c static unsigned int mg_wait(struct mg_host *host, u32 expect, u32 msec) · line 249

Quoted 8 lines
drivers/block/mg_disk.c +0 -2
@@ -244,8 +244,6 @@ static unsigned int mg_wait(struct mg_host *host, u32 expect, u32 msec)
 			mg_dump_status("not ready", status, host);
 			return MG_ERR_INV_STAT;
 		}
-		if (prv_data->use_polling)
-			msleep(1);
 
 		status = inb((unsigned long)host->dev_base + MG_REG_STATUS);
 	} while (time_before(cur_jiffies, expire));

This change has the potential to cause the driver to use much much more CPU time and power. Are you really sure that the driver is optimal in this area?

On possibility is to pass a flag into mg_wait() telling it whether it is permitted to sleep:

		if (may_sleep && prv_data->use_polling)
			msleep(1);
		else
			mdelay(1);

or

		if (may_sleep && prv_data->use_polling)
			msleep(1);
		else
			/* nothing */;

so that then we only consume extra power if the caller is the request_fn handler.