From patchwork Wed Jul 20 16:22:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 2210 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 6A5543F046 for ; Wed, 20 Jul 2022 18:22:55 +0200 (CEST) Received: by mail-ed1-f69.google.com with SMTP id l16-20020a056402255000b0043bbb1e39c3sf959078edb.11 for ; Wed, 20 Jul 2022 09:22:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1658334175; cv=pass; d=google.com; s=arc-20160816; b=CtY0cDX0NSLOoVjfB0bDYO0CCZqt89L38c2Zu8Whh096hVzki0IQormCR1ds3Lp3oE eByUjEqp+Z2NybuQnJcHERKtV5XhZZF0kypm8MszaO1FOlRJfJ3Z9figPAemfUCsZiQh Q3DCE5oH3kLM7T0o/B0z8jT0CnQlS5ysoy3FV7NqAoO/uket7FkZPBc2M8GslIbnuAhr WELoofBQ5n+cvGu1I9HHY7wtlFw67oe/hvsJw6fhHRdntAxm5qh4Ry8NYBLJBEPMOGNO ognwnI8cJkBlzN1dGy/p9a10g0Y/b4ltO9DZaLoKYq5qYIwRsFpcNPUB5RHpqSecEPEW CATA== 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=gf8yi+A3ByNhda9glCBbh9803s0KyqAl2fy635viMnk=; b=VJP6zBBm/fwZuZ3BttdGSaG0cQX8DfY370+jpHUQ/fJzrf2b/LzZCbElKoc6OkiRml VMB3LGE7lKK+kbHKJVhF/Bos+YYUBfqIYmhPH2D5gVIw7PlEY4OdSEFVLhbMrBBymUEb 3DUVFgRas4Ahbu7lXulwc+4c+wVcv05n5wy7rCQ57d8pKhDJVy+c5zFt5qNwLEQiUDhX X3jH2fc5aiR9gpmunXkZlePLjXUyfiUW1kCJSLf/IRFFRjH0OH6uMk/yiS5pRdHAOsM+ LVjsG4FMEJAqS0qaMM1WDYgzRlfdl8m/Vs+7huOnvQstyr94uD80huXwohYmb12RbaIt NnWw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ElInlVNx; 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=gf8yi+A3ByNhda9glCBbh9803s0KyqAl2fy635viMnk=; b=jnp2rciMb6nwiGY06C1WJhmk/3xuGCK8bE17g7fxFScGl+fyfItBwy/0Lnpj1ESCVQ 6/MLnafLL3EEmh6/hjNtQ0HadTcldbn3lPECsWd84rINogQbOr3MceF6FCP33aUR77oY KMGvrTG3W7Qs7lUfleY2t+Iyu5wTeIZDJLEio= 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=gf8yi+A3ByNhda9glCBbh9803s0KyqAl2fy635viMnk=; b=o3BaJ36bgEN9Qk+S1847TcjiPXdtVS9qEPcebxqhU1mJ2m9EyRa/TrCCFLuosSucMP 1TL6K4H3rXyCaMee9kiKgCFmOIdmZLoH+7x8FzdphjdcQUCqoOUEUZPfvz0sA1dM54NZ Q4eSQ5V5zkbAtQDP5w+V5hV4QL8LMuvnYA2XA5X7z4S2z38j+Bt/2yMuupCTQk4KX9Iv CHukTGWhnjBQMzpGFsbpf3aBu0oGraSsZAIvTeLR/+nItBbphVdkJqr5bxRvWSIjrmUK ZSn4+w8E/D+vLywiFbgBlIiEm33NIdIXXaZwWziOFdeH1EwoTWeo0DHHvISVmuNPvG8B ZH6w== X-Gm-Message-State: AJIora+UQKrCgQe4JRHOPGSCaFgOxWjV+VEYB3i52XmxdI7iXaVPerhM 8Nfw8RM5w1KAUW0/CFC4ir/NCOhn X-Google-Smtp-Source: AGRyM1vza92/sdO/bhFqACA8TK0S1dzjybOS5u924XhWblLQ1E4jWGMiiRVeLCDD/MAp3Fba/obW9w== X-Received: by 2002:a05:6402:1d51:b0:41f:cf6c:35a5 with SMTP id dz17-20020a0564021d5100b0041fcf6c35a5mr53061161edb.25.1658334175312; Wed, 20 Jul 2022 09:22:55 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:906:7082:b0:6fe:b664:4b5f with SMTP id b2-20020a170906708200b006feb6644b5fls376004ejk.2.-pod-prod-gmail; Wed, 20 Jul 2022 09:22:54 -0700 (PDT) X-Received: by 2002:a17:907:67b0:b0:72f:84c2:fa96 with SMTP id qu48-20020a17090767b000b0072f84c2fa96mr1305480ejc.133.1658334174147; Wed, 20 Jul 2022 09:22:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658334174; cv=none; d=google.com; s=arc-20160816; b=u4iOTPXLjRRSvRSZ4KyiYRVTBS3tvT646aXYDZZppsgZtqkKbDhQtC4KBsMgEYdSLO jjOVR4Pf1uaEK18Wl5uyUTjTJTuXjB9vAhs94p2mEuPEZasOiWbuxDJhkOw/LzFhc+m/ dsuK7WMTXz8zUfK8xSOyDjvtu2B+STtU1ysmFNjgmvlutWE8AZ9a+Hmery7LQ1/C8DUL Qc1ebWRldBOCiSR07S+Q0xdLOqs7Bwp12/tvDwIHhLxNG+QSJA2+nLxvCKzY1fpbP6pk oI2dSR7SSVmi4R4I5i+UE2UpRdyC8LrBkbiv4jSNkvfLz3AigjfcX0YPONPnnRKJL67c 9Mdw== 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=60G2gAXdyvXVp1G8eokKbB/NS8ffGuQU42nXwBlFMIs=; b=G0tLIUa2ZEJRqc/y1ry35M7SPfNK434+Q1GiC9MXJaF+oNiazjV8SBqC0nYHwQVVg6 JHN5fAKDgctptNAaJKUs/MQ30ESXZ5zjs7MPviwD7TW0sr5vXMBUZFNh+Vn+EOh4ysSb 5nPsTMfXPzSaCPV/pfn01aDQ8KnGVsPiqvAqdb2uXZAv6xJNOUAruXlraWNQ+/z1aJj9 RxlC7FIpfU9rxojS2zjCNMet+eTQSgpXq21Ikl6ezldy4Q/stq9++VBjwZb8fVH+KRvW /8tAES6CKB+ugkisHskSHTHF2c7kP1D6eGfQZ8OLm6Oxo6dC9++XuZbVe+zfA+Ld25fc 2mTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ElInlVNx; 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 qw30-20020a1709066a1e00b006d0a2bf88a6sor6165951ejc.18.2022.07.20.09.22.54 for (Google Transport Security); Wed, 20 Jul 2022 09:22:54 -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:a17:907:6d01:b0:72f:53f:7a25 with SMTP id sa1-20020a1709076d0100b0072f053f7a25mr23740879ejc.126.1658334173865; Wed, 20 Jul 2022 09:22:53 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jul 2022 09:22:53 -0700 (PDT) From: Dario Binacchi To: michael@amarulasolutions.com Cc: Amarula patchwork , Dario Binacchi Subject: [PATCH v3 09/13] mtd: nand: Move Micron specific init logic in nand_micron.c Date: Wed, 20 Jul 2022 18:22:12 +0200 Message-Id: <20220720162216.2397616-9-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=ElInlVNx; 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 10d4e75c36f6c1. Move Micron specific initialization logic into nand_micron.c. This is part of the "separate vendor specific code from core" cleanup process. Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- Changes in v3: - Use commit sha1 with 13 digits. - Add the SPDX-License-Identifier tag. - 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. - Adjust the include file in nand_micron. drivers/mtd/nand/raw/Makefile | 3 +- drivers/mtd/nand/raw/nand_base.c | 33 +----------- drivers/mtd/nand/raw/nand_ids.c | 2 +- drivers/mtd/nand/raw/nand_micron.c | 87 ++++++++++++++++++++++++++++++ include/linux/mtd/rawnand.h | 21 +------- 5 files changed, 93 insertions(+), 53 deletions(-) create mode 100644 drivers/mtd/nand/raw/nand_micron.c diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile index 16e0775395a2..8ef30b45fd2d 100644 --- a/drivers/mtd/nand/raw/Makefile +++ b/drivers/mtd/nand/raw/Makefile @@ -14,7 +14,7 @@ obj-$(CONFIG_SPL_NAND_DENALI) += denali_spl.o obj-$(CONFIG_SPL_NAND_SIMPLE) += nand_spl_simple.o obj-$(CONFIG_SPL_NAND_LOAD) += nand_spl_load.o obj-$(CONFIG_SPL_NAND_ECC) += nand_ecc.o -obj-$(CONFIG_SPL_NAND_BASE) += nand_base.o nand_hynix.o nand_samsung.o nand_toshiba.o +obj-$(CONFIG_SPL_NAND_BASE) += nand_base.o nand_hynix.o nand_micron.o nand_samsung.o nand_toshiba.o obj-$(CONFIG_SPL_NAND_IDENT) += nand_ids.o nand_timings.o obj-$(CONFIG_TPL_NAND_INIT) += nand.o ifeq ($(CONFIG_SPL_ENV_SUPPORT),y) @@ -32,6 +32,7 @@ obj-y += nand_util.o obj-y += nand_ecc.o obj-y += nand_base.o obj-y += nand_hynix.o +obj-y += nand_micron.o obj-y += nand_samsung.o obj-y += nand_toshiba.o obj-y += nand_timings.o diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 4ea7f10a06fc..fe7e049d4064 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -3871,30 +3871,6 @@ ext_out: return ret; } -static int nand_setup_read_retry_micron(struct mtd_info *mtd, int retry_mode) -{ - struct nand_chip *chip = mtd_to_nand(mtd); - uint8_t feature[ONFI_SUBFEATURE_PARAM_LEN] = {retry_mode}; - - return chip->onfi_set_features(mtd, chip, ONFI_FEATURE_ADDR_READ_RETRY, - feature); -} - -/* - * Configure chip properties from Micron vendor-specific ONFI table - */ -static void nand_onfi_detect_micron(struct nand_chip *chip, - struct nand_onfi_params *p) -{ - struct nand_onfi_vendor_micron *micron = (void *)p->vendor; - - if (le16_to_cpu(p->vendor_revision) < 1) - return; - - chip->read_retries = micron->read_retry_options; - chip->setup_read_retry = nand_setup_read_retry_micron; -} - /* * Check if the NAND chip is ONFI compliant, returns 1 if it is, 0 otherwise. */ @@ -3994,9 +3970,6 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip) pr_warn("Could not retrieve ONFI ECC requirements\n"); } - if (p->jedec_id == NAND_MFR_MICRON) - nand_onfi_detect_micron(chip, p); - return 1; } #else @@ -4272,10 +4245,8 @@ static void nand_decode_bbm_options(struct mtd_info *mtd, * Micron devices with 2KiB pages and on SLC Samsung, Hynix, Toshiba, * AMD/Spansion, and Macronix. All others scan only the first page. */ - if ((nand_is_slc(chip) && - (maf_id == NAND_MFR_AMD || - maf_id == NAND_MFR_MACRONIX)) || - (mtd->writesize == 2048 && maf_id == NAND_MFR_MICRON)) + if (nand_is_slc(chip) && + (maf_id == NAND_MFR_AMD || maf_id == NAND_MFR_MACRONIX)) chip->bbt_options |= NAND_BBT_SCAN2NDPAGE; } diff --git a/drivers/mtd/nand/raw/nand_ids.c b/drivers/mtd/nand/raw/nand_ids.c index 509652c8e26c..bb5ac8337fde 100644 --- a/drivers/mtd/nand/raw/nand_ids.c +++ b/drivers/mtd/nand/raw/nand_ids.c @@ -195,7 +195,7 @@ struct nand_manufacturers nand_manuf_ids[] = { {NAND_MFR_RENESAS, "Renesas"}, {NAND_MFR_STMICRO, "ST Micro"}, {NAND_MFR_HYNIX, "Hynix", &hynix_nand_manuf_ops}, - {NAND_MFR_MICRON, "Micron"}, + {NAND_MFR_MICRON, "Micron", µn_nand_manuf_ops}, {NAND_MFR_AMD, "AMD/Spansion"}, {NAND_MFR_MACRONIX, "Macronix"}, {NAND_MFR_EON, "Eon"}, diff --git a/drivers/mtd/nand/raw/nand_micron.c b/drivers/mtd/nand/raw/nand_micron.c new file mode 100644 index 000000000000..8b31c6198134 --- /dev/null +++ b/drivers/mtd/nand/raw/nand_micron.c @@ -0,0 +1,87 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2017 Free Electrons + * Copyright (C) 2017 NextThing Co + * + * Author: Boris Brezillon + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include + +struct nand_onfi_vendor_micron { + u8 two_plane_read; + u8 read_cache; + u8 read_unique_id; + u8 dq_imped; + u8 dq_imped_num_settings; + u8 dq_imped_feat_addr; + u8 rb_pulldown_strength; + u8 rb_pulldown_strength_feat_addr; + u8 rb_pulldown_strength_num_settings; + u8 otp_mode; + u8 otp_page_start; + u8 otp_data_prot_addr; + u8 otp_num_pages; + u8 otp_feat_addr; + u8 read_retry_options; + u8 reserved[72]; + u8 param_revision; +} __packed; + +static int micron_nand_setup_read_retry(struct mtd_info *mtd, int retry_mode) +{ + struct nand_chip *chip = mtd_to_nand(mtd); + u8 feature[ONFI_SUBFEATURE_PARAM_LEN] = {retry_mode}; + + return chip->onfi_set_features(mtd, chip, ONFI_FEATURE_ADDR_READ_RETRY, + feature); +} + +/* + * Configure chip properties from Micron vendor-specific ONFI table + */ +static int micron_nand_onfi_init(struct nand_chip *chip) +{ + struct nand_onfi_params *p = &chip->onfi_params; + struct nand_onfi_vendor_micron *micron = (void *)p->vendor; + + if (!chip->onfi_version) + return 0; + + if (le16_to_cpu(p->vendor_revision) < 1) + return 0; + + chip->read_retries = micron->read_retry_options; + chip->setup_read_retry = micron_nand_setup_read_retry; + + return 0; +} + +static int micron_nand_init(struct nand_chip *chip) +{ + struct mtd_info *mtd = nand_to_mtd(chip); + int ret; + + ret = micron_nand_onfi_init(chip); + if (ret) + return ret; + + if (mtd->writesize == 2048) + chip->bbt_options |= NAND_BBT_SCAN2NDPAGE; + + return 0; +} + +const struct nand_manufacturer_ops micron_nand_manuf_ops = { + .init = micron_nand_init, +}; diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index 73abb3401649..ec0f77b24bd6 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -388,26 +388,6 @@ struct onfi_ext_param_page { */ } __packed; -struct nand_onfi_vendor_micron { - u8 two_plane_read; - u8 read_cache; - u8 read_unique_id; - u8 dq_imped; - u8 dq_imped_num_settings; - u8 dq_imped_feat_addr; - u8 rb_pulldown_strength; - u8 rb_pulldown_strength_feat_addr; - u8 rb_pulldown_strength_num_settings; - u8 otp_mode; - u8 otp_page_start; - u8 otp_data_prot_addr; - u8 otp_num_pages; - u8 otp_feat_addr; - u8 read_retry_options; - u8 reserved[72]; - u8 param_revision; -} __packed; - struct jedec_ecc_info { u8 ecc_bits; u8 codeword_size; @@ -1161,6 +1141,7 @@ extern struct nand_manufacturers nand_manuf_ids[]; extern const struct nand_manufacturer_ops toshiba_nand_manuf_ops; extern const struct nand_manufacturer_ops samsung_nand_manuf_ops; extern const struct nand_manufacturer_ops hynix_nand_manuf_ops; +extern const struct nand_manufacturer_ops micron_nand_manuf_ops; int nand_default_bbt(struct mtd_info *mtd); int nand_markbad_bbt(struct mtd_info *mtd, loff_t offs);