Unverified Commit 45397787 authored by Tudor Ambarus's avatar Tudor Ambarus
Browse files

mtd: spi-nor: Introduce 'struct spi_nor_controller_ops' 



Move all SPI NOR controller driver specific ops in a dedicated
structure. 'struct spi_nor' becomes lighter.

Use size_t for lengths in 'int (*write_reg)()' and 'int (*read_reg)()'.
Rename wite/read_buf to buf, the name of the functions are
suggestive enough. Constify buf in int (*write_reg). Comply with these
changes in the SPI NOR controller drivers.

Suggested-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
parent 1a21bdfe

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

+14 −9
Original line number Diff line number Diff line
@@ -320,7 +320,8 @@ static void aspeed_smc_unprep(struct spi_nor *nor, enum spi_nor_ops ops) 
	mutex_unlock(&chip->controller->mutex);

}



static int aspeed_smc_read_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len)

static int aspeed_smc_read_reg(struct spi_nor *nor, u8 opcode, u8 *buf,

			       size_t len)

{

	struct aspeed_smc_chip *chip = nor->priv;
@@ -331,8 +332,8 @@ static int aspeed_smc_read_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len) 
	return 0;

}



static int aspeed_smc_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf,

				int len)

static int aspeed_smc_write_reg(struct spi_nor *nor, u8 opcode, const u8 *buf,

				size_t len)

{

	struct aspeed_smc_chip *chip = nor->priv;
@@ -746,6 +747,15 @@ static int aspeed_smc_chip_setup_finish(struct aspeed_smc_chip *chip) 
	return 0;

}



static const struct spi_nor_controller_ops aspeed_smc_controller_ops = {

	.prepare = aspeed_smc_prep,

	.unprepare = aspeed_smc_unprep,

	.read_reg = aspeed_smc_read_reg,

	.write_reg = aspeed_smc_write_reg,

	.read = aspeed_smc_read_user,

	.write = aspeed_smc_write_user,

};



static int aspeed_smc_setup_flash(struct aspeed_smc_controller *controller,

				  struct device_node *np, struct resource *r)

{
@@ -805,12 +815,7 @@ static int aspeed_smc_setup_flash(struct aspeed_smc_controller *controller, 
		nor->dev = dev;

		nor->priv = chip;

		spi_nor_set_flash_node(nor, child);

		nor->read = aspeed_smc_read_user;

		nor->write = aspeed_smc_write_user;

		nor->read_reg = aspeed_smc_read_reg;

		nor->write_reg = aspeed_smc_write_reg;

		nor->prepare = aspeed_smc_prep;

		nor->unprepare = aspeed_smc_unprep;

		nor->controller_ops = &aspeed_smc_controller_ops;



		ret = aspeed_smc_chip_setup_init(chip, r);

		if (ret)

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

+22 −17
Original line number Diff line number Diff line
@@ -356,18 +356,19 @@ static int cqspi_exec_flash_cmd(struct cqspi_st *cqspi, unsigned int reg) 


static int cqspi_command_read(struct spi_nor *nor,

			      const u8 *txbuf, const unsigned n_tx,

			      u8 *rxbuf, const unsigned n_rx)

			      u8 *rxbuf, size_t n_rx)

{

	struct cqspi_flash_pdata *f_pdata = nor->priv;

	struct cqspi_st *cqspi = f_pdata->cqspi;

	void __iomem *reg_base = cqspi->iobase;

	unsigned int rdreg;

	unsigned int reg;

	unsigned int read_len;

	size_t read_len;

	int status;



	if (!n_rx || n_rx > CQSPI_STIG_DATA_LEN_MAX || !rxbuf) {

		dev_err(nor->dev, "Invalid input argument, len %d rxbuf 0x%p\n",

		dev_err(nor->dev,

			"Invalid input argument, len %zu rxbuf 0x%p\n",

			n_rx, rxbuf);

		return -EINVAL;

	}
@@ -404,19 +405,19 @@ static int cqspi_command_read(struct spi_nor *nor, 
}



static int cqspi_command_write(struct spi_nor *nor, const u8 opcode,

			       const u8 *txbuf, const unsigned n_tx)

			       const u8 *txbuf, size_t n_tx)

{

	struct cqspi_flash_pdata *f_pdata = nor->priv;

	struct cqspi_st *cqspi = f_pdata->cqspi;

	void __iomem *reg_base = cqspi->iobase;

	unsigned int reg;

	unsigned int data;

	u32 write_len;

	size_t write_len;

	int ret;



	if (n_tx > CQSPI_STIG_DATA_LEN_MAX || (n_tx && !txbuf)) {

		dev_err(nor->dev,

			"Invalid input argument, cmdlen %d txbuf 0x%p\n",

			"Invalid input argument, cmdlen %zu txbuf 0x%p\n",

			n_tx, txbuf);

		return -EINVAL;

	}
@@ -1050,7 +1051,7 @@ static int cqspi_erase(struct spi_nor *nor, loff_t offs) 
		return ret;



	/* Send write enable, then erase commands. */

	ret = nor->write_reg(nor, SPINOR_OP_WREN, NULL, 0);

	ret = nor->controller_ops->write_reg(nor, SPINOR_OP_WREN, NULL, 0);

	if (ret)

		return ret;
@@ -1080,7 +1081,7 @@ static void cqspi_unprep(struct spi_nor *nor, enum spi_nor_ops ops) 
	mutex_unlock(&cqspi->bus_mutex);

}



static int cqspi_read_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len)

static int cqspi_read_reg(struct spi_nor *nor, u8 opcode, u8 *buf, size_t len)

{

	int ret;
@@ -1091,7 +1092,8 @@ static int cqspi_read_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len) 
	return ret;

}



static int cqspi_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len)

static int cqspi_write_reg(struct spi_nor *nor, u8 opcode, const u8 *buf,

			   size_t len)

{

	int ret;
@@ -1216,6 +1218,16 @@ static void cqspi_request_mmap_dma(struct cqspi_st *cqspi) 
	init_completion(&cqspi->rx_dma_complete);

}



static const struct spi_nor_controller_ops cqspi_controller_ops = {

	.prepare = cqspi_prep,

	.unprepare = cqspi_unprep,

	.read_reg = cqspi_read_reg,

	.write_reg = cqspi_write_reg,

	.read = cqspi_read,

	.write = cqspi_write,

	.erase = cqspi_erase,

};



static int cqspi_setup_flash(struct cqspi_st *cqspi, struct device_node *np)

{

	struct platform_device *pdev = cqspi->pdev;
@@ -1265,14 +1277,7 @@ static int cqspi_setup_flash(struct cqspi_st *cqspi, struct device_node *np) 
		nor->dev = dev;

		spi_nor_set_flash_node(nor, np);

		nor->priv = f_pdata;



		nor->read_reg = cqspi_read_reg;

		nor->write_reg = cqspi_write_reg;

		nor->read = cqspi_read;

		nor->write = cqspi_write;

		nor->erase = cqspi_erase;

		nor->prepare = cqspi_prep;

		nor->unprepare = cqspi_unprep;

		nor->controller_ops = &cqspi_controller_ops;



		mtd->name = devm_kasprintf(dev, GFP_KERNEL, "%s.%d",

					   dev_name(dev), cs);

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

+13 −9
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static void hisi_spi_nor_unprep(struct spi_nor *nor, enum spi_nor_ops ops) 
}



static int hisi_spi_nor_op_reg(struct spi_nor *nor,

				u8 opcode, int len, u8 optype)

				u8 opcode, size_t len, u8 optype)

{

	struct hifmc_priv *priv = nor->priv;

	struct hifmc_host *host = priv->host;
@@ -200,7 +200,7 @@ static int hisi_spi_nor_op_reg(struct spi_nor *nor, 
}



static int hisi_spi_nor_read_reg(struct spi_nor *nor, u8 opcode, u8 *buf,

		int len)

				 size_t len)

{

	struct hifmc_priv *priv = nor->priv;

	struct hifmc_host *host = priv->host;
@@ -215,7 +215,7 @@ static int hisi_spi_nor_read_reg(struct spi_nor *nor, u8 opcode, u8 *buf, 
}



static int hisi_spi_nor_write_reg(struct spi_nor *nor, u8 opcode,

				u8 *buf, int len)

				  const u8 *buf, size_t len)

{

	struct hifmc_priv *priv = nor->priv;

	struct hifmc_host *host = priv->host;
@@ -311,6 +311,15 @@ static ssize_t hisi_spi_nor_write(struct spi_nor *nor, loff_t to, 
	return len;

}



static const struct spi_nor_controller_ops hisi_controller_ops = {

	.prepare = hisi_spi_nor_prep,

	.unprepare = hisi_spi_nor_unprep,

	.read_reg = hisi_spi_nor_read_reg,

	.write_reg = hisi_spi_nor_write_reg,

	.read = hisi_spi_nor_read,

	.write = hisi_spi_nor_write,

};



/**

 * Get spi flash device information and register it as a mtd device.

 */
@@ -357,13 +366,8 @@ static int hisi_spi_nor_register(struct device_node *np, 
	}

	priv->host = host;

	nor->priv = priv;

	nor->controller_ops = &hisi_controller_ops;



	nor->prepare = hisi_spi_nor_prep;

	nor->unprepare = hisi_spi_nor_unprep;

	nor->read_reg = hisi_spi_nor_read_reg;

	nor->write_reg = hisi_spi_nor_write_reg;

	nor->read = hisi_spi_nor_read;

	nor->write = hisi_spi_nor_write;

	ret = spi_nor_scan(nor, NULL, &hwcaps);

	if (ret)

		return ret;

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

+15 −9
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ static int intel_spi_opcode_index(struct intel_spi *ispi, u8 opcode, int optype) 
	return 0;

}



static int intel_spi_hw_cycle(struct intel_spi *ispi, u8 opcode, int len)

static int intel_spi_hw_cycle(struct intel_spi *ispi, u8 opcode, size_t len)

{

	u32 val, status;

	int ret;
@@ -489,7 +489,7 @@ static int intel_spi_hw_cycle(struct intel_spi *ispi, u8 opcode, int len) 
	return 0;

}



static int intel_spi_sw_cycle(struct intel_spi *ispi, u8 opcode, int len,

static int intel_spi_sw_cycle(struct intel_spi *ispi, u8 opcode, size_t len,

			      int optype)

{

	u32 val = 0, status;
@@ -555,7 +555,8 @@ static int intel_spi_sw_cycle(struct intel_spi *ispi, u8 opcode, int len, 
	return 0;

}



static int intel_spi_read_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len)

static int intel_spi_read_reg(struct spi_nor *nor, u8 opcode, u8 *buf,

			      size_t len)

{

	struct intel_spi *ispi = nor->priv;

	int ret;
@@ -575,7 +576,8 @@ static int intel_spi_read_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len) 
	return intel_spi_read_block(ispi, buf, len);

}



static int intel_spi_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len)

static int intel_spi_write_reg(struct spi_nor *nor, u8 opcode, const u8 *buf,

			       size_t len)

{

	struct intel_spi *ispi = nor->priv;

	int ret;
@@ -884,6 +886,14 @@ static void intel_spi_fill_partition(struct intel_spi *ispi, 
	}

}



static const struct spi_nor_controller_ops intel_spi_controller_ops = {

	.read_reg = intel_spi_read_reg,

	.write_reg = intel_spi_write_reg,

	.read = intel_spi_read,

	.write = intel_spi_write,

	.erase = intel_spi_erase,

};



struct intel_spi *intel_spi_probe(struct device *dev,

	struct resource *mem, const struct intel_spi_boardinfo *info)

{
@@ -917,11 +927,7 @@ struct intel_spi *intel_spi_probe(struct device *dev, 


	ispi->nor.dev = ispi->dev;

	ispi->nor.priv = ispi;

	ispi->nor.read_reg = intel_spi_read_reg;

	ispi->nor.write_reg = intel_spi_write_reg;

	ispi->nor.read = intel_spi_read;

	ispi->nor.write = intel_spi_write;

	ispi->nor.erase = intel_spi_erase;

	ispi->nor.controller_ops = &intel_spi_controller_ops;



	ret = spi_nor_scan(&ispi->nor, NULL, &hwcaps);

	if (ret) {

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

+14 −11
Original line number Diff line number Diff line
@@ -151,9 +151,9 @@ static int mtk_nor_execute_cmd(struct mtk_nor *mtk_nor, u8 cmdval) 
}



static int mtk_nor_do_tx_rx(struct mtk_nor *mtk_nor, u8 op,

			    u8 *tx, int txlen, u8 *rx, int rxlen)

			    const u8 *tx, size_t txlen, u8 *rx, size_t rxlen)

{

	int len = 1 + txlen + rxlen;

	size_t len = 1 + txlen + rxlen;

	int i, ret, idx;



	if (len > MTK_NOR_MAX_SHIFT)
@@ -193,7 +193,7 @@ static int mtk_nor_do_tx_rx(struct mtk_nor *mtk_nor, u8 op, 
}



/* Do a WRSR (Write Status Register) command */

static int mtk_nor_wr_sr(struct mtk_nor *mtk_nor, u8 sr)

static int mtk_nor_wr_sr(struct mtk_nor *mtk_nor, const u8 sr)

{

	writeb(sr, mtk_nor->base + MTK_NOR_PRGDATA5_REG);

	writeb(8, mtk_nor->base + MTK_NOR_CNT_REG);
@@ -354,7 +354,7 @@ static ssize_t mtk_nor_write(struct spi_nor *nor, loff_t to, size_t len, 
	return len;

}



static int mtk_nor_read_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len)

static int mtk_nor_read_reg(struct spi_nor *nor, u8 opcode, u8 *buf, size_t len)

{

	int ret;

	struct mtk_nor *mtk_nor = nor->priv;
@@ -376,8 +376,8 @@ static int mtk_nor_read_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len) 
	return ret;

}



static int mtk_nor_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf,

			     int len)

static int mtk_nor_write_reg(struct spi_nor *nor, u8 opcode, const u8 *buf,

			     size_t len)

{

	int ret;

	struct mtk_nor *mtk_nor = nor->priv;
@@ -419,6 +419,13 @@ static int mtk_nor_enable_clk(struct mtk_nor *mtk_nor) 
	return 0;

}



static const struct spi_nor_controller_ops mtk_controller_ops = {

	.read_reg = mtk_nor_read_reg,

	.write_reg = mtk_nor_write_reg,

	.read = mtk_nor_read,

	.write = mtk_nor_write,

};



static int mtk_nor_init(struct mtk_nor *mtk_nor,

			struct device_node *flash_node)

{
@@ -438,12 +445,8 @@ static int mtk_nor_init(struct mtk_nor *mtk_nor, 
	nor->dev = mtk_nor->dev;

	nor->priv = mtk_nor;

	spi_nor_set_flash_node(nor, flash_node);

	nor->controller_ops = &mtk_controller_ops;



	/* fill the hooks to spi nor */

	nor->read = mtk_nor_read;

	nor->read_reg = mtk_nor_read_reg;

	nor->write = mtk_nor_write;

	nor->write_reg = mtk_nor_write_reg;

	nor->mtd.name = "mtk_nor";

	/* initialized with NULL */

	ret = spi_nor_scan(nor, NULL, &hwcaps);

CRA Git | Maintained and supported by SUSTech CRA and CCSE