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

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

Pull MTD fixes from Miquel Raynal:
 "MTD core fixes:
   - Fix lock hierarchy in deregister_mtd_blktrans
   - Handle flashes without OTP gracefully
   - Break circular locks in register_mtd_blktrans

  MTD device fixes:
   - mchp48l640:
      - Fix memory leak on cmd
      - Silence some uninitialized variable warnings
   - blkdevs:
      - Initialize rq.limits.discard_granularity

  CFI fixes:
   - Fix crash when erasing/writing AMD cards

  Raw NAND fixes:
   - Fix of_get_nand_secure_regions():
      - Add a missing check
      - Avoid an unwanted probe failure when a DT property is missing"

* tag 'mtd/fixes-for-5.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux:
  mtd: rawnand: Fix probe failure due to of_get_nand_secure_regions()
  mtd: fix lock hierarchy in deregister_mtd_blktrans
  mtd: devices: mchp48l640: Fix memory leak on cmd
  mtd: cfi_cmdset_0002: fix crash when erasing/writing AMD cards
  mtd: core: handle flashes without OTP gracefully
  mtd: mchp48l640: silence some uninitialized variable warnings
  mtd: break circular locks in register_mtd_blktrans
  mtd: rawnand: Add a check in of_get_nand_secure_regions()
  mtd: mtd_blkdevs: Initialize rq.limits.discard_granularity
parents b88bcc7d b4802708

drivers/mtd/chips/cfi_cmdset_0002.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static int cfi_use_status_reg(struct cfi_private *cfi) 
	struct cfi_pri_amdstd *extp = cfi->cmdset_priv;

	u8 poll_mask = CFI_POLL_STATUS_REG | CFI_POLL_DQ;



	return extp->MinorVersion >= '5' &&

	return extp && extp->MinorVersion >= '5' &&

		(extp->SoftwareFeatures & poll_mask) == CFI_POLL_STATUS_REG;

}

drivers/mtd/devices/mchp48l640.c

+3 −2
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static int mchp48l640_write(struct mtd_info *mtd, loff_t to, size_t len, 
		woff += ws;

	}



	return ret;

	return 0;

}



static int mchp48l640_read_page(struct mtd_info *mtd, loff_t from, size_t len,
@@ -255,6 +255,7 @@ static int mchp48l640_read_page(struct mtd_info *mtd, loff_t from, size_t len, 
	if (!ret)

		*retlen += len;



	kfree(cmd);

	return ret;



fail:
@@ -286,7 +287,7 @@ static int mchp48l640_read(struct mtd_info *mtd, loff_t from, size_t len, 
		woff += ws;

	}



	return ret;

	return 0;

};



static const struct mchp48_caps mchp48l640_caps = {

drivers/mtd/mtd_blkdevs.c

+4 −7
Original line number Diff line number Diff line
@@ -419,6 +419,7 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new) 
	if (tr->discard) {

		blk_queue_flag_set(QUEUE_FLAG_DISCARD, new->rq);

		blk_queue_max_discard_sectors(new->rq, UINT_MAX);

		new->rq->limits.discard_granularity = tr->blksize;

	}



	gd->queue = new->rq;
@@ -525,14 +526,10 @@ int register_mtd_blktrans(struct mtd_blktrans_ops *tr) 
	if (!blktrans_notifier.list.next)

		register_mtd_user(&blktrans_notifier);





	mutex_lock(&mtd_table_mutex);



	ret = register_blkdev(tr->major, tr->name);

	if (ret < 0) {

		printk(KERN_WARNING "Unable to register %s block device on major %d: %d\n",

		       tr->name, tr->major, ret);

		mutex_unlock(&mtd_table_mutex);

		return ret;

	}
@@ -542,12 +539,12 @@ int register_mtd_blktrans(struct mtd_blktrans_ops *tr) 
	tr->blkshift = ffs(tr->blksize) - 1;



	INIT_LIST_HEAD(&tr->devs);

	list_add(&tr->list, &blktrans_majors);



	mutex_lock(&mtd_table_mutex);

	list_add(&tr->list, &blktrans_majors);

	mtd_for_each_device(mtd)

		if (mtd->type != MTD_ABSENT)

			tr->add_mtd(tr, mtd);



	mutex_unlock(&mtd_table_mutex);

	return 0;

}
@@ -564,8 +561,8 @@ int deregister_mtd_blktrans(struct mtd_blktrans_ops *tr) 
	list_for_each_entry_safe(dev, next, &tr->devs, list)

		tr->remove_dev(dev);



	unregister_blkdev(tr->major, tr->name);

	mutex_unlock(&mtd_table_mutex);

	unregister_blkdev(tr->major, tr->name);



	BUG_ON(!list_empty(&tr->devs));

	return 0;

drivers/mtd/mtdcore.c

+3 −1
Original line number Diff line number Diff line
@@ -806,7 +806,9 @@ static ssize_t mtd_otp_size(struct mtd_info *mtd, bool is_user) 


err:

	kfree(info);

	return ret;



	/* ENODATA means there is no OTP region. */

	return ret == -ENODATA ? 0 : ret;

}



static struct nvmem_device *mtd_otp_nvmem_register(struct mtd_info *mtd,

drivers/mtd/nand/raw/nand_base.c

+8 −2
Original line number Diff line number Diff line
@@ -5228,12 +5228,18 @@ static bool of_get_nand_on_flash_bbt(struct device_node *np) 
static int of_get_nand_secure_regions(struct nand_chip *chip)

{

	struct device_node *dn = nand_get_flash_node(chip);

	struct property *prop;

	int nr_elem, i, j;



	nr_elem = of_property_count_elems_of_size(dn, "secure-regions", sizeof(u64));

	if (!nr_elem)

	/* Only proceed if the "secure-regions" property is present in DT */

	prop = of_find_property(dn, "secure-regions", NULL);

	if (!prop)

		return 0;



	nr_elem = of_property_count_elems_of_size(dn, "secure-regions", sizeof(u64));

	if (nr_elem <= 0)

		return nr_elem;



	chip->nr_secure_regions = nr_elem / 2;

	chip->secure_regions = kcalloc(chip->nr_secure_regions, sizeof(*chip->secure_regions),

				       GFP_KERNEL);