From: Jan Kiszka <[email protected]> Patch is pending for upstream and stable trees.
Signed-off-by: Jan Kiszka <[email protected]> --- ...snps-dwmac-mdio-MDIOs-are-automatically-r.patch | 6 ++-- ...dwmac-sun8i-Handle-integrated-external-MD.patch | 6 ++-- ...-net-stmmac-sun8i-Restore-the-compatibles.patch | 6 ++-- ...-arm-dts-sunxi-h3-h5-Restore-EMAC-changes.patch | 6 ++-- ...xi-h3-h5-represent-the-mdio-switch-used-b.patch | 6 ++-- ...ARM-dts-sunxi-Restore-EMAC-changes-boards.patch | 6 ++-- ...M-dts-orange-pi-zero-Adjust-wifi-settings.patch | 6 ++-- ...u-uart-Fix-reporting-of-effective-CSIZE-t.patch | 38 ++++++++++++++++++++++ recipes-kernel/linux/linux-jailhouse.bb | 1 + 9 files changed, 60 insertions(+), 21 deletions(-) create mode 100644 recipes-kernel/linux/files/0008-serial-mvebu-uart-Fix-reporting-of-effective-CSIZE-t.patch diff --git a/recipes-kernel/linux/files/0001-net-stmmac-snps-dwmac-mdio-MDIOs-are-automatically-r.patch b/recipes-kernel/linux/files/0001-net-stmmac-snps-dwmac-mdio-MDIOs-are-automatically-r.patch index bd8289c..dbb7f2e 100644 --- a/recipes-kernel/linux/files/0001-net-stmmac-snps-dwmac-mdio-MDIOs-are-automatically-r.patch +++ b/recipes-kernel/linux/files/0001-net-stmmac-snps-dwmac-mdio-MDIOs-are-automatically-r.patch @@ -1,7 +1,7 @@ -From 0c51e7930914d0ff36a9424217203c43bffbea31 Mon Sep 17 00:00:00 2001 +From 87665212bc776247084792254316036a2b408fc0 Mon Sep 17 00:00:00 2001 From: Corentin Labbe <[email protected]> Date: Tue, 24 Oct 2017 19:57:12 +0200 -Subject: [PATCH 1/7] net: stmmac: snps, dwmac-mdio MDIOs are automatically +Subject: [PATCH 1/8] net: stmmac: snps, dwmac-mdio MDIOs are automatically registered stmmac bindings docs said that its mdio node must have @@ -34,5 +34,5 @@ index 195eb7e71473..05f122b8424a 100644 }; -- -2.13.7 +2.16.4 diff --git a/recipes-kernel/linux/files/0002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch b/recipes-kernel/linux/files/0002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch index cca54bf..5c29680 100644 --- a/recipes-kernel/linux/files/0002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch +++ b/recipes-kernel/linux/files/0002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch @@ -1,7 +1,7 @@ -From 85c5661ac18e7d60cdf28490c8a97ebbf2534abd Mon Sep 17 00:00:00 2001 +From 21eaebce670e1cf8552336982446efdf64083487 Mon Sep 17 00:00:00 2001 From: Corentin Labbe <[email protected]> Date: Tue, 24 Oct 2017 19:57:13 +0200 -Subject: [PATCH 2/7] net: stmmac: dwmac-sun8i: Handle integrated/external +Subject: [PATCH 2/8] net: stmmac: dwmac-sun8i: Handle integrated/external MDIOs The Allwinner H3 SoC have two distinct MDIO bus, only one could be @@ -510,5 +510,5 @@ index 39c2122a4f26..b3eb344bb158 100644 static const struct of_device_id sun8i_dwmac_match[] = { -- -2.13.7 +2.16.4 diff --git a/recipes-kernel/linux/files/0003-net-stmmac-sun8i-Restore-the-compatibles.patch b/recipes-kernel/linux/files/0003-net-stmmac-sun8i-Restore-the-compatibles.patch index 460625d..1d1e286 100644 --- a/recipes-kernel/linux/files/0003-net-stmmac-sun8i-Restore-the-compatibles.patch +++ b/recipes-kernel/linux/files/0003-net-stmmac-sun8i-Restore-the-compatibles.patch @@ -1,7 +1,7 @@ -From 41f6f89e0d8efb5e213418b24d43ba680535753d Mon Sep 17 00:00:00 2001 +From 4a85e5a4ab7fa9f226029a4cbd69b9b23996678a Mon Sep 17 00:00:00 2001 From: Corentin Labbe <[email protected]> Date: Tue, 24 Oct 2017 19:57:14 +0200 -Subject: [PATCH 3/7] net: stmmac: sun8i: Restore the compatibles +Subject: [PATCH 3/8] net: stmmac: sun8i: Restore the compatibles The original dwmac-sun8i DT bindings have some issue on how to handle integrated PHY and was reverted in last RC of 4.13. @@ -36,5 +36,5 @@ index b3eb344bb158..e5ff734d4f9b 100644 }; MODULE_DEVICE_TABLE(of, sun8i_dwmac_match); -- -2.13.7 +2.16.4 diff --git a/recipes-kernel/linux/files/0004-arm-dts-sunxi-h3-h5-Restore-EMAC-changes.patch b/recipes-kernel/linux/files/0004-arm-dts-sunxi-h3-h5-Restore-EMAC-changes.patch index 8a8bcc6..34ebd72 100644 --- a/recipes-kernel/linux/files/0004-arm-dts-sunxi-h3-h5-Restore-EMAC-changes.patch +++ b/recipes-kernel/linux/files/0004-arm-dts-sunxi-h3-h5-Restore-EMAC-changes.patch @@ -1,7 +1,7 @@ -From 32c2b21a8e1e0558d748e81f4e8c710923fd2ca1 Mon Sep 17 00:00:00 2001 +From ee238cd8fa7078f28debe7685d652186f1443db5 Mon Sep 17 00:00:00 2001 From: Corentin Labbe <[email protected]> Date: Tue, 31 Oct 2017 09:19:10 +0100 -Subject: [PATCH 4/7] arm: dts: sunxi: h3/h5: Restore EMAC changes +Subject: [PATCH 4/8] arm: dts: sunxi: h3/h5: Restore EMAC changes The original dwmac-sun8i DT bindings have some issue on how to handle integrated PHY and was reverted in last RC of 4.13. @@ -55,5 +55,5 @@ index 11240a8313c2..d38282b9e5d4 100644 compatible = "allwinner,sun8i-h3-spi"; reg = <0x01c68000 0x1000>; -- -2.13.7 +2.16.4 diff --git a/recipes-kernel/linux/files/0005-ARM-dts-sunxi-h3-h5-represent-the-mdio-switch-used-b.patch b/recipes-kernel/linux/files/0005-ARM-dts-sunxi-h3-h5-represent-the-mdio-switch-used-b.patch index ae31177..b1db3b2 100644 --- a/recipes-kernel/linux/files/0005-ARM-dts-sunxi-h3-h5-represent-the-mdio-switch-used-b.patch +++ b/recipes-kernel/linux/files/0005-ARM-dts-sunxi-h3-h5-represent-the-mdio-switch-used-b.patch @@ -1,7 +1,7 @@ -From 374e3208fa9e93f9ebbe9166771e527fa73024bf Mon Sep 17 00:00:00 2001 +From dd220bf142f8cbd31e1589044efa66488cd9c255 Mon Sep 17 00:00:00 2001 From: Corentin Labbe <[email protected]> Date: Tue, 31 Oct 2017 09:19:11 +0100 -Subject: [PATCH 5/7] ARM: dts: sunxi: h3/h5: represent the mdio switch used by +Subject: [PATCH 5/8] ARM: dts: sunxi: h3/h5: represent the mdio switch used by sun8i-h3-emac Since dwmac-sun8i could use either an integrated PHY or an external PHY @@ -60,5 +60,5 @@ index d38282b9e5d4..2721b39c1875 100644 }; }; -- -2.13.7 +2.16.4 diff --git a/recipes-kernel/linux/files/0006-ARM-dts-sunxi-Restore-EMAC-changes-boards.patch b/recipes-kernel/linux/files/0006-ARM-dts-sunxi-Restore-EMAC-changes-boards.patch index 8cc5cec..33be158 100644 --- a/recipes-kernel/linux/files/0006-ARM-dts-sunxi-Restore-EMAC-changes-boards.patch +++ b/recipes-kernel/linux/files/0006-ARM-dts-sunxi-Restore-EMAC-changes-boards.patch @@ -1,7 +1,7 @@ -From 1bbab9600f94cacc5b09f96592fa3d51b5e737a5 Mon Sep 17 00:00:00 2001 +From 8675216640b2d5edb9ecb92a20dafcd2e0d89273 Mon Sep 17 00:00:00 2001 From: Corentin Labbe <[email protected]> Date: Tue, 31 Oct 2017 09:19:12 +0100 -Subject: [PATCH 6/7] ARM: dts: sunxi: Restore EMAC changes (boards) +Subject: [PATCH 6/8] ARM: dts: sunxi: Restore EMAC changes (boards) The original dwmac-sun8i DT bindings have some issue on how to handle integrated PHY and was reverted in last RC of 4.13. @@ -311,5 +311,5 @@ index 97920b12a944..6dbf7b2e0c13 100644 + }; +}; -- -2.13.7 +2.16.4 diff --git a/recipes-kernel/linux/files/0007-ARM-dts-orange-pi-zero-Adjust-wifi-settings.patch b/recipes-kernel/linux/files/0007-ARM-dts-orange-pi-zero-Adjust-wifi-settings.patch index 6d95bd5..e3a9ce7 100644 --- a/recipes-kernel/linux/files/0007-ARM-dts-orange-pi-zero-Adjust-wifi-settings.patch +++ b/recipes-kernel/linux/files/0007-ARM-dts-orange-pi-zero-Adjust-wifi-settings.patch @@ -1,7 +1,7 @@ -From 1b42b51b35c7d0b160351d561bf57c9e014ff9f4 Mon Sep 17 00:00:00 2001 +From ea1d3f3a5274de5d97a22f8620e46a36ae33faea Mon Sep 17 00:00:00 2001 From: Jan Kiszka <[email protected]> Date: Sun, 17 Jun 2018 08:18:41 +0200 -Subject: [PATCH 7/7] ARM: dts: orange-pi-zero: Adjust wifi settings +Subject: [PATCH 7/8] ARM: dts: orange-pi-zero: Adjust wifi settings This imports the dts changes of https://github.com/fifteenhex/xradio to enable the wifi module. @@ -91,5 +91,5 @@ index 6713d0f2b3f4..ad0829e8f716 100644 bias-pull-up; }; -- -2.13.7 +2.16.4 diff --git a/recipes-kernel/linux/files/0008-serial-mvebu-uart-Fix-reporting-of-effective-CSIZE-t.patch b/recipes-kernel/linux/files/0008-serial-mvebu-uart-Fix-reporting-of-effective-CSIZE-t.patch new file mode 100644 index 0000000..c191aed --- /dev/null +++ b/recipes-kernel/linux/files/0008-serial-mvebu-uart-Fix-reporting-of-effective-CSIZE-t.patch @@ -0,0 +1,38 @@ +From 6de7404090b401a6345975c9ef7c01425daeab05 Mon Sep 17 00:00:00 2001 +From: Jan Kiszka <[email protected]> +Date: Sun, 26 Aug 2018 20:52:30 +0200 +Subject: [PATCH 8/8] serial: mvebu-uart: Fix reporting of effective CSIZE to + userspace + +Apparently, this driver (or the hardware) does not support character +length settings. It's apparently running in 8-bit mode, but it makes +userspace believe it's in 5-bit mode. That makes tcsetattr with CS8 +incorrectly fail, breaking e.g. getty from busybox, thus the login shell +on ttyMVx. + +Fix by hard-wiring CS8 into c_cflag. + +Signed-off-by: Jan Kiszka <[email protected]> +--- + drivers/tty/serial/mvebu-uart.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/tty/serial/mvebu-uart.c b/drivers/tty/serial/mvebu-uart.c +index 45b57c294d13..401c983ec5f3 100644 +--- a/drivers/tty/serial/mvebu-uart.c ++++ b/drivers/tty/serial/mvebu-uart.c +@@ -327,8 +327,10 @@ static void mvebu_uart_set_termios(struct uart_port *port, + if ((termios->c_cflag & CREAD) == 0) + port->ignore_status_mask |= STAT_RX_RDY | STAT_BRK_ERR; + +- if (old) ++ if (old) { + tty_termios_copy_hw(termios, old); ++ termios->c_cflag |= CS8; ++ } + + baud = uart_get_baud_rate(port, termios, old, 0, 460800); + uart_update_timeout(port, termios->c_cflag, baud); +-- +2.16.4 + diff --git a/recipes-kernel/linux/linux-jailhouse.bb b/recipes-kernel/linux/linux-jailhouse.bb index 5836cfb..58e46ba 100644 --- a/recipes-kernel/linux/linux-jailhouse.bb +++ b/recipes-kernel/linux/linux-jailhouse.bb @@ -29,6 +29,7 @@ SRC_URI += " \ file://0005-ARM-dts-sunxi-h3-h5-represent-the-mdio-switch-used-b.patch \ file://0006-ARM-dts-sunxi-Restore-EMAC-changes-boards.patch \ file://0007-ARM-dts-orange-pi-zero-Adjust-wifi-settings.patch \ + file://0008-serial-mvebu-uart-Fix-reporting-of-effective-CSIZE-t.patch \ file://${KERNEL_DEFCONFIG}" SRC_URI[sha256sum] = "27dbdeee1e6f2f4aea6bcfc6d552f371c6ccc2e63e12d692516d05e3daa9cf1f" SRCREV = "fb67a109309134bee65d97e29076128d603227b3" -- 2.16.4 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
