From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752132AbdATN0N (ORCPT ); Fri, 20 Jan 2017 08:26:13 -0500 Received: from smtpout.microchip.com ([198.175.253.82]:42459 "EHLO email.microchip.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751941AbdATN0M (ORCPT ); Fri, 20 Jan 2017 08:26:12 -0500 Subject: Re: [PATCH v2] mtd: spi-nor: Fix S3AN addressing calculation To: Ricardo Ribalda Delgado , Marek Vasut , Boris Brezillon , Brian Norris , David Woodhouse , Richard Weinberger , , References: <20170118164016.27976-1-ricardo.ribalda@gmail.com> From: Cyrille Pitchen Message-ID: Date: Fri, 20 Jan 2017 14:26:08 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <20170118164016.27976-1-ricardo.ribalda@gmail.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit X-Brightmail-Tracker: H4sIAAAAAAAAC+NgFjrPKsWRWlGSWpSXmKPExsXCxeXDovuJvynC4PD0S2vYLA68WMhiceTCWmaLiSsnM1tc3jWHzWJ30zJ2i6N77jFbdHXPY7KYvPMNowOHx5NNFxk9ds66y+6xeYWWx+Yl9R435xV6fN4kF8AWxZqZl5RfkcCa8eHSfaaCX1wVL+c+Y2tgfMvRxcjFISSwglGicc4bti5GDg5hAVeJZx+8uxg5OUQELjJJvFxsC2ILCdhJvL38kxXEZhMwlHj74CiYzStgIzHxxFkwm0VAVWJp9052kDGiAhESDYfTIUoEJU7OfMICYnMK2EuceHmADcRmFjCQOLJoDiuELS/RvHU2M8QqNYmFLSvAbAmBQIlXiz+yQthOEjuXT2WBsO0kDk+/yA5hO0gs/T2HHaamfekbqHptie2v9kHZOhLbDvZD9dpK7JkxkQnCdpd48Gg5lO0rMethA1RNlMTbeadYJjBKzELywiwkZ89CcvYCRuZVjNLOHn66wWG6rhHOHgamernJGQW6uYmZeXrJ+bmbGCFRm7WD8XdnxCFGSQ4mJVHe3R8bIoT4kvJTKjMSizPii0pzUosPMcpwcChJ8JbzNUUICRalpqdWpGXmANMHTJqJg/MQowQHj5IIbyxIDW9xQWJucWY6RP4Uo6SUOK8DSEIAJJFRmgfXe4lRVEqYN4MNKMdTkFqUm1kCEb/FKMbxkInjMZMQS15+XqoU0KkMQGDA+IpRnINRSZiXhR+kJTOvBG7NK6ALmIAusFKuB7mgJBEhJdXAqGLd+XHCmW8M/Nrdh7aHXbBlnjvn6b6Geu3zFXP2d/M/VjVyXbT3yAXLwF9hXs9iOzbP6TY/w726dvuTdTczZlfynS4osDs5mU0h1fbAAsV+UYOgw+XiSbevhCqaxUmbtNm09ug+Cd5jbvqf/aKuxkTVsH61rR6zkl5sr2fNOySSzB+nMEtNiaU4I9FQi7moOBEAwjJlpmIDAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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? > --- > > 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; > } > > /* >