* [PATCH] mtd: spi-nor: Fix S3AN addressing calculation
@ 2017-01-18 16:08 Ricardo Ribalda Delgado
2017-01-18 16:29 ` Marek Vasut
0 siblings, 1 reply; 2+ messages in thread
From: Ricardo Ribalda Delgado @ 2017-01-18 16:08 UTC (permalink / raw)
To: Boris Brezillon, Brian Norris, Marek Vasut, Cyrille Pitchen,
David Woodhouse, Richard Weinberger, linux-mtd, linux-kernel
Cc: Ricardo Ribalda Delgado
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] mtd: spi-nor: Fix S3AN addressing calculation
2017-01-18 16:08 [PATCH] mtd: spi-nor: Fix S3AN addressing calculation Ricardo Ribalda Delgado
@ 2017-01-18 16:29 ` Marek Vasut
0 siblings, 0 replies; 2+ messages in thread
From: Marek Vasut @ 2017-01-18 16:29 UTC (permalink / raw)
To: Ricardo Ribalda Delgado, Boris Brezillon, Brian Norris,
Cyrille Pitchen, David Woodhouse, Richard Weinberger, linux-mtd,
linux-kernel
On 01/18/2017 05:08 PM, Ricardo Ribalda Delgado wrote:
> 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;
Can you use something less opaque than "ret" , something more
descriptive ? Thanks
> - 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;
> }
>
> /*
>
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-18 16:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-18 16:08 [PATCH] mtd: spi-nor: Fix S3AN addressing calculation Ricardo Ribalda Delgado
2017-01-18 16:29 ` Marek Vasut
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®