| Message ID | 1458152126-2333-2-git-send-email-qipeng.zha@intel.com |
|---|---|
| State | New |
| Headers | show |
On Wed, Mar 16, 2016 at 7:15 PM, Qipeng Zha <qipeng.zha@intel.com> wrote: > From: Qi Zheng <qi.zheng@intel.com> > > There is unexpected gpio interrupt after irq_enable. If not > implemeted gpio_irq_enable callback, irq_enable calls irq_unmask > instead. But if there was interrupt set before the irq_enable, > unmask it may trigger the unexpected interrupt. By implementing > the gpio_irq_enable callback, do interrupt status ack, the issue > has gone. > > Signed-off-by: Qi Zheng <qi.zheng@intel.com> > Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> > Signed-off-by: Qipeng Zha <qipeng.zha@intel.com> Patch applied for fixes. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Mar 17, 2016 at 03:07:33PM +0100, Linus Walleij wrote: > On Wed, Mar 16, 2016 at 7:15 PM, Qipeng Zha <qipeng.zha@intel.com> wrote: > > > From: Qi Zheng <qi.zheng@intel.com> > > > > There is unexpected gpio interrupt after irq_enable. If not > > implemeted gpio_irq_enable callback, irq_enable calls irq_unmask > > instead. But if there was interrupt set before the irq_enable, > > unmask it may trigger the unexpected interrupt. By implementing > > the gpio_irq_enable callback, do interrupt status ack, the issue > > has gone. > > > > Signed-off-by: Qi Zheng <qi.zheng@intel.com> > > Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> > > Signed-off-by: Qipeng Zha <qipeng.zha@intel.com> > > Patch applied for fixes. Linus, what happend to these two patches? I do not find them in the mainline for some reason. -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Apr 1, 2016 at 1:54 PM, Westerberg, Mika <mika.westerberg@intel.com> wrote: > On Thu, Mar 17, 2016 at 03:07:33PM +0100, Linus Walleij wrote: >> On Wed, Mar 16, 2016 at 7:15 PM, Qipeng Zha <qipeng.zha@intel.com> wrote: >> >> > From: Qi Zheng <qi.zheng@intel.com> >> > >> > There is unexpected gpio interrupt after irq_enable. If not >> > implemeted gpio_irq_enable callback, irq_enable calls irq_unmask >> > instead. But if there was interrupt set before the irq_enable, >> > unmask it may trigger the unexpected interrupt. By implementing >> > the gpio_irq_enable callback, do interrupt status ack, the issue >> > has gone. >> > >> > Signed-off-by: Qi Zheng <qi.zheng@intel.com> >> > Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> >> > Signed-off-by: Qipeng Zha <qipeng.zha@intel.com> >> >> Patch applied for fixes. > > Linus, what happend to these two patches? I do not find them in the > mainline for some reason. I guess lack of patience or me being slow :) It's there now AFAICT. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Apr 13, 2016 at 03:29:00PM +0200, Linus Walleij wrote: > On Fri, Apr 1, 2016 at 1:54 PM, Westerberg, Mika > <mika.westerberg@intel.com> wrote: > > On Thu, Mar 17, 2016 at 03:07:33PM +0100, Linus Walleij wrote: > >> On Wed, Mar 16, 2016 at 7:15 PM, Qipeng Zha <qipeng.zha@intel.com> wrote: > >> > >> > From: Qi Zheng <qi.zheng@intel.com> > >> > > >> > There is unexpected gpio interrupt after irq_enable. If not > >> > implemeted gpio_irq_enable callback, irq_enable calls irq_unmask > >> > instead. But if there was interrupt set before the irq_enable, > >> > unmask it may trigger the unexpected interrupt. By implementing > >> > the gpio_irq_enable callback, do interrupt status ack, the issue > >> > has gone. > >> > > >> > Signed-off-by: Qi Zheng <qi.zheng@intel.com> > >> > Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> > >> > Signed-off-by: Qipeng Zha <qipeng.zha@intel.com> > >> > >> Patch applied for fixes. > > > > Linus, what happend to these two patches? I do not find them in the > > mainline for some reason. > > I guess lack of patience or me being slow :) > > It's there now AFAICT. Thank you :) -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c index c216cb3..6c2c816f 100644 --- a/drivers/pinctrl/intel/pinctrl-intel.c +++ b/drivers/pinctrl/intel/pinctrl-intel.c @@ -665,6 +665,35 @@ static void intel_gpio_irq_ack(struct irq_data *d) spin_unlock(&pctrl->lock); } +static void intel_gpio_irq_enable(struct irq_data *d) +{ + struct gpio_chip *gc = irq_data_get_irq_chip_data(d); + struct intel_pinctrl *pctrl = gpiochip_get_data(gc); + const struct intel_community *community; + unsigned pin = irqd_to_hwirq(d); + unsigned long flags; + + spin_lock_irqsave(&pctrl->lock, flags); + + community = intel_get_community(pctrl, pin); + if (community) { + unsigned padno = pin_to_padno(community, pin); + unsigned gpp_size = community->gpp_size; + unsigned gpp_offset = padno % gpp_size; + unsigned gpp = padno / gpp_size; + u32 value; + + /* Clear interrupt status first to avoid unexpected interrupt */ + writel(BIT(gpp_offset), community->regs + GPI_IS + gpp * 4); + + value = readl(community->regs + community->ie_offset + gpp * 4); + value |= BIT(gpp_offset); + writel(value, community->regs + community->ie_offset + gpp * 4); + } + + spin_unlock_irqrestore(&pctrl->lock, flags); +} + static void intel_gpio_irq_mask_unmask(struct irq_data *d, bool mask) { struct gpio_chip *gc = irq_data_get_irq_chip_data(d); @@ -853,6 +882,7 @@ static irqreturn_t intel_gpio_irq(int irq, void *data) static struct irq_chip intel_gpio_irqchip = { .name = "intel-gpio", + .irq_enable = intel_gpio_irq_enable, .irq_ack = intel_gpio_irq_ack, .irq_mask = intel_gpio_irq_mask, .irq_unmask = intel_gpio_irq_unmask,