From: "Andreas Färber" <afaerber@suse.de>
To: linux-arm-kernel@lists.infradead.org
Cc: mp-cs@actions-semi.com,
"Thomas Liau" <thomas.liau@actions-semi.com>,
张东风 <zhangdf@actions-semi.com>, 刘炜 <liuwei@actions-semi.com>,
张天益 <tyzhang@actions-semi.com>,
96boards@ucrobotics.com, support@lemaker.org,
linux-kernel@vger.kernel.org, "Andreas Färber" <afaerber@suse.de>
Subject: [PATCH v4 27/28] soc: actions: owl-sps: Factor out owl_sps_set_pg() for power-gating
Date: Tue, 6 Jun 2017 02:54:25 +0200 [thread overview]
Message-ID: <20170606005426.26446-28-afaerber@suse.de> (raw)
In-Reply-To: <20170606005426.26446-1-afaerber@suse.de>
Allow the SMP code to reuse PM domain code for CPU2/CPU3 wakeup.
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
v4: new
drivers/soc/actions/Kconfig | 4 +++
drivers/soc/actions/Makefile | 1 +
drivers/soc/actions/owl-sps-helper.c | 51 ++++++++++++++++++++++++++++++++++++
drivers/soc/actions/owl-sps.c | 34 +++---------------------
include/linux/soc/actions/owl-sps.h | 11 ++++++++
5 files changed, 70 insertions(+), 31 deletions(-)
create mode 100644 drivers/soc/actions/owl-sps-helper.c
create mode 100644 include/linux/soc/actions/owl-sps.h
diff --git a/drivers/soc/actions/Kconfig b/drivers/soc/actions/Kconfig
index bdf827d5ce78..9d68b5a771c3 100644
--- a/drivers/soc/actions/Kconfig
+++ b/drivers/soc/actions/Kconfig
@@ -1,8 +1,12 @@
if ARCH_ACTIONS || COMPILE_TEST
+config OWL_PM_DOMAINS_HELPER
+ bool
+
config OWL_PM_DOMAINS
bool "Actions Semi SPS power domains"
depends on PM
+ select OWL_PM_DOMAINS_HELPER
select PM_GENERIC_DOMAINS
help
Say 'y' here to enable support for Smart Power System (SPS)
diff --git a/drivers/soc/actions/Makefile b/drivers/soc/actions/Makefile
index 720c34ed16e4..1e101b06bab1 100644
--- a/drivers/soc/actions/Makefile
+++ b/drivers/soc/actions/Makefile
@@ -1 +1,2 @@
+obj-$(CONFIG_OWL_PM_DOMAINS_HELPER) += owl-sps-helper.o
obj-$(CONFIG_OWL_PM_DOMAINS) += owl-sps.o
diff --git a/drivers/soc/actions/owl-sps-helper.c b/drivers/soc/actions/owl-sps-helper.c
new file mode 100644
index 000000000000..9d7a2c2b44ec
--- /dev/null
+++ b/drivers/soc/actions/owl-sps-helper.c
@@ -0,0 +1,51 @@
+/*
+ * Actions Semi Owl Smart Power System (SPS) shared helpers
+ *
+ * Copyright 2012 Actions Semi Inc.
+ * Author: Actions Semi, Inc.
+ *
+ * Copyright (c) 2017 Andreas Färber
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/delay.h>
+#include <linux/io.h>
+
+#define OWL_SPS_PG_CTL 0x0
+
+int owl_sps_set_pg(void __iomem *base, u32 pwr_mask, u32 ack_mask, bool enable)
+{
+ u32 val;
+ bool ack;
+ int timeout;
+
+ val = readl(base + OWL_SPS_PG_CTL);
+ ack = val & ack_mask;
+ if (ack == enable)
+ return 0;
+
+ if (enable)
+ val |= pwr_mask;
+ else
+ val &= ~pwr_mask;
+
+ writel(val, base + OWL_SPS_PG_CTL);
+
+ for (timeout = 5000; timeout > 0; timeout -= 50) {
+ val = readl(base + OWL_SPS_PG_CTL);
+ if ((val & ack_mask) == (enable ? ack_mask : 0))
+ break;
+ udelay(50);
+ }
+ if (timeout <= 0)
+ return -ETIMEDOUT;
+
+ udelay(10);
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(owl_sps_set_pg);
diff --git a/drivers/soc/actions/owl-sps.c b/drivers/soc/actions/owl-sps.c
index d9160579b542..41991c5217a0 100644
--- a/drivers/soc/actions/owl-sps.c
+++ b/drivers/soc/actions/owl-sps.c
@@ -12,15 +12,12 @@
* option) any later version.
*/
-#include <linux/delay.h>
-#include <linux/io.h>
#include <linux/of_address.h>
#include <linux/of_platform.h>
#include <linux/pm_domain.h>
+#include <linux/soc/actions/owl-sps.h>
#include <dt-bindings/power/s500-powergate.h>
-#define OWL_SPS_PG_CTL 0x0
-
struct owl_sps_domain_info {
const char *name;
int pwr_bit;
@@ -51,37 +48,12 @@ struct owl_sps_domain {
static int owl_sps_set_power(struct owl_sps_domain *pd, bool enable)
{
- u32 val, pwr_mask, ack_mask;
- int timeout;
- bool ack;
+ u32 pwr_mask, ack_mask;
ack_mask = BIT(pd->info->ack_bit);
pwr_mask = BIT(pd->info->pwr_bit);
- val = readl(pd->sps->base + OWL_SPS_PG_CTL);
- ack = val & ack_mask;
-
- if (ack == enable)
- return 0;
-
- if (enable)
- val |= pwr_mask;
- else
- val &= ~pwr_mask;
-
- writel(val, pd->sps->base + OWL_SPS_PG_CTL);
- for (timeout = 5000; timeout > 0; timeout -= 50) {
- val = readl(pd->sps->base + OWL_SPS_PG_CTL);
- if ((val & ack_mask) == (enable ? ack_mask : 0))
- break;
- udelay(50);
- }
- if (timeout <= 0)
- return -ETIMEDOUT;
-
- udelay(10);
-
- return 0;
+ return owl_sps_set_pg(pd->sps->base, pwr_mask, ack_mask, enable);
}
static int owl_sps_power_on(struct generic_pm_domain *domain)
diff --git a/include/linux/soc/actions/owl-sps.h b/include/linux/soc/actions/owl-sps.h
new file mode 100644
index 000000000000..33d0dbeceb55
--- /dev/null
+++ b/include/linux/soc/actions/owl-sps.h
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2017 Andreas Färber
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+#ifndef SOC_ACTIONS_OWL_SPS_H
+#define SOC_ACTIONS_OWL_SPS_H
+
+int owl_sps_set_pg(void __iomem *base, u32 pwr_mask, u32 ack_mask, bool enable);
+
+#endif
--
2.12.3
next prev parent reply other threads:[~2017-06-06 0:57 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-06 0:53 [PATCH v4 00/28] ARM: Initial Actions Semi S500 and S900 enablement Andreas Färber
2017-06-06 0:53 ` [PATCH v4 01/28] dt-bindings: Add vendor prefix for Actions Semi Andreas Färber
2017-06-18 18:46 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 02/28] dt-bindings: arm: Document Actions Semi S500 Andreas Färber
2017-06-18 18:48 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 03/28] dt-bindings: timer: Document Owl timer Andreas Färber
2017-06-18 20:18 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 04/28] clocksource: Add " Andreas Färber
2017-06-06 16:33 ` Daniel Lezcano
2017-06-18 20:43 ` Andreas Färber
2017-06-19 13:53 ` Daniel Lezcano
2017-06-19 14:31 ` Andreas Färber
2017-06-21 11:57 ` Daniel Lezcano
2017-06-06 0:54 ` [PATCH v4 05/28] clocksource: owl: Add S900 support Andreas Färber
2017-06-06 16:34 ` Daniel Lezcano
2017-06-18 20:50 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 06/28] ARM: Prepare Actions Semi S500 Andreas Färber
2017-06-18 21:21 ` Andreas Färber
2017-07-01 21:41 ` [PATCH] ARM: owl: Drop custom machine Andreas Färber
2017-06-06 0:54 ` [PATCH v4 07/28] ARM64: Prepare Actions Semi S900 Andreas Färber
2017-06-11 13:04 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 08/28] dt-bindings: serial: Document Actions Semi Owl UARTs Andreas Färber
2017-06-06 0:54 ` [PATCH v4 09/28] tty: serial: Add Actions Semi Owl UART earlycon Andreas Färber
2017-06-18 21:45 ` Andreas Färber
2017-06-19 1:16 ` Greg Kroah-Hartman
2017-06-19 1:24 ` Andreas Färber
2017-06-19 1:46 ` [PATCH v5 07/26] dt-bindings: serial: Document Actions Semi Owl UARTs Andreas Färber
2017-06-19 1:46 ` [PATCH v5 08/26] tty: serial: Add Actions Semi Owl UART earlycon Andreas Färber
2017-06-19 2:12 ` [PATCH v4 09/28] " Greg Kroah-Hartman
2017-06-19 2:26 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 10/28] Documentation: kernel-parameters: Document owl earlycon Andreas Färber
2017-06-06 0:54 ` [PATCH v4 11/28] ARM: dts: Add Actions Semi S500 and LeMaker Guitar Andreas Färber
2017-06-18 22:10 ` Andreas Färber
2017-06-19 1:08 ` [PATCH v5 10/27] " Andreas Färber
2017-06-19 2:01 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 12/28] dt-bindings: Add vendor prefix for uCRobotics Andreas Färber
2017-06-18 22:19 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 13/28] dt-bindings: arm: Document Actions Semi S900 Andreas Färber
2017-06-18 22:29 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 14/28] ARM64: dts: Add Actions Semi S900 and Bubblegum-96 Andreas Färber
2017-06-18 22:40 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 15/28] MAINTAINERS: Add Actions Semi Owl section Andreas Färber
2017-06-18 22:49 ` Andreas Färber
2017-06-19 2:44 ` [PATCH v5 13/26] " Andreas Färber
2017-06-26 6:56 ` 答复: " 张天益
2017-06-06 0:54 ` [PATCH v4 16/28] tty: serial: owl: Implement console driver Andreas Färber
2017-06-06 13:34 ` Alan Cox
2017-07-02 20:27 ` Andreas Färber
2017-06-07 14:37 ` Andy Shevchenko
2017-07-02 22:36 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 17/28] ARM64: dts: actions: s900-bubblegum-96: Add fake uart5 clock Andreas Färber
2017-09-05 21:29 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 18/28] ARM: dts: s500-guitar-bb-rev-b: Add fake uart3 clock Andreas Färber
2017-09-05 21:37 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 19/28] dt-bindings: arm: cpus: Add S500 enable-method Andreas Färber
2017-06-19 2:09 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 20/28] ARM: owl: Implement CPU enable-method for S500 Andreas Färber
2017-06-19 2:11 ` Andreas Färber
2017-06-21 8:16 ` Arnd Bergmann
2017-06-21 10:25 ` Arnd Bergmann
2017-06-21 16:48 ` Andreas Färber
2017-06-21 18:02 ` Arnd Bergmann
2017-06-29 15:07 ` Arnd Bergmann
2017-06-29 15:22 ` Andreas Färber
2017-06-29 15:50 ` Arnd Bergmann
2017-07-01 21:29 ` [PATCH] ARM: owl: smp: Drop bogus holding pen Andreas Färber
2017-07-03 12:35 ` Arnd Bergmann
2017-07-01 4:42 ` 答复: [PATCH v4 20/28] ARM: owl: Implement CPU enable-method for S500 刘炜
2017-07-01 19:56 ` Andreas Färber
2017-07-03 8:13 ` 刘炜
2017-07-04 23:32 ` [PATCH] ARM: owl: smp: Drop owl_secondary_boot() Andreas Färber
2017-07-05 2:36 ` Florian Fainelli
2017-07-06 17:17 ` Andreas Färber
2017-07-06 17:38 ` Alexandre Belloni
2017-07-06 19:47 ` Florian Fainelli
2017-07-07 7:34 ` Gregory CLEMENT
2017-07-07 17:32 ` Florian Fainelli
2017-07-06 17:39 ` Mark Rutland
2017-07-06 21:16 ` Florian Fainelli
2017-07-09 21:55 ` Andreas Färber
2017-07-10 4:27 ` Florian Fainelli
2017-06-06 0:54 ` [PATCH v4 21/28] ARM: dts: s500: Set CPU enable-method Andreas Färber
2017-06-19 2:09 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 22/28] dt-bindings: power: Add Owl SPS power domains Andreas Färber
2017-06-19 3:36 ` [PATCH v5 20/26] " Andreas Färber
2017-06-19 3:57 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 23/28] soc: actions: Add Owl SPS Andreas Färber
2017-06-19 3:40 ` [PATCH v5 21/26] " Andreas Färber
2017-06-19 3:59 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 24/28] MAINTAINERS: Update Actions Semi section with SPS Andreas Färber
2017-06-19 3:44 ` [PATCH v5 22/26] " Andreas Färber
2017-06-19 4:00 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 25/28] ARM: dts: s500: Add SPS node Andreas Färber
2017-06-19 4:01 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 26/28] ARM: dts: s500: Set power domains for CPU2 and CPU3 Andreas Färber
2017-07-27 20:58 ` Andreas Färber
2017-06-06 0:54 ` Andreas Färber [this message]
2017-06-19 4:12 ` [PATCH v4 27/28] soc: actions: owl-sps: Factor out owl_sps_set_pg() for power-gating Andreas Färber
2017-06-06 0:54 ` [PATCH v4 28/28] ARM: owl: smp: Implement SPS power-gating for CPU2 and CPU3 Andreas Färber
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=20170606005426.26446-28-afaerber@suse.de \
--to=afaerber@suse.de \
--cc=96boards@ucrobotics.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liuwei@actions-semi.com \
--cc=mp-cs@actions-semi.com \
--cc=support@lemaker.org \
--cc=thomas.liau@actions-semi.com \
--cc=tyzhang@actions-semi.com \
--cc=zhangdf@actions-semi.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).