Skip to contentSkip to conversation

clk: divider: read before write for HIWORD mask

PATCH RESEND New Haojian Zhuang 2 participants 2 messages Dec 20, 2013 Common clk

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 clk: divider: read before write for HIWORD mask

When multiple dividers share one register, we need to read & mask register fist. Then we set the right value.

For example, there're two mmc clock dividers shared in one registers. The clock register is HIWORD type.

---
 drivers/clk/clk-divider.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/clk/clk-divider.c +4 -6
index 8d3009e..e1ea289 100644
@@ -227,12 +227,10 @@ static int clk_divider_set_rate(struct clk_hw *hw, unsigned long rate,
 	if (divider->lock)
 		spin_lock_irqsave(divider->lock, flags);
 
-	if (divider->flags & CLK_DIVIDER_HIWORD_MASK) {
-		val = div_mask(divider) << (divider->shift + 16);
-	} else {
-		val = clk_readl(divider->reg);
-		val &= ~(div_mask(divider) << divider->shift);
-	}
+	val = clk_readl(divider->reg);
+	val &= ~(div_mask(divider) << divider->shift);
+	if (divider->flags & CLK_DIVIDER_HIWORD_MASK)
+		val |= div_mask(divider) << (divider->shift + 16);
 	val |= value << divider->shift;
 	clk_writel(val, divider->reg);
 
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH RESEND 1/1 clk: divider: read before write for HIWORD mask

Am Freitag, 20. Dezember 2013, 04:50:17 schrieb Haojian Zhuang:

Quoted 5 lines

When multiple dividers share one register, we need to read & mask register fist. Then we set the right value.

For example, there're two mmc clock dividers shared in one registers. The clock register is HIWORD type.

Why do you need the read before write on hiword registers?

Say you have the two dividers on bits [15:8] and [7:0]. When you change the later one [7:0] you also set the bits [23:16] to enable the write to these lower bits - but also only to them.

With this setting the other bits of the register you didn't mark for writing won't be changed at all.

Heiko

Quoted 26 lines
---
 drivers/clk/clk-divider.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/clk/clk-divider.c +4 -6
index 8d3009e..e1ea289 100644
@@ -227,12 +227,10 @@ static int clk_divider_set_rate(struct clk_hw *hw,
 unsigned long rate, if (divider->lock)
 		spin_lock_irqsave(divider->lock, flags);
 
-	if (divider->flags & CLK_DIVIDER_HIWORD_MASK) {
-		val = div_mask(divider) << (divider->shift + 16);
-	} else {
-		val = clk_readl(divider->reg);
-		val &= ~(div_mask(divider) << divider->shift);
-	}
+	val = clk_readl(divider->reg);
+	val &= ~(div_mask(divider) << divider->shift);
+	if (divider->flags & CLK_DIVIDER_HIWORD_MASK)
+		val |= div_mask(divider) << (divider->shift + 16);
 	val |= value << divider->shift;
 	clk_writel(val, divider->reg);