From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A287C004D3 for ; Mon, 22 Oct 2018 10:27:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D89D120895 for ; Mon, 22 Oct 2018 10:27:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D89D120895 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728616AbeJVSpI (ORCPT ); Mon, 22 Oct 2018 14:45:08 -0400 Received: from mail.bootlin.com ([62.4.15.54]:46384 "EHLO mail.bootlin.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728372AbeJVSpI (ORCPT ); Mon, 22 Oct 2018 14:45:08 -0400 Received: by mail.bootlin.com (Postfix, from userid 110) id 1A514207A3; Mon, 22 Oct 2018 12:27:10 +0200 (CEST) Received: from bbrezillon (aaubervilliers-681-1-25-52.w90-88.abo.wanadoo.fr [90.88.145.52]) by mail.bootlin.com (Postfix) with ESMTPSA id ACE0C2072D; Mon, 22 Oct 2018 12:26:59 +0200 (CEST) Date: Mon, 22 Oct 2018 12:26:59 +0200 From: Boris Brezillon To: Yogesh Narayan Gaur Cc: Tudor Ambarus , "richard@nod.at" , Mark Brown , "linux-kernel@vger.kernel.org" , "nicolas.ferre@microchip.com" , "marek.vasut@gmail.com" , "cyrille.pitchen@microchip.com" , "linux-mtd@lists.infradead.org" , "Cristian.Birsan@microchip.com" , Cyrille Pitchen , "computersforpeace@gmail.com" , "dwmw2@infradead.org" , "linux-arm-kernel@lists.infradead.org" Subject: Re: [PATCH v3 1/2] mtd: spi-nor: add support to non-uniform SFDP SPI NOR flash memories Message-ID: <20181022122659.0675942e@bbrezillon> In-Reply-To: References: <20180911154007.17195-1-tudor.ambarus@microchip.com> <20180911154007.17195-2-tudor.ambarus@microchip.com> <31a8f6a9-1459-443a-6ef8-2b2c17769ae4@microchip.com> <20181017090724.12f2cd79@bbrezillon> <20181017091045.124e0266@bbrezillon> <20181017092941.3658bd9a@bbrezillon> <20181017115237.07310b74@bbrezillon> <20181022111543.2a607efc@bbrezillon> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 22 Oct 2018 10:03:55 +0000 Yogesh Narayan Gaur wrote: > --- a/drivers/mtd/spi-nor/spi-nor.c > +++ b/drivers/mtd/spi-nor/spi-nor.c > @@ -2863,26 +2863,36 @@ static u8 spi_nor_smpt_read_dummy(const struct spi_nor *nor, const u32 settings) > * @nor: pointer to a 'struct spi_nor' > * @smpt: pointer to the sector map parameter table > */ > -static const u32 *spi_nor_get_map_in_use(struct spi_nor *nor, const u32 *smpt) > +static const u32 *spi_nor_get_map_in_use(struct spi_nor *nor, const u32 *smpt, u32 smpt_len) > { > const u32 *ret = NULL; > - u32 i, addr; > + u32 i, addr, nmaps; > int err; > u8 addr_width, read_opcode, read_dummy; > u8 read_data_mask, data_byte, map_id; > + bool map_id_is_valid = false; > > addr_width = nor->addr_width; > read_dummy = nor->read_dummy; > read_opcode = nor->read_opcode; > > + pr_info("Start [addr_width:%08x, read_dumy:%0x8, read_opcode:%08x]\n", nor->addr_width, nor->read_dummy, nor->read_opcode); > + > + for (i = 0; i + pr_info("%s:%i smpt[%d]=%08x\n", __func__, __LINE__, i, smpt[i]); > + > map_id = 0; > - i = 0; > /* Determine if there are any optional Detection Command Descriptors */ > - while (!(smpt[i] & SMPT_DESC_TYPE_MAP)) { > + for (i = 0; i< smpt_len; i++) { ^ i += 2) { > + if ((smpt[i] & SMPT_DESC_TYPE_MAP)) > + break; > + > read_data_mask = SMPT_CMD_READ_DATA(smpt[i]); > nor->addr_width = spi_nor_smpt_addr_width(nor, smpt[i]); > nor->read_dummy = spi_nor_smpt_read_dummy(nor, smpt[i]); > nor->read_opcode = SMPT_CMD_OPCODE(smpt[i]); > + pr_info("smpt[%d]=[addr_width:%08x, read_dumy:%0x8, read_opcode:%08x]\n", i, nor->addr_width, nor->read_dummy, nor->read_opcode); > + > addr = smpt[i + 1]; > > err = spi_nor_read_raw(nor, addr, 1, &data_byte); > @@ -2894,18 +2904,36 @@ static const u32 *spi_nor_get_map_in_use(struct spi_nor *nor, const u32 *smpt) > * Configuration that is currently in use. > */ > map_id = map_id << 1 | !!(data_byte & read_data_mask); > + map_id_is_valid = true; > i = i + 2; Drop the above line (i = i + 2). > } > > - /* Find the matching configuration map */ > - while (SMPT_MAP_ID(smpt[i]) != map_id) { > - if (smpt[i] & SMPT_DESC_END) > - goto out; > + if (map_id_is_valid) > + pr_info("%s:%i map_id=%d\n", __func__, __LINE__, map_id); > + else > + pr_info("%s:%i NO map_id\n", __func__, __LINE__); > + > + for (nmaps = 0; i< smpt_len; nmaps++) { > + if((smpt[i] & SMPT_DESC_TYPE_MAP)) > + continue; > + > + if(!map_id_is_valid) { > + if (nmaps) { > + ret = NULL; > + break; > + } > + > + ret = smpt+i; > + } else if (map_id == SMPT_MAP_ID(smpt[i])) { > + ret = smpt+i; > + break; > + } > + > /* increment the table index to the next map */ > i += SMPT_MAP_REGION_COUNT(smpt[i]) + 1; > } > > - ret = smpt + i; > + pr_info("End [addr_width:%08x, read_dumy:%0x8, read_opcode:%08x]\n", nor->addr_width, nor->read_dummy, nor->read_opcode); > /* fall through */ > out: > nor->addr_width = addr_width;