From patchwork Fri May 6 00:31:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 619100 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3r1CTg1w0Nz9t6s for ; Fri, 6 May 2016 10:34:47 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=sbxzM76l; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ayThf-0006qg-2z; Fri, 06 May 2016 00:33:11 +0000 Received: from mail-pa0-x230.google.com ([2607:f8b0:400e:c03::230]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ayThS-0006Lf-T4 for linux-mtd@lists.infradead.org; Fri, 06 May 2016 00:32:59 +0000 Received: by mail-pa0-x230.google.com with SMTP id xk12so41518355pac.0 for ; Thu, 05 May 2016 17:32:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZU8RMfd85OEtjbAgpIXdKMtLM+eUbV7CArylNPSio2Q=; b=sbxzM76l9emoD6AwozZdJVb2ZuWM/Ql+7XLU246axHDmv1QFjlp8zHf3FJSOY1Pq40 BFnO+mb8AvNzN7myD66tWp24z10KcwP9BSMiF++/4RwldvDts7bonQNMuMiYHngjVsWP SvTwxdPqGqUB9YlsR5OjKl7dnDLL0OLv8G5FTgkL4HivdbBlm6rDEop2f0CiaM8XKzZ0 fAL+rVzGyhFbQBo/mPQtA2UvdXyHkP1SYfYk0q25DYa66qln160q1AOla8oAbB+S3eTS 9xlI+eeOLCTfdXy2HT+n0M+JdvTg1eEpfa81wXOoW4ZAHFAb+hdserBqR468A2bWInUW 2InA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZU8RMfd85OEtjbAgpIXdKMtLM+eUbV7CArylNPSio2Q=; b=IU5caVJWjdyx22viK8x2XNSYnxh8JrtQqqvpcqmG3OkO165YeLejNXw4oq5pIFuujY zBcREvsgJWoS6091fmSxvrbaUV6QoBali743LbnD5SAJZQi7tvg32LiDCfNbWLPpEmAn jvzhYlFZHaMDXQzGAmoDlvs2w7hJt0IdH57O/4qwvOEQLHT0TyCf6qnE4XQ3NYVxCVXU QO62yDqzzzQdgCm+ChYHpvGkz7eCNVlnb31I1PTr+TIls0/aejIRwlJIPBmIREXL+wR+ qXhcDkMr8GdsmdyxNUHiHZdGbhqV4rrFJZTpoHJ2NAcEX4g/6o5M0SBdgyK8U099im+p QtmA== X-Gm-Message-State: AOPr4FV9Ax4S1pDUZ7OcDz+ree/Wovvzw89qVbul1TglczPX8X2Y0CzWqpS1X/ESaebLsQ== X-Received: by 10.66.81.136 with SMTP id a8mr24832238pay.113.1462494758280; Thu, 05 May 2016 17:32:38 -0700 (PDT) Received: from ban.mtv.corp.google.com ([172.22.64.120]) by smtp.gmail.com with ESMTPSA id n10sm16337821pax.18.2016.05.05.17.32.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 May 2016 17:32:37 -0700 (PDT) From: Brian Norris To: Subject: [PATCH v7 04/10] mtd: mtk-quadspi: return amount of data transferred or error in read/write Date: Thu, 5 May 2016 17:31:50 -0700 Message-Id: <1462494716-95312-5-git-send-email-computersforpeace@gmail.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1462494716-95312-1-git-send-email-computersforpeace@gmail.com> References: <1462494716-95312-1-git-send-email-computersforpeace@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160505_173259_069743_DB54DC43 X-CRM114-Status: GOOD ( 13.79 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2607:f8b0:400e:c03:0:0:0:230 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (computersforpeace[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 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 -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Boris Brezillon , Michal Suchanek , Gabor Juhos , Bean Huo , Rafal Milecki , linux-kernel@vger.kernel.org, Bayi Cheng , "Andrew F. Davis" , Javier Martinez Canillas , Jagan Teki , Han Xu , Cyrille Pitchen , Brian Norris , Mika Westerberg , Joachim Eastwood , Heiner Kallweit MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Add checking of SPI transfer errors and return them from read/write functions. Also return the amount of data transferred. Signed-off-by: Brian Norris --- New in v7 drivers/mtd/spi-nor/mtk-quadspi.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/mtd/spi-nor/mtk-quadspi.c b/drivers/mtd/spi-nor/mtk-quadspi.c index ab92ac0f6b2b..e85687126c25 100644 --- a/drivers/mtd/spi-nor/mtk-quadspi.c +++ b/drivers/mtd/spi-nor/mtk-quadspi.c @@ -261,7 +261,7 @@ static ssize_t mt8173_nor_read(struct spi_nor *nor, loff_t from, size_t length, return ret; buf[i] = readb(mt8173_nor->base + MTK_NOR_RDATA_REG); } - return 0; + return length; } static int mt8173_nor_write_single_byte(struct mt8173_nor *mt8173_nor, @@ -302,6 +302,7 @@ static ssize_t mt8173_nor_write(struct spi_nor *nor, loff_t to, size_t len, { int ret; struct mt8173_nor *mt8173_nor = nor->priv; + size_t i; ret = mt8173_nor_write_buffer_enable(mt8173_nor); if (ret < 0) { @@ -309,13 +310,12 @@ static ssize_t mt8173_nor_write(struct spi_nor *nor, loff_t to, size_t len, return ret; } - while (len >= SFLASH_WRBUF_SIZE) { + for (i = 0; i + SFLASH_WRBUF_SIZE <= len; i += SFLASH_WRBUF_SIZE) { ret = mt8173_nor_write_buffer(mt8173_nor, to, buf); if (ret < 0) { dev_err(mt8173_nor->dev, "write buffer failed!\n"); return ret; } - len -= SFLASH_WRBUF_SIZE; to += SFLASH_WRBUF_SIZE; buf += SFLASH_WRBUF_SIZE; (*retlen) += SFLASH_WRBUF_SIZE; @@ -326,9 +326,9 @@ static ssize_t mt8173_nor_write(struct spi_nor *nor, loff_t to, size_t len, return ret; } - if (len) { - ret = mt8173_nor_write_single_byte(mt8173_nor, to, (int)len, - (u8 *)buf); + if (i < len) { + ret = mt8173_nor_write_single_byte(mt8173_nor, to, + (int)(len - i), (u8 *)buf); if (ret < 0) { dev_err(mt8173_nor->dev, "write single byte failed!\n"); return ret; @@ -336,7 +336,7 @@ static ssize_t mt8173_nor_write(struct spi_nor *nor, loff_t to, size_t len, (*retlen) += len; } - return 0; + return len; } static int mt8173_nor_read_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len)