* [PATCH 1/4] ARC: [plat-hsdk]: Set initial core pll output frequency
2017-12-09 13:59 [PATCH 0/4] ARC: Set initial core pll output frequency via DTS Eugeniy Paltsev
@ 2017-12-09 13:59 ` Eugeniy Paltsev
2017-12-09 13:59 ` [PATCH 2/4] ARC: [plat-hsdk]: Get rid of core pll frequency set in platform code Eugeniy Paltsev
` (4 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Eugeniy Paltsev @ 2017-12-09 13:59 UTC (permalink / raw)
To: linux-snps-arc
Set initial core pll output frequency specified in device tree to
1GHz. It will be applied at the core pll driver probing.
Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev at synopsys.com>
---
arch/arc/boot/dts/hsdk.dts | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arc/boot/dts/hsdk.dts b/arch/arc/boot/dts/hsdk.dts
index 8f627c2..006aa3d 100644
--- a/arch/arc/boot/dts/hsdk.dts
+++ b/arch/arc/boot/dts/hsdk.dts
@@ -114,6 +114,14 @@
reg = <0x00 0x10>, <0x14B8 0x4>;
#clock-cells = <0>;
clocks = <&input_clk>;
+
+ /*
+ * Set initial core pll output frequency to 1GHz.
+ * It will be applied at the core pll driver probing
+ * on early boot.
+ */
+ assigned-clocks = <&core_clk>;
+ assigned-clock-rates = <1000000000>;
};
serial: serial at 5000 {
--
2.9.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/4] ARC: [plat-hsdk]: Get rid of core pll frequency set in platform code
2017-12-09 13:59 [PATCH 0/4] ARC: Set initial core pll output frequency via DTS Eugeniy Paltsev
2017-12-09 13:59 ` [PATCH 1/4] ARC: [plat-hsdk]: Set initial core pll output frequency Eugeniy Paltsev
@ 2017-12-09 13:59 ` Eugeniy Paltsev
2017-12-09 13:59 ` [PATCH 3/4] ARC: [plat-axs103]: Set initial core pll output frequency Eugeniy Paltsev
` (3 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Eugeniy Paltsev @ 2017-12-09 13:59 UTC (permalink / raw)
To: linux-snps-arc
Get rid of core pll frequency set in platform code as we set it via
device tree using 'assigned-clock-rates' property.
Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev at synopsys.com>
---
arch/arc/plat-hsdk/platform.c | 42 ------------------------------------------
1 file changed, 42 deletions(-)
diff --git a/arch/arc/plat-hsdk/platform.c b/arch/arc/plat-hsdk/platform.c
index fd0ae5e..2958aed 100644
--- a/arch/arc/plat-hsdk/platform.c
+++ b/arch/arc/plat-hsdk/platform.c
@@ -38,42 +38,6 @@ static void __init hsdk_init_per_cpu(unsigned int cpu)
#define CREG_PAE (CREG_BASE + 0x180)
#define CREG_PAE_UPDATE (CREG_BASE + 0x194)
-#define CREG_CORE_IF_CLK_DIV (CREG_BASE + 0x4B8)
-#define CREG_CORE_IF_CLK_DIV_2 0x1
-#define CGU_BASE ARC_PERIPHERAL_BASE
-#define CGU_PLL_STATUS (ARC_PERIPHERAL_BASE + 0x4)
-#define CGU_PLL_CTRL (ARC_PERIPHERAL_BASE + 0x0)
-#define CGU_PLL_STATUS_LOCK BIT(0)
-#define CGU_PLL_STATUS_ERR BIT(1)
-#define CGU_PLL_CTRL_1GHZ 0x3A10
-#define HSDK_PLL_LOCK_TIMEOUT 500
-
-#define HSDK_PLL_LOCKED() \
- !!(ioread32((void __iomem *) CGU_PLL_STATUS) & CGU_PLL_STATUS_LOCK)
-
-#define HSDK_PLL_ERR() \
- !!(ioread32((void __iomem *) CGU_PLL_STATUS) & CGU_PLL_STATUS_ERR)
-
-static void __init hsdk_set_cpu_freq_1ghz(void)
-{
- u32 timeout = HSDK_PLL_LOCK_TIMEOUT;
-
- /*
- * As we set cpu clock which exceeds 500MHz, the divider for the interface
- * clock must be programmed to div-by-2.
- */
- iowrite32(CREG_CORE_IF_CLK_DIV_2, (void __iomem *) CREG_CORE_IF_CLK_DIV);
-
- /* Set cpu clock to 1GHz */
- iowrite32(CGU_PLL_CTRL_1GHZ, (void __iomem *) CGU_PLL_CTRL);
-
- while (!HSDK_PLL_LOCKED() && timeout--)
- cpu_relax();
-
- if (!HSDK_PLL_LOCKED() || HSDK_PLL_ERR())
- pr_err("Failed to setup CPU frequency to 1GHz!");
-}
-
#define SDIO_BASE (ARC_PERIPHERAL_BASE + 0xA000)
#define SDIO_UHS_REG_EXT (SDIO_BASE + 0x108)
#define SDIO_UHS_REG_EXT_DIV_2 (2 << 30)
@@ -98,12 +62,6 @@ static void __init hsdk_init_early(void)
* minimum possible div-by-2.
*/
iowrite32(SDIO_UHS_REG_EXT_DIV_2, (void __iomem *) SDIO_UHS_REG_EXT);
-
- /*
- * Setup CPU frequency to 1GHz.
- * TODO: remove it after smart hsdk pll driver will be introduced.
- */
- hsdk_set_cpu_freq_1ghz();
}
static const char *hsdk_compat[] __initconst = {
--
2.9.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/4] ARC: [plat-axs103]: Set initial core pll output frequency
2017-12-09 13:59 [PATCH 0/4] ARC: Set initial core pll output frequency via DTS Eugeniy Paltsev
2017-12-09 13:59 ` [PATCH 1/4] ARC: [plat-hsdk]: Set initial core pll output frequency Eugeniy Paltsev
2017-12-09 13:59 ` [PATCH 2/4] ARC: [plat-hsdk]: Get rid of core pll frequency set in platform code Eugeniy Paltsev
@ 2017-12-09 13:59 ` Eugeniy Paltsev
2017-12-09 13:59 ` [PATCH 4/4] ARC: [plat-axs103] refactor the quad core DT quirk code Eugeniy Paltsev
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Eugeniy Paltsev @ 2017-12-09 13:59 UTC (permalink / raw)
To: linux-snps-arc
Set initial core pll output frequency specified in device tree to
100MHz for SMP configuration and 90MHz for UP configuration.
It will be applied at the core pll driver probing.
Update platform quirk for decreasing core frequency for quad core
configuration.
Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev at synopsys.com>
---
arch/arc/boot/dts/axc003.dtsi | 8 ++++++++
arch/arc/boot/dts/axc003_idu.dtsi | 8 ++++++++
arch/arc/plat-axs10x/axs10x.c | 8 ++------
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/arch/arc/boot/dts/axc003.dtsi b/arch/arc/boot/dts/axc003.dtsi
index 4e6e9f5..dc91c66 100644
--- a/arch/arc/boot/dts/axc003.dtsi
+++ b/arch/arc/boot/dts/axc003.dtsi
@@ -35,6 +35,14 @@
reg = <0x80 0x10>, <0x100 0x10>;
#clock-cells = <0>;
clocks = <&input_clk>;
+
+ /*
+ * Set initial core pll output frequency to 90MHz.
+ * It will be applied at the core pll driver probing
+ * on early boot.
+ */
+ assigned-clocks = <&core_clk>;
+ assigned-clock-rates = <90000000>;
};
core_intc: archs-intc at cpu {
diff --git a/arch/arc/boot/dts/axc003_idu.dtsi b/arch/arc/boot/dts/axc003_idu.dtsi
index 63954a8..69ff4895 100644
--- a/arch/arc/boot/dts/axc003_idu.dtsi
+++ b/arch/arc/boot/dts/axc003_idu.dtsi
@@ -35,6 +35,14 @@
reg = <0x80 0x10>, <0x100 0x10>;
#clock-cells = <0>;
clocks = <&input_clk>;
+
+ /*
+ * Set initial core pll output frequency to 100MHz.
+ * It will be applied at the core pll driver probing
+ * on early boot.
+ */
+ assigned-clocks = <&core_clk>;
+ assigned-clock-rates = <100000000>;
};
core_intc: archs-intc at cpu {
diff --git a/arch/arc/plat-axs10x/axs10x.c b/arch/arc/plat-axs10x/axs10x.c
index cf14ebc..28b3cb2 100644
--- a/arch/arc/plat-axs10x/axs10x.c
+++ b/arch/arc/plat-axs10x/axs10x.c
@@ -327,22 +327,18 @@ static void __init axs103_early_init(void)
unsigned int num_cores = (read_aux_reg(ARC_REG_MCIP_BCR) >> 16) & 0x3F;
if (num_cores > 2) {
u32 freq = 50, orig;
- /*
- * TODO: use cpu node "cpu-freq" param instead of platform-specific
- * "/cpu_card/core_clk" as it works only if we use fixed-clock for cpu.
- */
int off = fdt_path_offset(initial_boot_params, "/cpu_card/core_clk");
const struct fdt_property *prop;
prop = fdt_get_property(initial_boot_params, off,
- "clock-frequency", NULL);
+ "assigned-clock-rates", NULL);
orig = be32_to_cpu(*(u32*)(prop->data)) / 1000000;
/* Patching .dtb in-place with new core clock value */
if (freq != orig ) {
freq = cpu_to_be32(freq * 1000000);
fdt_setprop_inplace(initial_boot_params, off,
- "clock-frequency", &freq, sizeof(freq));
+ "assigned-clock-rates", &freq, sizeof(freq));
}
}
#endif
--
2.9.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/4] ARC: [plat-axs103] refactor the quad core DT quirk code
2017-12-09 13:59 [PATCH 0/4] ARC: Set initial core pll output frequency via DTS Eugeniy Paltsev
` (2 preceding siblings ...)
2017-12-09 13:59 ` [PATCH 3/4] ARC: [plat-axs103]: Set initial core pll output frequency Eugeniy Paltsev
@ 2017-12-09 13:59 ` Eugeniy Paltsev
2017-12-15 21:46 ` [PATCH 0/4] ARC: Set initial core pll output frequency via DTS Vineet Gupta
2017-12-19 19:11 ` Stephen Boyd
5 siblings, 0 replies; 9+ messages in thread
From: Eugeniy Paltsev @ 2017-12-09 13:59 UTC (permalink / raw)
To: linux-snps-arc
Refactor the quad core DT quirk code:
get rid of waste division and multiplication by 1000000 constant.
Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev at synopsys.com>
---
arch/arc/plat-axs10x/axs10x.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/arc/plat-axs10x/axs10x.c b/arch/arc/plat-axs10x/axs10x.c
index 28b3cb2..0ea2f86 100644
--- a/arch/arc/plat-axs10x/axs10x.c
+++ b/arch/arc/plat-axs10x/axs10x.c
@@ -324,19 +324,21 @@ static void __init axs103_early_init(void)
* Instead of duplicating defconfig/DT for SMP/QUAD, add a small hack
* of fudging the freq in DT
*/
+#define AXS103_QUAD_CORE_CPU_FREQ_HZ 50000000
+
unsigned int num_cores = (read_aux_reg(ARC_REG_MCIP_BCR) >> 16) & 0x3F;
if (num_cores > 2) {
- u32 freq = 50, orig;
+ u32 freq;
int off = fdt_path_offset(initial_boot_params, "/cpu_card/core_clk");
const struct fdt_property *prop;
prop = fdt_get_property(initial_boot_params, off,
"assigned-clock-rates", NULL);
- orig = be32_to_cpu(*(u32*)(prop->data)) / 1000000;
+ freq = be32_to_cpu(*(u32 *)(prop->data));
/* Patching .dtb in-place with new core clock value */
- if (freq != orig ) {
- freq = cpu_to_be32(freq * 1000000);
+ if (freq != AXS103_QUAD_CORE_CPU_FREQ_HZ) {
+ freq = cpu_to_be32(AXS103_QUAD_CORE_CPU_FREQ_HZ);
fdt_setprop_inplace(initial_boot_params, off,
"assigned-clock-rates", &freq, sizeof(freq));
}
--
2.9.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 0/4] ARC: Set initial core pll output frequency via DTS
2017-12-09 13:59 [PATCH 0/4] ARC: Set initial core pll output frequency via DTS Eugeniy Paltsev
` (3 preceding siblings ...)
2017-12-09 13:59 ` [PATCH 4/4] ARC: [plat-axs103] refactor the quad core DT quirk code Eugeniy Paltsev
@ 2017-12-15 21:46 ` Vineet Gupta
2017-12-19 19:11 ` Stephen Boyd
5 siblings, 0 replies; 9+ messages in thread
From: Vineet Gupta @ 2017-12-15 21:46 UTC (permalink / raw)
To: linux-snps-arc
On 12/09/2017 05:59 AM, Eugeniy Paltsev wrote:
> Set initial core pll output frequency on HSDK and AXS103 via
> "assigned-clock-rates" property in device tree.
> It will be applied at the core pll driver probing.
>
> Eugeniy Paltsev (4):
> ARC: [plat-hsdk]: Set initial core pll output frequency
> ARC: [plat-hsdk]: Get rid of core pll frequency set in platform code
> ARC: [plat-axs103]: Set initial core pll output frequency
> ARC: [plat-axs103] refactor the quad core DT quirk code
>
> arch/arc/boot/dts/axc003.dtsi | 3 +++
> arch/arc/boot/dts/axc003_idu.dtsi | 3 +++
> arch/arc/boot/dts/hsdk.dts | 3 +++
> arch/arc/plat-axs10x/axs10x.c | 18 ++++++++---------
> arch/arc/plat-hsdk/platform.c | 42 ---------------------------------------
> 5 files changed, 17 insertions(+), 52 deletions(-)
>
Alexey can you give this a quick spin on either boards and confirm if the DT
changes are indeed what they were before ?
Thx,
-Vineet
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 0/4] ARC: Set initial core pll output frequency via DTS
2017-12-09 13:59 [PATCH 0/4] ARC: Set initial core pll output frequency via DTS Eugeniy Paltsev
` (4 preceding siblings ...)
2017-12-15 21:46 ` [PATCH 0/4] ARC: Set initial core pll output frequency via DTS Vineet Gupta
@ 2017-12-19 19:11 ` Stephen Boyd
5 siblings, 0 replies; 9+ messages in thread
From: Stephen Boyd @ 2017-12-19 19:11 UTC (permalink / raw)
To: linux-snps-arc
On 12/09, Eugeniy Paltsev wrote:
> Set initial core pll output frequency on HSDK and AXS103 via
> "assigned-clock-rates" property in device tree.
> It will be applied at the core pll driver probing.
>
> Eugeniy Paltsev (4):
> ARC: [plat-hsdk]: Set initial core pll output frequency
> ARC: [plat-hsdk]: Get rid of core pll frequency set in platform code
> ARC: [plat-axs103]: Set initial core pll output frequency
> ARC: [plat-axs103] refactor the quad core DT quirk code
>
Patches look good to me.
Acked-by: Stephen Boyd <sboyd at codeaurora.org>
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 9+ messages in thread