From patchwork Thu Jul 21 06:44:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 2226 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 19A7C44190 for ; Thu, 21 Jul 2022 08:45:06 +0200 (CEST) Received: by mail-wr1-f72.google.com with SMTP id n7-20020adfc607000000b0021a37d8f93asf68351wrg.21 for ; Wed, 20 Jul 2022 23:45:06 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1658385905; cv=pass; d=google.com; s=arc-20160816; b=RAG5femvo2PtyPjc4LGJEHhC/wQJNH+9JioJiQWEEJ27r0OatT0ykJelZR93RiJgF8 SVJhu0srPlrStZxlVXKv2v3G56B2PVagBKqJRkQub1GjlTw8CQb0CuWNyk2PIXdOyUJ/ ucH8LfLKTV1XYh6yYsM0HKyxuUM+obTiU+QvScQSc6cFCYGA7LSPNb6WB6etbHqJ15oW /eWs/xLtECp6rhkuSaglgnTKqV1XAwd7puPkFjhEQnsaWma/uLi0stLZAZgKUbXc8Qbd MI2qhvtxGE7x6aro0Btbq2b/DlHH6layjnKyaYDaGBu/WJSgk//KOUTc0j5zOWoYDbI8 QFag== 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=VUpUJjefdYqwIDL/s/KW2j6Mgjydarb1A7kXrCG78U4=; b=sQR4MkEXMHRU3Vt+GcaWWw1wTSr0CZfjq8d9lbcMMgfO8ilWpJ1k67iWMmYbcikh2x Zyq5M7fsiazfx+uWQ7xAxxQZJIaw3QkE237QkiPUF1/Z5BqHmxIeDjrXs8RCgV9lngZA AuR9EsnMJrGj1PKX54ddTwq93rjsckqJEyDhC6Su++HifTvQqDfCmAYX1w4A8MRYYPr1 /tbrXihZnvwrivQOSB/do3dt/3jfT6Nkw5oiMDj/Ro5quXz7i3T1L5ywFntGuE7Mj8dh zBE6tIMfTZ1yHz02pAk0wGQ6mcjnB+6Y4NLTQiq9daZ2URqQRDL5x83k25qEx8knVXFe gXfQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=bvUzRhOo; 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=VUpUJjefdYqwIDL/s/KW2j6Mgjydarb1A7kXrCG78U4=; b=plR16PWrXLP+cBeHKhmsczAwRqw635dGuEK9ZzJKrfJxbaygG/cdsJX5Pu58rVeoyw 2ZtbuxyuIqI2Bchs6ENQndfRQbNetazMLgnQcIbqJijfckFdBv4TTzwGNNbEH8GIg7Cj LjcwyNKwYEi3NlUruAmDg/5wiXM+oyYRZHysQ= 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=VUpUJjefdYqwIDL/s/KW2j6Mgjydarb1A7kXrCG78U4=; b=Jb4/2PmAns9eKLXm9cxfh/gYyF4pkgOu/NmLxCj53l5ptFwfQXMCyJ0h5qyW3xmi1o k6/0VWiE+r5EFNQv5q7wKWjSSmi1Eh8DbtGed1gcLq4SG65O2d+qqizhBKndtJQG9a+F /c/XyVhjJRjC6l8mm6gY1rKaEf4Jh2oIkQbBfUMSaFoIcx/bK8CQW8j0tTV/XN5+pmFQ R5O9z89cWRZUt+BSK4xbxCZ4saKNtwbdVQEExF2KwPcqTCKs8/MPxXAVToNgWOiFUkGM bLkLCDsFiu1lOr0v418aQzAqQ43sCaAlAaJBzDkEtcjNSrny7ixQ4ySltdxP5ako3Zfl iIvA== X-Gm-Message-State: AJIora/jGfYQ+3cL4Uadm4xy9R+RawnVSl3+GCtqRpP4wKy9QixMDJBb JvHXIBZgbkTL7OH7oc7yNHDFbIND X-Google-Smtp-Source: AGRyM1sXAVsvlsdITBthw3nWA4tiT2Sz1GJIpYWu3DvcBs85KYSSCcLy/EOXlIcaTMLkgFRPc2hduQ== X-Received: by 2002:a7b:c851:0:b0:3a3:19df:2673 with SMTP id c17-20020a7bc851000000b003a319df2673mr6784704wml.75.1658385905876; Wed, 20 Jul 2022 23:45:05 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a5d:6547:0:b0:21d:668b:3503 with SMTP id z7-20020a5d6547000000b0021d668b3503ls243828wrv.2.-pod-prod-gmail; Wed, 20 Jul 2022 23:45:05 -0700 (PDT) X-Received: by 2002:a5d:5683:0:b0:21e:5469:88d1 with SMTP id f3-20020a5d5683000000b0021e546988d1mr1258308wrv.297.1658385904807; Wed, 20 Jul 2022 23:45:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658385904; cv=none; d=google.com; s=arc-20160816; b=r44WamcR/x3L0yfaA+YG7tZnFBdztnRXTuCtSSnamCy5M3h11i1uGFRuHOefKzGnOM mLEo6at9tteiPov1NaSAfOmTqlwX8t+JSDcqh6B3lu7fsfz0/XYm0okJDFPGOqZ2xJ79 GdElSLBJIQQA5587GnIqZBdK7sI43phN125WJuZZBTfH5xJylhlKo6V4zU67KiOdJF3z LAa51vdKMv6vJAHxJo0x3yJY/MwxU3OIRx6UL2ioRZGw6NTK0snms0cR2mpi66oe8j3O LBW7Yoh/lO+xToI0JOJB8qY61iffJ/cYRXG6ESrCQddi8OREu1Zvn2sDXDUg4u/GCmyi ZAHw== 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=FsZWT0Murd3SQ44lFE5DRzJg9mfkFK0I1DKwG/FJg6E=; b=dSf0RYqMPVc9hEgRrxq8UIduV160d1Ube1RFw9gbdRYpYxAamQM4z3J/pTMZSROfQu VdNSNWfPx9JuDzR5Qr8msKAykMEOz7SUFm4ZKNFA9lYH4qH3G6BxtLVx59uDa+6BJeR7 L0p6T6tGOfivxxeTrFxUzAg4RC/DKFEp2/b1v86QbRKB0Eh2pl2AIH4JyXmXyaCfgJZt Otl2uvBgCqkvJ1IHriKqqpezjJGXFzUFOsbuUE/TUqO2Uv+N46Z9dpGkhZquRZE5CQ4R i/8IpAyIAJ0pXalY34v6Ox5GVVpiIwzM32FYC3hSABU9RwHwqMqwDVl+UomE9kkXmCTC eGkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=bvUzRhOo; 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 p4-20020a05600c064400b003a2f1416c90sor189921wmm.31.2022.07.20.23.45.04 for (Google Transport Security); Wed, 20 Jul 2022 23:45:04 -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:a7b:c8ce:0:b0:3a3:2cf8:edb with SMTP id f14-20020a7bc8ce000000b003a32cf80edbmr4326163wml.70.1658385904581; Wed, 20 Jul 2022 23:45:04 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.pdxnet.pdxeng.ch (mob-5-90-140-42.net.vodafone.it. [5.90.140.42]) by smtp.gmail.com with ESMTPSA id c18-20020a056000105200b0021e4f446d43sm903711wrx.58.2022.07.20.23.45.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jul 2022 23:45:04 -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 v3 11/13] mtd: nand: Move Macronix specific initialization in nand_macronix.c Date: Thu, 21 Jul 2022 08:44:33 +0200 Message-Id: <20220721064435.2456601-12-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220721064435.2456601-1-dario.binacchi@amarulasolutions.com> References: <20220721064435.2456601-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=bvUzRhOo; 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 --- 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);