From patchwork Mon Sep 10 03:50:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pi-Hsun Shih X-Patchwork-Id: 10593547 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E0102920 for ; Mon, 10 Sep 2018 03:51:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D014528E16 for ; Mon, 10 Sep 2018 03:51:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C452528FF4; Mon, 10 Sep 2018 03:51:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6ED6028E16 for ; Mon, 10 Sep 2018 03:51:23 +0000 (UTC) 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=3qVvPAJLdtAF0xUY/SkPxNhTnT5VOkNENkvUFbgcEiU=; b=Pb6pB9/y7nRfIq 0zFkwsJATegYXJLGdIfhKFM1x8ovgSzYFqz9o8YzgTJM3VMiHiHrpopPwqz2O/+hmF1qtoDqJUObQ +MkNqhyGMMXUvK8VVgatdKmz98/TnjYNPDAp/LjGF2H7McmS0593BVo57Dlmcl5OiRn4y9hOpCWd/ dEHMshuuxfAtCk2hRRVaiRpnxEb8q0JaiT/GtrrjUuZ4k3jCBOH9VwD8u9TrOrQc0g/MpQrZ5jF3P mO4wXv0P26DHsKuEIgwgICQzT+FfiTzFMbgiktU32C9pilE/tPPVCZTPjChGNRnRk00M8Oz5s4q0Z Ohk8H7uK89wOVDYyDglw==; 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 1fzDEH-0003GE-JU; Mon, 10 Sep 2018 03:51:13 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fzDED-0003EF-PK for linux-arm-kernel@lists.infradead.org; Mon, 10 Sep 2018 03:51:11 +0000 Received: by mail-pf1-x441.google.com with SMTP id s13-v6so9744724pfi.7 for ; Sun, 09 Sep 2018 20:50:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=us8MiVjBc7nOe5bP1RkQsxOcd9Kj8H95GNP9AKTxXuE=; b=gu8ULdScBWzQ+33TdqIUskkT6Ei3wa7797zGA7ghlECWWwE0xO025JfJ6NrHi0YoxA GT1whHbfXUepjglrosZKskrYGF/SAZ2KWsvJDnneGbuD+A8JZof3UiyT8e+Z0ybankGN niXs3PFgC/mI6FCP8q4vGOT0IVaAwPBz8cE3s= 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:mime-version :content-transfer-encoding; bh=us8MiVjBc7nOe5bP1RkQsxOcd9Kj8H95GNP9AKTxXuE=; b=OUVU8Nq/dueyvzOEPZlO4m53u6JKqYMp578XVLZVvAydJ5sBk3eiOONZ3VoPv5eVkv 128CXlvC5G98h0H+Ag5oH4C9BeKqdFSdiOKpHpWTeMvB+hvQW3V57KFYlQ1Kw4KzLm8q BqIV+GS/+v+volgoGz3jDq1hIhVfCtI2D5Tna0umpiuszuhOsBT0FXHugp4eU7X80qjd hsaf5fen8QqefTi73k3XQiXcq9zf2Jn1333fyJeKGYfBkHpc8vwB//z6xDDAdgIIboXG +VE8zBMEz7G+0bcmC8PBOn3ddJj6QjqJjyQEl3RzWOzATPQIM6nFnSfzAv7VCw21muy4 uKlg== X-Gm-Message-State: APzg51AKBJElG9rywMVjs+JBg9F9Em67lszTYgmf8JISiRWZPxTXrM8/ QwbH9VSL0b4SbWs7sNhg10AV5w== X-Google-Smtp-Source: ANB0VdZYH2HCpMpsncDH19htrQ6JYFP83yTWSGWVyATe0IDhrHVsghoZbqelgUOTKA9CsxlSbF2KrQ== X-Received: by 2002:a62:9e08:: with SMTP id s8-v6mr21507109pfd.23.1536551457000; Sun, 09 Sep 2018 20:50:57 -0700 (PDT) Received: from pihsun-z840.tpe.corp.google.com ([2401:fa00:1:10:7889:7a43:f899:134c]) by smtp.googlemail.com with ESMTPSA id u83-v6sm43209515pfj.37.2018.09.09.20.50.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Sep 2018 20:50:56 -0700 (PDT) From: Peter Shih To: Subject: [PATCH] spi: mediatek: Don't modify spi_transfer when transfer. Date: Mon, 10 Sep 2018 11:50:47 +0800 Message-Id: <20180910035047.98496-1-pihsun@chromium.org> X-Mailer: git-send-email 2.19.0.rc2.392.g5ba43deb5a-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180909_205109_845492_0638804C X-CRM114-Status: GOOD ( 14.74 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, Mark Brown , linux-mediatek@lists.infradead.org, pihsun@chromium.org, Matthias Brugger , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Mediatek SPI driver modifies some fields (tx_buf, rx_buf, len, tx_dma, rx_dma) of the spi_transfer* passed in when doing transfer_one and in interrupt handler. This is somewhat unexpected, and there are some caller (e.g. Cr50 spi driver) that reuse the spi_transfer for multiple messages. Add a field to record how many bytes have been transferred, and calculate the right len / buffer based on it instead. BUG=b:113973051 TEST=None Signed-off-by: Pi-Hsun Shih Change-Id: I23e218cd964f16c0b2b26127d4a5ca6529867673 --- drivers/spi/spi-mt65xx.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c index 86bf45667a040..3dc31627c6558 100644 --- a/drivers/spi/spi-mt65xx.c +++ b/drivers/spi/spi-mt65xx.c @@ -98,6 +98,7 @@ struct mtk_spi { struct clk *parent_clk, *sel_clk, *spi_clk; struct spi_transfer *cur_transfer; u32 xfer_len; + u32 num_xfered; struct scatterlist *tx_sgl, *rx_sgl; u32 tx_sgl_len, rx_sgl_len; const struct mtk_spi_compatible *dev_comp; @@ -385,6 +386,7 @@ static int mtk_spi_fifo_transfer(struct spi_master *master, mdata->cur_transfer = xfer; mdata->xfer_len = min(MTK_SPI_MAX_FIFO_SIZE, xfer->len); + mdata->num_xfered = 0; mtk_spi_prepare_transfer(master, xfer); mtk_spi_setup_packet(master); @@ -415,6 +417,7 @@ static int mtk_spi_dma_transfer(struct spi_master *master, mdata->tx_sgl_len = 0; mdata->rx_sgl_len = 0; mdata->cur_transfer = xfer; + mdata->num_xfered = 0; mtk_spi_prepare_transfer(master, xfer); @@ -482,7 +485,7 @@ static int mtk_spi_setup(struct spi_device *spi) static irqreturn_t mtk_spi_interrupt(int irq, void *dev_id) { - u32 cmd, reg_val, cnt, remainder; + u32 cmd, reg_val, cnt, remainder, len; struct spi_master *master = dev_id; struct mtk_spi *mdata = spi_master_get_devdata(master); struct spi_transfer *trans = mdata->cur_transfer; @@ -497,36 +500,38 @@ static irqreturn_t mtk_spi_interrupt(int irq, void *dev_id) if (trans->rx_buf) { cnt = mdata->xfer_len / 4; ioread32_rep(mdata->base + SPI_RX_DATA_REG, - trans->rx_buf, cnt); + trans->rx_buf + mdata->num_xfered, cnt); remainder = mdata->xfer_len % 4; if (remainder > 0) { reg_val = readl(mdata->base + SPI_RX_DATA_REG); - memcpy(trans->rx_buf + (cnt * 4), - ®_val, remainder); + memcpy(trans->rx_buf + + mdata->num_xfered + + (cnt * 4), + ®_val, + remainder); } } - trans->len -= mdata->xfer_len; - if (!trans->len) { + mdata->num_xfered += mdata->xfer_len; + if (mdata->num_xfered == trans->len) { spi_finalize_current_transfer(master); return IRQ_HANDLED; } - if (trans->tx_buf) - trans->tx_buf += mdata->xfer_len; - if (trans->rx_buf) - trans->rx_buf += mdata->xfer_len; - - mdata->xfer_len = min(MTK_SPI_MAX_FIFO_SIZE, trans->len); + len = trans->len - mdata->num_xfered; + mdata->xfer_len = min(MTK_SPI_MAX_FIFO_SIZE, len); mtk_spi_setup_packet(master); - cnt = trans->len / 4; - iowrite32_rep(mdata->base + SPI_TX_DATA_REG, trans->tx_buf, cnt); + cnt = len / 4; + iowrite32_rep(mdata->base + SPI_TX_DATA_REG, + trans->tx_buf + mdata->num_xfered, cnt); - remainder = trans->len % 4; + remainder = len % 4; if (remainder > 0) { reg_val = 0; - memcpy(®_val, trans->tx_buf + (cnt * 4), remainder); + memcpy(®_val, + trans->tx_buf + (cnt * 4) + mdata->num_xfered, + remainder); writel(reg_val, mdata->base + SPI_TX_DATA_REG); }