Commit b4991c01 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull mtd fixes from Miquel Raynal:
 "Two important fixes: the build of the SPI NAND layer with old GCC
  versions as well as the fix of the Qpic Makefile which was wrong in
  the first place.

  There are also two smaller fixes about a missing error and status
  check"

* tag 'mtd/fixes-for-6.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux:
  mtd: spinand: Fix build with gcc < 7.5
  mtd: rawnand: Add status chack in r852_ready()
  mtd: inftlcore: Add error check for inftl_read_oob()
  mtd: nand: Drop explicit test for built-in CONFIG_SPI_QPIC_SNAND
parents 3b07108a 1c1fd374

drivers/mtd/inftlcore.c

+5 −4
Original line number Diff line number Diff line
@@ -482,9 +482,10 @@ static inline u16 INFTL_findwriteunit(struct INFTLrecord *inftl, unsigned block) 
		silly = MAX_LOOPS;



		while (thisEUN <= inftl->lastEUN) {

			inftl_read_oob(mtd, (thisEUN * inftl->EraseSize) +

				       blockofs, 8, &retlen, (char *)&bci);



			if (inftl_read_oob(mtd, (thisEUN * inftl->EraseSize) +

				       blockofs, 8, &retlen, (char *)&bci) < 0)

				status = SECTOR_IGNORE;

			else

				status = bci.Status | bci.Status1;

			pr_debug("INFTL: status of block %d in EUN %d is %x\n",

					block , writeEUN, status);

drivers/mtd/nand/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -3,11 +3,8 @@ 
nandcore-objs := core.o bbt.o

obj-$(CONFIG_MTD_NAND_CORE) += nandcore.o

obj-$(CONFIG_MTD_NAND_ECC_MEDIATEK) += ecc-mtk.o

ifeq ($(CONFIG_SPI_QPIC_SNAND),y)

obj-$(CONFIG_SPI_QPIC_SNAND) += qpic_common.o

else

obj-$(CONFIG_MTD_NAND_QCOM) += qpic_common.o

endif

obj-y	+= onenand/

obj-y	+= raw/

obj-y	+= spi/

drivers/mtd/nand/raw/r852.c

+3 −0
Original line number Diff line number Diff line
@@ -387,6 +387,9 @@ static int r852_wait(struct nand_chip *chip) 
static int r852_ready(struct nand_chip *chip)

{

	struct r852_device *dev = r852_get_dev(nand_to_mtd(chip));

	if (dev->card_unstable)

		return 0;



	return !(r852_read_reg(dev, R852_CARD_STA) & R852_CARD_STA_BUSY);

}

include/linux/mtd/spinand.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
		   SPI_MEM_OP_ADDR(2, addr, 1),				\

		   SPI_MEM_OP_DUMMY(ndummy, 1),				\

		   SPI_MEM_OP_DATA_IN(len, buf, 1),			\

		   __VA_OPT__(SPI_MEM_OP_MAX_FREQ(__VA_ARGS__)))

		   SPI_MEM_OP_MAX_FREQ(__VA_ARGS__ + 0))



#define SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(addr, ndummy, buf, len) \

	SPI_MEM_OP(SPI_MEM_OP_CMD(0x0b, 1),			\