From patchwork Sat Jun 16 11:25:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 930361 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="F3UNfnFh"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 417FR11QXzz9s47 for ; Sat, 16 Jun 2018 21:25:48 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id AB9B78805A; Sat, 16 Jun 2018 11:25:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0yW9SYmqZoBp; Sat, 16 Jun 2018 11:25:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id CB293883AF; Sat, 16 Jun 2018 11:25:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 519C81C2827 for ; Sat, 16 Jun 2018 11:25:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4CC12227F1 for ; Sat, 16 Jun 2018 11:25:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id R7gbH4dPoamP for ; Sat, 16 Jun 2018 11:25:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by silver.osuosl.org (Postfix) with ESMTPS id 38D1422064 for ; Sat, 16 Jun 2018 11:25:41 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id w10-v6so12247870wrk.9 for ; Sat, 16 Jun 2018 04:25:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PxUXV0LizqVX4FQBhWytspKsirsWOT5BqnEUR7b+GI4=; b=F3UNfnFhEUupvQ2L19zmBZYPdNI5RY4MFoJxB8Y3TQxdh0FOtpaPP5rygI54beoLpK 3Rkqtb6j/8E+JxEx+iv6NyRYoTqt0fORTOd7Q+NnBjFxDDYAYflvN1MGykEwgyPpvarz gRY4V93gP5BDiLu/Zzgm8/FOfEyIf3mAhO6HGC8VnND4puP7Mg+tPdG6Dl63U5YGBIS5 WQ5tN7TeLdF/lczfVZHGIitRWsa0dLDSAzRGSW8w9/9avPF3uZQXKEPeo78LlkC/XFod gkPjgYjDDblq6OC9AybAoeVdgqAKMbHJH7BJUU0R3ynDJ9W0CcVupL9Nsy0jfeE+Mv7j u3Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PxUXV0LizqVX4FQBhWytspKsirsWOT5BqnEUR7b+GI4=; b=WLy1F03I7vBnx7H70LAAgQ7J04Y1eQjPgveb3VScz9q7ta0dyXOti+g9TfUXn4oYtm ZEZupCmXR3OiaBLC7q1E59ztKMEWQ8dUTSs5eBY5Z6DGL1oi7ydaubqFvZs0I49K434w DJ/esVwXtJGpFQkhem7J3VwvyKus/GjrDw2u46U7cQINRgfW4adYNpzwTf3kdQ1idxui NnVWi40zIxzsc0VtUephUNTj3+mzfFFPz24zS4D9M2Ma/1ulJ7KAKS8jOxNWZJrYjckZ WMpXu+R9Lh3i1scjvj6xy6/4UTa+YCzdshZl6Z9SAG4BKOM0rj7wuzgf30o67HPNyEd2 hBRw== X-Gm-Message-State: APt69E2cDBWFwZLqh4OaiGXDOdemzdb0SUZMUZL4yTB27kiQYkgcwhQ8 I6rqwKO7Kb61Iufqvqthqfral4/1 X-Google-Smtp-Source: ADUXVKJ3PPAr9Ee5Rrd5z3MHBOzqFARPCaV+L32KHh58dNUJ2yOR0UoGi9seHrbMDGixi3RY/fOl0A== X-Received: by 2002:adf:f7cf:: with SMTP id a15-v6mr4541529wrq.108.1529148339224; Sat, 16 Jun 2018 04:25:39 -0700 (PDT) Received: from adeos.home (2a01cb00054978001a46adb371a118d7.ipv6.abo.wanadoo.fr. [2a01:cb00:549:7800:1a46:adb3:71a1:18d7]) by smtp.gmail.com with ESMTPSA id n18-v6sm11700467wrj.58.2018.06.16.04.25.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 16 Jun 2018 04:25:37 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sat, 16 Jun 2018 13:25:32 +0200 Message-Id: <20180616112532.26275-2-romain.naour@gmail.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180616112532.26275-1-romain.naour@gmail.com> References: <20180616112532.26275-1-romain.naour@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] qemu/sh4eb-r2d: restore the old sh-sci driver behaviour X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" As for sh4-r2d (little-endian) restore the old sh-sci driver behaviour for sh4eb-r2d. Tested with qemu_sh4eb_r2d_defconfig. Signed-off-by: Romain Naour Cc: Thomas Petazzoni --- ...al-sh-sci-increase-RX-FIFO-trigger-defaul.patch | 61 ++++++++++++++++++++++ configs/qemu_sh4eb_r2d_defconfig | 1 + 2 files changed, 62 insertions(+) create mode 100644 board/qemu/sh4eb-r2d/patches/linux/0001-Revert-serial-sh-sci-increase-RX-FIFO-trigger-defaul.patch 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 new file mode 100644 index 0000000000..36c82d84ef --- /dev/null +++ b/board/qemu/sh4eb-r2d/patches/linux/0001-Revert-serial-sh-sci-increase-RX-FIFO-trigger-defaul.patch @@ -0,0 +1,61 @@ +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_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig index 79e8c38e8a..e7dbd46a2b 100644 --- a/configs/qemu_sh4eb_r2d_defconfig +++ b/configs/qemu_sh4eb_r2d_defconfig @@ -3,6 +3,7 @@ BR2_sh=y BR2_sh4eb=y # System +BR2_GLOBAL_PATCH_DIR="board/qemu/sh4eb-r2d/patches" BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" # Filesystem