From patchwork Thu Jul 14 14:35:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Trimarchi X-Patchwork-Id: 2172 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 87D133F066 for ; Thu, 14 Jul 2022 16:36:07 +0200 (CEST) Received: by mail-wr1-f69.google.com with SMTP id h29-20020adfaa9d000000b0021d67fc0b4asf601146wrc.9 for ; Thu, 14 Jul 2022 07:36:07 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1657809367; cv=pass; d=google.com; s=arc-20160816; b=O/eUOcWHFDw+x6yXFXHDwu5DEGgHoNo//ytw9t/oQoi1C+n+arz4HxfazcpRlGkPNa aZ6B9pJCIQ6BGeHdlTSHctI74jFnLL1vPP9YWtoTuvpmtZdn73xT9QQkNW615wMctnET HOwRaTb3MQrMXd9vG4F+7Aa5R8WflCYf/JCqJSKQTjJJrx6l3Vj69O+SowcEssZIo3Iw taCLJeyY6ywc/YtMLuzzaTjBJIM6iGgzrj4qy0zSbNwmbBD8Qg/Wuc+gAup8baIquHpD RxiJKNQiXI0CG8cs0RnNNEaDkXJBcRBcpc9i7XpMA4Dm84yk9hdHOWdQHzNXuZL6SNyh aI1g== 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=Z4Za9miDuNc8iaqcB/I0Z0pJsjLu4rXSfpAjBCnI4Ec=; b=upKdUqUvQsX11YFBY6zq487sKYD01cjRxhaw92D00LUwRqJeifu0fq2gX/TZYWvjBq 5Wfmhfp4ahD8iA8RVIqTraS5EE32ahUXO1rTSVfOv0cA4hlU58RH0s+N5UB58qTAlONA jeQhlJ27K2iJS5/MzNBMTsIFPvR6+Ml82FMWkdD4tDwbrAbRy+PGDXhPOiQVCli1pBjc u+KHy8PwQ3nxQfWXAgAAtHT51YmeRgI9GPQp35tKCoVBi8Mw8QY2Ptv7YKsU77RrA27H 2EN4wYXDJAp4xIgIznBrdryqtTMqQk+wXxOP9XOMr6VW3/DhNLVlBOkUlYJ72OegDoKc CxsQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=hOdjk8hx; 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: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=Z4Za9miDuNc8iaqcB/I0Z0pJsjLu4rXSfpAjBCnI4Ec=; b=rZ3M9Y23wD3evuKFDhh5K9Wal0gvDYv+VMQF81VEbjGn0bnmYP6ldW6em0pGZpqupa xeYxO1Iw0vVGaFegjbYs0llQS4BEZxN+cXKTNELdfOL57p3z046s2umHjvS5knh+ufJG aO9SbLOnrwhfmSP+iVBw3394BEczvOSGgPoK4= 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=Z4Za9miDuNc8iaqcB/I0Z0pJsjLu4rXSfpAjBCnI4Ec=; b=bFfyLV57RnpKE+4CjCz7L6ToldSUPji4vImsLqzA4BZBSF4G5DmmShN5VyNqcYcRJY oRwMqsd0Y5V85XWoeV9jDlgZojrhsIaGNon2uUwT4YTu2cTc834KQ9w/dXAyoBrnU8wI QFZUSGMtGL3CPefISdGg55BsYAbno13pqIoiRKsT4ZasmSQ2DquKtgYtxSZNqtjsbLpF FPc5bT6sL8w/QubnLB0eUyKPLcJi2YC/cM8PmnCsA7mdqfGOv8Rbcp9Ojkwr4fCUs+kb ywyRr/uxBqsMvNk+uge0Rg2EI/RV1eg8QzA34/XC0YlHZ+GXNAsijc8kSfTPh/lMmFhf DHmw== X-Gm-Message-State: AJIora8IUziQCvGDLGC8BbjpbRII++6rwvzVQkNK5emF0700f7XNGIN5 Wry23nlV474ylwvctuQ0OuW12Akm X-Google-Smtp-Source: AGRyM1uvjYsS6p+abbsVMbDgNRjNoMntHw6VSIjb8i0KDXPv+dpcNCN4h+JNgfd/ZoFxEp0VMHdsgw== X-Received: by 2002:a05:600c:2411:b0:3a2:e09a:6cb8 with SMTP id 17-20020a05600c241100b003a2e09a6cb8mr9249631wmp.44.1657809367173; Thu, 14 Jul 2022 07:36:07 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a5d:588d:0:b0:21d:339f:dc1 with SMTP id n13-20020a5d588d000000b0021d339f0dc1ls242834wrf.0.gmail; Thu, 14 Jul 2022 07:36:06 -0700 (PDT) X-Received: by 2002:adf:f64f:0:b0:21d:76c6:d98 with SMTP id x15-20020adff64f000000b0021d76c60d98mr8499485wrp.299.1657809365924; Thu, 14 Jul 2022 07:36:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657809365; cv=none; d=google.com; s=arc-20160816; b=qMRgeXJthnQriBlemGmcLdlxYSlyHtNhSu4ZeowpcZegN/SvEYkhYFfYwW+vnHS+ys 5egZoCKtwJWKtU3EWV8JmjB/SeBpup7BBHhHCdiiLtn4rNlY3n9SiH8oGn4o9+OIEulV Zhl/o1U32QY6tntsMgvB/Uo5ZC2slwJSRdi0Y2wGHhRU/xNXIalLDncw9TCDZOWYiTJ2 2UxuQtYYLmL05YULHahCMSa9LDGue80soqeNefRD5FKNSRRk1OUl1n/n3ty+Wa6opVjv OkYnLuYrjVLYrh3PJi1dtgjU9QVTbXMobOeIPOOZvgsbziz76+bIhcNZZ2Rwl1FuEOWz /r6A== 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=+4va1oQEAtp8P+P8+M1DvWl85yw3nFaxtze8wXVuAkY=; b=l4aqQqpyqGYfoLTp9iSlYpw09pyZ1lSqu+yo5qaSyBs5RIc+xD8GeBW/uFWw2ey6Bl 8D/UqpMZ6ITSVfvYFpKYuXpfvHSXZ1ja5217DMfQKA+LwImwtu09tw+uziZC4riJtMAJ 2x4JAZuxwSiGEJh2UjIhx8fTmBhSuYsJ3IlHCXBluC3co5xPTXweqb6ZpNEMISQAFHV+ lTE11CbY7zWGXmsFTt5//ZYU5tCS0u2Fgmem4MNxX5eEbVULNboiivJm+zxhmqYHzAlI AzwIoMmvmMwzqpBTdIX/Mro1SzgBqekpcgzOqZYYJDD26mvNnmW5TOYL+8apG/r+1cb/ /UdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=hOdjk8hx; 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 o2-20020adfa102000000b0021d765472b4sor878952wro.66.2022.07.14.07.36.05 for (Google Transport Security); Thu, 14 Jul 2022 07:36:05 -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:4402:0:b0:21d:8093:138c with SMTP id z2-20020a5d4402000000b0021d8093138cmr8497611wrq.535.1657809365132; Thu, 14 Jul 2022 07:36:05 -0700 (PDT) Received: from panicking.. ([2.198.242.86]) by smtp.gmail.com with ESMTPSA id u18-20020a05600c19d200b003973c54bd69sm5712357wmq.1.2022.07.14.07.36.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jul 2022 07:36:04 -0700 (PDT) From: Michael Trimarchi To: linux-amarula@amarulasolutions.com, Dario Binacchi , Tommaso Merciai , Boris Brezillon , Richard Weinberger , Patrice Chotard , Wolfgang Denk , u-boot@lists.denx.de (open list) Cc: Boris Brezillon , Simon Glass , u-boot@lists.denx.de (open list) Subject: [PATCH 06/11] mtd: nand: Move Samsung specific init/detection logic in nand_samsung.c Date: Thu, 14 Jul 2022 16:35:38 +0200 Message-Id: <20220714143543.448991-7-michael@amarulasolutions.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220714143543.448991-1-michael@amarulasolutions.com> References: <20220714143543.448991-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=hOdjk8hx; 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);