Skip to contentSkip to conversation

dt-bindings: cadence-quadspi: add optional reset property

PATCH Superseded Dinh Nguyen 2 participants 4 messages Jun 12, 2019

Subsystems (3)

v5 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/2 dt-bindings: cadence-quadspi: add optional reset property

The QSPI module can have an optional reset signals that will hold the module in a reset state.

---
v5: document reset-names
v4: no change
v3: created base on review comments
v2: did not exist
v1: did not exist

---
 Documentation/devicetree/bindings/mtd/cadence-quadspi.txt | 5 +++++
 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/mtd/cadence-quadspi.txt +5 -0
index 4345c3a6f530..945be7d5b236 100644
@@ -35,6 +35,9 @@ custom properties:
 		  (qspi_n_ss_out).
 - cdns,tslch-ns : Delay in nanoseconds between setting qspi_n_ss_out low
                   and first bit transfer.
+- resets	: Must contain an entry for each entry in reset-names.
+		  See ../reset/reset.txt for details.
+- reset-names	: Must include either "qspi" and/or "qspi-ocp".
 
 Example:
 
@@ -50,6 +53,8 @@ Example:
 		cdns,fifo-depth = <128>;
 		cdns,fifo-width = <4>;
 		cdns,trigger-address = <0x00000000>;
+		resets = <&rst QSPI_RESET>, <&rst QSPI_OCP_RESET>;
+		reset-names = "qspi", "qspi-ocp";
 
 		flash0: n25q00@0 {
 			...
Signature · 1 line
2.20.0
#1 lore raw

PATCH v5 2/2 mtd: spi-nor: cadence-quadspi: add reset control

Get the reset control properties for the QSPI controller and bring them out of reset. Most will have just one reset bit, but there is an additional OCP reset bit that is used ECC. The OCP reset bit will also need to get de-asserted as well. [1]

The reason this patch is needed is in the case where a bootloader leaves the QSPI controller in a reset state, or a state where init cannot occur successfully, this patch will put the QSPI controller into a clean state.

[1] https://www.intel.com/content/www/us/en/programmable/hps/arria-10/hps.html#reg_soc_top/sfo1429890575955.html

---
v5: remove udelay(not needed) on tested hardware
group reset assert/deassert together
update commit message with reasoning for patch
v4: fix compile error
v3: return full error by using PTR_ERR(rtsc)
move reset control calls until after the clock enables use udelay(2) to be safe
Add optional OCP(Open Core Protocol) reset signal
v2: use devm_reset_control_get_optional_exclusive
print an error message
return -EPROBE_DEFER

---
 drivers/mtd/spi-nor/cadence-quadspi.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
drivers/mtd/spi-nor/cadence-quadspi.c +26 -0
index 792628750eec..f8b1009e488c 100644
@@ -34,6 +34,7 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/reset.h>
 #include <linux/sched.h>
 #include <linux/spi/spi.h>
 #include <linux/timer.h>
@@ -1336,6 +1337,8 @@ static int cqspi_probe(struct platform_device *pdev)
 	struct cqspi_st *cqspi;
 	struct resource *res;
 	struct resource *res_ahb;
+	struct reset_control *rstc;
+	struct reset_control *rstc_ocp;
 	const struct cqspi_driver_platdata *ddata;
 	int ret;
 	int irq;
@@ -1402,6 +1405,29 @@ static int cqspi_probe(struct platform_device *pdev)
 		goto probe_clk_failed;
 	}
 
+	/* Obtain QSPI reset control */
+	rstc = devm_reset_control_get_optional_exclusive(dev, "qspi");
+	if (IS_ERR(rstc)) {
+		dev_err(dev, "Cannot get QSPI reset.\n");
+		return PTR_ERR(rstc);
+	}
+
+	rstc_ocp = devm_reset_control_get_optional_exclusive(dev, "qspi-ocp");
+	if (IS_ERR(rstc_ocp)) {
+		dev_err(dev, "Cannot get QSPI OCP reset.\n");
+		return PTR_ERR(rstc_ocp);
+	}
+
+	if (rstc) {
+		reset_control_assert(rstc);
+		reset_control_deassert(rstc);
+
+		if (rstc_ocp) {
+			reset_control_assert(rstc_ocp);
+			reset_control_deassert(rstc_ocp);
+		}
+	}
+
 	cqspi->master_ref_clk_hz = clk_get_rate(cqspi->clk);
 	ddata  = of_device_get_match_data(dev);
 	if (ddata && (ddata->quirks & CQSPI_NEEDS_WR_DELAY))
Signature · 1 line
2.20.0
#2 lore raw

Re: [PATCHv5 2/2] mtd: spi-nor: cadence-quadspi: add reset control

Quoted 61 lines · Dinh Nguyen

External E-Mail

Get the reset control properties for the QSPI controller and bring them out of reset. Most will have just one reset bit, but there is an additional OCP reset bit that is used ECC. The OCP reset bit will also need to get de-asserted as well. [1]

The reason this patch is needed is in the case where a bootloader leaves the QSPI controller in a reset state, or a state where init cannot occur successfully, this patch will put the QSPI controller into a clean state.

[1] https://www.intel.com/content/www/us/en/programmable/hps/arria-10/hps.html#reg_soc_top/sfo1429890575955.html

---
v5: remove udelay(not needed) on tested hardware
group reset assert/deassert together
update commit message with reasoning for patch
v4: fix compile error
v3: return full error by using PTR_ERR(rtsc)
move reset control calls until after the clock enables use udelay(2) to be safe
Add optional OCP(Open Core Protocol) reset signal
v2: use devm_reset_control_get_optional_exclusive
print an error message
return -EPROBE_DEFER

---
 drivers/mtd/spi-nor/cadence-quadspi.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
drivers/mtd/spi-nor/cadence-quadspi.c +7 -0
index 792628750eec..f8b1009e488c 100644
@@ -34,6 +34,7 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/reset.h>
 #include <linux/sched.h>
 #include <linux/spi/spi.h>
 #include <linux/timer.h>
@@ -1336,6 +1337,8 @@ static int cqspi_probe(struct platform_device *pdev)
 	struct cqspi_st *cqspi;
 	struct resource *res;
 	struct resource *res_ahb;
+	struct reset_control *rstc;
+	struct reset_control *rstc_ocp;
 	const struct cqspi_driver_platdata *ddata;
 	int ret;
 	int irq;
@@ -1402,6 +1405,29 @@ static int cqspi_probe(struct platform_device *pdev)
 		goto probe_clk_failed;
 	}
 
+	/* Obtain QSPI reset control */
+	rstc = devm_reset_control_get_optional_exclusive(dev, "qspi");
+	if (IS_ERR(rstc)) {
+		dev_err(dev, "Cannot get QSPI reset.\n");

drivers/mtd/spi-nor/cadence-quadspi.c static int cqspi_probe(struct platform_device *pdev) · line 1421

Quoted 10 lines
drivers/mtd/spi-nor/cadence-quadspi.c +10 -0
+		return PTR_ERR(rstc);
+	}
+
+	rstc_ocp = devm_reset_control_get_optional_exclusive(dev, "qspi-ocp");
+	if (IS_ERR(rstc_ocp)) {
+		dev_err(dev, "Cannot get QSPI OCP reset.\n");
+		return PTR_ERR(rstc_ocp);
+	}
+
+	if (rstc) {

Hi, Dinh,

reset_control_assert/deassert() already have checks for null, you can call them directly without checking for null.

drivers/mtd/spi-nor/cadence-quadspi.c static int cqspi_probe(struct platform_device *pdev) · line 1423

Quoted 2 lines
drivers/mtd/spi-nor/cadence-quadspi.c +2 -0
+		reset_control_assert(rstc);
+		reset_control_deassert(rstc);

Is there any difference between:
reset_control_assert(rstc);
reset_control_assert(rstc_ocp);

reset_control_deassert(rstc);
reset_control_deassert(rstc_ocp);

and:

reset_control_assert(rstc);
reset_control_deassert(rstc);

reset_control_assert(rstc_ocp);
reset_control_deassert(rstc_ocp);

Which one would you choose?

Thanks, Dinh,
ta

Quoted 11 lines
drivers/mtd/spi-nor/cadence-quadspi.c +7 -0
+
+		if (rstc_ocp) {
+			reset_control_assert(rstc_ocp);
+			reset_control_deassert(rstc_ocp);
+		}
+	}
+
 	cqspi->master_ref_clk_hz = clk_get_rate(cqspi->clk);
 	ddata  = of_device_get_match_data(dev);
 	if (ddata && (ddata->quirks & CQSPI_NEEDS_WR_DELAY))
#3 lore raw

Re: [PATCHv5 2/2] mtd: spi-nor: cadence-quadspi: add reset control

Quoted 92 lines · On 6/12/19 10:07 AM, [email protected] wrote:
Quoted 61 lines · Dinh Nguyen

External E-Mail

Get the reset control properties for the QSPI controller and bring them out of reset. Most will have just one reset bit, but there is an additional OCP reset bit that is used ECC. The OCP reset bit will also need to get de-asserted as well. [1]

The reason this patch is needed is in the case where a bootloader leaves the QSPI controller in a reset state, or a state where init cannot occur successfully, this patch will put the QSPI controller into a clean state.

[1] https://www.intel.com/content/www/us/en/programmable/hps/arria-10/hps.html#reg_soc_top/sfo1429890575955.html

---
v5: remove udelay(not needed) on tested hardware
group reset assert/deassert together
update commit message with reasoning for patch
v4: fix compile error
v3: return full error by using PTR_ERR(rtsc)
move reset control calls until after the clock enables use udelay(2) to be safe
Add optional OCP(Open Core Protocol) reset signal
v2: use devm_reset_control_get_optional_exclusive
print an error message
return -EPROBE_DEFER

---
 drivers/mtd/spi-nor/cadence-quadspi.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
drivers/mtd/spi-nor/cadence-quadspi.c +7 -0
index 792628750eec..f8b1009e488c 100644
@@ -34,6 +34,7 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/reset.h>
 #include <linux/sched.h>
 #include <linux/spi/spi.h>
 #include <linux/timer.h>
@@ -1336,6 +1337,8 @@ static int cqspi_probe(struct platform_device *pdev)
 	struct cqspi_st *cqspi;
 	struct resource *res;
 	struct resource *res_ahb;
+	struct reset_control *rstc;
+	struct reset_control *rstc_ocp;
 	const struct cqspi_driver_platdata *ddata;
 	int ret;
 	int irq;
@@ -1402,6 +1405,29 @@ static int cqspi_probe(struct platform_device *pdev)
 		goto probe_clk_failed;
 	}
 
+	/* Obtain QSPI reset control */
+	rstc = devm_reset_control_get_optional_exclusive(dev, "qspi");
+	if (IS_ERR(rstc)) {
+		dev_err(dev, "Cannot get QSPI reset.\n");

drivers/mtd/spi-nor/cadence-quadspi.c static int cqspi_probe(struct platform_device *pdev) · line 1421

Quoted 10 lines
drivers/mtd/spi-nor/cadence-quadspi.c +10 -0
+		return PTR_ERR(rstc);
+	}
+
+	rstc_ocp = devm_reset_control_get_optional_exclusive(dev, "qspi-ocp");
+	if (IS_ERR(rstc_ocp)) {
+		dev_err(dev, "Cannot get QSPI OCP reset.\n");
+		return PTR_ERR(rstc_ocp);
+	}
+
+	if (rstc) {

Hi, Dinh,

reset_control_assert/deassert() already have checks for null, you can call them directly without checking for null.

drivers/mtd/spi-nor/cadence-quadspi.c static int cqspi_probe(struct platform_device *pdev) · line 1423

Quoted 2 lines
drivers/mtd/spi-nor/cadence-quadspi.c +2 -0
+		reset_control_assert(rstc);
+		reset_control_deassert(rstc);

Is there any difference between:
reset_control_assert(rstc);
reset_control_assert(rstc_ocp);

reset_control_deassert(rstc);
reset_control_deassert(rstc_ocp);

and:

Quoted 8 lines

reset_control_assert(rstc);
reset_control_deassert(rstc);

reset_control_assert(rstc_ocp);
reset_control_deassert(rstc_ocp);

Which one would you choose?

I prefer grouping the assert/deassert for each reset pointer together.

Dinh