| 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: Thu, 16 May 2013 10:12:32 -0700
From: Doug Anderson <dianders@...omium.org>
To: Tomasz Figa <tomasz.figa@...il.com>,
Kukjin Kim <kgene.kim@...sung.com>
Cc: Olof Johansson <olof@...om.net>,
Stephen Warren <swarren@...dotorg.org>,
Thomas Abraham <thomas.abraham@...aro.org>,
Linus Walleij <linus.walleij@...aro.org>,
Prathyush K <prathyush.k@...sung.com>,
linux-samsung-soc@...r.kernel.org,
Doug Anderson <dianders@...omium.org>,
linux-kernel@...r.kernel.org
Subject: [PATCH 2/2] pinctrl: exynos: fix eint wakeup by using irq_set_wake()
From: Prathyush K <prathyush.k@...sung.com>
Add the irq_set_wake function for exynos pinctrl to configure the
external interrupt wakeup mask register.
[dianders: minor nit fixes; port to ToT]
Signed-off-by: Prathyush K <prathyush.k@...sung.com>
Signed-off-by: Doug Anderson <dianders@...omium.org>
---
drivers/pinctrl/pinctrl-exynos.c | 45 ++++++++++++++++++++++++++++-----------
drivers/pinctrl/pinctrl-exynos.h | 3 ++-
drivers/pinctrl/pinctrl-samsung.h | 2 ++
3 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-exynos.c b/drivers/pinctrl/pinctrl-exynos.c
index ac74281..3ebb2ff 100644
--- a/drivers/pinctrl/pinctrl-exynos.c
+++ b/drivers/pinctrl/pinctrl-exynos.c
@@ -30,6 +30,8 @@
#include <linux/spinlock.h>
#include <linux/err.h>
+#include <plat/pm.h>
+
#include "pinctrl-samsung.h"
#include "pinctrl-exynos.h"
@@ -326,6 +328,24 @@ static int exynos_wkup_irq_set_type(struct irq_data *irqd, unsigned int type)
return 0;
}
+static int exynos_wkup_irq_set_wake(struct irq_data *irqd, unsigned int state)
+{
+ struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);
+ const int eint_num = bank->eint_base + irqd->hwirq;
+ unsigned long bit = 1L << eint_num;
+
+ pr_info("wake %s for eint %d / %s[%ld]\n",
+ state ? "enabled" : "disabled",
+ eint_num, bank->name, irqd->hwirq);
+
+ if (!state)
+ s3c_irqwake_eintmask |= bit;
+ else
+ s3c_irqwake_eintmask &= ~bit;
+
+ return 0;
+}
+
/*
* irq_chip for wakeup interrupts
*/
@@ -335,6 +355,7 @@ static struct irq_chip exynos_wkup_irq_chip = {
.irq_mask = exynos_wkup_irq_mask,
.irq_ack = exynos_wkup_irq_ack,
.irq_set_type = exynos_wkup_irq_set_type,
+ .irq_set_wake = exynos_wkup_irq_set_wake,
};
/* interrupt handler for wakeup interrupts 0..15 */
@@ -543,10 +564,10 @@ static struct samsung_pin_bank exynos4210_pin_banks1[] = {
EXYNOS_PIN_BANK_EINTN(8, 0x1A0, "gpy4"),
EXYNOS_PIN_BANK_EINTN(8, 0x1C0, "gpy5"),
EXYNOS_PIN_BANK_EINTN(8, 0x1E0, "gpy6"),
- EXYNOS_PIN_BANK_EINTW(8, 0xC00, "gpx0", 0x00),
- EXYNOS_PIN_BANK_EINTW(8, 0xC20, "gpx1", 0x04),
- EXYNOS_PIN_BANK_EINTW(8, 0xC40, "gpx2", 0x08),
- EXYNOS_PIN_BANK_EINTW(8, 0xC60, "gpx3", 0x0c),
+ EXYNOS_PIN_BANK_EINTW(8, 0xC00, "gpx0", 0x00, 0),
+ EXYNOS_PIN_BANK_EINTW(8, 0xC20, "gpx1", 0x04, 8),
+ EXYNOS_PIN_BANK_EINTW(8, 0xC40, "gpx2", 0x08, 16),
+ EXYNOS_PIN_BANK_EINTW(8, 0xC60, "gpx3", 0x0c, 24),
};
/* pin banks of exynos4210 pin-controller 2 */
@@ -629,10 +650,10 @@ static struct samsung_pin_bank exynos4x12_pin_banks1[] = {
EXYNOS_PIN_BANK_EINTN(8, 0x1A0, "gpy4"),
EXYNOS_PIN_BANK_EINTN(8, 0x1C0, "gpy5"),
EXYNOS_PIN_BANK_EINTN(8, 0x1E0, "gpy6"),
- EXYNOS_PIN_BANK_EINTW(8, 0xC00, "gpx0", 0x00),
- EXYNOS_PIN_BANK_EINTW(8, 0xC20, "gpx1", 0x04),
- EXYNOS_PIN_BANK_EINTW(8, 0xC40, "gpx2", 0x08),
- EXYNOS_PIN_BANK_EINTW(8, 0xC60, "gpx3", 0x0c),
+ EXYNOS_PIN_BANK_EINTW(8, 0xC00, "gpx0", 0x00, 0),
+ EXYNOS_PIN_BANK_EINTW(8, 0xC20, "gpx1", 0x04, 8),
+ EXYNOS_PIN_BANK_EINTW(8, 0xC40, "gpx2", 0x08, 16),
+ EXYNOS_PIN_BANK_EINTW(8, 0xC60, "gpx3", 0x0c, 24),
};
/* pin banks of exynos4x12 pin-controller 2 */
@@ -724,10 +745,10 @@ static struct samsung_pin_bank exynos5250_pin_banks0[] = {
EXYNOS_PIN_BANK_EINTN(8, 0x220, "gpy4"),
EXYNOS_PIN_BANK_EINTN(8, 0x240, "gpy5"),
EXYNOS_PIN_BANK_EINTN(8, 0x260, "gpy6"),
- EXYNOS_PIN_BANK_EINTW(8, 0xC00, "gpx0", 0x00),
- EXYNOS_PIN_BANK_EINTW(8, 0xC20, "gpx1", 0x04),
- EXYNOS_PIN_BANK_EINTW(8, 0xC40, "gpx2", 0x08),
- EXYNOS_PIN_BANK_EINTW(8, 0xC60, "gpx3", 0x0c),
+ EXYNOS_PIN_BANK_EINTW(8, 0xC00, "gpx0", 0x00, 0),
+ EXYNOS_PIN_BANK_EINTW(8, 0xC20, "gpx1", 0x04, 8),
+ EXYNOS_PIN_BANK_EINTW(8, 0xC40, "gpx2", 0x08, 16),
+ EXYNOS_PIN_BANK_EINTW(8, 0xC60, "gpx3", 0x0c, 24),
};
/* pin banks of exynos5250 pin-controller 1 */
diff --git a/drivers/pinctrl/pinctrl-exynos.h b/drivers/pinctrl/pinctrl-exynos.h
index 9b1f77a..d98e9ff 100644
--- a/drivers/pinctrl/pinctrl-exynos.h
+++ b/drivers/pinctrl/pinctrl-exynos.h
@@ -65,13 +65,14 @@
.name = id \
}
-#define EXYNOS_PIN_BANK_EINTW(pins, reg, id, offs) \
+#define EXYNOS_PIN_BANK_EINTW(pins, reg, id, offs, base)\
{ \
.type = &bank_type_alive, \
.pctl_offset = reg, \
.nr_pins = pins, \
.eint_type = EINT_TYPE_WKUP, \
.eint_offset = offs, \
+ .eint_base = base, \
.name = id \
}
diff --git a/drivers/pinctrl/pinctrl-samsung.h b/drivers/pinctrl/pinctrl-samsung.h
index c9a7b6e..1e033ae 100644
--- a/drivers/pinctrl/pinctrl-samsung.h
+++ b/drivers/pinctrl/pinctrl-samsung.h
@@ -120,6 +120,7 @@ struct samsung_pin_bank_type {
* @eint_func: function to set in CON register to configure pin as EINT.
* @eint_type: type of the external interrupt supported by the bank.
* @eint_mask: bit mask of pins which support EINT function.
+ * @eint_base: number of external wakeup interrupts from start to this bank.
* @name: name to be prefixed for each pin in this pin bank.
* @of_node: OF node of the bank.
* @drvdata: link to controller driver data
@@ -138,6 +139,7 @@ struct samsung_pin_bank {
enum eint_type eint_type;
u32 eint_mask;
u32 eint_offset;
+ u32 eint_base;
char *name;
struct device_node *of_node;
struct samsung_pinctrl_drv_data *drvdata;
--
1.8.2.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists