From: Lubomir Rintel <lkundrak@v3.sk>
To: Andy Shevchenko <andy@infradead.org>, Darren Hart <dvhart@infradead.org>
Cc: Rob Herring <robh+dt@kernel.org>,
Russell King <linux@armlinux.org.uk>,
Mark Rutland <mark.rutland@arm.com>,
platform-driver-x86@vger.kernel.org, linux-pm@vger.kernel.org,
Sebastian Reichel <sebastian.reichel@collabora.com>,
Lubomir Rintel <lkundrak@v3.sk>
Subject: [PATCH v7 10/10] Platform: OLPC: Add restart support to XO-1.75 EC driver
Date: Mon, 13 May 2019 09:56:41 +0200 [thread overview]
Message-ID: <20190513075641.1277716-11-lkundrak@v3.sk> (raw)
In-Reply-To: <20190513075641.1277716-1-lkundrak@v3.sk>
This hooks to arm_pm_restart instead od utilizing a restart handler
notifier, because the reboot dance on XO 1.75 needs to sleep (it pokes a
GPIO and waits for the EC to initiate the command transaction) and the
restart handler is called in atomic context. Sad.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
Changes since v4:
- Split off from the driver.
drivers/platform/olpc/Kconfig | 2 +-
drivers/platform/olpc/olpc-xo175-ec.c | 13 +++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/drivers/platform/olpc/Kconfig b/drivers/platform/olpc/Kconfig
index 858ac1d2290a..02b232c34444 100644
--- a/drivers/platform/olpc/Kconfig
+++ b/drivers/platform/olpc/Kconfig
@@ -4,7 +4,7 @@ config OLPC_EC
config OLPC_XO175_EC
tristate "OLPC XO 1.75 Embedded Controller"
- depends on ARCH_MMP || COMPILE_TEST
+ depends on ARM && (ARCH_MMP || COMPILE_TEST)
select SPI_SLAVE
select OLPC_EC
help
diff --git a/drivers/platform/olpc/olpc-xo175-ec.c b/drivers/platform/olpc/olpc-xo175-ec.c
index 344d14f3da54..b64443605a03 100644
--- a/drivers/platform/olpc/olpc-xo175-ec.c
+++ b/drivers/platform/olpc/olpc-xo175-ec.c
@@ -23,6 +23,7 @@
#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/spi/spi.h>
+#include <asm/system_misc.h>
struct ec_cmd_t {
u8 cmd;
@@ -580,6 +581,14 @@ static int olpc_xo175_ec_set_event_mask(unsigned int mask)
return olpc_ec_cmd(CMD_WRITE_EXT_SCI_MASK, args, 2, NULL, 0);
}
+static void olpc_xo175_ec_restart(enum reboot_mode mode, const char *cmd)
+{
+ while (1) {
+ olpc_ec_cmd(CMD_POWER_CYCLE, NULL, 0, NULL, 0);
+ mdelay(1000);
+ }
+}
+
static void olpc_xo175_ec_power_off(void)
{
while (1) {
@@ -651,6 +660,8 @@ static int olpc_xo175_ec_remove(struct spi_device *spi)
{
if (pm_power_off == olpc_xo175_ec_power_off)
pm_power_off = NULL;
+ if (arm_pm_restart == olpc_xo175_ec_restart)
+ arm_pm_restart = NULL;
spi_slave_abort(spi);
@@ -718,6 +729,8 @@ static int olpc_xo175_ec_probe(struct spi_device *spi)
if (pm_power_off == NULL)
pm_power_off = olpc_xo175_ec_power_off;
+ if (arm_pm_restart == NULL)
+ arm_pm_restart = olpc_xo175_ec_restart;
dev_info(&spi->dev, "OLPC XO-1.75 Embedded Controller driver\n");
--
2.21.0
prev parent reply other threads:[~2019-05-13 7:57 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-13 7:56 [PATCH v7 00/10] Add support for OLPC XO 1.75 Embedded Controller Lubomir Rintel
2019-05-13 7:56 ` [PATCH v7 01/10] dt-bindings: olpc,xo1.75-ec: Add OLPC XO-1.75 EC bindings Lubomir Rintel
2019-05-13 9:07 ` Pavel Machek
2019-05-13 13:18 ` Lubomir Rintel
2019-05-24 16:29 ` Andy Shevchenko
2019-08-01 19:27 ` OLPC in 5.3? was " Pavel Machek
2019-08-02 10:39 ` Lubomir Rintel
2019-08-03 8:47 ` Pavel Machek
2019-08-05 10:26 ` Lubomir Rintel
2019-08-07 12:31 ` Pavel Machek
2019-08-07 12:41 ` Lubomir Rintel
2019-05-13 7:56 ` [PATCH v7 02/10] Platform: OLPC: Remove an unused include Lubomir Rintel
2019-05-13 7:56 ` [PATCH v7 03/10] Platform: OLPC: Move EC-specific functionality out from x86 Lubomir Rintel
2019-05-13 7:56 ` [PATCH v7 04/10] Platform: OLPC: Avoid a warning if the EC didn't register yet Lubomir Rintel
2019-05-13 7:56 ` [PATCH v7 05/10] Platform: OLPC: Use BIT() and GENMASK() for event masks Lubomir Rintel
2019-05-13 7:56 ` [PATCH v7 06/10] Platform: OLPC: Add XO-1.75 EC driver Lubomir Rintel
2019-05-13 7:56 ` [PATCH v7 07/10] Platform: OLPC: Add a regulator for the DCON Lubomir Rintel
2019-05-13 7:56 ` [PATCH v7 08/10] power: supply: olpc_battery: Allow building the driver on non-x86 Lubomir Rintel
2019-05-13 7:56 ` [PATCH v7 09/10] ARM: export arm_pm_restart Lubomir Rintel
2019-05-13 7:56 ` Lubomir Rintel [this message]
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=20190513075641.1277716-11-lkundrak@v3.sk \
--to=lkundrak@v3.sk \
--cc=andy@infradead.org \
--cc=dvhart@infradead.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mark.rutland@arm.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=sebastian.reichel@collabora.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).