From patchwork Thu Jul 14 07:51:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Trimarchi X-Patchwork-Id: 2153 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 576B13F013 for ; Thu, 14 Jul 2022 09:52:00 +0200 (CEST) Received: by mail-ej1-f72.google.com with SMTP id gr1-20020a170906e2c100b006fefea3ec0asf424060ejb.14 for ; Thu, 14 Jul 2022 00:52:00 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1657785120; cv=pass; d=google.com; s=arc-20160816; b=puXHPzrqbtAvEkJBCv0Ui131I7WeyLpwWtquBhu93nYg2I68kvtSbOwLfdgLlKbaGk gORJDQ2sQ+67lt4ePjoe5DBylFydSzcXpckpXl3i8f4wjCDn0gUkdonBvTDIElo0s4w6 TvWh/UuAOBx+noUyzGMIBwbwF0JcK7vF0Xt2OfkpMmCcfvwdUvJaREzU0lB3vEUDhFSi 00I2q0udQGM5heAe/TEC6CCdeTL86MhsR+EQH8BSjgiu7/1UBT/t0cCI4MRP1q3+RnY6 pQ2UmS3OwvByvY+xBXA9XVCm3YdL4NUFgvbGt3oa3V4N16eMhNMTem0NtVCnFvtnbDda WhTg== 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=FwJKfOkiRL7xGXLx1b0m6O7PEnZxzovlpeWPhsE5gII=; b=MEDCKbwJTuVMDUl1NCmf9qihQhbkkGjUsHp+I3VKU3A+rkS0DNn2sAl+30G8l8BoTN PFeJ5F9XZxEAPR5m/LLEd4d8EIAawELhhB8WtN2roygI2UAI3ZWe0UubOwNa4r9UQGHk sjwia+A084FaQAv45HFnmSGFC4LHU7SbtrP4Tsu+xS89gSFoX4d9Gw/FSdAWnH5jI60+ SfJDPLc19Vl0qb5jQAv03e4XptSbdmfYHTiftf/VTVFldlUbN91Kdju83AZiLO7Sn4HJ e6vZVI85H9X1SWv1zDegFWWsVE9bQ3ak2ag/d1aPAEvuq/hIrr4lV1SnBEy7wZJYzqq4 u7gw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=lqvgGs5H; 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=FwJKfOkiRL7xGXLx1b0m6O7PEnZxzovlpeWPhsE5gII=; b=FQ3fv6z8BMkmzCllcW9HNf611o2jMYkMuxcmnd3SPcyyaZ8gmRSHkVg0i0cazEw5Pb NqgvCB5x7K87U13H9Qknsb7wd1Zgp42hzSrQI9sLAFmVnkcPB7oXeUx2bvB0C5bEcq0l hnx4B8fZ19RSOyVV0a3leMV5BHtl+6pHZc9TY= 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=FwJKfOkiRL7xGXLx1b0m6O7PEnZxzovlpeWPhsE5gII=; b=CLgbCl8cmTmYGn3Lm1OPXcDwEvBPd4Opo/f8EwPFC0Gk+cvvLG1ZngpVx14MMCLx2V 7JYNT3g3DCujfb+eYNPjUsZiSrkVSAM7EcC7kWNyBHhPpXE/bBfFmxPDx9YUMTGUeAq8 wjJi+ItxniXilWdJspQLaUr0zW2HeTonE+7AgVzpBZJCswRIcM/wH1KyqHGsqRe/+D6d p6p5rwG46EQHZLSBxQzNyRwkHcZYHoQiZxTYQt6fOmkpOqpa76dS13N+gHRJAtFWPE5P 3mmcRDdnmh0ByqJ/tnOdIjNRAUrVLwjIptDqdL8LClhh9idZxfAnKrSbHIP7t+rz9cmt bTXw== X-Gm-Message-State: AJIora9F+pwm2JD6VIHqXf24k2eJz42z9jzpYQKFBMFvfpqZ3sHS4P8L IT+DlzsMFeatZ6Xajej4l+qEZBNp X-Google-Smtp-Source: AGRyM1vhRUgwZSCMs5XoW1TGkIf7GGW0V4BfTjw4aHOWWlGK5NTGYt533/tGxjA73zumWT4qp7wOUw== X-Received: by 2002:a17:907:2bcc:b0:72b:3391:59fd with SMTP id gv12-20020a1709072bcc00b0072b339159fdmr7569395ejc.509.1657785120184; Thu, 14 Jul 2022 00:52:00 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:906:70cf:b0:6fe:d027:3c1f with SMTP id g15-20020a17090670cf00b006fed0273c1fls4177018ejk.2.gmail; Thu, 14 Jul 2022 00:51:59 -0700 (PDT) X-Received: by 2002:a17:906:7304:b0:6ff:a76:5b09 with SMTP id di4-20020a170906730400b006ff0a765b09mr7310287ejc.193.1657785118825; Thu, 14 Jul 2022 00:51:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657785118; cv=none; d=google.com; s=arc-20160816; b=YNMo7ZYuQyAsyNV5vLjG1/dNCs2mwe4y9jTnetMcxF3VpGRJDS38WGMLTMUy9xisb5 QOL2yV0apLhUq3f3zLl0GzuPYvZD9MinyXnkZWsYVCJYb18tRBUYIAhPTMlaKDVKW8sL X+45Xn2BAFWFAExMzf45R0tSwDpWPqw7IK3UVBr+5B2mTRNk3Ololjt/2d300yPJ/Tr0 UhGUkP6TsXHYI4Nt+5ptzTQzM4zhOEK7kLAoA1XX/Dsmapd+7tkBo/VbZW2EykxZWQTD ihrXmsOa6dgILitLBxG5apnOc6dtGvwA8TBItAaStbCNgXVP8jh9OB529QQEcHfizDzJ Fi9A== 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=IlWkK+BuUZfXUw6/qJJsivj+j+ojfyd53fXmVlibE+4=; b=ezZXewOJnX31ly9+LtaGMm4Wmxtn0you3+JSoUrTuKh+4UTqxLLcqK88i8cxomvB9p c8oaJWf197gPOfTyBU23akWXdzruvuSP7hYzh3szkRB3AzIHZ4rRQpyFwxFkgwFn1xjN imll+El9hTld8UGiMwFlF2U5XeKQJPsM/TQuId6GitV5P9J56gW6QYTuYuiD40EMqWH0 oBwlc2pVEfFBkDDH7NoRefVqlOSJvbTlzX1FHR0p6qubilO0v6jcrEvugaQxc4o6DI5H TSvoE/Ri3COy6AsDJl3y0aB0k1xQQnMd6qz9Wthf9qjoFXgPETEQRpKKBNVsHy8wKyML 8LKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=lqvgGs5H; 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 dv3-20020a170906b80300b0072b5f614ddcsor306557ejb.41.2022.07.14.00.51.58 for (Google Transport Security); Thu, 14 Jul 2022 00:51:58 -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:a17:906:6989:b0:726:f129:1748 with SMTP id i9-20020a170906698900b00726f1291748mr7318783ejr.495.1657785118147; Thu, 14 Jul 2022 00:51:58 -0700 (PDT) Received: from panicking.amarulasolutions.com ([2.198.242.86]) by smtp.gmail.com with ESMTPSA id r23-20020a170906a21700b0072b616ade26sm369252ejy.216.2022.07.14.00.51.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jul 2022 00:51:57 -0700 (PDT) From: Michael Trimarchi To: linux-amarula@amarulasolutions.com, Dario Binacchi , Tommaso Merciai Subject: [PATCH 11/11] mtd: nand: Move Macronix specific initialization in nand_macronix.c Date: Thu, 14 Jul 2022 09:51:31 +0200 Message-Id: <20220714075131.411548-11-michael@amarulasolutions.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220714075131.411548-1-michael@amarulasolutions.com> References: <20220714075131.411548-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=lqvgGs5H; 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 3b5206f4be9b65d2f0f85b3239cf117a1d0de7ce 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: Boris Brezillon Signed-off-by: Michael Trimarchi --- 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 | 32 ++++++++++++++++++++++++++++ include/linux/mtd/rawnand.h | 1 + 5 files changed, 37 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 090bb413f7..d888eb2be5 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_SPL_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 baa7618923..b16300c304 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -4210,22 +4210,11 @@ static void nand_decode_id(struct nand_chip *chip, 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 c78f2e0880..7602dd30f1 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 0000000000..3cccb5869a --- /dev/null +++ b/drivers/mtd/nand/raw/nand_macronix.c @@ -0,0 +1,32 @@ +/* + * 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 + +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 bb1a359a9c..aa45558b3d 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);