* [PATCH v1 1/6] cpufreq: mediatek-hw: Add support for CPUFREQ HW
2020-10-23 8:24 [PATCH v1] cpufreq: mediatek-hw: Add support for Mediatek cpufreq HW driver Hector Yuan
@ 2020-10-23 8:24 ` Hector Yuan
2020-10-23 8:24 ` [PATCH v1 2/6] dt-bindings: arm: cpus: Document 'mtk,freq-domain' property Hector Yuan
` (5 subsequent siblings)
6 siblings, 0 replies; 20+ messages in thread
From: Hector Yuan @ 2020-10-23 8:24 UTC (permalink / raw)
To: linux-mediatek, linux-arm-kernel, linux-pm, Rob Herring,
Rafael J. Wysocki, Viresh Kumar, Maxime Ripard,
Santosh Shilimkar, Amit Kucheria, Stephen Boyd, Ulf Hansson,
Dave Gerlach, Florian Fainelli, Robin Murphy, Lorenzo Pieralisi,
devicetree
Cc: linux-kernel, wsd_upstream, hector.yuan
From: "Hector.Yuan" <hector.yuan@mediatek.com>
Add cpufreq HW support.
Signed-off-by: Hector.Yuan <hector.yuan@mediatek.com>
---
drivers/cpufreq/Kconfig.arm | 12 ++
drivers/cpufreq/Makefile | 1 +
drivers/cpufreq/mediatek-cpufreq-hw.c | 276 +++++++++++++++++++++++++++++++++
3 files changed, 289 insertions(+)
create mode 100644 drivers/cpufreq/mediatek-cpufreq-hw.c
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index cb72fb5..b9d17c5 100644
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -123,6 +123,18 @@ config ARM_MEDIATEK_CPUFREQ
help
This adds the CPUFreq driver support for MediaTek SoCs.
+config ARM_MEDIATEK_CPUFREQ_HW
+ tristate "MediaTek CPUFreq HW driver"
+ depends on ARCH_MEDIATEK || COMPILE_TEST
+ default m
+ help
+ Support for the CPUFreq HW driver.
+ Some MediaTek chipsets have a HW engine to offload the steps
+ necessary for changing the frequency of the CPUs. Firmware loaded
+ in this engine exposes a programming interface to the OS.
+ The driver implements the cpufreq interface for this HW engine.
+ Say Y if you want to support CPUFreq HW.
+
config ARM_OMAP2PLUS_CPUFREQ
bool "TI OMAP2+"
depends on ARCH_OMAP2PLUS
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
index f1b7e3d..ffc61cd 100644
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@ -57,6 +57,7 @@ obj-$(CONFIG_ARM_IMX6Q_CPUFREQ) += imx6q-cpufreq.o
obj-$(CONFIG_ARM_IMX_CPUFREQ_DT) += imx-cpufreq-dt.o
obj-$(CONFIG_ARM_KIRKWOOD_CPUFREQ) += kirkwood-cpufreq.o
obj-$(CONFIG_ARM_MEDIATEK_CPUFREQ) += mediatek-cpufreq.o
+obj-$(CONFIG_ARM_MEDIATEK_CPUFREQ_HW) += mediatek-cpufreq-hw.o
obj-$(CONFIG_MACH_MVEBU_V7) += mvebu-cpufreq.o
obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o
obj-$(CONFIG_ARM_PXA2xx_CPUFREQ) += pxa2xx-cpufreq.o
diff --git a/drivers/cpufreq/mediatek-cpufreq-hw.c b/drivers/cpufreq/mediatek-cpufreq-hw.c
new file mode 100644
index 0000000..74449da
--- /dev/null
+++ b/drivers/cpufreq/mediatek-cpufreq-hw.c
@@ -0,0 +1,276 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2020 MediaTek Inc.
+ */
+
+#include <linux/bitfield.h>
+#include <linux/cpufreq.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/of_platform.h>
+#include <linux/slab.h>
+
+#define LUT_MAX_ENTRIES 32U
+#define LUT_FREQ GENMASK(11, 0)
+#define LUT_ROW_SIZE 0x4
+
+enum {
+ REG_LUT_TABLE,
+ REG_ENABLE,
+ REG_PERF_STATE,
+
+ REG_ARRAY_SIZE,
+};
+
+struct cpufreq_mtk {
+ struct cpufreq_frequency_table *table;
+ void __iomem *reg_bases[REG_ARRAY_SIZE];
+ cpumask_t related_cpus;
+};
+
+static const u16 cpufreq_mtk_offsets[REG_ARRAY_SIZE] = {
+ [REG_LUT_TABLE] = 0x0,
+ [REG_ENABLE] = 0x84,
+ [REG_PERF_STATE] = 0x88,
+};
+
+static struct cpufreq_mtk *mtk_freq_domain_map[NR_CPUS];
+
+static int mtk_cpufreq_hw_target_index(struct cpufreq_policy *policy,
+ unsigned int index)
+{
+ struct cpufreq_mtk *c = policy->driver_data;
+
+ writel_relaxed(index, c->reg_bases[REG_PERF_STATE]);
+
+ return 0;
+}
+
+static unsigned int mtk_cpufreq_hw_get(unsigned int cpu)
+{
+ struct cpufreq_mtk *c;
+ unsigned int index;
+
+ c = mtk_freq_domain_map[cpu];
+
+ index = readl_relaxed(c->reg_bases[REG_PERF_STATE]);
+ index = min(index, LUT_MAX_ENTRIES - 1);
+
+ return c->table[index].frequency;
+}
+
+static int mtk_cpufreq_hw_cpu_init(struct cpufreq_policy *policy)
+{
+ struct cpufreq_mtk *c;
+
+ c = mtk_freq_domain_map[policy->cpu];
+ if (!c) {
+ pr_err("No scaling support for CPU%d\n", policy->cpu);
+ return -ENODEV;
+ }
+
+ cpumask_copy(policy->cpus, &c->related_cpus);
+
+ policy->freq_table = c->table;
+ policy->driver_data = c;
+
+ /* HW should be in enabled state to proceed now */
+ writel_relaxed(0x1, c->reg_bases[REG_ENABLE]);
+
+ return 0;
+}
+
+static int mtk_cpufreq_hw_cpu_exit(struct cpufreq_policy *policy)
+{
+ struct cpufreq_mtk *c;
+
+ c = mtk_freq_domain_map[policy->cpu];
+ if (!c) {
+ pr_err("No scaling support for CPU%d\n", policy->cpu);
+ return -ENODEV;
+ }
+
+ /* HW should be in paused state now */
+ writel_relaxed(0x0, c->reg_bases[REG_ENABLE]);
+
+ return 0;
+}
+
+static struct cpufreq_driver cpufreq_mtk_hw_driver = {
+ .flags = CPUFREQ_STICKY | CPUFREQ_NEED_INITIAL_FREQ_CHECK |
+ CPUFREQ_HAVE_GOVERNOR_PER_POLICY,
+ .verify = cpufreq_generic_frequency_table_verify,
+ .target_index = mtk_cpufreq_hw_target_index,
+ .get = mtk_cpufreq_hw_get,
+ .init = mtk_cpufreq_hw_cpu_init,
+ .exit = mtk_cpufreq_hw_cpu_exit,
+ .name = "mtk-cpufreq-hw",
+ .attr = cpufreq_generic_attr,
+};
+
+static int mtk_cpu_create_freq_table(struct platform_device *pdev,
+ struct cpufreq_mtk *c)
+{
+ struct device *dev = &pdev->dev;
+ void __iomem *base_table;
+ u32 data, i, freq, prev_freq = 0;
+
+ c->table = devm_kcalloc(dev, LUT_MAX_ENTRIES + 1,
+ sizeof(*c->table), GFP_KERNEL);
+ if (!c->table)
+ return -ENOMEM;
+
+ base_table = c->reg_bases[REG_LUT_TABLE];
+
+ for (i = 0; i < LUT_MAX_ENTRIES; i++) {
+ data = readl_relaxed(base_table + (i * LUT_ROW_SIZE));
+ freq = FIELD_GET(LUT_FREQ, data) * 1000;
+
+ if (freq == prev_freq)
+ break;
+
+ c->table[i].frequency = freq;
+
+ dev_dbg(dev, "index=%d freq=%d\n",
+ i, c->table[i].frequency);
+
+ prev_freq = freq;
+ }
+
+ c->table[i].frequency = CPUFREQ_TABLE_END;
+
+ return 0;
+}
+
+static int mtk_get_related_cpus(int index, struct cpufreq_mtk *c)
+{
+ struct device_node *cpu_np;
+ struct of_phandle_args args;
+ int cpu, ret;
+
+ for_each_possible_cpu(cpu) {
+ cpu_np = of_cpu_device_node_get(cpu);
+ if (!cpu_np)
+ continue;
+
+ ret = of_parse_phandle_with_args(cpu_np, "mtk-freq-domain",
+ "#freq-domain-cells", 0,
+ &args);
+ of_node_put(cpu_np);
+ if (ret < 0)
+ continue;
+
+ if (index == args.args[0]) {
+ cpumask_set_cpu(cpu, &c->related_cpus);
+ mtk_freq_domain_map[cpu] = c;
+ }
+ }
+
+ return 0;
+}
+
+static int mtk_cpu_resources_init(struct platform_device *pdev,
+ unsigned int cpu, int index,
+ const u16 *offsets)
+{
+ struct cpufreq_mtk *c;
+ struct device *dev = &pdev->dev;
+ int ret, i;
+ void __iomem *base;
+
+ if (mtk_freq_domain_map[cpu])
+ return 0;
+
+ c = devm_kzalloc(dev, sizeof(*c), GFP_KERNEL);
+ if (!c)
+ return -ENOMEM;
+
+ base = devm_platform_ioremap_resource(pdev, index);
+ if (IS_ERR(base))
+ return PTR_ERR(base);
+
+ for (i = REG_LUT_TABLE; i < REG_ARRAY_SIZE; i++)
+ c->reg_bases[i] = base + offsets[i];
+
+ ret = mtk_get_related_cpus(index, c);
+ if (ret) {
+ dev_err(dev, "Domain-%d failed to get related CPUs\n", index);
+ return ret;
+ }
+
+ ret = mtk_cpu_create_freq_table(pdev, c);
+ if (ret) {
+ dev_err(dev, "Domain-%d failed to create freq table\n", index);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int mtk_cpufreq_hw_driver_probe(struct platform_device *pdev)
+{
+ struct device_node *cpu_np;
+ struct of_phandle_args args;
+ const u16 *offsets;
+ unsigned int cpu;
+ int ret;
+
+ offsets = of_device_get_match_data(&pdev->dev);
+ if (!offsets)
+ return -EINVAL;
+
+ for_each_possible_cpu(cpu) {
+ cpu_np = of_cpu_device_node_get(cpu);
+ if (!cpu_np) {
+ dev_err(&pdev->dev, "Failed to get cpu %d device\n",
+ cpu);
+ return -ENODEV;
+ }
+
+ ret = of_parse_phandle_with_args(cpu_np, "mtk-freq-domain",
+ "#freq-domain-cells", 0,
+ &args);
+ if (ret < 0)
+ return ret;
+
+ /* Get the bases of cpufreq for domains */
+ ret = mtk_cpu_resources_init(pdev, cpu, args.args[0], offsets);
+ if (ret) {
+ dev_err(&pdev->dev, "CPUFreq resource init failed\n");
+ return ret;
+ }
+ }
+
+ ret = cpufreq_register_driver(&cpufreq_mtk_hw_driver);
+ if (ret) {
+ dev_err(&pdev->dev, "CPUFreq HW driver failed to register\n");
+ return ret;
+ }
+
+ return 0;
+}
+
+static int mtk_cpufreq_hw_driver_remove(struct platform_device *pdev)
+{
+ return cpufreq_unregister_driver(&cpufreq_mtk_hw_driver);
+}
+
+static const struct of_device_id mtk_cpufreq_hw_match[] = {
+ { .compatible = "mediatek,cpufreq-hw", .data = &cpufreq_mtk_offsets },
+ {}
+};
+
+static struct platform_driver mtk_cpufreq_hw_driver = {
+ .probe = mtk_cpufreq_hw_driver_probe,
+ .remove = mtk_cpufreq_hw_driver_remove,
+ .driver = {
+ .name = "mtk-cpufreq-hw",
+ .of_match_table = mtk_cpufreq_hw_match,
+ },
+};
+module_platform_driver(mtk_cpufreq_hw_driver);
+
+MODULE_DESCRIPTION("Mediatek cpufreq-hw driver");
+MODULE_LICENSE("GPL v2");
--
1.7.9.5
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v1 2/6] dt-bindings: arm: cpus: Document 'mtk,freq-domain' property
2020-10-23 8:24 [PATCH v1] cpufreq: mediatek-hw: Add support for Mediatek cpufreq HW driver Hector Yuan
2020-10-23 8:24 ` [PATCH v1 1/6] cpufreq: mediatek-hw: Add support for CPUFREQ HW Hector Yuan
@ 2020-10-23 8:24 ` Hector Yuan
2020-10-23 8:29 ` Viresh Kumar
2020-10-23 16:20 ` Rob Herring
2020-10-23 8:24 ` [PATCH v1 3/6] dt-bindings: cpufreq: add bindings for MediaTek cpufreq HW Hector Yuan
` (4 subsequent siblings)
6 siblings, 2 replies; 20+ messages in thread
From: Hector Yuan @ 2020-10-23 8:24 UTC (permalink / raw)
To: linux-mediatek, linux-arm-kernel, linux-pm, Rob Herring,
Rafael J. Wysocki, Viresh Kumar, Maxime Ripard,
Santosh Shilimkar, Amit Kucheria, Stephen Boyd, Ulf Hansson,
Dave Gerlach, Florian Fainelli, Robin Murphy, Lorenzo Pieralisi,
devicetree
Cc: linux-kernel, wsd_upstream, hector.yuan
From: "Hector.Yuan" <hector.yuan@mediatek.com>
Add devicetree documentation for 'mtk,freq-domain' property specific
to Mediatek CPUs. This property is used to reference the CPUFREQ node
along with the domain id.
Signed-off-by: Hector.Yuan <hector.yuan@mediatek.com>
---
Documentation/devicetree/bindings/arm/cpus.yaml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/cpus.yaml b/Documentation/devicetree/bindings/arm/cpus.yaml
index 1222bf1..06a6f5b 100644
--- a/Documentation/devicetree/bindings/arm/cpus.yaml
+++ b/Documentation/devicetree/bindings/arm/cpus.yaml
@@ -255,6 +255,12 @@ properties:
where voltage is in V, frequency is in MHz.
+ mtk-freq-domain:
+ $ref: '/schemas/types.yaml#/definitions/phandle-array'
+ description:
+ CPUs supporting freq-domain must set their "mtk-freq-domain" property
+ with phandle to a cpufreq_hw node followed by the domain id.
+
power-domains:
$ref: '/schemas/types.yaml#/definitions/phandle-array'
description:
--
1.7.9.5
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v1 2/6] dt-bindings: arm: cpus: Document 'mtk,freq-domain' property
2020-10-23 8:24 ` [PATCH v1 2/6] dt-bindings: arm: cpus: Document 'mtk,freq-domain' property Hector Yuan
@ 2020-10-23 8:29 ` Viresh Kumar
2020-10-26 6:14 ` Hector Yuan
2020-10-23 16:20 ` Rob Herring
1 sibling, 1 reply; 20+ messages in thread
From: Viresh Kumar @ 2020-10-23 8:29 UTC (permalink / raw)
To: Hector Yuan
Cc: linux-mediatek, linux-arm-kernel, linux-pm, Rob Herring,
Rafael J. Wysocki, Maxime Ripard, Santosh Shilimkar,
Amit Kucheria, Stephen Boyd, Ulf Hansson, Dave Gerlach,
Florian Fainelli, Robin Murphy, Lorenzo Pieralisi, devicetree,
linux-kernel, wsd_upstream
On 23-10-20, 16:24, Hector Yuan wrote:
> From: "Hector.Yuan" <hector.yuan@mediatek.com>
>
> Add devicetree documentation for 'mtk,freq-domain' property specific
> to Mediatek CPUs. This property is used to reference the CPUFREQ node
> along with the domain id.
>
> Signed-off-by: Hector.Yuan <hector.yuan@mediatek.com>
> ---
> Documentation/devicetree/bindings/arm/cpus.yaml | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/arm/cpus.yaml b/Documentation/devicetree/bindings/arm/cpus.yaml
> index 1222bf1..06a6f5b 100644
> --- a/Documentation/devicetree/bindings/arm/cpus.yaml
> +++ b/Documentation/devicetree/bindings/arm/cpus.yaml
> @@ -255,6 +255,12 @@ properties:
>
> where voltage is in V, frequency is in MHz.
>
> + mtk-freq-domain:
> + $ref: '/schemas/types.yaml#/definitions/phandle-array'
> + description:
> + CPUs supporting freq-domain must set their "mtk-freq-domain" property
> + with phandle to a cpufreq_hw node followed by the domain id.
> +
Name should have been mtk,freq-domain I believe. Rob will confirm the
rest.
> power-domains:
> $ref: '/schemas/types.yaml#/definitions/phandle-array'
> description:
> --
> 1.7.9.5
--
viresh
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v1 2/6] dt-bindings: arm: cpus: Document 'mtk,freq-domain' property
2020-10-23 8:29 ` Viresh Kumar
@ 2020-10-26 6:14 ` Hector Yuan
0 siblings, 0 replies; 20+ messages in thread
From: Hector Yuan @ 2020-10-26 6:14 UTC (permalink / raw)
To: Viresh Kumar
Cc: linux-mediatek, linux-arm-kernel, linux-pm, Rob Herring,
Rafael J. Wysocki, Maxime Ripard, Santosh Shilimkar,
Amit Kucheria, Stephen Boyd, Ulf Hansson, Dave Gerlach,
Florian Fainelli, Robin Murphy, Lorenzo Pieralisi, devicetree,
linux-kernel, wsd_upstream
On Fri, 2020-10-23 at 13:59 +0530, Viresh Kumar wrote:
> On 23-10-20, 16:24, Hector Yuan wrote:
> > From: "Hector.Yuan" <hector.yuan@mediatek.com>
> >
> > Add devicetree documentation for 'mtk,freq-domain' property specific
> > to Mediatek CPUs. This property is used to reference the CPUFREQ node
> > along with the domain id.
> >
> > Signed-off-by: Hector.Yuan <hector.yuan@mediatek.com>
> > ---
> > Documentation/devicetree/bindings/arm/cpus.yaml | 6 ++++++
> > 1 file changed, 6 insertions(+)
> >
> > diff --git a/Documentation/devicetree/bindings/arm/cpus.yaml b/Documentation/devicetree/bindings/arm/cpus.yaml
> > index 1222bf1..06a6f5b 100644
> > --- a/Documentation/devicetree/bindings/arm/cpus.yaml
> > +++ b/Documentation/devicetree/bindings/arm/cpus.yaml
> > @@ -255,6 +255,12 @@ properties:
> >
> > where voltage is in V, frequency is in MHz.
> >
> > + mtk-freq-domain:
> > + $ref: '/schemas/types.yaml#/definitions/phandle-array'
> > + description:
> > + CPUs supporting freq-domain must set their "mtk-freq-domain" property
> > + with phandle to a cpufreq_hw node followed by the domain id.
> > +
>
> Name should have been mtk,freq-domain I believe. Rob will confirm the
> rest.
>
OK, will name it as mediatek,freq-domain. Thank you.
> > power-domains:
> > $ref: '/schemas/types.yaml#/definitions/phandle-array'
> > description:
> > --
> > 1.7.9.5
>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v1 2/6] dt-bindings: arm: cpus: Document 'mtk,freq-domain' property
2020-10-23 8:24 ` [PATCH v1 2/6] dt-bindings: arm: cpus: Document 'mtk,freq-domain' property Hector Yuan
2020-10-23 8:29 ` Viresh Kumar
@ 2020-10-23 16:20 ` Rob Herring
2020-10-26 6:12 ` Hector Yuan
1 sibling, 1 reply; 20+ messages in thread
From: Rob Herring @ 2020-10-23 16:20 UTC (permalink / raw)
To: Hector Yuan
Cc: linux-mediatek, linux-arm-kernel, linux-pm, Rafael J. Wysocki,
Viresh Kumar, Maxime Ripard, Santosh Shilimkar, Amit Kucheria,
Stephen Boyd, Ulf Hansson, Dave Gerlach, Florian Fainelli,
Robin Murphy, Lorenzo Pieralisi, devicetree, linux-kernel,
wsd_upstream, Sudeep Holla
+Sudeep
On Fri, Oct 23, 2020 at 04:24:49PM +0800, Hector Yuan wrote:
> From: "Hector.Yuan" <hector.yuan@mediatek.com>
>
> Add devicetree documentation for 'mtk,freq-domain' property specific
> to Mediatek CPUs. This property is used to reference the CPUFREQ node
> along with the domain id.
Okay, now we've got the same thing being done for Mediatek, QCom, and
SCMI. This needs to be a common binding.
> Signed-off-by: Hector.Yuan <hector.yuan@mediatek.com>
> ---
> Documentation/devicetree/bindings/arm/cpus.yaml | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/arm/cpus.yaml b/Documentation/devicetree/bindings/arm/cpus.yaml
> index 1222bf1..06a6f5b 100644
> --- a/Documentation/devicetree/bindings/arm/cpus.yaml
> +++ b/Documentation/devicetree/bindings/arm/cpus.yaml
> @@ -255,6 +255,12 @@ properties:
>
> where voltage is in V, frequency is in MHz.
>
> + mtk-freq-domain:
I expect this to change, but still not right form: <vendor>,<prop name>
mtk is not the registered vendor.
> + $ref: '/schemas/types.yaml#/definitions/phandle-array'
> + description:
> + CPUs supporting freq-domain must set their "mtk-freq-domain" property
> + with phandle to a cpufreq_hw node followed by the domain id.
> +
> power-domains:
> $ref: '/schemas/types.yaml#/definitions/phandle-array'
> description:
> --
> 1.7.9.5
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v1 2/6] dt-bindings: arm: cpus: Document 'mtk,freq-domain' property
2020-10-23 16:20 ` Rob Herring
@ 2020-10-26 6:12 ` Hector Yuan
0 siblings, 0 replies; 20+ messages in thread
From: Hector Yuan @ 2020-10-26 6:12 UTC (permalink / raw)
To: Rob Herring
Cc: linux-mediatek, linux-arm-kernel, linux-pm, Rafael J. Wysocki,
Viresh Kumar, Maxime Ripard, Santosh Shilimkar, Amit Kucheria,
Stephen Boyd, Ulf Hansson, Dave Gerlach, Florian Fainelli,
Robin Murphy, Lorenzo Pieralisi, devicetree, linux-kernel,
wsd_upstream, Sudeep Holla
On Fri, 2020-10-23 at 11:20 -0500, Rob Herring wrote:
> +Sudeep
>
> On Fri, Oct 23, 2020 at 04:24:49PM +0800, Hector Yuan wrote:
> > From: "Hector.Yuan" <hector.yuan@mediatek.com>
> >
> > Add devicetree documentation for 'mtk,freq-domain' property specific
> > to Mediatek CPUs. This property is used to reference the CPUFREQ node
> > along with the domain id.
>
> Okay, now we've got the same thing being done for Mediatek, QCom, and
> SCMI. This needs to be a common binding.
>
OK, thank you. I will pay attention for this. But still
"mediatek,freq-domain" in v8.
> > Signed-off-by: Hector.Yuan <hector.yuan@mediatek.com>
> > ---
> > Documentation/devicetree/bindings/arm/cpus.yaml | 6 ++++++
> > 1 file changed, 6 insertions(+)
> >
> > diff --git a/Documentation/devicetree/bindings/arm/cpus.yaml b/Documentation/devicetree/bindings/arm/cpus.yaml
> > index 1222bf1..06a6f5b 100644
> > --- a/Documentation/devicetree/bindings/arm/cpus.yaml
> > +++ b/Documentation/devicetree/bindings/arm/cpus.yaml
> > @@ -255,6 +255,12 @@ properties:
> >
> > where voltage is in V, frequency is in MHz.
> >
> > + mtk-freq-domain:
>
> I expect this to change, but still not right form: <vendor>,<prop name>
>
> mtk is not the registered vendor.
>
OK, will modify this in v8.(use the previous pacthset and merge all
changes)
> > + $ref: '/schemas/types.yaml#/definitions/phandle-array'
> > + description:
> > + CPUs supporting freq-domain must set their "mtk-freq-domain" property
> > + with phandle to a cpufreq_hw node followed by the domain id.
> > +
> > power-domains:
> > $ref: '/schemas/types.yaml#/definitions/phandle-array'
> > description:
> > --
> > 1.7.9.5
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v1 3/6] dt-bindings: cpufreq: add bindings for MediaTek cpufreq HW
2020-10-23 8:24 [PATCH v1] cpufreq: mediatek-hw: Add support for Mediatek cpufreq HW driver Hector Yuan
2020-10-23 8:24 ` [PATCH v1 1/6] cpufreq: mediatek-hw: Add support for CPUFREQ HW Hector Yuan
2020-10-23 8:24 ` [PATCH v1 2/6] dt-bindings: arm: cpus: Document 'mtk,freq-domain' property Hector Yuan
@ 2020-10-23 8:24 ` Hector Yuan
2020-10-23 8:35 ` Viresh Kumar
2020-10-23 16:15 ` Rob Herring
2020-10-23 8:24 ` [PATCH v1 4/6] cpufreq: mediatek-hw: register EM power table Hector Yuan
` (3 subsequent siblings)
6 siblings, 2 replies; 20+ messages in thread
From: Hector Yuan @ 2020-10-23 8:24 UTC (permalink / raw)
To: linux-mediatek, linux-arm-kernel, linux-pm, Rob Herring,
Rafael J. Wysocki, Viresh Kumar, Maxime Ripard,
Santosh Shilimkar, Amit Kucheria, Stephen Boyd, Ulf Hansson,
Dave Gerlach, Florian Fainelli, Robin Murphy, Lorenzo Pieralisi,
devicetree
Cc: linux-kernel, wsd_upstream, hector.yuan
From: "Hector.Yuan" <hector.yuan@mediatek.com>
Add devicetree bindings for MediaTek HW driver.
Signed-off-by: Hector.Yuan <hector.yuan@mediatek.com>
---
.../bindings/cpufreq/cpufreq-mediatek-hw.yaml | 46 ++++++++++++++++++++
1 file changed, 46 insertions(+)
create mode 100644 Documentation/devicetree/bindings/cpufreq/cpufreq-mediatek-hw.yaml
diff --git a/Documentation/devicetree/bindings/cpufreq/cpufreq-mediatek-hw.yaml b/Documentation/devicetree/bindings/cpufreq/cpufreq-mediatek-hw.yaml
new file mode 100644
index 0000000..a99f44f
--- /dev/null
+++ b/Documentation/devicetree/bindings/cpufreq/cpufreq-mediatek-hw.yaml
@@ -0,0 +1,46 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/cpufreq/cpufreq-mediatek-hw.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: MediaTek's CPUFREQ Bindings
+
+maintainers:
+ - Hector Yuan <hector.yuan@mediatek.com>
+
+description:
+ CPUFREQ HW is a hardware engine used by MediaTek
+ SoCs to manage frequency in hardware. It is capable of controlling frequency
+ for multiple clusters.
+
+properties:
+ compatible:
+ const: mediatek,cpufreq-hw
+
+ reg:
+ minItems: 1
+ maxItems: 2
+ description: |
+ Addresses and sizes for the memory of the HW bases in each frequency domain.
+
+required:
+ - compatible
+ - reg
+
+examples:
+ - |
+ soc {
+ #address-cells = <2>;
+ #size-cells = <2>;
+
+ cpufreq_hw: cpufreq@11bc00 {
+ compatible = "mediatek,cpufreq-hw";
+ reg = <0 0x11bc10 0 0x8c>,
+ <0 0x11bca0 0 0x8c>;
+ };
+ };
+
+
+
+
--
1.7.9.5
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v1 3/6] dt-bindings: cpufreq: add bindings for MediaTek cpufreq HW
2020-10-23 8:24 ` [PATCH v1 3/6] dt-bindings: cpufreq: add bindings for MediaTek cpufreq HW Hector Yuan
@ 2020-10-23 8:35 ` Viresh Kumar
2020-10-26 6:17 ` Hector Yuan
2020-10-23 16:15 ` Rob Herring
1 sibling, 1 reply; 20+ messages in thread
From: Viresh Kumar @ 2020-10-23 8:35 UTC (permalink / raw)
To: Hector Yuan
Cc: linux-mediatek, linux-arm-kernel, linux-pm, Rob Herring,
Rafael J. Wysocki, Maxime Ripard, Santosh Shilimkar,
Amit Kucheria, Stephen Boyd, Ulf Hansson, Dave Gerlach,
Florian Fainelli, Robin Murphy, Lorenzo Pieralisi, devicetree,
linux-kernel, wsd_upstream
On 23-10-20, 16:24, Hector Yuan wrote:
> From: "Hector.Yuan" <hector.yuan@mediatek.com>
>
> Add devicetree bindings for MediaTek HW driver.
>
> Signed-off-by: Hector.Yuan <hector.yuan@mediatek.com>
> ---
> .../bindings/cpufreq/cpufreq-mediatek-hw.yaml | 46 ++++++++++++++++++++
> 1 file changed, 46 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/cpufreq/cpufreq-mediatek-hw.yaml
>
> diff --git a/Documentation/devicetree/bindings/cpufreq/cpufreq-mediatek-hw.yaml b/Documentation/devicetree/bindings/cpufreq/cpufreq-mediatek-hw.yaml
> new file mode 100644
> index 0000000..a99f44f
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/cpufreq/cpufreq-mediatek-hw.yaml
> @@ -0,0 +1,46 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/cpufreq/cpufreq-mediatek-hw.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: MediaTek's CPUFREQ Bindings
> +
> +maintainers:
> + - Hector Yuan <hector.yuan@mediatek.com>
> +
> +description:
> + CPUFREQ HW is a hardware engine used by MediaTek
> + SoCs to manage frequency in hardware. It is capable of controlling frequency
> + for multiple clusters.
> +
> +properties:
> + compatible:
> + const: mediatek,cpufreq-hw
> +
> + reg:
> + minItems: 1
> + maxItems: 2
> + description: |
> + Addresses and sizes for the memory of the HW bases in each frequency domain.
> +
> +required:
> + - compatible
> + - reg
> +
> +examples:
> + - |
> + soc {
> + #address-cells = <2>;
> + #size-cells = <2>;
> +
> + cpufreq_hw: cpufreq@11bc00 {
> + compatible = "mediatek,cpufreq-hw";
> + reg = <0 0x11bc10 0 0x8c>,
> + <0 0x11bca0 0 0x8c>;
> + };
> + };
You still need to keep the CPU specific part here and explain how this
block is going to get used using the other binding you added.
--
viresh
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH v1 3/6] dt-bindings: cpufreq: add bindings for MediaTek cpufreq HW
2020-10-23 8:35 ` Viresh Kumar
@ 2020-10-26 6:17 ` Hector Yuan
0 siblings, 0 replies; 20+ messages in thread
From: Hector Yuan @ 2020-10-26 6:17 UTC (permalink / raw)
To: Viresh Kumar
Cc: linux-mediatek, linux-arm-kernel, linux-pm, Rob Herring,
Rafael J. Wysocki, Maxime Ripard, Santosh Shilimkar,
Amit Kucheria, Stephen Boyd, Ulf Hansson, Dave Gerlach,
Florian Fainelli, Robin Murphy, Lorenzo Pieralisi, devicetree,
linux-kernel, wsd_upstream
On Fri, 2020-10-23 at 14:05 +0530, Viresh Kumar wrote:
> On 23-10-20, 16:24, Hector Yuan wrote:
> > From: "Hector.Yuan" <hector.yuan@mediatek.com>
> >
> > Add devicetree bindings for MediaTek HW driver.
> >
> > Signed-off-by: Hector.Yuan <hector.yuan@mediatek.com>
> > ---
> > .../bindings/cpufreq/cpufreq-mediatek-hw.yaml | 46 ++++++++++++++++++++
> > 1 file changed, 46 insertions(+)
> > create mode 100644 Documentation/devicetree/bindings/cpufreq/cpufreq-mediatek-hw.yaml
> >
> > diff --git a/Documentation/devicetree/bindings/cpufreq/cpufreq-mediatek-hw.yaml b/Documentation/devicetree/bindings/cpufreq/cpufreq-mediatek-hw.yaml
> > new file mode 100644
> > index 0000000..a99f44f
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/cpufreq/cpufreq-mediatek-hw.yaml
> > @@ -0,0 +1,46 @@
> > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> > +%YAML 1.2
> > +---
> > +$id: http://devicetree.org/schemas/cpufreq/cpufreq-mediatek-hw.yaml#
> > +$schema: http://devicetree.org/meta-schemas/core.yaml#
> > +
> > +title: MediaTek's CPUFREQ Bindings
> > +
> > +maintainers:
> > + - Hector Yuan <hector.yuan@mediatek.com>
> > +
> > +description:
> > + CPUFREQ HW is a hardware engine used by MediaTek
> > + SoCs to manage frequency in hardware. It is capable of controlling frequency
> > + for multiple clusters.
> > +
> > +properties:
> > + compatible:
> > + const: mediatek,cpufreq-hw
> > +
> > + reg:
> > + minItems: 1
> > + maxItems: 2
> > + description: |
> > + Addresses and sizes for the memory of the HW bases in each frequency domain.
> > +
> > +required:
> > + - compatible
> > + - reg
> > +
> > +examples:
> > + - |
> > + soc {
> > + #address-cells = <2>;
> > + #size-cells = <2>;
> > +
> > + cpufreq_hw: cpufreq@11bc00 {
> > + compatible = "mediatek,cpufreq-hw";
> > + reg = <0 0x11bc10 0 0x8c>,
> > + <0 0x11bca0 0 0x8c>;
> > + };
> > + };
>
> You still need to keep the CPU specific part here and explain how this
> block is going to get used using the other binding you added.
>
OK, will add cpu part here in v8.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v1 3/6] dt-bindings: cpufreq: add bindings for MediaTek cpufreq HW
2020-10-23 8:24 ` [PATCH v1 3/6] dt-bindings: cpufreq: add bindings for MediaTek cpufreq HW Hector Yuan
2020-10-23 8:35 ` Viresh Kumar
@ 2020-10-23 16:15 ` Rob Herring
2020-10-26 6:15 ` Hector Yuan
1 sibling, 1 reply; 20+ messages in thread
From: Rob Herring @ 2020-10-23 16:15 UTC (permalink / raw)
To: Hector Yuan
Cc: devicetree, Maxime Ripard, Stephen Boyd, Viresh Kumar,
Rob Herring, Santosh Shilimkar, Amit Kucheria, linux-pm,
Dave Gerlach, Robin Murphy, Lorenzo Pieralisi, wsd_upstream,
Rafael J. Wysocki, linux-arm-kernel, Ulf Hansson, linux-kernel,
linux-mediatek, Florian Fainelli
On Fri, 23 Oct 2020 16:24:50 +0800, Hector Yuan wrote:
> From: "Hector.Yuan" <hector.yuan@mediatek.com>
>
> Add devicetree bindings for MediaTek HW driver.
>
> Signed-off-by: Hector.Yuan <hector.yuan@mediatek.com>
> ---
> .../bindings/cpufreq/cpufreq-mediatek-hw.yaml | 46 ++++++++++++++++++++
> 1 file changed, 46 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/cpufreq/cpufreq-mediatek-hw.yaml
>
My bot found errors running 'make dt_binding_check' on your patch:
yamllint warnings/errors:
./Documentation/devicetree/bindings/cpufreq/cpufreq-mediatek-hw.yaml:46:1: [warning] too many blank lines (4 > 1) (empty-lines)
dtschema/dtc warnings/errors:
See https://patchwork.ozlabs.org/patch/1386572
The base for the patch is generally the last rc1. Any dependencies
should be noted.
If you already ran 'make dt_binding_check' and didn't see the above
error(s), then make sure 'yamllint' is installed and dt-schema is up to
date:
pip3 install dtschema --upgrade
Please check and re-submit.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v1 3/6] dt-bindings: cpufreq: add bindings for MediaTek cpufreq HW
2020-10-23 16:15 ` Rob Herring
@ 2020-10-26 6:15 ` Hector Yuan
0 siblings, 0 replies; 20+ messages in thread
From: Hector Yuan @ 2020-10-26 6:15 UTC (permalink / raw)
To: Rob Herring
Cc: devicetree, Maxime Ripard, Stephen Boyd, Viresh Kumar,
Rob Herring, Santosh Shilimkar, Amit Kucheria, linux-pm,
Dave Gerlach, Robin Murphy, Lorenzo Pieralisi, wsd_upstream,
Rafael J. Wysocki, linux-arm-kernel, Ulf Hansson, linux-kernel,
linux-mediatek, Florian Fainelli
On Fri, 2020-10-23 at 11:15 -0500, Rob Herring wrote:
> On Fri, 23 Oct 2020 16:24:50 +0800, Hector Yuan wrote:
> > From: "Hector.Yuan" <hector.yuan@mediatek.com>
> >
> > Add devicetree bindings for MediaTek HW driver.
> >
> > Signed-off-by: Hector.Yuan <hector.yuan@mediatek.com>
> > ---
> > .../bindings/cpufreq/cpufreq-mediatek-hw.yaml | 46 ++++++++++++++++++++
> > 1 file changed, 46 insertions(+)
> > create mode 100644 Documentation/devicetree/bindings/cpufreq/cpufreq-mediatek-hw.yaml
> >
>
>
> My bot found errors running 'make dt_binding_check' on your patch:
>
> yamllint warnings/errors:
> ./Documentation/devicetree/bindings/cpufreq/cpufreq-mediatek-hw.yaml:46:1: [warning] too many blank lines (4 > 1) (empty-lines)
>
> dtschema/dtc warnings/errors:
>
>
> See https://patchwork.ozlabs.org/patch/1386572
>
> The base for the patch is generally the last rc1. Any dependencies
> should be noted.
>
> If you already ran 'make dt_binding_check' and didn't see the above
> error(s), then make sure 'yamllint' is installed and dt-schema is up to
> date:
>
> pip3 install dtschema --upgrade
>
> Please check and re-submit.
>
OK, will fix this warning in v8.
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v1 4/6] cpufreq: mediatek-hw: register EM power table
2020-10-23 8:24 [PATCH v1] cpufreq: mediatek-hw: Add support for Mediatek cpufreq HW driver Hector Yuan
` (2 preceding siblings ...)
2020-10-23 8:24 ` [PATCH v1 3/6] dt-bindings: cpufreq: add bindings for MediaTek cpufreq HW Hector Yuan
@ 2020-10-23 8:24 ` Hector Yuan
2020-10-23 8:24 ` [PATCH v1 5/6] cpufreq: mediatek-hw: Add SVS CPU initialization Hector Yuan
` (2 subsequent siblings)
6 siblings, 0 replies; 20+ messages in thread
From: Hector Yuan @ 2020-10-23 8:24 UTC (permalink / raw)
To: linux-mediatek, linux-arm-kernel, linux-pm, Rob Herring,
Rafael J. Wysocki, Viresh Kumar, Maxime Ripard,
Santosh Shilimkar, Amit Kucheria, Stephen Boyd, Ulf Hansson,
Dave Gerlach, Florian Fainelli, Robin Murphy, Lorenzo Pieralisi,
devicetree
Cc: linux-kernel, wsd_upstream, hector.yuan
From: "Hector.Yuan" <hector.yuan@mediatek.com>
Register energy model table for EAS and thermal cooling device usage
Signed-off-by: Hector.Yuan <hector.yuan@mediatek.com>
---
drivers/cpufreq/mediatek-cpufreq-hw.c | 58 ++++++++++++++++++++++++++-------
1 file changed, 46 insertions(+), 12 deletions(-)
diff --git a/drivers/cpufreq/mediatek-cpufreq-hw.c b/drivers/cpufreq/mediatek-cpufreq-hw.c
index 74449da..241d93f 100644
--- a/drivers/cpufreq/mediatek-cpufreq-hw.c
+++ b/drivers/cpufreq/mediatek-cpufreq-hw.c
@@ -5,6 +5,7 @@
#include <linux/bitfield.h>
#include <linux/cpufreq.h>
+#include <linux/energy_model.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
@@ -17,9 +18,10 @@
#define LUT_ROW_SIZE 0x4
enum {
- REG_LUT_TABLE,
- REG_ENABLE,
- REG_PERF_STATE,
+ REG_FREQ_LUT_TABLE,
+ REG_FREQ_ENABLE,
+ REG_FREQ_PERF_STATE,
+ REG_EM_POWER_TBL,
REG_ARRAY_SIZE,
};
@@ -27,23 +29,44 @@ enum {
struct cpufreq_mtk {
struct cpufreq_frequency_table *table;
void __iomem *reg_bases[REG_ARRAY_SIZE];
+ int nr_opp;
cpumask_t related_cpus;
};
static const u16 cpufreq_mtk_offsets[REG_ARRAY_SIZE] = {
- [REG_LUT_TABLE] = 0x0,
- [REG_ENABLE] = 0x84,
- [REG_PERF_STATE] = 0x88,
+ [REG_FREQ_LUT_TABLE] = 0x0,
+ [REG_FREQ_ENABLE] = 0x84,
+ [REG_FREQ_PERF_STATE] = 0x88,
+ [REG_EM_POWER_TBL] = 0x3D0,
};
static struct cpufreq_mtk *mtk_freq_domain_map[NR_CPUS];
+static int mtk_cpufreq_get_cpu_power(unsigned long *mW,
+ unsigned long *KHz, struct device *cpu_dev)
+{
+ struct cpufreq_mtk *c = mtk_freq_domain_map[cpu_dev->id];
+ int i;
+
+ for (i = 0; i < c->nr_opp; i++) {
+ if (c->table[i].frequency < *KHz)
+ break;
+ }
+ i--;
+
+ *KHz = c->table[i].frequency;
+ *mW = readl_relaxed(c->reg_bases[REG_EM_POWER_TBL] +
+ i * LUT_ROW_SIZE) / 1000;
+
+ return 0;
+}
+
static int mtk_cpufreq_hw_target_index(struct cpufreq_policy *policy,
unsigned int index)
{
struct cpufreq_mtk *c = policy->driver_data;
- writel_relaxed(index, c->reg_bases[REG_PERF_STATE]);
+ writel_relaxed(index, c->reg_bases[REG_FREQ_PERF_STATE]);
return 0;
}
@@ -55,7 +78,7 @@ static unsigned int mtk_cpufreq_hw_get(unsigned int cpu)
c = mtk_freq_domain_map[cpu];
- index = readl_relaxed(c->reg_bases[REG_PERF_STATE]);
+ index = readl_relaxed(c->reg_bases[REG_FREQ_PERF_STATE]);
index = min(index, LUT_MAX_ENTRIES - 1);
return c->table[index].frequency;
@@ -64,6 +87,14 @@ static unsigned int mtk_cpufreq_hw_get(unsigned int cpu)
static int mtk_cpufreq_hw_cpu_init(struct cpufreq_policy *policy)
{
struct cpufreq_mtk *c;
+ struct device *cpu_dev;
+ struct em_data_callback em_cb = EM_DATA_CB(mtk_cpufreq_get_cpu_power);
+
+ cpu_dev = get_cpu_device(policy->cpu);
+ if (!cpu_dev) {
+ pr_err("failed to get cpu%d device\n", policy->cpu);
+ return -ENODEV;
+ }
c = mtk_freq_domain_map[policy->cpu];
if (!c) {
@@ -77,7 +108,9 @@ static int mtk_cpufreq_hw_cpu_init(struct cpufreq_policy *policy)
policy->driver_data = c;
/* HW should be in enabled state to proceed now */
- writel_relaxed(0x1, c->reg_bases[REG_ENABLE]);
+ writel_relaxed(0x1, c->reg_bases[REG_FREQ_ENABLE]);
+
+ em_dev_register_perf_domain(cpu_dev, c->nr_opp, &em_cb, policy->cpus);
return 0;
}
@@ -93,7 +126,7 @@ static int mtk_cpufreq_hw_cpu_exit(struct cpufreq_policy *policy)
}
/* HW should be in paused state now */
- writel_relaxed(0x0, c->reg_bases[REG_ENABLE]);
+ writel_relaxed(0x0, c->reg_bases[REG_FREQ_ENABLE]);
return 0;
}
@@ -122,7 +155,7 @@ static int mtk_cpu_create_freq_table(struct platform_device *pdev,
if (!c->table)
return -ENOMEM;
- base_table = c->reg_bases[REG_LUT_TABLE];
+ base_table = c->reg_bases[REG_FREQ_LUT_TABLE];
for (i = 0; i < LUT_MAX_ENTRIES; i++) {
data = readl_relaxed(base_table + (i * LUT_ROW_SIZE));
@@ -140,6 +173,7 @@ static int mtk_cpu_create_freq_table(struct platform_device *pdev,
}
c->table[i].frequency = CPUFREQ_TABLE_END;
+ c->nr_opp = i;
return 0;
}
@@ -191,7 +225,7 @@ static int mtk_cpu_resources_init(struct platform_device *pdev,
if (IS_ERR(base))
return PTR_ERR(base);
- for (i = REG_LUT_TABLE; i < REG_ARRAY_SIZE; i++)
+ for (i = REG_FREQ_LUT_TABLE; i < REG_ARRAY_SIZE; i++)
c->reg_bases[i] = base + offsets[i];
ret = mtk_get_related_cpus(index, c);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v1 5/6] cpufreq: mediatek-hw: Add SVS CPU initialization
2020-10-23 8:24 [PATCH v1] cpufreq: mediatek-hw: Add support for Mediatek cpufreq HW driver Hector Yuan
` (3 preceding siblings ...)
2020-10-23 8:24 ` [PATCH v1 4/6] cpufreq: mediatek-hw: register EM power table Hector Yuan
@ 2020-10-23 8:24 ` Hector Yuan
2020-10-23 8:37 ` Viresh Kumar
2020-10-23 8:24 ` [PATCH v1 6/6] cpufreq: mediatek-hw: Add cooling dev flag Hector Yuan
2020-10-23 8:28 ` [PATCH v1] cpufreq: mediatek-hw: Add support for Mediatek cpufreq HW driver Viresh Kumar
6 siblings, 1 reply; 20+ messages in thread
From: Hector Yuan @ 2020-10-23 8:24 UTC (permalink / raw)
To: linux-mediatek, linux-arm-kernel, linux-pm, Rob Herring,
Rafael J. Wysocki, Viresh Kumar, Maxime Ripard,
Santosh Shilimkar, Amit Kucheria, Stephen Boyd, Ulf Hansson,
Dave Gerlach, Florian Fainelli, Robin Murphy, Lorenzo Pieralisi,
devicetree
Cc: linux-kernel, wsd_upstream, hector.yuan
From: "Hector.Yuan" <hector.yuan@mediatek.com>
Use pm_qos to block cpu-idle state for SVS initializing.
CPUs must be in power on state when doing SVS.
Add polling ack while coufreq hw is ready.(SVS init done)
Signed-off-by: Hector.Yuan <hector.yuan@mediatek.com>
---
drivers/cpufreq/mediatek-cpufreq-hw.c | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/drivers/cpufreq/mediatek-cpufreq-hw.c b/drivers/cpufreq/mediatek-cpufreq-hw.c
index 241d93f..15fba20 100644
--- a/drivers/cpufreq/mediatek-cpufreq-hw.c
+++ b/drivers/cpufreq/mediatek-cpufreq-hw.c
@@ -7,20 +7,27 @@
#include <linux/cpufreq.h>
#include <linux/energy_model.h>
#include <linux/init.h>
+#include <linux/iopoll.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/of_address.h>
#include <linux/of_platform.h>
+#include <linux/pm_qos.h>
#include <linux/slab.h>
#define LUT_MAX_ENTRIES 32U
#define LUT_FREQ GENMASK(11, 0)
#define LUT_ROW_SIZE 0x4
+#define CPUFREQ_HW_STATUS BIT(0)
+#define SVS_HW_STATUS BIT(1)
+#define POLL_USEC 1000
+#define TIMEOUT_USEC 300000
enum {
REG_FREQ_LUT_TABLE,
REG_FREQ_ENABLE,
REG_FREQ_PERF_STATE,
+ REG_FREQ_HW_STATE,
REG_EM_POWER_TBL,
REG_ARRAY_SIZE,
@@ -37,6 +44,7 @@ struct cpufreq_mtk {
[REG_FREQ_LUT_TABLE] = 0x0,
[REG_FREQ_ENABLE] = 0x84,
[REG_FREQ_PERF_STATE] = 0x88,
+ [REG_FREQ_HW_STATE] = 0x8c,
[REG_EM_POWER_TBL] = 0x3D0,
};
@@ -89,6 +97,12 @@ static int mtk_cpufreq_hw_cpu_init(struct cpufreq_policy *policy)
struct cpufreq_mtk *c;
struct device *cpu_dev;
struct em_data_callback em_cb = EM_DATA_CB(mtk_cpufreq_get_cpu_power);
+ struct pm_qos_request *qos_request;
+ int sig, pwr_hw = CPUFREQ_HW_STATUS | SVS_HW_STATUS;
+
+ qos_request = kzalloc(sizeof(*qos_request), GFP_KERNEL);
+ if (!qos_request)
+ return -ENOMEM;
cpu_dev = get_cpu_device(policy->cpu);
if (!cpu_dev) {
@@ -107,11 +121,29 @@ static int mtk_cpufreq_hw_cpu_init(struct cpufreq_policy *policy)
policy->freq_table = c->table;
policy->driver_data = c;
+ /* Let CPUs leave idle-off state for SVS CPU initializing */
+ cpu_latency_qos_add_request(qos_request, 0);
+
/* HW should be in enabled state to proceed now */
writel_relaxed(0x1, c->reg_bases[REG_FREQ_ENABLE]);
+ if (readl_poll_timeout(c->reg_bases[REG_FREQ_HW_STATE], sig,
+ (sig & pwr_hw) == pwr_hw, POLL_USEC,
+ TIMEOUT_USEC)) {
+ if (!(sig & CPUFREQ_HW_STATUS)) {
+ pr_info("cpufreq hardware of CPU%d is not enabled\n",
+ policy->cpu);
+ return -ENODEV;
+ }
+
+ pr_info("SVS of CPU%d is not enabled\n", policy->cpu);
+ }
+
em_dev_register_perf_domain(cpu_dev, c->nr_opp, &em_cb, policy->cpus);
+ cpu_latency_qos_remove_request(qos_request);
+ kfree(qos_request);
+
return 0;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v1 5/6] cpufreq: mediatek-hw: Add SVS CPU initialization
2020-10-23 8:24 ` [PATCH v1 5/6] cpufreq: mediatek-hw: Add SVS CPU initialization Hector Yuan
@ 2020-10-23 8:37 ` Viresh Kumar
0 siblings, 0 replies; 20+ messages in thread
From: Viresh Kumar @ 2020-10-23 8:37 UTC (permalink / raw)
To: Hector Yuan
Cc: linux-mediatek, linux-arm-kernel, linux-pm, Rob Herring,
Rafael J. Wysocki, Maxime Ripard, Santosh Shilimkar,
Amit Kucheria, Stephen Boyd, Ulf Hansson, Dave Gerlach,
Florian Fainelli, Robin Murphy, Lorenzo Pieralisi, devicetree,
linux-kernel, wsd_upstream
On 23-10-20, 16:24, Hector Yuan wrote:
> From: "Hector.Yuan" <hector.yuan@mediatek.com>
>
> Use pm_qos to block cpu-idle state for SVS initializing.
> CPUs must be in power on state when doing SVS.
> Add polling ack while coufreq hw is ready.(SVS init done)
Why is this required ?
And when you send the next version, please send a single patch for the
cpufreq-driver by merging all of these together.
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v1 6/6] cpufreq: mediatek-hw: Add cooling dev flag
2020-10-23 8:24 [PATCH v1] cpufreq: mediatek-hw: Add support for Mediatek cpufreq HW driver Hector Yuan
` (4 preceding siblings ...)
2020-10-23 8:24 ` [PATCH v1 5/6] cpufreq: mediatek-hw: Add SVS CPU initialization Hector Yuan
@ 2020-10-23 8:24 ` Hector Yuan
2020-10-23 8:28 ` [PATCH v1] cpufreq: mediatek-hw: Add support for Mediatek cpufreq HW driver Viresh Kumar
6 siblings, 0 replies; 20+ messages in thread
From: Hector Yuan @ 2020-10-23 8:24 UTC (permalink / raw)
To: linux-mediatek, linux-arm-kernel, linux-pm, Rob Herring,
Rafael J. Wysocki, Viresh Kumar, Maxime Ripard,
Santosh Shilimkar, Amit Kucheria, Stephen Boyd, Ulf Hansson,
Dave Gerlach, Florian Fainelli, Robin Murphy, Lorenzo Pieralisi,
devicetree
Cc: linux-kernel, wsd_upstream, hector.yuan
From: "Hector.Yuan" <hector.yuan@mediatek.com>
Add cooling device flag for thermal throttle
Signed-off-by: Hector.Yuan <hector.yuan@mediatek.com>
---
drivers/cpufreq/mediatek-cpufreq-hw.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/cpufreq/mediatek-cpufreq-hw.c b/drivers/cpufreq/mediatek-cpufreq-hw.c
index 15fba20..665f220f 100644
--- a/drivers/cpufreq/mediatek-cpufreq-hw.c
+++ b/drivers/cpufreq/mediatek-cpufreq-hw.c
@@ -165,7 +165,8 @@ static int mtk_cpufreq_hw_cpu_exit(struct cpufreq_policy *policy)
static struct cpufreq_driver cpufreq_mtk_hw_driver = {
.flags = CPUFREQ_STICKY | CPUFREQ_NEED_INITIAL_FREQ_CHECK |
- CPUFREQ_HAVE_GOVERNOR_PER_POLICY,
+ CPUFREQ_HAVE_GOVERNOR_PER_POLICY |
+ CPUFREQ_IS_COOLING_DEV,
.verify = cpufreq_generic_frequency_table_verify,
.target_index = mtk_cpufreq_hw_target_index,
.get = mtk_cpufreq_hw_get,
--
1.7.9.5
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v1] cpufreq: mediatek-hw: Add support for Mediatek cpufreq HW driver
2020-10-23 8:24 [PATCH v1] cpufreq: mediatek-hw: Add support for Mediatek cpufreq HW driver Hector Yuan
` (5 preceding siblings ...)
2020-10-23 8:24 ` [PATCH v1 6/6] cpufreq: mediatek-hw: Add cooling dev flag Hector Yuan
@ 2020-10-23 8:28 ` Viresh Kumar
2020-10-23 9:08 ` Hector Yuan
6 siblings, 1 reply; 20+ messages in thread
From: Viresh Kumar @ 2020-10-23 8:28 UTC (permalink / raw)
To: Hector Yuan
Cc: linux-mediatek, linux-arm-kernel, linux-pm, Rob Herring,
Rafael J. Wysocki, Maxime Ripard, Santosh Shilimkar,
Amit Kucheria, Stephen Boyd, Ulf Hansson, Dave Gerlach,
Florian Fainelli, Robin Murphy, Lorenzo Pieralisi, devicetree,
linux-kernel, wsd_upstream
On 23-10-20, 16:24, Hector Yuan wrote:
> This patchset includes 6 patches and depends on the MT6779 DTS patch[1] submitted by Hanks Chen.
> The first 3 patches are for CPUFREQ HW driver and device tree binding, which are already sent before separately [2][3]. For binding part, I add a new patch to add property in cpu schema.
> Besides, we add three more patches including EM power table, SVS CPU initialize, and cooling device.
And even after so many versions of these you chose to name this V1. It
is very difficult for reviewers to find time to review your stuff, and
they expect some sort of summary from you on what exactly changed from
last version and you also need to name the current version currently.
This should have been V8 and you should have added a "V7->V8 diff:"
section here, naming all the changes you did. Please send that as
reply to this email, so I can see what really changed.
--
viresh
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH v1] cpufreq: mediatek-hw: Add support for Mediatek cpufreq HW driver
2020-10-23 8:28 ` [PATCH v1] cpufreq: mediatek-hw: Add support for Mediatek cpufreq HW driver Viresh Kumar
@ 2020-10-23 9:08 ` Hector Yuan
2020-10-23 9:27 ` Viresh Kumar
0 siblings, 1 reply; 20+ messages in thread
From: Hector Yuan @ 2020-10-23 9:08 UTC (permalink / raw)
To: Viresh Kumar
Cc: linux-mediatek, linux-arm-kernel, linux-pm, Rob Herring,
Rafael J. Wysocki, Maxime Ripard, Santosh Shilimkar,
Amit Kucheria, Stephen Boyd, Ulf Hansson, Dave Gerlach,
Florian Fainelli, Robin Murphy, Lorenzo Pieralisi, devicetree,
linux-kernel, wsd_upstream
On Fri, 2020-10-23 at 13:58 +0530, Viresh Kumar wrote:
> On 23-10-20, 16:24, Hector Yuan wrote:
> > This patchset includes 6 patches and depends on the MT6779 DTS patch[1] submitted by Hanks Chen.
> > The first 3 patches are for CPUFREQ HW driver and device tree binding, which are already sent before separately [2][3]. For binding part, I add a new patch to add property in cpu schema.
> > Besides, we add three more patches including EM power table, SVS CPU initialize, and cooling device.
>
> And even after so many versions of these you chose to name this V1. It
> is very difficult for reviewers to find time to review your stuff, and
> they expect some sort of summary from you on what exactly changed from
> last version and you also need to name the current version currently.
>
> This should have been V8 and you should have added a "V7->V8 diff:"
> section here, naming all the changes you did. Please send that as
> reply to this email, so I can see what really changed.
>
Hi, Viresh
Sorry for your inconvenience.
#1~#3 is for cpufreq driver we have reviewed and the bindings which
separate freq domain to CPU schema.There is no change for the driver
itself.
1. cpufreq: mediatek-hw: Add support for CPUFREQ HW
2. dt-bindings: arm: cpus: Document 'mtk,freq-domain' property
3. dt-bindings: cpufreq: add bindings for MediaTek cpufreq HW
#4~#6 is for other CPU features, i.e. SVS [1]
4. cpufreq: mediatek-hw: register EM power table
5. cpufreq: mediatek-hw: Add SVS CPU initialization
6. cpufreq: mediatek-hw: Add cooling dev flag
I supposed that it could be more clean to separate #4~#6 in another
patchset.May I know is it okay to you? Or I should merge all of changes
into v8 like you mentioned? Thank you.
[1]
https://patchwork.kernel.org/project/linux-mediatek/patch/20190906100514.30803-4-roger.lu%40mediatek.com/
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v1] cpufreq: mediatek-hw: Add support for Mediatek cpufreq HW driver
2020-10-23 9:08 ` Hector Yuan
@ 2020-10-23 9:27 ` Viresh Kumar
2020-10-26 6:20 ` Hector Yuan
0 siblings, 1 reply; 20+ messages in thread
From: Viresh Kumar @ 2020-10-23 9:27 UTC (permalink / raw)
To: Hector Yuan
Cc: linux-mediatek, linux-arm-kernel, linux-pm, Rob Herring,
Rafael J. Wysocki, Maxime Ripard, Santosh Shilimkar,
Amit Kucheria, Stephen Boyd, Ulf Hansson, Dave Gerlach,
Florian Fainelli, Robin Murphy, Lorenzo Pieralisi, devicetree,
linux-kernel, wsd_upstream
On 23-10-20, 17:08, Hector Yuan wrote:
> On Fri, 2020-10-23 at 13:58 +0530, Viresh Kumar wrote:
> > On 23-10-20, 16:24, Hector Yuan wrote:
> > > This patchset includes 6 patches and depends on the MT6779 DTS patch[1] submitted by Hanks Chen.
> > > The first 3 patches are for CPUFREQ HW driver and device tree binding, which are already sent before separately [2][3]. For binding part, I add a new patch to add property in cpu schema.
> > > Besides, we add three more patches including EM power table, SVS CPU initialize, and cooling device.
> >
> > And even after so many versions of these you chose to name this V1. It
> > is very difficult for reviewers to find time to review your stuff, and
> > they expect some sort of summary from you on what exactly changed from
> > last version and you also need to name the current version currently.
> >
> > This should have been V8 and you should have added a "V7->V8 diff:"
> > section here, naming all the changes you did. Please send that as
> > reply to this email, so I can see what really changed.
> >
> Hi, Viresh
>
> Sorry for your inconvenience.
> #1~#3 is for cpufreq driver we have reviewed and the bindings which
> separate freq domain to CPU schema.There is no change for the driver
> itself.
> 1. cpufreq: mediatek-hw: Add support for CPUFREQ HW
> 2. dt-bindings: arm: cpus: Document 'mtk,freq-domain' property
> 3. dt-bindings: cpufreq: add bindings for MediaTek cpufreq HW
>
> #4~#6 is for other CPU features, i.e. SVS [1]
> 4. cpufreq: mediatek-hw: register EM power table
> 5. cpufreq: mediatek-hw: Add SVS CPU initialization
> 6. cpufreq: mediatek-hw: Add cooling dev flag
>
> I supposed that it could be more clean to separate #4~#6 in another
> patchset.May I know is it okay to you? Or I should merge all of changes
> into v8 like you mentioned? Thank you.
Merge them all together and explain any special features (like SVS) in
the commit log. It will also help in future when people want to
understand your driver. Explain whatever is worth explaining there and
is not straight forward.
Thanks for the details.
--
viresh
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v1] cpufreq: mediatek-hw: Add support for Mediatek cpufreq HW driver
2020-10-23 9:27 ` Viresh Kumar
@ 2020-10-26 6:20 ` Hector Yuan
0 siblings, 0 replies; 20+ messages in thread
From: Hector Yuan @ 2020-10-26 6:20 UTC (permalink / raw)
To: Viresh Kumar
Cc: linux-mediatek, linux-arm-kernel, linux-pm, Rob Herring,
Rafael J. Wysocki, Maxime Ripard, Santosh Shilimkar,
Amit Kucheria, Stephen Boyd, Ulf Hansson, Dave Gerlach,
Florian Fainelli, Robin Murphy, Lorenzo Pieralisi, devicetree,
linux-kernel, wsd_upstream
On Fri, 2020-10-23 at 14:57 +0530, Viresh Kumar wrote:
> On 23-10-20, 17:08, Hector Yuan wrote:
> > On Fri, 2020-10-23 at 13:58 +0530, Viresh Kumar wrote:
> > > On 23-10-20, 16:24, Hector Yuan wrote:
> > > > This patchset includes 6 patches and depends on the MT6779 DTS patch[1] submitted by Hanks Chen.
> > > > The first 3 patches are for CPUFREQ HW driver and device tree binding, which are already sent before separately [2][3]. For binding part, I add a new patch to add property in cpu schema.
> > > > Besides, we add three more patches including EM power table, SVS CPU initialize, and cooling device.
> > >
> > > And even after so many versions of these you chose to name this V1. It
> > > is very difficult for reviewers to find time to review your stuff, and
> > > they expect some sort of summary from you on what exactly changed from
> > > last version and you also need to name the current version currently.
> > >
> > > This should have been V8 and you should have added a "V7->V8 diff:"
> > > section here, naming all the changes you did. Please send that as
> > > reply to this email, so I can see what really changed.
> > >
> > Hi, Viresh
> >
> > Sorry for your inconvenience.
> > #1~#3 is for cpufreq driver we have reviewed and the bindings which
> > separate freq domain to CPU schema.There is no change for the driver
> > itself.
> > 1. cpufreq: mediatek-hw: Add support for CPUFREQ HW
> > 2. dt-bindings: arm: cpus: Document 'mtk,freq-domain' property
> > 3. dt-bindings: cpufreq: add bindings for MediaTek cpufreq HW
> >
> > #4~#6 is for other CPU features, i.e. SVS [1]
> > 4. cpufreq: mediatek-hw: register EM power table
> > 5. cpufreq: mediatek-hw: Add SVS CPU initialization
> > 6. cpufreq: mediatek-hw: Add cooling dev flag
> >
> > I supposed that it could be more clean to separate #4~#6 in another
> > patchset.May I know is it okay to you? Or I should merge all of changes
> > into v8 like you mentioned? Thank you.
>
> Merge them all together and explain any special features (like SVS) in
> the commit log. It will also help in future when people want to
> understand your driver. Explain whatever is worth explaining there and
> is not straight forward.
>
> Thanks for the details.
>
OK, I will merge all changes in v8. And explain details in cover-letter.
Thank you.
^ permalink raw reply [flat|nested] 20+ messages in thread