Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3d8b76f authored by Linus Walleij's avatar Linus Walleij Committed by Greg Kroah-Hartman
Browse files

serial: PL011: move interrupt clearing 



Commit 360f748b204275229f8398cb2f9f53955db1503b
"serial: PL011: clear pending interrupts"
attempts to clear interrupts by writing to a
yet-unassigned memory address. This fixes the issue.

The breaking patch is marked for stable so should be
carried along with the other patch.

Cc: Shreshtha Kumar Sahu <shreshthakumar.sahu@stericsson.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: stable <stable@vger.kernel.org>
Cc: Nicolas Pitre <nico@fluxnic.net>
Reported-by: default avatarViresh Kumar <viresh.kumar@st.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Tested-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dd775ae2

drivers/tty/serial/amba-pl011.c

+4 −4
Original line number Diff line number Diff line
@@ -1946,10 +1946,6 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) 
		goto unmap;

	}



	/* Ensure interrupts from this UART are masked and cleared */

	writew(0, uap->port.membase + UART011_IMSC);

	writew(0xffff, uap->port.membase + UART011_ICR);



	uap->vendor = vendor;

	uap->lcrh_rx = vendor->lcrh_rx;

	uap->lcrh_tx = vendor->lcrh_tx;
@@ -1967,6 +1963,10 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) 
	uap->port.line = i;

	pl011_dma_probe(uap);



	/* Ensure interrupts from this UART are masked and cleared */

	writew(0, uap->port.membase + UART011_IMSC);

	writew(0xffff, uap->port.membase + UART011_ICR);



	snprintf(uap->type, sizeof(uap->type), "PL011 rev%u", amba_rev(dev));



	amba_ports[i] = uap;