LSR flag preservation improvements
Subsystems (3)
Ilpo Järvinen
maintainerv2 cover LSR flag preservation improvements
Note to Greg: the first patch of this series is the fix I submitted earlier but it was not yet applied as the merge window was about to begin at that point (thus, using v2 to differentiate, the rest of the series have not been sent earlier).
Improve LSR flag preservation. Not all devices preserve all LSR flags on read. Therefore, the non-permanent flags must be stored until consumed. 8250_port has handled this for some of the reads (but not all). Drivers not so much but it's unclear to me which of the devices actually clear flags on read so this series only does per driver fixes for DW.
Ilpo Järvinen (6):
serial: 8250: Store to lsr_save_flags after lsr read
serial: 8250: Create serial_lsr_in()
serial: 8250: Get preserved flags using serial_lsr_in()
serial: 8250: Adjust misleading LSR related comment
serial: 8250_dw: Use serial_lsr_in() in dw8250_handle_irq()
serial: 8250_dw: Store LSR into lsr_saved_flags in
dw8250_tx_wait_empty()
drivers/tty/serial/8250/8250.h | 20 ++++++++++++++++++++ drivers/tty/serial/8250/8250_core.c | 3 +-- drivers/tty/serial/8250/8250_dw.c | 7 +++++-- drivers/tty/serial/8250/8250_port.c | 24 +++++++++++------------- 4 files changed, 37 insertions(+), 17 deletions(-)
Signature · 1 line
2.30.2
Ilpo Järvinen
maintainerPATCH v2 1/6 serial: 8250: Store to lsr_save_flags after lsr read
Not all LSR register flags are preserved across reads. Therefore, LSR readers must store the non-preserved bits into lsr_save_flags.
This fix was initially mixed into feature commit f6f586102add ("serial:
8250: Handle UART without interrupt on TEMT using em485"). However, that feature change had a flaw and it was reverted to make room for simpler approach providing the same feature. The embedded fix got reverted with the feature change.
Re-add the lsr_save_flags fix and properly mark it's a fix.
--- drivers/tty/serial/8250/8250_port.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/tty/serial/8250/8250_port.c +2 -0
@@ -1511,6 +1511,8 @@ static inline void __stop_tx(struct uart_8250_port *p)unsigned char lsr =serial_in (p,UART_LSR );u64 stop_delay =0 ; + p->lsr_saved_flags |= lsr &LSR_SAVE_FLAGS ; +if (!(lsr &UART_LSR_THRE ))return ;/*
Signature · 1 line
2.30.2
Ilpo Järvinen
maintainerRe: [PATCH v2 1/6] serial: 8250: Store to lsr_save_flags after lsr read
Quoted 9 lines · Ilpo Järvinen
Not all LSR register flags are preserved across reads. Therefore, LSR readers must store the non-preserved bits into
lsr_save_flags.This fix was initially mixed into feature commit
f6f586102add("serial:
8250: Handle UART without interrupt on TEMT using em485"). However, that feature change had a flaw and it was reverted to make room for simpler approach providing the same feature. The embedded fix got reverted with the feature change.
Quoted 6 lines
Re-add the
lsr_save_flagsfix and properly mark it's a fix.Fixes e490c9144cfa ("tty: Add software emulated RS485 support for 8250")Link https://lore.kernel.org/all/[email protected]/T/#m1737eef986bd20cf19593e344cebd7b0244945fc open hereSigned-off-by Uwe Kleine-König <[email protected]>Acked-by Uwe Kleine-König <[email protected]>
It seems that Uwe managed to mistype his email for the A-by which I just happily copy-pasted.
Greg, please let me know if you want me to resend the series (or if you will just change it on the fly while applying).
Signature · 1 line
i.
Quoted 19 lines
Signed-off-by Ilpo Järvinen <[email protected]>--- drivers/tty/serial/8250/8250_port.c | 2 ++ 1 file changed, 2 insertions(+)drivers/tty/serial/8250/8250_port.c +2
-0@@ -1511,6 +1511,8 @@ static inline void __stop_tx(struct uart_8250_port *p)unsigned char lsr =serial_in (p,UART_LSR );u64 stop_delay =0 ; + p->lsr_saved_flags |= lsr &LSR_SAVE_FLAGS ; +if (!(lsr &UART_LSR_THRE ))return ;/*
Re: [PATCH v2 1/6] serial: 8250: Store to lsr_save_flags after lsr read
Quoted 1 line · Ilpo Järvinen
On Mon, 6 Jun 2022, Ilpo Järvinen wrote:
...
Quoted 10 lines
Quoted 4 lines
Fixes e490c9144cfa ("tty: Add software emulated RS485 support for 8250")Link https://lore.kernel.org/all/[email protected]/T/#m1737eef986bd20cf19593e344cebd7b0244945fc open hereSigned-off-by Uwe Kleine-König <[email protected]>Acked-by Uwe Kleine-König <[email protected]>It seems that Uwe managed to mistype his email for the A-by which I just happily copy-pasted.
Greg, please let me know if you want me to resend the series (or if you will just change it on the fly while applying).
I believe Greg doesn't handle patches on the fly, hence resend. But more importantly I do not see the reason for the Acked-by tag when SoB of the same person is present.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Ilpo Järvinen
maintainerRe: [PATCH v2 1/6] serial: 8250: Store to lsr_save_flags after lsr read
Quoted 14 lines · Andy Shevchenko
Quoted 1 line · Ilpo Järvinen
On Mon, 6 Jun 2022, Ilpo Järvinen wrote:
...
Quoted 8 lines
Quoted 4 lines
Fixes e490c9144cfa ("tty: Add software emulated RS485 support for 8250")Link https://lore.kernel.org/all/[email protected]/T/#m1737eef986bd20cf19593e344cebd7b0244945fc open hereSigned-off-by Uwe Kleine-König <[email protected]>Acked-by Uwe Kleine-König <[email protected]>It seems that Uwe managed to mistype his email for the A-by which I just happily copy-pasted.
Quoted 6 lines
Quoted 2 lines
Greg, please let me know if you want me to resend the series (or if you will just change it on the fly while applying).
I believe Greg doesn't handle patches on the fly, hence resend. But more importantly I do not see the reason for the Acked-by tag when SoB of the same person is present.
I just repeated what Uwe gave me. Maybe he didn't notice he was already there as SoB.
This situation is anyway a bit more complex than usual. The line I took was part of Uwe's much larger patch initially (which was fully reverted) so his SoB was carried over to preserve the authorship. As I made a non-trivial modification to his original patch by removing almost all of it, I added my SoB too. Given this situation, I kind of thought he Acked (approved) the post-modification version of it.
Signature · 1 line
i.
Re: [PATCH v2 1/6] serial: 8250: Store to lsr_save_flags after lsr read
Quoted 3 lines · Ilpo Järvinen
Quoted 2 lines · Andy Shevchenko
On Mon, Jun 6, 2022 at 3:55 PM Ilpo Järvinen
<[email protected]> wrote:
...
Quoted 6 lines
Quoted 2 lines
But more importantly I do not see the reason for the Acked-by tag when SoB of the same person is present.
I just repeated what Uwe gave me. Maybe he didn't notice he was already there as SoB.
Quoted 6 lines
This situation is anyway a bit more complex than usual. The line I took was part of Uwe's much larger patch initially (which was fully reverted) so his SoB was carried over to preserve the authorship. As I made a non-trivial modification to his original patch by removing almost all of it, I added my SoB too. Given this situation, I kind of thought he Acked (approved) the post-modification version of it.
I believe you haven't preserved the authorship that way (since From line is different), but since you have done non-trivial changes and Uwe is okay with them, the straightforward tag chain would be (with your authorship implied):
Co-developed-by: Uwe
SoB: Uwe
SoB: yours
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v2 1/6] serial: 8250: Store to lsr_save_flags after lsr read
Quoted 21 lines · Andy Shevchenko
Quoted 3 lines · Ilpo Järvinen
Quoted 2 lines · Andy Shevchenko
On Mon, Jun 6, 2022 at 3:55 PM Ilpo Järvinen
<[email protected]> wrote:...
Quoted 6 lines
Quoted 2 lines
But more importantly I do not see the reason for the Acked-by tag when SoB of the same person is present.
I just repeated what Uwe gave me. Maybe he didn't notice he was already there as SoB.
Quoted 6 lines
This situation is anyway a bit more complex than usual. The line I took was part of Uwe's much larger patch initially (which was fully reverted) so his SoB was carried over to preserve the authorship. As I made a non-trivial modification to his original patch by removing almost all of it, I added my SoB too. Given this situation, I kind of thought he Acked (approved) the post-modification version of it.
Quoted 7 lines
I believe you haven't preserved the authorship that way (since From line is different), but since you have done non-trivial changes and Uwe is okay with them, the straightforward tag chain would be (with your authorship implied):
Co-developed-by: Uwe
SoB: Uwe
SoB: yours
I don't care much, but IMHO the initial set of tags made sense to me. It has my S-o-b because the change is (somewhat) taken from me and it has my ack because the modification looked good to me.
But indeed, fixing the email address would be appreciated. Do with the tags whatever you consider sensible.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ |
Re: [PATCH v2 1/6] serial: 8250: Store to lsr_save_flags after lsr read
Quoted 31 lines · Uwe Kleine-König
Quoted 21 lines · Andy Shevchenko
Quoted 3 lines · Ilpo Järvinen
Quoted 2 lines · Andy Shevchenko
On Mon, Jun 6, 2022 at 3:55 PM Ilpo Järvinen
<[email protected]> wrote:...
Quoted 6 lines
Quoted 2 lines
But more importantly I do not see the reason for the Acked-by tag when SoB of the same person is present.
I just repeated what Uwe gave me. Maybe he didn't notice he was already there as SoB.
Quoted 6 lines
This situation is anyway a bit more complex than usual. The line I took was part of Uwe's much larger patch initially (which was fully reverted) so his SoB was carried over to preserve the authorship. As I made a non-trivial modification to his original patch by removing almost all of it, I added my SoB too. Given this situation, I kind of thought he Acked (approved) the post-modification version of it.
Quoted 7 lines
I believe you haven't preserved the authorship that way (since From line is different), but since you have done non-trivial changes and Uwe is okay with them, the straightforward tag chain would be (with your authorship implied):
Co-developed-by: Uwe
SoB: Uwe
SoB: yours
Quoted 5 lines
I don't care much, but IMHO the initial set of tags made sense to me.
It
has my S-o-b because the change is (somewhat) taken from me and it has my ack because the modification looked good to me.
According to
https://www.kernel.org/doc/html/latest/process/submitting-patches.html#when-to-use-acked-by-cc-and-co-developed-by
the SoB already implies that you developed that, but Ack if not. It also clarifies Co-developed-by for cases like this.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v2 1/6] serial: 8250: Store to lsr_save_flags after lsr read
Hello Andy,
Quoted 35 lines · Andy Shevchenko
Quoted 32 lines · Uwe Kleine-König
Quoted 21 lines · Andy Shevchenko
Quoted 3 lines · Ilpo Järvinen
Quoted 2 lines · Andy Shevchenko
On Mon, Jun 6, 2022 at 3:55 PM Ilpo Järvinen
<[email protected]> wrote:...
Quoted 6 lines
Quoted 2 lines
But more importantly I do not see the reason for the Acked-by tag when SoB of the same person is present.
I just repeated what Uwe gave me. Maybe he didn't notice he was already there as SoB.
Quoted 6 lines
This situation is anyway a bit more complex than usual. The line I took was part of Uwe's much larger patch initially (which was fully reverted) so his SoB was carried over to preserve the authorship. As I made a non-trivial modification to his original patch by removing almost all of it, I added my SoB too. Given this situation, I kind of thought he Acked (approved) the post-modification version of it.
Quoted 7 lines
I believe you haven't preserved the authorship that way (since From line is different), but since you have done non-trivial changes and Uwe is okay with them, the straightforward tag chain would be (with your authorship implied):
Co-developed-by: Uwe
SoB: Uwe
SoB: yoursI don't care much, but IMHO the initial set of tags made sense to me.
Quoted 8 lines
Quoted 3 lines
It
has my S-o-b because the change is (somewhat) taken from me and it has my ack because the modification looked good to me.According to
https://www.kernel.org/doc/html/latest/process/submitting-patches.html#when-to-use-acked-by-cc-and-co-developed-by
the SoB already implies that you developed that, but Ack if not. It also clarifies Co-developed-by for cases like this.
That's unintuitive (and wrong) in my opinion. For me, Acked-by is a confirmation of the respective person, that the patch in question is ok. If I take a hunk of a random reverted patch and add the S-o-b of the big patch's author, can I really assume the original author "acks" the result? I would expect that in most cases they don't. (And if they do, there is no way to record it, because the usual way of adding an Ack is blocked as there is already a S-o-b?)
*shrug*
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ |
Re: [PATCH v2 1/6] serial: 8250: Store to lsr_save_flags after lsr read
+Cc: Jonathan (some documentation clarification might be needed)
Quoted 40 lines · Uwe Kleine-König
Quoted 39 lines · Andy Shevchenko
Quoted 36 lines · Uwe Kleine-König
Quoted 21 lines · Andy Shevchenko
Quoted 3 lines · Ilpo Järvinen
Quoted 2 lines · Andy Shevchenko
On Mon, Jun 6, 2022 at 3:55 PM Ilpo Järvinen
<[email protected]> wrote:...
Quoted 6 lines
Quoted 2 lines
But more importantly I do not see the reason for the Acked-by tag when SoB of the same person is present.
I just repeated what Uwe gave me. Maybe he didn't notice he was already there as SoB.
Quoted 6 lines
This situation is anyway a bit more complex than usual. The line I took was part of Uwe's much larger patch initially (which was fully reverted) so his SoB was carried over to preserve the authorship. As I made a non-trivial modification to his original patch by removing almost all of it, I added my SoB too. Given this situation, I kind of thought he Acked (approved) the post-modification version of it.
Quoted 7 lines
I believe you haven't preserved the authorship that way (since From line is different), but since you have done non-trivial changes and Uwe is okay with them, the straightforward tag chain would be (with your authorship implied):
Co-developed-by: Uwe
SoB: Uwe
SoB: yoursI don't care much, but IMHO the initial set of tags made sense to me.
It
has my S-o-b because the change is (somewhat) taken from me and it has my ack because the modification looked good to me.
Quoted 6 lines
Quoted 4 lines
According to
https://www.kernel.org/doc/html/latest/process/submitting-patches.html#when-to-use-acked-by-cc-and-co-developed-by
the SoB already implies that you developed that, but Ack if not. It also clarifies Co-developed-by for cases like this.That's unintuitive (and wrong) in my opinion.
I have the opposite opinion.
Quoted 7 lines
For me, Acked-by is a
confirmation of the respective person, that the patch in question is ok. If I take a hunk of a random reverted patch and add the S-o-b of the big patch's author, can I really assume the original author "acks" the result? I would expect that in most cases they don't. (And if they do, there is no way to record it, because the usual way of adding an Ack is blocked as there is already a S-o-b?)
It's very logical to me. If you allowed (by not NAKing) the other developer to use your SoB you imply Ack for every change they made. Otherwise you need explicitly ask for withdrawal of your SoB.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v2 1/6] serial: 8250: Store to lsr_save_flags after lsr read
Hello,
Quoted 10 lines · Andy Shevchenko
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
Quoted 7 lines
I believe you haven't preserved the authorship that way (since From line is different), but since you have done non-trivial changes and Uwe is okay with them, the straightforward tag chain would be (with your authorship implied):
Co-developed-by: Uwe
SoB: Uwe
SoB: yoursI don't care much, but IMHO the initial set of tags made sense to me.
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 3 lines
It
has my S-o-b because the change is (somewhat) taken from me and it has my ack because the modification looked good to me.According to
https://www.kernel.org/doc/html/latest/process/submitting-patches.html#when-to-use-acked-by-cc-and-co-developed-by
the SoB already implies that you developed that, but Ack if not. It also clarifies Co-developed-by for cases like this.
Reading that by the letter, it doesn't say you must not use Ack if there is a S-o-b.
If a person was not directly involved in the preparation or handling of a patch but wishes to signify and record their approval of it then they can ask to have an Acked-by: line added to the patch’s changelog.
It's "If" and not "Iff". Not sure if that is intended?!
Quoted 12 lines
Quoted 1 line
That's unintuitive (and wrong) in my opinion.
I have the opposite opinion.
Quoted 7 lines
For me, Acked-by is a
confirmation of the respective person, that the patch in question is ok. If I take a hunk of a random reverted patch and add the S-o-b of the big patch's author, can I really assume the original author "acks" the result? I would expect that in most cases they don't. (And if they do, there is no way to record it, because the usual way of adding an Ack is blocked as there is already a S-o-b?)
Quoted 2 lines
It's very logical to me. If you allowed (by not NAKing) the other developer to use your SoB you imply Ack for every change they made.
So you assume that you notice each patch with your S-o-b in time to send a NAK. I don't claim that for me and I would be surprised if a major part of the kernel contributors did.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ |
Re: [PATCH v2 1/6] serial: 8250: Store to lsr_save_flags after lsr read
Quoted 1 line · Uwe Kleine-König
On Tue, Jun 07, 2022 at 12:09:39PM +0200, Andy Shevchenko wrote:
...
Quoted 22 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
Quoted 7 lines
I believe you haven't preserved the authorship that way (since From line is different), but since you have done non-trivial changes and Uwe is okay with them, the straightforward tag chain would be (with your authorship implied):
Co-developed-by: Uwe
SoB: Uwe
SoB: yoursI don't care much, but IMHO the initial set of tags made sense to me.
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 3 lines
It
has my S-o-b because the change is (somewhat) taken from me and it has my ack because the modification looked good to me.According to
https://www.kernel.org/doc/html/latest/process/submitting-patches.html#when-to-use-acked-by-cc-and-co-developed-by
the SoB already implies that you developed that, but Ack if not. It also clarifies Co-developed-by for cases like this.Reading that by the letter, it doesn't say you must not use Ack if there is a S-o-b.
Quoted 6 lines
If a person was not directly involved in the preparation or handling of a patch but wishes to signify and record their approval of it then they can ask to have an Acked-by: line added to the patch’s changelog.
It's "If" and not "Iff". Not sure if that is intended?!
Yes, it's a bit ambiguous, but I use common sense. Acking yourself code seems awkward to me.
...
Quoted 12 lines
Quoted 12 lines
Quoted 1 line
That's unintuitive (and wrong) in my opinion.
I have the opposite opinion.
Quoted 7 lines
For me, Acked-by is a
confirmation of the respective person, that the patch in question is ok. If I take a hunk of a random reverted patch and add the S-o-b of the big patch's author, can I really assume the original author "acks" the result? I would expect that in most cases they don't. (And if they do, there is no way to record it, because the usual way of adding an Ack is blocked as there is already a S-o-b?)
Quoted 6 lines
Quoted 2 lines
It's very logical to me. If you allowed (by not NAKing) the other developer to use your SoB you imply Ack for every change they made.
So you assume that you notice each patch with your S-o-b in time to send a NAK. I don't claim that for me and I would be surprised if a major part of the kernel contributors did.
Yes. That's why git send-email is always Cc'ing people whose SoB tags in the patch.
The flaw that you may notice here is that anybody can potentially add anybody's SoB to any garbage and send it to a mailing list. It has non-zero chances to pass review (a person whose SoB has been abused on a sick leave, for example). But this is more process and QA related.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Ilpo Järvinen
maintainerPATCH v2 2/6 serial: 8250: Create serial_lsr_in()
In reply to Ilpo JärvinenLSR register readers need to be careful in order to not lose bits that are not preserved across reads. Create a helper that takes care of storing the non-preserved bits into lsr_save_flags.
--- drivers/tty/serial/8250/8250.h | 20 ++++++++++++++++++++ drivers/tty/serial/8250/8250_core.c | 3 +-- drivers/tty/serial/8250/8250_port.c | 15 ++++----------- 3 files changed, 25 insertions(+), 13 deletions(-)
drivers/tty/serial/8250/8250.h +20 -0
@@ -123,6 +123,26 @@ static inline void serial_out(struct uart_8250_port *up, int offset, int value) up->port.serial_out (&up->port, offset, value); } +/** +* serial_lsr_in - Read LSR register and preserve flags across reads +* @up: uart 8250 port +* +* Read LSR register and handle saving non-preserved flags across reads. +* The flags that are not preserved across reads are stored into +* up->lsr_saved_flags. +* +* Returns LSR value or'ed with the preserved flags (if any). +*/ +static inline unsigned int serial_lsr_in (struct uart_8250_port *up) +{ +unsigned int lsr = up->lsr_saved_flags; + + lsr |=serial_in (up,UART_LSR ); + up->lsr_saved_flags = lsr &LSR_SAVE_FLAGS ; + +return lsr; +} +/* * For the 16C950 */
drivers/tty/serial/8250/8250_core.c +1 -2
@@ -276,8 +276,7 @@ static void serial8250_backup_timeout(struct timer_list *t)* the "Diva" UART used on the management processor on many HP * ia64 and parisc boxes. */ - lsr =serial_in (up,UART_LSR ); - up->lsr_saved_flags |= lsr &LSR_SAVE_FLAGS ; + lsr =serial_lsr_in (up);if ((iir &UART_IIR_NO_INT ) && (up->ier &UART_IER_THRI ) && (!uart_circ_empty (&up->port.state->xmit) || up->port.x_char) && (lsr &UART_LSR_THRE )) {
drivers/tty/serial/8250/8250_port.c +4 -11
@@ -1508,11 +1508,9 @@ static inline void __stop_tx(struct uart_8250_port *p)struct uart_8250_em485 *em485 = p->em485;if (em485) { -unsigned char lsr =serial_in (p,UART_LSR ); +unsigned char lsr =serial_lsr_in (p);u64 stop_delay =0 ; - p->lsr_saved_flags |= lsr &LSR_SAVE_FLAGS ; -if (!(lsr &UART_LSR_THRE ))return ;/*
@@ -1567,10 +1565,8 @@ static inline void __start_tx(struct uart_port *port)if (serial8250_set_THRI (up)) {if (up->bugs &UART_BUG_TXEN ) { -unsigned char lsr; +unsigned char lsr =serial_lsr_in (up); - lsr =serial_in (up,UART_LSR ); - up->lsr_saved_flags |= lsr &LSR_SAVE_FLAGS ;if (lsr &UART_LSR_THRE )serial8250_tx_chars (up); }
@@ -2001,8 +1997,7 @@ static unsigned int serial8250_tx_empty(struct uart_port *port)serial8250_rpm_get (up);spin_lock_irqsave (&port->lock, flags); - lsr =serial_port_in (port,UART_LSR ); - up->lsr_saved_flags |= lsr &LSR_SAVE_FLAGS ; + lsr =serial_lsr_in (up);spin_unlock_irqrestore (&port->lock, flags);serial8250_rpm_put (up);
@@ -2078,9 +2073,7 @@ static void wait_for_lsr(struct uart_8250_port *up, int bits)/* Wait up to 10ms for the character(s) to be sent. */ for (;;) { - status =serial_in (up,UART_LSR ); - - up->lsr_saved_flags |= status &LSR_SAVE_FLAGS ; + status =serial_lsr_in (up);if ((status & bits) == bits)break ;
Signature · 1 line
2.30.2
Ilpo Järvinen
maintainerPATCH v2 3/6 serial: 8250: Get preserved flags using serial_lsr_in()
In reply to Ilpo Järvinenserial8250_handle_irq() assumes it's the first to read LSR register. However, there are 8250 drivers which perform LSR read in their own irq handler prior to calling serial8250_handle_irq(). As not all flags are preserved across LSR reads, use serial_lsr_in() helper to get all the preserved flags.
This commit might fix other commits too besides the ones for DW UART mentioned below. It's just not clear to me which of the other devices clear some of the LSR flags on read. AFAIK, nobody has complained about this problem (either against DW or other devices) so it might not have that bad impact in the end.
--- drivers/tty/serial/8250/8250_port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/8250/8250_port.c +1 -1
@@ -1916,7 +1916,7 @@ int serial8250_handle_irq(struct uart_port *port, unsigned int iir)spin_lock_irqsave (&port->lock, flags); - status =serial_port_in (port,UART_LSR ); + status =serial_lsr_in (up);/* * If port is stopped and there are no error conditions in the
Signature · 1 line
2.30.2
Ilpo Järvinen
maintainerPATCH v2 4/6 serial: 8250: Adjust misleading LSR related comment
In reply to Ilpo Järvinenserial8250_rx_chars() has max_count based character limit. If it triggers, the function returns old LSR value (and it has never returned only flags which were not handled). Adjust the comment to match behavior and warn about which flags can be depended on.
While I'd have moved LSR read before LSR read and used serial_lsr_in() also here but I came across this old discussion about the topic:
https://www.spinics.net/lists/linux-serial/msg20555.html
...so I left it as it is (it works as long as the callers only use a subset of the LSR flags which holds true today).
--- drivers/tty/serial/8250/8250_port.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/tty/serial/8250/8250_port.c +6 -3
@@ -1782,9 +1782,12 @@ void serial8250_read_char(struct uart_8250_port *up, unsigned char lsr)EXPORT_SYMBOL_GPL (serial8250_read_char);/* -* serial8250_rx_chars: processes according to the passed in LSR -* value, and returns the remaining LSR bits not handled -* by this Rx routine. +* serial8250_rx_chars: Read characters. The first LSR value must be passed +* in. +* +* Returns LSR bits. The caller should rely only non-rx related LSR bits +* (such as THRE) because the LSR value might come from an already consumed +* character. */ unsigned char serial8250_rx_chars (struct uart_8250_port *up,unsigned char lsr) {
Signature · 1 line
2.30.2
Ilpo Järvinen
maintainerPATCH v2 5/6 serial: 8250_dw: Use serial_lsr_in() in dw8250_handle_irq()
In reply to Ilpo Järvinendw8250_handle_irq() reads LSR under a few conditions, convert both to use serial_lsr_in() in order to preserve LSR flags properly across reads.
--- drivers/tty/serial/8250/8250_dw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/serial/8250/8250_dw.c +2 -2
@@ -253,7 +253,7 @@ static int dw8250_handle_irq(struct uart_port *p)*/ if (!up->dma && rx_timeout) {spin_lock_irqsave (&p->lock, flags); - status = p->serial_in (p,UART_LSR ); + status =serial_lsr_in (up);if (!(status & (UART_LSR_DR |UART_LSR_BI ))) (void ) p->serial_in (p,UART_RX );
@@ -263,7 +263,7 @@ static int dw8250_handle_irq(struct uart_port *p)/* Manually stop the Rx DMA transfer when acting as flow controller */ if (quirks &DW_UART_QUIRK_IS_DMA_FC && up->dma && up->dma->rx_running && rx_timeout) { - status = p->serial_in (p,UART_LSR ); + status =serial_lsr_in (up);if (status & (UART_LSR_DR |UART_LSR_BI )) {dw8250_writel_ext (p,RZN1_UART_RDMACR ,0 );dw8250_writel_ext (p,DW_UART_DMASA ,1 );
Signature · 1 line
2.30.2
Ilpo Järvinen
maintainerPATCH v2 6/6 serial: 8250_dw: Store LSR into lsr_saved_flags in dw8250_tx_wait_empty()
In reply to Ilpo JärvinenMake sure LSR flags are preserved in dw8250_tx_wait_empty(). This function is called from a low-level out function and therefore cannot call serial_lsr_in() as it would lead to infinite recursion.
It is borderline if the flags need to be saved here at all since this code relates to writing LCR register which usually implies no important characters should be arriving.
--- drivers/tty/serial/8250/8250_dw.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/tty/serial/8250/8250_dw.c +3 -0
@@ -122,12 +122,15 @@ static void dw8250_check_lcr(struct uart_port *p, int value)/* Returns once the transmitter is empty or we run out of retries */ static void dw8250_tx_wait_empty (struct uart_port *p) { +struct uart_8250_port *up =up_to_u8250p (p);unsigned int tries =20000 ;unsigned int delay_threshold = tries -1000 ;unsigned int lsr;while (tries--) { lsr =readb (p->membase + (UART_LSR << p->regshift)); + up->lsr_saved_flags |= lsr &LSR_SAVE_FLAGS ; +if (lsr &UART_LSR_TEMT )break ;
Signature · 1 line
2.30.2