From patchwork Mon Apr 23 18:05:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 903132 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="n6mKk171"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sirena.org.uk header.i=@sirena.org.uk header.b="KvnE5za7"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40VDw350wvz9rxs for ; Tue, 24 Apr 2018 04:08:03 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Date:Message-Id: In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: References:List-Owner; bh=w+SEG7rvqD0NC7Xc6CXzFXo+cDujWn2cEqudv4VayNs=; b=n6m Kk171FA11PHxKaJS5/Dq6hsPOOWbvGzUX4HuW+uIOS4uOCKwQ4hXIcEzaaqqBxkG46JdwoYgPWF+b SZZRV21vt0GyZJ0uov2QEpUbhEI9EOkwohzmXW/iBk0CQYC2BXFTUq+t74m/99nmBCM7A+EWSyi79 L1/dRd7usarodO8saVrdaQPK0vPhj4h2JZr6AU+sVHwFk9XT7EN5lENISnKfMWcES9PBd5nQgZZEU yOBbvBmcAIwfD2YrKpVFlcNnmEz29XgVg9G1O64U7qK1/A+hcYi/CZPamQOsljBdinMh1MyH6uXuS fU+6kSI7c7IvxjDbYSHgOtG3cCRg6+Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fAfsY-0003Z7-JE; Mon, 23 Apr 2018 18:07:54 +0000 Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fAfqc-0002Xi-CX for linux-mtd@lists.infradead.org; Mon, 23 Apr 2018 18:05:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=zHD7jINwLJb1aV2SI294SkccQ+iSN7Ox431eyLCQgZQ=; b=KvnE5za7PoWg oYZ5fStgM67HNUwWlEgaMYeLARbCDc+0PEgwHBYJ7AHewhly6++50aNPN5erKojPkhgnIkifAz8Vq cAqymTO/krgjZeWELf5im6WZwcdaZqAQdTM4ILiuKvJjM9A/ot9zeo1q+1uXa6gL1YaBy+amyUUvM FPZ/0=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1fAfqB-00065S-T6; Mon, 23 Apr 2018 18:05:27 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1fAfqB-0004Jh-F7; Mon, 23 Apr 2018 19:05:27 +0100 From: Mark Brown To: Boris Brezillon Subject: Applied "spi: Add an helper to flush the message queue" to the spi tree In-Reply-To: <20180422183522.11118-3-boris.brezillon@bootlin.com> Message-Id: Date: Mon, 23 Apr 2018 19:05:27 +0100 X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180423_110554_596508_A8796C9A X-CRM114-Status: GOOD ( 18.27 ) X-Spam-Score: 0.2 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yogesh Gaur , Vignesh R , Kamal Dasu , Richard Weinberger , Miquel Raynal , linux-spi@vger.kernel.org, Peter Pan , Marek Vasut , Frieder Schrempf , Mark Brown , linux-mtd@lists.infradead.org, Cyrille Pitchen , =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Maxime Chevallier , Brian Norris , David Woodhouse MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The patch spi: Add an helper to flush the message queue has been applied to the spi tree at https://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 988f259b46646934003ff8ae4966f7233691d1ad Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Sun, 22 Apr 2018 20:35:15 +0200 Subject: [PATCH] spi: Add an helper to flush the message queue This is needed by the spi-mem logic to force all messages that have been queued before a memory operation to be sent before we start the memory operation. We do that in order to guarantee that spi-mem operations do not preempt regular SPI transfers. Signed-off-by: Boris Brezillon Signed-off-by: Mark Brown --- drivers/spi/internals.h | 2 ++ drivers/spi/spi.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/drivers/spi/internals.h b/drivers/spi/internals.h index dbe56c77b464..4a28a8395552 100644 --- a/drivers/spi/internals.h +++ b/drivers/spi/internals.h @@ -17,6 +17,8 @@ #include #include +void spi_flush_queue(struct spi_controller *ctrl); + #ifdef CONFIG_HAS_DMA int spi_map_buf(struct spi_controller *ctlr, struct device *dev, struct sg_table *sgt, void *buf, size_t len, diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 86b778d8563e..3f4666365678 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1522,6 +1522,22 @@ static int spi_controller_initialize_queue(struct spi_controller *ctlr) return ret; } +/** + * spi_flush_queue - Send all pending messages in the queue from the callers' + * context + * @ctlr: controller to process queue for + * + * This should be used when one wants to ensure all pending messages have been + * sent before doing something. Is used by the spi-mem code to make sure SPI + * memory operations do not preempt regular SPI transfers that have been queued + * before the spi-mem operation. + */ +void spi_flush_queue(struct spi_controller *ctlr) +{ + if (ctlr->transfer == spi_queued_transfer) + __spi_pump_messages(ctlr, false); +} + /*-------------------------------------------------------------------------*/ #if defined(CONFIG_OF)