arm pl011 serial: support multi-irq request
PATCH v3 1/1 arm pl011 serial: support multi-irq request
From: Bing Fan <[email protected]>
In order to make pl011 work better, multiple interrupts are required, such as TXIM, RXIM, RTIM, error interrupt(FE/PE/BE/OE); at the same time, pl011 to GIC does not merge the interrupt lines(each serial-interrupt corresponding to different GIC hardware interrupt), so need to enable and request multiple gic interrupt numbers in the driver.
--- drivers/tty/serial/amba-pl011.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
drivers/tty/serial/amba-pl011.c +18 -1
@@ -1703,9 +1703,26 @@ static void pl011_write_lcr_h(struct uart_amba_port *uap, unsigned int lcr_h)static int pl011_allocate_irq (struct uart_amba_port *uap) { +int ret =0 ; +int i; +unsigned int virq; + struct amba_device *amba_dev = container_of(uap->port.dev, struct amba_device, dev); +pl011_write (uap->im, uap,REG_IMSC ); -return request_irq (uap->port.irq, pl011_int,IRQF_SHARED ,"uart-pl011" , uap); +for (i =0 ; i <AMBA_NR_IRQS ; i++) { + virq = amba_dev->irq[i]; +if (virq ==0 ) +break ; + + ret =request_irq (virq, pl011_int,IRQF_SHARED ,"uart-pl011-*" , uap); +if (ret) { +dev_err (uap->port.dev,"request %u interrupt failed\n" , virq); +break ; + } + } + +return ret; }/*
Signature · 1 line
2.17.1
Greg KH
maintainerQuoted 29 lines · Bing Fan
From: Bing Fan <[email protected]>
In order to make pl011 work better, multiple interrupts are required, such as TXIM, RXIM, RTIM, error interrupt(FE/PE/BE/OE); at the same time, pl011 to GIC does not merge the interrupt lines(each serial-interrupt corresponding to different GIC hardware interrupt), so need to enable and request multiple gic interrupt numbers in the driver.
Signed-off-by Bing Fan <[email protected]>--- drivers/tty/serial/amba-pl011.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)drivers/tty/serial/amba-pl011.c +5
-0@@ -1703,9 +1703,26 @@ static void pl011_write_lcr_h(struct uart_amba_port *uap, unsigned int lcr_h)static int pl011_allocate_irq (struct uart_amba_port *uap) { +int ret =0 ; +int i; +unsigned int virq; + struct amba_device *amba_dev = container_of(uap->port.dev, struct amba_device, dev); +pl011_write (uap->im, uap,REG_IMSC );
drivers/tty/serial/amba-pl011.c static void pl011_write_lcr_h(struct uart_amba_port *uap, unsigned int lcr_h) · line 1721
Quoted 10 lines
drivers/tty/serial/amba-pl011.c +9
-1-return request_irq (uap->port.irq, pl011_int,IRQF_SHARED ,"uart-pl011" , uap); +for (i =0 ; i <AMBA_NR_IRQS ; i++) { + virq = amba_dev->irq[i]; +if (virq ==0 ) +break ; + + ret =request_irq (virq, pl011_int,IRQF_SHARED ,"uart-pl011-*" , uap); +if (ret) { +dev_err (uap->port.dev,"request %u interrupt failed\n" , virq); +break ;
No error handling to put back the irq you requested if an error happens? That feels like a memory leak...
thanks,
greg k-h