From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:45323 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754982AbbISE75 (ORCPT ); Sat, 19 Sep 2015 00:59:57 -0400 Subject: Patch "spi/spi-xilinx: Fix mixed poll/irq mode" has been added to the 4.1-stable tree To: ricardo.ribalda@gmail.com, broonie@kernel.org, ekigwana@scires.com, gregkh@linuxfoundation.org Cc: , From: Date: Fri, 18 Sep 2015 20:33:57 -0700 Message-ID: <144263363719478@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled spi/spi-xilinx: Fix mixed poll/irq mode to the 4.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: spi-spi-xilinx-fix-mixed-poll-irq-mode.patch and it can be found in the queue-4.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 16ea9b8ac45bf11d48af6013283e141e8ed86348 Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Wed, 12 Aug 2015 18:04:04 +0200 Subject: spi/spi-xilinx: Fix mixed poll/irq mode From: Ricardo Ribalda Delgado commit 16ea9b8ac45bf11d48af6013283e141e8ed86348 upstream. Once the module process a transfer in irq mode, the next poll transfer will not work because the transmitter is left in inhibited state. Fixes: 22417352f6b7f623 (Use polling mode on small transfers) Reported-by: Edward Kigwana Signed-off-by: Ricardo Ribalda Delgado Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/spi/spi-xilinx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/spi/spi-xilinx.c +++ b/drivers/spi/spi-xilinx.c @@ -306,8 +306,10 @@ static int xilinx_spi_txrx_bufs(struct s remaining_words -= n_words; } - if (use_irq) + if (use_irq) { xspi->write_fn(0, xspi->regs + XIPIF_V123B_DGIER_OFFSET); + xspi->write_fn(cr, xspi->regs + XSPI_CR_OFFSET); + } return t->len; } Patches currently in stable-queue which might be from ricardo.ribalda@gmail.com are queue-4.1/spi-spi-xilinx-fix-mixed-poll-irq-mode.patch queue-4.1/spi-spi-xilinx-fix-spurious-irq-ack-on-irq-mode.patch