Commit 8b522c4b authored by Richard Weinberger's avatar Richard Weinberger
Browse files

Merge tag 'spi-nor/for-5.2' of... 

Merge tag 'spi-nor/for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/next

SPI NOR core changes:
- Print all JEDEC ID bytes on error
- Fix comment of spi_nor_find_best_erase_type()
- Add region locking flags for s25fl512s

SPI NOR controller drivers changes:
- intel-spi:
  * Avoid crossing 4K address boundary on read/write
  * Add support for Intel Comet Lake SPI serial flash
parents 1c7cbd63 e43f53c2

drivers/mtd/spi-nor/intel-spi-pci.c

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ static void intel_spi_pci_remove(struct pci_dev *pdev) 
}



static const struct pci_device_id intel_spi_pci_ids[] = {

	{ PCI_VDEVICE(INTEL, 0x02a4), (unsigned long)&bxt_info },

	{ PCI_VDEVICE(INTEL, 0x18e0), (unsigned long)&bxt_info },

	{ PCI_VDEVICE(INTEL, 0x19e0), (unsigned long)&bxt_info },

	{ PCI_VDEVICE(INTEL, 0x34a4), (unsigned long)&bxt_info },

drivers/mtd/spi-nor/intel-spi.c

+8 −0
Original line number Diff line number Diff line
@@ -632,6 +632,10 @@ static ssize_t intel_spi_read(struct spi_nor *nor, loff_t from, size_t len, 
	while (len > 0) {

		block_size = min_t(size_t, len, INTEL_SPI_FIFO_SZ);



		/* Read cannot cross 4K boundary */

		block_size = min_t(loff_t, from + block_size,

				   round_up(from + 1, SZ_4K)) - from;



		writel(from, ispi->base + FADDR);



		val = readl(ispi->base + HSFSTS_CTL);
@@ -685,6 +689,10 @@ static ssize_t intel_spi_write(struct spi_nor *nor, loff_t to, size_t len, 
	while (len > 0) {

		block_size = min_t(size_t, len, INTEL_SPI_FIFO_SZ);



		/* Write cannot cross 4K boundary */

		block_size = min_t(loff_t, to + block_size,

				   round_up(to + 1, SZ_4K)) - to;



		writel(to, ispi->base + FADDR);



		val = readl(ispi->base + HSFSTS_CTL);

drivers/mtd/spi-nor/spi-nor.c

+6 −4
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ spi_nor_find_best_erase_type(const struct spi_nor_erase_map *map, 
	u8 erase_mask = region->offset & SNOR_ERASE_TYPE_MASK;



	/*

	 * Erase types are ordered by size, with the biggest erase type at

	 * Erase types are ordered by size, with the smallest erase type at

	 * index 0.

	 */

	for (i = SNOR_ERASE_TYPE_MAX - 1; i >= 0; i--) {
@@ -1905,7 +1905,9 @@ static const struct flash_info spi_nor_ids[] = { 
			SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) },

	{ "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, USE_CLSR) },

	{ "s25fl256s1", INFO(0x010219, 0x4d01,  64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) },

	{ "s25fl512s",  INFO6(0x010220, 0x4d0080, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) },

	{ "s25fl512s",  INFO6(0x010220, 0x4d0080, 256 * 1024, 256,

			SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |

			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB | USE_CLSR) },

	{ "s25fs512s",  INFO6(0x010220, 0x4d0081, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) },

	{ "s70fl01gs",  INFO(0x010221, 0x4d00, 256 * 1024, 256, 0) },

	{ "s25sl12800", INFO(0x012018, 0x0300, 256 * 1024,  64, 0) },
@@ -2071,8 +2073,8 @@ static const struct flash_info *spi_nor_read_id(struct spi_nor *nor) 
				return &spi_nor_ids[tmp];

		}

	}

	dev_err(nor->dev, "unrecognized JEDEC id bytes: %02x, %02x, %02x\n",

		id[0], id[1], id[2]);

	dev_err(nor->dev, "unrecognized JEDEC id bytes: %*ph\n",

		SPI_NOR_MAX_ID_LEN, id);

	return ERR_PTR(-ENODEV);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE