Commit c51d0ac5 authored by Boris Brezillon's avatar Boris Brezillon
Browse files

mtd: nand: Move Samsung specific init/detection logic in nand_samsung.c 



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: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: default avatarRichard Weinberger <richard@nod.at>
parent abbe26d1

drivers/mtd/nand/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -61,3 +61,4 @@ obj-$(CONFIG_MTD_NAND_QCOM) += qcom_nandc.o 
obj-$(CONFIG_MTD_NAND_MTK)		+= mtk_nand.o mtk_ecc.o



nand-objs := nand_base.o nand_bbt.o nand_timings.o nand_ids.o

nand-objs += nand_samsung.o

drivers/mtd/nand/nand_base.c

+4 −48
Original line number Diff line number Diff line
@@ -3832,47 +3832,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 && id_data[0] == NAND_MFR_SAMSUNG &&

			!nand_is_slc(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 && id_data[0] == NAND_MFR_HYNIX &&

	if (id_len == 6 && id_data[0] == NAND_MFR_HYNIX &&

	    !nand_is_slc(chip)) {

		unsigned int tmp;
@@ -4001,13 +3966,10 @@ static void nand_decode_bbm_options(struct nand_chip *chip) 
	 * 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)) ||
@@ -4202,12 +4164,6 @@ static int nand_detect(struct nand_chip *chip, struct nand_flash_dev *type) 
	/* 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) {

drivers/mtd/nand/nand_ids.c

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/mtd/nand.h>

#include <linux/sizes.h>



#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
@@ -172,7 +172,7 @@ struct nand_flash_dev nand_flash_ids[] = { 
static const struct nand_manufacturer nand_manufacturers[] = {

	{NAND_MFR_TOSHIBA, "Toshiba"},

	{NAND_MFR_ESMT, "ESMT"},

	{NAND_MFR_SAMSUNG, "Samsung"},

	{NAND_MFR_SAMSUNG, "Samsung", &samsung_nand_manuf_ops},

	{NAND_MFR_FUJITSU, "Fujitsu"},

	{NAND_MFR_NATIONAL, "National"},

	{NAND_MFR_RENESAS, "Renesas"},

drivers/mtd/nand/nand_samsung.c

0 → 100644
+92 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 Free Electrons

 * Copyright (C) 2017 NextThing Co

 *

 * Author: Boris Brezillon <boris.brezillon@free-electrons.com>

 *

 * 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 <linux/mtd/nand.h>



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;

		default:

			/*

			 * We should never reach this case, but if that

			 * happens, this probably means Samsung decided to use

			 * a different extended ID format, and we should find

			 * a way to support it.

			 */

			WARN(1, "Invalid OOB size value");

			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,

};

include/linux/mtd/nand.h

+2 −0
Original line number Diff line number Diff line
@@ -1114,6 +1114,8 @@ nand_manufacturer_name(const struct nand_manufacturer *manufacturer) 


extern struct nand_flash_dev nand_flash_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);