In order to avoid Linux from gating clocks that are used by
another OS running at the same time (eg. RTOS), we are adding
the "CLK_IGNORE_UNUSED" flag to the concerned clocks.
As for now, list of clocks to be flagged have been completed
depending of features that are supported by Renesas SoCs/boards
port in Zephyr RTOS.
Signed-off-by: Aymeric Aillet <aymeric.aillet@xxxxxxx>
---
drivers/clk/renesas/r8a7795-cpg-mssr.c | 16 ++++++++++++++++
drivers/clk/renesas/r8a779f0-cpg-mssr.c | 10 ++++++++++
drivers/clk/renesas/renesas-cpg-mssr.c | 9 +++++++++
drivers/clk/renesas/renesas-cpg-mssr.h | 4 ++++
4 files changed, 39 insertions(+)
diff --git a/drivers/clk/renesas/r8a7795-cpg-mssr.c b/drivers/clk/renesas/r8a7795-cpg-mssr.c
index ad20b3301ef6..82465354b100 100644
--- a/drivers/clk/renesas/r8a7795-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7795-cpg-mssr.c
@@ -288,6 +288,18 @@ static struct mssr_mod_clk r8a7795_mod_clks[] __initdata = {
DEF_MOD("scu-src0", 1031, MOD_CLK_ID(1017)),
};
+static const unsigned int r8a7795_ignore_unused_mod_clks[] __initconst = {
+ MOD_CLK_ID(206), /* SCIF1 */
+ MOD_CLK_ID(303), /* CMT0 */
+ MOD_CLK_ID(310), /* SCIF2 */
+ MOD_CLK_ID(523), /* PWM */
+ MOD_CLK_ID(906), /* GPIO6 */
+ MOD_CLK_ID(907), /* GPIO5 */
+ MOD_CLK_ID(916), /* CAN0 */
+ MOD_CLK_ID(929), /* I2C2 */
+ MOD_CLK_ID(927), /* I2C4 */
+};
+
static const unsigned int r8a7795_crit_mod_clks[] __initconst = {
MOD_CLK_ID(402), /* RWDT */
MOD_CLK_ID(408), /* INTC-AP (GIC) */
@@ -388,6 +400,10 @@ const struct cpg_mssr_info r8a7795_cpg_mssr_info __initconst = {
.num_mod_clks = ARRAY_SIZE(r8a7795_mod_clks),
.num_hw_mod_clks = 12 * 32,
+ /* Ignore Unused Module Clocks */
+ .ignore_unused_mod_clks = r8a7795_ignore_unused_mod_clks,
+ .num_ignore_unused_mod_clks = ARRAY_SIZE(r8a7795_ignore_unused_mod_clks),
+
/* Critical Module Clocks */
.crit_mod_clks = r8a7795_crit_mod_clks,
.num_crit_mod_clks = ARRAY_SIZE(r8a7795_crit_mod_clks),
diff --git a/drivers/clk/renesas/r8a779f0-cpg-mssr.c b/drivers/clk/renesas/r8a779f0-cpg-mssr.c
index f721835c7e21..ceae94c1c7dc 100644
--- a/drivers/clk/renesas/r8a779f0-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a779f0-cpg-mssr.c
@@ -168,6 +168,12 @@ static const struct mssr_mod_clk r8a779f0_mod_clks[] __initconst = {
DEF_MOD("ufs", 1514, R8A779F0_CLK_S0D4_HSC),
};
+static const unsigned int r8a779f0_ignore_unused_mod_clks[] __initconst = {
+ MOD_CLK_ID(702), /* SCIF0 */
+ MOD_CLK_ID(704), /* SCIF3 */
+ MOD_CLK_ID(915), /* PFC0 */
+};
+
static const unsigned int r8a779f0_crit_mod_clks[] __initconst = {
MOD_CLK_ID(907), /* WDT */
};
@@ -226,6 +232,10 @@ const struct cpg_mssr_info r8a779f0_cpg_mssr_info __initconst = {
.num_mod_clks = ARRAY_SIZE(r8a779f0_mod_clks),
.num_hw_mod_clks = 28 * 32,
+ /* Ignore Unused Module Clocks */
+ .ignore_unused_mod_clks = r8a779f0_ignore_unused_mod_clks,
+ .num_ignore_unused_mod_clks = ARRAY_SIZE(r8a779f0_ignore_unused_mod_clks),
+
/* Critical Module Clocks */
.crit_mod_clks = r8a779f0_crit_mod_clks,
.num_crit_mod_clks = ARRAY_SIZE(r8a779f0_crit_mod_clks),
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.c b/drivers/clk/renesas/renesas-cpg-mssr.c
index cb80d1bf6c7c..8e08a13e6904 100644
--- a/drivers/clk/renesas/renesas-cpg-mssr.c
+++ b/drivers/clk/renesas/renesas-cpg-mssr.c
@@ -444,6 +444,15 @@ static void __init cpg_mssr_register_mod_clk(const struct mssr_mod_clk *mod,
clock->priv = priv;
clock->hw.init = &init;
+ for (i = 0; i < info->num_ignore_unused_mod_clks; i++) {
+ if (id == info->ignore_unused_mod_clks[i]) {
+ dev_dbg(dev, "MSTP %s setting CLK_IGNORE_UNUSED\n",
+ mod->name);
+ init.flags |= CLK_IGNORE_UNUSED;
+ break;
+ }
+ }
+
for (i = 0; i < info->num_crit_mod_clks; i++)
if (id == info->crit_mod_clks[i] &&
cpg_mstp_clock_is_enabled(&clock->hw)) {
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.h b/drivers/clk/renesas/renesas-cpg-mssr.h
index 80c5b462924a..da5e999c23b0 100644
--- a/drivers/clk/renesas/renesas-cpg-mssr.h
+++ b/drivers/clk/renesas/renesas-cpg-mssr.h
@@ -140,6 +140,10 @@ struct cpg_mssr_info {
unsigned int num_mod_clks;
unsigned int num_hw_mod_clks;
+ /* Module Clocks that should not be gated */
+ const unsigned int *ignore_unused_mod_clks;
+ unsigned int num_ignore_unused_mod_clks;
+
/* Critical Module Clocks that should not be disabled */
const unsigned int *crit_mod_clks;
unsigned int num_crit_mod_clks;
--
2.25.1
