All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: linux-pm@vger.kernel.org
Cc: linux-rockchip@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
	Heiko Stuebner <heiko@sntech.de>,
	Kyungmin Park <kyungmin.park@samsung.com>,
	MyungJoo Ham <myungjoo.ham@samsung.com>,
	Will Deacon <will@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	kernel@pegutronix.de,
	Michael Riesch <michael.riesch@wolfvision.net>,
	Sascha Hauer <s.hauer@pengutronix.de>
Subject: [PATCH 11/18] PM / devfreq: rockchip-dfi: Handle LPDDR2 correctly
Date: Fri,  3 Feb 2023 13:50:05 +0100	[thread overview]
Message-ID: <20230203125012.3804008-12-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20230203125012.3804008-1-s.hauer@pengutronix.de>

According to the downstream driver the DDRMON_CTRL_LPDDR23 bit must be
set for both LPDDR2 and LPDDR3. Add the missing LPDDR2 case and while
at it turn the if/else if/else into switch/case which makes it easier
to read.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/devfreq/event/rockchip-dfi.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c
index 78cb594bd2a81..92ee61c96a1a9 100644
--- a/drivers/devfreq/event/rockchip-dfi.c
+++ b/drivers/devfreq/event/rockchip-dfi.c
@@ -82,12 +82,19 @@ static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev)
 	writel_relaxed(HIWORD_UPDATE(0, 0xffff), dfi_regs + DDRMON_CTRL);
 
 	/* set ddr type to dfi */
-	if (dfi->ddr_type == ROCKCHIP_DDRTYPE_LPDDR3)
+	switch (dfi->ddr_type) {
+	case ROCKCHIP_DDRTYPE_LPDDR2:
+	case ROCKCHIP_DDRTYPE_LPDDR3:
 		writel_relaxed(HIWORD_UPDATE(DDRMON_CTRL_LPDDR23, DDRMON_CTRL_DDR_TYPE_MASK),
 			       dfi_regs + DDRMON_CTRL);
-	else if (dfi->ddr_type == ROCKCHIP_DDRTYPE_LPDDR4)
+		break;
+	case ROCKCHIP_DDRTYPE_LPDDR4:
 		writel_relaxed(HIWORD_UPDATE(DDRMON_CTRL_LPDDR4, DDRMON_CTRL_DDR_TYPE_MASK),
 			       dfi_regs + DDRMON_CTRL);
+		break;
+	default:
+		break;
+	}
 
 	/* enable count, use software mode */
 	writel_relaxed(HIWORD_UPDATE(DDRMON_CTRL_SOFTWARE_EN, DDRMON_CTRL_SOFTWARE_EN),
-- 
2.30.2


WARNING: multiple messages have this Message-ID (diff)
From: Sascha Hauer <s.hauer@pengutronix.de>
To: linux-pm@vger.kernel.org
Cc: linux-rockchip@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
	Heiko Stuebner <heiko@sntech.de>,
	Kyungmin Park <kyungmin.park@samsung.com>,
	MyungJoo Ham <myungjoo.ham@samsung.com>,
	Will Deacon <will@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	kernel@pegutronix.de,
	Michael Riesch <michael.riesch@wolfvision.net>,
	Sascha Hauer <s.hauer@pengutronix.de>
Subject: [PATCH 11/18] PM / devfreq: rockchip-dfi: Handle LPDDR2 correctly
Date: Fri,  3 Feb 2023 13:50:05 +0100	[thread overview]
Message-ID: <20230203125012.3804008-12-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20230203125012.3804008-1-s.hauer@pengutronix.de>

According to the downstream driver the DDRMON_CTRL_LPDDR23 bit must be
set for both LPDDR2 and LPDDR3. Add the missing LPDDR2 case and while
at it turn the if/else if/else into switch/case which makes it easier
to read.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/devfreq/event/rockchip-dfi.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c
index 78cb594bd2a81..92ee61c96a1a9 100644
--- a/drivers/devfreq/event/rockchip-dfi.c
+++ b/drivers/devfreq/event/rockchip-dfi.c
@@ -82,12 +82,19 @@ static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev)
 	writel_relaxed(HIWORD_UPDATE(0, 0xffff), dfi_regs + DDRMON_CTRL);
 
 	/* set ddr type to dfi */
-	if (dfi->ddr_type == ROCKCHIP_DDRTYPE_LPDDR3)
+	switch (dfi->ddr_type) {
+	case ROCKCHIP_DDRTYPE_LPDDR2:
+	case ROCKCHIP_DDRTYPE_LPDDR3:
 		writel_relaxed(HIWORD_UPDATE(DDRMON_CTRL_LPDDR23, DDRMON_CTRL_DDR_TYPE_MASK),
 			       dfi_regs + DDRMON_CTRL);
-	else if (dfi->ddr_type == ROCKCHIP_DDRTYPE_LPDDR4)
+		break;
+	case ROCKCHIP_DDRTYPE_LPDDR4:
 		writel_relaxed(HIWORD_UPDATE(DDRMON_CTRL_LPDDR4, DDRMON_CTRL_DDR_TYPE_MASK),
 			       dfi_regs + DDRMON_CTRL);
+		break;
+	default:
+		break;
+	}
 
 	/* enable count, use software mode */
 	writel_relaxed(HIWORD_UPDATE(DDRMON_CTRL_SOFTWARE_EN, DDRMON_CTRL_SOFTWARE_EN),
-- 
2.30.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

WARNING: multiple messages have this Message-ID (diff)
From: Sascha Hauer <s.hauer@pengutronix.de>
To: linux-pm@vger.kernel.org
Cc: linux-rockchip@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
	Heiko Stuebner <heiko@sntech.de>,
	Kyungmin Park <kyungmin.park@samsung.com>,
	MyungJoo Ham <myungjoo.ham@samsung.com>,
	Will Deacon <will@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	kernel@pegutronix.de,
	Michael Riesch <michael.riesch@wolfvision.net>,
	Sascha Hauer <s.hauer@pengutronix.de>
Subject: [PATCH 11/18] PM / devfreq: rockchip-dfi: Handle LPDDR2 correctly
Date: Fri,  3 Feb 2023 13:50:05 +0100	[thread overview]
Message-ID: <20230203125012.3804008-12-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20230203125012.3804008-1-s.hauer@pengutronix.de>

According to the downstream driver the DDRMON_CTRL_LPDDR23 bit must be
set for both LPDDR2 and LPDDR3. Add the missing LPDDR2 case and while
at it turn the if/else if/else into switch/case which makes it easier
to read.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/devfreq/event/rockchip-dfi.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c
index 78cb594bd2a81..92ee61c96a1a9 100644
--- a/drivers/devfreq/event/rockchip-dfi.c
+++ b/drivers/devfreq/event/rockchip-dfi.c
@@ -82,12 +82,19 @@ static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev)
 	writel_relaxed(HIWORD_UPDATE(0, 0xffff), dfi_regs + DDRMON_CTRL);
 
 	/* set ddr type to dfi */
-	if (dfi->ddr_type == ROCKCHIP_DDRTYPE_LPDDR3)
+	switch (dfi->ddr_type) {
+	case ROCKCHIP_DDRTYPE_LPDDR2:
+	case ROCKCHIP_DDRTYPE_LPDDR3:
 		writel_relaxed(HIWORD_UPDATE(DDRMON_CTRL_LPDDR23, DDRMON_CTRL_DDR_TYPE_MASK),
 			       dfi_regs + DDRMON_CTRL);
-	else if (dfi->ddr_type == ROCKCHIP_DDRTYPE_LPDDR4)
+		break;
+	case ROCKCHIP_DDRTYPE_LPDDR4:
 		writel_relaxed(HIWORD_UPDATE(DDRMON_CTRL_LPDDR4, DDRMON_CTRL_DDR_TYPE_MASK),
 			       dfi_regs + DDRMON_CTRL);
+		break;
+	default:
+		break;
+	}
 
 	/* enable count, use software mode */
 	writel_relaxed(HIWORD_UPDATE(DDRMON_CTRL_SOFTWARE_EN, DDRMON_CTRL_SOFTWARE_EN),
-- 
2.30.2


_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

  parent reply	other threads:[~2023-02-03 12:50 UTC|newest]

Thread overview: 75+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-03 12:49 [PATCH 00/18] Add perf support to the rockchip-dfi driver Sascha Hauer
2023-02-03 12:49 ` Sascha Hauer
2023-02-03 12:49 ` Sascha Hauer
2023-02-03 12:49 ` [PATCH 01/18] PM / devfreq: rockchip-dfi: Embed desc into private data struct Sascha Hauer
2023-02-03 12:49   ` Sascha Hauer
2023-02-03 12:49   ` Sascha Hauer
2023-02-03 12:49 ` [PATCH 02/18] PM / devfreq: rockchip-dfi: use consistent name for " Sascha Hauer
2023-02-03 12:49   ` Sascha Hauer
2023-02-03 12:49   ` Sascha Hauer
2023-02-03 12:49 ` [PATCH 03/18] PM / devfreq: rockchip-dfi: Make pmu regmap mandatory Sascha Hauer
2023-02-03 12:49   ` Sascha Hauer
2023-02-03 12:49   ` Sascha Hauer
2023-02-03 12:49 ` [PATCH 04/18] PM / devfreq: rockchip-dfi: Add SoC specific init function Sascha Hauer
2023-02-03 12:49   ` Sascha Hauer
2023-02-03 12:49   ` Sascha Hauer
2023-02-03 12:49 ` [PATCH 05/18] PM / devfreq: rockchip-dfi: dfi store raw values in counter struct Sascha Hauer
2023-02-03 12:49   ` Sascha Hauer
2023-02-03 12:49   ` Sascha Hauer
2023-02-03 12:50 ` [PATCH 06/18] PM / devfreq: rockchip-dfi: Use free running counter Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50 ` [PATCH 07/18] PM / devfreq: rockchip-dfi: introduce channel mask Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50 ` [PATCH 08/18] PM / devfreq: rk3399_dmc,dfi: generalize DDRTYPE defines Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50 ` [PATCH 09/18] PM / devfreq: rockchip-dfi: Clean up DDR type register defines Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50 ` [PATCH 10/18] PM / devfreq: rockchip-dfi: Add RK3568 support Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50 ` Sascha Hauer [this message]
2023-02-03 12:50   ` [PATCH 11/18] PM / devfreq: rockchip-dfi: Handle LPDDR2 correctly Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50 ` [PATCH 12/18] PM / devfreq: rockchip-dfi: Handle LPDDR4X Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50 ` [PATCH 13/18] PM / devfreq: rockchip-dfi: Pass private data struct to internal functions Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50 ` [PATCH 14/18] PM / devfreq: rockchip-dfi: Prepare for multiple users Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50 ` [PATCH 15/18] PM / devfreq: rockchip-dfi: Add perf support Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50 ` [PATCH 16/18] arm64: dts: rockchip: rk3399: Enable DFI Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50 ` [PATCH 17/18] arm64: dts: rockchip: rk356x: Add DFI Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50 ` [PATCH 18/18] dt-bindings: devfreq: event: convert Rockchip DFI binding to yaml Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 12:50   ` Sascha Hauer
2023-02-03 15:14   ` Krzysztof Kozlowski
2023-02-03 15:14     ` Krzysztof Kozlowski
2023-02-03 15:14     ` Krzysztof Kozlowski
2023-02-03 15:19     ` Krzysztof Kozlowski
2023-02-03 15:19       ` Krzysztof Kozlowski
2023-02-03 15:19       ` Krzysztof Kozlowski
2023-02-03 16:02     ` Sascha Hauer
2023-02-03 16:02       ` Sascha Hauer
2023-02-03 16:02       ` Sascha Hauer
2023-02-03 18:09       ` Krzysztof Kozlowski
2023-02-03 18:09         ` Krzysztof Kozlowski
2023-02-03 18:09         ` Krzysztof Kozlowski
2023-02-03 20:18   ` Rob Herring
2023-02-03 20:18     ` Rob Herring
2023-02-03 20:18     ` Rob Herring
2023-02-04  4:49   ` kernel test robot
2023-02-04  4:49     ` kernel test robot
2023-02-04  4:49     ` kernel test robot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230203125012.3804008-12-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=devicetree@vger.kernel.org \
    --cc=heiko@sntech.de \
    --cc=kernel@pegutronix.de \
    --cc=kyungmin.park@samsung.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=mark.rutland@arm.com \
    --cc=michael.riesch@wolfvision.net \
    --cc=myungjoo.ham@samsung.com \
    --cc=will@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.