From patchwork Tue Jan 5 19:15:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 7958601 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 69A74BEEE5 for ; Tue, 5 Jan 2016 19:15:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7F8A42021B for ; Tue, 5 Jan 2016 19:15:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8A76D201E4 for ; Tue, 5 Jan 2016 19:15:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751706AbcAETPe (ORCPT ); Tue, 5 Jan 2016 14:15:34 -0500 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:37201 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751819AbcAETPc (ORCPT ); Tue, 5 Jan 2016 14:15:32 -0500 Received: from cpc11-sgyl31-2-0-cust672.sgyl.cable.virginm.net ([94.175.94.161] helo=debutante) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1aGX4q-0002HE-Lb; Tue, 05 Jan 2016 19:15:29 +0000 Received: from broonie by debutante with local (Exim 4.86) (envelope-from ) id 1aGX4n-0005eg-SS; Tue, 05 Jan 2016 19:15:25 +0000 From: Mark Brown To: Martin Sperl , Mark Brown Cc: linux-spi@vger.kernel.org In-Reply-To: <1450698772-2379-9-git-send-email-kernel@martin.sperl.org> Message-Id: Date: Tue, 05 Jan 2016 19:15:25 +0000 X-SA-Exim-Connect-IP: 94.175.94.161 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Subject: Applied "spi: loopback-test: added support for HW-loopback mode" to the spi tree X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The patch spi: loopback-test: added support for HW-loopback mode has been applied to the spi tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From b0632bfe5ec416a30d2e72bb1cc5dde5c6864e41 Mon Sep 17 00:00:00 2001 From: Martin Sperl Date: Tue, 22 Dec 2015 18:03:28 +0000 Subject: [PATCH] spi: loopback-test: added support for HW-loopback mode If the module parameter "loopback" for testing RX to match TX is not set and the spi_master supports SPI_LOOP then SPI_LOOP as well as RX-data testing will get enabled. When the "loopback" module parameter is set then the SPI_LOOP support in spi_master will not get enabled, which means that MOSI needs to get connected to MISO by some other means (possibly via a simple jumper connection or a SN74AHCT125 connecting MOSI/MISO) Suggested-by: Geert Uytterhoeven Signed-off-by: Martin Sperl Signed-off-by: Mark Brown --- drivers/spi/spi-loopback-test.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-loopback-test.c b/drivers/spi/spi-loopback-test.c index 7f79a77c4b68..a194d4bab7fa 100644 --- a/drivers/spi/spi-loopback-test.c +++ b/drivers/spi/spi-loopback-test.c @@ -282,8 +282,34 @@ static struct spi_test spi_tests[] = { static int spi_loopback_test_probe(struct spi_device *spi) { int ret; + char *msg; - dev_info(&spi->dev, "Executing spi-loopback-tests\n"); + /* + * Enable HW-loopback automatically if the master supports it + * and we have the have_rx_buf unset (set means that we have + * got an external loopback enabled, so no need to use SPI_LOOP) + */ + if (!check_rx_buf && (spi->master->mode_bits & SPI_LOOP)) { + spi->mode |= SPI_LOOP; + ret = spi_setup(spi); + if (ret) { + dev_err(&spi->dev, + "spi_setup failed to enable loopback: %i\n", + ret); + return ret; + } + + /* force checking rx_buf for valid (loopback) data */ + check_rx_buf = 1; + + msg = "with SPI_LOOP support"; + } else { + msg = (check_rx_buf) ? + "with external loopback" : + "without any loopback - rx_buf content is not checked"; + } + + dev_info(&spi->dev, "Executing spi-loopback-tests %s\n", msg); ret = spi_test_run_tests(spi, spi_tests);