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

Commit 9b2d61f8 authored by Boris Brezillon's avatar Boris Brezillon
Browse files

mtd: nand: Move Toshiba specific init/detection logic in nand_toshiba.c 



Move Toshiba specific initialization and detection logic into
nand_toshiba.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 01389b6b

drivers/mtd/nand/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -63,3 +63,4 @@ 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

nand-objs += nand_toshiba.o

drivers/mtd/nand/nand_base.c

+2 −17
Original line number Diff line number Diff line
@@ -3822,7 +3822,7 @@ static int nand_get_bits_per_cell(u8 cellinfo) 
void nand_decode_ext_id(struct nand_chip *chip)

{

	struct mtd_info *mtd = nand_to_mtd(chip);

	int extid, id_len = chip->id.len;

	int extid;

	u8 *id_data = chip->id.data;

	/* The 3rd id byte holds MLC / multichip data */

	chip->bits_per_cell = nand_get_bits_per_cell(id_data[2]);
@@ -3841,20 +3841,6 @@ void nand_decode_ext_id(struct nand_chip *chip) 
	/* Get buswidth information */

	if (extid & 0x1)

		chip->options |= NAND_BUSWIDTH_16;



	/*

	 * Toshiba 24nm raw SLC (i.e., not BENAND) have 32B OOB per

	 * 512B page. For Toshiba SLC, we decode the 5th/6th byte as

	 * follows:

	 * - ID byte 6, bits[2:0]: 100b -> 43nm, 101b -> 32nm,

	 *                         110b -> 24nm

	 * - ID byte 5, bit[7]:    1 -> BENAND, 0 -> raw SLC

	 */

	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 */)

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

}

EXPORT_SYMBOL_GPL(nand_decode_ext_id);
@@ -3914,8 +3900,7 @@ static void nand_decode_bbm_options(struct nand_chip *chip) 
	 * AMD/Spansion, and Macronix.  All others scan only the first page.

	 */

	if ((nand_is_slc(chip) &&

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

	      maf_id == NAND_MFR_MACRONIX)) ||

	     (maf_id == NAND_MFR_AMD || maf_id == NAND_MFR_MACRONIX)) ||

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

		chip->bbt_options |= NAND_BBT_SCAN2NDPAGE;

}

drivers/mtd/nand/nand_ids.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ struct nand_flash_dev nand_flash_ids[] = { 


/* Manufacturer IDs */

static const struct nand_manufacturer nand_manufacturers[] = {

	{NAND_MFR_TOSHIBA, "Toshiba"},

	{NAND_MFR_TOSHIBA, "Toshiba", &toshiba_nand_manuf_ops},

	{NAND_MFR_ESMT, "ESMT"},

	{NAND_MFR_SAMSUNG, "Samsung", &samsung_nand_manuf_ops},

	{NAND_MFR_FUJITSU, "Fujitsu"},

drivers/mtd/nand/nand_toshiba.c

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

{

	struct mtd_info *mtd = nand_to_mtd(chip);



	nand_decode_ext_id(chip);



	/*

	 * Toshiba 24nm raw SLC (i.e., not BENAND) have 32B OOB per

	 * 512B page. For Toshiba SLC, we decode the 5th/6th byte as

	 * follows:

	 * - ID byte 6, bits[2:0]: 100b -> 43nm, 101b -> 32nm,

	 *                         110b -> 24nm

	 * - ID byte 5, bit[7]:    1 -> BENAND, 0 -> raw SLC

	 */

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

	    (chip->id.data[5] & 0x7) == 0x6 /* 24nm */ &&

	    !(chip->id.data[4] & 0x80) /* !BENAND */)

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

}



static int toshiba_nand_init(struct nand_chip *chip)

{

	if (nand_is_slc(chip))

		chip->bbt_options |= NAND_BBT_SCAN2NDPAGE;



	return 0;

}



const struct nand_manufacturer_ops toshiba_nand_manuf_ops = {

	.detect = toshiba_nand_decode_id,

	.init = toshiba_nand_init,

};

include/linux/mtd/nand.h

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


extern struct nand_flash_dev nand_flash_ids[];



extern const struct nand_manufacturer_ops toshiba_nand_manuf_ops;

extern const struct nand_manufacturer_ops samsung_nand_manuf_ops;

extern const struct nand_manufacturer_ops hynix_nand_manuf_ops;