Skip to contentSkip to conversation

Patch "clk: renesas: cpg-mssr: Stop using printk format %pCr" has been added to the 4.17-stable tree

PATCH gregkh at linuxfoundation.org 1 participant 1 message Jul 1, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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

clk: renesas: cpg-mssr: Stop using printk format %pCr

to the 4.17-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:
clk-renesas-cpg-mssr-stop-using-printk-format-pcr.patch
and it can be found in the queue-4.17 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 ef4b0be62641d296cf4c0ad8f75ab83ab066ed51 Mon Sep 17 00:00:00 2001

From: Geert Uytterhoeven <[email protected]>
Date: Fri, 1 Jun 2018 11:28:19 +0200
Subject: clk: renesas: cpg-mssr: Stop using printk format %pCr

From: Geert Uytterhoeven <[email protected]>

commit ef4b0be62641d296cf4c0ad8f75ab83ab066ed51 upstream.

Printk format "%pCr" will be removed soon, as clk_get_rate() must not be called in atomic context.

Replace it by open-coding the operation. This is safe here, as the code runs in task context.

To: Jia-Ju Bai <[email protected]>
To: Jonathan Corbet <[email protected]>
To: Michael Turquette <[email protected]>
To: Stephen Boyd <[email protected]>
To: Zhang Rui <[email protected]>
To: Eduardo Valentin <[email protected]>
To: Eric Anholt <[email protected]>
To: Stefan Wahren <[email protected]>
To: Greg Kroah-Hartman <[email protected]>

Cc Sergey Senozhatsky <[email protected]>
Cc Petr Mladek <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc linux-doc at vger.kernel.org
Cc linux-clk at vger.kernel.org
Cc linux-pm at vger.kernel.org
Cc linux-serial at vger.kernel.org
Cc linux-arm-kernel at lists.infradead.org
Cc linux-renesas-soc at vger.kernel.org
Cc linux-kernel at vger.kernel.org
Cc Geert Uytterhoeven <[email protected]>
Cc stable at vger.kernel.org # 4.5+
---
 drivers/clk/renesas/renesas-cpg-mssr.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/clk/renesas/renesas-cpg-mssr.c +5 -4
@@ -258,8 +258,9 @@ struct clk *cpg_mssr_clk_src_twocell_get
 		dev_err(dev, "Cannot get %s clock %u: %ld", type, clkidx,
 		       PTR_ERR(clk));
 	else
-		dev_dbg(dev, "clock (%u, %u) is %pC at %pCr Hz\n",
-			clkspec->args[0], clkspec->args[1], clk, clk);
+		dev_dbg(dev, "clock (%u, %u) is %pC at %lu Hz\n",
+			clkspec->args[0], clkspec->args[1], clk,
+			clk_get_rate(clk));
 	return clk;
 }
 
@@ -326,7 +327,7 @@ static void __init cpg_mssr_register_cor
 	if (IS_ERR_OR_NULL(clk))
 		goto fail;
 
-	dev_dbg(dev, "Core clock %pC at %pCr Hz\n", clk, clk);
+	dev_dbg(dev, "Core clock %pC at %lu Hz\n", clk, clk_get_rate(clk));
 	priv->clks[id] = clk;
 	return;
 
@@ -392,7 +393,7 @@ static void __init cpg_mssr_register_mod
 	if (IS_ERR(clk))
 		goto fail;
 
-	dev_dbg(dev, "Module clock %pC at %pCr Hz\n", clk, clk);
+	dev_dbg(dev, "Module clock %pC at %lu Hz\n", clk, clk_get_rate(clk));
 	priv->clks[id] = clk;
 	priv->smstpcr_saved[clock->index / 32].mask |= BIT(clock->index % 32);
 	return;

Patches currently in stable-queue which might be from geert+renesas at glider.be are

queue-4.17/lib-vsprintf-remove-atomic-unsafe-support-for-pcr.patch queue-4.17/thermal-bcm2835-stop-using-printk-format-pcr.patch queue-4.17/serial-sh-sci-use-spin_-try-lock_irqsave-instead-of-open-coding-version.patch queue-4.17/clk-renesas-cpg-mssr-stop-using-printk-format-pcr.patch