Skip to contentSkip to conversation

spi: cadence_qspi: optimize & fix indirect rd-writes

PATCH Superseded Vikas Manocha 3 participants 18 messages Sep 11, 2015 – Sep 23, 2015

Subsystems (2)

v6 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

v6 cover spi: cadence_qspi: optimize & fix indirect rd-writes

This patchset:
- fixes trigger base & transfer start address register programming. This fix superseeds the previous patch "spi: cadence_qspi: Fix the indirect ahb trigger address setting".
- adds support to get fifo width from device tree

Changes in v6:
- fixed binding for trigger-address.

Changes in v5:
- fixed compilation warnings.

Changes in v4:
- fifo-width & trigger address alligned to linux device tree binding.
- removed un-necessary casting.
- renaming of one parameter splitted to separate patch.
- trigger address of socfpga reverted back to 0x0.
- code formatting done to avoid checkpatch CHECKS.

Changes in v3:
- removed two patches which were bypassing the sram level check.
- format string in patch corrected 3/4
- added commit message in patch 1/4

Changes in v2:
- rebased to master.
- removed patch "spi: cadence_qspi: read can be independent of fifo width", it was implemented in other patchset, in mainline now.

Vikas Manocha (5):
spi: cadence_qspi: move trigger base configuration in init
spi: cadence_qspi: fix indirect read/write start address
spi: cadence_qspi: fix base trigger address & transfer start address
spi: cadence_qspi: rename ahbbase to flashbase for clarity
spi: cadence_qspi: get fifo width from device tree

 arch/arm/dts/socfpga.dtsi      |    2 ++
 arch/arm/dts/stv0991.dts       |    2 ++
 drivers/spi/cadence_qspi.c     |   14 ++++++++------
 drivers/spi/cadence_qspi.h     |    6 ++++--
 drivers/spi/cadence_qspi_apb.c |   42 ++++++++++++++++------------------------
 5 files changed, 33 insertions(+), 33 deletions(-)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v6 1/5 spi: cadence_qspi: move trigger base configuration in init

No need to configure indirect trigger address for every read/write.

---

Changes in v6: None
Changes in v5: fixed type cast compilation warnings. Changes in v4: removed extra type casts.
Changes in v3: added commit message & removed extra bracket. Changes in v2: Rebased to master

 drivers/spi/cadence_qspi_apb.c |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/spi/cadence_qspi_apb.c +2 -7
index d053407..d377ad1 100644
@@ -534,6 +534,8 @@ void cadence_qspi_apb_controller_init(struct cadence_spi_platdata *plat)
 
 	/* Indirect mode configurations */
 	writel((plat->sram_size/2), plat->regbase + CQSPI_REG_SRAMPARTITION);
+	writel((u32)plat->ahbbase & CQSPI_INDIRECTTRIGGER_ADDR_MASK,
+	       plat->regbase + CQSPI_REG_INDIRECTTRIGGER);
 
 	/* Disable all interrupts */
 	writel(0, plat->regbase + CQSPI_REG_IRQMASK);
@@ -693,10 +695,6 @@ int cadence_qspi_apb_indirect_read_setup(struct cadence_spi_platdata *plat,
 		/* for normal read (only ramtron as of now) */
 		addr_bytes = cmdlen - 1;
 
-	/* Setup the indirect trigger address */
-	writel(((u32)plat->ahbbase & CQSPI_INDIRECTTRIGGER_ADDR_MASK),
-	       plat->regbase + CQSPI_REG_INDIRECTTRIGGER);
-
 	/* Configure the opcode */
 	rd_reg = cmdbuf[0] << CQSPI_REG_RD_INSTR_OPCODE_LSB;
 
@@ -790,9 +788,6 @@ int cadence_qspi_apb_indirect_write_setup(struct cadence_spi_platdata *plat,
 		       cmdlen, (unsigned int)cmdbuf);
 		return -EINVAL;
 	}
-	/* Setup the indirect trigger address */
-	writel(((u32)plat->ahbbase & CQSPI_INDIRECTTRIGGER_ADDR_MASK),
-	       plat->regbase + CQSPI_REG_INDIRECTTRIGGER);
 
 	/* Configure the opcode */
 	reg = cmdbuf[0] << CQSPI_REG_WR_INSTR_OPCODE_LSB;
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH v6 1/5 spi: cadence_qspi: move trigger base configuration in init

Quoted 51 lines · Vikas Manocha

No need to configure indirect trigger address for every read/write.

---

Changes in v6: None
Changes in v5: fixed type cast compilation warnings. Changes in v4: removed extra type casts.
Changes in v3: added commit message & removed extra bracket. Changes in v2: Rebased to master

 drivers/spi/cadence_qspi_apb.c |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/spi/cadence_qspi_apb.c +2 -8
index d053407..d377ad1 100644
@@ -534,6 +534,8 @@ void cadence_qspi_apb_controller_init(struct cadence_spi_platdata *plat)
 
        /* Indirect mode configurations */
        writel((plat->sram_size/2), plat->regbase + CQSPI_REG_SRAMPARTITION);
+       writel((u32)plat->ahbbase & CQSPI_INDIRECTTRIGGER_ADDR_MASK,
+              plat->regbase + CQSPI_REG_INDIRECTTRIGGER);
 
        /* Disable all interrupts */
        writel(0, plat->regbase + CQSPI_REG_IRQMASK);
@@ -693,10 +695,6 @@ int cadence_qspi_apb_indirect_read_setup(struct cadence_spi_platdata *plat,
                /* for normal read (only ramtron as of now) */
                addr_bytes = cmdlen - 1;
 
-       /* Setup the indirect trigger address */
-       writel(((u32)plat->ahbbase & CQSPI_INDIRECTTRIGGER_ADDR_MASK),
-              plat->regbase + CQSPI_REG_INDIRECTTRIGGER);
-
        /* Configure the opcode */
        rd_reg = cmdbuf[0] << CQSPI_REG_RD_INSTR_OPCODE_LSB;
 
@@ -790,9 +788,6 @@ int cadence_qspi_apb_indirect_write_setup(struct cadence_spi_platdata *plat,
                       cmdlen, (unsigned int)cmdbuf);
                return -EINVAL;
        }
-       /* Setup the indirect trigger address */
-       writel(((u32)plat->ahbbase & CQSPI_INDIRECTTRIGGER_ADDR_MASK),
-              plat->regbase + CQSPI_REG_INDIRECTTRIGGER);
 
        /* Configure the opcode */
        reg = cmdbuf[0] << CQSPI_REG_WR_INSTR_OPCODE_LSB;
--

1.7.9.5

Quoted 4 lines

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

thanks!

Signature · 1 line
Jagan | openedev.
#3 lore raw

PATCH v6 2/5 spi: cadence_qspi: fix indirect read/write start address

In reply to Vikas Manocha

Indirect read/write start addresses are flash start addresses for indirect read or write transfers. These should be absolute flash addresses instead of offsets.

---

Changes in v6: none
Changes in v5: fixed type cast compilation warnings. Changes in v4: removed extra type casts. Changes in v3: none
Changes in v2: Rebased to master

 drivers/spi/cadence_qspi_apb.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/spi/cadence_qspi_apb.c +4 -2
index d377ad1..c5b14c5 100644
@@ -705,7 +705,8 @@ int cadence_qspi_apb_indirect_read_setup(struct cadence_spi_platdata *plat,
 
 	/* Get address */
 	addr_value = cadence_qspi_apb_cmd2addr(&cmdbuf[1], addr_bytes);
-	writel(addr_value, plat->regbase + CQSPI_REG_INDIRECTRDSTARTADDR);
+	writel((u32)plat->ahbbase + addr_value,
+	       plat->regbase + CQSPI_REG_INDIRECTRDSTARTADDR);
 
 	/* The remaining lenght is dummy bytes. */
 	dummy_bytes = cmdlen - addr_bytes - 1;
@@ -795,7 +796,8 @@ int cadence_qspi_apb_indirect_write_setup(struct cadence_spi_platdata *plat,
 
 	/* Setup write address. */
 	reg = cadence_qspi_apb_cmd2addr(&cmdbuf[1], addr_bytes);
-	writel(reg, plat->regbase + CQSPI_REG_INDIRECTWRSTARTADDR);
+	writel((u32)plat->ahbbase + reg,
+	       plat->regbase + CQSPI_REG_INDIRECTWRSTARTADDR);
 
 	reg = readl(plat->regbase + CQSPI_REG_SIZE);
 	reg &= ~CQSPI_REG_SIZE_ADDRESS_MASK;
Signature · 1 line
1.7.9.5
#4 lore raw

PATCH v6 2/5 spi: cadence_qspi: fix indirect read/write start address

Quoted 5 lines · Vikas Manocha

Indirect read/write start addresses are flash start addresses for indirect read or write transfers. These should be absolute flash addresses instead of offsets.

Quoted 42 lines

---

Changes in v6: none
Changes in v5: fixed type cast compilation warnings. Changes in v4: removed extra type casts. Changes in v3: none
Changes in v2: Rebased to master

 drivers/spi/cadence_qspi_apb.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/spi/cadence_qspi_apb.c +4 -3
index d377ad1..c5b14c5 100644
@@ -705,7 +705,8 @@ int cadence_qspi_apb_indirect_read_setup(struct cadence_spi_platdata *plat,
 
        /* Get address */
        addr_value = cadence_qspi_apb_cmd2addr(&cmdbuf[1], addr_bytes);
-       writel(addr_value, plat->regbase + CQSPI_REG_INDIRECTRDSTARTADDR);
+       writel((u32)plat->ahbbase + addr_value,
+              plat->regbase + CQSPI_REG_INDIRECTRDSTARTADDR);
 
        /* The remaining lenght is dummy bytes. */
        dummy_bytes = cmdlen - addr_bytes - 1;
@@ -795,7 +796,8 @@ int cadence_qspi_apb_indirect_write_setup(struct cadence_spi_platdata *plat,
 
        /* Setup write address. */
        reg = cadence_qspi_apb_cmd2addr(&cmdbuf[1], addr_bytes);
-       writel(reg, plat->regbase + CQSPI_REG_INDIRECTWRSTARTADDR);
+       writel((u32)plat->ahbbase + reg,
+              plat->regbase + CQSPI_REG_INDIRECTWRSTARTADDR);
 
        reg = readl(plat->regbase + CQSPI_REG_SIZE);
        reg &= ~CQSPI_REG_SIZE_ADDRESS_MASK;
--

1.7.9.5

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Signature · 1 line
Jagan | openedev.
#5 lore raw

PATCH v6 2/5 spi: cadence_qspi: fix indirect read/write start address

Quoted 38 lines · Jagan Teki
Quoted 5 lines · Vikas Manocha

Indirect read/write start addresses are flash start addresses for indirect read or write transfers. These should be absolute flash addresses instead of offsets.

Quoted 29 lines

---

Changes in v6: none
Changes in v5: fixed type cast compilation warnings. Changes in v4: removed extra type casts. Changes in v3: none
Changes in v2: Rebased to master

 drivers/spi/cadence_qspi_apb.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/drivers/spi/cadence_qspi_apb.c index d377ad1..c5b14c5 100644

drivers/spi/cadence_qspi_apb.c +0 -1
@@ -705,7 +705,8 @@ int cadence_qspi_apb_indirect_read_setup(struct
 cadence_spi_platdata *plat,
 
        /* Get address */
        addr_value = cadence_qspi_apb_cmd2addr(&cmdbuf[1], addr_bytes);
 
-       writel(addr_value, plat->regbase +

CQSPI_REG_INDIRECTRDSTARTADDR); + writel((u32)plat->ahbbase +
addr_value,
+ plat->regbase + CQSPI_REG_INDIRECTRDSTARTADDR);

        /* The remaining lenght is dummy bytes. */
        dummy_bytes = cmdlen - addr_bytes - 1;
Quoted 8 lines

drivers/spi/cadence_qspi_apb.c int cadence_qspi_apb_indirect_write_setup(struct · line 801

Quoted 8 lines
drivers/spi/cadence_qspi_apb.c +1 -1
@@ -795,7 +796,8 @@ int cadence_qspi_apb_indirect_write_setup(struct
 cadence_spi_platdata *plat,
 
        /* Setup write address. */
        reg = cadence_qspi_apb_cmd2addr(&cmdbuf[1], addr_bytes);
 
-       writel(reg, plat->regbase + CQSPI_REG_INDIRECTWRSTARTADDR);
+       writel((u32)plat->ahbbase + reg,

Jagan, is introducing ad-hoc typecasts to suppress warnings OK with you ?

Best regards,
Marek Vasut

#6 lore raw

PATCH v6 2/5 spi: cadence_qspi: fix indirect read/write start address

Quoted 42 lines · Marek Vasut
Quoted 41 lines · Jagan Teki
Quoted 5 lines · Vikas Manocha

Indirect read/write start addresses are flash start addresses for indirect read or write transfers. These should be absolute flash addresses instead of offsets.

Quoted 32 lines

---

Changes in v6: none
Changes in v5: fixed type cast compilation warnings. Changes in v4: removed extra type casts. Changes in v3: none
Changes in v2: Rebased to master

 drivers/spi/cadence_qspi_apb.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/drivers/spi/cadence_qspi_apb.c index d377ad1..c5b14c5 100644

drivers/spi/cadence_qspi_apb.c +0 -1
@@ -705,7 +705,8 @@ int cadence_qspi_apb_indirect_read_setup(struct
 cadence_spi_platdata *plat,
 
        /* Get address */
        addr_value = cadence_qspi_apb_cmd2addr(&cmdbuf[1], addr_bytes);
 
-       writel(addr_value, plat->regbase +

CQSPI_REG_INDIRECTRDSTARTADDR); + writel((u32)plat->ahbbase +
addr_value,

drivers/spi/cadence_qspi_apb.c +1 -0
+              plat->regbase + CQSPI_REG_INDIRECTRDSTARTADDR);
 
        /* The remaining lenght is dummy bytes. */
        dummy_bytes = cmdlen - addr_bytes - 1;
@@ -795,7 +796,8 @@ int cadence_qspi_apb_indirect_write_setup(struct
 cadence_spi_platdata *plat,
 
Quoted 7 lines
Quoted 5 lines

drivers/spi/cadence_qspi_apb.c int cadence_qspi_apb_indirect_write_setup(struct cadence_spi_platdata *plat,

Quoted 5 lines
drivers/spi/cadence_qspi_apb.c +1 -1
        /* Setup write address. */
        reg = cadence_qspi_apb_cmd2addr(&cmdbuf[1], addr_bytes);
 
-       writel(reg, plat->regbase + CQSPI_REG_INDIRECTWRSTARTADDR);
+       writel((u32)plat->ahbbase + reg,

Jagan, is introducing ad-hoc typecasts to suppress warnings OK with you ?

I think there are few ad-hoc typecasts similar to were there in the driver, do you have any other thoughts?

thanks!

Signature · 1 line
Jagan | openedev.
#7 lore raw

PATCH v6 2/5 spi: cadence_qspi: fix indirect read/write start address

Quoted 47 lines · Jagan Teki
Quoted 46 lines · Marek Vasut
Quoted 45 lines · Jagan Teki
Quoted 5 lines · Vikas Manocha

Indirect read/write start addresses are flash start addresses for indirect read or write transfers. These should be absolute flash addresses instead of offsets.

Quoted 36 lines

---

Changes in v6: none
Changes in v5: fixed type cast compilation warnings. Changes in v4: removed extra type casts. Changes in v3: none
Changes in v2: Rebased to master

 drivers/spi/cadence_qspi_apb.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/drivers/spi/cadence_qspi_apb.c index d377ad1..c5b14c5 100644

drivers/spi/cadence_qspi_apb.c +0 -1
@@ -705,7 +705,8 @@ int cadence_qspi_apb_indirect_read_setup(struct
 cadence_spi_platdata *plat,
 
        /* Get address */
        addr_value = cadence_qspi_apb_cmd2addr(&cmdbuf[1],
        addr_bytes);
 
-       writel(addr_value, plat->regbase +

CQSPI_REG_INDIRECTRDSTARTADDR); + writel((u32)plat->ahbbase +
addr_value,

drivers/spi/cadence_qspi_apb.c +1 -0
+              plat->regbase + CQSPI_REG_INDIRECTRDSTARTADDR);
 
        /* The remaining lenght is dummy bytes. */
        dummy_bytes = cmdlen - addr_bytes - 1;
@@ -795,7 +796,8 @@ int cadence_qspi_apb_indirect_write_setup(struct
 cadence_spi_platdata *plat,
 
        /* Setup write address. */
        reg = cadence_qspi_apb_cmd2addr(&cmdbuf[1], addr_bytes);
 
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

drivers/spi/cadence_qspi_apb.c int cadence_qspi_apb_indirect_write_setup(struct cadence_spi_platdata *plat, · line 799

Quoted 2 lines
drivers/spi/cadence_qspi_apb.c +1 -1
-       writel(reg, plat->regbase + CQSPI_REG_INDIRECTWRSTARTADDR);
+       writel((u32)plat->ahbbase + reg,

Jagan, is introducing ad-hoc typecasts to suppress warnings OK with you ?

I think there are few ad-hoc typecasts similar to were there in the driver, do you have any other thoughts?

Yes, for example -- fix the few, then add new features. Adding more just because there were some before is a totally shitty approach.

Best regards,
Marek Vasut

#8 lore raw

PATCH v6 2/5 spi: cadence_qspi: fix indirect read/write start address

Hi Vikas,

Quoted 45 lines · Marek Vasut
Quoted 44 lines · Jagan Teki
Quoted 43 lines · Marek Vasut
Quoted 42 lines · Jagan Teki
Quoted 5 lines · Vikas Manocha

Indirect read/write start addresses are flash start addresses for indirect read or write transfers. These should be absolute flash addresses instead of offsets.

Quoted 33 lines

---

Changes in v6: none
Changes in v5: fixed type cast compilation warnings. Changes in v4: removed extra type casts. Changes in v3: none
Changes in v2: Rebased to master

 drivers/spi/cadence_qspi_apb.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/drivers/spi/cadence_qspi_apb.c index d377ad1..c5b14c5 100644

drivers/spi/cadence_qspi_apb.c +0 -1
@@ -705,7 +705,8 @@ int cadence_qspi_apb_indirect_read_setup(struct
 cadence_spi_platdata *plat,
 
        /* Get address */
        addr_value = cadence_qspi_apb_cmd2addr(&cmdbuf[1],
        addr_bytes);
 
-       writel(addr_value, plat->regbase +

CQSPI_REG_INDIRECTRDSTARTADDR); + writel((u32)plat->ahbbase +
addr_value,

drivers/spi/cadence_qspi_apb.c +1 -0
+              plat->regbase + CQSPI_REG_INDIRECTRDSTARTADDR);
 
        /* The remaining lenght is dummy bytes. */
        dummy_bytes = cmdlen - addr_bytes - 1;
@@ -795,7 +796,8 @@ int cadence_qspi_apb_indirect_write_setup(struct
 cadence_spi_platdata *plat,
 
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 5 lines

drivers/spi/cadence_qspi_apb.c int cadence_qspi_apb_indirect_write_setup(struct cadence_spi_platdata *plat,

Quoted 5 lines
drivers/spi/cadence_qspi_apb.c +1 -1
        /* Setup write address. */
        reg = cadence_qspi_apb_cmd2addr(&cmdbuf[1], addr_bytes);
 
-       writel(reg, plat->regbase + CQSPI_REG_INDIRECTWRSTARTADDR);
+       writel((u32)plat->ahbbase + reg,

Jagan, is introducing ad-hoc typecasts to suppress warnings OK with you ?

Can you fix this?

Quoted 6 lines
Quoted 3 lines

I think there are few ad-hoc typecasts similar to were there in the driver, do you have any other thoughts?

Yes, for example -- fix the few, then add new features. Adding more just because there were some before is a totally shitty approach.

thanks!

Signature · 1 line
Jagan | openedev.
#9 lore raw

PATCH v6 3/5 spi: cadence_qspi: fix base trigger address & transfer start address

In reply to Vikas Manocha

This patch is to separate the base trigger from the read/write transfer start addresses.

Base trigger register address (0x1c register) corresponds to the address which should be put on AHB bus to handle indirect transfer triggered before.

To handle indirect transfer we need to issue addresses from (value of 0x1c) to (value of 0x1c) + 15*4 ("4" corresponds to size of SRAM location). There are no obstacles in issuing const address just equal to 0x1c. Important thing to note is that indirect trigger address has nothing in common with your physical or mapped NOR Flash address.

Transfer read/write start addresses (offset 0x68/0x78)should be programmed with the absolute flash address to be read/written.

plat->triggerbase is added in device tree for mapped spi flash address.

---

Changes in v6: fixed binding for trigger-address.
Changes in v5: None.
Changes in v4:
- fifo-width & trigger address alligned to linux device tree binding.
- renaming of one parameter moved to separate patch.
- trigger address of socfpga reverted back to 0x0.

Changes in v3: formatted string breaking fixed.
Changes in v2: Rebased to master

 arch/arm/dts/socfpga.dtsi      |    1 +
 arch/arm/dts/stv0991.dts       |    1 +
 drivers/spi/cadence_qspi.c     |    9 +++++----
 drivers/spi/cadence_qspi.h     |    1 +
 drivers/spi/cadence_qspi_apb.c |    7 +++----
 5 files changed, 11 insertions(+), 8 deletions(-)
arch/arm/dts/socfpga.dtsi +1 -0
index 9b12420..9756544 100644
@@ -639,6 +639,7 @@
 			ext-decoder = <0>;  /* external decoder */
 			num-cs = <4>;
 			fifo-depth = <128>;
+			cdns,trigger-address = <0x00000000>;
 			sram-size = <128>;
 			bus-num = <2>;
 			status = "disabled";
arch/arm/dts/stv0991.dts +1 -0
index fa3fd64..6bc5372 100644
@@ -33,6 +33,7 @@
 				<0x40000000 0x1000000>;
 			clocks = <3750000>;
 			sram-size = <256>;
+			cdns,trigger-address = <0x40000000>;
 			status = "okay";
 
 			flash0: n25q32 at 0 {
drivers/spi/cadence_qspi.c +5 -4
index 34a0f46..0d1abc8 100644
@@ -290,6 +290,8 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
 
 	plat->regbase = (void *)data[0];
 	plat->ahbbase = (void *)data[2];
+	plat->trigger_base = (u32 *)fdtdec_get_addr(blob, node,
+						    "cdns,trigger-address");
 
 	/* Use 500KHz as a suitable default */
 	plat->max_hz = fdtdec_get_int(blob, node, "spi-max-frequency",
@@ -311,10 +313,9 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
 	plat->tslch_ns = fdtdec_get_int(blob, subnode, "tslch-ns", 20);
 	plat->sram_size = fdtdec_get_int(blob, node, "sram-size", 128);
 
-	debug("%s: regbase=%p ahbbase=%p max-frequency=%d page-size=%d\n",
-	      __func__, plat->regbase, plat->ahbbase, plat->max_hz,
-	      plat->page_size);
-
+	debug("%s: regbase=%p ahbbase=%p trigger_base=%p max-frequency=%d page-size=%d\n",
+	      __func__, plat->regbase, plat->ahbbase, plat->trigger_base,
+	      plat->max_hz, plat->page_size);
 	return 0;
 }
 
drivers/spi/cadence_qspi.h +1 -0
index 98e57aa..2f1bd92 100644
@@ -18,6 +18,7 @@ struct cadence_spi_platdata {
 	unsigned int	max_hz;
 	void		*regbase;
 	void		*ahbbase;
+	void		*trigger_base;
 
 	u32		page_size;
 	u32		block_size;
drivers/spi/cadence_qspi_apb.c +3 -4
index c5b14c5..8156b2b 100644
@@ -44,7 +44,6 @@
 #define CQSPI_INST_TYPE_QUAD			(2)
 
 #define CQSPI_STIG_DATA_LEN_MAX			(8)
-#define CQSPI_INDIRECTTRIGGER_ADDR_MASK		(0xFFFFF)
 
 #define CQSPI_DUMMY_CLKS_PER_BYTE		(8)
 #define CQSPI_DUMMY_BYTES_MAX			(4)
@@ -281,7 +280,7 @@ static int qpsi_write_sram_fifo_push(struct cadence_spi_platdata *plat,
 				const void *src_addr, unsigned int num_bytes)
 {
 	const void *reg_base = plat->regbase;
-	void *dest_addr = plat->ahbbase;
+	void *dest_addr = plat->trigger_base;
 	unsigned int retry = CQSPI_REG_RETRY;
 	unsigned int sram_level;
 	unsigned int wr_bytes;
@@ -534,7 +533,7 @@ void cadence_qspi_apb_controller_init(struct cadence_spi_platdata *plat)
 
 	/* Indirect mode configurations */
 	writel((plat->sram_size/2), plat->regbase + CQSPI_REG_SRAMPARTITION);
-	writel((u32)plat->ahbbase & CQSPI_INDIRECTTRIGGER_ADDR_MASK,
+	writel((u32)plat->trigger_base,
 	       plat->regbase + CQSPI_REG_INDIRECTTRIGGER);
 
 	/* Disable all interrupts */
@@ -753,7 +752,7 @@ int cadence_qspi_apb_indirect_read_execute(struct cadence_spi_platdata *plat,
 	       plat->regbase + CQSPI_REG_INDIRECTRD);
 
 	if (qspi_read_sram_fifo_poll(plat->regbase, (void *)rxbuf,
-				     (const void *)plat->ahbbase, rxlen))
+				     (const void *)plat->trigger_base, rxlen))
 		goto failrd;
 
 	/* Check flash indirect controller */
Signature · 1 line
1.7.9.5
#10 lore raw

PATCH v6 3/5 spi: cadence_qspi: fix base trigger address & transfer start address

Quoted 12 lines · Vikas Manocha

This patch is to separate the base trigger from the read/write transfer start addresses.

Base trigger register address (0x1c register) corresponds to the address which should be put on AHB bus to handle indirect transfer triggered before.

To handle indirect transfer we need to issue addresses from (value of 0x1c) to (value of 0x1c) + 15*4 ("4" corresponds to size of SRAM location). There are no obstacles in issuing const address just equal to 0x1c. Important thing to note is that indirect trigger address has nothing in common with your physical or mapped NOR Flash address.

Quoted 6 lines

Transfer read/write start addresses (offset 0x68/0x78)should be programmed with the absolute flash address to be read/written.

plat->triggerbase is added in device tree for mapped spi flash address.

Quoted 128 lines

---

Changes in v6: fixed binding for trigger-address.
Changes in v5: None.
Changes in v4:
- fifo-width & trigger address alligned to linux device tree binding.
- renaming of one parameter moved to separate patch.
- trigger address of socfpga reverted back to 0x0.

Changes in v3: formatted string breaking fixed.
Changes in v2: Rebased to master

 arch/arm/dts/socfpga.dtsi      |    1 +
 arch/arm/dts/stv0991.dts       |    1 +
 drivers/spi/cadence_qspi.c     |    9 +++++----
 drivers/spi/cadence_qspi.h     |    1 +
 drivers/spi/cadence_qspi_apb.c |    7 +++----
 5 files changed, 11 insertions(+), 8 deletions(-)
arch/arm/dts/socfpga.dtsi +1 -0
index 9b12420..9756544 100644
@@ -639,6 +639,7 @@
                        ext-decoder = <0>;  /* external decoder */
                        num-cs = <4>;
                        fifo-depth = <128>;
+                       cdns,trigger-address = <0x00000000>;
                        sram-size = <128>;
                        bus-num = <2>;
                        status = "disabled";
arch/arm/dts/stv0991.dts +1 -0
index fa3fd64..6bc5372 100644
@@ -33,6 +33,7 @@
                                <0x40000000 0x1000000>;
                        clocks = <3750000>;
                        sram-size = <256>;
+                       cdns,trigger-address = <0x40000000>;
                        status = "okay";
 
                        flash0: n25q32 at 0 {
drivers/spi/cadence_qspi.c +5 -4
index 34a0f46..0d1abc8 100644
@@ -290,6 +290,8 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
 
        plat->regbase = (void *)data[0];
        plat->ahbbase = (void *)data[2];
+       plat->trigger_base = (u32 *)fdtdec_get_addr(blob, node,
+                                                   "cdns,trigger-address");
 
        /* Use 500KHz as a suitable default */
        plat->max_hz = fdtdec_get_int(blob, node, "spi-max-frequency",
@@ -311,10 +313,9 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
        plat->tslch_ns = fdtdec_get_int(blob, subnode, "tslch-ns", 20);
        plat->sram_size = fdtdec_get_int(blob, node, "sram-size", 128);
 
-       debug("%s: regbase=%p ahbbase=%p max-frequency=%d page-size=%d\n",
-             __func__, plat->regbase, plat->ahbbase, plat->max_hz,
-             plat->page_size);
-
+       debug("%s: regbase=%p ahbbase=%p trigger_base=%p max-frequency=%d page-size=%d\n",
+             __func__, plat->regbase, plat->ahbbase, plat->trigger_base,
+             plat->max_hz, plat->page_size);
        return 0;
 }
 
drivers/spi/cadence_qspi.h +1 -0
index 98e57aa..2f1bd92 100644
@@ -18,6 +18,7 @@ struct cadence_spi_platdata {
        unsigned int    max_hz;
        void            *regbase;
        void            *ahbbase;
+       void            *trigger_base;
 
        u32             page_size;
        u32             block_size;
drivers/spi/cadence_qspi_apb.c +3 -5
index c5b14c5..8156b2b 100644
@@ -44,7 +44,6 @@
 #define CQSPI_INST_TYPE_QUAD                   (2)
 
 #define CQSPI_STIG_DATA_LEN_MAX                        (8)
-#define CQSPI_INDIRECTTRIGGER_ADDR_MASK                (0xFFFFF)
 
 #define CQSPI_DUMMY_CLKS_PER_BYTE              (8)
 #define CQSPI_DUMMY_BYTES_MAX                  (4)
@@ -281,7 +280,7 @@ static int qpsi_write_sram_fifo_push(struct cadence_spi_platdata *plat,
                                const void *src_addr, unsigned int num_bytes)
 {
        const void *reg_base = plat->regbase;
-       void *dest_addr = plat->ahbbase;
+       void *dest_addr = plat->trigger_base;
        unsigned int retry = CQSPI_REG_RETRY;
        unsigned int sram_level;
        unsigned int wr_bytes;
@@ -534,7 +533,7 @@ void cadence_qspi_apb_controller_init(struct cadence_spi_platdata *plat)
 
        /* Indirect mode configurations */
        writel((plat->sram_size/2), plat->regbase + CQSPI_REG_SRAMPARTITION);
-       writel((u32)plat->ahbbase & CQSPI_INDIRECTTRIGGER_ADDR_MASK,
+       writel((u32)plat->trigger_base,
               plat->regbase + CQSPI_REG_INDIRECTTRIGGER);
 
        /* Disable all interrupts */
@@ -753,7 +752,7 @@ int cadence_qspi_apb_indirect_read_execute(struct cadence_spi_platdata *plat,
               plat->regbase + CQSPI_REG_INDIRECTRD);
 
        if (qspi_read_sram_fifo_poll(plat->regbase, (void *)rxbuf,
-                                    (const void *)plat->ahbbase, rxlen))
+                                    (const void *)plat->trigger_base, rxlen))
                goto failrd;
 
        /* Check flash indirect controller */
--

1.7.9.5

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Signature · 1 line
Jagan | openedev.
#11 lore raw

PATCH v6 4/5 spi: cadence_qspi: rename ahbbase to flashbase for clarity

In reply to Vikas Manocha

plat->ahbbase renamed to plat->flashbase for better clarity.

---

Changes in v6: none
Changes in v5: none
Changes in v4: new

 drivers/spi/cadence_qspi.c     |    8 ++++----
 drivers/spi/cadence_qspi.h     |    4 ++--
 drivers/spi/cadence_qspi_apb.c |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
drivers/spi/cadence_qspi.c +4 -4
index 0d1abc8..c63f583 100644
@@ -150,7 +150,7 @@ static int cadence_spi_probe(struct udevice *bus)
 	struct cadence_spi_priv *priv = dev_get_priv(bus);
 
 	priv->regbase = plat->regbase;
-	priv->ahbbase = plat->ahbbase;
+	priv->flashbase = plat->flashbase;
 
 	if (!priv->qspi_is_init) {
 		cadence_qspi_apb_controller_init(plat);
@@ -289,7 +289,7 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
 	}
 
 	plat->regbase = (void *)data[0];
-	plat->ahbbase = (void *)data[2];
+	plat->flashbase = (void *)data[2];
 	plat->trigger_base = (u32 *)fdtdec_get_addr(blob, node,
 						    "cdns,trigger-address");
 
@@ -313,8 +313,8 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
 	plat->tslch_ns = fdtdec_get_int(blob, subnode, "tslch-ns", 20);
 	plat->sram_size = fdtdec_get_int(blob, node, "sram-size", 128);
 
-	debug("%s: regbase=%p ahbbase=%p trigger_base=%p max-frequency=%d page-size=%d\n",
-	      __func__, plat->regbase, plat->ahbbase, plat->trigger_base,
+	debug("%s: regbase=%p flashbase=%p trigger_base=%p max-frequency=%d page-size=%d\n",
+	      __func__, plat->regbase, plat->flashbase, plat->trigger_base,
 	      plat->max_hz, plat->page_size);
 	return 0;
 }
drivers/spi/cadence_qspi.h +2 -2
index 2f1bd92..7341339 100644
@@ -17,7 +17,7 @@
 struct cadence_spi_platdata {
 	unsigned int	max_hz;
 	void		*regbase;
-	void		*ahbbase;
+	void		*flashbase;
 	void		*trigger_base;
 
 	u32		page_size;
@@ -31,7 +31,7 @@ struct cadence_spi_platdata {
 
 struct cadence_spi_priv {
 	void		*regbase;
-	void		*ahbbase;
+	void		*flashbase;
 	size_t		cmd_len;
 	u8		cmd_buf[32];
 	size_t		data_len;
drivers/spi/cadence_qspi_apb.c +2 -2
index 8156b2b..2638f00 100644
@@ -704,7 +704,7 @@ int cadence_qspi_apb_indirect_read_setup(struct cadence_spi_platdata *plat,
 
 	/* Get address */
 	addr_value = cadence_qspi_apb_cmd2addr(&cmdbuf[1], addr_bytes);
-	writel((u32)plat->ahbbase + addr_value,
+	writel((u32)plat->flashbase + addr_value,
 	       plat->regbase + CQSPI_REG_INDIRECTRDSTARTADDR);
 
 	/* The remaining lenght is dummy bytes. */
@@ -795,7 +795,7 @@ int cadence_qspi_apb_indirect_write_setup(struct cadence_spi_platdata *plat,
 
 	/* Setup write address. */
 	reg = cadence_qspi_apb_cmd2addr(&cmdbuf[1], addr_bytes);
-	writel((u32)plat->ahbbase + reg,
+	writel((u32)plat->flashbase + reg,
 	       plat->regbase + CQSPI_REG_INDIRECTWRSTARTADDR);
 
 	reg = readl(plat->regbase + CQSPI_REG_SIZE);
Signature · 1 line
1.7.9.5
#12 lore raw

PATCH v6 4/5 spi: cadence_qspi: rename ahbbase to flashbase for clarity

Quoted 1 line · Vikas Manocha

plat->ahbbase renamed to plat->flashbase for better clarity.

Can you give short description about this rename.

Quoted 97 lines

---

Changes in v6: none
Changes in v5: none
Changes in v4: new

 drivers/spi/cadence_qspi.c     |    8 ++++----
 drivers/spi/cadence_qspi.h     |    4 ++--
 drivers/spi/cadence_qspi_apb.c |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
drivers/spi/cadence_qspi.c +4 -4
index 0d1abc8..c63f583 100644
@@ -150,7 +150,7 @@ static int cadence_spi_probe(struct udevice *bus)
        struct cadence_spi_priv *priv = dev_get_priv(bus);
 
        priv->regbase = plat->regbase;
-       priv->ahbbase = plat->ahbbase;
+       priv->flashbase = plat->flashbase;
 
        if (!priv->qspi_is_init) {
                cadence_qspi_apb_controller_init(plat);
@@ -289,7 +289,7 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
        }
 
        plat->regbase = (void *)data[0];
-       plat->ahbbase = (void *)data[2];
+       plat->flashbase = (void *)data[2];
        plat->trigger_base = (u32 *)fdtdec_get_addr(blob, node,
                                                    "cdns,trigger-address");
 
@@ -313,8 +313,8 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
        plat->tslch_ns = fdtdec_get_int(blob, subnode, "tslch-ns", 20);
        plat->sram_size = fdtdec_get_int(blob, node, "sram-size", 128);
 
-       debug("%s: regbase=%p ahbbase=%p trigger_base=%p max-frequency=%d page-size=%d\n",
-             __func__, plat->regbase, plat->ahbbase, plat->trigger_base,
+       debug("%s: regbase=%p flashbase=%p trigger_base=%p max-frequency=%d page-size=%d\n",
+             __func__, plat->regbase, plat->flashbase, plat->trigger_base,
              plat->max_hz, plat->page_size);
        return 0;
 }
drivers/spi/cadence_qspi.h +2 -2
index 2f1bd92..7341339 100644
@@ -17,7 +17,7 @@
 struct cadence_spi_platdata {
        unsigned int    max_hz;
        void            *regbase;
-       void            *ahbbase;
+       void            *flashbase;
        void            *trigger_base;
 
        u32             page_size;
@@ -31,7 +31,7 @@ struct cadence_spi_platdata {
 
 struct cadence_spi_priv {
        void            *regbase;
-       void            *ahbbase;
+       void            *flashbase;
        size_t          cmd_len;
        u8              cmd_buf[32];
        size_t          data_len;
drivers/spi/cadence_qspi_apb.c +2 -3
index 8156b2b..2638f00 100644
@@ -704,7 +704,7 @@ int cadence_qspi_apb_indirect_read_setup(struct cadence_spi_platdata *plat,
 
        /* Get address */
        addr_value = cadence_qspi_apb_cmd2addr(&cmdbuf[1], addr_bytes);
-       writel((u32)plat->ahbbase + addr_value,
+       writel((u32)plat->flashbase + addr_value,
               plat->regbase + CQSPI_REG_INDIRECTRDSTARTADDR);
 
        /* The remaining lenght is dummy bytes. */
@@ -795,7 +795,7 @@ int cadence_qspi_apb_indirect_write_setup(struct cadence_spi_platdata *plat,
 
        /* Setup write address. */
        reg = cadence_qspi_apb_cmd2addr(&cmdbuf[1], addr_bytes);
-       writel((u32)plat->ahbbase + reg,
+       writel((u32)plat->flashbase + reg,
               plat->regbase + CQSPI_REG_INDIRECTWRSTARTADDR);
 
        reg = readl(plat->regbase + CQSPI_REG_SIZE);
--

1.7.9.5

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Signature · 1 line
Jagan | openedev.
#13 lore raw

PATCH v6 4/5 spi: cadence_qspi: rename ahbbase to flashbase for clarity

Hi Jagan,

Quoted 8 lines

-----Original Message-----
From: Jagan Teki [mailto:jteki at openedev.com]
Sent: Wednesday, September 23, 2015 3:15 AM
To: Vikas MANOCHA
Cc: u-boot at lists.denx.de; Stefan Roese; Graham Moore; Marek Va?ut
Subject: Re: [U-Boot] [PATCH v6 4/5] spi: cadence_qspi: rename ahbbase to flashbase for clarity

Quoted 5 lines
Quoted 1 line · Vikas Manocha

plat->ahbbase renamed to plat->flashbase for better clarity.

Can you give short description about this rename.

With ahbbase it was not clear which base address it is, flashbase makes it clear that it is mapped flash memory base address. I will add this info & send the next version.

Rgds,
Vikas

Quoted 112 lines

drivers/spi/cadence_qspi.c static int cadence_spi_ofdata_to_platdata(struct

Quoted 28 lines

---

Changes in v6: none
Changes in v5: none
Changes in v4: new

 drivers/spi/cadence_qspi.c     |    8 ++++----
 drivers/spi/cadence_qspi.h     |    4 ++--
 drivers/spi/cadence_qspi_apb.c |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
drivers/spi/cadence_qspi.c +1 -1
index 0d1abc8..c63f583 100644
@@ -150,7 +150,7 @@ static int cadence_spi_probe(struct udevice *bus)
        struct cadence_spi_priv *priv = dev_get_priv(bus);
 
        priv->regbase = plat->regbase;
-       priv->ahbbase = plat->ahbbase;
+       priv->flashbase = plat->flashbase;
 
        if (!priv->qspi_is_init) {
                cadence_qspi_apb_controller_init(plat);
@@ -289,7 +289,7 @@ static int cadence_spi_ofdata_to_platdata(struct

udevice *bus)

drivers/spi/cadence_qspi.c static int cadence_spi_ofdata_to_platdata(struct

Quoted 10 lines
drivers/spi/cadence_qspi.c +1 -1
        }
 
        plat->regbase = (void *)data[0];
-       plat->ahbbase = (void *)data[2];
+       plat->flashbase = (void *)data[2];
        plat->trigger_base = (u32 *)fdtdec_get_addr(blob, node,
 
 "cdns,trigger-address");
@@ -313,8 +313,8 @@ static int cadence_spi_ofdata_to_platdata(struct

udevice *bus)

drivers/spi/cadence_qspi.c static int cadence_spi_ofdata_to_platdata(struct · line 317

Quoted 5 lines
drivers/spi/cadence_qspi.c +0 -1
        plat->tslch_ns = fdtdec_get_int(blob, subnode, "tslch-ns", 20);
        plat->sram_size = fdtdec_get_int(blob, node, "sram-size",
 128);
 
-       debug("%s: regbase=%p ahbbase=%p trigger_base=%p max-

frequency=%d page-size=%d\n",

drivers/spi/cadence_qspi.c static int cadence_spi_ofdata_to_platdata(struct · line 317

Quoted 2 lines
drivers/spi/cadence_qspi.c +1 -1
-             __func__, plat->regbase, plat->ahbbase, plat->trigger_base,
+       debug("%s: regbase=%p flashbase=%p trigger_base=%p max-

frequency=%d page-size=%d\n",

Quoted 54 lines
drivers/spi/cadence_qspi.c +2 -0
+             __func__, plat->regbase, plat->flashbase,
+ plat->trigger_base,
              plat->max_hz, plat->page_size);
        return 0;
 }
drivers/spi/cadence_qspi.h +2 -2
index 2f1bd92..7341339 100644
@@ -17,7 +17,7 @@
 struct cadence_spi_platdata {
        unsigned int    max_hz;
        void            *regbase;
-       void            *ahbbase;
+       void            *flashbase;
        void            *trigger_base;
 
        u32             page_size;
@@ -31,7 +31,7 @@ struct cadence_spi_platdata {
 
 struct cadence_spi_priv {
        void            *regbase;
-       void            *ahbbase;
+       void            *flashbase;
        size_t          cmd_len;
        u8              cmd_buf[32];
        size_t          data_len;
(quoted diff) +0 -0

b/drivers/spi/cadence_qspi_apb.c index 8156b2b..2638f00 100644

drivers/spi/cadence_qspi_apb.c +1 -1
@@ -704,7 +704,7 @@ int cadence_qspi_apb_indirect_read_setup(struct
 cadence_spi_platdata *plat,
 
        /* Get address */
        addr_value = cadence_qspi_apb_cmd2addr(&cmdbuf[1], addr_bytes);
-       writel((u32)plat->ahbbase + addr_value,
+       writel((u32)plat->flashbase + addr_value,
               plat->regbase + CQSPI_REG_INDIRECTRDSTARTADDR);
 
        /* The remaining lenght is dummy bytes. */ @@ -795,7 +795,7 @@

int cadence_qspi_apb_indirect_write_setup(struct cadence_spi_platdata *plat,

        /* Setup write address. */
        reg = cadence_qspi_apb_cmd2addr(&cmdbuf[1], addr_bytes);
drivers/spi/cadence_qspi_apb.c +1 -2
-       writel((u32)plat->ahbbase + reg,
+       writel((u32)plat->flashbase + reg,
               plat->regbase + CQSPI_REG_INDIRECTWRSTARTADDR);
 
        reg = readl(plat->regbase + CQSPI_REG_SIZE);
--

1.7.9.5

Quoted 4 lines

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

--
Jagan | openedev.

#14 lore raw

PATCH v6 5/5 spi: cadence_qspi: get fifo width from device tree

In reply to Vikas Manocha

Fifo width could be different on different socs, e.g. stv0991 & altera soc have different fifo width.

---

Changes in v6: none
Changes in v5: none
Changes in v4: alligned to linux device tree binding. Changes in v3: none
Changes in v2: Rebased to master

 arch/arm/dts/socfpga.dtsi      |    1 +
 arch/arm/dts/stv0991.dts       |    1 +
 drivers/spi/cadence_qspi.c     |    1 +
 drivers/spi/cadence_qspi.h     |    1 +
 drivers/spi/cadence_qspi_apb.c |   24 ++++++++++--------------
 5 files changed, 14 insertions(+), 14 deletions(-)
arch/arm/dts/socfpga.dtsi +1 -0
index 9756544..5f0b0fa 100644
@@ -640,6 +640,7 @@
 			num-cs = <4>;
 			fifo-depth = <128>;
 			cdns,trigger-address = <0x00000000>;
+			cdns,fifo-width = <4>;
 			sram-size = <128>;
 			bus-num = <2>;
 			status = "disabled";
arch/arm/dts/stv0991.dts +1 -0
index 6bc5372..0a88b69 100644
@@ -34,6 +34,7 @@
 			clocks = <3750000>;
 			sram-size = <256>;
 			cdns,trigger-address = <0x40000000>;
+			cdns,fifo-width = <8>;
 			status = "okay";
 
 			flash0: n25q32 at 0 {
drivers/spi/cadence_qspi.c +1 -0
index c63f583..0430218 100644
@@ -312,6 +312,7 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
 	plat->tchsh_ns = fdtdec_get_int(blob, subnode, "tchsh-ns", 20);
 	plat->tslch_ns = fdtdec_get_int(blob, subnode, "tslch-ns", 20);
 	plat->sram_size = fdtdec_get_int(blob, node, "sram-size", 128);
+	plat->fifo_width = fdtdec_get_int(blob, node, "cdns,fifo-width", 4);
 
 	debug("%s: regbase=%p flashbase=%p trigger_base=%p max-frequency=%d page-size=%d\n",
 	      __func__, plat->regbase, plat->flashbase, plat->trigger_base,
drivers/spi/cadence_qspi.h +1 -0
index 7341339..91f38f1 100644
@@ -27,6 +27,7 @@ struct cadence_spi_platdata {
 	u32		tchsh_ns;
 	u32		tslch_ns;
 	u32		sram_size;
+	u32		fifo_width;
 };
 
 struct cadence_spi_priv {
drivers/spi/cadence_qspi_apb.c +10 -14
index 2638f00..478b5a0 100644
@@ -34,8 +34,6 @@
 #define CQSPI_REG_RETRY				(10000)
 #define CQSPI_POLL_IDLE_RETRY			(3)
 
-#define CQSPI_FIFO_WIDTH			(4)
-
 #define CQSPI_REG_SRAM_THRESHOLD_WORDS		(50)
 
 /* Transfer mode */
@@ -48,9 +46,6 @@
 #define CQSPI_DUMMY_CLKS_PER_BYTE		(8)
 #define CQSPI_DUMMY_BYTES_MAX			(4)
 
-
-#define CQSPI_REG_SRAM_FILL_THRESHOLD	\
-	((CQSPI_REG_SRAM_SIZE_WORD / 2) * CQSPI_FIFO_WIDTH)
 /****************************************************************************
  * Controller's configuration and status register (offset from QSPI_BASE)
  ****************************************************************************/
@@ -214,7 +209,7 @@ static void cadence_qspi_apb_read_fifo_data(void *dest,
 }
 
 static void cadence_qspi_apb_write_fifo_data(const void *dest_ahb_addr,
-	const void *src, unsigned int bytes)
+	const void *src, unsigned int fifo_width, unsigned int bytes)
 {
 	unsigned int temp = 0;
 	int i;
@@ -222,11 +217,11 @@ static void cadence_qspi_apb_write_fifo_data(const void *dest_ahb_addr,
 	unsigned int *dest_ptr = (unsigned int *)dest_ahb_addr;
 	unsigned int *src_ptr = (unsigned int *)src;
 
-	while (remaining >= CQSPI_FIFO_WIDTH) {
-		for (i = CQSPI_FIFO_WIDTH/sizeof(src_ptr) - 1; i >= 0; i--)
+	while (remaining >= fifo_width) {
+		for (i = fifo_width/sizeof(src_ptr) - 1; i >= 0; i--)
 			writel(*(src_ptr+i), dest_ptr+i);
-		src_ptr += CQSPI_FIFO_WIDTH/sizeof(src_ptr);
-		remaining -= CQSPI_FIFO_WIDTH;
+		src_ptr += fifo_width/sizeof(src_ptr);
+		remaining -= fifo_width;
 	}
 	if (remaining) {
 		/* dangling bytes */
@@ -241,7 +236,7 @@ static void cadence_qspi_apb_write_fifo_data(const void *dest_ahb_addr,
 
 /* Read from SRAM FIFO with polling SRAM fill level. */
 static int qspi_read_sram_fifo_poll(const void *reg_base, void *dest_addr,
-			const void *src_addr,  unsigned int num_bytes)
+	const void *src_addr, unsigned int fifo_width, unsigned int num_bytes)
 {
 	unsigned int remaining = num_bytes;
 	unsigned int retry;
@@ -263,7 +258,7 @@ static int qspi_read_sram_fifo_poll(const void *reg_base, void *dest_addr,
 			return -1;
 		}
 
-		sram_level *= CQSPI_FIFO_WIDTH;
+		sram_level *= fifo_width;
 		sram_level = sram_level > remaining ? remaining : sram_level;
 
 		/* Read data from FIFO. */
@@ -305,7 +300,8 @@ static int qpsi_write_sram_fifo_push(struct cadence_spi_platdata *plat,
 		wr_bytes = (remaining > page_size) ?
 					page_size : remaining;
 
-		cadence_qspi_apb_write_fifo_data(dest_addr, src, wr_bytes);
+		cadence_qspi_apb_write_fifo_data(dest_addr, src,
+						 plat->fifo_width, wr_bytes);
 		src += wr_bytes;
 		remaining -= wr_bytes;
 	}
@@ -752,7 +748,7 @@ int cadence_qspi_apb_indirect_read_execute(struct cadence_spi_platdata *plat,
 	       plat->regbase + CQSPI_REG_INDIRECTRD);
 
 	if (qspi_read_sram_fifo_poll(plat->regbase, (void *)rxbuf,
-				     (const void *)plat->trigger_base, rxlen))
+		(const void *)plat->trigger_base, plat->fifo_width, rxlen))
 		goto failrd;
 
 	/* Check flash indirect controller */
Signature · 1 line
1.7.9.5
#15 lore raw

PATCH v6 5/5 spi: cadence_qspi: get fifo width from device tree

Hi Vikas,

Quoted 4 lines · Vikas Manocha

Fifo width could be different on different socs, e.g. stv0991 & altera soc have different fifo width.

Quoted 77 lines

---

Changes in v6: none
Changes in v5: none
Changes in v4: alligned to linux device tree binding. Changes in v3: none
Changes in v2: Rebased to master

 arch/arm/dts/socfpga.dtsi      |    1 +
 arch/arm/dts/stv0991.dts       |    1 +
 drivers/spi/cadence_qspi.c     |    1 +
 drivers/spi/cadence_qspi.h     |    1 +
 drivers/spi/cadence_qspi_apb.c |   24 ++++++++++--------------
 5 files changed, 14 insertions(+), 14 deletions(-)
arch/arm/dts/socfpga.dtsi +1 -0
index 9756544..5f0b0fa 100644
@@ -640,6 +640,7 @@
                        num-cs = <4>;
                        fifo-depth = <128>;
                        cdns,trigger-address = <0x00000000>;
+                       cdns,fifo-width = <4>;
                        sram-size = <128>;
                        bus-num = <2>;
                        status = "disabled";
arch/arm/dts/stv0991.dts +1 -0
index 6bc5372..0a88b69 100644
@@ -34,6 +34,7 @@
                        clocks = <3750000>;
                        sram-size = <256>;
                        cdns,trigger-address = <0x40000000>;
+                       cdns,fifo-width = <8>;
                        status = "okay";
 
                        flash0: n25q32 at 0 {
drivers/spi/cadence_qspi.c +1 -0
index c63f583..0430218 100644
@@ -312,6 +312,7 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
        plat->tchsh_ns = fdtdec_get_int(blob, subnode, "tchsh-ns", 20);
        plat->tslch_ns = fdtdec_get_int(blob, subnode, "tslch-ns", 20);
        plat->sram_size = fdtdec_get_int(blob, node, "sram-size", 128);
+       plat->fifo_width = fdtdec_get_int(blob, node, "cdns,fifo-width", 4);
 
        debug("%s: regbase=%p flashbase=%p trigger_base=%p max-frequency=%d page-size=%d\n",
              __func__, plat->regbase, plat->flashbase, plat->trigger_base,
drivers/spi/cadence_qspi.h +1 -0
index 7341339..91f38f1 100644
@@ -27,6 +27,7 @@ struct cadence_spi_platdata {
        u32             tchsh_ns;
        u32             tslch_ns;
        u32             sram_size;
+       u32             fifo_width;
 };
 
 struct cadence_spi_priv {
drivers/spi/cadence_qspi_apb.c +0 -2
index 2638f00..478b5a0 100644
@@ -34,8 +34,6 @@
 #define CQSPI_REG_RETRY                                (10000)
 #define CQSPI_POLL_IDLE_RETRY                  (3)
 
-#define CQSPI_FIFO_WIDTH                       (4)
-
 #define CQSPI_REG_SRAM_THRESHOLD_WORDS         (50)
 
 /* Transfer mode */

drivers/spi/cadence_qspi_apb.c line 52

Quoted 5 lines
drivers/spi/cadence_qspi_apb.c +0 -2
@@ -48,9 +46,6 @@
 #define CQSPI_DUMMY_CLKS_PER_BYTE              (8)
 #define CQSPI_DUMMY_BYTES_MAX                  (4)
 
-
-#define CQSPI_REG_SRAM_FILL_THRESHOLD  \

This removal is out-of-scope wrt this patch, create one more patch for this.

Quoted 68 lines
drivers/spi/cadence_qspi_apb.c +10 -11
-       ((CQSPI_REG_SRAM_SIZE_WORD / 2) * CQSPI_FIFO_WIDTH)
 /****************************************************************************
  * Controller's configuration and status register (offset from QSPI_BASE)
  ****************************************************************************/
@@ -214,7 +209,7 @@ static void cadence_qspi_apb_read_fifo_data(void *dest,
 }
 
 static void cadence_qspi_apb_write_fifo_data(const void *dest_ahb_addr,
-       const void *src, unsigned int bytes)
+       const void *src, unsigned int fifo_width, unsigned int bytes)
 {
        unsigned int temp = 0;
        int i;
@@ -222,11 +217,11 @@ static void cadence_qspi_apb_write_fifo_data(const void *dest_ahb_addr,
        unsigned int *dest_ptr = (unsigned int *)dest_ahb_addr;
        unsigned int *src_ptr = (unsigned int *)src;
 
-       while (remaining >= CQSPI_FIFO_WIDTH) {
-               for (i = CQSPI_FIFO_WIDTH/sizeof(src_ptr) - 1; i >= 0; i--)
+       while (remaining >= fifo_width) {
+               for (i = fifo_width/sizeof(src_ptr) - 1; i >= 0; i--)
                        writel(*(src_ptr+i), dest_ptr+i);
-               src_ptr += CQSPI_FIFO_WIDTH/sizeof(src_ptr);
-               remaining -= CQSPI_FIFO_WIDTH;
+               src_ptr += fifo_width/sizeof(src_ptr);
+               remaining -= fifo_width;
        }
        if (remaining) {
                /* dangling bytes */
@@ -241,7 +236,7 @@ static void cadence_qspi_apb_write_fifo_data(const void *dest_ahb_addr,
 
 /* Read from SRAM FIFO with polling SRAM fill level. */
 static int qspi_read_sram_fifo_poll(const void *reg_base, void *dest_addr,
-                       const void *src_addr,  unsigned int num_bytes)
+       const void *src_addr, unsigned int fifo_width, unsigned int num_bytes)
 {
        unsigned int remaining = num_bytes;
        unsigned int retry;
@@ -263,7 +258,7 @@ static int qspi_read_sram_fifo_poll(const void *reg_base, void *dest_addr,
                        return -1;
                }
 
-               sram_level *= CQSPI_FIFO_WIDTH;
+               sram_level *= fifo_width;
                sram_level = sram_level > remaining ? remaining : sram_level;
 
                /* Read data from FIFO. */
@@ -305,7 +300,8 @@ static int qpsi_write_sram_fifo_push(struct cadence_spi_platdata *plat,
                wr_bytes = (remaining > page_size) ?
                                        page_size : remaining;
 
-               cadence_qspi_apb_write_fifo_data(dest_addr, src, wr_bytes);
+               cadence_qspi_apb_write_fifo_data(dest_addr, src,
+                                                plat->fifo_width, wr_bytes);
                src += wr_bytes;
                remaining -= wr_bytes;
        }
@@ -752,7 +748,7 @@ int cadence_qspi_apb_indirect_read_execute(struct cadence_spi_platdata *plat,
               plat->regbase + CQSPI_REG_INDIRECTRD);
 
        if (qspi_read_sram_fifo_poll(plat->regbase, (void *)rxbuf,
-                                    (const void *)plat->trigger_base, rxlen))
+               (const void *)plat->trigger_base, plat->fifo_width, rxlen))
                goto failrd;
 
        /* Check flash indirect controller */
--

1.7.9.5

Signature · 1 line
Jagan | openedev.
#16 lore raw

PATCH v6 5/5 spi: cadence_qspi: get fifo width from device tree

Thanks Jagan,

Quoted 103 lines

-----Original Message-----
From: Jagan Teki [mailto:jteki at openedev.com]
Sent: Wednesday, September 23, 2015 4:00 AM
To: Vikas MANOCHA
Cc: u-boot at lists.denx.de; Stefan Roese; Graham Moore; Marek Va?ut
Subject: Re: [U-Boot] [PATCH v6 5/5] spi: cadence_qspi: get fifo width from device tree

Hi Vikas,

Quoted 4 lines · Vikas Manocha

Fifo width could be different on different socs, e.g. stv0991 & altera soc have different fifo width.

drivers/spi/cadence_qspi.c static int cadence_spi_ofdata_to_platdata(struct

Quoted 44 lines

---

Changes in v6: none
Changes in v5: none
Changes in v4: alligned to linux device tree binding. Changes in v3: none
Changes in v2: Rebased to master

 arch/arm/dts/socfpga.dtsi      |    1 +
 arch/arm/dts/stv0991.dts       |    1 +
 drivers/spi/cadence_qspi.c     |    1 +
 drivers/spi/cadence_qspi.h     |    1 +
 drivers/spi/cadence_qspi_apb.c |   24 ++++++++++--------------
 5 files changed, 14 insertions(+), 14 deletions(-)
arch/arm/dts/socfpga.dtsi +1 -0
index 9756544..5f0b0fa 100644
@@ -640,6 +640,7 @@
                        num-cs = <4>;
                        fifo-depth = <128>;
                        cdns,trigger-address = <0x00000000>;
+                       cdns,fifo-width = <4>;
                        sram-size = <128>;
                        bus-num = <2>;
                        status = "disabled"; diff --git

a/arch/arm/dts/stv0991.dts b/arch/arm/dts/stv0991.dts index 6bc5372..0a88b69 100644

arch/arm/dts/stv0991.dts +1 -0
@@ -34,6 +34,7 @@
                        clocks = <3750000>;
                        sram-size = <256>;
                        cdns,trigger-address = <0x40000000>;
+                       cdns,fifo-width = <8>;
                        status = "okay";
 
                        flash0: n25q32 at 0 { diff --git

a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c index c63f583..0430218 100644

drivers/spi/cadence_qspi.c +0 -0
@@ -312,6 +312,7 @@ static int cadence_spi_ofdata_to_platdata(struct

udevice *bus)

drivers/spi/cadence_qspi.c static int cadence_spi_ofdata_to_platdata(struct

Quoted 8 lines
drivers/spi/cadence_qspi.c +2 -0
        plat->tchsh_ns = fdtdec_get_int(blob, subnode, "tchsh-ns", 20);
        plat->tslch_ns = fdtdec_get_int(blob, subnode, "tslch-ns", 20);
        plat->sram_size = fdtdec_get_int(blob, node, "sram-size",
 128);
+       plat->fifo_width = fdtdec_get_int(blob, node,
+ "cdns,fifo-width", 4);
 
        debug("%s: regbase=%p flashbase=%p trigger_base=%p max-

frequency=%d page-size=%d\n",

Quoted 30 lines
              __func__, plat->regbase, plat->flashbase,

plat->trigger_base, diff --git a/drivers/spi/cadence_qspi.h b/drivers/spi/cadence_qspi.h index 7341339..91f38f1 100644

drivers/spi/cadence_qspi.h +1 -0
@@ -27,6 +27,7 @@ struct cadence_spi_platdata {
        u32             tchsh_ns;
        u32             tslch_ns;
        u32             sram_size;
+       u32             fifo_width;
 };
 
 struct cadence_spi_priv {
(quoted diff) +0 -0

b/drivers/spi/cadence_qspi_apb.c index 2638f00..478b5a0 100644

drivers/spi/cadence_qspi_apb.c +0 -2
@@ -34,8 +34,6 @@
 #define CQSPI_REG_RETRY                                (10000)
 #define CQSPI_POLL_IDLE_RETRY                  (3)
 
-#define CQSPI_FIFO_WIDTH                       (4)
-
 #define CQSPI_REG_SRAM_THRESHOLD_WORDS         (50)
 
 /* Transfer mode */
@@ -48,9 +46,6 @@
 #define CQSPI_DUMMY_CLKS_PER_BYTE              (8)
 #define CQSPI_DUMMY_BYTES_MAX                  (4)
 
Quoted 4 lines

drivers/spi/cadence_qspi_apb.c line 52

Quoted 2 lines
drivers/spi/cadence_qspi_apb.c +0 -2
-
-#define CQSPI_REG_SRAM_FILL_THRESHOLD  \

This removal is out-of-scope wrt this patch, create one more patch for this.

Agreed, I will create another patch in next version.

Rgds,
Vikas

Quoted 88 lines

drivers/spi/cadence_qspi_apb.c line 49

Quoted 3 lines
drivers/spi/cadence_qspi_apb.c +0 -1
-       ((CQSPI_REG_SRAM_SIZE_WORD / 2) * CQSPI_FIFO_WIDTH)
 

/**********************************************************
******************

drivers/spi/cadence_qspi_apb.c line 51

Quoted 3 lines
drivers/spi/cadence_qspi_apb.c +0 -0
  * Controller's configuration and status register (offset from QSPI_BASE)
 

**********************************************************
************

Quoted 4 lines

******/ @@ -214,7 +209,7 @@ static void
cadence_qspi_apb_read_fifo_data(void *dest, }

static void cadence_qspi_apb_write_fifo_data(const void

*dest_ahb_addr,

drivers/spi/cadence_qspi_apb.c static void

Quoted 6 lines
drivers/spi/cadence_qspi_apb.c +1 -1
-       const void *src, unsigned int bytes)
+       const void *src, unsigned int fifo_width, unsigned int bytes)
 {
        unsigned int temp = 0;
        int i;
@@ -222,11 +217,11 @@ static void

cadence_qspi_apb_write_fifo_data(const void *dest_ahb_addr,

drivers/spi/cadence_qspi_apb.c static void

Quoted 16 lines
drivers/spi/cadence_qspi_apb.c +4 -4
        unsigned int *dest_ptr = (unsigned int *)dest_ahb_addr;
        unsigned int *src_ptr = (unsigned int *)src;
 
-       while (remaining >= CQSPI_FIFO_WIDTH) {
-               for (i = CQSPI_FIFO_WIDTH/sizeof(src_ptr) - 1; i >= 0; i--)
+       while (remaining >= fifo_width) {
+               for (i = fifo_width/sizeof(src_ptr) - 1; i >= 0; i--)
                        writel(*(src_ptr+i), dest_ptr+i);
-               src_ptr += CQSPI_FIFO_WIDTH/sizeof(src_ptr);
-               remaining -= CQSPI_FIFO_WIDTH;
+               src_ptr += fifo_width/sizeof(src_ptr);
+               remaining -= fifo_width;
        }
        if (remaining) {
                /* dangling bytes */
@@ -241,7 +236,7 @@ static void

cadence_qspi_apb_write_fifo_data(const

drivers/spi/cadence_qspi_apb.c static int qspi_read_sram_fifo_poll(const void

Quoted 11 lines
drivers/spi/cadence_qspi_apb.c +2 -1
 void *dest_ahb_addr,
 
 /* Read from SRAM FIFO with polling SRAM fill level. */  static int
 qspi_read_sram_fifo_poll(const void *reg_base, void *dest_addr,
-                       const void *src_addr,  unsigned int num_bytes)
+       const void *src_addr, unsigned int fifo_width, unsigned int
+ num_bytes)
 {
        unsigned int remaining = num_bytes;
        unsigned int retry;
@@ -263,7 +258,7 @@ static int qspi_read_sram_fifo_poll(const void

*reg_base, void *dest_addr,

drivers/spi/cadence_qspi_apb.c int

Quoted 21 lines
drivers/spi/cadence_qspi_apb.c +1 -1
                        return -1;
                }
 
-               sram_level *= CQSPI_FIFO_WIDTH;
+               sram_level *= fifo_width;
                sram_level = sram_level > remaining ? remaining :
 sram_level;
 
                /* Read data from FIFO. */ @@ -305,7 +300,8 @@ static

int qpsi_write_sram_fifo_push(struct cadence_spi_platdata *plat,
wr_bytes = (remaining > page_size) ?
page_size : remaining;

drivers/spi/cadence_qspi_apb.c +3 -1
-               cadence_qspi_apb_write_fifo_data(dest_addr, src, wr_bytes);
+               cadence_qspi_apb_write_fifo_data(dest_addr, src,
+                                                plat->fifo_width,
+ wr_bytes);
                src += wr_bytes;
                remaining -= wr_bytes;
        }
@@ -752,7 +748,7 @@ int

cadence_qspi_apb_indirect_read_execute(struct cadence_spi_platdata *plat,

Quoted 11 lines
drivers/spi/cadence_qspi_apb.c +2 -2
               plat->regbase + CQSPI_REG_INDIRECTRD);
 
        if (qspi_read_sram_fifo_poll(plat->regbase, (void *)rxbuf,
-                                    (const void *)plat->trigger_base, rxlen))
+               (const void *)plat->trigger_base, plat->fifo_width,
+ rxlen))
                goto failrd;
 
        /* Check flash indirect controller */
--

1.7.9.5

--
Jagan | openedev.

#17 lore raw

v6 cover spi: cadence_qspi: optimize & fix indirect rd-writes

In reply to Vikas Manocha

Reminder... let me know if there is any comment.

Rgds,
Vikas

Quoted 55 lines

-----Original Message-----
From: Vikas MANOCHA
Sent: Friday, September 11, 2015 11:28 AM
To: u-boot at lists.denx.de; sr at denx.de; grmoore at opensource.altera.com; jteki at openedev.com; marex at denx.de
Cc: Vikas MANOCHA
Subject: [PATCH v6 0/5] spi: cadence_qspi: optimize & fix indirect rd-writes

This patchset:
- fixes trigger base & transfer start address register programming. This fix superseeds the previous patch "spi: cadence_qspi: Fix the indirect ahb trigger address setting".
- adds support to get fifo width from device tree

Changes in v6:
- fixed binding for trigger-address.

Changes in v5:
- fixed compilation warnings.

Changes in v4:
- fifo-width & trigger address alligned to linux device tree binding.
- removed un-necessary casting.
- renaming of one parameter splitted to separate patch.
- trigger address of socfpga reverted back to 0x0.
- code formatting done to avoid checkpatch CHECKS.

Changes in v3:
- removed two patches which were bypassing the sram level check.
- format string in patch corrected 3/4
- added commit message in patch 1/4

Changes in v2:
- rebased to master.
- removed patch "spi: cadence_qspi: read can be independent of fifo width", it
was implemented in other patchset, in mainline now.

Vikas Manocha (5):
spi: cadence_qspi: move trigger base configuration in init
spi: cadence_qspi: fix indirect read/write start address
spi: cadence_qspi: fix base trigger address & transfer start address
spi: cadence_qspi: rename ahbbase to flashbase for clarity
spi: cadence_qspi: get fifo width from device tree

 arch/arm/dts/socfpga.dtsi      |    2 ++
 arch/arm/dts/stv0991.dts       |    2 ++
 drivers/spi/cadence_qspi.c     |   14 ++++++++------
 drivers/spi/cadence_qspi.h     |    6 ++++--
 drivers/spi/cadence_qspi_apb.c |   42 ++++++++++++++++---------------------
---
 5 files changed, 33 insertions(+), 33 deletions(-)

--
1.7.9.5