Skip to contentSkip to conversation

Patch "mmc: bcm2835: Don't overwrite max frequency unconditionally" has been added to the 4.15-stable tree

PATCH [email protected] 1 participant 1 message Feb 20, 2018

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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

mmc: bcm2835: Don't overwrite max frequency unconditionally

to the 4.15-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-bcm2835-don-t-overwrite-max-frequency-unconditionally.patch
and it can be found in the queue-4.15 subdirectory.

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

Quoted 1 line

From 118032be389009b07ecb5a03ffe219a89d421def Mon Sep 17 00:00:00 2001

From: Phil Elwell <[email protected]>
Date: Mon, 12 Feb 2018 21:13:44 +0100
Subject: mmc: bcm2835: Don't overwrite max frequency unconditionally

From: Phil Elwell <[email protected]>

commit 118032be389009b07ecb5a03ffe219a89d421def upstream.

The optional DT parameter max-frequency could init the max bus frequency. So take care of this, before setting the max bus frequency.

Fixes 660fc733bd74 ("mmc: bcm2835: Add new driver for the sdhost controller.")
Cc <[email protected]> # 4.12+
---
 drivers/mmc/host/bcm2835.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/bcm2835.c +2 -1
@@ -1265,7 +1265,8 @@ static int bcm2835_add_host(struct bcm28
 	char pio_limit_string[20];
 	int ret;
 
-	mmc->f_max = host->max_clk;
+	if (!mmc->f_max || mmc->f_max > host->max_clk)
+		mmc->f_max = host->max_clk;
 	mmc->f_min = host->max_clk / SDCDIV_MAX_CDIV;
 
 	mmc->max_busy_timeout = ~0 / (mmc->f_max / 1000);

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

queue-4.15/mmc-bcm2835-don-t-overwrite-max-frequency-unconditionally.patch