Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1561928

[PATCH] mtd: spi-nor: Fix S3AN addressing calculation

Show all headers | View raw

The page calculation under spi_nor_s3an_addr_convert() was wrong. On
Default Address Mode we need to perform a divide by page_size.

Fixes: 61cba34bd6c1 ("mtd: spi-nor: Add support for S3AN spi-nor devices")
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
 drivers/mtd/spi-nor/spi-nor.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index 2a643a1bb45e..a374532068f0 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -431,11 +431,15 @@ static void spi_nor_unlock_and_unprep(struct spi_nor *nor, enum spi_nor_ops ops)
  */
 static loff_t spi_nor_s3an_addr_convert(struct spi_nor *nor, unsigned int addr)
 {
-	unsigned int offset = addr;
+	unsigned int offset;
+	unsigned int ret;
 
-	offset %= nor->page_size;
+	offset = addr % nor->page_size;
+	ret = addr / nor->page_size;
+	ret <<= (nor->page_size > 512) ? 10 : 9;
+	ret |= offset;
 
-	return ((addr - offset) << 1) | offset;
+	return ret;
 }
 
 /*
-- 
2.11.0

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] mtd: spi-nor: Fix S3AN addressing calculation Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> - 2017-01-18 17:10 +0100
  Re: [PATCH] mtd: spi-nor: Fix S3AN addressing calculation Marek Vasut <marek.vasut@gmail.com> - 2017-01-18 17:40 +0100

csiph-web