Skip to contentSkip to conversation

spi: cadence_qspi: Add quad write support

PATCH New Ley Foon Tan 2 participants 3 messages Feb 26, 2019 – Feb 27, 2019 SPI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 spi: cadence_qspi: Add quad write support

Use quad write if SPI_TX_QUAD flag is set.

---
 drivers/spi/cadence_qspi.c     | 2 +-
 drivers/spi/cadence_qspi.h     | 2 +-
 drivers/spi/cadence_qspi_apb.c | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 drivers/spi/cadence_qspi.c
 mode change 100644 => 100755 drivers/spi/cadence_qspi.h
 mode change 100644 => 100755 drivers/spi/cadence_qspi_apb.c
drivers/spi/cadence_qspi.c +1 -1
old mode 100644
new mode 100755
index 11fce9c4fe..efdb178450
@@ -256,7 +256,7 @@ static int cadence_spi_xfer(struct udevice *dev, unsigned int bitlen,
 		break;
 		case CQSPI_INDIRECT_WRITE:
 			err = cadence_qspi_apb_indirect_write_setup
-				(plat, priv->cmd_len, cmd_buf);
+				(plat, priv->cmd_len, dm_plat->mode, cmd_buf);
 			if (!err) {
 				err = cadence_qspi_apb_indirect_write_execute
 				(plat, data_bytes, dout);
drivers/spi/cadence_qspi.h +1 -1
old mode 100644
new mode 100755
index 055900def0..b491407130
@@ -60,7 +60,7 @@ int cadence_qspi_apb_indirect_read_setup(struct cadence_spi_platdata *plat,
 int cadence_qspi_apb_indirect_read_execute(struct cadence_spi_platdata *plat,
 	unsigned int rxlen, u8 *rxbuf);
 int cadence_qspi_apb_indirect_write_setup(struct cadence_spi_platdata *plat,
-	unsigned int cmdlen, const u8 *cmdbuf);
+	unsigned int cmdlen, unsigned int tx_width, const u8 *cmdbuf);
 int cadence_qspi_apb_indirect_write_execute(struct cadence_spi_platdata *plat,
 	unsigned int txlen, const u8 *txbuf);
 
drivers/spi/cadence_qspi_apb.c +6 -1
old mode 100644
new mode 100755
index a8af352030..55a7501913
@@ -77,6 +77,7 @@
 
 #define	CQSPI_REG_WR_INSTR			0x08
 #define	CQSPI_REG_WR_INSTR_OPCODE_LSB		0
+#define	CQSPI_REG_WR_INSTR_TYPE_DATA_LSB	16
 
 #define	CQSPI_REG_DELAY				0x0C
 #define	CQSPI_REG_DELAY_TSLCH_LSB		0
@@ -686,7 +687,7 @@ failrd:
 
 /* Opcode + Address (3/4 bytes) */
 int cadence_qspi_apb_indirect_write_setup(struct cadence_spi_platdata *plat,
-	unsigned int cmdlen, const u8 *cmdbuf)
+	unsigned int cmdlen, unsigned int tx_width, const u8 *cmdbuf)
 {
 	unsigned int reg;
 	unsigned int addr_bytes = cmdlen > 4 ? 4 : 3;
@@ -702,6 +703,10 @@ int cadence_qspi_apb_indirect_write_setup(struct cadence_spi_platdata *plat,
 
 	/* Configure the opcode */
 	reg = cmdbuf[0] << CQSPI_REG_WR_INSTR_OPCODE_LSB;
+
+	if (tx_width & SPI_TX_QUAD)
+		reg |= CQSPI_INST_TYPE_QUAD << CQSPI_REG_WR_INSTR_TYPE_DATA_LSB;
+
 	writel(reg, plat->regbase + CQSPI_REG_WR_INSTR);
 
 	/* Setup write address. */
Signature · 1 line
2.19.0
#1 lore raw

PATCH 1/1 spi: cadence_qspi: Add quad write support

Quoted 2 lines · Ley Foon Tan

Use quad write if SPI_TX_QUAD flag is set.

How was the patch tested? Could you add that info to commit msg?

Quoted 10 lines
---
 drivers/spi/cadence_qspi.c     | 2 +-
 drivers/spi/cadence_qspi.h     | 2 +-
 drivers/spi/cadence_qspi_apb.c | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 drivers/spi/cadence_qspi.c
 mode change 100644 => 100755 drivers/spi/cadence_qspi.h
 mode change 100644 => 100755 drivers/spi/cadence_qspi_apb.c

Why are the permissions being changed? Please keep it as is

Quoted 65 lines
drivers/spi/cadence_qspi.c +1 -1
old mode 100644
new mode 100755
index 11fce9c4fe..efdb178450
@@ -256,7 +256,7 @@ static int cadence_spi_xfer(struct udevice *dev, unsigned int bitlen,
 		break;
 		case CQSPI_INDIRECT_WRITE:
 			err = cadence_qspi_apb_indirect_write_setup
-				(plat, priv->cmd_len, cmd_buf);
+				(plat, priv->cmd_len, dm_plat->mode, cmd_buf);
 			if (!err) {
 				err = cadence_qspi_apb_indirect_write_execute
 				(plat, data_bytes, dout);
drivers/spi/cadence_qspi.h +1 -1
old mode 100644
new mode 100755
index 055900def0..b491407130
@@ -60,7 +60,7 @@ int cadence_qspi_apb_indirect_read_setup(struct cadence_spi_platdata *plat,
 int cadence_qspi_apb_indirect_read_execute(struct cadence_spi_platdata *plat,
 	unsigned int rxlen, u8 *rxbuf);
 int cadence_qspi_apb_indirect_write_setup(struct cadence_spi_platdata *plat,
-	unsigned int cmdlen, const u8 *cmdbuf);
+	unsigned int cmdlen, unsigned int tx_width, const u8 *cmdbuf);
 int cadence_qspi_apb_indirect_write_execute(struct cadence_spi_platdata *plat,
 	unsigned int txlen, const u8 *txbuf);
 
drivers/spi/cadence_qspi_apb.c +6 -1
old mode 100644
new mode 100755
index a8af352030..55a7501913
@@ -77,6 +77,7 @@
 
 #define	CQSPI_REG_WR_INSTR			0x08
 #define	CQSPI_REG_WR_INSTR_OPCODE_LSB		0
+#define	CQSPI_REG_WR_INSTR_TYPE_DATA_LSB	16
 
 #define	CQSPI_REG_DELAY				0x0C
 #define	CQSPI_REG_DELAY_TSLCH_LSB		0
@@ -686,7 +687,7 @@ failrd:
 
 /* Opcode + Address (3/4 bytes) */
 int cadence_qspi_apb_indirect_write_setup(struct cadence_spi_platdata *plat,
-	unsigned int cmdlen, const u8 *cmdbuf)
+	unsigned int cmdlen, unsigned int tx_width, const u8 *cmdbuf)
 {
 	unsigned int reg;
 	unsigned int addr_bytes = cmdlen > 4 ? 4 : 3;
@@ -702,6 +703,10 @@ int cadence_qspi_apb_indirect_write_setup(struct cadence_spi_platdata *plat,
 
 	/* Configure the opcode */
 	reg = cmdbuf[0] << CQSPI_REG_WR_INSTR_OPCODE_LSB;
+
+	if (tx_width & SPI_TX_QUAD)
+		reg |= CQSPI_INST_TYPE_QUAD << CQSPI_REG_WR_INSTR_TYPE_DATA_LSB;
+
 	writel(reg, plat->regbase + CQSPI_REG_WR_INSTR);
 
 	/* Setup write address. */
Signature · 2 lines
Regards
Vignesh
#2 lore raw

PATCH 1/1 spi: cadence_qspi: Add quad write support

Quoted 6 lines · Vignesh R
Quoted 3 lines · Ley Foon Tan

Use quad write if SPI_TX_QUAD flag is set.

How was the patch tested? Could you add that info to commit msg?

Tested on Stratix 10 SoC board.
Will update commit message.

Quoted 12 lines
Quoted 12 lines

---
 drivers/spi/cadence_qspi.c     | 2 +-
 drivers/spi/cadence_qspi.h     | 2 +-
 drivers/spi/cadence_qspi_apb.c | 7 ++++++-

 3 files changed, 8 insertions(+), 3 deletions(-)

 mode change 100644 => 100755 drivers/spi/cadence_qspi.c mode change 100644 => 100755 drivers/spi/cadence_qspi.h mode change 100644 => 100755 drivers/spi/cadence_qspi_apb.c

Quoted 1 line

Why are the permissions being changed? Please keep it as is

Change it accidentally. Will fix this.

Quoted 84 lines
Quoted 84 lines
drivers/spi/cadence_qspi.c +0 -0
old mode 100644
new mode 100755
index 11fce9c4fe..efdb178450
@@ -256,7 +256,7 @@ static int cadence_spi_xfer(struct udevice
 *dev, unsigned int bitlen,
  		break;

  case CQSPI_INDIRECT_WRITE:
  err =
cadence_qspi_apb_indirect_write_setup

drivers/spi/cadence_qspi.c +1 -1
-				(plat, priv->cmd_len, cmd_buf);
+				(plat, priv->cmd_len, dm_plat-
Quoted 1 line

mode, cmd_buf);

  if (!err) {
  err = cadence_qspi_apb_indirect_write_execute
  (plat, data_bytes, dout);

drivers/spi/cadence_qspi.h +0 -0
old mode 100644
new mode 100755
index 055900def0..b491407130
@@ -60,7 +60,7 @@ int cadence_qspi_apb_indirect_read_setup(struct
 cadence_spi_platdata *plat,

 int cadence_qspi_apb_indirect_read_execute(struct cadence_spi_platdata *plat,
  unsigned int rxlen, u8 *rxbuf); int cadence_qspi_apb_indirect_write_setup(struct cadence_spi_platdata *plat,

drivers/spi/cadence_qspi.h +1 -1
-	unsigned int cmdlen, const u8 *cmdbuf);
+	unsigned int cmdlen, unsigned int tx_width, const u8

*cmdbuf);
 int cadence_qspi_apb_indirect_write_execute(struct cadence_spi_platdata *plat,
  unsigned int txlen, const u8 *txbuf);

drivers/spi/cadence_qspi_apb.c +0 -0
old mode 100644
new mode 100755
index a8af352030..55a7501913
@@ -77,6 +77,7 @@


 #define CQSPI_REG_WR_INSTR 0x08
 #define CQSPI_REG_WR_INSTR_OPCODE_LSB 0
+#define CQSPI_REG_WR_INSTR_TYPE_DATA_LSB 16

 #define CQSPI_REG_DELAY 0x0C
 #define CQSPI_REG_DELAY_TSLCH_LSB 0

drivers/spi/cadence_qspi_apb.c +0 -0
@@ -686,7 +687,7 @@ failrd:


 /* Opcode + Address (3/4 bytes) */
 int cadence_qspi_apb_indirect_write_setup(struct
cadence_spi_platdata *plat,

drivers/spi/cadence_qspi_apb.c +1 -1
-	unsigned int cmdlen, const u8 *cmdbuf)
+	unsigned int cmdlen, unsigned int tx_width, const u8

*cmdbuf)
 {
  unsigned int reg;
  unsigned int addr_bytes = cmdlen > 4 ? 4 : 3;

drivers/spi/cadence_qspi_apb.c +0 -0
@@ -702,6 +703,10 @@ int

cadence_qspi_apb_indirect_write_setup(struct cadence_spi_platdata *plat,

  /* Configure the opcode */
  reg = cmdbuf[0] << CQSPI_REG_WR_INSTR_OPCODE_LSB;

drivers/spi/cadence_qspi_apb.c +3 -0
+
+	if (tx_width & SPI_TX_QUAD)
+		reg |= CQSPI_INST_TYPE_QUAD <<

CQSPI_REG_WR_INSTR_TYPE_DATA_LSB;
+
  writel(reg, plat->regbase + CQSPI_REG_WR_INSTR);
  /* Setup write address. */