From patchwork Thu Jul 14 14:02:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Trimarchi X-Patchwork-Id: 2160 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 7CC6E3F013 for ; Thu, 14 Jul 2022 16:02:34 +0200 (CEST) Received: by mail-wr1-f69.google.com with SMTP id g9-20020adfa489000000b0021d6e786099sf576123wrb.7 for ; Thu, 14 Jul 2022 07:02:34 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1657807354; cv=pass; d=google.com; s=arc-20160816; b=qGl8wUxsar/srOwV25Rv0TauqebzgIGa4c5fTSar0bspOkN5vcf6ob+E6kETK07fBw 7zFM6Ig3sWPz+t29+N//UBl7Urw0zQ1ir5x4MSBws34Q5idv6t5chalj7akL8n/uRVvD ikttk5P/+Qs+75j8gWxVxsaEsARAQ9m8t9PdOr1hc1yK7Q6DHZDS3mzU2fEVz7KgJBTg 5Bu2clluH8FPD/buHdt+UjPiA+WtbbWBVmEdETHS/mvqqcpUuIZ9C7JMPEq2JXRRTH5C uEiuR/d6OjUz0BDriOpF3ANKxsW0kdkFrFVEzRon2IFyTL8L9wQDQHF+iX3vfkmnOJVW 7Plw== 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=Z4Za9miDuNc8iaqcB/I0Z0pJsjLu4rXSfpAjBCnI4Ec=; b=N2rUhgut4yqucGgMCfWiM0x4LnHXYXKhnNhUYRltRKfXv36ouW08qdP8I+tWp+gBRW sIEYT5TudcLQBoNYVVpiiQcTGX+C59g3PB8pmkWuR1rQDTZm0eXFUHaYJnTW6r4mQD/o m82k8npkv+bySl1pmCl7o+MB+uYrpV+lDzdcjK+ZwS+a/qGDKYCGpxodiwNSxWNeAQB8 96VC2x7kACcM+qBUxpUtzmKtTKAMUfzMW2UsahUnhe3iSz56BW3Dk49gXGFx4IRrVLyp N1CAU3TkWyCMyKs2TXiAeNwaSRM6lJ3iFKw/0hRSomkwHCkWTKMEnaFSV6G2UOuisXKk GH0w== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=kDFL7eAT; 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=Z4Za9miDuNc8iaqcB/I0Z0pJsjLu4rXSfpAjBCnI4Ec=; b=c8yA4fXCuRJQjG4TdESRt3hOpyVYFoD3mT2lpvOH/E+x450oWJnU/9ER3DQ8pLLCp5 RZuP6xISdhykmxsnCrOpDCrsa5fLYBdPnrULqhuBZNIJbbpeS3IMfFRiS8eyPqSwzD78 8Jra+4OUiip+6ehr2ErMC4jbp+SHte9yFlJAs= 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=Z4Za9miDuNc8iaqcB/I0Z0pJsjLu4rXSfpAjBCnI4Ec=; b=jeyTGuH114VYmyz6+b9xK/6sn0qoehRURg8lHG3Am2+10CEGHjyue/3vKVWQmabJpU O7jhVec7IJ07Lc0hlyPumHYqanrvwPlAxjwDqLr4Aqb52Rm75tOLHWg71bx3tEwGWM/c 0oQ1LWpdWDP8XvwMY7Q8IjmLvSqTgHnGLJjd/5u3s6u6aQAq4gIMl53zh6cx/NOoRUHQ 8E/teQeLaarsIpZAEGs0tM6oLiOFT7u2Itzk7vCnN7IZfkVwEwaN9WB0mXR18X4IoBPn dCaUkq1l1KS3kd1grjoubQTEb0aQGi4HBNKmSi8SKe8UIQysCTRP5lDARUZZ1ewa0t/c X+sQ== X-Gm-Message-State: AJIora/555aczK0bZfzR9YxE+DCPW9sf54Qd7fUzdDQSxO6lIK25X/tY fEZTRC3syVg8zuydsqYFZowT2nqw X-Google-Smtp-Source: AGRyM1sZg+EKVwsN1vvz/sjvVJC6LK0e571SAyV0yJBYsx5bJtBMeekZi8S2tKRhfOfaL8jx9cU2wQ== X-Received: by 2002:a1c:7407:0:b0:3a3:1d8:5c12 with SMTP id p7-20020a1c7407000000b003a301d85c12mr3208350wmc.191.1657807354296; Thu, 14 Jul 2022 07:02:34 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a5d:64af:0:b0:21d:bf45:f904 with SMTP id m15-20020a5d64af000000b0021dbf45f904ls110927wrp.3.gmail; Thu, 14 Jul 2022 07:02:33 -0700 (PDT) X-Received: by 2002:a5d:4903:0:b0:21d:6d8f:a321 with SMTP id x3-20020a5d4903000000b0021d6d8fa321mr8312026wrq.59.1657807353046; Thu, 14 Jul 2022 07:02:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657807353; cv=none; d=google.com; s=arc-20160816; b=UeDQh1hAJs+CRzDnwaKd5KPyHHMWU8+yq9rdF9njIzum0d6mflZ4s44fRAaguJfshf fH6YjPZFYswMj82DHkUDJHre6ovwVSZbTY03U+N0kLmBEENy4GVdc1ydDmdJbZKtxKlU q2TFsjdaDad2a3O/LgiNgv2KTgS0qN3JCOqORIPCyZhFQ4h6+U9B2lGVzMDPqyNlhO/L Xm7Ctokah6k0xDq44h4oBlH03A5Nh5UzLU4ubWVqldodkkYtbcIgBWdDmPU61paQE3IS 3ha5KOo4CheOy7I1yGXJTj+VstOjlzpnIA2RDcbDZPPl84GOFOpYk/fQciR6ZtJGqH5z c4hA== 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=+4va1oQEAtp8P+P8+M1DvWl85yw3nFaxtze8wXVuAkY=; b=lTdewfBW8O3WZrpyBs9+jO3yKujegHhNx1ipPej3yQgaqu4rECjydF9y1B+4SUgKOA 0PkGhc+Bvwrh8vstx2PX5UWFxrwuYmcFxv7YesFh8/UnwHEimv0yGdnrQS7v0Gym0UCD fP5WHRqzzwfdisqv4No+MBzg9w1y7BO1FUFln6Ni7OEC5M66xtRP6y01PVc1Lk7HkLXm MaWJ/2MY6Y83x9Z8BKH/V8X2USy1H3aAzd7FyFHZ1Re1ZoQseLuB32VtH3f6eLS2iipH OeJKtE4VZAyYk3ZUj7s7Eke0OsUqG9jsWRiMpk+4gIhoXHvvKXyFGphVZ31E74lbMR+w F9MA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=kDFL7eAT; 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 y10-20020a05600015ca00b0021d644c7981sor782959wry.27.2022.07.14.07.02.33 for (Google Transport Security); Thu, 14 Jul 2022 07:02:33 -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:a5d:4304:0:b0:21b:9b2c:be34 with SMTP id h4-20020a5d4304000000b0021b9b2cbe34mr8778371wrq.577.1657807352248; Thu, 14 Jul 2022 07:02:32 -0700 (PDT) Received: from panicking.. ([2.198.242.86]) by smtp.gmail.com with ESMTPSA id k11-20020a7bc40b000000b0039c5cecf206sm2029114wmi.4.2022.07.14.07.02.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jul 2022 07:02:31 -0700 (PDT) From: Michael Trimarchi To: linux-amarula@amarulasolutions.com, Dario Binacchi , Tommaso Merciai Subject: [PATCH 06/11] mtd: nand: Move Samsung specific init/detection logic in nand_samsung.c Date: Thu, 14 Jul 2022 16:02:10 +0200 Message-Id: <20220714140215.444993-7-michael@amarulasolutions.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220714140215.444993-1-michael@amarulasolutions.com> References: <20220714140215.444993-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=kDFL7eAT; 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 c51d0ac59f24200dfdccc897ff7c3c9446c7599a 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: Boris Brezillon Acked-by: Richard Weinberger Signed-off-by: Michael Trimarchi --- drivers/mtd/nand/raw/Makefile | 3 +- drivers/mtd/nand/raw/nand_base.c | 50 +--------------- 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, 99 insertions(+), 50 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 e3f6b903f7..0e3f017bf6 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 4cb38378f4..7f41395afe 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -4173,47 +4173,12 @@ 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 && + if (id_len == 6 && chip->id.data[0] == NAND_MFR_HYNIX && !nand_is_slc(chip)) { unsigned int tmp; @@ -4375,13 +4340,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)) || @@ -4550,12 +4512,6 @@ struct nand_flash_dev *nand_get_flash_type(struct nand_chip *chip, /* 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 2a50f0b214..f4126c3a5a 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 0000000000..3dfbbec382 --- /dev/null +++ b/drivers/mtd/nand/raw/nand_samsung.c @@ -0,0 +1,90 @@ +/* + * 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 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 8fb2a43296..d0312e924b 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);