Patch "mmc: sdhci: Restore behavior while creating OCR mask" has been added to the 4.1-stable tree

This is a note to let you know that I've just added the patch titled

mmc: sdhci: Restore behavior while creating OCR mask

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mmc-sdhci-restore-behavior-while-creating-ocr-mask.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Ulf Hansson <[email protected]>
Date: Fri, 5 Jun 2015 11:40:08 +0200
Subject: mmc: sdhci: Restore behavior while creating OCR mask

From: Ulf Hansson <[email protected]>

commit 5fd26c7ecb32082745b0bd33c8e35badd1cb5a91 upstream.

Commit 3a48edc4bd68 ("mmc: sdhci: Use mmc core regulator infrastucture") changed the behavior for how to assign the ocr_avail mask for the mmc host. More precisely it started to mask the bits instead of assigning them.

Restore the behavior, but also make it clear that an OCR mask created from an external regulator overrides the other ones. The OCR mask is determined by one of the following with this priority:

1. Supported ranges of external regulator if one supplies VDD
2. Host OCR mask if set by the driver (based on DT properties)
3. The capabilities reported by the controller itself

---
 drivers/mmc/host/sdhci.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

@@ -3315,13 +3315,14 @@ int sdhci_add_host(struct sdhci_host *ho
 				   SDHCI_MAX_CURRENT_MULTIPLIER;
 	}
 
-	/* If OCR set by external regulators, use it instead */
+	/* If OCR set by host, use it instead. */
+	if (host->ocr_mask)
+		ocr_avail = host->ocr_mask;
+
+	/* If OCR set by external regulators, give it highest prio. */
 	if (mmc->ocr_avail)
 		ocr_avail = mmc->ocr_avail;
 
-	if (host->ocr_mask)
-		ocr_avail &= host->ocr_mask;
-
 	mmc->ocr_avail = ocr_avail;
 	mmc->ocr_avail_sdio = ocr_avail;
 	if (host->ocr_avail_sdio)

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/mmc-sdhci-restore-behavior-while-creating-ocr-mask.patch queue-4.1/mmc-block-add-missing-mmc_blk_put-in-power_ro_lock_show.patch queue-4.1/mmc-card-fixup-request-missing-in-mmc_blk_issue_rw_rq.patch