From patchwork Wed Jul 13 17:11:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Trimarchi X-Patchwork-Id: 2140 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id B7D573F066 for ; Wed, 13 Jul 2022 19:11:21 +0200 (CEST) Received: by mail-ej1-f72.google.com with SMTP id sc42-20020a1709078a2a00b0072b5f51a9dbsf3276749ejc.1 for ; Wed, 13 Jul 2022 10:11:21 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1657732281; cv=pass; d=google.com; s=arc-20160816; b=Ja4L6FcNZawO6Dx3YscclHUL1xsR3C+jDjsrodJI6PX0Zk+EjjMBjHk3QLG9/XU6P+ xT8spr8iRlHLQj2/JDp7zSSDvTUM5aDoEttAE8kHA1+5Y1nX0n4CE3uRQJx3vTkaG+YX Sy9WGB0L0qcGQSjqRnHKt+kuWWblJL/jEB4Zci/nbOGtXseWNhNz8w6Ft/26VcXxlxKL dBL7c94tzwPmASUWNpTUF5Hwo0fr0YGdvlweEgbeZ7ogKtq0Ky8A39xLgYKJD2TTdu9X S2nJewZwlGvIejgaevqhVbCxf9dmmkXRsiy7Onc0xgTasei6hjfN4ed1zjcBvu88BrFh 6Rlw== 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:to:from:dkim-signature; bh=zG6wjqM5pKhjIObcbq+1697BitA63oTxB0xoc3v5vjg=; b=MCTfgoa2xUy96VjLEsQF0ypM2lr5u19VCbguXdmIbrrEJz4fWH0UoK29p/c8deyhPA Ocna2PrKWHzHkaMrHqID+2DftwJcjglVR5/0oTq2t1heiR246w2oT4bZdw8jH1ppJR0/ xMLZi0jS84/XPAZ0AHL8+WbvPvMZ4HbRkUdHtGej9TOjNMDIuinO60mZcLkVv2MXofue rXM2AdYqjdU7bJUDZeOYW2pCkRSvywhg/gBas8xt/iSi5sEhF6ktolVMss7ybvIND/iZ 7tqxMJ/ftqvDIN7pNKhJzzrHml/HdKNM9t6U52nOkdKW9ddL7dIJEMQ4vC74U1fULWcU Z+mw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=qJH2TJ6a; 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: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=zG6wjqM5pKhjIObcbq+1697BitA63oTxB0xoc3v5vjg=; b=ZS0c3qxmlE+fCIuYc6wHOiZagGUdVaPHAqiAB59Osx60tNbAE7GPbgFLbM7gc9JeIY 74397xHkO2W91bpNGGRzYUw9k8uH+1kGqvEvhwtaU1BP9G35OR62z7fleWU5Y3uUJXeK 2CRDiaGQZoW7YQrXcxXlc4FFDtzBR57uPqPeA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to: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=zG6wjqM5pKhjIObcbq+1697BitA63oTxB0xoc3v5vjg=; b=rhQ8ZVtF91XNUzm4xHAUbAGtOZm1TKmK516gGlxdw3emow27QxVVnZduHHRx6QHeQj Vl5klR0LkfxFDZgiLlC5s0+HKgA20gOiUc0QomJeh6OKfu8seKyj4PWrECNYB1oG7ill T6K6W4Pd98BfDYSDP56Hw5NjnThEvN3v0ZRU2jbbUJTykbXkeHcGKa/8M2NqLlSFuKBh uEclILdz8iprYBreqwep80iDldK9tGiY0XRHg0iicZV8CAqnnyoImkavDSAhLv+CNFIW q2XO+xLJrqYld7uyX8xyAFspthchij34gqoHUV08Prx4fJ9F7/Cgx7JN+upEPiMGH+87 X0Iw== X-Gm-Message-State: AJIora9538hwQ7+IROO0kFfYLpXJzIJykmwpWHjSSYYBs4UZc6J7zCJi 0C1a9AFXlw0ZhkU8VTNUf4LdKl4w X-Google-Smtp-Source: AGRyM1tNharPwSmHf4Bkd5pb52fE6TfRxE/Ht6iIjSh8E+zkfN4/T5bTk4F39WxLm/tEd6wmQk/jJg== X-Received: by 2002:a17:907:7638:b0:72d:f11b:5ebb with SMTP id jy24-20020a170907763800b0072df11b5ebbmr1976184ejc.647.1657732281560; Wed, 13 Jul 2022 10:11:21 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:907:9728:b0:72b:4fab:1c58 with SMTP id jg40-20020a170907972800b0072b4fab1c58ls923036ejc.3.gmail; Wed, 13 Jul 2022 10:11:20 -0700 (PDT) X-Received: by 2002:a17:906:9b09:b0:72b:9612:d373 with SMTP id eo9-20020a1709069b0900b0072b9612d373mr4344413ejc.606.1657732280207; Wed, 13 Jul 2022 10:11:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657732280; cv=none; d=google.com; s=arc-20160816; b=Xa+tqb09Pl/4lLXb3rDK6tZfaSt4U7m9vVYyXRv5JjVQQpgsDqvAxV9iW2AecrPwKJ 5NXK3GtyN422NzeHsKyPJIdhKEwLldaw02msCuZXOsZV5CLpop3jfTD7skiASnzFuBsD zMBDErojMATUMfgC2uihTmtn8C8KUvc6lw23VXiwlS0/8TGyjXOmwd9loHPuqGuwsZOJ OBukS52F3zQ4ZoCCyogVLeXaPbRUr2brHgVyuktkR8d6Fy69XxQ5batI9VdFrVZrzh3e rihhhSTuOQE7gU5EXKe2rU8JR00+7k6N1scC61TpR76NeDX9640RdbzkwMn1pIoklWGe LO/Q== 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:to:from:dkim-signature; bh=Gv8SBLd9l2dLRbvszGJpHjk1PR74fLOlZSaAeCY0NBQ=; b=kenvB8S0Xjakc+3iV9g6ZwpVRMYUj1xq0Z8PcnPlcFybGF2zqJLf4d1MSBouNpwFZO ppI7cF4TSEe3xRUmHX/t0NvdYVHYXTu5K7HY6rjL6gegndHjfW+MwHg3KUawHVcuzs3Y TXbYSqjYo648W/UgLCaCEIF9dWegix7KXB2By7pmGb+Jv4rAAvr+3PFGuOSoERkOdTFV fMW8OfBG4k35DSQ/dHeMzLr1YgMVaQhRAGuQnx+qHm1LvAatMB4SempHXRRmSwKy5p4v IfEEqzeDwDQPyXxNqOoCJcbQeWAyzPcjnpO8ThbMzFTymNcGh/ba3tN/6HPHqi25tlAN QDUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=qJH2TJ6a; 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 l17-20020a1709067d5100b00722e1ac3ee8sor4042835ejp.110.2022.07.13.10.11.20 for (Google Transport Security); Wed, 13 Jul 2022 10:11:20 -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:a17:907:7f9e:b0:72e:d375:431 with SMTP id qk30-20020a1709077f9e00b0072ed3750431mr606285ejc.580.1657732279274; Wed, 13 Jul 2022 10:11:19 -0700 (PDT) Received: from panicking.amarulasolutions.com ([2.198.242.86]) by smtp.gmail.com with ESMTPSA id lb16-20020a170907785000b0072b36cbcdaasm5218168ejc.92.2022.07.13.10.11.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 10:11:18 -0700 (PDT) From: Michael Trimarchi To: linux-amarula@amarulasolutions.com, Dario Binacchi , Tommaso Merciai Subject: [PATCH V3 2/4] mtd: nand: Store nand ID in struct nand_chip Date: Wed, 13 Jul 2022 19:11:09 +0200 Message-Id: <20220713171111.337338-2-michael@amarulasolutions.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220713171111.337338-1-michael@amarulasolutions.com> References: <20220713171111.337338-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=qJH2TJ6a; 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 9244287b10..6e964275e5 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -4152,16 +4152,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: @@ -4172,8 +4170,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; @@ -4206,7 +4204,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; @@ -4270,10 +4268,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; } @@ -4286,9 +4284,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; @@ -4303,11 +4301,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); } } @@ -4317,9 +4315,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)) @@ -4354,14 +4352,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); @@ -4387,7 +4385,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) @@ -4445,9 +4443,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; @@ -4475,9 +4475,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 */ @@ -4515,7 +4515,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;