From patchwork Thu Jul 14 14:02:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Trimarchi X-Patchwork-Id: 2163 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id E159D3F013 for ; Thu, 14 Jul 2022 16:02:41 +0200 (CEST) Received: by mail-wr1-f71.google.com with SMTP id k26-20020adfb35a000000b0021d6c3b9363sf577588wrd.1 for ; Thu, 14 Jul 2022 07:02:41 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1657807361; cv=pass; d=google.com; s=arc-20160816; b=DO9nPgLOPu/kFcO8G3LMiiybvjh7V9mMZcXNgQoax7lrzjIE/ehxymIGY3hdbQ53b5 mVDqiHYcq5DZy5xs7U3OGYqCN6sviDdDhiDH3X2VrEXI4UA79jitqi09N3U/w2ZdO0ea f3cRodeFT5elwh48wqVVBOR3f3M69NmbRQQjb6gSWtq+YUR3Iiq9eFSvzRAul4HFQnMD OvNr0qbwo2M4lD9iONOhkSYkXFi37NX+J2dfckFLHG/rLVe/XjttSWeUYmcB24fEdfmM Xjt+oHnrY2yO7vRjNz2tRRoCl49RHivtZAuSQPY7gR1wgFJUJgBNs0jxakMVRUnagBvJ SEeQ== 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=+jKhKJy2k3mldzHkeN3w5AI0zcNFlIr2NWHRBikgln8=; b=eeeNPVd6inuFrxdjtOr9EZXfVNQKpWP+ZI9d5asEaiYXHMoxx9mHASyR7mzJ183P61 EBzAB1g7puA5rggsAaKSB2L3XUsvT3RF4/TgvmPYb64dsS042Zx/1NuedF7dXg1MeKuZ 7g5PelvW4pqwPrSCRODjJizXWWR1RiVxf2RKP7eDvYnQ4INT+Q9h/hCZ3PmqiZDdkchh 3u1VPma439UJtu5cqdkwGxIdI0RDompWO1nve+70BVp5Be9NySfGA8KT6HHHUgqvgdbC 3w7J9qDf6u1VXjQHyAp3OzHbMD218eJ4Z07NTjXV0eh8CDXMU13IURA+qE7g5ueLMHQf Pj1A== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=cqpZMy+D; 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=+jKhKJy2k3mldzHkeN3w5AI0zcNFlIr2NWHRBikgln8=; b=E6/2v2WehPPgC2rv0yraMEOLUYWPqxqSL0QUdrWUIezAB2U30v7JqnyRZ2Y1BJMuWh hGYlUoFU0RuW65WzPKRrKXGm6ep0TV4bwmpsee8IbOtwcmAxD2AbwGcjcmoknqsw9UJ4 0kCakT3tfCEpP/VKKZgvXyxachC7fh2SMHOaw= 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=+jKhKJy2k3mldzHkeN3w5AI0zcNFlIr2NWHRBikgln8=; b=XAKPYUXCSU7dxdKQVHA9ihXpY4JbTrf4xt6ukxoOsr/D5hNqyOc6ZRwTbTdbwvrd+o iLaTV6Fh5lomEjydFliLTNiNH+dd7cT75810NarlDUoSu5Q6T/xEMhOsQtXLW/Tuib5P a4l39s90BWLCwp4QIbUdwUcS59GoPUtpAp6OJBDE+m4Pn5cjfvNDAY9wmK4PFiV6wJrS 1mmPX6QngdU6NH679ENAmW9NNtHA1bsiu9PSFlJng8vrXBLYUiIhDe17jl1I/sCprCMk HH31puwhR3mDOxbeG5g86tfYUqQUzRLOVIHBk2nKeW8CLEtIFBYXsRQA3UqDNIHgSli3 IYng== X-Gm-Message-State: AJIora+w+rPvGlj5OGMBZVPOUYmoz8DmZugaA9aSofeTqwGykRUrUv5/ GQz5F2NpjP/tJEZfHxky586n6azF X-Google-Smtp-Source: AGRyM1tp2LU7X9ejeUidRpjZlhtQmcLumYeTGe0cNCYsjBgUbqmlAxPPwkGmSyD2IdZRNxQOKL/HaQ== X-Received: by 2002:a05:600c:3845:b0:3a2:c04d:5ff9 with SMTP id s5-20020a05600c384500b003a2c04d5ff9mr15629755wmr.74.1657807361644; Thu, 14 Jul 2022 07:02:41 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a5d:64af:0:b0:21d:bf45:f904 with SMTP id m15-20020a5d64af000000b0021dbf45f904ls111714wrp.3.gmail; Thu, 14 Jul 2022 07:02:40 -0700 (PDT) X-Received: by 2002:a5d:6f11:0:b0:21d:7f60:e5a3 with SMTP id ay17-20020a5d6f11000000b0021d7f60e5a3mr8479568wrb.8.1657807360382; Thu, 14 Jul 2022 07:02:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657807360; cv=none; d=google.com; s=arc-20160816; b=Q/b6DTQ/2eZD0hN7BXesiBnMRl1eRaUSVPAWWN32s+zDzYhZiqYL/Kl/qNUDN7uRE8 g55MNUbncV/z11pFI4G5xLz7tRYX1w+k7mLw9dX37rPCod6lp5/yGgLH5KiPY5n48bgt XLXQ7BB+dggLnO4ojNQG8v5itNsXluHEyIMBRJZ9yf7KPnFAeoEh6Nkbmr/5axgSdAcv UTkQYXdD/1HP8o94oEZFueNsnF9BkngGqYf1Nnw6UOjVzWu4u2EfFNKcAtK031+H6QcH oIEHhUQrG9FcJnVvtzl3IM3b/ep7lB2c3EwYEjbG3Fa7dXdRIkqs3D4HzhNfm+DU+hc2 cWOA== 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=KoBfOtZSuWjXMH5ooKp+4pUgGAdKWVS7+4lORZDN2pg=; b=PMmw/UGEbz0XkEnCV3yjyYbfuUo5O9r5IUYsLGT9xdWXYh9Qh6149nzWonSMYlOQ+d Ewz4EPPv26VlWFzfyqny47AcY8MXCHhyqaRFvhJi5K+fR3zyUQj3kEqpnHsgRp0RIXzE o6Csujidnd2Fijkw3zZeSXYIxP80xCJq5LCjhrR1cjeforb7sgsDeapS4YWZ9aCRULE+ 93wDkNKMYaqXUtBFPDRa+k/2pcX2gGiQ+KzQkTmjsPZIZ7JZsSky9s15SAOx2nSbdiTi 0TXWOTJMAHmwBKF2KypdKM9ingKrHXaxxdgx5hZV/fNkOE/pr9cNs6pJJfZzSEZ5UMYy 6tJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=cqpZMy+D; 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 m18-20020adfc592000000b0021bbf881c9fsor812138wrg.30.2022.07.14.07.02.40 for (Google Transport Security); Thu, 14 Jul 2022 07:02:40 -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:a5d:474f:0:b0:21d:9a9b:a1fb with SMTP id o15-20020a5d474f000000b0021d9a9ba1fbmr8783146wrs.115.1657807359651; Thu, 14 Jul 2022 07:02:39 -0700 (PDT) Received: from panicking.. ([2.198.242.86]) by smtp.gmail.com with ESMTPSA id k11-20020a7bc40b000000b0039c5cecf206sm2029114wmi.4.2022.07.14.07.02.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jul 2022 07:02:39 -0700 (PDT) From: Michael Trimarchi To: linux-amarula@amarulasolutions.com, Dario Binacchi , Tommaso Merciai Subject: [PATCH 09/11] mtd: nand: Move Micron specific init logic in nand_micron.c Date: Thu, 14 Jul 2022 16:02:13 +0200 Message-Id: <20220714140215.444993-10-michael@amarulasolutions.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220714140215.444993-1-michael@amarulasolutions.com> References: <20220714140215.444993-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=cqpZMy+D; 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 10d4e75c36f6c16311dde1461f318210da357219 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: Boris Brezillon Acked-by: Richard Weinberger Signed-off-by: Michael Trimarchi --- 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 | 88 ++++++++++++++++++++++++++++++ include/linux/mtd/rawnand.h | 21 +------ 5 files changed, 94 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 db608a2830..e8fb451076 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 8c06b1c530..d2079c73fb 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 @@ -4273,10 +4246,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 509652c8e2..bb5ac8337f 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 0000000000..a99bf8bbec --- /dev/null +++ b/drivers/mtd/nand/raw/nand_micron.c @@ -0,0 +1,88 @@ +/* + * 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 +#include +#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 73abb34016..ec0f77b24b 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);