* [PATCH v2 1/3] devfreq: exynos-ppmu: use node names with hyphens
2021-09-20 7:15 ` [PATCH v2 0/3] devfreq: exynos-ppmu: conform to dt naming convention Krzysztof Kozlowski
@ 2021-09-20 7:17 ` Krzysztof Kozlowski
2021-09-22 7:55 ` Chanwoo Choi
2021-09-20 7:17 ` [PATCH v2 2/3] devfreq: exynos-ppmu: simplify parsing event-type from DT Krzysztof Kozlowski
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Krzysztof Kozlowski @ 2021-09-20 7:17 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Chanwoo Choi, MyungJoo Ham,
Kyungmin Park, devicetree, linux-arm-kernel, linux-samsung-soc,
linux-kernel, linux-pm
Cc: Marek Szyprowski, Sylwester Nawrocki, Bartlomiej Zolnierkiewicz
Devicetree naming convention requires device node names to use hyphens
instead of underscore, so Exynos5422 devfreq event name
"ppmu-event3-dmc0_0" should be "ppmu-event3-dmc0-0". Newly introduced
dtschema enforces this, however the driver still expects old name with
an underscore.
Add new events for Exynos5422 while still accepting old name for
backwards compatibility.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
drivers/devfreq/event/exynos-ppmu.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/devfreq/event/exynos-ppmu.c b/drivers/devfreq/event/exynos-ppmu.c
index 17ed980d9099..541bd13ab61d 100644
--- a/drivers/devfreq/event/exynos-ppmu.c
+++ b/drivers/devfreq/event/exynos-ppmu.c
@@ -94,11 +94,16 @@ static struct __exynos_ppmu_events {
PPMU_EVENT(d1-general),
PPMU_EVENT(d1-rt),
- /* For Exynos5422 SoC */
+ /* For Exynos5422 SoC, deprecated (backwards compatible) */
PPMU_EVENT(dmc0_0),
PPMU_EVENT(dmc0_1),
PPMU_EVENT(dmc1_0),
PPMU_EVENT(dmc1_1),
+ /* For Exynos5422 SoC */
+ PPMU_EVENT(dmc0-0),
+ PPMU_EVENT(dmc0-1),
+ PPMU_EVENT(dmc1-0),
+ PPMU_EVENT(dmc1-1),
};
static int __exynos_ppmu_find_ppmu_id(const char *edev_name)
--
2.30.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 1/3] devfreq: exynos-ppmu: use node names with hyphens
2021-09-20 7:17 ` [PATCH v2 1/3] devfreq: exynos-ppmu: use node names with hyphens Krzysztof Kozlowski
@ 2021-09-22 7:55 ` Chanwoo Choi
0 siblings, 0 replies; 9+ messages in thread
From: Chanwoo Choi @ 2021-09-22 7:55 UTC (permalink / raw)
To: Krzysztof Kozlowski, Rob Herring, Chanwoo Choi, MyungJoo Ham,
Kyungmin Park, devicetree, linux-arm-kernel, linux-samsung-soc,
linux-kernel, linux-pm
Cc: Marek Szyprowski, Sylwester Nawrocki, Bartlomiej Zolnierkiewicz
Hi Krzysztof,
On 21. 9. 20. 오후 4:17, Krzysztof Kozlowski wrote:
> Devicetree naming convention requires device node names to use hyphens
> instead of underscore, so Exynos5422 devfreq event name
> "ppmu-event3-dmc0_0" should be "ppmu-event3-dmc0-0". Newly introduced
> dtschema enforces this, however the driver still expects old name with
> an underscore.
>
> Add new events for Exynos5422 while still accepting old name for
> backwards compatibility.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
> ---
> drivers/devfreq/event/exynos-ppmu.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/devfreq/event/exynos-ppmu.c b/drivers/devfreq/event/exynos-ppmu.c
> index 17ed980d9099..541bd13ab61d 100644
> --- a/drivers/devfreq/event/exynos-ppmu.c
> +++ b/drivers/devfreq/event/exynos-ppmu.c
> @@ -94,11 +94,16 @@ static struct __exynos_ppmu_events {
> PPMU_EVENT(d1-general),
> PPMU_EVENT(d1-rt),
>
> - /* For Exynos5422 SoC */
> + /* For Exynos5422 SoC, deprecated (backwards compatible) */
> PPMU_EVENT(dmc0_0),
> PPMU_EVENT(dmc0_1),
> PPMU_EVENT(dmc1_0),
> PPMU_EVENT(dmc1_1),
> + /* For Exynos5422 SoC */
> + PPMU_EVENT(dmc0-0),
> + PPMU_EVENT(dmc0-1),
> + PPMU_EVENT(dmc1-0),
> + PPMU_EVENT(dmc1-1),
> };
>
> static int __exynos_ppmu_find_ppmu_id(const char *edev_name)
>
Applied it. Thanks.
--
Best Regards,
Samsung Electronics
Chanwoo Choi
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 2/3] devfreq: exynos-ppmu: simplify parsing event-type from DT
2021-09-20 7:15 ` [PATCH v2 0/3] devfreq: exynos-ppmu: conform to dt naming convention Krzysztof Kozlowski
2021-09-20 7:17 ` [PATCH v2 1/3] devfreq: exynos-ppmu: use node names with hyphens Krzysztof Kozlowski
@ 2021-09-20 7:17 ` Krzysztof Kozlowski
2021-09-22 8:05 ` Chanwoo Choi
2021-09-20 7:17 ` [PATCH v2 3/3] ARM: dts: exynos: align PPMU event node names with dtschema Krzysztof Kozlowski
2021-09-20 9:38 ` [PATCH v2 0/3] devfreq: exynos-ppmu: conform to dt naming convention Marek Szyprowski
3 siblings, 1 reply; 9+ messages in thread
From: Krzysztof Kozlowski @ 2021-09-20 7:17 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Chanwoo Choi, MyungJoo Ham,
Kyungmin Park, devicetree, linux-arm-kernel, linux-samsung-soc,
linux-kernel, linux-pm
Cc: Marek Szyprowski, Sylwester Nawrocki, Bartlomiej Zolnierkiewicz
When parsing devicetree, the function of_get_devfreq_events(), for each
device child node, iterates over array of possible events "ppmu_events"
till it finds one matching by node name. When match is found the
ppmu_events[i] points to element having both the name of the event and
the counters ID.
Each PPMU device child node might have an "event-name" property with the
name of the event, however due to the design of devfreq it must be the
same as the device node name. If it is not the same, the devfreq client
won't be able to use it via devfreq_event_get_edev_by_phandle().
Since PPMU device child node name must be equal to the "event-name"
property (event-name == ppmu_events[i].name), there is no need to find
the counters ID by the "event-name". Instead use ppmu_events[i].id
which must be equal to it.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
drivers/devfreq/event/exynos-ppmu.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/devfreq/event/exynos-ppmu.c b/drivers/devfreq/event/exynos-ppmu.c
index 541bd13ab61d..9b849d781116 100644
--- a/drivers/devfreq/event/exynos-ppmu.c
+++ b/drivers/devfreq/event/exynos-ppmu.c
@@ -566,13 +566,10 @@ static int of_get_devfreq_events(struct device_node *np,
* use default if not.
*/
if (info->ppmu_type == EXYNOS_TYPE_PPMU_V2) {
- int id;
/* Not all registers take the same value for
* read+write data count.
*/
- id = __exynos_ppmu_find_ppmu_id(desc[j].name);
-
- switch (id) {
+ switch (ppmu_events[i].id) {
case PPMU_PMNCNT0:
case PPMU_PMNCNT1:
case PPMU_PMNCNT2:
--
2.30.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 2/3] devfreq: exynos-ppmu: simplify parsing event-type from DT
2021-09-20 7:17 ` [PATCH v2 2/3] devfreq: exynos-ppmu: simplify parsing event-type from DT Krzysztof Kozlowski
@ 2021-09-22 8:05 ` Chanwoo Choi
0 siblings, 0 replies; 9+ messages in thread
From: Chanwoo Choi @ 2021-09-22 8:05 UTC (permalink / raw)
To: Krzysztof Kozlowski, Rob Herring, Chanwoo Choi, MyungJoo Ham,
Kyungmin Park, devicetree, linux-arm-kernel, linux-samsung-soc,
linux-kernel, linux-pm
Cc: Marek Szyprowski, Sylwester Nawrocki, Bartlomiej Zolnierkiewicz
Hi Krzysztof,
On 21. 9. 20. 오후 4:17, Krzysztof Kozlowski wrote:
> When parsing devicetree, the function of_get_devfreq_events(), for each
> device child node, iterates over array of possible events "ppmu_events"
> till it finds one matching by node name. When match is found the
> ppmu_events[i] points to element having both the name of the event and
> the counters ID.
>
> Each PPMU device child node might have an "event-name" property with the
> name of the event, however due to the design of devfreq it must be the
> same as the device node name. If it is not the same, the devfreq client
> won't be able to use it via devfreq_event_get_edev_by_phandle().
>
> Since PPMU device child node name must be equal to the "event-name"
> property (event-name == ppmu_events[i].name), there is no need to find
> the counters ID by the "event-name". Instead use ppmu_events[i].id
> which must be equal to it.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
> ---
> drivers/devfreq/event/exynos-ppmu.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/devfreq/event/exynos-ppmu.c b/drivers/devfreq/event/exynos-ppmu.c
> index 541bd13ab61d..9b849d781116 100644
> --- a/drivers/devfreq/event/exynos-ppmu.c
> +++ b/drivers/devfreq/event/exynos-ppmu.c
> @@ -566,13 +566,10 @@ static int of_get_devfreq_events(struct device_node *np,
> * use default if not.
> */
> if (info->ppmu_type == EXYNOS_TYPE_PPMU_V2) {
> - int id;
> /* Not all registers take the same value for
> * read+write data count.
> */
> - id = __exynos_ppmu_find_ppmu_id(desc[j].name);
> -
> - switch (id) {
> + switch (ppmu_events[i].id) {
> case PPMU_PMNCNT0:
> case PPMU_PMNCNT1:
> case PPMU_PMNCNT2:
>
Applied it. Thanks.
--
Best Regards,
Samsung Electronics
Chanwoo Choi
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 3/3] ARM: dts: exynos: align PPMU event node names with dtschema
2021-09-20 7:15 ` [PATCH v2 0/3] devfreq: exynos-ppmu: conform to dt naming convention Krzysztof Kozlowski
2021-09-20 7:17 ` [PATCH v2 1/3] devfreq: exynos-ppmu: use node names with hyphens Krzysztof Kozlowski
2021-09-20 7:17 ` [PATCH v2 2/3] devfreq: exynos-ppmu: simplify parsing event-type from DT Krzysztof Kozlowski
@ 2021-09-20 7:17 ` Krzysztof Kozlowski
2021-09-23 2:22 ` Chanwoo Choi
2022-02-18 13:18 ` (subset) " Krzysztof Kozlowski
2021-09-20 9:38 ` [PATCH v2 0/3] devfreq: exynos-ppmu: conform to dt naming convention Marek Szyprowski
3 siblings, 2 replies; 9+ messages in thread
From: Krzysztof Kozlowski @ 2021-09-20 7:17 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Chanwoo Choi, MyungJoo Ham,
Kyungmin Park, devicetree, linux-arm-kernel, linux-samsung-soc,
linux-kernel, linux-pm
Cc: Marek Szyprowski, Sylwester Nawrocki, Bartlomiej Zolnierkiewicz
Use hyphen instead of underscore and align the PPMU event node name with
dtschema. The event-name property must match the node name, by the
design of devfreq events and PPMU driver.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
arch/arm/boot/dts/exynos5420.dtsi | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index e23e8ffb093f..b2f30bea96ce 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -302,8 +302,8 @@ ppmu_dmc0_0: ppmu@10d00000 {
clocks = <&clock CLK_PCLK_PPMU_DREX0_0>;
clock-names = "ppmu";
events {
- ppmu_event3_dmc0_0: ppmu-event3-dmc0_0 {
- event-name = "ppmu-event3-dmc0_0";
+ ppmu_event3_dmc0_0: ppmu-event3-dmc0-0 {
+ event-name = "ppmu-event3-dmc0-0";
};
};
};
@@ -314,8 +314,8 @@ ppmu_dmc0_1: ppmu@10d10000 {
clocks = <&clock CLK_PCLK_PPMU_DREX0_1>;
clock-names = "ppmu";
events {
- ppmu_event3_dmc0_1: ppmu-event3-dmc0_1 {
- event-name = "ppmu-event3-dmc0_1";
+ ppmu_event3_dmc0_1: ppmu-event3-dmc0-1 {
+ event-name = "ppmu-event3-dmc0-1";
};
};
};
@@ -326,8 +326,8 @@ ppmu_dmc1_0: ppmu@10d60000 {
clocks = <&clock CLK_PCLK_PPMU_DREX1_0>;
clock-names = "ppmu";
events {
- ppmu_event3_dmc1_0: ppmu-event3-dmc1_0 {
- event-name = "ppmu-event3-dmc1_0";
+ ppmu_event3_dmc1_0: ppmu-event3-dmc1-0 {
+ event-name = "ppmu-event3-dmc1-0";
};
};
};
@@ -338,8 +338,8 @@ ppmu_dmc1_1: ppmu@10d70000 {
clocks = <&clock CLK_PCLK_PPMU_DREX1_1>;
clock-names = "ppmu";
events {
- ppmu_event3_dmc1_1: ppmu-event3-dmc1_1 {
- event-name = "ppmu-event3-dmc1_1";
+ ppmu_event3_dmc1_1: ppmu-event3-dmc1-1 {
+ event-name = "ppmu-event3-dmc1-1";
};
};
};
--
2.30.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 3/3] ARM: dts: exynos: align PPMU event node names with dtschema
2021-09-20 7:17 ` [PATCH v2 3/3] ARM: dts: exynos: align PPMU event node names with dtschema Krzysztof Kozlowski
@ 2021-09-23 2:22 ` Chanwoo Choi
2022-02-18 13:18 ` (subset) " Krzysztof Kozlowski
1 sibling, 0 replies; 9+ messages in thread
From: Chanwoo Choi @ 2021-09-23 2:22 UTC (permalink / raw)
To: Krzysztof Kozlowski, Rob Herring, MyungJoo Ham, Kyungmin Park,
devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel,
linux-pm
Cc: Marek Szyprowski, Sylwester Nawrocki, Bartlomiej Zolnierkiewicz
Hi Krzysztof,
On 9/20/21 4:17 PM, Krzysztof Kozlowski wrote:
> Use hyphen instead of underscore and align the PPMU event node name with
> dtschema. The event-name property must match the node name, by the
> design of devfreq events and PPMU driver.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
> ---
> arch/arm/boot/dts/exynos5420.dtsi | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
> index e23e8ffb093f..b2f30bea96ce 100644
> --- a/arch/arm/boot/dts/exynos5420.dtsi
> +++ b/arch/arm/boot/dts/exynos5420.dtsi
> @@ -302,8 +302,8 @@ ppmu_dmc0_0: ppmu@10d00000 {
> clocks = <&clock CLK_PCLK_PPMU_DREX0_0>;
> clock-names = "ppmu";
> events {
> - ppmu_event3_dmc0_0: ppmu-event3-dmc0_0 {
> - event-name = "ppmu-event3-dmc0_0";
> + ppmu_event3_dmc0_0: ppmu-event3-dmc0-0 {
> + event-name = "ppmu-event3-dmc0-0";
> };
> };
> };
> @@ -314,8 +314,8 @@ ppmu_dmc0_1: ppmu@10d10000 {
> clocks = <&clock CLK_PCLK_PPMU_DREX0_1>;
> clock-names = "ppmu";
> events {
> - ppmu_event3_dmc0_1: ppmu-event3-dmc0_1 {
> - event-name = "ppmu-event3-dmc0_1";
> + ppmu_event3_dmc0_1: ppmu-event3-dmc0-1 {
> + event-name = "ppmu-event3-dmc0-1";
> };
> };
> };
> @@ -326,8 +326,8 @@ ppmu_dmc1_0: ppmu@10d60000 {
> clocks = <&clock CLK_PCLK_PPMU_DREX1_0>;
> clock-names = "ppmu";
> events {
> - ppmu_event3_dmc1_0: ppmu-event3-dmc1_0 {
> - event-name = "ppmu-event3-dmc1_0";
> + ppmu_event3_dmc1_0: ppmu-event3-dmc1-0 {
> + event-name = "ppmu-event3-dmc1-0";
> };
> };
> };
> @@ -338,8 +338,8 @@ ppmu_dmc1_1: ppmu@10d70000 {
> clocks = <&clock CLK_PCLK_PPMU_DREX1_1>;
> clock-names = "ppmu";
> events {
> - ppmu_event3_dmc1_1: ppmu-event3-dmc1_1 {
> - event-name = "ppmu-event3-dmc1_1";
> + ppmu_event3_dmc1_1: ppmu-event3-dmc1-1 {
> + event-name = "ppmu-event3-dmc1-1";
> };
> };
> };
>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
--
Best Regards,
Chanwoo Choi
Samsung Electronics
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: (subset) [PATCH v2 3/3] ARM: dts: exynos: align PPMU event node names with dtschema
2021-09-20 7:17 ` [PATCH v2 3/3] ARM: dts: exynos: align PPMU event node names with dtschema Krzysztof Kozlowski
2021-09-23 2:22 ` Chanwoo Choi
@ 2022-02-18 13:18 ` Krzysztof Kozlowski
1 sibling, 0 replies; 9+ messages in thread
From: Krzysztof Kozlowski @ 2022-02-18 13:18 UTC (permalink / raw)
To: devicetree, MyungJoo Ham, linux-pm, Krzysztof Kozlowski,
linux-samsung-soc, linux-arm-kernel, linux-kernel, Chanwoo Choi,
Kyungmin Park, Rob Herring
Cc: Marek Szyprowski, Bartlomiej Zolnierkiewicz, Sylwester Nawrocki
On Mon, 20 Sep 2021 09:17:53 +0200, Krzysztof Kozlowski wrote:
> Use hyphen instead of underscore and align the PPMU event node name with
> dtschema. The event-name property must match the node name, by the
> design of devfreq events and PPMU driver.
>
>
Applied, thanks!
[3/3] ARM: dts: exynos: align PPMU event node names with dtschema
commit: 7cdfe3b3b60c89f0e12e8ee194a7cfbfd46515dd
Best regards,
--
Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 0/3] devfreq: exynos-ppmu: conform to dt naming convention
2021-09-20 7:15 ` [PATCH v2 0/3] devfreq: exynos-ppmu: conform to dt naming convention Krzysztof Kozlowski
` (2 preceding siblings ...)
2021-09-20 7:17 ` [PATCH v2 3/3] ARM: dts: exynos: align PPMU event node names with dtschema Krzysztof Kozlowski
@ 2021-09-20 9:38 ` Marek Szyprowski
3 siblings, 0 replies; 9+ messages in thread
From: Marek Szyprowski @ 2021-09-20 9:38 UTC (permalink / raw)
To: Krzysztof Kozlowski, Rob Herring, Chanwoo Choi, MyungJoo Ham,
Kyungmin Park, devicetree, linux-arm-kernel, linux-samsung-soc,
linux-kernel, linux-pm
Cc: Sylwester Nawrocki, Bartlomiej Zolnierkiewicz
On 20.09.2021 09:15, Krzysztof Kozlowski wrote:
> My previous patch 3/3 (ARM: dts: exynos: align PPMU event node names
> with dtschema) caused issues reported by Marek [1].
>
> Tested on Exynos5422. Testing on Exynso5433 board would be very useful.
Works fine on both 5422 and 5433.
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
> Changes since v1:
> 1. New patches 1/3 and 2/3.
> 2. Patch 3/3: rename event-name to match node name.
>
> [1] https://lore.kernel.org/linux-samsung-soc/0212a402-1490-0f8f-005e-32bb6f636a13@canonical.com/T/#m570c0257204af553fe11f9122551311beb56c15e
>
> Best regards,
> Krzysztof
>
>
> Krzysztof Kozlowski (3):
> devfreq: exynos-ppmu: use node names with hyphens
> devfreq: exynos-ppmu: simplify parsing event-type from DT
> ARM: dts: exynos: align PPMU event node names with dtschema
>
> arch/arm/boot/dts/exynos5420.dtsi | 16 ++++++++--------
> drivers/devfreq/event/exynos-ppmu.c | 12 +++++++-----
> 2 files changed, 15 insertions(+), 13 deletions(-)
>
Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland
^ permalink raw reply [flat|nested] 9+ messages in thread