2009-06-12 17:34:56

by Pandita, Vikram

Subject: [PATCH] serial: 8250: add IRQ trigger support

There is currently no provision for passing IRQ trigger flags for
serial IRQs with triggering requirements (such as GPIO IRQs.)

This patch adds UPF_IRQ_TRIG_* flags which map on to IRQF_TRIGGER_*
flags.

Signed-off-by: Vikram Pandita <[email protected]>
Acked-by: Kevin Hilman <[email protected]>
---
drivers/serial/8250.c | 10 ++++++++++
include/linux/serial_core.h | 4 ++++
2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index bab115e..8235ef5 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -1641,6 +1641,16 @@ static int serial_link_irq_chain(struct uart_8250_port *up)
struct irq_info *i;
int ret, irq_flags = up->port.flags & UPF_SHARE_IRQ ? IRQF_SHARED : 0;

+ /* Get IRQ Trigger Flag */
+ if (up->port.flags & UPF_IRQ_TRIG_RISING)
+ irq_flags |= IRQF_TRIGGER_RISING;
+ else if (up->port.flags & UPF_IRQ_TRIG_FALLING)
+ irq_flags |= IRQF_TRIGGER_FALLING;
+ else if (up->port.flags & UPF_IRQ_TRIG_HIGH)
+ irq_flags |= IRQF_TRIGGER_HIGH;
+ else if (up->port.flags & UPF_IRQ_TRIG_LOW)
+ irq_flags |= IRQF_TRIGGER_LOW;
+
mutex_lock(&hash_mutex);

h = &irq_lists[up->port.irq % NR_IRQ_HASH];
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 57a97e5..07591d5 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -296,7 +296,11 @@ struct uart_port {
#define UPF_SPD_WARP ((__force upf_t) (0x1010))
#define UPF_SKIP_TEST ((__force upf_t) (1 << 6))
#define UPF_AUTO_IRQ ((__force upf_t) (1 << 7))
+#define UPF_IRQ_TRIG_RISING ((__force upf_t) (1 << 8))
+#define UPF_IRQ_TRIG_FALLING ((__force upf_t) (1 << 9))
+#define UPF_IRQ_TRIG_HIGH ((__force upf_t) (1 << 10))
#define UPF_HARDPPS_CD ((__force upf_t) (1 << 11))
+#define UPF_IRQ_TRIG_LOW ((__force upf_t) (1 << 12))
#define UPF_LOW_LATENCY ((__force upf_t) (1 << 13))
#define UPF_BUGGY_UART ((__force upf_t) (1 << 14))
#define UPF_NO_TXEN_TEST ((__force upf_t) (1 << 15))
--
1.6.0.3.613.g9f8f13

2009-06-12 19:31:39

by Marc Zyngier

Subject: Re: [PATCH] serial: 8250: add IRQ trigger support

On Fri, 12 Jun 2009 12:32:51 -0500
Vikram Pandita <[email protected]> wrote:

> There is currently no provision for passing IRQ trigger flags for
> serial IRQs with triggering requirements (such as GPIO IRQs.)
>
> This patch adds UPF_IRQ_TRIG_* flags which map on to IRQF_TRIGGER_*
> flags.
>
> Signed-off-by: Vikram Pandita <[email protected]>
> Acked-by: Kevin Hilman <[email protected]>

Note that this patch doesn't allow the interrupt to trigger on both
edges (not that I have ever seen a 8250 with this behavior, but this
is a valid configuration from an interrupt point of view).

Aside from this remark:
Acked-by: Marc Zyngier <[email protected]>

> ---
> drivers/serial/8250.c | 10 ++++++++++
> include/linux/serial_core.h | 4 ++++
> 2 files changed, 14 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
> index bab115e..8235ef5 100644
> --- a/drivers/serial/8250.c
> +++ b/drivers/serial/8250.c
> @@ -1641,6 +1641,16 @@ static int serial_link_irq_chain(struct
> uart_8250_port *up) struct irq_info *i;
> int ret, irq_flags = up->port.flags & UPF_SHARE_IRQ ?
> IRQF_SHARED : 0;
> + /* Get IRQ Trigger Flag */
> + if (up->port.flags & UPF_IRQ_TRIG_RISING)
> + irq_flags |= IRQF_TRIGGER_RISING;
> + else if (up->port.flags & UPF_IRQ_TRIG_FALLING)
> + irq_flags |= IRQF_TRIGGER_FALLING;
> + else if (up->port.flags & UPF_IRQ_TRIG_HIGH)
> + irq_flags |= IRQF_TRIGGER_HIGH;
> + else if (up->port.flags & UPF_IRQ_TRIG_LOW)
> + irq_flags |= IRQF_TRIGGER_LOW;
> +
> mutex_lock(&hash_mutex);
>
> h = &irq_lists[up->port.irq % NR_IRQ_HASH];
> diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
> index 57a97e5..07591d5 100644
> --- a/include/linux/serial_core.h
> +++ b/include/linux/serial_core.h
> @@ -296,7 +296,11 @@ struct uart_port {
> #define UPF_SPD_WARP ((__force upf_t) (0x1010))
> #define UPF_SKIP_TEST ((__force upf_t) (1 << 6))
> #define UPF_AUTO_IRQ ((__force upf_t) (1 << 7))
> +#define UPF_IRQ_TRIG_RISING ((__force upf_t) (1 << 8))
> +#define UPF_IRQ_TRIG_FALLING ((__force upf_t) (1 << 9))
> +#define UPF_IRQ_TRIG_HIGH ((__force upf_t) (1 << 10))
> #define UPF_HARDPPS_CD ((__force upf_t) (1 << 11))
> +#define UPF_IRQ_TRIG_LOW ((__force upf_t) (1 << 12))
> #define UPF_LOW_LATENCY ((__force upf_t) (1 << 13))
> #define UPF_BUGGY_UART ((__force upf_t) (1 << 14))
> #define UPF_NO_TXEN_TEST ((__force upf_t) (1 << 15))

2009-06-22 12:40:52

by Tony Lindgren

Subject: Re: [PATCH] serial: 8250: add IRQ trigger support

* Marc Zyngier <[email protected]> [090612 22:31]:
> On Fri, 12 Jun 2009 12:32:51 -0500
> Vikram Pandita <[email protected]> wrote:
>
> > There is currently no provision for passing IRQ trigger flags for
> > serial IRQs with triggering requirements (such as GPIO IRQs.)
> >
> > This patch adds UPF_IRQ_TRIG_* flags which map on to IRQF_TRIGGER_*
> > flags.
> >
> > Signed-off-by: Vikram Pandita <[email protected]>
> > Acked-by: Kevin Hilman <[email protected]>
>
> Note that this patch doesn't allow the interrupt to trigger on both
> edges (not that I have ever seen a 8250 with this behavior, but this
> is a valid configuration from an interrupt point of view).

To me it sounds like the it would be better to have unsigned
long irqflags in struct uart_port instead of trying to squeeze
the irqflags the flags field. We're already not covering all the
irqflags currently like Marc pointed out.

Regards,

Tony


> Aside from this remark:
> Acked-by: Marc Zyngier <[email protected]>
>
> > ---
> > drivers/serial/8250.c | 10 ++++++++++
> > include/linux/serial_core.h | 4 ++++
> > 2 files changed, 14 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
> > index bab115e..8235ef5 100644
> > --- a/drivers/serial/8250.c
> > +++ b/drivers/serial/8250.c
> > @@ -1641,6 +1641,16 @@ static int serial_link_irq_chain(struct
> > uart_8250_port *up) struct irq_info *i;
> > int ret, irq_flags = up->port.flags & UPF_SHARE_IRQ ?
> > IRQF_SHARED : 0;
> > + /* Get IRQ Trigger Flag */
> > + if (up->port.flags & UPF_IRQ_TRIG_RISING)
> > + irq_flags |= IRQF_TRIGGER_RISING;
> > + else if (up->port.flags & UPF_IRQ_TRIG_FALLING)
> > + irq_flags |= IRQF_TRIGGER_FALLING;
> > + else if (up->port.flags & UPF_IRQ_TRIG_HIGH)
> > + irq_flags |= IRQF_TRIGGER_HIGH;
> > + else if (up->port.flags & UPF_IRQ_TRIG_LOW)
> > + irq_flags |= IRQF_TRIGGER_LOW;
> > +
> > mutex_lock(&hash_mutex);
> >
> > h = &irq_lists[up->port.irq % NR_IRQ_HASH];
> > diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
> > index 57a97e5..07591d5 100644
> > --- a/include/linux/serial_core.h
> > +++ b/include/linux/serial_core.h
> > @@ -296,7 +296,11 @@ struct uart_port {
> > #define UPF_SPD_WARP ((__force upf_t) (0x1010))
> > #define UPF_SKIP_TEST ((__force upf_t) (1 << 6))
> > #define UPF_AUTO_IRQ ((__force upf_t) (1 << 7))
> > +#define UPF_IRQ_TRIG_RISING ((__force upf_t) (1 << 8))
> > +#define UPF_IRQ_TRIG_FALLING ((__force upf_t) (1 << 9))
> > +#define UPF_IRQ_TRIG_HIGH ((__force upf_t) (1 << 10))
> > #define UPF_HARDPPS_CD ((__force upf_t) (1 << 11))
> > +#define UPF_IRQ_TRIG_LOW ((__force upf_t) (1 << 12))
> > #define UPF_LOW_LATENCY ((__force upf_t) (1 << 13))
> > #define UPF_BUGGY_UART ((__force upf_t) (1 << 14))
> > #define UPF_NO_TXEN_TEST ((__force upf_t) (1 << 15))
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/

2009-06-22 13:23:03

by Alan

Subject: Re: [PATCH] serial: 8250: add IRQ trigger support

> To me it sounds like the it would be better to have unsigned
> long irqflags in struct uart_port instead of trying to squeeze
> the irqflags the flags field. We're already not covering all the
> irqflags currently like Marc pointed out.

Agreed.

Alan

2009-06-22 13:25:35

by Pandita, Vikram

Subject: RE: [PATCH] serial: 8250: add IRQ trigger support

>-----Original Message-----
>From: Alan Cox [mailto:[email protected]]
>Sent: Monday, June 22, 2009 8:24 AM
>To: Tony Lindgren
>Cc: Marc Zyngier; Pandita, Vikram; [email protected]; [email protected]; linux-
>[email protected]; [email protected]
>Subject: Re: [PATCH] serial: 8250: add IRQ trigger support
>
>> To me it sounds like the it would be better to have unsigned
>> long irqflags in struct uart_port instead of trying to squeeze
>> the irqflags the flags field. We're already not covering all the
>> irqflags currently like Marc pointed out.
>
>Agreed.

I can post a patch with new irqflags in uart_port.
Expect a patch today.

>
>Alan