spi: npcm-fiu: support dual and quad UMA writes
Subsystems (2)
Tomer Maimon
maintainerPATCH 1/1 spi: npcm-fiu: support dual and quad UMA writes
The manual page-program path used the UMA command byte for the first byte of each continuation chunk. That forced command-lane semantics onto chunked writes and blocked dual/quad payload writes.
Switch continuation chunks to data-only UMA transactions so WDBPCK controls the payload bus width.
--- drivers/spi/spi-npcm-fiu.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/spi/spi-npcm-fiu.c +8 -7
@@ -393,7 +393,7 @@ static int npcm_fiu_uma_write(struct spi_mem *mem, {struct npcm_fiu_spi *fiu =spi_controller_get_devdata (mem->spi->controller); -u32 uma_cfg =BIT (10 ); +u32 uma_cfg = cmd ?BIT (10 ) :0 ;u32 data_reg[4 ] = {0 };u32 val;u32 i;
@@ -403,8 +403,11 @@ static int npcm_fiu_uma_write(struct spi_mem *mem, (spi_get_chipselect (mem->spi,0 ) << NPCM_FIU_UMA_CTS_DEV_NUM_SHIFT)); -regmap_update_bits (fiu->regmap,NPCM_FIU_UMA_CMD , -NPCM_FIU_UMA_CMD_CMD , cmd); +if (cmd) +regmap_update_bits (fiu->regmap,NPCM_FIU_UMA_CMD , +NPCM_FIU_UMA_CMD_CMD , cmd); +else + uma_cfg |=ilog2 (op->data.buswidth) <<NPCM_FIU_UMA_CFG_WDBPCK_SHIFT ;if (data_size) {memcpy (data_reg, data, data_size);
@@ -464,8 +467,7 @@ static int npcm_fiu_manualwrite(struct spi_mem *mem,/* Starting the data writing loop in multiples of 8 */ for (idx =0 ; idx < num_data_chunks; ++idx) { - ret =npcm_fiu_uma_write (mem, op, data[0 ], false, - &data[1 ],CHUNK_SIZE -1 ); + ret =npcm_fiu_uma_write (mem, op,0 , false, &data[0 ],CHUNK_SIZE );if (ret)return ret;
@@ -474,8 +476,7 @@ static int npcm_fiu_manualwrite(struct spi_mem *mem,/* Handling chunk remains */ if (remain_data >0 ) { - ret =npcm_fiu_uma_write (mem, op, data[0 ], false, - &data[1 ], remain_data -1 ); + ret =npcm_fiu_uma_write (mem, op,0 , false, &data[0 ], remain_data);if (ret)return ret; }
Signature · 1 line
2.34.1
Mark Brown
maintainerQuoted 1 line · Tomer Maimon
spi: npcm-fiu: support dual and quad UMA writes
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-7.3
Thanks!
[1/1] spi: npcm-fiu: support dual and quad UMA writes
https://git.kernel.org/broonie/spi/c/06f2005b9421
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark