* [PATCH] mfd: Read wm831x AUXADC conversion results before acknowledging interrupt
@ 2011-06-02 10:28 Mark Brown
2011-06-02 10:40 ` Mark Brown
0 siblings, 1 reply; 3+ messages in thread
From: Mark Brown @ 2011-06-02 10:28 UTC (permalink / raw)
To: Samuel Ortiz; +Cc: linux-kernel, patches, Mark Brown
Ensure that there's no possibility of loosing an AUXADC interrupt by reading
the conversion result in the IRQ handler when using interrupts. Otherwise
it's possible that under very heavy load a new conversion could be initiated
before the acknowledgement for a previous interrupt has happened.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
drivers/mfd/wm831x-core.c | 46 +++++++++++++++++++++++++-------------
include/linux/mfd/wm831x/core.h | 1 +
2 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index 58f033b..e39fce2 100644
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -376,6 +376,16 @@ int wm831x_auxadc_read(struct wm831x *wm831x, enum wm831x_auxadc input)
goto disable;
}
}
+
+ ret = wm831x_reg_read(wm831x, WM831X_AUXADC_DATA);
+ if (ret < 0) {
+ dev_err(wm831x->dev,
+ "Failed to read AUXADC data: %d\n", ret);
+ goto disable;
+ }
+
+ wm831x->auxadc_data = ret;
+
} else {
/* If we are using interrupts then wait for the
* interrupt to complete. Use an extremely long
@@ -390,23 +400,18 @@ int wm831x_auxadc_read(struct wm831x *wm831x, enum wm831x_auxadc input)
}
}
- ret = wm831x_reg_read(wm831x, WM831X_AUXADC_DATA);
- if (ret < 0) {
- dev_err(wm831x->dev, "Failed to read AUXADC data: %d\n", ret);
+ src = ((wm831x->auxadc_data & WM831X_AUX_DATA_SRC_MASK)
+ >> WM831X_AUX_DATA_SRC_SHIFT) - 1;
+
+ if (src == 14)
+ src = WM831X_AUX_CAL;
+
+ if (src != input) {
+ dev_err(wm831x->dev, "Data from source %d not %d\n",
+ src, input);
+ ret = -EINVAL;
} else {
- src = ((ret & WM831X_AUX_DATA_SRC_MASK)
- >> WM831X_AUX_DATA_SRC_SHIFT) - 1;
-
- if (src == 14)
- src = WM831X_AUX_CAL;
-
- if (src != input) {
- dev_err(wm831x->dev, "Data from source %d not %d\n",
- src, input);
- ret = -EINVAL;
- } else {
- ret &= WM831X_AUX_DATA_MASK;
- }
+ wm831x->auxadc_data &= WM831X_AUX_DATA_MASK;
}
disable:
@@ -421,6 +426,15 @@ static irqreturn_t wm831x_auxadc_irq(int irq, void *irq_data)
{
struct wm831x *wm831x = irq_data;
+ ret = wm831x_reg_read(wm831x, WM831X_AUXADC_DATA);
+ if (ret < 0) {
+ dev_err(wm831x->dev,
+ "Failed to read AUXADC data: %d\n", ret);
+ wm831x->auxadc_data = 0xffff;
+ } else {
+ wm831x->auxadc_data = ret;
+ }
+
complete(&wm831x->auxadc_done);
return IRQ_HANDLED;
diff --git a/include/linux/mfd/wm831x/core.h b/include/linux/mfd/wm831x/core.h
index 1d93cbe..fb6568e 100644
--- a/include/linux/mfd/wm831x/core.h
+++ b/include/linux/mfd/wm831x/core.h
@@ -379,6 +379,7 @@ struct wm831x {
struct mutex auxadc_lock;
struct completion auxadc_done;
+ u16 auxadc_data;
/* The WM831x has a security key blocking access to certain
* registers. The mutex is taken by the accessors for locking
--
1.7.5.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH] mfd: Read wm831x AUXADC conversion results before acknowledging interrupt
@ 2011-06-02 10:48 Mark Brown
0 siblings, 0 replies; 3+ messages in thread
From: Mark Brown @ 2011-06-02 10:48 UTC (permalink / raw)
To: Samuel Ortiz; +Cc: patches, linux-kernel, Mark Brown
Ensure that there's no possibility of loosing an AUXADC interrupt by reading
the conversion result in the IRQ handler when using interrupts. Otherwise
it's possible that under very heavy load a new conversion could be initiated
before the acknowledgement for a previous interrupt has happened.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
drivers/mfd/wm831x-core.c | 47 +++++++++++++++++++++++++-------------
include/linux/mfd/wm831x/core.h | 1 +
2 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index 58f033b..ba9e9f39 100644
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -376,6 +376,16 @@ int wm831x_auxadc_read(struct wm831x *wm831x, enum wm831x_auxadc input)
goto disable;
}
}
+
+ ret = wm831x_reg_read(wm831x, WM831X_AUXADC_DATA);
+ if (ret < 0) {
+ dev_err(wm831x->dev,
+ "Failed to read AUXADC data: %d\n", ret);
+ goto disable;
+ }
+
+ wm831x->auxadc_data = ret;
+
} else {
/* If we are using interrupts then wait for the
* interrupt to complete. Use an extremely long
@@ -390,23 +400,18 @@ int wm831x_auxadc_read(struct wm831x *wm831x, enum wm831x_auxadc input)
}
}
- ret = wm831x_reg_read(wm831x, WM831X_AUXADC_DATA);
- if (ret < 0) {
- dev_err(wm831x->dev, "Failed to read AUXADC data: %d\n", ret);
+ src = ((wm831x->auxadc_data & WM831X_AUX_DATA_SRC_MASK)
+ >> WM831X_AUX_DATA_SRC_SHIFT) - 1;
+
+ if (src == 14)
+ src = WM831X_AUX_CAL;
+
+ if (src != input) {
+ dev_err(wm831x->dev, "Data from source %d not %d\n",
+ src, input);
+ ret = -EINVAL;
} else {
- src = ((ret & WM831X_AUX_DATA_SRC_MASK)
- >> WM831X_AUX_DATA_SRC_SHIFT) - 1;
-
- if (src == 14)
- src = WM831X_AUX_CAL;
-
- if (src != input) {
- dev_err(wm831x->dev, "Data from source %d not %d\n",
- src, input);
- ret = -EINVAL;
- } else {
- ret &= WM831X_AUX_DATA_MASK;
- }
+ wm831x->auxadc_data &= WM831X_AUX_DATA_MASK;
}
disable:
@@ -420,6 +425,16 @@ EXPORT_SYMBOL_GPL(wm831x_auxadc_read);
static irqreturn_t wm831x_auxadc_irq(int irq, void *irq_data)
{
struct wm831x *wm831x = irq_data;
+ int ret;
+
+ ret = wm831x_reg_read(wm831x, WM831X_AUXADC_DATA);
+ if (ret < 0) {
+ dev_err(wm831x->dev,
+ "Failed to read AUXADC data: %d\n", ret);
+ wm831x->auxadc_data = 0xffff;
+ } else {
+ wm831x->auxadc_data = ret;
+ }
complete(&wm831x->auxadc_done);
diff --git a/include/linux/mfd/wm831x/core.h b/include/linux/mfd/wm831x/core.h
index 1d93cbe..fb6568e 100644
--- a/include/linux/mfd/wm831x/core.h
+++ b/include/linux/mfd/wm831x/core.h
@@ -379,6 +379,7 @@ struct wm831x {
struct mutex auxadc_lock;
struct completion auxadc_done;
+ u16 auxadc_data;
/* The WM831x has a security key blocking access to certain
* registers. The mutex is taken by the accessors for locking
--
1.7.5.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-06-02 10:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-02 10:28 [PATCH] mfd: Read wm831x AUXADC conversion results before acknowledging interrupt Mark Brown
2011-06-02 10:40 ` Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2011-06-02 10:48 Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox