From patchwork Thu Jul 14 14:35:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Trimarchi X-Patchwork-Id: 2175 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 247563F066 for ; Thu, 14 Jul 2022 16:36:19 +0200 (CEST) Received: by mail-wr1-f72.google.com with SMTP id l11-20020adfbd8b000000b0021d754b84c5sf603340wrh.17 for ; Thu, 14 Jul 2022 07:36:19 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1657809379; cv=pass; d=google.com; s=arc-20160816; b=thy2HCs3PFWsUCdHznRxm7s4d6iNCcxZGFI2BGrT2B6+N115pPgO695mZHieb48i0h txJme0lDqVoozCEblx30yxFfJtPDvUHBeGsm8gRmCJjdd+aUBWY4CXC+AlrvCWZxC3S7 cl8PMHxRcQ+pHjZudVJnPJDA6zguf1oAIddkIQa/Aty4rSUB//MhAQcO5o5k/6cA2DnS x9RP9ejoCcJObUfeLBQfKCwDMyDf7xZtdmdUqntg5I2GDifOntxfqBAFO2Ak6RtYiw/3 TokY9GHecnsMRQzlKKQaCCeMKQBVJ2v/gX8wwg97w2/PrA6acpNlzovTbUjW2MPIlzEk Vmqg== 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=+jKhKJy2k3mldzHkeN3w5AI0zcNFlIr2NWHRBikgln8=; b=tN3UzP9v2hYi0P/hiiAdI2CEcv6txuaEYsxuVbEQUP5St9jLn4CHLHe4E6U/TvDPvc /7fhxYYqY3ecER/tAJLBkJJ7c+rufzba96iDDakPe5b9elfnDJT861eS2+yA1KF3fU15 +OjrmGXaFiCpXMnSXvOOdWGi1k8qxbBuAnycEtk6UQ7uVDXWvtFuHXKJ0lD3RRs2Rxxf OSomx7wIsb3aXRqFcPHZAbmDqHfFL/7MaXZJ81qgAHqojjP3JK6w3kqZOSYFmn+CGlNN Q2M2LJKSfbmc9e8nlW+/0TF3TJY5AEEPRYvP+5giMPcWdXaT4778rWM8EXX+1VQlkBgb nAbQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=QH+2Vn4J; 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=+jKhKJy2k3mldzHkeN3w5AI0zcNFlIr2NWHRBikgln8=; b=cz6SL8WNh0tc8T+P2Cnaj3dPllMJ2SuWQ5ZwDSOJsfm6GTkaHMk5Nq+LqtmHyrSnfJ BPy0t8YQV2sN/vfGLvFkGB5rcDEASMYzPQ4vLpYh23GWDjXwRgwp8q+zGOn0dtGxgGmg sbvKrZUJOM7UXA4GPJey1fP5nxmZKBgbLYMGY= 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=+jKhKJy2k3mldzHkeN3w5AI0zcNFlIr2NWHRBikgln8=; b=RzgA6rp15ay/t4SRS7OLxYqz75ahld67katxx7JcMmHeaymn0Yl8YTNkIdogiiatxC hnKv4AsScvnbpb8OUyeHFt3IRKxtE5eK6RAbOuYRrsEaaUbgWo4BgvneC/M1jfkl5DuS Apgspox64uSgUJQxqrSWJ/nuTx39ZMCG+55R4/LD1BEDHokYmOD7t+nz/R6YVhCwQHgB A2+oZoWau6M9VCLuO0jLsCeIZkuv7nEYVj2genezokXi8bFREMWKMS9bFVCehs8VAjnO I8NZgMlJ18E7G5VCJVP4yx4JfAdFAZL5CJS4A+meWsjowY8WvuyrpzEkjxhWra8KqByw MPvg== X-Gm-Message-State: AJIora8fxa9OePiQHY1SNWW3127fidOxL4bA79N+1wIoPgTfsgtxTgp/ 8fhVhJZw7KBFUAI8ir6u6wSjGfmL X-Google-Smtp-Source: AGRyM1tsApTMUCczqZQgo+PnZcEMlJYh5fFyfuIzCO+ZEEDjLCTWQIg1Yd82xZlc3qmKFo522y0/+w== X-Received: by 2002:a5d:4cce:0:b0:21d:755b:d4f8 with SMTP id c14-20020a5d4cce000000b0021d755bd4f8mr9098297wrt.190.1657809378923; Thu, 14 Jul 2022 07:36:18 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a5d:588d:0:b0:21d:339f:dc1 with SMTP id n13-20020a5d588d000000b0021d339f0dc1ls243458wrf.0.gmail; Thu, 14 Jul 2022 07:36:17 -0700 (PDT) X-Received: by 2002:adf:e104:0:b0:21b:9938:b07a with SMTP id t4-20020adfe104000000b0021b9938b07amr8637920wrz.682.1657809377683; Thu, 14 Jul 2022 07:36:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657809377; cv=none; d=google.com; s=arc-20160816; b=iaqbePM8REvjbSz1R7xh8hs0pQ2dWnjAGes23kx/ZEPojfHP0eoxqweu39PV9IEoMu WWUG+fDEvYiEeLSyWKFNf/QF1XqjxvCKjxx211aZcgBjDqKt5fcjuNrJ+6nyyD3cJv8n ASfaSc2tn8fkO33fvcdFQNhPKEvfkZZaCRXA6r4vfzlg0p1TWq9Mq2vAzGMQ9825cVOi yuyhc5XCLapyhruHgyT6gTP8KXynrEmjPAvWJ9m2juCTYlMY0kHvGBYIfjNuAlaLrz6G 8l7hS6IyDe4OBYJN9Ah6RR+7sG1/QaXWkeLsj6Fitl75UcN1/u38Xhfev3+Mus375PCR 2EYQ== 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=KoBfOtZSuWjXMH5ooKp+4pUgGAdKWVS7+4lORZDN2pg=; b=Bc7DRbyo32ytMuoJdj49qCt+LJx7jNhAPtEpy4u4Gwds+DBvLX8rHL0Kq/Pd+xGm1Q vgnPicVi/XWWeMSDwmMi1uu80Bi1WJ0MKJkPql2vYI5AU7/5KoZsgcpXWEsGBJettm7X q88nd2agf8g4K2dOvF1if5XXjEH0uef8DtgXBpfsH3TZ3Xmv07+kKCXMTC3u/8UxxuMJ wd/cYZ5kddbNloxiLp4n5JAkCejmsJ/bKkSa8xu4e8PrfpTn+QIkH9kCm3yf+U15F5G7 v6OI03ofeC5sg7nQuT8NcdpB9NAVMNlKkwz54orn9E2zXNsvYC2V+OiQbSaajjIst7DY NZYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=QH+2Vn4J; 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 o5-20020a5d6485000000b0021d7ecd0e3csor853659wri.37.2022.07.14.07.36.17 for (Google Transport Security); Thu, 14 Jul 2022 07:36:17 -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:e483:0:b0:21d:a52e:261d with SMTP id i3-20020adfe483000000b0021da52e261dmr8264973wrm.228.1657809376963; Thu, 14 Jul 2022 07:36:16 -0700 (PDT) Received: from panicking.. ([2.198.242.86]) by smtp.gmail.com with ESMTPSA id u18-20020a05600c19d200b003973c54bd69sm5712357wmq.1.2022.07.14.07.36.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jul 2022 07:36:16 -0700 (PDT) From: Michael Trimarchi To: linux-amarula@amarulasolutions.com, Dario Binacchi , Tommaso Merciai , Boris Brezillon , Richard Weinberger , Patrice Chotard , Wolfgang Denk , u-boot@lists.denx.de (open list) Cc: Boris Brezillon , Simon Glass , u-boot@lists.denx.de (open list) Subject: [PATCH 09/11] mtd: nand: Move Micron specific init logic in nand_micron.c Date: Thu, 14 Jul 2022 16:35:41 +0200 Message-Id: <20220714143543.448991-10-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=QH+2Vn4J; 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);