Skip to contentSkip to conversation

spi: cadence_qspi: Ensure spi_calibration is run when sclk change

PATCH New Chin Liang See 2 participants 10 messages Sep 3, 2015 – Sep 8, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/4 spi: cadence_qspi: Ensure spi_calibration is run when sclk change

Ensuring spi_calibration is run when there is a change of sclk frequency. This will ensure the qspi flash access works for high sclk frequency

Cc Dinh Nguyen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Vikas Manocha <[email protected]>
Cc Jagannadh Teki <[email protected]>
Cc Pavel Machek <[email protected]>
---
 drivers/spi/cadence_qspi.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/spi/cadence_qspi.c +4 -4
index 34a0f46..300934e 100644
@@ -37,7 +37,7 @@ static int cadence_spi_write_speed(struct udevice *bus, uint hz)
 }
 
 /* Calibration sequence to determine the read data capture delay register */
-static int spi_calibration(struct udevice *bus)
+static int spi_calibration(struct udevice *bus, uint hz)
 {
 	struct cadence_spi_platdata *plat = bus->platdata;
 	struct cadence_spi_priv *priv = dev_get_priv(bus);
@@ -64,7 +64,7 @@ static int spi_calibration(struct udevice *bus)
 	}
 
 	/* use back the intended clock and find low range */
-	cadence_spi_write_speed(bus, plat->max_hz);
+	cadence_spi_write_speed(bus, hz);
 	for (i = 0; i < CQSPI_READ_CAPTURE_MAX_DELAY; i++) {
 		/* Disable QSPI */
 		cadence_qspi_apb_controller_disable(base);
@@ -111,7 +111,7 @@ static int spi_calibration(struct udevice *bus)
 	      (range_hi + range_lo) / 2, range_lo, range_hi);
 
 	/* just to ensure we do once only when speed or chip select change */
-	priv->qspi_calibrated_hz = plat->max_hz;
+	priv->qspi_calibrated_hz = hz;
 	priv->qspi_calibrated_cs = spi_chip_select(bus);
 
 	return 0;
@@ -131,7 +131,7 @@ static int cadence_spi_set_speed(struct udevice *bus, uint hz)
 	/* Calibration required for different SCLK speed or chip select */
 	if (priv->qspi_calibrated_hz != plat->max_hz ||
 	    priv->qspi_calibrated_cs != spi_chip_select(bus)) {
-		err = spi_calibration(bus);
+		err = spi_calibration(bus, hz);
 		if (err)
 			return err;
 	}
Signature · 1 line
1.7.7.4
#1 lore raw

PATCH 2/4 spi: cadence_qspi: Fix fdt read of spi-max-frequency

Fix the fdt read for spi-max-frequency as it's contained in the child node. Current state of code is always returning default value.

Cc Dinh Nguyen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Vikas Manocha <[email protected]>
Cc Jagannadh Teki <[email protected]>
Cc Pavel Machek <[email protected]>
---
 drivers/spi/cadence_qspi.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/spi/cadence_qspi.c +4 -4
index 300934e..a00af87 100644
@@ -291,10 +291,6 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
 	plat->regbase = (void *)data[0];
 	plat->ahbbase = (void *)data[2];
 
-	/* Use 500KHz as a suitable default */
-	plat->max_hz = fdtdec_get_int(blob, node, "spi-max-frequency",
-				      500000);
-
 	/* All other paramters are embedded in the child node */
 	subnode = fdt_first_subnode(blob, node);
 	if (subnode < 0) {
@@ -302,6 +298,10 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
 		return -ENODEV;
 	}
 
+	/* Use 500KHz as a suitable default */
+	plat->max_hz = fdtdec_get_int(blob, subnode, "spi-max-frequency",
+				      500000);
+
 	/* Read other parameters from DT */
 	plat->page_size = fdtdec_get_int(blob, subnode, "page-size", 256);
 	plat->block_size = fdtdec_get_int(blob, subnode, "block-size", 16);
Signature · 1 line
1.7.7.4
#2 lore raw

PATCH 2/4 spi: cadence_qspi: Fix fdt read of spi-max-frequency

Quoted 32 lines · Chin Liang See

Fix the fdt read for spi-max-frequency as it's contained in the child node. Current state of code is always returning default value.

Cc Dinh Nguyen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Vikas Manocha <[email protected]>
Cc Jagannadh Teki <[email protected]>
Cc Pavel Machek <[email protected]>
---
 drivers/spi/cadence_qspi.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/spi/cadence_qspi.c +0 -4
index 300934e..a00af87 100644
@@ -291,10 +291,6 @@ static int cadence_spi_ofdata_to_platdata(struct
 udevice *bus) plat->regbase = (void *)data[0];
 	plat->ahbbase = (void *)data[2];
 
-	/* Use 500KHz as a suitable default */
-	plat->max_hz = fdtdec_get_int(blob, node, "spi-max-frequency",
-				      500000);
-
 	/* All other paramters are embedded in the child node */
 	subnode = fdt_first_subnode(blob, node);
 	if (subnode < 0) {

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

Quoted 6 lines
drivers/spi/cadence_qspi.c +3 -0
@@ -302,6 +298,10 @@ static int cadence_spi_ofdata_to_platdata(struct
 udevice *bus) return -ENODEV;
 	}
 
+	/* Use 500KHz as a suitable default */
+	plat->max_hz = fdtdec_get_int(blob, subnode, "spi-max-frequency",
+				      500000);

Use fdtdec_get_u32() or such, since the value is unsigned int (have you ever seen negative frequency ? ;-) ). Then check the fdtdec_get_u32() return value.

drivers/spi/cadence_qspi.c static int cadence_spi_ofdata_to_platdata(struct udevice *bus) · line 307

Quoted 3 lines
drivers/spi/cadence_qspi.c +0 -0
 	/* Read other parameters from DT */
 	plat->page_size = fdtdec_get_int(blob, subnode, "page-size", 256);
 	plat->block_size = fdtdec_get_int(blob, subnode, "block-size", 16);

Best regards,
Marek Vasut

#3 lore raw

PATCH 2/4 spi: cadence_qspi: Fix fdt read of spi-max-frequency

Hi,

Quoted 36 lines · marex at denx.de
Quoted 35 lines · Chin Liang See

Fix the fdt read for spi-max-frequency as it's contained in the child node. Current state of code is always returning default value.

Cc Dinh Nguyen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Vikas Manocha <[email protected]>
Cc Jagannadh Teki <[email protected]>
Cc Pavel Machek <[email protected]>
---
 drivers/spi/cadence_qspi.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/spi/cadence_qspi.c +0 -4
index 300934e..a00af87 100644
@@ -291,10 +291,6 @@ static int cadence_spi_ofdata_to_platdata(struct
 udevice *bus) plat->regbase = (void *)data[0];
 	plat->ahbbase = (void *)data[2];
 
-	/* Use 500KHz as a suitable default */
-	plat->max_hz = fdtdec_get_int(blob, node, "spi-max-frequency",
-				      500000);
-
 	/* All other paramters are embedded in the child node */
 	subnode = fdt_first_subnode(blob, node);
 	if (subnode < 0) {
@@ -302,6 +298,10 @@ static int cadence_spi_ofdata_to_platdata(struct
 udevice *bus) return -ENODEV;
 	}
 
Quoted 7 lines

drivers/spi/cadence_qspi.c static int cadence_spi_ofdata_to_platdata(struct udevice *bus) · line 303

Quoted 3 lines
drivers/spi/cadence_qspi.c +3 -0
+	/* Use 500KHz as a suitable default */
+	plat->max_hz = fdtdec_get_int(blob, subnode, "spi-max-frequency",
+				      500000);

Use fdtdec_get_u32() or such, since the value is unsigned int (have you ever seen negative frequency ? ;-) ). Then check the fdtdec_get_u32() return value.

I git grep and no unsigned version.
But I can add unsigned casting to avoid that.

Thanks
Chin Liang

Quoted 6 lines

drivers/spi/cadence_qspi.c static int cadence_spi_ofdata_to_platdata(struct udevice *bus) · line 307

Quoted 3 lines
drivers/spi/cadence_qspi.c +0 -0
 	/* Read other parameters from DT */
 	plat->page_size = fdtdec_get_int(blob, subnode, "page-size", 256);
 	plat->block_size = fdtdec_get_int(blob, subnode, "block-size", 16);

Best regards,
Marek Vasut

#4 lore raw

PATCH 2/4 spi: cadence_qspi: Fix fdt read of spi-max-frequency

Quoted 1 line · Chin Liang See

Hi,

Hi!

Quoted 50 lines · marex at denx.de
Quoted 41 lines · Chin Liang See
Quoted 40 lines

Fix the fdt read for spi-max-frequency as it's contained in the child node. Current state of code is always returning default value.

Cc Dinh Nguyen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Vikas Manocha <[email protected]>
Cc Jagannadh Teki <[email protected]>
Cc Pavel Machek <[email protected]>

---

 drivers/spi/cadence_qspi.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/spi/cadence_qspi.c +0 -4
index 300934e..a00af87 100644
@@ -291,10 +291,6 @@ static int cadence_spi_ofdata_to_platdata(struct
 udevice *bus) plat->regbase = (void *)data[0];
 
 	plat->ahbbase = (void *)data[2];
 
-	/* Use 500KHz as a suitable default */
-	plat->max_hz = fdtdec_get_int(blob, node, "spi-max-frequency",
-				      500000);
-
 
 	/* All other paramters are embedded in the child node */
drivers/spi/cadence_qspi.c +0 -0
 	subnode = fdt_first_subnode(blob, node);
 	if (subnode < 0) {
@@ -302,6 +298,10 @@ static int cadence_spi_ofdata_to_platdata(struct
 udevice *bus) return -ENODEV;
 
 	}
 
Quoted 7 lines

drivers/spi/cadence_qspi.c static int cadence_spi_ofdata_to_platdata(struct udevice *bus) · line 303

Quoted 3 lines
drivers/spi/cadence_qspi.c +3 -0
+	/* Use 500KHz as a suitable default */
+	plat->max_hz = fdtdec_get_int(blob, subnode, "spi-max-frequency",
+				      500000);

Use fdtdec_get_u32() or such, since the value is unsigned int (have you ever seen negative frequency ? ;-) ). Then check the fdtdec_get_u32() return value.

Quoted 2 lines

I git grep and no unsigned version.
But I can add unsigned casting to avoid that.

I think fdt_getprop_u32() is what you're looking for.

Best regards,
Marek Vasut

#5 lore raw

PATCH 3/4 spi: cadence_qspi: Ensure check for max frequency in place

In reply to Chin Liang See

Ensure the intended SCLK frequency not exceeding the maximum frequency. If that happen, SCLK will set to maximum frequency.

Cc Dinh Nguyen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Vikas Manocha <[email protected]>
Cc Jagannadh Teki <[email protected]>
Cc Pavel Machek <[email protected]>
---
 drivers/spi/cadence_qspi.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
drivers/spi/cadence_qspi.c +5 -0
index a00af87..52c29d5 100644
@@ -123,6 +123,11 @@ static int cadence_spi_set_speed(struct udevice *bus, uint hz)
 	struct cadence_spi_priv *priv = dev_get_priv(bus);
 	int err;
 
+	if (hz > plat->max_hz) {
+		hz = plat->max_hz;
+		puts("SF: Default to maximum supported SCLK frequency\n");
+	}
+
 	/* Disable QSPI */
 	cadence_qspi_apb_controller_disable(priv->regbase);
 
Signature · 1 line
1.7.7.4
#6 lore raw

PATCH 4/4 arm: dts: socfpga: Increase the spi-max-frequency for QSPI flash

In reply to Chin Liang See

With a working QSPI calibration, the SCLK can now run up to 100MHz

Cc Dinh Nguyen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Vikas Manocha <[email protected]>
Cc Jagannadh Teki <[email protected]>
Cc Pavel Machek <[email protected]>
---
 arch/arm/dts/socfpga_cyclone5_socdk.dts |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/dts/socfpga_cyclone5_socdk.dts +1 -1
index 9650eb0..04e5695 100644
@@ -86,7 +86,7 @@
 		#size-cells = <1>;
 		compatible = "n25q00";
 		reg = <0>;      /* chip select */
-		spi-max-frequency = <50000000>;
+		spi-max-frequency = <100000000>;
 		m25p,fast-read;
 		page-size = <256>;
 		block-size = <16>; /* 2^16, 64KB */
Signature · 1 line
1.7.7.4
#7 lore raw

PATCH 4/4 arm: dts: socfpga: Increase the spi-max-frequency for QSPI flash

Quoted 10 lines · Chin Liang See

With a working QSPI calibration, the SCLK can now run up to 100MHz

Cc Dinh Nguyen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Vikas Manocha <[email protected]>
Cc Jagannadh Teki <[email protected]>
Cc Pavel Machek <[email protected]>

Best regards,
Marek Vasut

#8 lore raw

PATCH 1/4 spi: cadence_qspi: Ensure spi_calibration is run when sclk change

In reply to Chin Liang See

drivers/spi/cadence_qspi.c static int cadence_spi_set_speed(struct udevice *bus,

Quoted 48 lines · Chin Liang See

Ensuring spi_calibration is run when there is a change of sclk frequency. This will ensure the qspi flash access works for high sclk frequency

Cc Dinh Nguyen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Vikas Manocha <[email protected]>
Cc Jagannadh Teki <[email protected]>
Cc Pavel Machek <[email protected]>
---
 drivers/spi/cadence_qspi.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/spi/cadence_qspi.c +3 -2
index 34a0f46..300934e 100644
@@ -37,7 +37,7 @@ static int cadence_spi_write_speed(struct udevice *bus,
 uint hz) }
 
 /* Calibration sequence to determine the read data capture delay register
 */ -static int spi_calibration(struct udevice *bus)
+static int spi_calibration(struct udevice *bus, uint hz)
 {
 	struct cadence_spi_platdata *plat = bus->platdata;
 	struct cadence_spi_priv *priv = dev_get_priv(bus);
@@ -64,7 +64,7 @@ static int spi_calibration(struct udevice *bus)
 	}
 
 	/* use back the intended clock and find low range */
-	cadence_spi_write_speed(bus, plat->max_hz);
+	cadence_spi_write_speed(bus, hz);
 	for (i = 0; i < CQSPI_READ_CAPTURE_MAX_DELAY; i++) {
 		/* Disable QSPI */
 		cadence_qspi_apb_controller_disable(base);
@@ -111,7 +111,7 @@ static int spi_calibration(struct udevice *bus)
 	      (range_hi + range_lo) / 2, range_lo, range_hi);
 
 	/* just to ensure we do once only when speed or chip select change */
-	priv->qspi_calibrated_hz = plat->max_hz;
+	priv->qspi_calibrated_hz = hz;
 	priv->qspi_calibrated_cs = spi_chip_select(bus);
 
 	return 0;
@@ -131,7 +131,7 @@ static int cadence_spi_set_speed(struct udevice *bus,

Hi,

My impression is that the logic here should be like this:

if (hz > plat->max_hz) {
    printf("error, freq. too high");
    return -EINVAL;
}

if (priv->previous_hz != hz) /* Bus frequency changed, re-calibrate */
spi_calibrate(bus, hz)
cadence_spi_write_speed(bus, priv->qspi_calibrated_hz); priv->previous_hz = hz;

Note that you need a new private variable, previous_hz, to hold the previous value of "hz". This is needed since the calibrated frequency might not be equal to requested frequency.

drivers/spi/cadence_qspi.c static int cadence_spi_set_speed(struct udevice *bus, uint hz) · line 134

Quoted 5 lines

uint hz) /* Calibration required for different SCLK speed or chip select */ if (priv->qspi_calibrated_hz != plat->max_hz ||

drivers/spi/cadence_qspi.c +1 -1
 	    priv->qspi_calibrated_cs != spi_chip_select(bus)) {
-		err = spi_calibration(bus);
+		err = spi_calibration(bus, hz);

This is called after the frequency is configured in this function, this looks really backwards.

drivers/spi/cadence_qspi.c static int cadence_spi_set_speed(struct udevice *bus, uint hz) · line 137

Quoted 3 lines
drivers/spi/cadence_qspi.c +0 -0
 		if (err)
 			return err;
 	}

Best regards,
Marek Vasut

#9 lore raw

PATCH 1/4 spi: cadence_qspi: Ensure spi_calibration is run when sclk change

Hi,

Quoted 58 lines · marex at denx.de

drivers/spi/cadence_qspi.c static int cadence_spi_set_speed(struct udevice *bus,

Quoted 48 lines · Chin Liang See

Ensuring spi_calibration is run when there is a change of sclk frequency. This will ensure the qspi flash access works for high sclk frequency

Cc Dinh Nguyen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Vikas Manocha <[email protected]>
Cc Jagannadh Teki <[email protected]>
Cc Pavel Machek <[email protected]>
---
 drivers/spi/cadence_qspi.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/spi/cadence_qspi.c +3 -2
index 34a0f46..300934e 100644
@@ -37,7 +37,7 @@ static int cadence_spi_write_speed(struct udevice *bus,
 uint hz) }
 
 /* Calibration sequence to determine the read data capture delay register
 */ -static int spi_calibration(struct udevice *bus)
+static int spi_calibration(struct udevice *bus, uint hz)
 {
 	struct cadence_spi_platdata *plat = bus->platdata;
 	struct cadence_spi_priv *priv = dev_get_priv(bus);
@@ -64,7 +64,7 @@ static int spi_calibration(struct udevice *bus)
 	}
 
 	/* use back the intended clock and find low range */
-	cadence_spi_write_speed(bus, plat->max_hz);
+	cadence_spi_write_speed(bus, hz);
 	for (i = 0; i < CQSPI_READ_CAPTURE_MAX_DELAY; i++) {
 		/* Disable QSPI */
 		cadence_qspi_apb_controller_disable(base);
@@ -111,7 +111,7 @@ static int spi_calibration(struct udevice *bus)
 	      (range_hi + range_lo) / 2, range_lo, range_hi);
 
 	/* just to ensure we do once only when speed or chip select change */
-	priv->qspi_calibrated_hz = plat->max_hz;
+	priv->qspi_calibrated_hz = hz;
 	priv->qspi_calibrated_cs = spi_chip_select(bus);
 
 	return 0;
@@ -131,7 +131,7 @@ static int cadence_spi_set_speed(struct udevice *bus,

Hi,

My impression is that the logic here should be like this:

if (hz > plat->max_hz) {
    printf("error, freq. too high");
    return -EINVAL;
}
Quoted 9 lines

if (priv->previous_hz != hz) /* Bus frequency changed, re-calibrate */
spi_calibrate(bus, hz)
cadence_spi_write_speed(bus, priv->qspi_calibrated_hz); priv->previous_hz = hz;

Note that you need a new private variable, previous_hz, to hold the previous value of "hz". This is needed since the calibrated frequency might not be equal to requested frequency.

I know where you coming from.
Yah, calibration can be skipped when requested frequency same as previous or calibrated one.
Let me add that.

Quoted 8 lines

drivers/spi/cadence_qspi.c static int cadence_spi_set_speed(struct udevice *bus, uint hz) · line 134

Quoted 5 lines

uint hz) /* Calibration required for different SCLK speed or chip select */ if (priv->qspi_calibrated_hz != plat->max_hz ||

drivers/spi/cadence_qspi.c +1 -1
 	    priv->qspi_calibrated_cs != spi_chip_select(bus)) {
-		err = spi_calibration(bus);
+		err = spi_calibration(bus, hz);

This is called after the frequency is configured in this function, this looks really backwards.

Yah, let me remove the old code.

Thanks
Chin Liang

Quoted 7 lines

drivers/spi/cadence_qspi.c static int cadence_spi_set_speed(struct udevice *bus, uint hz) · line 137

Quoted 4 lines
drivers/spi/cadence_qspi.c +0 -0
 		if (err)
 			return err;
 	}

Best regards,
Marek Vasut