clk: actions: Introduce dummy get/set_rate callbacks
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/6 clk: actions: Introduce dummy get/set_rate callbacks
Quoted 14 lines · Amit Singh Tomar
This commit introduces get/set_rate callbacks, these are dummy at the moment, and can be used to get/set clock for various devices based on the clk id.
Signed-off-by Amit Singh Tomar <[email protected]>--- drivers/clk/owl/clk_owl.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)drivers/clk/owl/clk_owl.c +0
-0
drivers/clk/owl/clk_owl.c int owl_clk_disable(struct clk *clk) · line 133
Quoted 6 lines
drivers/clk/owl/clk_owl.c +3
-0@@ -128,6 +128,32 @@ int owl_clk_disable(struct clk *clk)return 0 ; } +static ulong owl_clk_get_rate (struct clk *clk) +{ +struct owl_clk_priv *priv =dev_get_priv (clk->dev);
This is a bit premature and leads to compilation warnings.
drivers/clk/owl/clk_owl.c int owl_clk_disable(struct clk *clk) · line 146
Quoted 13 lines
drivers/clk/owl/clk_owl.c +13
-0+ulong rate; + +switch (clk->id) { +default : +return -ENOENT ; + } + +return rate; +} + +static ulong owl_clk_set_rate (struct clk *clk,ulong rate) +{ +struct owl_clk_priv *priv =dev_get_priv (clk->dev);
Same here.
Cheers,
Andre
Quoted 23 lines
drivers/clk/owl/clk_owl.c +12
-0+ulong new_rate; + +switch (clk->id) { +default : +return -ENOENT ; + } + +return new_rate; +} +static int owl_clk_probe (struct udevice *dev) {struct owl_clk_priv *priv =dev_get_priv (dev);@@ -145,6 +171,8 @@ static int owl_clk_probe(struct udevice *dev)static const struct clk_ops owl_clk_ops = { .enable = owl_clk_enable, .disable = owl_clk_disable, + .get_rate = owl_clk_get_rate, + .set_rate = owl_clk_set_rate, };static const struct udevice_id owl_clk_ids[] = {
PATCH 1/6 clk: actions: Introduce dummy get/set_rate callbacks
Hi,
Quoted 19 lines · Andr? Przywara
Quoted 17 lines · Amit Singh Tomar
This commit introduces get/set_rate callbacks, these are dummy at the moment, and can be used to get/set clock for various devices based on the clk id.
Signed-off-by Amit Singh Tomar <[email protected]>--- drivers/clk/owl/clk_owl.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)drivers/clk/owl/clk_owl.c +0
-0@@ -128,6 +128,32 @@ int owl_clk_disable(struct clk *clk)return 0 ; }
Quoted 5 lines
drivers/clk/owl/clk_owl.c int owl_clk_disable(struct clk *clk) · line 133
Quoted 3 lines
drivers/clk/owl/clk_owl.c +3
-0+static ulong owl_clk_get_rate (struct clk *clk) +{ +struct owl_clk_priv *priv =dev_get_priv (clk->dev);This is a bit premature and leads to compilation warnings.
Sorry, I should have compile-tested the individual commit as well. I Would fix it in the next version.
Thanks
-Amit
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/6 clk: actions: Add SD/MMC clocks
On 13/12/2020 09:44, Amit Singh Tomar wrote:
Hi,
Quoted 37 lines
This commit adds SD/MMC clocks, and provides .set/get_rate callbacks for SD/MMC device present on Actions OWL S700 SoCs.
Signed-off-by Amit Singh Tomar <[email protected]>--- drivers/clk/owl/clk_owl.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/clk/owl/clk_owl.h | 2 ++ 2 files changed, 68 insertions(+)drivers/clk/owl/clk_owl.c +6
-0@@ -92,6 +92,9 @@ int owl_clk_enable(struct clk *clk)setbits_le32 (priv->base +CMU_DEVCLKEN1 ,CMU_DEVCLKEN1_ETH );setbits_le32 (priv->base +CMU_ETHERNETPLL ,5 );break ; +case CLK_SD0 : +setbits_le32 (priv->base +CMU_DEVCLKEN0 ,CMU_DEVCLKEN0_SD0 ); +break ;default :return -EINVAL ; }@@ -121,6 +124,9 @@ int owl_clk_disable(struct clk *clk)case CLK_ETHERNET :clrbits_le32 (priv->base +CMU_DEVCLKEN1 ,CMU_DEVCLKEN1_ETH );break ; +case CLK_SD0 : +clrbits_le32 (priv->base +CMU_DEVCLKEN0 ,CMU_DEVCLKEN0_SD0 ); +break ;default :return -EINVAL ; }@@ -128,12 +134,69 @@ int owl_clk_disable(struct clk *clk)return 0 ; }
drivers/clk/owl/clk_owl.c int owl_clk_disable(struct clk *clk) · line 146
Quoted 10 lines
drivers/clk/owl/clk_owl.c +10
-0+static ulong owl_get_sd_clk_rate (struct owl_clk_priv *priv,int sd_index) +{ +ulong parent_rate; +uint div =1 ; + +/* Clock output of DEV_PLL +* Range: 48M ~ 756M +* Frequency= DEVPLLCLK * 6 +*/ + parent_rate =readl (priv->base +CMU_DEVPLL ) &0x7f ;
According to the datasheet the clock source could also be NAND_PLL, depending on bit 9.
Both PLLs use the same rate calculation, so it's just matter of the PLL address offset to use for covering both.
drivers/clk/owl/clk_owl.c int owl_clk_disable(struct clk *clk) · line 158
Quoted 12 lines
drivers/clk/owl/clk_owl.c +12
-0+ parent_rate *=6000000 ; + + div +=readl (priv->base + (CMU_SD0CLK + sd_index*0x4 )) &0x1f ; + +return (parent_rate / div); +} + +static ulong owl_set_sd_clk_rate (struct owl_clk_priv *priv,ulong rate, +int sd_index) +{ +ulong parent_rate; +uint div =1 , val;
Unneeded initialisation, you overwrite this below.
drivers/clk/owl/clk_owl.c int owl_clk_disable(struct clk *clk) · line 167
Quoted 9 lines
drivers/clk/owl/clk_owl.c +9
-0+ +/* Clock output of DEV_PLL +* Range: 48M ~ 756M +* Frequency= DEVPLLCLK * 6 +*/ + parent_rate =readl (priv->base +CMU_DEVPLL ) &0x7f ; + parent_rate *=6000000 ; + + rate *=2 ;
Where does this come from?
drivers/clk/owl/clk_owl.c int owl_clk_disable(struct clk *clk) · line 168
Quoted 1 line
drivers/clk/owl/clk_owl.c +1
-0+ div = (parent_rate / rate) -1 ;
Please check rate being not zero before you dividing by it. And I would keep the real divider value for now, so drop the -1 here.
drivers/clk/owl/clk_owl.c int owl_clk_disable(struct clk *clk) · line 171
Quoted 3 lines
drivers/clk/owl/clk_owl.c +3
-0+ +if (div >=128 ) + div |=0x100 ;
This does not seem right. You would need to divide the value by 128, once you decided to use the "divide-by-128" bit (which is bit 8). What about moving this below, after you know the register value? Then you can divide by 128 and set bit 8.
drivers/clk/owl/clk_owl.c int owl_clk_disable(struct clk *clk) · line 176
Quoted 5 lines
drivers/clk/owl/clk_owl.c +5
-0+ + val =readl (priv->base + (CMU_SD0CLK + sd_index*0x4 )); +/* Bits 4..0 is used to program div value */ + val &= ~0x1f ; + val |= div;
Please mask div before applying.
drivers/clk/owl/clk_owl.c int owl_clk_disable(struct clk *clk) · line 180
Quoted 4 lines
drivers/clk/owl/clk_owl.c +4
-0+/* As per Manuals Bits 31..10 are reserved but Bits 11 and +* 10 needed to be set for proper operation +*/ + val |=0xc00 ;
Where does this come from? I don't see the Linux driver doing that?
drivers/clk/owl/clk_owl.c int owl_clk_disable(struct clk *clk) · line 181
Quoted 1 line
drivers/clk/owl/clk_owl.c +1
-0+/* Bit 9 and 8 must be cleared */
Bit 9 is the parent clock selection, which you hard code to DEV_CLK. Bit 8 is the divide-by-128 bit.
Please split those two up and explain it in a comment, maybe.
Cheers,
Andre
Quoted 43 lines
drivers/clk/owl/clk_owl.c +15
-0+if (div <128 ) + val &= ~0x300 ; +else + val &= ~0x200 ; +writel (val, priv->base + (CMU_SD0CLK + sd_index*0x4 )); + +return owl_get_sd_clk_rate (priv,0 ); +} +static ulong owl_clk_get_rate (struct clk *clk) {struct owl_clk_priv *priv =dev_get_priv (clk->dev);ulong rate;switch (clk->id) { +case CLK_SD0 : + rate =owl_get_sd_clk_rate (priv,0 ); +break ;default :return -ENOENT ; }@@ -147,6 +210,9 @@ static ulong owl_clk_set_rate(struct clk *clk, ulong rate)ulong new_rate;switch (clk->id) { +case CLK_SD0 : + new_rate =owl_set_sd_clk_rate (priv, rate,0 ); +break ;default :return -ENOENT ; }drivers/clk/owl/clk_owl.h +2
-0@@ -62,4 +62,6 @@ struct owl_clk_priv {#define CMU_DEVCLKEN1_UART5 BIT(21)#define CMU_DEVCLKEN1_UART3 BIT(11) +#define CMU_DEVCLKEN0_SD0 BIT(22) +#endif
PATCH 2/6 clk: actions: Add SD/MMC clocks
Hi,
Thanks for having the detailed look and providing comments:
Quoted 4 lines
According to the datasheet the clock source could also be
NAND_PLL, depending on bit 9.
Both PLLs use the same rate calculation, so it's just matter of the PLL address offset to use for covering both.
Ok, should I change the comment as Clock output of DEV/NAND_PLL ?
Quoted 11 lines
Review
Quoted 9 lines
(quoted diff) +9
-0+ + /* Clock output of DEV_PLL + * Range: 48M ~ 756M + * Frequency= DEVPLLCLK * 6 + */ + parent_rate = readl(priv->base + CMU_DEVPLL) & 0x7f; + parent_rate *= 6000000; + + rate *= 2;Where does this come from?
While experimenting about it, I found that doubling input rate doubles the speed , and BSP code does the same.
Not sure if it is a good enough explanation or maybe its side effect of not programming divider value well when its >=128. Would check it again.
Quoted 4 lines
Quoted 1 line
+ div = (
parent_rate/ rate) - 1;Please check rate being not zero before you dividing by it. And I would keep the real divider value for now, so drop the -1 here.
Ok. I would make the check.
Quoted 8 lines
Review
Quoted 3 lines
(quoted diff) +3
-0+ + if (div >= 128) + div |= 0x100;This does not seem right. You would need to divide the value by 128, once you decided to use the "divide-by-128" bit (which is bit 8). What about moving this below, after you know the register value? Then you can divide by 128 and set bit 8.
Sure, Thanks for explaining it in detail. It helped understanding ACTIONS not so usual
clock design.
Quoted 6 lines
Review
Quoted 4 lines
(quoted diff) +4
-0+ val = readl(priv->base + (CMU_SD0CLK + sd_index*0x4)); + /* Bits 4..0 is used to program div value */ + val &= ~0x1f; + val |= div;Please mask div before applying.
But I am masking the first 4.0 bit above , ~0x1f;
Quoted 6 lines
Review
Quoted 4 lines
(quoted diff) +4
-0+ /* As per Manuals Bits 31..10 are reserved but Bits 11 and + * 10 needed to be set for proper operation + */ + val |= 0xc00;Where does this come from? I don't see the Linux driver doing that?
Actually if I don't set 11th and 10th bit , I see SD speed of 2KiB/s and unstable behaviour
while loading files from the card.
BSP U-boot driver chooses a value 0xfffffce0 for it.
Thanks
Amit
PATCH 2/6 clk: actions: Add SD/MMC clocks
Quoted 10 lines · Amit Tomer
Hi,
Thanks for having the detailed look and providing comments:
Quoted 4 lines
According to the datasheet the clock source could also be
NAND_PLL, depending on bit 9.
Both PLLs use the same rate calculation, so it's just matter of the PLL address offset to use for covering both.Ok, should I change the comment as Clock output of DEV/NAND_PLL ?
I meant you should read the parent rate either from the NAND or the DEV PLL, depending on this bit.
Since you force the parent to be DEV that's not strictly needed for this current use case, but it's much cleaner to do so in the *clock* driver, and as I said, is not hard to do.
Quoted 13 lines
Quoted 12 lines
Review
Quoted 10 lines
(quoted diff) +9
-0+ + /* Clock output of DEV_PLL + * Range: 48M ~ 756M + * Frequency= DEVPLLCLK * 6 + */ + parent_rate = readl(priv->base + CMU_DEVPLL) & 0x7f; + parent_rate *= 6000000; + + rate *= 2;Where does this come from?
Quoted 2 lines
While experimenting about it, I found that doubling input rate doubles the speed , and BSP code does the same.
Sure doubling the input frequency improves the performance, but is also wrong. If the card can do twice as much *reliably*, then it would advertise more advanced speed modes, and we could use them. Otherwise it's just overclocking.
You should check what the card reports (SDR50?), then check which clock value you set, and what the performance is (for reading a bigger number of sectors). If that matches up (SDR50 => 50 MHz => ~25MB/s), then it's correct. Everything else should be investigated.
Quoted 2 lines
Not sure if it is a good enough explanation or maybe its side effect of not programming divider value well when its >=128. Would check it again.
This explanation sounds very dodgy. There might be a hidden divider somewhere, but this should be discoverable by the test I described above. And since the "divide-by-128" is only needed for the initial 400KHz communication, I don't think it's related here.
Quoted 21 lines
Quoted 5 lines
Quoted 2 lines
+ div = (
parent_rate/ rate) - 1;Please check rate being not zero before you dividing by it. And I would keep the real divider value for now, so drop the -1 here.
Ok. I would make the check.
Quoted 8 lines
Review
Quoted 3 lines
(quoted diff) +3
-0+ + if (div >= 128) + div |= 0x100;This does not seem right. You would need to divide the value by 128, once you decided to use the "divide-by-128" bit (which is bit 8). What about moving this below, after you know the register value? Then you can divide by 128 and set bit 8.
Sure, Thanks for explaining it in detail. It helped understanding ACTIONS not so usual
clock design.
Quoted 8 lines
Quoted 6 lines
Review
Quoted 4 lines
(quoted diff) +4
-0+ val = readl(priv->base + (CMU_SD0CLK + sd_index*0x4)); + /* Bits 4..0 is used to program div value */ + val &= ~0x1f; + val |= div;Please mask div before applying.
But I am masking the first 4.0 bit above , ~0x1f;
No, you are masking val, not div. If div is bigger than 31, you set other bits in this register.
Quoted 11 lines
Quoted 6 lines
Review
Quoted 4 lines
(quoted diff) +4
-0+ /* As per Manuals Bits 31..10 are reserved but Bits 11 and + * 10 needed to be set for proper operation + */ + val |= 0xc00;Where does this come from? I don't see the Linux driver doing that?
Actually if I don't set 11th and 10th bit , I see SD speed of 2KiB/s and unstable behaviour
while loading files from the card.
BSP U-boot driver chooses a value0xfffffce0for it.
I wouldn't rely on downstream BSP U-Boot for *anything*.
I guess you see normal speed in (almost) mainline Linux? Check what we do with the clock register there (can dump it once the driver has initialised).
I would rather mimic the mainline kernel here than anything else.
Cheers,
Andre
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 4/6 ARM: dts: s700: add MMC/SD controller node
Quoted 5 lines · Amit Singh Tomar
This patch adds node for ethernet controller found on Action Semi OWL S700 SoC.
Since, upstream Linux binding has not been merged for S700 MMC/SD controller, Changes are put in u-boot specific dtsi file.
So what's the mainline state of this? If it's going to be merged into 5.11-rc1, we can surely wait for the two weeks.
Cheers,
Andre
Quoted 28 lines
Signed-off-by Amit Singh Tomar <[email protected]>--- arch/arm/dts/s700-u-boot.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+)arch/arm/dts/s700-u-boot.dtsi +10
-0@@ -19,6 +19,16 @@ status = "okay"; }; + mmc0: mmc at e0210000 { + compatible = "actions,s700-mmc", "actions,owl-mmc"; + reg = <0x0 0xe0210000 0x0 0x4000>; + interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cmu CLK_SD0>; + dmas = <&dma 2>; + dma-names = "mmc"; + bus-width = <4>; + status = "okay"; + }; }; };