soc: amlogic: meson-clk-measure: g12a/b DVFS support
cover soc: amlogic: meson-clk-measure: g12a/b DVFS support
This patchset :
- protects the measure with a mutex, between concurrent user space debugfs reads
- adds entries for the G12B secondary cluster SYS_PLL and CPU clock
Neil Armstrong (2):
soc: amlogic: meson-clk-measure: protect measure with a mutex
soc: amlogic: meson-clk-measure: add G12B second cluster cpu clk
drivers/soc/amlogic/meson-clk-measure.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
Signature · 1 line
2.22.0
PATCH 1/2 soc: amlogic: meson-clk-measure: protect measure with a mutex
In order to protect clock measuring when multiple process asks for a measure, protect the main measure function with mutexes.
Reviewed-by Kevin Hilman <[email protected]>
Reviewed-by Martin Blumenstingl <[email protected]>
Signed-off-by Neil Armstrong <[email protected]>
--- drivers/soc/amlogic/meson-clk-measure.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/soc/amlogic/meson-clk-measure.c +11 -1
@@ -11,6 +11,8 @@#include <linux/debugfs.h> #include <linux/regmap.h> +static DEFINE_MUTEX (measure_lock); +#define MSR_CLK_DUTY 0x0#define MSR_CLK_REG0 0x4#define MSR_CLK_REG1 0x8
@@ -360,6 +362,10 @@ static int meson_measure_id(struct meson_msr_id *clk_msr_id,unsigned int val;int ret; + ret =mutex_lock_interruptible (&measure_lock); +if (ret) +return ret; +regmap_write (priv->regmap,MSR_CLK_REG0 ,0 );/* Set measurement duration */
@@ -377,8 +383,10 @@ static int meson_measure_id(struct meson_msr_id *clk_msr_id, ret =regmap_read_poll_timeout (priv->regmap,MSR_CLK_REG0 , val, !(val &MSR_BUSY ),10 ,10000 ); -if (ret) +if (ret) { +mutex_unlock (&measure_lock);return ret; + }/* Disable */ regmap_update_bits (priv->regmap,MSR_CLK_REG0 ,MSR_ENABLE ,0 );
@@ -386,6 +394,8 @@ static int meson_measure_id(struct meson_msr_id *clk_msr_id,/* Get the value in multiple of gate time counts */ regmap_read (priv->regmap,MSR_CLK_REG2 , &val); +mutex_unlock (&measure_lock); +if (val >=MSR_VAL_MASK )return -EINVAL ;
Signature · 7 lines
2.22.0 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
PATCH 2/2 soc: amlogic: meson-clk-measure: add G12B second cluster cpu clk
In reply to Neil ArmstrongAdd the G12B second CPU cluster CPU and SYS_PLL measure IDs.
These IDs returns 0Hz on G12A.
Reviewed-by Kevin Hilman <[email protected]>
Reviewed-by Martin Blumenstingl <[email protected]>
Signed-off-by Neil Armstrong <[email protected]>
--- drivers/soc/amlogic/meson-clk-measure.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/soc/amlogic/meson-clk-measure.c +2 -0
@@ -324,6 +324,8 @@ static struct meson_msr_id clk_msr_g12a[CLK_MSR_MAX] = {CLK_MSR_ID (84 ,"co_tx" ),CLK_MSR_ID (89 ,"hdmi_todig" ),CLK_MSR_ID (90 ,"hdmitx_sys" ), +CLK_MSR_ID (91 ,"sys_cpub_div16" ), +CLK_MSR_ID (92 ,"sys_pll_cpub_div16" ),CLK_MSR_ID (94 ,"eth_phy_rx" ),CLK_MSR_ID (95 ,"eth_phy_pll" ), CLK_MSR_ID(96, "vpu_b"),
Signature · 1 line
2.22.0