From patchwork Wed Jul 20 16:22:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 2207 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 781FA3F046 for ; Wed, 20 Jul 2022 18:22:44 +0200 (CEST) Received: by mail-ed1-f70.google.com with SMTP id h20-20020a05640250d400b0043b6a4a2f11sf5978857edb.23 for ; Wed, 20 Jul 2022 09:22:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1658334164; cv=pass; d=google.com; s=arc-20160816; b=RazjvqnTHIynIzpU2tuos5I7xSZy4Ja8zDa+IAq7orbpvwOWe/t0GlZHQcU7ECqOr+ Gx+BJ781KIcUJJ8i5zj+Cm9OuCSxpEFJGxUhfPtK0PJOlT4LaZpr6uYlyKJJAl0V77Zn hL68vhF956ZmoC4HWsp6zEEiyyyNkzC7EOy1kWgn55KaqURXHDB5qLuL4SYm3zuvSKaS MJqCogMWe0xIqLqQVpwuJvyFc5UYtWzFarwXXUK9exo0uH61MS/4zBWSURvb0pg+bIwa /e0BNwvuodIVPydXNPsqShM0YIikFuIZI1QEzGyZltWVI8E+/hk/0JZgRzJR875qRQsL xh9g== 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=bqzaH7mo1dXBMUA6ZLakIOijnDz2CJQqz5oMmXQinO8=; b=yskSzD2kn/74nIJh4pV81fJChnKi8xOxgvZPvv461sefx34/2dtVNtheBInBVVmUkC A+V0xT0sFdcs3c5fpaV1Jur5u60OW4cx+cK6iobMsBCCyAAMxpnCYaAiPEJahNFTuMoN zWbcnajs3R67e45UVa3gRjYpedTiPpOD2PWfsx482XcwbE9Ogi5t9xltsahPMrRUr8uC gYBffrkPPFTPmW1ww61YiIugDPCokerE4TqmQeBtVZIpyGP0o6iXbO4NKHjRc2P5AyB2 27d12lqYlvpXq8MIapixRU4rW3zAmsaRpsHbcZF95PGPSEWhpaQJS/nLdxEossTgmAXS D+GA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=L61ABPB+; 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=bqzaH7mo1dXBMUA6ZLakIOijnDz2CJQqz5oMmXQinO8=; b=T0k3acZhuCzsPg7wRL/yHfJlaE1sTGDA2bfhzqVAjR4zx9QJb2xA27jFzUVqVskMyP n9DsJmqVu/yDabrnCePcRXgPTcYefmR7MUED2cd/ewjoODDsQ4nEdNfp0GX2k1w6GT/d s+HITJJmDDdYMWEkAXyrDYYh51QPLJaSO827Y= 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=bqzaH7mo1dXBMUA6ZLakIOijnDz2CJQqz5oMmXQinO8=; b=mx2/5/+ipT72CMVF7O61jnw8jIFw91W9gPKsUu3xSLe3rhGFJlv3BmGJjPFWOJtwvN StW94+Jcno/iYmQRC9ipsAWm8qU9q/wDeL1prO9EwOTjS0hSY5mfVYIQYm2uew+tCGe7 kQLzC/2YUVTWmLzJx5cH8h7/HdjCjjWDIN+hdkm1Q0MWlFwn70vwGEtWX/ibHzCB8ggd WiazWZ2Ijl0FAQm1dSLaN29wvfYzyu6no2ZM+DLtA1o02+Yci4OK+ob/nPaMnuzqzKY2 +5pXPK2cjfn1uIK/EzPo2giC9QRNn8P173FX4039hCKo7XOYeiXEJmn2FcmQqOlkA7OU 5HdQ== X-Gm-Message-State: AJIora8zAuG3ThOZ64xYncDe2W4Gh+8wJPPOlU+Mz7ICsUzdIbrGpS0A 6bzfY6QutyitOWD4XAnPvpLVw2U+ X-Google-Smtp-Source: AGRyM1sZ3kqYYMk4BIXuZ6hh+XolQ146ppvhvcPYaZWyvdWbFCm+cBF2YSqRJmoukibGa3Iwq1DUcw== X-Received: by 2002:a17:907:60c6:b0:72f:2e3b:ead6 with SMTP id hv6-20020a17090760c600b0072f2e3bead6mr15755262ejc.664.1658334164291; Wed, 20 Jul 2022 09:22:44 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:d0e:b0:425:ff69:1a2d with SMTP id eb14-20020a0564020d0e00b00425ff691a2dls257097edb.1.-pod-prod-gmail; Wed, 20 Jul 2022 09:22:43 -0700 (PDT) X-Received: by 2002:a05:6402:1772:b0:43b:b794:87f8 with SMTP id da18-20020a056402177200b0043bb79487f8mr5966878edb.237.1658334163208; Wed, 20 Jul 2022 09:22:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658334163; cv=none; d=google.com; s=arc-20160816; b=juwGNDsCkfXpBBdxISLxcnDCfTeBlVPBj09JDxZsFaVCrwfbbIVHwK3x2Pgop7iGoe aB2/S9EZoyvPBzCheBpFc1CcpoX1wvs8L5kFZtdsxqiLS6nIy9m7frOgB0psZEfIJv+c Ex8/7upko7u5VbFKQJKb+rcIjdxdreeWzqpSbm0iNXBHpqsw5D2hF1OSct32bKyGjskh zv2nQTO2mZ68WlMk6mG/PI8a3ly/UBTQlpmTsjxA3ioo543HcpSHF9y8IveDxKok7oG3 B0u0lTbJtCflXy0wf5bXpVpbPg4h18Bt63kZF/i/y/fYzIQLswdRP+8KvXsat2rvBFae uVWw== 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=i8A8CzFILS7ro6NcMA+hZ9Vq5gjU4ZOypegayHdfqAs=; b=HiBKsYoAh/3Q+NLY7RMjd1WWkU2/gG44jTlM88IcQLUhYa/E/YVMmjzgiUrXQWTx1Z q2rgNGF+ni3GelI8+wJBe362yWjcFDHusIEt25JQ3iphEKkPYsiBEQqeghz1U48swg8U tk452/W/aFTDS4QfQiVmnsqoLYQu0UD7yCtGd4snS3VFwhhaU5wiet3gp4ZxU9kdzsZH yGmNNc1+x2Vgb8wdXuniF5DUxve0bgz8V9jiMCEimzv+REGOW3K1oMqm6ncHacJfyWgK gUKSxUZhxgX3LjiUHX3TW2RfL33eTsqXt31rLX5+Ab2LKrLA95l1Ixq2MOR38PpLmQoV NBcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=L61ABPB+; 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 p1-20020a50cd81000000b0043ba4f8d2e5sor2137297edi.52.2022.07.20.09.22.43 for (Google Transport Security); Wed, 20 Jul 2022 09:22:43 -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:6402:4490:b0:43a:8f5a:d273 with SMTP id er16-20020a056402449000b0043a8f5ad273mr50862417edb.6.1658334162918; Wed, 20 Jul 2022 09:22:42 -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 jl10-20020a17090775ca00b0072ed9efc9dfsm8057839ejc.48.2022.07.20.09.22.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jul 2022 09:22:42 -0700 (PDT) From: Dario Binacchi To: michael@amarulasolutions.com Cc: Amarula patchwork , Dario Binacchi Subject: [PATCH v3 06/13] mtd: nand: Move Samsung specific init/detection logic in nand_samsung.c Date: Wed, 20 Jul 2022 18:22:09 +0200 Message-Id: <20220720162216.2397616-6-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220720162216.2397616-1-dario.binacchi@amarulasolutions.com> References: <20220720162216.2397616-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=L61ABPB+; 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 c51d0ac59f2420. Move Samsung specific initialization and detection logic into nand_samsung.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. - Fix code style warnings raised by patman. - Add the SPDX-License-Identifier tag. 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_samsung. drivers/mtd/nand/raw/Makefile | 3 +- drivers/mtd/nand/raw/nand_base.c | 52 ++--------------- drivers/mtd/nand/raw/nand_ids.c | 4 +- drivers/mtd/nand/raw/nand_samsung.c | 90 +++++++++++++++++++++++++++++ include/linux/mtd/rawnand.h | 2 + 5 files changed, 100 insertions(+), 51 deletions(-) create mode 100644 drivers/mtd/nand/raw/nand_samsung.c diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile index f278f31f5cd5..440290bed0fe 100644 --- a/drivers/mtd/nand/raw/Makefile +++ b/drivers/mtd/nand/raw/Makefile @@ -14,7 +14,7 @@ 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 +obj-$(CONFIG_SPL_NAND_BASE) += nand_base.o nand_samsung.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 +31,7 @@ obj-y += nand_ids.o obj-y += nand_util.o obj-y += nand_ecc.o obj-y += nand_base.o +obj-y += nand_samsung.o obj-y += nand_timings.o endif # not spl diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 174c760f3416..fe59157bc3c4 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -4173,48 +4173,13 @@ void nand_decode_ext_id(struct nand_chip *chip) /* * Field definitions are in the following datasheets: * Old style (4,5 byte ID): Samsung K9GAG08U0M (p.32) - * New Samsung (6 byte ID): Samsung K9GAG08U0F (p.44) * Hynix MLC (6 byte ID): Hynix H27UBG8T2B (p.22) * * Check for ID length, non-zero 6th byte, cell type, and Hynix/Samsung * ID to decide what to do. */ - if (id_len == 6 && chip->id.data[0] == NAND_MFR_SAMSUNG && - !nand_is_slc(chip) && chip->id.data[5] != 0x00) { - /* Calc pagesize */ - mtd->writesize = 2048 << (extid & 0x03); - extid >>= 2; - /* Calc oobsize */ - switch (((extid >> 2) & 0x04) | (extid & 0x03)) { - case 1: - mtd->oobsize = 128; - break; - case 2: - mtd->oobsize = 218; - break; - case 3: - mtd->oobsize = 400; - break; - case 4: - mtd->oobsize = 436; - break; - case 5: - mtd->oobsize = 512; - break; - case 6: - mtd->oobsize = 640; - break; - case 7: - default: /* Other cases are "reserved" (unknown) */ - mtd->oobsize = 1024; - break; - } - extid >>= 2; - /* Calc blocksize */ - mtd->erasesize = (128 * 1024) << - (((extid >> 1) & 0x04) | (extid & 0x03)); - } else if (id_len == 6 && chip->id.data[0] == NAND_MFR_HYNIX && - !nand_is_slc(chip)) { + if (id_len == 6 && chip->id.data[0] == NAND_MFR_HYNIX && + !nand_is_slc(chip)) { unsigned int tmp; /* Calc pagesize */ @@ -4374,13 +4339,10 @@ 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_SAMSUNG || - maf_id == NAND_MFR_HYNIX)) + if (!nand_is_slc(chip) && maf_id == NAND_MFR_HYNIX) chip->bbt_options |= NAND_BBT_SCANLASTPAGE; else if ((nand_is_slc(chip) && - (maf_id == NAND_MFR_SAMSUNG || - maf_id == NAND_MFR_HYNIX || + (maf_id == NAND_MFR_HYNIX || maf_id == NAND_MFR_TOSHIBA || maf_id == NAND_MFR_AMD || maf_id == NAND_MFR_MACRONIX)) || @@ -4549,12 +4511,6 @@ struct nand_flash_dev *nand_get_flash_type(struct nand_chip *chip, int *maf_id, /* Get chip options */ chip->options |= type->options; - /* - * Check if chip is not a Samsung device. Do not clear the - * options for chips which do not have an extended id. - */ - if (*maf_id != NAND_MFR_SAMSUNG && !type->pagesize) - chip->options &= ~NAND_SAMSUNG_LP_OPTIONS; ident_done: if (chip->options & NAND_BUSWIDTH_AUTO) { diff --git a/drivers/mtd/nand/raw/nand_ids.c b/drivers/mtd/nand/raw/nand_ids.c index 2a50f0b2144c..f4126c3a5a13 100644 --- a/drivers/mtd/nand/raw/nand_ids.c +++ b/drivers/mtd/nand/raw/nand_ids.c @@ -10,7 +10,7 @@ #include #include -#define LP_OPTIONS NAND_SAMSUNG_LP_OPTIONS +#define LP_OPTIONS 0 #define LP_OPTIONS16 (LP_OPTIONS | NAND_BUSWIDTH_16) #define SP_OPTIONS NAND_NEED_READRDY @@ -189,7 +189,7 @@ struct nand_flash_dev nand_flash_ids[] = { /* Manufacturer IDs */ struct nand_manufacturers nand_manuf_ids[] = { {NAND_MFR_TOSHIBA, "Toshiba"}, - {NAND_MFR_SAMSUNG, "Samsung"}, + {NAND_MFR_SAMSUNG, "Samsung", &samsung_nand_manuf_ops}, {NAND_MFR_FUJITSU, "Fujitsu"}, {NAND_MFR_NATIONAL, "National"}, {NAND_MFR_RENESAS, "Renesas"}, diff --git a/drivers/mtd/nand/raw/nand_samsung.c b/drivers/mtd/nand/raw/nand_samsung.c new file mode 100644 index 000000000000..0ab80621936f --- /dev/null +++ b/drivers/mtd/nand/raw/nand_samsung.c @@ -0,0 +1,90 @@ +// 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 +#include + +static void samsung_nand_decode_id(struct nand_chip *chip) +{ + struct mtd_info *mtd = nand_to_mtd(chip); + + /* New Samsung (6 byte ID): Samsung K9GAG08U0F (p.44) */ + if (chip->id.len == 6 && !nand_is_slc(chip) && + chip->id.data[5] != 0x00) { + u8 extid = chip->id.data[3]; + + /* Get pagesize */ + mtd->writesize = 2048 << (extid & 0x03); + + extid >>= 2; + + /* Get oobsize */ + switch (((extid >> 2) & 0x4) | (extid & 0x3)) { + case 1: + mtd->oobsize = 128; + break; + case 2: + mtd->oobsize = 218; + break; + case 3: + mtd->oobsize = 400; + break; + case 4: + mtd->oobsize = 436; + break; + case 5: + mtd->oobsize = 512; + break; + case 6: + mtd->oobsize = 640; + break; + case 7: + default: /* Other cases are "reserved" (unknown) */ + WARN(1, "Invalid OOB size value"); + mtd->oobsize = 1024; + break; + } + + /* Get blocksize */ + extid >>= 2; + mtd->erasesize = (128 * 1024) << + (((extid >> 1) & 0x04) | (extid & 0x03)); + } else { + nand_decode_ext_id(chip); + } +} + +static int samsung_nand_init(struct nand_chip *chip) +{ + struct mtd_info *mtd = nand_to_mtd(chip); + + if (mtd->writesize > 512) + chip->options |= NAND_SAMSUNG_LP_OPTIONS; + + if (!nand_is_slc(chip)) + chip->bbt_options |= NAND_BBT_SCANLASTPAGE; + else + chip->bbt_options |= NAND_BBT_SCAN2NDPAGE; + + return 0; +} + +const struct nand_manufacturer_ops samsung_nand_manuf_ops = { + .detect = samsung_nand_decode_id, + .init = samsung_nand_init, +}; diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index 8fb2a43296f5..d0312e924b4d 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -1158,6 +1158,8 @@ struct nand_manufacturers { extern struct nand_flash_dev nand_flash_ids[]; extern struct nand_manufacturers nand_manuf_ids[]; +extern const struct nand_manufacturer_ops samsung_nand_manuf_ops; + int nand_default_bbt(struct mtd_info *mtd); int nand_markbad_bbt(struct mtd_info *mtd, loff_t offs); int nand_isreserved_bbt(struct mtd_info *mtd, loff_t offs);