From patchwork Wed Jul 20 16:22:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 2203 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 231423F046 for ; Wed, 20 Jul 2022 18:22:32 +0200 (CEST) Received: by mail-ed1-f72.google.com with SMTP id x21-20020a05640226d500b0043abb7ac086sf12380302edd.14 for ; Wed, 20 Jul 2022 09:22:32 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1658334152; cv=pass; d=google.com; s=arc-20160816; b=kN/L6dkIwZkMbsZgwx9pbI/Xw39K2MTpPnW6AIaS1VuIxDVN6OnvpYHQ5NRELZJKSL xYoXaRVF8cvD14Ac9Rn/FDc4M0wy3cC7mSU4QsfWpnWr5GSwFsQh1OAjI9yE4pkbLmeW G/8mMW2QtGtwBm8uSw7IWvjy4Q6LiEhQi2kMXfKqIt3pMtH0tESo0QWBjy2maO/+yp5D ero3GtH9jA34nJbHcrluAoO034puSUBt80h6ncG4sS+24pyqrd8gCU1uxtHJ5bNMlB25 KlvciWosrq5zmcFFWNbGoGv/q/OEpQxyYlfYQNlE9YHupmPiIRuqEfKRYzjlQQL94ppc CvSw== 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=2WNAcEUUoJze4mzfnXy11tgihs+EpuTieRVh5uKngWk=; b=cRyJl1ASyGeO1XrV4gMItxY/IqupRO8MPwv1CTDcvrR1+y+t+426p+6kaPbC7xMHHk JAin6mv5xK2ABj1QSIpxhjCyqic+gOeZ2xBNRya/si7+Fkey9tus3feOYNMjkVXUfyxB ArBwivTe8EYZkVeuUc89QEYsJbsGzbFLRtZBy0EWO/MpRkwAYEtviK3XcRKXkQ+1wzFJ pXMOi+IytN1tUoEUaNWBklBQ+zkVxvUVMJ3rrGPKOhBbDi8H01JEbFwgy7g/RPFrMfP7 77Jv09yN5EmygOScFb7QUYsPLFC0Mvs95Ky4OhWvRG9q+OUsbkdJdPWiKViOdfvPXKW0 eQSg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=DkUoXrQB; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@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=2WNAcEUUoJze4mzfnXy11tgihs+EpuTieRVh5uKngWk=; b=ZPtiGFoB8M+VXHnfwUq3qsNB0caDrNT20agnBNf5RaMDp5i4RWiLSrPxorFcz5MHFQ SCC8QmfV5gWTeNlf/cHc7C5ggsNpMr3Xiky8xtbJ6VKzT7EXeeTvnn9T7XQhDU5FgT6g 9cFpPX3uJo1bYNjiysO9MAyfbKDmm0ADAjaRk= 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=2WNAcEUUoJze4mzfnXy11tgihs+EpuTieRVh5uKngWk=; b=ZrOrnQTIKO0fzP6rNgF3Ij8Upj6yFyrwhcgz37FxpDjh6VOEjBwUQ64eC3KYGf0Oa6 NoAtU58p+lQKvOGZqcpY0HDdyGcG32QPajHdFlS0JT3PatDnAsaWvVKRfNdM6uvvSbgM kU/5g+lWovNUIFAyFyxoImprx/8t932poMbGmhadah5cngtWXqcJDPWOT1PZJJNaIMgh ChmQYfrob5TLEUCRXj0OZuAzNFls+u0a+qWx/DXQbpRk2NDiP/G5BiVi3coj6YlnBbQU CSV6IYwI6W8v+O1DN16fW3wV5UzWkauxmJxc6P+fps4nO0LXLvDhx8hpV2S+X65iaYUT oKQg== X-Gm-Message-State: AJIora/dqjwt2Jiq3tGcKuw84MDsFayvRz1Ww17rC/8MjlsQPeO282u0 we0VlypSpcY4gaw5/UFpBDjJkkb9 X-Google-Smtp-Source: AGRyM1vf8cqcfVT8WYxBaV1FpuBE0ZHj0C7l47cHX64ra8Am8PPs2cW59XYMfU3xN0GiX9WHGTG3vA== X-Received: by 2002:a05:6402:1350:b0:43b:a40f:3b66 with SMTP id y16-20020a056402135000b0043ba40f3b66mr9442989edw.173.1658334151764; Wed, 20 Jul 2022 09:22:31 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:906:4889:b0:726:abf9:5f2e with SMTP id v9-20020a170906488900b00726abf95f2els376963ejq.9.-pod-prod-gmail; Wed, 20 Jul 2022 09:22:30 -0700 (PDT) X-Received: by 2002:a17:907:971c:b0:72b:83d2:aa7a with SMTP id jg28-20020a170907971c00b0072b83d2aa7amr36869159ejc.633.1658334150605; Wed, 20 Jul 2022 09:22:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658334150; cv=none; d=google.com; s=arc-20160816; b=ZP95Xt0FRSVs3mXPzwpHU4aAhzeOkjC3o75DjjxyJDvJWCFnltNteqmtZPCmbuGmeb /cvvcUXGqC0HEoQcdROQ0H825q1C2/DhTwRfDkVeUvhi09Sij7VcP0NASrURzYK4LzQK BK+bUzFoAOJB5OFaYE+1nPNccWJ2ic6O1T5y/U9f7thQfV407w40II/MOPLYQkIe0A2U BXN4rxwnjiLiejAoqOTguDdotU8SP13hTUPP/fxBWdH08RB7cZ940qj1a3wsusX5lVaT ioY5TyKwTFBcH4fwL5UjEkIYHQyBFhXuHNcWQ8+Fhmrstp/cYzlSmEocsc0qTs6MXLJC NPIg== 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=xd8eUKK9iYAZXNsfE7I8BnNoJPlhH4IJYqhYXjF2Fiw=; b=pFgd9B0zHgmfexH26+UEfpf6dBdXcsYm5IYzBTjnA7FOPjRQk5oaAeDDIkcO8RKEqN zX5z+B442CdPuxt3vai6X62wgH4WlvGlfSzyjMDt3qBftw5t+QrWtvAmn5vNCUJggMet ODd8n53pTd+IEli0O3aHBFBolil2ps7AuSIsRJ5MKYU5LV42ApL5cOVKzXN64/AqtJxG lOv4wFMAh1EBeXWFcnZOAJVJdpGbvcKFnqnn3glMTsvF2xJWFw5sMHfQdujf6sFbU1Ot 6FGYnr8KUw7WhV/+SoYz4LbMCNW0fITl+CLIu3XTueeL6ATiirvPDMAoQov7jHH6WmMT iXYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=DkUoXrQB; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@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 11-20020a508e0b000000b004357254db69sor9002241edw.13.2022.07.20.09.22.30 for (Google Transport Security); Wed, 20 Jul 2022 09:22:30 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:a05:6402:2425:b0:43b:20a8:ae8b with SMTP id t37-20020a056402242500b0043b20a8ae8bmr44502029eda.234.1658334150298; Wed, 20 Jul 2022 09:22:30 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.pdxnet.pdxeng.ch (host-87-14-98-67.retail.telecomitalia.it. [87.14.98.67]) by smtp.gmail.com with ESMTPSA id jl10-20020a17090775ca00b0072ed9efc9dfsm8057839ejc.48.2022.07.20.09.22.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jul 2022 09:22:29 -0700 (PDT) From: Dario Binacchi To: michael@amarulasolutions.com Cc: Amarula patchwork , Dario Binacchi Subject: [PATCH v3 02/13] mtd: nand: Store nand ID in struct nand_chip Date: Wed, 20 Jul 2022 18:22:05 +0200 Message-Id: <20220720162216.2397616-2-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220720162216.2397616-1-dario.binacchi@amarulasolutions.com> References: <20220720162216.2397616-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=DkUoXrQB; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@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: , From: Michael Trimarchi Upstream linux commit 7f501f0a72036d. Store the NAND ID in struct nand_chip to avoid passing id_data and id_len as function parameters. Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- Changes in v3: - Use commit sha1 with 13 digits. - Fix code style warnings raised by patman. Changes in v2: - Use short-commit form. - Remove linux info. Uboot seems that backport without add this extra information. drivers/mtd/nand/raw/nand_base.c | 58 ++++++++++++++++---------------- include/linux/mtd/rawnand.h | 15 +++++++++ 2 files changed, 44 insertions(+), 29 deletions(-) diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 9a2194ebd3f8..220804c75c87 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 && - nand_is_slc(chip) && - (id_data[5] & 0x7) == 0x6 /* 24nm */ && - !(id_data[4] & 0x80) /* !BENAND */) { + if (id_len >= 6 && chip->id.data[0] == NAND_MFR_TOSHIBA && + nand_is_slc(chip) && + (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 - && mtd->writesize == 512) { + 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 3417ca2a0d2e..f2c6a978cbf8 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;