Skip to contentSkip to conversation

spi: npcm-fiu: add dual and quad write support

PATCH In review Tomer Maimon 2 participants 3 messages Jul 9, 2024 – Jul 16, 2024

Subsystems (2)
lore
Share & tools
lore

Tomer Maimon

author maintainer
#0 lore raw

PATCH 1/1 spi: npcm-fiu: add dual and quad write support

Add dual and quad write support by writing the command write in the UMA register first and then write the data in chunks of 16 bytes.

---
 drivers/spi/spi-npcm-fiu.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/spi/spi-npcm-fiu.c +8 -7
index e42248519688..a999614340d6 100644
@@ -392,7 +392,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;
@@ -402,8 +402,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);
@@ -463,8 +466,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;
 
@@ -473,8 +475,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
maintainer
#1 lore raw
Quoted 8 lines · Tomer Maimon

Add dual and quad write support by writing the command write in the UMA register first and then write the data in chunks of 16 bytes.

---
 drivers/spi/spi-npcm-fiu.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

What's the state of this patch with respect to upstream? Is this something specific to the openbmc/linux dev-6.6 tree, or is there an upstream equivalent? If the latter, can you please link to the relevant patch?

Andrew

author maintainer
#2 lore raw

Hi Andrew,

Quoted 11 lines · Andrew Jeffery
Quoted 8 lines · Tomer Maimon

Add dual and quad write support by writing the command write in the UMA register first and then write the data in chunks of 16 bytes.

---
 drivers/spi/spi-npcm-fiu.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
Quoted 4 lines

What's the state of this patch with respect to upstream? Is this something specific to the openbmc/linux dev-6.6 tree, or is there an upstream equivalent? If the latter, can you please link to the relevant patch?

This patch set hasn't been upstream yet to OpenBMC vanilla and it is not specific to openbmc/linux dev-6.6 tree.
We will do our best to upstream this patch in kernel 6.11 (We already have a lot of patches to handle in the next kernel version :-)). since we need to upgrade the NPCM from dev-6.1 to dev-6.6, we would appreciate it if you could add it now to dev-6.6.

Quoted 2 lines

Andrew

Thanks,

Tomer