From patchwork Fri Jul 22 16:10:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 2241 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id EEA463F047 for ; Fri, 22 Jul 2022 18:11:22 +0200 (CEST) Received: by mail-ed1-f71.google.com with SMTP id q16-20020a056402519000b0043bd73ad1basf570674edd.3 for ; Fri, 22 Jul 2022 09:11:22 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1658506282; cv=pass; d=google.com; s=arc-20160816; b=MsIXV0yS41K2KOczudIR4AnepQC656zNsYF1llEHkedvISspDygxlnNpPCu5CeUO8I rTKMamQeExbBbl2Yehh6k4b1oHb1n+dQ9Kre6JDUyk6W5dyILXZ0GO422c/cflljWKDH rD3TfntqQyKuCntFoCsSHJyUNJ7O4ccibMqAlo2E07GiAqRgVpsAepyR/KLYh9clbbUv rJCeH4BQeFRByg9M3A5qGSK13U+P+bi14YxybOHrK+Yqp8fPV5bn5gm06zKRyEN1KUhu w8ggSO+8IqFwUNqlQZuItPzkEx8ayzET/30zgSLSJzcf+1NTizcVvbvDcfTRsJ1joDWs e4iQ== 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=+nvoBi4Ck3hTBZOmwahF77J02W60BQfsqSgVfcZvnEU=; b=Ef+KyvVWDs4+49Li+PSiIdTcvJ+7BOi/cib8bngC5UNfh1Cv1uXsKpJge30IyjeW3v tkMOpJ1+Cq6uOYaW60SHqi1hCNrpaAlGESXQYCEGLQGTueSfRtmR1F9NQY0DFHXWVJ4C fIEGkB6NgNtM0FzterUOt74tqs4qFf8H8f4qZBakwpBkQCR0gOpHVEJ96at/2CSKeuCF I+AlNXkhdUVmD3coJLfpxYI33jnBr5Jib9XnXN2ri23JGC5eu9C+nYxCFafLHTZxZL+C tvoAKJ1mwiIxhedQF9pNtchQNGOLEeLwqiJvF+CBZw9B3uv4DzfmEsGbVlj5OFs3lTTn vsLQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=kG3r6GTv; 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=+nvoBi4Ck3hTBZOmwahF77J02W60BQfsqSgVfcZvnEU=; b=GroQ9MULuxSXgxZGw2Lz/8iDfhMtDRM0VZiA19gtgjd0CNoTKcl6IWoeBQ1ZGlqML6 CS2AQb+fwjLf7GEfTnGH9B7DoJY3o6og3ZG3rWH1XHm3MKYprRhB1/fgseUdaFibXiDi Tb/KUdExnRbDaa1ysZ8RBGlontrGxLaXWhdj0= 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=+nvoBi4Ck3hTBZOmwahF77J02W60BQfsqSgVfcZvnEU=; b=JoYJXhRficiatt56Ru2ZDFTBcGIKSF4aoE2VuvBbUrOexcWMY/6Wq5XkimxeZmU4IC H04jCkZBqeT3Zw2Ow8vvxWe+OoIEL4WJkjFT79UB6/s7D15rgWGJrPUX+Yx6glWfLsDK z+WwxIV5SBWmFmJ19p8loCiY501ghQguew4Jo0HiuHaegQafY0QtAxGIL10R6x63zJ4q jHzChsKeeXrNu8gifeGrB/5TsOUpApa65b/C8l07P3fpGhp5m6oIemrwfLgWdRQ0qCkd 2nUg83DjZijZ15vn+DmSKOHmSqVHtbypi486gVr1i/9DQmfuHDaOXpCO85M6jIqxEF0T 4ejg== X-Gm-Message-State: AJIora+by6BWOynFsxWNvx3pqySlC++d4MvMQPDWq134BQ1dMtbm4tWf 78A4uukNjlxl+S18VKuSDliBEAT/ X-Google-Smtp-Source: AGRyM1sSJsajtysNlpDgP503dGQRgqhm54Lx/kwUm/1HS70lt3jasu5iSHeatMhRDQdhRDaQ+vVImg== X-Received: by 2002:a17:907:6e02:b0:72b:9f16:1bc5 with SMTP id sd2-20020a1709076e0200b0072b9f161bc5mr498250ejc.676.1658506282856; Fri, 22 Jul 2022 09:11:22 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a50:d0c9:0:b0:43a:6e16:5059 with SMTP id g9-20020a50d0c9000000b0043a6e165059ls2107502edf.2.-pod-prod-gmail; Fri, 22 Jul 2022 09:11:22 -0700 (PDT) X-Received: by 2002:a05:6402:5193:b0:43a:eaa8:74b2 with SMTP id q19-20020a056402519300b0043aeaa874b2mr592802edd.111.1658506281853; Fri, 22 Jul 2022 09:11:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658506281; cv=none; d=google.com; s=arc-20160816; b=NpR56WX9wZpVpJgQpkdHTUsQ8il0VvSKygMfJCU9ckfRLpzjzbAYzupABgPjhTofYK /iGPzmqkI1+xpbRnjbUkPSrtzwJNWmGBZlzoL6oKZF7M0Xk1RaL0QveQ7GsGbOxN8DcP t+pY5yQo6/2tyiWaBdCGnRHL6Sk9m4hsQOPd1z7cpump+7OE3zu4jpEPIcvNoHLznlZU dfdzN9nGXjKSxqft95FfFuaiRhJZBAKJ8eRaP3bmMrhzbIT7mus182DS2voe1VgAuuEE /8YKlgLuXj8cqikyQ+FEOuepWPfcfFp76rD6BVCXx0XdqC85rLf7IuyBgCj33ZC4xDIL 2ruA== 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=pTvdFFgd/7bGiFQ+kUeBl/2HLPoUTLMSal7ljPTITS8=; b=eLQsLUoiIHzNT/7cmZ5EXowLfzRpWmWpvKYZ/ARqL3DiQcotANRZ34ziQIuI5rlOT4 IJr9W+jRZtieXJ8uf42REPAohe2DnUZii3gQTZ1BjSBItOEaQMr76f5nPGmay4HlT5GC bV1TuNYDRib+DJieMvNl1DfF7Nn+QDXfKJheCk8ZDRhkeqa5yeYAFTHKeD6/EqsZZNsB fVkb+i5bPL+vI1fjaxeauno4s4D5ChqvbYpYCmidUO8IDS/n2+UYa9HpsUBNhdePYD/B Qw4c69miwdDNBS1XJoLFsZUDLu2yyjG4ca4GiyDC6xBErIXmFEGjymTThueZ2SdCGn1K +lPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=kG3r6GTv; 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 u14-20020a17090617ce00b0072b17278302sor2190520eje.78.2022.07.22.09.11.21 for (Google Transport Security); Fri, 22 Jul 2022 09:11:21 -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:7243:b0:72f:21d7:d122 with SMTP id ds3-20020a170907724300b0072f21d7d122mr483090ejc.271.1658506281616; Fri, 22 Jul 2022 09:11:21 -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 d19-20020a170906305300b006fe8ac6bc69sm2174025ejd.140.2022.07.22.09.11.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jul 2022 09:11:21 -0700 (PDT) From: Dario Binacchi To: u-boot@lists.denx.de Cc: Amarula patchwork , michael@amarulasolutions.com, Dario Binacchi , Patrice Chotard , Simon Glass , Wolfgang Denk Subject: [PATCH v4 12/14] mtd: nand: Move Macronix specific initialization in nand_macronix.c Date: Fri, 22 Jul 2022 18:10:06 +0200 Message-Id: <20220722161009.2686504-13-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220722161009.2686504-1-dario.binacchi@amarulasolutions.com> References: <20220722161009.2686504-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=kG3r6GTv; 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 3b5206f4be9b65. Move Macronix specific initialization logic into nand_macronix.c. This is part of the "separate vendor specific code from core" cleanup process. Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- (no changes since v3) 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_macronix. drivers/mtd/nand/raw/Makefile | 4 +++- drivers/mtd/nand/raw/nand_base.c | 11 ---------- drivers/mtd/nand/raw/nand_ids.c | 2 +- drivers/mtd/nand/raw/nand_macronix.c | 31 ++++++++++++++++++++++++++++ include/linux/mtd/rawnand.h | 1 + 5 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 drivers/mtd/nand/raw/nand_macronix.c diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile index 9c2ced9925d8..a398aa9d8864 100644 --- a/drivers/mtd/nand/raw/Makefile +++ b/drivers/mtd/nand/raw/Makefile @@ -14,7 +14,8 @@ 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_amd.o nand_hynix.o nand_micron.o \ +obj-$(CONFIG_SPL_NAND_BASE) += nand_base.o nand_amd.o nand_hynix.o \ + nand_macronix.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 @@ -34,6 +35,7 @@ obj-y += nand_ecc.o obj-y += nand_base.o obj-y += nand_amd.o obj-y += nand_hynix.o +obj-y += nand_macronix.o obj-y += nand_micron.o obj-y += nand_samsung.o obj-y += nand_toshiba.o diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 68e6f4f14347..4b09a1128827 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -4217,22 +4217,11 @@ static void nand_decode_id(struct nand_chip *chip, struct nand_flash_dev *type) static void nand_decode_bbm_options(struct mtd_info *mtd, struct nand_chip *chip) { - int maf_id = chip->id.data[0]; - /* Set the bad block position */ if (mtd->writesize > 512 || (chip->options & NAND_BUSWIDTH_16)) chip->badblockpos = NAND_LARGE_BADBLOCK_POS; else chip->badblockpos = NAND_SMALL_BADBLOCK_POS; - - /* - * Bad block marker is stored in the last page of each block on Samsung - * and Hynix MLC devices; stored in first two pages of each block on - * 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_MACRONIX) - chip->bbt_options |= NAND_BBT_SCAN2NDPAGE; } static inline bool is_full_id_nand(struct nand_flash_dev *type) diff --git a/drivers/mtd/nand/raw/nand_ids.c b/drivers/mtd/nand/raw/nand_ids.c index c78f2e088040..7602dd30f169 100644 --- a/drivers/mtd/nand/raw/nand_ids.c +++ b/drivers/mtd/nand/raw/nand_ids.c @@ -197,7 +197,7 @@ struct nand_manufacturers nand_manuf_ids[] = { {NAND_MFR_HYNIX, "Hynix", &hynix_nand_manuf_ops}, {NAND_MFR_MICRON, "Micron", µn_nand_manuf_ops}, {NAND_MFR_AMD, "AMD/Spansion", &amd_nand_manuf_ops}, - {NAND_MFR_MACRONIX, "Macronix"}, + {NAND_MFR_MACRONIX, "Macronix", ¯onix_nand_manuf_ops}, {NAND_MFR_EON, "Eon"}, {NAND_MFR_SANDISK, "SanDisk"}, {NAND_MFR_INTEL, "Intel"}, diff --git a/drivers/mtd/nand/raw/nand_macronix.c b/drivers/mtd/nand/raw/nand_macronix.c new file mode 100644 index 000000000000..dc972e590922 --- /dev/null +++ b/drivers/mtd/nand/raw/nand_macronix.c @@ -0,0 +1,31 @@ +// 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 + +static int macronix_nand_init(struct nand_chip *chip) +{ + if (nand_is_slc(chip)) + chip->bbt_options |= NAND_BBT_SCAN2NDPAGE; + + return 0; +} + +const struct nand_manufacturer_ops macronix_nand_manuf_ops = { + .init = macronix_nand_init, +}; diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index bb1a359a9c14..aa45558b3d41 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -1143,6 +1143,7 @@ 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; extern const struct nand_manufacturer_ops amd_nand_manuf_ops; +extern const struct nand_manufacturer_ops macronix_nand_manuf_ops; int nand_default_bbt(struct mtd_info *mtd); int nand_markbad_bbt(struct mtd_info *mtd, loff_t offs);