Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1629906

[PATCH v2 1/1] gpio: gpio-wcove: fix GPIO IRQ status mask

From sathyanarayanan.kuppuswamy@linux.intel.com
Newsgroups linux.kernel
Subject [PATCH v2 1/1] gpio: gpio-wcove: fix GPIO IRQ status mask
Date 2017-04-24 21:20 +0200
Message-ID <tzRGF-2y4-19@gated-at.bofh.it> (permalink)
References <ty4I2-80K-19@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>

According to Whiskey Cove PMIC spec, bit 7 of GPIOIRQ0_REG belongs to
battery IO. So we should skip this bit when checking for GPIO IRQ pending
status. Otherwise, wcove_gpio_irq_handler() might go into the infinite
loop until IRQ "pending" status becomes 0. This patch fixes this issue.

Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
---
 drivers/gpio/gpio-wcove.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Changes since v1:
 * Used GENMASK API.
 * Fixed some style issues.
 * Updated commit message.

diff --git a/drivers/gpio/gpio-wcove.c b/drivers/gpio/gpio-wcove.c
index 97613de..7872435 100644
--- a/drivers/gpio/gpio-wcove.c
+++ b/drivers/gpio/gpio-wcove.c
@@ -51,6 +51,8 @@
 #define GROUP1_NR_IRQS		6
 #define IRQ_MASK_BASE		0x4e19
 #define IRQ_STATUS_BASE		0x4e0b
+#define GPIO_IRQ0_MASK		GENMASK(6, 0)
+#define GPIO_IRQ1_MASK		GENMASK(5, 0)
 #define UPDATE_IRQ_TYPE		BIT(0)
 #define UPDATE_IRQ_MASK		BIT(1)
 
@@ -309,7 +311,7 @@ static irqreturn_t wcove_gpio_irq_handler(int irq, void *data)
 		return IRQ_NONE;
 	}
 
-	pending = p[0] | (p[1] << 8);
+	pending = (p[0] & GPIO_IRQ0_MASK) | ((p[1] & GPIO_IRQ1_MASK) << 7);
 	if (!pending)
 		return IRQ_NONE;
 
@@ -333,7 +335,7 @@ static irqreturn_t wcove_gpio_irq_handler(int irq, void *data)
 			break;
 		}
 
-		pending = p[0] | (p[1] << 8);
+		pending = (p[0] & GPIO_IRQ0_MASK) | ((p[1] & GPIO_IRQ1_MASK) << 7);
 	}
 
 	return IRQ_HANDLED;
-- 
2.7.4

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH v1 1/2] gpio: gpio-wcove: fix GPIO irq status mask sathyanarayanan.kuppuswamy@linux.intel.com - 2017-04-14 19:40 +0200
  [PATCH v1 2/2] gpio: gpio-wcove: fix irq pending status bit width sathyanarayanan.kuppuswamy@linux.intel.com - 2017-04-14 19:40 +0200
    Re: [PATCH v1 2/2] gpio: gpio-wcove: fix irq pending status bit width Linus Walleij <linus.walleij@linaro.org> - 2017-04-24 15:20 +0200
      Re: [PATCH v1 2/2] gpio: gpio-wcove: fix irq pending status bit  width Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-04-24 16:30 +0200
  Re: [PATCH v1 1/2] gpio: gpio-wcove: fix GPIO irq status mask Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-04-19 22:50 +0200
    Re: [PATCH v1 1/2] gpio: gpio-wcove: fix GPIO irq status mask sathyanarayanan kuppuswamy          <sathyanarayanan.kuppuswamy@linux.intel.com> - 2017-04-21 03:00 +0200
    [PATCH v2 1/1] gpio: gpio-wcove: fix GPIO IRQ status mask sathyanarayanan.kuppuswamy@linux.intel.com - 2017-04-24 21:20 +0200
      Re: [PATCH v2 1/1] gpio: gpio-wcove: fix GPIO IRQ status mask Linus Walleij <linus.walleij@linaro.org> - 2017-04-26 16:30 +0200
        Re: [PATCH v2 1/1] gpio: gpio-wcove: fix GPIO IRQ status mask Mika Westerberg <mika.westerberg@linux.intel.com> - 2017-04-26 17:00 +0200
        Re: [PATCH v2 1/1] gpio: gpio-wcove: fix GPIO IRQ status mask Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-04-26 17:00 +0200
        RE: [PATCH v2 1/1] gpio: gpio-wcove: fix GPIO IRQ status mask "Gao, Bin" <bin.gao@intel.com> - 2017-04-26 18:50 +0200

csiph-web