From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1753841AbdARQiJ (ORCPT <rfc822;w@1wt.eu>);
        Wed, 18 Jan 2017 11:38:09 -0500
Received: from mail-lf0-f67.google.com ([209.85.215.67]:33193 "EHLO
        mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751471AbdARQiG (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 18 Jan 2017 11:38:06 -0500
Subject: Re: [PATCH] mtd: spi-nor: Fix S3AN addressing calculation
To: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>,
        Boris Brezillon <boris.brezillon@free-electrons.com>,
        Brian Norris <computersforpeace@gmail.com>,
        Cyrille Pitchen <cyrille.pitchen@atmel.com>,
        David Woodhouse <dwmw2@infradead.org>,
        Richard Weinberger <richard@nod.at>, linux-mtd@lists.infradead.org,
        linux-kernel@vger.kernel.org
References: <20170118160854.10801-1-ricardo.ribalda@gmail.com>
From: Marek Vasut <marek.vasut@gmail.com>
Message-ID: <82a44983-b207-0bcb-29d8-f84b3b24ee4c@gmail.com>
Date: Wed, 18 Jan 2017 17:29:15 +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: <20170118160854.10801-1-ricardo.ribalda@gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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