* [PATCH v6 1/3] arm64: dts: qcom: sc7180: Add cpuidle low power states
2020-02-21 9:32 [PATCH v6 0/3] Invoke rpmh_flush for non OSI targets Maulik Shah
@ 2020-02-21 9:32 ` Maulik Shah
2020-02-24 6:41 ` Srinivas Rao L
2020-02-21 9:32 ` [PATCH v6 2/3] soc: qcom: rpmh: Update dirty flag only when data changes Maulik Shah
2020-02-21 9:32 ` [PATCH v6 3/3] soc: qcom: rpmh: Invoke rpmh_flush for dirty caches Maulik Shah
2 siblings, 1 reply; 7+ messages in thread
From: Maulik Shah @ 2020-02-21 9:32 UTC (permalink / raw)
To: swboyd, mka, evgreen, bjorn.andersson
Cc: linux-kernel, linux-arm-msm, agross, dianders, rnayak, ilina,
lsrao, Maulik Shah, devicetree
Add device bindings for cpuidle states for cpu devices.
Cc: devicetree@vger.kernel.org
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
---
arch/arm64/boot/dts/qcom/sc7180.dtsi | 78 ++++++++++++++++++++++++++++++++++++
1 file changed, 78 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index cc5a94f..2941a7e 100644
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -86,6 +86,9 @@
compatible = "arm,armv8";
reg = <0x0 0x0>;
enable-method = "psci";
+ cpu-idle-states = <&LITTLE_CPU_SLEEP_0
+ &LITTLE_CPU_SLEEP_1
+ &CLUSTER_SLEEP_0>;
next-level-cache = <&L2_0>;
#cooling-cells = <2>;
qcom,freq-domain = <&cpufreq_hw 0>;
@@ -103,6 +106,9 @@
compatible = "arm,armv8";
reg = <0x0 0x100>;
enable-method = "psci";
+ cpu-idle-states = <&LITTLE_CPU_SLEEP_0
+ &LITTLE_CPU_SLEEP_1
+ &CLUSTER_SLEEP_0>;
next-level-cache = <&L2_100>;
#cooling-cells = <2>;
qcom,freq-domain = <&cpufreq_hw 0>;
@@ -117,6 +123,9 @@
compatible = "arm,armv8";
reg = <0x0 0x200>;
enable-method = "psci";
+ cpu-idle-states = <&LITTLE_CPU_SLEEP_0
+ &LITTLE_CPU_SLEEP_1
+ &CLUSTER_SLEEP_0>;
next-level-cache = <&L2_200>;
#cooling-cells = <2>;
qcom,freq-domain = <&cpufreq_hw 0>;
@@ -131,6 +140,9 @@
compatible = "arm,armv8";
reg = <0x0 0x300>;
enable-method = "psci";
+ cpu-idle-states = <&LITTLE_CPU_SLEEP_0
+ &LITTLE_CPU_SLEEP_1
+ &CLUSTER_SLEEP_0>;
next-level-cache = <&L2_300>;
#cooling-cells = <2>;
qcom,freq-domain = <&cpufreq_hw 0>;
@@ -145,6 +157,9 @@
compatible = "arm,armv8";
reg = <0x0 0x400>;
enable-method = "psci";
+ cpu-idle-states = <&LITTLE_CPU_SLEEP_0
+ &LITTLE_CPU_SLEEP_1
+ &CLUSTER_SLEEP_0>;
next-level-cache = <&L2_400>;
#cooling-cells = <2>;
qcom,freq-domain = <&cpufreq_hw 0>;
@@ -159,6 +174,9 @@
compatible = "arm,armv8";
reg = <0x0 0x500>;
enable-method = "psci";
+ cpu-idle-states = <&LITTLE_CPU_SLEEP_0
+ &LITTLE_CPU_SLEEP_1
+ &CLUSTER_SLEEP_0>;
next-level-cache = <&L2_500>;
#cooling-cells = <2>;
qcom,freq-domain = <&cpufreq_hw 0>;
@@ -173,6 +191,9 @@
compatible = "arm,armv8";
reg = <0x0 0x600>;
enable-method = "psci";
+ cpu-idle-states = <&BIG_CPU_SLEEP_0
+ &BIG_CPU_SLEEP_1
+ &CLUSTER_SLEEP_0>;
next-level-cache = <&L2_600>;
#cooling-cells = <2>;
qcom,freq-domain = <&cpufreq_hw 1>;
@@ -187,6 +208,9 @@
compatible = "arm,armv8";
reg = <0x0 0x700>;
enable-method = "psci";
+ cpu-idle-states = <&BIG_CPU_SLEEP_0
+ &BIG_CPU_SLEEP_1
+ &CLUSTER_SLEEP_0>;
next-level-cache = <&L2_700>;
#cooling-cells = <2>;
qcom,freq-domain = <&cpufreq_hw 1>;
@@ -195,6 +219,60 @@
next-level-cache = <&L3_0>;
};
};
+
+ idle-states {
+ entry-method = "psci";
+
+ LITTLE_CPU_SLEEP_0: cpu-sleep-0-0 {
+ compatible = "arm,idle-state";
+ idle-state-name = "little-power-down";
+ arm,psci-suspend-param = <0x40000003>;
+ entry-latency-us = <549>;
+ exit-latency-us = <901>;
+ min-residency-us = <1774>;
+ local-timer-stop;
+ };
+
+ LITTLE_CPU_SLEEP_1: cpu-sleep-0-1 {
+ compatible = "arm,idle-state";
+ idle-state-name = "little-rail-power-down";
+ arm,psci-suspend-param = <0x40000004>;
+ entry-latency-us = <702>;
+ exit-latency-us = <915>;
+ min-residency-us = <4001>;
+ local-timer-stop;
+ };
+
+ BIG_CPU_SLEEP_0: cpu-sleep-1-0 {
+ compatible = "arm,idle-state";
+ idle-state-name = "big-power-down";
+ arm,psci-suspend-param = <0x40000003>;
+ entry-latency-us = <523>;
+ exit-latency-us = <1244>;
+ min-residency-us = <2207>;
+ local-timer-stop;
+ };
+
+ BIG_CPU_SLEEP_1: cpu-sleep-1-1 {
+ compatible = "arm,idle-state";
+ idle-state-name = "big-rail-power-down";
+ arm,psci-suspend-param = <0x40000004>;
+ entry-latency-us = <526>;
+ exit-latency-us = <1854>;
+ min-residency-us = <5555>;
+ local-timer-stop;
+ };
+
+ CLUSTER_SLEEP_0: cluster-sleep-0 {
+ compatible = "arm,idle-state";
+ idle-state-name = "cluster-power-down";
+ arm,psci-suspend-param = <0x40003444>;
+ entry-latency-us = <3263>;
+ exit-latency-us = <6562>;
+ min-residency-us = <9926>;
+ local-timer-stop;
+ };
+ };
};
memory@80000000 {
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v6 1/3] arm64: dts: qcom: sc7180: Add cpuidle low power states
2020-02-21 9:32 ` [PATCH v6 1/3] arm64: dts: qcom: sc7180: Add cpuidle low power states Maulik Shah
@ 2020-02-24 6:41 ` Srinivas Rao L
0 siblings, 0 replies; 7+ messages in thread
From: Srinivas Rao L @ 2020-02-24 6:41 UTC (permalink / raw)
To: Maulik Shah, swboyd, mka, evgreen, bjorn.andersson
Cc: linux-kernel, linux-arm-msm, agross, dianders, rnayak, ilina, devicetree
Reviewed-by: Srinivas Rao L <lsrao@codeaurora.org>
Regards,
Srinivas.
On 2/21/2020 3:02 PM, Maulik Shah wrote:
> Add device bindings for cpuidle states for cpu devices.
>
> Cc: devicetree@vger.kernel.org
> Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
> ---
> arch/arm64/boot/dts/qcom/sc7180.dtsi | 78 ++++++++++++++++++++++++++++++++++++
> 1 file changed, 78 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> index cc5a94f..2941a7e 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> @@ -86,6 +86,9 @@
> compatible = "arm,armv8";
> reg = <0x0 0x0>;
> enable-method = "psci";
> + cpu-idle-states = <&LITTLE_CPU_SLEEP_0
> + &LITTLE_CPU_SLEEP_1
> + &CLUSTER_SLEEP_0>;
> next-level-cache = <&L2_0>;
> #cooling-cells = <2>;
> qcom,freq-domain = <&cpufreq_hw 0>;
> @@ -103,6 +106,9 @@
> compatible = "arm,armv8";
> reg = <0x0 0x100>;
> enable-method = "psci";
> + cpu-idle-states = <&LITTLE_CPU_SLEEP_0
> + &LITTLE_CPU_SLEEP_1
> + &CLUSTER_SLEEP_0>;
> next-level-cache = <&L2_100>;
> #cooling-cells = <2>;
> qcom,freq-domain = <&cpufreq_hw 0>;
> @@ -117,6 +123,9 @@
> compatible = "arm,armv8";
> reg = <0x0 0x200>;
> enable-method = "psci";
> + cpu-idle-states = <&LITTLE_CPU_SLEEP_0
> + &LITTLE_CPU_SLEEP_1
> + &CLUSTER_SLEEP_0>;
> next-level-cache = <&L2_200>;
> #cooling-cells = <2>;
> qcom,freq-domain = <&cpufreq_hw 0>;
> @@ -131,6 +140,9 @@
> compatible = "arm,armv8";
> reg = <0x0 0x300>;
> enable-method = "psci";
> + cpu-idle-states = <&LITTLE_CPU_SLEEP_0
> + &LITTLE_CPU_SLEEP_1
> + &CLUSTER_SLEEP_0>;
> next-level-cache = <&L2_300>;
> #cooling-cells = <2>;
> qcom,freq-domain = <&cpufreq_hw 0>;
> @@ -145,6 +157,9 @@
> compatible = "arm,armv8";
> reg = <0x0 0x400>;
> enable-method = "psci";
> + cpu-idle-states = <&LITTLE_CPU_SLEEP_0
> + &LITTLE_CPU_SLEEP_1
> + &CLUSTER_SLEEP_0>;
> next-level-cache = <&L2_400>;
> #cooling-cells = <2>;
> qcom,freq-domain = <&cpufreq_hw 0>;
> @@ -159,6 +174,9 @@
> compatible = "arm,armv8";
> reg = <0x0 0x500>;
> enable-method = "psci";
> + cpu-idle-states = <&LITTLE_CPU_SLEEP_0
> + &LITTLE_CPU_SLEEP_1
> + &CLUSTER_SLEEP_0>;
> next-level-cache = <&L2_500>;
> #cooling-cells = <2>;
> qcom,freq-domain = <&cpufreq_hw 0>;
> @@ -173,6 +191,9 @@
> compatible = "arm,armv8";
> reg = <0x0 0x600>;
> enable-method = "psci";
> + cpu-idle-states = <&BIG_CPU_SLEEP_0
> + &BIG_CPU_SLEEP_1
> + &CLUSTER_SLEEP_0>;
> next-level-cache = <&L2_600>;
> #cooling-cells = <2>;
> qcom,freq-domain = <&cpufreq_hw 1>;
> @@ -187,6 +208,9 @@
> compatible = "arm,armv8";
> reg = <0x0 0x700>;
> enable-method = "psci";
> + cpu-idle-states = <&BIG_CPU_SLEEP_0
> + &BIG_CPU_SLEEP_1
> + &CLUSTER_SLEEP_0>;
> next-level-cache = <&L2_700>;
> #cooling-cells = <2>;
> qcom,freq-domain = <&cpufreq_hw 1>;
> @@ -195,6 +219,60 @@
> next-level-cache = <&L3_0>;
> };
> };
> +
> + idle-states {
> + entry-method = "psci";
> +
> + LITTLE_CPU_SLEEP_0: cpu-sleep-0-0 {
> + compatible = "arm,idle-state";
> + idle-state-name = "little-power-down";
> + arm,psci-suspend-param = <0x40000003>;
> + entry-latency-us = <549>;
> + exit-latency-us = <901>;
> + min-residency-us = <1774>;
> + local-timer-stop;
> + };
> +
> + LITTLE_CPU_SLEEP_1: cpu-sleep-0-1 {
> + compatible = "arm,idle-state";
> + idle-state-name = "little-rail-power-down";
> + arm,psci-suspend-param = <0x40000004>;
> + entry-latency-us = <702>;
> + exit-latency-us = <915>;
> + min-residency-us = <4001>;
> + local-timer-stop;
> + };
> +
> + BIG_CPU_SLEEP_0: cpu-sleep-1-0 {
> + compatible = "arm,idle-state";
> + idle-state-name = "big-power-down";
> + arm,psci-suspend-param = <0x40000003>;
> + entry-latency-us = <523>;
> + exit-latency-us = <1244>;
> + min-residency-us = <2207>;
> + local-timer-stop;
> + };
> +
> + BIG_CPU_SLEEP_1: cpu-sleep-1-1 {
> + compatible = "arm,idle-state";
> + idle-state-name = "big-rail-power-down";
> + arm,psci-suspend-param = <0x40000004>;
> + entry-latency-us = <526>;
> + exit-latency-us = <1854>;
> + min-residency-us = <5555>;
> + local-timer-stop;
> + };
> +
> + CLUSTER_SLEEP_0: cluster-sleep-0 {
> + compatible = "arm,idle-state";
> + idle-state-name = "cluster-power-down";
> + arm,psci-suspend-param = <0x40003444>;
> + entry-latency-us = <3263>;
> + exit-latency-us = <6562>;
> + min-residency-us = <9926>;
> + local-timer-stop;
> + };
> + };
> };
>
> memory@80000000 {
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v6 2/3] soc: qcom: rpmh: Update dirty flag only when data changes
2020-02-21 9:32 [PATCH v6 0/3] Invoke rpmh_flush for non OSI targets Maulik Shah
2020-02-21 9:32 ` [PATCH v6 1/3] arm64: dts: qcom: sc7180: Add cpuidle low power states Maulik Shah
@ 2020-02-21 9:32 ` Maulik Shah
2020-02-24 6:43 ` Srinivas Rao L
2020-02-21 9:32 ` [PATCH v6 3/3] soc: qcom: rpmh: Invoke rpmh_flush for dirty caches Maulik Shah
2 siblings, 1 reply; 7+ messages in thread
From: Maulik Shah @ 2020-02-21 9:32 UTC (permalink / raw)
To: swboyd, mka, evgreen, bjorn.andersson
Cc: linux-kernel, linux-arm-msm, agross, dianders, rnayak, ilina,
lsrao, Maulik Shah
Currently rpmh ctrlr dirty flag is set for all cases regardless
of data is really changed or not. Add changes to update it when
data is updated to newer values.
Also move dirty flag updates to happen from within cache_lock.
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
---
drivers/soc/qcom/rpmh.c | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/drivers/soc/qcom/rpmh.c b/drivers/soc/qcom/rpmh.c
index eb0ded0..83ba4e0 100644
--- a/drivers/soc/qcom/rpmh.c
+++ b/drivers/soc/qcom/rpmh.c
@@ -139,20 +139,27 @@ static struct cache_req *cache_rpm_request(struct rpmh_ctrlr *ctrlr,
existing:
switch (state) {
case RPMH_ACTIVE_ONLY_STATE:
- if (req->sleep_val != UINT_MAX)
+ if (req->sleep_val != UINT_MAX) {
req->wake_val = cmd->data;
+ ctrlr->dirty = true;
+ }
break;
case RPMH_WAKE_ONLY_STATE:
- req->wake_val = cmd->data;
+ if (req->wake_val != cmd->data) {
+ req->wake_val = cmd->data;
+ ctrlr->dirty = true;
+ }
break;
case RPMH_SLEEP_STATE:
- req->sleep_val = cmd->data;
+ if (req->sleep_val != cmd->data) {
+ req->sleep_val = cmd->data;
+ ctrlr->dirty = true;
+ }
break;
default:
break;
}
- ctrlr->dirty = true;
unlock:
spin_unlock_irqrestore(&ctrlr->cache_lock, flags);
@@ -287,6 +294,7 @@ static void cache_batch(struct rpmh_ctrlr *ctrlr, struct batch_cache_req *req)
spin_lock_irqsave(&ctrlr->cache_lock, flags);
list_add_tail(&req->list, &ctrlr->batch_cache);
+ ctrlr->dirty = true;
spin_unlock_irqrestore(&ctrlr->cache_lock, flags);
}
@@ -323,6 +331,7 @@ static void invalidate_batch(struct rpmh_ctrlr *ctrlr)
list_for_each_entry_safe(req, tmp, &ctrlr->batch_cache, list)
kfree(req);
INIT_LIST_HEAD(&ctrlr->batch_cache);
+ ctrlr->dirty = true;
spin_unlock_irqrestore(&ctrlr->cache_lock, flags);
}
@@ -456,6 +465,7 @@ static int send_single(struct rpmh_ctrlr *ctrlr, enum rpmh_state state,
int rpmh_flush(struct rpmh_ctrlr *ctrlr)
{
struct cache_req *p;
+ unsigned long flags;
int ret;
if (!ctrlr->dirty) {
@@ -488,7 +498,9 @@ int rpmh_flush(struct rpmh_ctrlr *ctrlr)
return ret;
}
+ spin_lock_irqsave(&ctrlr->cache_lock, flags);
ctrlr->dirty = false;
+ spin_unlock_irqrestore(&ctrlr->cache_lock, flags);
return 0;
}
@@ -507,7 +519,6 @@ int rpmh_invalidate(const struct device *dev)
int ret;
invalidate_batch(ctrlr);
- ctrlr->dirty = true;
do {
ret = rpmh_rsc_invalidate(ctrlr_to_drv(ctrlr));
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v6 2/3] soc: qcom: rpmh: Update dirty flag only when data changes
2020-02-21 9:32 ` [PATCH v6 2/3] soc: qcom: rpmh: Update dirty flag only when data changes Maulik Shah
@ 2020-02-24 6:43 ` Srinivas Rao L
0 siblings, 0 replies; 7+ messages in thread
From: Srinivas Rao L @ 2020-02-24 6:43 UTC (permalink / raw)
To: Maulik Shah, swboyd, mka, evgreen, bjorn.andersson
Cc: linux-kernel, linux-arm-msm, agross, dianders, rnayak, ilina
Reviewed-by: Srinivas Rao L <lsrao@codeaurora.org>
Regards,
Srinivas.
On 2/21/2020 3:02 PM, Maulik Shah wrote:
> Currently rpmh ctrlr dirty flag is set for all cases regardless
> of data is really changed or not. Add changes to update it when
> data is updated to newer values.
>
> Also move dirty flag updates to happen from within cache_lock.
>
> Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
> ---
> drivers/soc/qcom/rpmh.c | 21 ++++++++++++++++-----
> 1 file changed, 16 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/soc/qcom/rpmh.c b/drivers/soc/qcom/rpmh.c
> index eb0ded0..83ba4e0 100644
> --- a/drivers/soc/qcom/rpmh.c
> +++ b/drivers/soc/qcom/rpmh.c
> @@ -139,20 +139,27 @@ static struct cache_req *cache_rpm_request(struct rpmh_ctrlr *ctrlr,
> existing:
> switch (state) {
> case RPMH_ACTIVE_ONLY_STATE:
> - if (req->sleep_val != UINT_MAX)
> + if (req->sleep_val != UINT_MAX) {
> req->wake_val = cmd->data;
> + ctrlr->dirty = true;
> + }
> break;
> case RPMH_WAKE_ONLY_STATE:
> - req->wake_val = cmd->data;
> + if (req->wake_val != cmd->data) {
> + req->wake_val = cmd->data;
> + ctrlr->dirty = true;
> + }
> break;
> case RPMH_SLEEP_STATE:
> - req->sleep_val = cmd->data;
> + if (req->sleep_val != cmd->data) {
> + req->sleep_val = cmd->data;
> + ctrlr->dirty = true;
> + }
> break;
> default:
> break;
> }
>
> - ctrlr->dirty = true;
> unlock:
> spin_unlock_irqrestore(&ctrlr->cache_lock, flags);
>
> @@ -287,6 +294,7 @@ static void cache_batch(struct rpmh_ctrlr *ctrlr, struct batch_cache_req *req)
>
> spin_lock_irqsave(&ctrlr->cache_lock, flags);
> list_add_tail(&req->list, &ctrlr->batch_cache);
> + ctrlr->dirty = true;
> spin_unlock_irqrestore(&ctrlr->cache_lock, flags);
> }
>
> @@ -323,6 +331,7 @@ static void invalidate_batch(struct rpmh_ctrlr *ctrlr)
> list_for_each_entry_safe(req, tmp, &ctrlr->batch_cache, list)
> kfree(req);
> INIT_LIST_HEAD(&ctrlr->batch_cache);
> + ctrlr->dirty = true;
> spin_unlock_irqrestore(&ctrlr->cache_lock, flags);
> }
>
> @@ -456,6 +465,7 @@ static int send_single(struct rpmh_ctrlr *ctrlr, enum rpmh_state state,
> int rpmh_flush(struct rpmh_ctrlr *ctrlr)
> {
> struct cache_req *p;
> + unsigned long flags;
> int ret;
>
> if (!ctrlr->dirty) {
> @@ -488,7 +498,9 @@ int rpmh_flush(struct rpmh_ctrlr *ctrlr)
> return ret;
> }
>
> + spin_lock_irqsave(&ctrlr->cache_lock, flags);
> ctrlr->dirty = false;
> + spin_unlock_irqrestore(&ctrlr->cache_lock, flags);
>
> return 0;
> }
> @@ -507,7 +519,6 @@ int rpmh_invalidate(const struct device *dev)
> int ret;
>
> invalidate_batch(ctrlr);
> - ctrlr->dirty = true;
>
> do {
> ret = rpmh_rsc_invalidate(ctrlr_to_drv(ctrlr));
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v6 3/3] soc: qcom: rpmh: Invoke rpmh_flush for dirty caches
2020-02-21 9:32 [PATCH v6 0/3] Invoke rpmh_flush for non OSI targets Maulik Shah
2020-02-21 9:32 ` [PATCH v6 1/3] arm64: dts: qcom: sc7180: Add cpuidle low power states Maulik Shah
2020-02-21 9:32 ` [PATCH v6 2/3] soc: qcom: rpmh: Update dirty flag only when data changes Maulik Shah
@ 2020-02-21 9:32 ` Maulik Shah
2020-02-24 6:48 ` Srinivas Rao L
2 siblings, 1 reply; 7+ messages in thread
From: Maulik Shah @ 2020-02-21 9:32 UTC (permalink / raw)
To: swboyd, mka, evgreen, bjorn.andersson
Cc: linux-kernel, linux-arm-msm, agross, dianders, rnayak, ilina,
lsrao, Maulik Shah
Add changes to invoke rpmh flush when the data in cache is dirty.
This is done only if OSI is not supported in PSCI. If OSI is supported
rpmh_flush will get invoked by power domain off call when the last cpu
in the domain is going to power collapse.
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
---
drivers/soc/qcom/rpmh.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/soc/qcom/rpmh.c b/drivers/soc/qcom/rpmh.c
index 83ba4e0..839af8d 100644
--- a/drivers/soc/qcom/rpmh.c
+++ b/drivers/soc/qcom/rpmh.c
@@ -12,6 +12,7 @@
#include <linux/module.h>
#include <linux/of.h>
#include <linux/platform_device.h>
+#include <linux/psci.h>
#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/types.h>
@@ -163,6 +164,9 @@ static struct cache_req *cache_rpm_request(struct rpmh_ctrlr *ctrlr,
unlock:
spin_unlock_irqrestore(&ctrlr->cache_lock, flags);
+ if (ctrlr->dirty && !psci_has_osi_support())
+ return rpmh_flush(ctrlr) ? ERR_PTR(-EINVAL) : req;
+
return req;
}
@@ -391,6 +395,8 @@ int rpmh_write_batch(const struct device *dev, enum rpmh_state state,
if (state != RPMH_ACTIVE_ONLY_STATE) {
cache_batch(ctrlr, req);
+ if (!psci_has_osi_support())
+ return rpmh_flush(ctrlr);
return 0;
}
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v6 3/3] soc: qcom: rpmh: Invoke rpmh_flush for dirty caches
2020-02-21 9:32 ` [PATCH v6 3/3] soc: qcom: rpmh: Invoke rpmh_flush for dirty caches Maulik Shah
@ 2020-02-24 6:48 ` Srinivas Rao L
0 siblings, 0 replies; 7+ messages in thread
From: Srinivas Rao L @ 2020-02-24 6:48 UTC (permalink / raw)
To: Maulik Shah, swboyd, mka, evgreen, bjorn.andersson
Cc: linux-kernel, linux-arm-msm, agross, dianders, rnayak, ilina
As power domain support is dropped in v6 , please update commit text
accordingly.
Post the update of commit text, you can add my reviewed by.
Reviewed-by: Srinivas Rao L <lsrao@codeaurora.org>
Regards,
Srinivas.
On 2/21/2020 3:02 PM, Maulik Shah wrote:
> Add changes to invoke rpmh flush when the data in cache is dirty.
>
> This is done only if OSI is not supported in PSCI. If OSI is supported
> rpmh_flush will get invoked by power domain off call when the last cpu
> in the domain is going to power collapse.
>
> Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
> ---
> drivers/soc/qcom/rpmh.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/drivers/soc/qcom/rpmh.c b/drivers/soc/qcom/rpmh.c
> index 83ba4e0..839af8d 100644
> --- a/drivers/soc/qcom/rpmh.c
> +++ b/drivers/soc/qcom/rpmh.c
> @@ -12,6 +12,7 @@
> #include <linux/module.h>
> #include <linux/of.h>
> #include <linux/platform_device.h>
> +#include <linux/psci.h>
> #include <linux/slab.h>
> #include <linux/spinlock.h>
> #include <linux/types.h>
> @@ -163,6 +164,9 @@ static struct cache_req *cache_rpm_request(struct rpmh_ctrlr *ctrlr,
> unlock:
> spin_unlock_irqrestore(&ctrlr->cache_lock, flags);
>
> + if (ctrlr->dirty && !psci_has_osi_support())
> + return rpmh_flush(ctrlr) ? ERR_PTR(-EINVAL) : req;
> +
> return req;
> }
>
> @@ -391,6 +395,8 @@ int rpmh_write_batch(const struct device *dev, enum rpmh_state state,
>
> if (state != RPMH_ACTIVE_ONLY_STATE) {
> cache_batch(ctrlr, req);
> + if (!psci_has_osi_support())
> + return rpmh_flush(ctrlr);
> return 0;
> }
>
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 7+ messages in thread