From 2a7982ee523a7a0ef2de34797e2e1df05c8de84b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 27 Apr 2020 18:05:44 +0200 Subject: [PATCH] configs/qemu_sh4{, eb}-r2d: remove kernel patch "restore the old sh-sci driver behaviour" This reverts commit f7a887c3682282a281206bca61724a750c326b3d and 23aee3eac497f15f901ddf99ab3aa81af747f7e5 since the kernel patch is not needed as soon as qemu >= 3.1.0 is used with a kernel >= 4.11-rc1. The qemu emulation of sh-sci driver was fixed by adding basic timeout handling for 9600 bps [1]. [1] https://git.qemu.org/?p=qemu.git;a=commit;h=71bb4ce1b5592cdc03abc48cdf4ecb15b2db81a0 Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- ...-sci-increase-RX-FIFO-trigger-defaul.patch | 61 ------------------- ...-sci-increase-RX-FIFO-trigger-defaul.patch | 61 ------------------- configs/qemu_sh4_r2d_defconfig | 1 - configs/qemu_sh4eb_r2d_defconfig | 1 - 4 files changed, 124 deletions(-) delete mode 100644 board/qemu/sh4-r2d/patches/linux/0001-Revert-serial-sh-sci-increase-RX-FIFO-trigger-defaul.patch delete mode 100644 board/qemu/sh4eb-r2d/patches/linux/0001-Revert-serial-sh-sci-increase-RX-FIFO-trigger-defaul.patch diff --git a/board/qemu/sh4-r2d/patches/linux/0001-Revert-serial-sh-sci-increase-RX-FIFO-trigger-defaul.patch b/board/qemu/sh4-r2d/patches/linux/0001-Revert-serial-sh-sci-increase-RX-FIFO-trigger-defaul.patch deleted file mode 100644 index 36c82d84ef..0000000000 --- a/board/qemu/sh4-r2d/patches/linux/0001-Revert-serial-sh-sci-increase-RX-FIFO-trigger-defaul.patch +++ /dev/null @@ -1,61 +0,0 @@ -From aaaced6d2d6f796ed77e4725ed7ccbedb189c180 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 15 Jun 2018 17:43:38 +0200 -Subject: [PATCH] Revert: serial: sh-sci: increase RX FIFO trigger defaults for - (H)SCIF -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reverts commit 18e8cf159177100e69d528293f8cf6875c0b1bca (kernel) - -The last Qemu kernel update [1] introduced a regresion in sh4 SCIF -serial device. Some keyboard presses are very slow to be taken into -account, perhaps not even taken into account at all. This would -explain why our test infrastructure doesn’t manage to login as root -[2][3][4]. - -git bisect reported a kernel patch from 4.11, increasing RX FIFO -trigger defaults value for sh-sci (H)SCIF. The kernel patch itself -looks good but the Qemu emulation is not ready to handle this new -setting. - -From Qemu (2.12.0): target/sh4/README.sh4 -"Configuration of the second serial port (SCIF) is supported. FIFO -handling infrastructure has been started but is not completed yet." - -In order to be able to test sh4 architecture with newer kernel, -revert to the old behaviour. - -[1] https://git.buildroot.net/buildroot/commit/?id=03fb00f2175cdb4565e26fcb9b3da1c1059de1bd -[2] https://gitlab.com/free-electrons/toolchains-builder/-/jobs/72006425 -[3] https://gitlab.com/free-electrons/toolchains-builder/-/jobs/72006427 -[4] https://gitlab.com/free-electrons/toolchains-builder/-/jobs/72006426 - -Signed-off-by: Romain Naour -Cc: Thomas Petazzoni ---- - drivers/tty/serial/sh-sci.c | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c -index ab757546c6db..138e4dec44fb 100644 ---- a/drivers/tty/serial/sh-sci.c -+++ b/drivers/tty/serial/sh-sci.c -@@ -2793,11 +2793,8 @@ static int sci_init_single(struct platform_device *dev, - sci_port->rx_trigger = 32; - break; - case PORT_SCIF: -- if (p->regtype == SCIx_SH7705_SCIF_REGTYPE) -- /* RX triggering not implemented for this IP */ -- sci_port->rx_trigger = 1; -- else -- sci_port->rx_trigger = 8; -+ /* RX triggering not implemented in Qemu emulation */ -+ sci_port->rx_trigger = 1; - break; - default: - sci_port->rx_trigger = 1; --- -2.14.4 - diff --git a/board/qemu/sh4eb-r2d/patches/linux/0001-Revert-serial-sh-sci-increase-RX-FIFO-trigger-defaul.patch b/board/qemu/sh4eb-r2d/patches/linux/0001-Revert-serial-sh-sci-increase-RX-FIFO-trigger-defaul.patch deleted file mode 100644 index 36c82d84ef..0000000000 --- a/board/qemu/sh4eb-r2d/patches/linux/0001-Revert-serial-sh-sci-increase-RX-FIFO-trigger-defaul.patch +++ /dev/null @@ -1,61 +0,0 @@ -From aaaced6d2d6f796ed77e4725ed7ccbedb189c180 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 15 Jun 2018 17:43:38 +0200 -Subject: [PATCH] Revert: serial: sh-sci: increase RX FIFO trigger defaults for - (H)SCIF -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reverts commit 18e8cf159177100e69d528293f8cf6875c0b1bca (kernel) - -The last Qemu kernel update [1] introduced a regresion in sh4 SCIF -serial device. Some keyboard presses are very slow to be taken into -account, perhaps not even taken into account at all. This would -explain why our test infrastructure doesn’t manage to login as root -[2][3][4]. - -git bisect reported a kernel patch from 4.11, increasing RX FIFO -trigger defaults value for sh-sci (H)SCIF. The kernel patch itself -looks good but the Qemu emulation is not ready to handle this new -setting. - -From Qemu (2.12.0): target/sh4/README.sh4 -"Configuration of the second serial port (SCIF) is supported. FIFO -handling infrastructure has been started but is not completed yet." - -In order to be able to test sh4 architecture with newer kernel, -revert to the old behaviour. - -[1] https://git.buildroot.net/buildroot/commit/?id=03fb00f2175cdb4565e26fcb9b3da1c1059de1bd -[2] https://gitlab.com/free-electrons/toolchains-builder/-/jobs/72006425 -[3] https://gitlab.com/free-electrons/toolchains-builder/-/jobs/72006427 -[4] https://gitlab.com/free-electrons/toolchains-builder/-/jobs/72006426 - -Signed-off-by: Romain Naour -Cc: Thomas Petazzoni ---- - drivers/tty/serial/sh-sci.c | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c -index ab757546c6db..138e4dec44fb 100644 ---- a/drivers/tty/serial/sh-sci.c -+++ b/drivers/tty/serial/sh-sci.c -@@ -2793,11 +2793,8 @@ static int sci_init_single(struct platform_device *dev, - sci_port->rx_trigger = 32; - break; - case PORT_SCIF: -- if (p->regtype == SCIx_SH7705_SCIF_REGTYPE) -- /* RX triggering not implemented for this IP */ -- sci_port->rx_trigger = 1; -- else -- sci_port->rx_trigger = 8; -+ /* RX triggering not implemented in Qemu emulation */ -+ sci_port->rx_trigger = 1; - break; - default: - sci_port->rx_trigger = 1; --- -2.14.4 - diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index e837a9572d..33044d22d1 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -3,7 +3,6 @@ BR2_sh=y BR2_sh4=y # System -BR2_GLOBAL_PATCH_DIR="board/qemu/sh4-r2d/patches" BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig index 18548d65f8..bd814bb901 100644 --- a/configs/qemu_sh4eb_r2d_defconfig +++ b/configs/qemu_sh4eb_r2d_defconfig @@ -3,7 +3,6 @@ BR2_sh=y BR2_sh4eb=y # System -BR2_GLOBAL_PATCH_DIR="board/qemu/sh4eb-r2d/patches" BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" # Filesystem -- 2.30.2