All of lore.kernel.org
 help / color / mirror / Atom feed
From: Adrian Hunter <adrian.hunter@nokia.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com>,
	Adrian Hunter <adrian.hunter@nokia.com>,
	linux-omap Mailing List <linux-omap@vger.kernel.org>,
	Pierre Ossman <pierre@ossman.eu>,
	Denis Karpov <ext-denis.2.karpov@nokia.com>,
	Matt Fleming <matt@console-pimps.org>,
	lkml <linux-kernel@vger.kernel.org>
Subject: [PATCH V2 29/32] omap_hsmmc: protect the card when the cover is open
Date: Tue, 28 Jul 2009 13:42:08 +0300	[thread overview]
Message-ID: <20090728104208.2371.2569.sendpatchset@ahunter-laptop> (raw)
In-Reply-To: <20090728103834.2371.65809.sendpatchset@ahunter-laptop>

>From f1228758121aab11ba2265f2c6fe37f65b3aae03 Mon Sep 17 00:00:00 2001
From: Adrian Hunter <adrian.hunter@nokia.com>
Date: Fri, 22 May 2009 16:53:49 +0300
Subject: [PATCH] omap_hsmmc: protect the card when the cover is open

Depending on the manufacturer, there is a small possibility that
removing a card while it is being written to, can render the
card permanently unusable.  To prevent that, the card is made
inaccessible when the cover is open.

Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
---
 drivers/mmc/host/omap_hsmmc.c |   63 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index c2b334d..32d5aef 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -165,6 +165,8 @@ struct omap_hsmmc_host {
 	int			context_loss;
 	int			dpm_state;
 	int			vdd;
+	int			protect_card;
+	int			reqs_blocked;
 
 	struct	omap_mmc_platform_data	*pdata;
 };
@@ -349,6 +351,9 @@ static void send_init_stream(struct omap_hsmmc_host *host)
 	int reg = 0;
 	unsigned long timeout;
 
+	if (host->protect_card)
+		return;
+
 	disable_irq(host->irq);
 	OMAP_HSMMC_WRITE(host->base, CON,
 		OMAP_HSMMC_READ(host->base, CON) | INIT_STREAM);
@@ -779,6 +784,30 @@ err:
 	return ret;
 }
 
+/* Protect the card while the cover is open */
+static void omap_hsmmc_protect_card(struct omap_hsmmc_host *host)
+{
+	if (!mmc_slot(host).get_cover_state)
+		return;
+
+	host->reqs_blocked = 0;
+	if (mmc_slot(host).get_cover_state(host->dev, host->slot_id)) {
+		if (host->protect_card) {
+			printk(KERN_INFO "%s: cover is closed, "
+					 "card is now accessible\n",
+					 mmc_hostname(host->mmc));
+			host->protect_card = 0;
+		}
+	} else {
+		if (!host->protect_card) {
+			printk(KERN_INFO "%s: cover is open, "
+					 "card is now inaccessible\n",
+					 mmc_hostname(host->mmc));
+			host->protect_card = 1;
+		}
+	}
+}
+
 /*
  * Work Item to notify the core about card insertion/removal
  */
@@ -796,8 +825,10 @@ static void omap_hsmmc_detect(struct work_struct *work)
 
 	if (slot->card_detect)
 		carddetect = slot->card_detect(slot->card_detect_irq);
-	else
+	else {
+		omap_hsmmc_protect_card(host);
 		carddetect = -ENOSYS;
+	}
 
 	if (carddetect) {
 		mmc_detect_change(host->mmc, (HZ * 200) / 1000);
@@ -1033,8 +1064,32 @@ static void omap_hsmmc_request(struct mmc_host *mmc, struct mmc_request *req)
 	 * interrupts, but not if we are already in interrupt context i.e.
 	 * retries.
 	 */
-	if (!in_interrupt())
+	if (!in_interrupt()) {
 		spin_lock_irqsave(&host->irq_lock, host->flags);
+		/*
+		 * Protect the card from I/O if there is a possibility
+		 * it can be removed.
+		 */
+		if (host->protect_card) {
+			if (host->reqs_blocked < 3) {
+				/*
+				 * Ensure the controller is left in a consistent
+				 * state by resetting the command and data state
+				 * machines.
+				 */
+				omap_hsmmc_reset_controller_fsm(host, SRD);
+				omap_hsmmc_reset_controller_fsm(host, SRC);
+				host->reqs_blocked += 1;
+			}
+			req->cmd->error = -EBADF;
+			if (req->data)
+				req->data->error = -EBADF;
+			spin_unlock_irqrestore(&host->irq_lock, host->flags);
+			mmc_request_done(mmc, req);
+			return;
+		} else if (host->reqs_blocked)
+			host->reqs_blocked = 0;
+	}
 	WARN_ON(host->mrq != NULL);
 	host->mrq = req;
 	err = omap_hsmmc_prepare_data(host, req);
@@ -1728,6 +1783,8 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
 
 	mmc_host_lazy_disable(host->mmc);
 
+	omap_hsmmc_protect_card(host);
+
 	mmc_add_host(mmc);
 
 	if (mmc_slot(host).name != NULL) {
@@ -1893,6 +1950,8 @@ static int omap_hsmmc_resume(struct platform_device *pdev)
 					"Unmask interrupt failed\n");
 		}
 
+		omap_hsmmc_protect_card(host);
+
 		/* Notify the core to resume the host */
 		ret = mmc_resume_host(host->mmc);
 		if (ret == 0)
-- 
1.5.6.3


  parent reply	other threads:[~2009-07-28 10:42 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-28 10:38 [PATCH V2 0/32] mmc and omap_hsmmc patches Adrian Hunter
2009-07-28 10:38 ` [PATCH V2 1/32] mmc: add 'enable' and 'disable' methods to mmc host Adrian Hunter
2009-07-28 10:38 ` [PATCH V2 2/32] mmc: allow host claim / release nesting Adrian Hunter
2009-07-28 10:38 ` [PATCH V2 3/32] mmc: add MMC_CAP_NONREMOVABLE host capability Adrian Hunter
2009-07-28 10:39 ` [PATCH V2 4/32] mmc: add ability to save power by powering off cards Adrian Hunter
2009-07-30  1:05   ` Madhusudhan
2009-07-30  7:16     ` Adrian Hunter
2009-07-28 10:39 ` [PATCH V2 5/32] mmc: add mmc card sleep and awake support Adrian Hunter
2009-07-28 10:39 ` [PATCH V2 6/32] mmc: power off once at removal Adrian Hunter
2009-07-28 10:39 ` [PATCH V2 7/32] mmc: add host capabilities for SD only and MMC only Adrian Hunter
2009-07-28 10:39 ` [PATCH V2 8/32] mmc: check status after MMC SWITCH command Adrian Hunter
2009-07-28 10:39 ` [PATCH V2 9/32] omap_hsmmc: add debugfs entry (host registers) Adrian Hunter
2009-07-28 10:39 ` [PATCH V2 10/32] omap_hsmmc: make use of new enable/disable interface Adrian Hunter
2009-07-28 10:39 ` [PATCH V2 11/32] ARM: OMAP: mmc-twl4030: add context loss counter support Adrian Hunter
2009-07-28 10:40 ` [PATCH V2 12/32] omap_hsmmc: keep track of power mode Adrian Hunter
2009-07-28 10:40 ` [PATCH V2 13/32] omap_hsmmc: context save/restore support Adrian Hunter
2009-07-30  2:00   ` Madhusudhan
2009-07-30  7:40     ` Adrian Hunter
2009-07-30 19:12       ` Madhusudhan
2009-07-30 19:12         ` Madhusudhan
2009-07-30 19:33         ` Adrian Hunter
2009-07-28 10:40 ` [PATCH V2 14/32] omap_hsmmc: set open drain bit correctly Adrian Hunter
2009-07-28 10:40 ` [PATCH V2 15/32] omap_hsmmc: ensure workqueues are empty before suspend Adrian Hunter
2009-07-28 10:40 ` [PATCH V2 16/32] omap_hsmmc: fix scatter-gather list sanity checking Adrian Hunter
2009-07-28 10:40 ` [PATCH V2 17/32] omap_hsmmc: make use of new MMC_CAP_NONREMOVABLE host capability Adrian Hunter
2009-07-28 10:40 ` [PATCH V2 18/32] omap_hsmmc: support for deeper power saving states Adrian Hunter
2009-07-28 10:40 ` [PATCH V2 19/32] ARM: OMAP: mmc-twl4030: add regulator sleep / wake function Adrian Hunter
2009-07-28 10:41 ` [PATCH V2 20/32] omap_hsmmc: put MMC regulator to sleep Adrian Hunter
2009-07-28 10:41 ` [PATCH V2 21/32] omap_hsmmc: add mmc card sleep and awake support Adrian Hunter
2009-07-28 10:41 ` [PATCH V2 22/32] omap_hsmmc: fix NULL pointer dereference Adrian Hunter
2009-07-28 10:41 ` [PATCH V2 23/32] omap_hsmmc: cleanup macro usage Adrian Hunter
2009-07-28 10:41 ` [PATCH V2 24/32] omap_hsmmc: clear interrupt status after init sequence Adrian Hunter
2009-07-28 10:41 ` [PATCH V2 25/32] omap_hsmmc: cater for weird CMD6 behaviour Adrian Hunter
2009-07-28 10:41 ` [PATCH V2 26/32] omap_hsmmc: prevent races with irq handler Adrian Hunter
2009-07-28 10:41 ` [PATCH V2 27/32] omap_hsmmc: pass host capabilities for SD only and MMC only Adrian Hunter
2009-07-28 10:42 ` [PATCH V2 28/32] omap_hsmmc: code refactoring Adrian Hunter
2009-07-28 10:42 ` Adrian Hunter [this message]
2009-07-28 10:42 ` [PATCH V2 30/32] omap_hsmmc: ensure all clock enables and disables are paired Adrian Hunter
2009-07-28 10:42 ` [PATCH V2 31/32] omap_hsmmc: set a large data timeout for commands with busy signal Adrian Hunter
2009-07-28 10:42 ` [PATCH V2 32/32] ARM: OMAP: RX51: set MMC capabilities and power-saving flag Adrian Hunter
2009-07-29 11:13 ` [PATCH V2 0/32] mmc and omap_hsmmc patches Matt Fleming
2009-07-31  0:52   ` Madhusudhan
2009-08-13 15:27     ` Madhusudhan
2009-08-13 16:29       ` Andrew Morton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090728104208.2371.2569.sendpatchset@ahunter-laptop \
    --to=adrian.hunter@nokia.com \
    --cc=akpm@linux-foundation.org \
    --cc=ext-denis.2.karpov@nokia.com \
    --cc=jarkko.lavinen@nokia.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=matt@console-pimps.org \
    --cc=pierre@ossman.eu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.