| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Sun, 9 Dec 2018 20:51:47 +0100
From: Andreas Kemnade <andreas@...nade.info>
To: johan@...nel.org, robh+dt@...nel.org, mark.rutland@....com,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
Discussions about the Letux Kernel
<letux-kernel@...nphoenux.org>
Cc: Andreas Kemnade <andreas@...nade.info>
Subject: [PATCH v2 2/5] gnss: sirf: power on logic for devices without wakeup signal
Some Wi2Wi devices do not have a wakeup output, so device state can
only be indirectly detected by looking whether there is communitcation
over the serial lines.
Additionally it checks for the initial state of the device during
probing to ensure it is off.
Timeout values need to be increased, because the reaction on serial line
is slower and are in line with previous patches by
Neil Brown <neilb@...e.de> and H. Nikolaus Schaller <hns@...delico.com>.
Signed-off-by: Andreas Kemnade <andreas@...nade.info>
---
Changes in v2:
- style cleanup
- do not keep serdev open just because runtime is active,
only when needed (gnss device is opened or state is changed)
- clearer timeout semantics
drivers/gnss/sirf.c | 114 +++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 91 insertions(+), 23 deletions(-)
diff --git a/drivers/gnss/sirf.c b/drivers/gnss/sirf.c
index ba663de1db49..c64369494afb 100644
--- a/drivers/gnss/sirf.c
+++ b/drivers/gnss/sirf.c
@@ -23,8 +23,13 @@
#define SIRF_BOOT_DELAY 500
#define SIRF_ON_OFF_PULSE_TIME 100
+/* activate till reaction of wakeup pin */
#define SIRF_ACTIVATE_TIMEOUT 200
+/* activate till reception of data */
+#define SIRF_ACTIVATE_TILL_OUTPUT_TIMEOUT 1000
#define SIRF_HIBERNATE_TIMEOUT 200
+/* If no data arrives for this time, we expect the chip to be off. */
+#define SIRF_MIN_SILENCE 1000
struct sirf_data {
struct gnss_device *gdev;
@@ -41,9 +46,44 @@ struct sirf_data {
*/
struct mutex gdev_mutex;
bool opened;
+ int serdev_usecount;
+ /*
+ * serdev will be opened for power state changing and when userspace
+ * needs it, so we have a usecount and need locking.
+ */
+ struct mutex serdev_mutex;
wait_queue_head_t power_wait;
};
+static int sirf_dev_get(struct sirf_data *data)
+{
+ int ret = 0;
+
+ mutex_lock(&data->serdev_mutex);
+ data->serdev_usecount++;
+ if (data->serdev_usecount == 1) {
+ ret = serdev_device_open(data->serdev);
+ if (ret)
+ data->serdev_usecount--;
+
+ serdev_device_set_baudrate(data->serdev, data->speed);
+ serdev_device_set_flow_control(data->serdev, false);
+ }
+
+ mutex_unlock(&data->serdev_mutex);
+ return ret;
+}
+
+static void sirf_dev_put(struct sirf_data *data)
+{
+ mutex_lock(&data->serdev_mutex);
+ data->serdev_usecount--;
+ if (data->serdev_usecount == 0)
+ serdev_device_close(data->serdev);
+
+ mutex_unlock(&data->serdev_mutex);
+}
+
static int sirf_open(struct gnss_device *gdev)
{
struct sirf_data *data = gnss_get_drvdata(gdev);
@@ -51,13 +91,10 @@ static int sirf_open(struct gnss_device *gdev)
int ret;
data->opened = true;
- ret = serdev_device_open(serdev);
+ ret = sirf_dev_get(data);
if (ret)
return ret;
- serdev_device_set_baudrate(serdev, data->speed);
- serdev_device_set_flow_control(serdev, false);
-
ret = pm_runtime_get_sync(&serdev->dev);
if (ret < 0) {
dev_err(&gdev->dev, "failed to runtime resume: %d\n", ret);
@@ -69,7 +106,7 @@ static int sirf_open(struct gnss_device *gdev)
return 0;
err_close:
- serdev_device_close(serdev);
+ sirf_dev_put(data);
return ret;
}
@@ -78,9 +115,7 @@ static void sirf_close(struct gnss_device *gdev)
{
struct sirf_data *data = gnss_get_drvdata(gdev);
struct serdev_device *serdev = data->serdev;
-
- serdev_device_close(serdev);
-
+ sirf_dev_put(data);
pm_runtime_put(&serdev->dev);
mutex_lock(&data->gdev_mutex);
data->opened = false;
@@ -118,12 +153,16 @@ static int sirf_receive_buf(struct serdev_device *serdev,
struct gnss_device *gdev = data->gdev;
int ret = 0;
+ if (!data->wakeup && !data->active) {
+ data->active = true;
+ wake_up_interruptible(&data->power_wait);
+ }
+
/*
- * we might come here everytime when runtime is resumed
- * and data is received. Two cases are possible
- * 1. device is opened during initialisation
- * 2. kernel is compiled without runtime pm
- * and device is opened all the time
+ * We might come here everytime when runtime is resumed
+ * and data is received. Two cases are possible:
+ * 1. during power state change
+ * 2. userspace has opened the gnss device
*/
mutex_lock(&data->gdev_mutex);
if (data->opened)
@@ -161,6 +200,24 @@ static int sirf_wait_for_power_state(struct sirf_data *data, bool active,
{
int ret;
+ if (!data->wakeup && !active && data->active) {
+ /* Wait for the chip to turn off. */
+ msleep(timeout);
+ data->active = false;
+ /* Now check if it is really off. */
+ ret = wait_event_interruptible_timeout(data->power_wait,
+ data->active,
+ msecs_to_jiffies(SIRF_MIN_SILENCE));
+
+ if (ret < 0)
+ return ret;
+
+ /* We are still getting data. -> state change timeout */
+ if (ret > 0)
+ return -ETIMEDOUT;
+ return 0;
+ }
+
ret = wait_event_interruptible_timeout(data->power_wait,
data->active == active, msecs_to_jiffies(timeout));
if (ret < 0)
@@ -189,13 +246,23 @@ static int sirf_set_active(struct sirf_data *data, bool active)
int ret;
if (active)
- timeout = SIRF_ACTIVATE_TIMEOUT;
+ timeout = data->wakeup ?
+ SIRF_ACTIVATE_TIMEOUT :
+ SIRF_ACTIVATE_TILL_OUTPUT_TIMEOUT;
else
timeout = SIRF_HIBERNATE_TIMEOUT;
do {
+ /* Open the serdev of wakeup-less devices to check for input. */
+ if (!data->wakeup) {
+ ret = sirf_dev_get(data);
+ if (ret)
+ return ret;
+ }
sirf_pulse_on_off(data);
ret = sirf_wait_for_power_state(data, active, timeout);
+ if (!data->wakeup)
+ sirf_dev_put(data);
if (ret < 0) {
if (ret == -ETIMEDOUT)
continue;
@@ -301,6 +368,7 @@ static int sirf_probe(struct serdev_device *serdev)
data->gdev = gdev;
mutex_init(&data->gdev_mutex);
+ mutex_init(&data->serdev_mutex);
init_waitqueue_head(&data->power_wait);
serdev_device_set_drvdata(serdev, data);
@@ -327,15 +395,6 @@ static int sirf_probe(struct serdev_device *serdev)
if (IS_ERR(data->wakeup))
goto err_put_device;
- /*
- * Configurations where WAKEUP has been left not connected,
- * are currently not supported.
- */
- if (!data->wakeup) {
- dev_err(dev, "no wakeup gpio specified\n");
- ret = -ENODEV;
- goto err_put_device;
- }
}
if (data->wakeup) {
@@ -365,6 +424,14 @@ static int sirf_probe(struct serdev_device *serdev)
if (IS_ENABLED(CONFIG_PM)) {
pm_runtime_set_suspended(dev); /* clear runtime_error flag */
pm_runtime_enable(dev);
+ /*
+ * Device might be enabled at boot, so lets first enable it,
+ * then disable it to bring it into a clear state.
+ */
+ ret = pm_runtime_get_sync(dev);
+ if (ret)
+ goto err_disable_rpm;
+ pm_runtime_put(dev);
} else {
ret = sirf_runtime_resume(dev);
if (ret < 0)
@@ -412,6 +479,7 @@ static void sirf_remove(struct serdev_device *serdev)
static const struct of_device_id sirf_of_match[] = {
{ .compatible = "fastrax,uc430" },
{ .compatible = "linx,r4" },
+ { .compatible = "wi2wi,w2sg0004" },
{ .compatible = "wi2wi,w2sg0008i" },
{ .compatible = "wi2wi,w2sg0084i" },
{},
--
2.11.0
Powered by blists - more mailing lists