From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752338AbdATNxR (ORCPT ); Fri, 20 Jan 2017 08:53:17 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35117 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752256AbdATNxN (ORCPT ); Fri, 20 Jan 2017 08:53:13 -0500 Subject: Re: [PATCH v2] mtd: spi-nor: Fix S3AN addressing calculation To: Cyrille Pitchen , Ricardo Ribalda Delgado , Boris Brezillon , Brian Norris , David Woodhouse , Richard Weinberger , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org References: <20170118164016.27976-1-ricardo.ribalda@gmail.com> From: Marek Vasut Message-ID: <52628ae5-8b58-f704-a513-74092c0dfa3a@gmail.com> Date: Fri, 20 Jan 2017 14:48:22 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/20/2017 02:26 PM, Cyrille Pitchen wrote: > Le 18/01/2017 à 17:40, Ricardo Ribalda Delgado a écrit : >> 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 > Reviewed-by: Cyrille Pitchen > > Marek, any comment on your side? All good, Acked-by: Marek Vasut >> --- >> >> v2: Suggested by Marek Vasut >> -Use more descriptive name for page >> >> drivers/mtd/spi-nor/spi-nor.c | 9 ++++++--- >> 1 file changed, 6 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c >> index 2a643a1bb45e..f5c3ce8ac48b 100644 >> --- a/drivers/mtd/spi-nor/spi-nor.c >> +++ b/drivers/mtd/spi-nor/spi-nor.c >> @@ -431,11 +431,14 @@ 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 page; >> >> - offset %= nor->page_size; >> + offset = addr % nor->page_size; >> + page = addr / nor->page_size; >> + page <<= (nor->page_size > 512) ? 10 : 9; >> >> - return ((addr - offset) << 1) | offset; >> + return page | offset; >> } >> >> /* >> > -- Best regards, Marek Vasut