Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01389b6b authored by Boris Brezillon's avatar Boris Brezillon
Browse files

mtd: nand: Move Hynix specific init/detection logic in nand_hynix.c 



Move Hynix specific initialization and detection logic into
nand_hynix.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 c51d0ac5

drivers/mtd/nand/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -61,4 +61,5 @@ 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_hynix.o

nand-objs += nand_samsung.o

drivers/mtd/nand/nand_base.c

+28 −86
Original line number Diff line number Diff line
@@ -3829,61 +3829,11 @@ void nand_decode_ext_id(struct nand_chip *chip) 
	/* The 4th id byte is the important one */

	extid = id_data[3];



	/*

	 * Field definitions are in the following datasheets:

	 * Old style (4,5 byte ID): Samsung K9GAG08U0M (p.32)

	 * 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_HYNIX &&

	    !nand_is_slc(chip)) {

		unsigned int tmp;



		/* Calc pagesize */

		mtd->writesize = 2048 << (extid & 0x03);

		extid >>= 2;

		/* Calc oobsize */

		switch (((extid >> 2) & 0x04) | (extid & 0x03)) {

		case 0:

			mtd->oobsize = 128;

			break;

		case 1:

			mtd->oobsize = 224;

			break;

		case 2:

			mtd->oobsize = 448;

			break;

		case 3:

			mtd->oobsize = 64;

			break;

		case 4:

			mtd->oobsize = 32;

			break;

		case 5:

			mtd->oobsize = 16;

			break;

		default:

			mtd->oobsize = 640;

			break;

		}

		extid >>= 2;

		/* Calc blocksize */

		tmp = ((extid >> 1) & 0x04) | (extid & 0x03);

		if (tmp < 0x03)

			mtd->erasesize = (128 * 1024) << tmp;

		else if (tmp == 0x03)

			mtd->erasesize = 768 * 1024;

		else

			mtd->erasesize = (64 * 1024) << tmp;

	} else {

	/* Calc pagesize */

	mtd->writesize = 1024 << (extid & 0x03);

	extid >>= 2;

	/* Calc oobsize */

		mtd->oobsize = (8 << (extid & 0x01)) *

			(mtd->writesize >> 9);

	mtd->oobsize = (8 << (extid & 0x01)) * (mtd->writesize >> 9);

	extid >>= 2;

	/* Calc blocksize. Blocksize is multiples of 64KiB */

	mtd->erasesize = (64 * 1024) << (extid & 0x03);
@@ -3903,12 +3853,9 @@ void nand_decode_ext_id(struct nand_chip *chip) 
	if (id_len >= 6 && id_data[0] == NAND_MFR_TOSHIBA &&

	    nand_is_slc(chip) &&

	    (id_data[5] & 0x7) == 0x6 /* 24nm */ &&

				!(id_data[4] & 0x80) /* !BENAND */) {

	     !(id_data[4] & 0x80) /* !BENAND */)

		mtd->oobsize = 32 * mtd->writesize >> 9;

}



	}

}

EXPORT_SYMBOL_GPL(nand_decode_ext_id);



/*
@@ -3966,15 +3913,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_HYNIX)

		chip->bbt_options |= NAND_BBT_SCANLASTPAGE;

	else if ((nand_is_slc(chip) &&

				(maf_id == NAND_MFR_HYNIX ||

				 maf_id == NAND_MFR_TOSHIBA ||

				 maf_id == NAND_MFR_AMD ||

	if ((nand_is_slc(chip) &&

	     (maf_id == NAND_MFR_TOSHIBA || maf_id == NAND_MFR_AMD ||

	      maf_id == NAND_MFR_MACRONIX)) ||

			(mtd->writesize == 2048 &&

			 maf_id == NAND_MFR_MICRON))

	    (mtd->writesize == 2048 && maf_id == NAND_MFR_MICRON))

		chip->bbt_options |= NAND_BBT_SCAN2NDPAGE;

}

drivers/mtd/nand/nand_hynix.c

0 → 100644
+84 −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 hynix_nand_decode_id(struct nand_chip *chip)

{

	struct mtd_info *mtd = nand_to_mtd(chip);



	/* Hynix MLC   (6 byte ID): Hynix H27UBG8T2B (p.22) */

	if (chip->id.len == 6 && !nand_is_slc(chip)) {

		u8 tmp, extid = chip->id.data[3];



		/* Extract pagesize */

		mtd->writesize = 2048 << (extid & 0x03);

		extid >>= 2;



		/* Extract oobsize */

		switch (((extid >> 2) & 0x4) | (extid & 0x3)) {

		case 0:

			mtd->oobsize = 128;

			break;

		case 1:

			mtd->oobsize = 224;

			break;

		case 2:

			mtd->oobsize = 448;

			break;

		case 3:

			mtd->oobsize = 64;

			break;

		case 4:

			mtd->oobsize = 32;

			break;

		case 5:

			mtd->oobsize = 16;

			break;

		default:

			mtd->oobsize = 640;

			break;

		}



		/* Extract blocksize */

		extid >>= 2;

		tmp = ((extid >> 1) & 0x04) | (extid & 0x03);

		if (tmp < 0x03)

			mtd->erasesize = (128 * 1024) << tmp;

		else if (tmp == 0x03)

			mtd->erasesize = 768 * 1024;

		else

			mtd->erasesize = (64 * 1024) << tmp;

	} else {

		nand_decode_ext_id(chip);

	}

}



static int hynix_nand_init(struct nand_chip *chip)

{

	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 hynix_nand_manuf_ops = {

	.detect = hynix_nand_decode_id,

	.init = hynix_nand_init,

};

drivers/mtd/nand/nand_ids.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static const struct nand_manufacturer nand_manufacturers[] = { 
	{NAND_MFR_NATIONAL, "National"},

	{NAND_MFR_RENESAS, "Renesas"},

	{NAND_MFR_STMICRO, "ST Micro"},

	{NAND_MFR_HYNIX, "Hynix"},

	{NAND_MFR_HYNIX, "Hynix", &hynix_nand_manuf_ops},

	{NAND_MFR_MICRON, "Micron"},

	{NAND_MFR_AMD, "AMD/Spansion"},

	{NAND_MFR_MACRONIX, "Macronix"},

include/linux/mtd/nand.h

+1 −0
Original line number Diff line number Diff line
@@ -1115,6 +1115,7 @@ 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;

extern const struct nand_manufacturer_ops hynix_nand_manuf_ops;



int nand_default_bbt(struct mtd_info *mtd);

int nand_markbad_bbt(struct mtd_info *mtd, loff_t offs);