Unverified Commit ad448884 authored Mar 20, 2025 by Miquel Raynal Committed by Mark Brown Mar 20, 2025

spi: spi-mem: Introduce a default ->exec_op() debug log

Many spi-mem controller drivers have a very similar debug log at the
beginning of their ->exec_op() callback implementation. This debug log is
effectively useful, so let's create one that is complete and concise
enough, so developers no longer need to write their own. The verbosity
being high, VERBOSE_DEBUG will be required in this case.

Remove the debug log from individual drivers and propose a common one.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: Tudor Ambarus <tudor.ambarus@linaro.org>
Link: https://patch.msgid.link/20250320115644.2231240-1-miquel.raynal@bootlin.com

Signed-off-by: Mark Brown <broonie@kernel.org>

parent 48303ef3

drivers/spi/spi-aspeed-smc.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -303,13 +303,6 @@ static int do_aspeed_spi_exec_op(struct spi_mem mem, const struct spi_mem_op o
		u32 ctl_val;
		int ret = 0;

		dev_dbg(aspi->dev,
		"CE%d %s OP %#x mode:%d.%d.%d.%d naddr:%#x ndummies:%#x len:%#x",
		chip->cs, op->data.dir == SPI_MEM_DATA_IN ? "read" : "write",
		op->cmd.opcode, op->cmd.buswidth, op->addr.buswidth,
		op->dummy.buswidth, op->data.buswidth,
		op->addr.nbytes, op->dummy.nbytes, op->data.nbytes);

		addr_mode = readl(aspi->regs + CE_CTRL_REG);
		addr_mode_backup = addr_mode;

drivers/spi/spi-mem.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -377,6 +377,17 @@ int spi_mem_exec_op(struct spi_mem mem, const struct spi_mem_op op)
		/* Make sure the operation frequency is correct before going futher */
		spi_mem_adjust_op_freq(mem, (struct spi_mem_op *)op);

		dev_vdbg(&mem->spi->dev, "[cmd: 0x%02x][%dB addr: %#8llx][%2dB dummy][%4dB data %s] %d%c-%d%c-%d%c-%d%c @ %uHz\n",
		op->cmd.opcode,
		op->addr.nbytes, (op->addr.nbytes ? op->addr.val : 0),
		op->dummy.nbytes,
		op->data.nbytes, (op->data.nbytes ? (op->data.dir == SPI_MEM_DATA_IN ? " read" : "write") : " "),
		op->cmd.buswidth, op->cmd.dtr ? 'D' : 'S',
		op->addr.buswidth, op->addr.dtr ? 'D' : 'S',
		op->dummy.buswidth, op->dummy.dtr ? 'D' : 'S',
		op->data.buswidth, op->data.dtr ? 'D' : 'S',
		op->max_freq ? op->max_freq : mem->spi->max_speed_hz);

		ret = spi_mem_check_op(op);
		if (ret)
		return ret;

drivers/spi/spi-mtk-snfi.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -1284,9 +1284,6 @@ static int mtk_snand_exec_op(struct spi_mem mem, const struct spi_mem_op op)
		{
		struct mtk_snand *ms = spi_controller_get_devdata(mem->spi->controller);

		dev_dbg(ms->dev, "OP %02x ADDR %08llX@%d:%u DATA %d:%u", op->cmd.opcode,
		op->addr.val, op->addr.buswidth, op->addr.nbytes,
		op->data.buswidth, op->data.nbytes);
		if (mtk_snand_is_page_ops(op)) {
		if (op->data.dir == SPI_MEM_DATA_IN)
		return mtk_snand_read_page_cache(ms, op);

drivers/spi/spi-npcm-fiu.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -550,11 +550,6 @@ static int npcm_fiu_exec_op(struct spi_mem mem, const struct spi_mem_op op)
		int ret = 0;
		u8 *buf;

		dev_dbg(fiu->dev, "cmd:%#x mode:%d.%d.%d.%d addr:%#llx len:%#x\n",
		op->cmd.opcode, op->cmd.buswidth, op->addr.buswidth,
		op->dummy.buswidth, op->data.buswidth, op->addr.val,
		op->data.nbytes);

		if (fiu->spix_mode \|\| op->addr.nbytes > 4)
		return -EOPNOTSUPP;

drivers/spi/spi-stm32-qspi.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -362,11 +362,6 @@ static int stm32_qspi_send(struct spi_device spi, const struct spi_mem_op op)
		u32 ccr, cr;
		int timeout, err = 0, err_poll_status = 0;

		dev_dbg(qspi->dev, "cmd:%#x mode:%d.%d.%d.%d addr:%#llx len:%#x\n",
		op->cmd.opcode, op->cmd.buswidth, op->addr.buswidth,
		op->dummy.buswidth, op->data.buswidth,
		op->addr.val, op->data.nbytes);

		cr = readl_relaxed(qspi->io_base + QSPI_CR);
		cr &= ~CR_PRESC_MASK & ~CR_FSEL;
		cr \|= FIELD_PREP(CR_PRESC_MASK, flash->presc);