Commit 7ac3a1c1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mtd/fixes-for-5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux 

Pull MTD fixes from Miquel Raynal:
 "MTD parsers:
   - Fix ofpart subpartitions parsing

  Raw NAND:
   - Fix external use of SW Hamming ECC helper (txx9ndfmc, tmio,
     sharpsl, ndfc, lpc32xx_slc, fsmc, cs553x)"

* tag 'mtd/fixes-for-5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux:
  mtd: parsers: ofpart: fix parsing subpartitions
  mtd: rawnand: txx9ndfmc: Fix external use of SW Hamming ECC helper
  mtd: rawnand: tmio: Fix external use of SW Hamming ECC helper
  mtd: rawnand: sharpsl: Fix external use of SW Hamming ECC helper
  mtd: rawnand: ndfc: Fix external use of SW Hamming ECC helper
  mtd: rawnand: lpc32xx_slc: Fix external use of SW Hamming ECC helper
  mtd: rawnand: fsmc: Fix external use of SW Hamming ECC helper
  mtd: rawnand: cs553x: Fix external use of SW Hamming ECC helper
parents bfb819ea 562b4e91

drivers/mtd/nand/raw/cs553x_nand.c

+11 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/module.h>

#include <linux/delay.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/nand-ecc-sw-hamming.h>

#include <linux/mtd/rawnand.h>

#include <linux/mtd/partitions.h>

#include <linux/iopoll.h>
@@ -240,6 +241,15 @@ static int cs_calculate_ecc(struct nand_chip *this, const u_char *dat, 
	return 0;

}



static int cs553x_ecc_correct(struct nand_chip *chip,

			      unsigned char *buf,

			      unsigned char *read_ecc,

			      unsigned char *calc_ecc)

{

	return ecc_sw_hamming_correct(buf, read_ecc, calc_ecc,

				      chip->ecc.size, false);

}



static struct cs553x_nand_controller *controllers[4];



static int cs553x_attach_chip(struct nand_chip *chip)
@@ -251,7 +261,7 @@ static int cs553x_attach_chip(struct nand_chip *chip) 
	chip->ecc.bytes = 3;

	chip->ecc.hwctl  = cs_enable_hwecc;

	chip->ecc.calculate = cs_calculate_ecc;

	chip->ecc.correct  = rawnand_sw_hamming_correct;

	chip->ecc.correct  = cs553x_ecc_correct;

	chip->ecc.strength = 1;



	return 0;

drivers/mtd/nand/raw/fsmc_nand.c

+11 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/sched.h>

#include <linux/types.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/nand-ecc-sw-hamming.h>

#include <linux/mtd/rawnand.h>

#include <linux/platform_device.h>

#include <linux/of.h>
@@ -432,6 +433,15 @@ static int fsmc_read_hwecc_ecc1(struct nand_chip *chip, const u8 *data, 
	return 0;

}



static int fsmc_correct_ecc1(struct nand_chip *chip,

			     unsigned char *buf,

			     unsigned char *read_ecc,

			     unsigned char *calc_ecc)

{

	return ecc_sw_hamming_correct(buf, read_ecc, calc_ecc,

				      chip->ecc.size, false);

}



/* Count the number of 0's in buff upto a max of max_bits */

static int count_written_bits(u8 *buff, int size, int max_bits)

{
@@ -917,7 +927,7 @@ static int fsmc_nand_attach_chip(struct nand_chip *nand) 
	case NAND_ECC_ENGINE_TYPE_ON_HOST:

		dev_info(host->dev, "Using 1-bit HW ECC scheme\n");

		nand->ecc.calculate = fsmc_read_hwecc_ecc1;

		nand->ecc.correct = rawnand_sw_hamming_correct;

		nand->ecc.correct = fsmc_correct_ecc1;

		nand->ecc.hwctl = fsmc_enable_hwecc;

		nand->ecc.bytes = 3;

		nand->ecc.strength = 1;

drivers/mtd/nand/raw/lpc32xx_slc.c

+14 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/of.h>

#include <linux/of_gpio.h>

#include <linux/mtd/lpc32xx_slc.h>

#include <linux/mtd/nand-ecc-sw-hamming.h>



#define LPC32XX_MODNAME		"lpc32xx-nand"
@@ -344,6 +345,18 @@ static int lpc32xx_nand_ecc_calculate(struct nand_chip *chip, 
	return 0;

}



/*

 * Corrects the data

 */

static int lpc32xx_nand_ecc_correct(struct nand_chip *chip,

				    unsigned char *buf,

				    unsigned char *read_ecc,

				    unsigned char *calc_ecc)

{

	return ecc_sw_hamming_correct(buf, read_ecc, calc_ecc,

				      chip->ecc.size, false);

}



/*

 * Read a single byte from NAND device

 */
@@ -802,7 +815,7 @@ static int lpc32xx_nand_attach_chip(struct nand_chip *chip) 
	chip->ecc.write_oob = lpc32xx_nand_write_oob_syndrome;

	chip->ecc.read_oob = lpc32xx_nand_read_oob_syndrome;

	chip->ecc.calculate = lpc32xx_nand_ecc_calculate;

	chip->ecc.correct = rawnand_sw_hamming_correct;

	chip->ecc.correct = lpc32xx_nand_ecc_correct;

	chip->ecc.hwctl = lpc32xx_nand_ecc_enable;



	/*

drivers/mtd/nand/raw/ndfc.c

+11 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/mtd/ndfc.h>

#include <linux/slab.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/nand-ecc-sw-hamming.h>

#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <asm/io.h>
@@ -100,6 +101,15 @@ static int ndfc_calculate_ecc(struct nand_chip *chip, 
	return 0;

}



static int ndfc_correct_ecc(struct nand_chip *chip,

			    unsigned char *buf,

			    unsigned char *read_ecc,

			    unsigned char *calc_ecc)

{

	return ecc_sw_hamming_correct(buf, read_ecc, calc_ecc,

				      chip->ecc.size, false);

}



/*

 * Speedups for buffer read/write/verify

 *
@@ -145,7 +155,7 @@ static int ndfc_chip_init(struct ndfc_controller *ndfc, 
	chip->controller = &ndfc->ndfc_control;

	chip->legacy.read_buf = ndfc_read_buf;

	chip->legacy.write_buf = ndfc_write_buf;

	chip->ecc.correct = rawnand_sw_hamming_correct;

	chip->ecc.correct = ndfc_correct_ecc;

	chip->ecc.hwctl = ndfc_enable_hwecc;

	chip->ecc.calculate = ndfc_calculate_ecc;

	chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_ON_HOST;

drivers/mtd/nand/raw/sharpsl.c

+11 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/module.h>

#include <linux/delay.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/nand-ecc-sw-hamming.h>

#include <linux/mtd/rawnand.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/sharpsl.h>
@@ -96,6 +97,15 @@ static int sharpsl_nand_calculate_ecc(struct nand_chip *chip, 
	return readb(sharpsl->io + ECCCNTR) != 0;

}



static int sharpsl_nand_correct_ecc(struct nand_chip *chip,

				    unsigned char *buf,

				    unsigned char *read_ecc,

				    unsigned char *calc_ecc)

{

	return ecc_sw_hamming_correct(buf, read_ecc, calc_ecc,

				      chip->ecc.size, false);

}



static int sharpsl_attach_chip(struct nand_chip *chip)

{

	if (chip->ecc.engine_type != NAND_ECC_ENGINE_TYPE_ON_HOST)
@@ -106,7 +116,7 @@ static int sharpsl_attach_chip(struct nand_chip *chip) 
	chip->ecc.strength = 1;

	chip->ecc.hwctl = sharpsl_nand_enable_hwecc;

	chip->ecc.calculate = sharpsl_nand_calculate_ecc;

	chip->ecc.correct = rawnand_sw_hamming_correct;

	chip->ecc.correct = sharpsl_nand_correct_ecc;



	return 0;

}