From patchwork Thu Jul 21 06:44:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 2225 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 920A944190 for ; Thu, 21 Jul 2022 08:45:04 +0200 (CEST) Received: by mail-wm1-f69.google.com with SMTP id a18-20020a05600c225200b003a30355c0fesf296524wmm.6 for ; Wed, 20 Jul 2022 23:45:04 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1658385904; cv=pass; d=google.com; s=arc-20160816; b=UIEGXlR3UhuMycRbmvs0QWaWXfb/hdL2HinleMaaEmPVMLET2oBRutShLKhi+Q0Zfn C/ZC/5jhLf+3wp9dG8JngBoi+u3FBjPe4+LUdmKjjXHpiCEBGRWmQnWRcdZFlTQSpony YcCDJnLKObD9V107zE7k+jA+Av5j6z8KQF5szljGz7m0W3dpz4QV9CiD87O7VZnmBCGR ZYTHuhYljy1OfindvtHoOXgJ0DgB8ecD4OrmDpLDLWozpTvossvvgZKmBK9Jm1I9PN+D 54/X60s9G10oVCToZ5RJJ4qlr51VSQ4IaidNV715zDh3CXdf6E9agzQjixjFVKhvyxr6 kHbw== 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=aC9Od0hQPKauauCqSC3c5uqP4FcFRlH8O/UZ0hBxE54=; b=yv68tO7pWeUtnXBfmbsR7kBNLWn1fWbleuagONFMhdPzkWoBxKb+5fVLaeRGFXzjXx jqE61OlHhgUdsmBWFmeeKaW8NqbZQW23DmGfVH+XxB6pnpS6gcu6Shd2Y2dlfaduqEVA nXW4TfognRm1TJHHvAi+m5N4vrzVCDu62CxD6D0IIM+OBei4DKDimRx7fxHIcOiohALU YiIkQ7UqBWy1SQpQYnJS9j+zJSB7Aa0GprDPzDrGkwrTotMLKIK0m1rAE1BjTjWxzxeE CN7CaxkLIoT5VKxMe7qsml5v/wEbjbMTliJCAh5wSRT2DdeOgsYcityVPyFLFRARLTo2 2hNw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=m0B84bIn; 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=aC9Od0hQPKauauCqSC3c5uqP4FcFRlH8O/UZ0hBxE54=; b=MqtcDnKzHVOK+gWKEchD5RxH0nxfjXZcvHBpBs8MVWkyJ7gtllLrsgSLYwEbN+/1aV hjnH4If98hvvrGpvNu5jUl+B/8JYX8EoHM+bpmJI/QSRQYXiYi58q5RYzNdP+b5645hY T0Ph4Y0e2RcUISvlcrHy6D/4lm5QeIn0K/8bE= 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=aC9Od0hQPKauauCqSC3c5uqP4FcFRlH8O/UZ0hBxE54=; b=uk1az5t1rwoMUbw9MhlvzTmqSTcKU9D66s7zxcOJmCNb7S7kfaBcfmiIdg4Z1J4rjD wjNoAivVjJTMNbkXTeg7ou8YFEPb3J5pEaULqoLVhDBN7TWpQq8S32Vskh7q9FJPE0S2 Acn4b04ECl2R/d2c/E01kvQzgXCX6lEQC1CYuIqByvSm7uorM2w3ivKqLK56BwpuAgJe coFD7JkJUyfkWUry+XJ/scIhsj1lGvWMKOjfqBp8wUZQ3/iYKmT7YUeGx/Jw6mfmpcA6 PSRnsU0S5indTVMgndDqnb2ja+z7GtvQ93sajut4Bu9cPuenozPuF0VCtnmKfh6JKCvE m7aQ== X-Gm-Message-State: AJIora+h75Opfjnzyk8Q920zddmWahW98OFCZcD6I1qhrMn2DVdY00LZ p2/Ha6ocOJz6TeTgNt81XXKrrD8B X-Google-Smtp-Source: AGRyM1vk/HKyIl2C0OL8hktC/3SmYZ0R3pqcjrK4OLtTgNn9UcPHdtYzRlBDfQ9lgZt1OpXq992QcQ== X-Received: by 2002:a05:600c:1da2:b0:3a3:10ed:43ce with SMTP id p34-20020a05600c1da200b003a310ed43cemr6857245wms.136.1658385904467; Wed, 20 Jul 2022 23:45:04 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:adf:d209:0:b0:21e:53a1:af5d with SMTP id j9-20020adfd209000000b0021e53a1af5dls244229wrh.3.-pod-prod-gmail; Wed, 20 Jul 2022 23:45:03 -0700 (PDT) X-Received: by 2002:adf:e786:0:b0:21d:6ec1:ee5c with SMTP id n6-20020adfe786000000b0021d6ec1ee5cmr32615149wrm.285.1658385903489; Wed, 20 Jul 2022 23:45:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658385903; cv=none; d=google.com; s=arc-20160816; b=BRC7p4IDnpyoyhLZcsfJxI0WGCfInVXiKZ5SZel2Ix2Cjo9X96p92UuXoLXTY5a1pc Jd8h0uWDVjFfH5CR08QMAIFzSo/LX0joRNq7XLLIFEJfwFAJpB77NiDNDf1/Ub4YsC4G o3W0CPtn+O8157VwhXrKMpxQ7zGUSQixibUh0EXCxNVs7owAhES3EgOAyuTmfGsJDESr Cei1fyttihLKkA/785h/FPIgEv92GQS+qhpdTRnCHytbmGwNHUmO9yVv11sZaLrhrZxs JxclmhQcP0CWQGedARwyfAUp05jTb7aaVidNAVw2iELpkbNhEDBEkCz/WofUm2P3qfAC c0hA== 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=akcoLfp54cRGzdnwH5I05Wq5uAksGtC+cqjjY5zmIMY=; b=XQMFvsFSXgAvoC3p/mZmu4ERDPLKgokVconSdtNJDkqzrvq1st7hapxbRzv+DB43IE YWlgFo9LxVO+2JpHuXbLoehYhAa39RPuVNSnHEBwQtEwkh76znswrWyaheokEy15JwMZ m5pENcg1YiPXfWFpW1DenDdh77+l/8XwffZzvhAfmrHpdzOSgijAzodLn44rjV06+TNT j7J10NxmtSZDKgmomf6qsygdRBYb+kqDQjBN2uLj8PBxHhQz6pEO/K77wX2sEqKaE30V 0dSs2fuDUiUWuoQ6oO0P9Re/FSRtVs03tW9xahFpG9wAwer+Gy4XVjnNlugRLIFk6mz/ tw3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=m0B84bIn; 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 u3-20020a7bcb03000000b003a32df89156sor180915wmj.45.2022.07.20.23.45.03 for (Google Transport Security); Wed, 20 Jul 2022 23:45:03 -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:a05:600c:6014:b0:3a3:14c9:bef1 with SMTP id az20-20020a05600c601400b003a314c9bef1mr6923897wmb.112.1658385903188; Wed, 20 Jul 2022 23:45:03 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jul 2022 23:45:02 -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 10/13] mtd: nand: Move AMD/Spansion specific init/detection logic in nand_amd.c Date: Thu, 21 Jul 2022 08:44:32 +0200 Message-Id: <20220721064435.2456601-11-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=m0B84bIn; 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 229204da53b31d. Move AMD/Spansion specific initialization/detection logic into nand_amd.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_amd. drivers/mtd/nand/raw/Makefile | 4 ++- drivers/mtd/nand/raw/nand_amd.c | 52 ++++++++++++++++++++++++++++++++ drivers/mtd/nand/raw/nand_base.c | 17 +---------- drivers/mtd/nand/raw/nand_ids.c | 2 +- include/linux/mtd/rawnand.h | 1 + 5 files changed, 58 insertions(+), 18 deletions(-) create mode 100644 drivers/mtd/nand/raw/nand_amd.c diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile index 8ef30b45fd2d..9c2ced9925d8 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_hynix.o nand_micron.o nand_samsung.o nand_toshiba.o +obj-$(CONFIG_SPL_NAND_BASE) += nand_base.o nand_amd.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) @@ -31,6 +32,7 @@ obj-y += nand_ids.o obj-y += nand_util.o obj-y += nand_ecc.o obj-y += nand_base.o +obj-y += nand_amd.o obj-y += nand_hynix.o obj-y += nand_micron.o obj-y += nand_samsung.o diff --git a/drivers/mtd/nand/raw/nand_amd.c b/drivers/mtd/nand/raw/nand_amd.c new file mode 100644 index 000000000000..e02b8c79dba2 --- /dev/null +++ b/drivers/mtd/nand/raw/nand_amd.c @@ -0,0 +1,52 @@ +// 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 void amd_nand_decode_id(struct nand_chip *chip) +{ + struct mtd_info *mtd = nand_to_mtd(chip); + + nand_decode_ext_id(chip); + + /* + * Check for Spansion/AMD ID + repeating 5th, 6th byte since + * some Spansion chips have erasesize that conflicts with size + * listed in nand_ids table. + * Data sheet (5 byte ID): Spansion S30ML-P ORNAND (p.39) + */ + if (chip->id.data[4] != 0x00 && chip->id.data[5] == 0x00 && + chip->id.data[6] == 0x00 && chip->id.data[7] == 0x00 && + mtd->writesize == 512) { + mtd->erasesize = 128 * 1024; + mtd->erasesize <<= ((chip->id.data[3] & 0x03) << 1); + } +} + +static int amd_nand_init(struct nand_chip *chip) +{ + if (nand_is_slc(chip)) + chip->bbt_options |= NAND_BBT_SCAN2NDPAGE; + + return 0; +} + +const struct nand_manufacturer_ops amd_nand_manuf_ops = { + .detect = amd_nand_decode_id, + .init = amd_nand_init, +}; diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index fe7e049d4064..68e6f4f14347 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -4200,7 +4200,6 @@ static int nand_manufacturer_init(struct nand_chip *chip) static void nand_decode_id(struct nand_chip *chip, struct nand_flash_dev *type) { struct mtd_info *mtd = &chip->mtd; - int maf_id = chip->id.data[0]; mtd->erasesize = type->erasesize; mtd->writesize = type->pagesize; @@ -4208,19 +4207,6 @@ static void nand_decode_id(struct nand_chip *chip, struct nand_flash_dev *type) /* All legacy ID NAND are small-page, SLC */ chip->bits_per_cell = 1; - - /* - * Check for Spansion/AMD ID + repeating 5th, 6th byte since - * some Spansion chips have erasesize that conflicts with size - * listed in nand_ids table. - * Data sheet (5 byte ID): Spansion S30ML-P ORNAND (p.39) - */ - if (maf_id == NAND_MFR_AMD && chip->id.data[4] != 0x00 && - chip->id.data[5] == 0x00 && chip->id.data[6] == 0x00 && - chip->id.data[7] == 0x00 && mtd->writesize == 512) { - mtd->erasesize = 128 * 1024; - mtd->erasesize <<= ((chip->id.data[3] & 0x03) << 1); - } } /* @@ -4245,8 +4231,7 @@ 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)) + if (nand_is_slc(chip) && 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 bb5ac8337fde..c78f2e088040 100644 --- a/drivers/mtd/nand/raw/nand_ids.c +++ b/drivers/mtd/nand/raw/nand_ids.c @@ -196,7 +196,7 @@ struct nand_manufacturers nand_manuf_ids[] = { {NAND_MFR_STMICRO, "ST Micro"}, {NAND_MFR_HYNIX, "Hynix", &hynix_nand_manuf_ops}, {NAND_MFR_MICRON, "Micron", µn_nand_manuf_ops}, - {NAND_MFR_AMD, "AMD/Spansion"}, + {NAND_MFR_AMD, "AMD/Spansion", &amd_nand_manuf_ops}, {NAND_MFR_MACRONIX, "Macronix"}, {NAND_MFR_EON, "Eon"}, {NAND_MFR_SANDISK, "SanDisk"}, diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index ec0f77b24bd6..bb1a359a9c14 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -1142,6 +1142,7 @@ 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; +extern const struct nand_manufacturer_ops amd_nand_manuf_ops; int nand_default_bbt(struct mtd_info *mtd); int nand_markbad_bbt(struct mtd_info *mtd, loff_t offs);