From patchwork Tue Jan 15 13:46:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "(Exiting) Baolin Wang" X-Patchwork-Id: 10764497 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 EBF56139A for ; Tue, 15 Jan 2019 13:47:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA8DE2B620 for ; Tue, 15 Jan 2019 13:47:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CB7C32C103; Tue, 15 Jan 2019 13:47:34 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 164A02B620 for ; Tue, 15 Jan 2019 13:47:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729516AbfAONrd (ORCPT ); Tue, 15 Jan 2019 08:47:33 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:34881 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727273AbfAONrd (ORCPT ); Tue, 15 Jan 2019 08:47:33 -0500 Received: by mail-pl1-f195.google.com with SMTP id p8so1330744plo.2 for ; Tue, 15 Jan 2019 05:47:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=iJghhK3Ea6pnQ7EyMrgiOwYdRz+yXPK9qPAyKingmVg=; b=JFyW2Ngva1MEGl5CSZA9zej4PRgkR2zxRydccPGGi39cRrIlXpZV5LpQJJ8Iw91xpe gnYDGJIJPDn5YomZAbLU/4xUwd5FhY1agHUl+GeVMoWGkbBpSbgT9h2lPe1tE+MdD+t8 bUXu2f/mvfYWsoJatf0b3EfzoA6hnt1PA47AE= 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; bh=iJghhK3Ea6pnQ7EyMrgiOwYdRz+yXPK9qPAyKingmVg=; b=JQKN72dPaBg+cAPUnq0IgDJqf3Kg1yx8/jSP9g7sTFHECHlJbwW8kcX8EQycbXTagI +g711NbPPU4M8UBeu9fY1amymMPhdfvKpSDt/3G13638VlB5BXbxLFLGYS/q6R6WFKOZ 2McmVe9O0xCqjYx0kUVTYoHlhaQcP8DiUfRTA66jUzBwS38NDY5VJvQIZt844n9X8L0T 9JazgU4Vk2nQl33EXZwIxnEkBgat2ye+WxdmY530gfBCkbfHM34O2RrykDxNGW4QKVGu RnU10iz3sQF5yrS2Yotov++xeZIQFje8CDO8f7GdcSdNcRlVkxUulZPPa5DRkzv5vuWF OBjw== X-Gm-Message-State: AJcUukfiShMSnopWYliJpvS4WAfv8WEg/gi9z1xez3v0SoX+68iU4ZS/ HTi5HQTuDg/pauZrS6lVNqJmuA== X-Google-Smtp-Source: ALg8bN5RXrkNjYkoeMFqGqGkePgB60PfAXAnbWptk+6kRGFjPfeGWKsAR9I2NsxKU5bFHEslAVFfmA== X-Received: by 2002:a17:902:aa4c:: with SMTP id c12mr4261453plr.48.1547560052298; Tue, 15 Jan 2019 05:47:32 -0800 (PST) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.102]) by smtp.gmail.com with ESMTPSA id y71sm5979422pfi.123.2019.01.15.05.47.29 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 15 Jan 2019 05:47:31 -0800 (PST) From: Baolin Wang To: broonie@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com Cc: orsonzhai@gmail.com, zhang.lyra@gmail.com, lanqing.liu@unisoc.com, baolin.wang@linaro.org, linux-spi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] spi: sprd: Fix the error data length in SPI read-only mode Date: Tue, 15 Jan 2019 21:46:50 +0800 Message-Id: X-Mailer: git-send-email 1.7.9.5 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 From: Lanqing Liu In SPI read-only mode, we will always return the writing length, which is always the power of "bits_per_word", but the length unit using by users is byte. Thus this patch fixes the returning length by getting from read_bufs() function to get the correct length. Signed-off-by: Lanqing Liu Signed-off-by: Baolin Wang --- drivers/spi/spi-sprd.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-sprd.c b/drivers/spi/spi-sprd.c index 8daa24e..fa324ce 100644 --- a/drivers/spi/spi-sprd.c +++ b/drivers/spi/spi-sprd.c @@ -380,7 +380,7 @@ static int sprd_spi_txrx_bufs(struct spi_device *sdev, struct spi_transfer *t) { struct sprd_spi *ss = spi_controller_get_devdata(sdev->controller); u32 trans_len = ss->trans_len, len; - int ret, write_size = 0; + int ret, write_size = 0, read_size = 0; while (trans_len) { len = trans_len > SPRD_SPI_FIFO_SIZE ? SPRD_SPI_FIFO_SIZE : @@ -416,13 +416,15 @@ static int sprd_spi_txrx_bufs(struct spi_device *sdev, struct spi_transfer *t) goto complete; if (ss->trans_mode & SPRD_SPI_RX_MODE) - ss->read_bufs(ss, len); + read_size += ss->read_bufs(ss, len); trans_len -= len; } - ret = write_size; - + if (ss->trans_mode & SPRD_SPI_TX_MODE) + ret = write_size; + else + ret = read_size; complete: sprd_spi_enter_idle(ss);