From patchwork Fri Jul 22 16:10:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 2240 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 02EEB3F047 for ; Fri, 22 Jul 2022 18:11:22 +0200 (CEST) Received: by mail-ej1-f70.google.com with SMTP id sa19-20020a1709076d1300b0072f703aef3asf2088063ejc.14 for ; Fri, 22 Jul 2022 09:11:22 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1658506281; cv=pass; d=google.com; s=arc-20160816; b=XWVy1pe/blk7CM1PelMqHNIw/ZYohCjW5oEer6JkMBvNBH/PI674MrinzM8QcrSkWi wJ3X6/RVbMN4GYQdxzyC4jBgwZCyZ/VT0QfdGL8HVCPnFbYXhUZxH5VwF1awcCSILzZ/ FV1qR3M8JUlVwEL3YBiHbPvFEuaNSn9c9Eigdkaxz2n/Owl1M2vQ3oIdtmQD/Tan2fEf N8V5yHohVFGfNyxwwjWKtpC+anQ4hy6qTEGXfhd5DFsowZMuG9c/r92ckGKbc+xMgYUc jm5Ac5bR7HX/EAPrnfWjMeqEAl57EBvZi+mGEfROB7r0QoLsDrUwTz5S6PztfCwxEs1B wQVg== 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=Qv6Mm57Rzn6Vj7g2r05yIl59P06yLg0yIVlQvyx2GkA=; b=WdgRVmciPo1pPETdayGYnjcwckL6HZaDiujZ/Zr80Ud+0CcLZW2hvtJgDTi/zfD8Qo C1ZgDVw4c6CX2IE61kzwVut2kxPZE2DR8B0T5MRHrKGsjQm+9krml/2L+2+RM0fxpY0o QlDQChfkvCIzC7RE1O8zI/USQ8I5kYYtbUAN3pxStLs6NxU5K9neySh2pzNTw2wt3Bzg i6fxii6HAC8TqtgZwzHYxkNfU2l+ACwvkWiPQ9qt13c+lToJ3teOmFwEf4klJFEkUr6l rIfsKnnMW89wls19IHmNnNvxJLZZi1o77k0Zj4+4f8PYeO9toVaK79HhWp1yeKcRAC8X GIPA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=DrAbXCKd; 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=Qv6Mm57Rzn6Vj7g2r05yIl59P06yLg0yIVlQvyx2GkA=; b=JINGJcqpDibJBLj0GcIum9csebfaO78BpZJ3zouQEvhzefvJz06kpDctGlA78p6hEO bDgJpHWgKP11oZCm9KA7C9XpkuI+u4h7rUa7VGpj+3uB0xdRNbyhDQPJl/YTLUA7Rfpm WsfP3kiWPSgoRssKi6iYC3Avq3hVP+T7nk9Gc= 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=Qv6Mm57Rzn6Vj7g2r05yIl59P06yLg0yIVlQvyx2GkA=; b=WjV2Q4k4GGSbppzT/FsX2Jity8ZB7jJsvUrs3He9RI1d98Z+CtqVxxlRGwFzqDvoeB QD7cKgRkBRWXvMA+hvd3tJo0KQl1B0ebsmdIRHoU0TFM5gVjmwzVxYIbHVPwT5aUlsiO ZuYokYzPuxu7KXuZah3Fx7lF15uW0cPya93NGu9whfldFcER4l9bItT6FtkW9Mi/euoz eWaG9GMspnfKGjespgvplAj9fcnD86hBk2lIpXW6+Np3QbNehWXaiyfgqk91fIlfZyjl efsb/EnAcaUvX0uHMTTb/jc6VLp1ybpDX6JXkEf5n0Dk8kxbdXal0YDoAcP6yX6CA+VR 6ZQA== X-Gm-Message-State: AJIora8fjWWYG1EVpr2R58pPoQ73+4uSTPFGFhj3fDKpzl1s+aTbTs5K PGbSDM88BVWVX49V96oxceEyVl7O X-Google-Smtp-Source: AGRyM1s+hTumWzNGWLYDmukb2YcsfLUsg7vwca35f1/4PGzYH8uDri5M9WPaLxOBKkTlbrpcetunjg== X-Received: by 2002:aa7:cd0a:0:b0:43b:c49d:22b6 with SMTP id b10-20020aa7cd0a000000b0043bc49d22b6mr566565edw.155.1658506281843; Fri, 22 Jul 2022 09:11:21 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:906:f741:b0:726:2c39:8546 with SMTP id jp1-20020a170906f74100b007262c398546ls3077791ejb.8.-pod-prod-gmail; Fri, 22 Jul 2022 09:11:20 -0700 (PDT) X-Received: by 2002:a17:906:5d16:b0:72f:9f40:d1eb with SMTP id g22-20020a1709065d1600b0072f9f40d1ebmr470120ejt.403.1658506280733; Fri, 22 Jul 2022 09:11:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658506280; cv=none; d=google.com; s=arc-20160816; b=Fz5hc7k+ywgDMRZZuIvQe3FPrBVYHgdzzC/JwzYLA3me+xpn1XCAmVQhb5uvdahUBR hUBXTiQPzQt0PDHflDyFwghJI047mTep2vuKH2TE0uESEPFTcEynrQvLafCXz9+rqos9 0D77HaP29zNzljopRSY4UcYrx8Uzd4yVspOuw+S6paNH8iRqtvOm6MD2V00RC2rYMn/P FAmReO68oU3CWAEXdR1zDjCyM2VuuXc7EQ7UlRCjzLWhP4qO8fk3W4xEvOQT875r4M1c n1h3juGYnWt9gsMNEkBOOVblRP1Q2eQADUMpQmwmVghR0lJumdOQg4zEzuJb0Q1ces39 UHEA== 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=AGMOz1nf65DdLdw6QFGuWgesKp0anQ6glN4wf5lFcaQ=; b=LK9tFYXBAqs1jm60KmPXkZgywEjJWrHrsCVahaPtnMdzW78YdNxmQtANU/R8N25ai3 trJTMOS9/4d4oUhwN+ZmOIMPilDDzvGLxRDg7AuTYCzLC2u+wumsLEnXlA1iXN5pCZ54 rrWRQ56sApVRjyXFp8wQILkFH7EpBmEWJY7FeuGPt0li9P4vR9vVFyve+WBVPncqOpTB MQS/5ibb2+pISMjmKe9jbesFz4j2sjk3kwhZqWiIEldJ2OIAoUuS0v8RtLzeh4Xmcobx 1+9vUOgyIxxwUAE+uUwykyqacTxhnO44NqRNubOkspuvRnm3sDtOr5H/aZzZw2ZzA6fk bMeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=DrAbXCKd; 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 j23-20020a17090643d700b0072f15f31f0asor2184430ejn.118.2022.07.22.09.11.20 for (Google Transport Security); Fri, 22 Jul 2022 09:11:20 -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:7394:b0:72b:3e52:6262 with SMTP id er20-20020a170907739400b0072b3e526262mr493865ejc.756.1658506280456; Fri, 22 Jul 2022 09:11:20 -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.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jul 2022 09:11:19 -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 11/14] mtd: nand: Move AMD/Spansion specific init/detection logic in nand_amd.c Date: Fri, 22 Jul 2022 18:10:05 +0200 Message-Id: <20220722161009.2686504-12-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=DrAbXCKd; 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 --- (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_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);