Skip to contentSkip to conversation

Patch "ARM: dts: armada-xp-98dx3236: Switch to armada-38x-uart serial node" has been added to the 4.14-stable tree

DISCUSSION Joshua Scott 2 participants 4 messages Jul 8, 2019 – Jul 10, 2019 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Joshua Scott

author Tested-by Andrew Lunn Acked-by Gregory CLEMENT Applied
#1 lore raw

Hi,

I do not think this patch alone will work on 4.14.

An earlier pair of patches which implements the "marvell,armada-38x-uart" quirk is present on the other kernel versions, but I do see it as far back as 4.14.

The following two patches are the ones which add support for that compatible string:

b7639b0b15dd serial: 8250_dw: Limit dw8250_tx_wait_empty quirk to armada-38x devices 914eaf935ec7 serial: 8250_dw: Allow TX FIFO to drain before writing to UART_LCR

Cheers,
Joshua Scott
________________________________________
From: [email protected] <[email protected]>
Sent: Friday, 5 July 2019 8:59 p.m.
To: [email protected]; [email protected]; [email protected]; Joshua Scott
Cc: [email protected]
Subject: Patch "ARM: dts: armada-xp-98dx3236: Switch to armada-38x-uart serial node" has been added to the 4.14-stable tree

This is a note to let you know that I've just added the patch titled

ARM: dts: armada-xp-98dx3236: Switch to armada-38x-uart serial node

to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:

     arm-dts-armada-xp-98dx3236-switch-to-armada-38x-uart-serial-node.patch

and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From 80031361747aec92163464f2ee08870fec33bcb0 Mon Sep 17 00:00:00 2001
From: Joshua Scott <[email protected]>
Date: Wed, 26 Jun 2019 10:11:08 +1200
Subject: ARM: dts: armada-xp-98dx3236: Switch to armada-38x-uart serial node

From: Joshua Scott <[email protected]>

commit 80031361747aec92163464f2ee08870fec33bcb0 upstream.

Switch to the "marvell,armada-38x-uart" driver variant to empty the UART buffer before writing to the UART_LCR register.

Fixes 43e28ba87708 ("ARM: dts: Use armada-370-xp as a base for armada-xp-98dx3236")
---
 arch/arm/boot/dts/armada-xp-98dx3236.dtsi |    8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm/boot/dts/armada-xp-98dx3236.dtsi +8 -0
@@ -360,3 +360,11 @@
        status = "disabled";
 };
 
+&uart0 {
+       compatible = "marvell,armada-38x-uart";
+};
+
+&uart1 {
+       compatible = "marvell,armada-38x-uart";
+};
+

Patches currently in stable-queue which might be from [email protected] are

queue-4.14/arm-dts-armada-xp-98dx3236-switch-to-armada-38x-uart-serial-node.patch

#2 lore raw
Quoted 4 lines · Joshua Scott

Hi,

I do not think this patch alone will work on 4.14.

Quoted 8 lines

An earlier pair of patches which implements the "marvell,armada-38x-uart" quirk is present on the other kernel versions, but I do see it as far back as 4.14.

The following two patches are the ones which add support for that compatible string:

b7639b0b15dd serial: 8250_dw: Limit dw8250_tx_wait_empty quirk to armada-38x devices 914eaf935ec7 serial: 8250_dw: Allow TX FIFO to drain before writing to UART_LCR

But, this patch says:

	Fixes: 43e28ba87708 ("ARM: dts: Use armada-370-xp as a base for armada-xp-98dx3236")

and that commit showed up in 4.12.

If that is not the case, fine, I'll drop this, otherwise I just have to go off of what is given to me :)

thanks,

greg k-h

#3 lore raw

Hi Greg,

43e28ba87708 ("ARM: dts: Use armada-370-xp as a base for armada-xp-98dx3236") is the patch which introduces the armada-xp-98dx3236, and contains the device-tree entry for the driver that does not behave correctly with this SoC.

However, the driver quirk that implements the fix does not exist until the two patches I mentioned :
b7639b0b15dd serial: 8250_dw: Limit dw8250_tx_wait_empty quirk to armada-38x devices 914eaf935ec7 serial: 8250_dw: Allow TX FIFO to drain before writing to UART_LCR

Before then, there is no "marvell,armada-38x-uart".

The current patch being delivered only changes the .dts to make use of the quirk. This won't work if it's being delivered to a branch that does not have the above two patches. I had a look at linux-4.14.y on kernel.org, and did not see the two patches there.

Cheers,
Joshua
________________________________________
From: [email protected] <[email protected]>
Sent: Monday, 8 July 2019 6:23 p.m.
To: Joshua Scott
Cc: [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: Patch "ARM: dts: armada-xp-98dx3236: Switch to armada-38x-uart serial node" has been added to the 4.14-stable tree

Quoted 4 lines · Joshua Scott

Hi,

I do not think this patch alone will work on 4.14.

Quoted 8 lines

An earlier pair of patches which implements the "marvell,armada-38x-uart" quirk is present on the other kernel versions, but I do see it as far back as 4.14.

The following two patches are the ones which add support for that compatible string:

b7639b0b15dd serial: 8250_dw: Limit dw8250_tx_wait_empty quirk to armada-38x devices 914eaf935ec7 serial: 8250_dw: Allow TX FIFO to drain before writing to UART_LCR

But, this patch says:

        Fixes: 43e28ba87708 ("ARM: dts: Use armada-370-xp as a base for armada-xp-98dx3236")

and that commit showed up in 4.12.

If that is not the case, fine, I'll drop this, otherwise I just have to go off of what is given to me :)

thanks,

greg k-h

#4 lore raw
Quoted 10 lines · Joshua Scott

Hi Greg,

43e28ba87708 ("ARM: dts: Use armada-370-xp as a base for armada-xp-98dx3236") is the patch which introduces the armada-xp-98dx3236, and contains the device-tree entry for the driver that does not behave correctly with this SoC.

However, the driver quirk that implements the fix does not exist until the two patches I mentioned :
b7639b0b15dd serial: 8250_dw: Limit dw8250_tx_wait_empty quirk to armada-38x devices 914eaf935ec7 serial: 8250_dw: Allow TX FIFO to drain before writing to UART_LCR

Quoted 5 lines

Before then, there is no "marvell,armada-38x-uart".

The current patch being delivered only changes the .dts to make use of the quirk. This won't work if it's being delivered to a branch that does not have the above two patches. I had a look at linux-4.14.y on kernel.org, and did not see the two patches there.

Ok, thanks, I've deleted it from the queueu now.

greg k-h