From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752674AbdATOor (ORCPT ); Fri, 20 Jan 2017 09:44:47 -0500 Received: from exsmtp01.microchip.com ([198.175.253.37]:31205 "EHLO email.microchip.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752580AbdATOop (ORCPT ); Fri, 20 Jan 2017 09:44:45 -0500 Subject: Re: [PATCH v2] mtd: spi-nor: Fix S3AN addressing calculation To: Marek Vasut , Ricardo Ribalda Delgado , Boris Brezillon , Brian Norris , David Woodhouse , Richard Weinberger , , References: <20170118164016.27976-1-ricardo.ribalda@gmail.com> <52628ae5-8b58-f704-a513-74092c0dfa3a@gmail.com> From: Cyrille Pitchen Message-ID: <297a9173-c20b-0b15-bfbb-141a7be5e315@atmel.com> Date: Fri, 20 Jan 2017 15:44:40 +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: <52628ae5-8b58-f704-a513-74092c0dfa3a@gmail.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit X-Brightmail-Tracker: =?Windows-1252?Q?H4sIAAAAAAAAC+NgFrrIKsWRWlGSWpSXmKPExsXCxeXDohut1BRh0HB1?= =?Windows-1252?Q?2llmiwMvFrJYHLmwltli4srJzBaXd81hs9jdtIzd4uiee8wWXd3zmCwm?= =?Windows-1252?Q?73zD6MDh8WTTRUaPnbPusntsXqHlsXlJvcfNeYUenzfJBbBFsWbmJeVX?= =?Windows-1252?Q?JLBm3D1+h63gOl/F3ms32BoYP3N3MXJxCAksZ5RovzydtYuRg0NYwFXi?= =?Windows-1252?Q?2QdvkLiIwEUmiRvf/zBCFC1hlFi6eDJbFyMnB5uAocTbB0dZQWxeARuJ?= =?Windows-1252?Q?fV93M4PYLAKqErMOfmIGGSQqECHRcDgdokRQ4uTMJywgNqeArUTv6yns?= =?Windows-1252?Q?IDazgIHEkUVzWCFseYnmrbPBxggJqEksbFkBZksIBEpseTiJDcJ2knh5?= =?Windows-1252?Q?9CWUbSdxePpFdgjbXuLsms3sMDU/d+1ghbC1Jba/2gdl60hsO9jPAmHb?= =?Windows-1252?Q?SuyZMZEJwnaXePBoOZTtKzHrYQNUTZREw4ITTBMYJWYheWEWkrNnITl7?= =?Windows-1252?Q?ASPzKkZpZw8/3eAwXdcIZw8DQ73c5IwC3dzEzDy95PzcTYyQyFXdwXjr?= =?Windows-1252?Q?X/ghRkkOJiVR3t0fGyKE+JLyUyozEosz4otKc1KLDzHKcHAoSfBWKzRF?= =?Windows-1252?Q?CAkWpaanVqRl5gBTCEyaiYPzEKMEB4+SCK+WIlANb3FBYm5xZjpE/hSj?= =?Windows-1252?Q?pJQ472F5oIQASCKjNA+u9xKjqJQw724RoBxPQWpRbmYJRPwWoxjHQyaO?= =?Windows-1252?Q?x0xCLHn5ealSQKcyAIEB4ytGcQ5GJWHeBSC38GTmlcCteQV0ARPQBVbK?= =?Windows-1252?Q?9SAXlCQipKQaGGuYpflUZkY5c37UXzhZ9OkxdtXT722Osj+yDhQ2ZrVQ?= =?Windows-1252?Q?a9Dy1V+dn83eyjJVk7Nv/Re9gA/Os7i1fqTyrHF+vz/04nbOX7yP0nj+?= =?Windows-1252?Q?poXavxDduH2XB7fNIb8dnFyRTe51k0Kepz/tdTN0qo4pmXV5mkzwzrVx?= =?Windows-1252?Q?suX7Q9hbxIvE/u+4ysN5xiVXiaU4I9FQi7moOBEAqEkiG2QDAAA=3D?= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le 20/01/2017 à 14:48, Marek Vasut a écrit : > 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") I've removed this "Fixes" tag since the commit ID refers to a commit in the spi-nor tree and the final commit ID in Linus tree is likely to be different. >>> Signed-off-by: Ricardo Ribalda Delgado >> Reviewed-by: Cyrille Pitchen >> >> Marek, any comment on your side? > > All good, > > Acked-by: Marek Vasut > Applied to git://github.com/spi-nor/linux.git Thanks! >>> --- >>> >>> 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; >>> } >>> >>> /* >>> >> > >