From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753645AbdARQJG (ORCPT ); Wed, 18 Jan 2017 11:09:06 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:34127 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752856AbdARQJE (ORCPT ); Wed, 18 Jan 2017 11:09:04 -0500 From: Ricardo Ribalda Delgado To: Boris Brezillon , Brian Norris , Marek Vasut , Cyrille Pitchen , David Woodhouse , Richard Weinberger , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Delgado Subject: [PATCH] mtd: spi-nor: Fix S3AN addressing calculation Date: Wed, 18 Jan 2017 17:08:54 +0100 Message-Id: <20170118160854.10801-1-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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