From patchwork Thu Jul 14 14:35:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Trimarchi X-Patchwork-Id: 2168 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 4E7E23F066 for ; Thu, 14 Jul 2022 16:35:55 +0200 (CEST) Received: by mail-wr1-f69.google.com with SMTP id l17-20020adfc791000000b0021dc7dc268dsf292148wrg.0 for ; Thu, 14 Jul 2022 07:35:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1657809355; cv=pass; d=google.com; s=arc-20160816; b=wYSGO7BOrBKl1mLvARHnl8LUx+ZPHKpIpheY88KmPtaUTHHSEYc09rIu+NyiOt5Z+h XNhPjR5GRLZ5ycXttHm0l0HGMWkrzvedgsDx7WG5uNqrctll03U3WeqNqCtUZsK2PBJm EqKiqjXFPW3QXIi0ZuX7LnbvVYfEazNHkF5LtBlVl+Us5wAvtDsWvLgqkFzX7COZXYP7 Lf8uEaoesjdErU1oWGCw/QNgo0oHIkTfZ1sJPYSvKevjg0CSBxM+tnEnowsMXpRhh0RV Wo+UCyjtliWKcQbTdrPJyOXG/DHI/xnxtgp9ki6xXNbq0tWQVA5L1MJRb6Ob5enEZjiz FZGw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=U6KVHMVhDQfZo32KbkTv2zF8IG0l7kHLolyZ6xRwLFk=; b=MkVvseyyUNtaAUS0cKazeSQaclLza/rfeqPO+8FNWUq3CQHFAFYQMGq8VOeB+CHFrD MzB1VE7B2ujyAKYtbToafRSzMcK0RCaSSCZKT0AiHWimbaea41XJTbC/eA4XHzyjz4Xc y+1WDKTd5LAc6Xf6fiEYbDym0/BBteUt1dIQIRjBTZ8tmLyWZH2wpazRz7REVrASa3Uq jiRaMP7eR8TTOPw63tugGZBhv2hIKsS9m01nzFapn7FFN57KkisDeb3DNPUjGbub7S2U KHTEBTQlbG5ZDYNnPECnJ62bztZ947qIL1b0VdjCwqs3hNu7xkkwTnmuyJd9gvqQYLul 4e/g== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=LYKRSA3F; spf=pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=michael@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=U6KVHMVhDQfZo32KbkTv2zF8IG0l7kHLolyZ6xRwLFk=; b=cnOxdmP3t3MI+1t8rvxq3BUsFOuYxEex3Y9cDoY99V8jSxTqBNvlGtJa3f264ndNbY T2qmK6KLk1ljRRpKTE+gup5vx+lstFyxAAHMmrOeRrGU9CXKv0UYQ5XjEAyO9AUiwcox jYhS2Fw9y/EHf6EY3Z+LQtw36jQGXHiyFBFHQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=U6KVHMVhDQfZo32KbkTv2zF8IG0l7kHLolyZ6xRwLFk=; b=ZPJm6dibNVUBdoj4Yt0VdavUClVhiGq6gpfVjUHkMjh+5Vrtjp5I6qlitDjsqUXNXn hjSahRVVEbRrumPkhVu+mwVDGWiK9RmYIqWsYdaeqA+DhXojtDNhIktolh9hSI0yntX8 Vdkl+y4vAzAhCpvIfhskipyvX8WnwfSgPkHIFkpuazUMNjRkCJiBYgzwADTF3zNoPXWl gf04wB3qtrM4e5ApH32VJ+xsDNI7cCE4S0JUQcImQvmWMAI5uQ+somLIAhcuKUr41MiO /MDoSq50ngE1T8KN+NE2ub1z76LqEhWSzmMjNev+7U1dBOVGULHFL/4qtqIroKvLcMZ2 MvVw== X-Gm-Message-State: AJIora9QYbHNgWfD85dRhRlGAgPpwSHeP7d1hzGqOVkM8NESp6vvKzoT eUMZqyYIXQm3c7f/TpCcd1ntVOhd X-Google-Smtp-Source: AGRyM1sw2MfNAU/yMC8cHbupJeuDcP3apGErdUaiWuHISJayl6ZGIIuR3umFekCnMQmmJ6KdH74kmQ== X-Received: by 2002:a5d:595f:0:b0:21d:78fd:70d6 with SMTP id e31-20020a5d595f000000b0021d78fd70d6mr8487287wri.402.1657809355055; Thu, 14 Jul 2022 07:35:55 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:600c:500f:b0:3a3:159:4356 with SMTP id n15-20020a05600c500f00b003a301594356ls1016152wmr.3.canary-gmail; Thu, 14 Jul 2022 07:35:53 -0700 (PDT) X-Received: by 2002:a7b:c3cc:0:b0:3a3:8ec:d69 with SMTP id t12-20020a7bc3cc000000b003a308ec0d69mr308696wmj.78.1657809353625; Thu, 14 Jul 2022 07:35:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657809353; cv=none; d=google.com; s=arc-20160816; b=rseNtWz2CaLKo35A+iLV2WKsVMep+uhrsjegKwojYecdB/cEtiJW1+4NQ5SaPIllOQ uuX9fq1QWo6IhLOhgKThKaqDFX0ADmy+3Lf9we3oDsIKQ72rmdx5N74s0/9KLg2MK1cB rva7z9/T79lHDZS9fPe4oK0FCkI2z7G4fmhIwR3QrUGSZsap7r+gMX0NX5eBgaWDAZJC k21bIBgYTFoF+Y75X6ayphEwGXoXj4k4M+bWhqZKHghwRr+GSJS8Y65/WC7K9m2o7orK BwPT/Ede2qMgR+uTDRY8M7YqZ08AV4StmuFbwcJ0jGZZkdHD2mxTjR0Sy5dveLk4HSwO 0Edw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=diK71uX3lIh/YgoKebxDYbelkMlwygsjJFrjrAg4a/M=; b=0YNf1piBqpxuVUhjKoz95be8YcLePiUhXD+xx5CyK2v8ziF2dwO5yYaqsMsSeZ04UP FkLklgK82L3ubqnAUz0NIlwPfWrrNNztGTuHTfWXikN+IPHB7QJ4w2fo+UY+EuG6Z2rq uYDEuMp9FqHeA62jhcVX52ZeDHgC1ddClCZMSEQBGDelvIZUJ7bHQmqe7VWCeSp98S6K KHiDjssZGRsAaMDBpFeAuFVqJeZV3OCtYukTvkmCTEs2bOzRg1oNUkX3mlkaLPirrcgK clV654F6G2/yDYsyy3epn5bdIwLM9kgULSGun1L7sfJszwHYn6LOnh7aAxxZFDyC1H8H 63Qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=LYKRSA3F; spf=pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=michael@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id n11-20020adf8b0b000000b0021d76a73a5asor874084wra.15.2022.07.14.07.35.53 for (Google Transport Security); Thu, 14 Jul 2022 07:35:53 -0700 (PDT) Received-SPF: pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:adf:e604:0:b0:21d:6ddb:d0ec with SMTP id p4-20020adfe604000000b0021d6ddbd0ecmr8760509wrm.177.1657809352852; Thu, 14 Jul 2022 07:35:52 -0700 (PDT) Received: from panicking.. ([2.198.242.86]) by smtp.gmail.com with ESMTPSA id u18-20020a05600c19d200b003973c54bd69sm5712357wmq.1.2022.07.14.07.35.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jul 2022 07:35:51 -0700 (PDT) From: Michael Trimarchi To: linux-amarula@amarulasolutions.com, Dario Binacchi , Tommaso Merciai , Boris Brezillon , Richard Weinberger , Patrice Chotard , Simon Glass , Wolfgang Denk , u-boot@lists.denx.de (open list) Cc: Boris Brezillon , Marek Vasut , Marek Vasut , u-boot@lists.denx.de (open list) Subject: [PATCH 02/11] mtd: nand: Store nand ID in struct nand_chip Date: Thu, 14 Jul 2022 16:35:34 +0200 Message-Id: <20220714143543.448991-3-michael@amarulasolutions.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220714143543.448991-1-michael@amarulasolutions.com> References: <20220714143543.448991-1-michael@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: michael@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=LYKRSA3F; spf=pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=michael@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Upstream commit 7f501f0a72036dc29ad9a53811474c393634b401 Store the NAND ID in struct nand_chip to avoid passing id_data and id_len as function parameters. Signed-off-by: Boris Brezillon Acked-by: Richard Weinberger Reviewed-by: Marek Vasut Signed-off-by: Michael Trimarchi --- drivers/mtd/nand/raw/nand_base.c | 54 ++++++++++++++++---------------- include/linux/mtd/rawnand.h | 15 +++++++++ 2 files changed, 42 insertions(+), 27 deletions(-) diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 9a2194ebd3..4a78770a25 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -4160,16 +4160,14 @@ static int nand_get_bits_per_cell(u8 cellinfo) * chip. The rest of the parameters must be decoded according to generic or * manufacturer-specific "extended ID" decoding patterns. */ -static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip, - u8 id_data[8]) +static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip) { int extid, id_len; /* The 3rd id byte holds MLC / multichip data */ - chip->bits_per_cell = nand_get_bits_per_cell(id_data[2]); + chip->bits_per_cell = nand_get_bits_per_cell(chip->id.data[2]); /* The 4th id byte is the important one */ - extid = id_data[3]; - - id_len = nand_id_len(id_data, 8); + extid = chip->id.data[3]; + id_len = chip->id.len; /* * Field definitions are in the following datasheets: @@ -4180,8 +4178,8 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip, * Check for ID length, non-zero 6th byte, cell type, and Hynix/Samsung * ID to decide what to do. */ - if (id_len == 6 && id_data[0] == NAND_MFR_SAMSUNG && - !nand_is_slc(chip) && id_data[5] != 0x00) { + if (id_len == 6 && chip->id.data[0] == NAND_MFR_SAMSUNG && + !nand_is_slc(chip) && chip->id.data[5] != 0x00) { /* Calc pagesize */ mtd->writesize = 2048 << (extid & 0x03); extid >>= 2; @@ -4214,7 +4212,7 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip, /* Calc blocksize */ mtd->erasesize = (128 * 1024) << (((extid >> 1) & 0x04) | (extid & 0x03)); - } else if (id_len == 6 && id_data[0] == NAND_MFR_HYNIX && + } else if (id_len == 6 && chip->id.data[0] == NAND_MFR_HYNIX && !nand_is_slc(chip)) { unsigned int tmp; @@ -4278,10 +4276,10 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip, * 110b -> 24nm * - ID byte 5, bit[7]: 1 -> BENAND, 0 -> raw SLC */ - if (id_len >= 6 && id_data[0] == NAND_MFR_TOSHIBA && + if (id_len >= 6 && chip->id.data[0] == NAND_MFR_TOSHIBA && nand_is_slc(chip) && - (id_data[5] & 0x7) == 0x6 /* 24nm */ && - !(id_data[4] & 0x80) /* !BENAND */) { + (chip->id.data[5] & 0x7) == 0x6 /* 24nm */ && + !(chip->id.data[4] & 0x80) /* !BENAND */) { mtd->oobsize = 32 * mtd->writesize >> 9; } @@ -4294,9 +4292,9 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip, * the chip. */ static void nand_decode_id(struct mtd_info *mtd, struct nand_chip *chip, - struct nand_flash_dev *type, u8 id_data[8]) + struct nand_flash_dev *type) { - int maf_id = id_data[0]; + int maf_id = chip->id.data[0]; mtd->erasesize = type->erasesize; mtd->writesize = type->pagesize; @@ -4311,11 +4309,11 @@ static void nand_decode_id(struct mtd_info *mtd, struct nand_chip *chip, * listed in nand_ids table. * Data sheet (5 byte ID): Spansion S30ML-P ORNAND (p.39) */ - if (maf_id == NAND_MFR_AMD && id_data[4] != 0x00 && id_data[5] == 0x00 - && id_data[6] == 0x00 && id_data[7] == 0x00 + if (maf_id == NAND_MFR_AMD && chip->id.data[4] != 0x00 && chip->id.data[5] == 0x00 + && chip->id.data[6] == 0x00 && chip->id.data[7] == 0x00 && mtd->writesize == 512) { mtd->erasesize = 128 * 1024; - mtd->erasesize <<= ((id_data[3] & 0x03) << 1); + mtd->erasesize <<= ((chip->id.data[3] & 0x03) << 1); } } @@ -4325,9 +4323,9 @@ static void nand_decode_id(struct mtd_info *mtd, struct nand_chip *chip, * page size, cell-type information). */ static void nand_decode_bbm_options(struct mtd_info *mtd, - struct nand_chip *chip, u8 id_data[8]) + struct nand_chip *chip) { - int maf_id = id_data[0]; + int maf_id = chip->id.data[0]; /* Set the bad block position */ if (mtd->writesize > 512 || (chip->options & NAND_BUSWIDTH_16)) @@ -4362,14 +4360,14 @@ static inline bool is_full_id_nand(struct nand_flash_dev *type) } static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip, - struct nand_flash_dev *type, u8 *id_data) + struct nand_flash_dev *type) { - if (!strncmp((char *)type->id, (char *)id_data, type->id_len)) { + if (!strncmp((char *)type->id, (char *)chip->id.data, type->id_len)) { mtd->writesize = type->pagesize; mtd->erasesize = type->erasesize; mtd->oobsize = type->oobsize; - chip->bits_per_cell = nand_get_bits_per_cell(id_data[2]); + chip->bits_per_cell = nand_get_bits_per_cell(chip->id.data[2]); chip->chipsize = (uint64_t)type->chipsize << 20; chip->options |= type->options; chip->ecc_strength_ds = NAND_ECC_STRENGTH(type); @@ -4395,7 +4393,7 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, { int busw, ret; int maf_idx; - u8 id_data[8]; + u8 *id_data = chip->id.data; /* * Reset the chip, required by some chips (e.g. Micron MT29FxGxxxxx) @@ -4453,9 +4451,11 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, */ chip->options &= ~NAND_BUSWIDTH_16; + chip->id.len = nand_id_len(id_data, ARRAY_SIZE(chip->id.data)); + for (; type->name != NULL; type++) { if (is_full_id_nand(type)) { - if (find_full_id_nand(mtd, chip, type, id_data)) + if (find_full_id_nand(mtd, chip, type)) goto ident_done; } else if (*dev_id == type->dev_id) { break; @@ -4483,9 +4483,9 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, if (!type->pagesize) { /* Decode parameters from extended ID */ - nand_decode_ext_id(mtd, chip, id_data); + nand_decode_ext_id(mtd, chip); } else { - nand_decode_id(mtd, chip, type, id_data); + nand_decode_id(mtd, chip, type); } /* Get chip options */ @@ -4523,7 +4523,7 @@ ident_done: return ERR_PTR(-EINVAL); } - nand_decode_bbm_options(mtd, chip, id_data); + nand_decode_bbm_options(mtd, chip); /* Calculate the address shift from the page size */ chip->page_shift = ffs(mtd->writesize) - 1; diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index 3417ca2a0d..f2c6a978cb 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -507,6 +507,19 @@ static inline void nand_hw_control_init(struct nand_hw_control *nfc) init_waitqueue_head(&nfc->wq); } +/* The maximum expected count of bytes in the NAND ID sequence */ +#define NAND_MAX_ID_LEN 8 + +/** + * struct nand_id - NAND id structure + * @data: buffer containing the id bytes. + * @len: ID length. + */ +struct nand_id { + u8 data[NAND_MAX_ID_LEN]; + int len; +}; + /** * struct nand_ecc_step_info - ECC step information of ECC engine * @stepsize: data bytes per ECC step @@ -888,6 +901,8 @@ nand_get_sdr_timings(const struct nand_data_interface *conf) struct nand_chip { struct mtd_info mtd; + struct nand_id id; + void __iomem *IO_ADDR_R; void __iomem *IO_ADDR_W;