Skip to contentSkip to conversation

reset: Introduce reset_reset.*() API

PATCH Superseded Michal Simek 2 participants 12 messages May 5 – May 15

Subsystems (3)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Michal Simek

author maintainer
#0 lore raw

v2 cover reset: Introduce reset_reset.*() API

Hi,

the patchset is adding reset_reset.*() interface which is common in Linux. And implement it for ZynqMP.

Thanks,
Michal

Changes in v2:
- Add delay_us parameter to specify delay between assert and deassert
- Pass delay_us to rst_reset op so drivers can use it if needed
- Return -ENOSYS in stubs when !CONFIG_DM_RESET (like clk.h)
- Fix line length to stay within 80 characters
- Add reset_count field to track reset pulse operations
- Implement sandbox_reset_reset() for rst_reset op
- Add sandbox_reset_get_count() to query reset pulse count
- Clear reset_count when reset is requested
- Update tests to verify reset pulse actually happened
- Pass 10us via parameter

Michal Simek (4):
reset: Add reset_reset() and reset_reset_bulk() API
reset: Add sandbox tests for reset_reset() and reset_reset_bulk()
spi: cadence: Use reset_reset_bulk() for proper reset cycling
reset: zynqmp: Implement rst_reset using PM_RESET_ACTION_PULSE

 arch/sandbox/include/asm/reset.h   |  3 ++
 drivers/reset/reset-uclass.c       | 34 +++++++++++++++
 drivers/reset/reset-zynqmp.c       | 11 +++++
 drivers/reset/sandbox-reset-test.c | 14 +++++++
 drivers/reset/sandbox-reset.c      | 31 ++++++++++++++
 drivers/spi/cadence_qspi.c         | 16 ++-----
 include/reset-uclass.h             | 12 ++++++
 include/reset.h                    | 41 ++++++++++++++++++
 test/dm/reset.c                    | 67 ++++++++++++++++++++++++++++++
 9 files changed, 217 insertions(+), 12 deletions(-)
Signature · 3 lines
2.43.0

base-commit: 57460fde4ba84d67de4066ee1141e89e8139ed23
author maintainer
#1 lore raw

PATCH v2 1/4 reset: Add reset_reset() and reset_reset_bulk() API

Add reset_reset() and reset_reset_bulk() functions to the reset controller API. These functions assert and then deassert reset signals in a single call, providing a convenient way to pulse/toggle a reset line.

This mimics the Linux kernel's reset_control_reset() and reset_control_bulk_reset() APIs. The new functions are useful for drivers that need to cycle a reset line during initialization or error recovery but with also passing delay parameter.

If a driver implements the rst_reset op, it will be called directly with the delay parameter. Otherwise, the reset core performs reset_assert(), optional udelay(), and reset_deassert() as fallback.

---

Changes in v2:
- Add delay_us parameter to specify delay between assert and deassert
- Pass delay_us to rst_reset op so drivers can use it if needed
- Return -ENOSYS in stubs when !CONFIG_DM_RESET (like clk.h)
- Fix line length to stay within 80 characters

 drivers/reset/reset-uclass.c | 34 ++++++++++++++++++++++++++++++
 include/reset-uclass.h       | 12 +++++++++++
 include/reset.h              | 41 ++++++++++++++++++++++++++++++++++++
 3 files changed, 87 insertions(+)
drivers/reset/reset-uclass.c +34 -0
index fe4cebf54f15..c199e3e5da71 100644
@@ -13,6 +13,7 @@
 #include <reset-uclass.h>
 #include <dm/devres.h>
 #include <dm/lists.h>
+#include <linux/delay.h>
 
 static inline struct reset_ops *reset_dev_ops(struct udevice *dev)
 {
@@ -225,6 +226,39 @@ int reset_deassert_bulk(struct reset_ctl_bulk *bulk)
 	return 0;
 }
 
+int reset_reset(struct reset_ctl *reset_ctl, ulong delay_us)
+{
+	struct reset_ops *ops = reset_dev_ops(reset_ctl->dev);
+	int ret;
+
+	debug("%s(reset_ctl=%p, delay_us=%lu)\n", __func__, reset_ctl,
+	      delay_us);
+
+	if (ops->rst_reset)
+		return ops->rst_reset(reset_ctl, delay_us);
+
+	ret = reset_assert(reset_ctl);
+	if (ret < 0)
+		return ret;
+
+	udelay(delay_us);
+
+	return reset_deassert(reset_ctl);
+}
+
+int reset_reset_bulk(struct reset_ctl_bulk *bulk, ulong delay_us)
+{
+	int i, ret;
+
+	for (i = 0; i < bulk->count; i++) {
+		ret = reset_reset(&bulk->resets[i], delay_us);
+		if (ret < 0)
+			return ret;
+	}
+
+	return 0;
+}
+
 int reset_status(struct reset_ctl *reset_ctl)
 {
 	struct reset_ops *ops = reset_dev_ops(reset_ctl->dev);
include/reset-uclass.h +12 -0
index 9a0696dd1e3b..706fcffd234d 100644
@@ -76,6 +76,18 @@ struct reset_ops {
 	 * @return 0 if OK, or a negative error code.
 	 */
 	int (*rst_deassert)(struct reset_ctl *reset_ctl);
+	/**
+	 * rst_reset - Reset a HW module.
+	 *
+	 * This optional function triggers a reset pulse on the reset line,
+	 * asserting and then deasserting the reset signal. If not implemented,
+	 * the reset core will use rst_assert followed by rst_deassert.
+	 *
+	 * @reset_ctl:	The reset signal to pulse.
+	 * @delay_us:	Delay in microseconds between assert and deassert.
+	 * @return 0 if OK, or a negative error code.
+	 */
+	int (*rst_reset)(struct reset_ctl *reset_ctl, ulong delay_us);
 	/**
 	 * rst_status - Check reset signal status.
 	 *
include/reset.h +41 -0

53 lines not on this page · raw message

Signature · 1 line
2.43.0
Reviewed-by on v2 1/4
#2 lore raw

Re: [PATCH v2 1/4] reset: Add reset_reset() and reset_reset_bulk() API

Hi Michal,

Quoted 16 lines · Michal Simek

reset: Add reset_reset() and reset_reset_bulk() API

Add reset_reset() and reset_reset_bulk() functions to the reset controller API. These functions assert and then deassert reset signals in a single call, providing a convenient way to pulse/toggle a reset line.

This mimics the Linux kernel's reset_control_reset() and reset_control_bulk_reset() APIs. The new functions are useful for drivers that need to cycle a reset line during initialization or error recovery but with also passing delay parameter.

If a driver implements the rst_reset op, it will be called directly with the delay parameter. Otherwise, the reset core performs reset_assert(), optional udelay(), and reset_deassert() as fallback.

Quoted 6 lines

drivers/reset/reset-uclass.c | 34 ++++++++++++++++++++++++++++++++++

 include/reset-uclass.h       | 12 ++++++++++++
 include/reset.h              | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 87 insertions(+)

optional nits / thoughts below

Quoted 4 lines
include/reset-uclass.h +2 -0
@@ -76,6 +76,18 @@ struct reset_ops {
+     /**
+      * rst_reset - Reset a HW module.

include/reset-uclass.h struct reset_ops { · line 87

Quoted 10 lines
include/reset-uclass.h +10 -0
+      *
+      * This optional function triggers a reset pulse on the reset line,
+      * asserting and then deasserting the reset signal. If not implemented,
+      * the reset core will use rst_assert followed by rst_deassert.
+      *
+      * @reset_ctl:  The reset signal to pulse.
+      * @delay_us:   Delay in microseconds between assert and deassert.
+      * @return 0 if OK, or a negative error code.
+      */
+     int (*rst_reset)(struct reset_ctl *reset_ctl, ulong delay_us);

Please document that the core inserts a udelay(delay_us) between rst_assert and rst_deassert in the fallback path, and clarify whether an rst_reset implementation must honour delay_us or may treat it as a hint. Without that, authors don't really know what to do with the value.

Quoted 4 lines
drivers/reset/reset-uclass.c +2 -0
@@ -225,6 +226,39 @@ int reset_deassert_bulk(struct reset_ctl_bulk *bulk)
+int reset_reset_bulk(struct reset_ctl_bulk *bulk, ulong delay_us)
+{

drivers/reset/reset-uclass.c int reset_deassert_bulk(struct reset_ctl_bulk *bulk) · line 237

Quoted 10 lines
drivers/reset/reset-uclass.c +10 -0
+     int i, ret;
+
+     for (i = 0; i < bulk->count; i++) {
+             ret = reset_reset(&bulk->resets[i], delay_us);
+             if (ret < 0)
+                     return ret;
+     }
+
+     return 0;
+}

Just to check - pulsing each reset sequentially means the first finishes its full assert/delay/deassert before the next starts asserting. For the cadence_qspi case in 3/4, where multiple OSPI reset lines are expected to be asserted together, the previous code did assert_bulk() / udelay() / deassert_bulk() so all lines were held low simultaneously. The new behaviour is different. Is that intentional, and have you confirmed the cadence controller is happy with it?

Regards,
Simon

author maintainer
#3 lore raw

Re: [PATCH v2 1/4] reset: Add reset_reset() and reset_reset_bulk() API

Quoted 42 lines · Simon Glass

Hi Michal,

Quoted 16 lines · Michal Simek

reset: Add reset_reset() and reset_reset_bulk() API

Add reset_reset() and reset_reset_bulk() functions to the reset controller API. These functions assert and then deassert reset signals in a single call, providing a convenient way to pulse/toggle a reset line.

This mimics the Linux kernel's reset_control_reset() and reset_control_bulk_reset() APIs. The new functions are useful for drivers that need to cycle a reset line during initialization or error recovery but with also passing delay parameter.

If a driver implements the rst_reset op, it will be called directly with the delay parameter. Otherwise, the reset core performs reset_assert(), optional udelay(), and reset_deassert() as fallback.

Quoted 6 lines

drivers/reset/reset-uclass.c | 34 ++++++++++++++++++++++++++++++++++

  include/reset-uclass.h       | 12 ++++++++++++
  include/reset.h              | 41 +++++++++++++++++++++++++++++++++++++++++
  3 files changed, 87 insertions(+)

optional nits / thoughts below

Quoted 12 lines
include/reset-uclass.h +10 -0
@@ -76,6 +76,18 @@ struct reset_ops {
+     /**
+      * rst_reset - Reset a HW module.
+      *
+      * This optional function triggers a reset pulse on the reset line,
+      * asserting and then deasserting the reset signal. If not implemented,
+      * the reset core will use rst_assert followed by rst_deassert.
+      *
+      * @reset_ctl:  The reset signal to pulse.
+      * @delay_us:   Delay in microseconds between assert and deassert.
+      * @return 0 if OK, or a negative error code.
Quoted 8 lines

include/reset-uclass.h struct reset_ops { · line 90

Quoted 2 lines
include/reset-uclass.h +2 -0
+      */
+     int (*rst_reset)(struct reset_ctl *reset_ctl, ulong delay_us);

Please document that the core inserts a udelay(delay_us) between rst_assert and rst_deassert in the fallback path, and clarify whether an rst_reset implementation must honour delay_us or may treat it as a hint. Without that, authors don't really know what to do with the value.

ok. Will fix in v3.

Quoted 15 lines
Quoted 4 lines
drivers/reset/reset-uclass.c +2 -0
@@ -225,6 +226,39 @@ int reset_deassert_bulk(struct reset_ctl_bulk *bulk)
+int reset_reset_bulk(struct reset_ctl_bulk *bulk, ulong delay_us)
+{

drivers/reset/reset-uclass.c int reset_deassert_bulk(struct reset_ctl_bulk *bulk) · line 237

Quoted 10 lines
drivers/reset/reset-uclass.c +10 -0
+     int i, ret;
+
+     for (i = 0; i < bulk->count; i++) {
+             ret = reset_reset(&bulk->resets[i], delay_us);
+             if (ret < 0)
+                     return ret;
+     }
+
+     return 0;
+}
Quoted 7 lines

Just to check - pulsing each reset sequentially means the first finishes its full assert/delay/deassert before the next starts asserting. For the cadence_qspi case in 3/4, where multiple OSPI reset lines are expected to be asserted together, the previous code did assert_bulk() / udelay() / deassert_bulk() so all lines were held low simultaneously. The new behaviour is different. Is that intentional, and have you confirmed the cadence controller is happy with it?

You are right that behavior has changed but it is aligned with what Linux kernel is doing.
We are using only one reset line that's why not an issue for us. But it saves one firmware call (per reset line).

int reset_control_bulk_reset(int num_rstcs,
struct reset_control_bulk_data *rstcs)

{
        int ret, i;

        for (i = 0; i < num_rstcs; i++) {
                ret = reset_control_reset(rstcs[i].rstc);
                if (ret)
                        return ret;
        }

        return 0;
}

EXPORT_SYMBOL_GPL(reset_control_bulk_reset);

If it is problematic we can go back to assert_bulk/delay/deassert_bulk in cadence driver.

Thanks,
Michal

#4 lore raw

Re: [PATCH v2 1/4] reset: Add reset_reset() and reset_reset_bulk() API

Hi Michal,

Quoted 99 lines · Michal Simek
Quoted 42 lines · Simon Glass

Hi Michal,

Quoted 16 lines · Michal Simek

reset: Add reset_reset() and reset_reset_bulk() API

Add reset_reset() and reset_reset_bulk() functions to the reset controller API. These functions assert and then deassert reset signals in a single call, providing a convenient way to pulse/toggle a reset line.

This mimics the Linux kernel's reset_control_reset() and reset_control_bulk_reset() APIs. The new functions are useful for drivers that need to cycle a reset line during initialization or error recovery but with also passing delay parameter.

If a driver implements the rst_reset op, it will be called directly with the delay parameter. Otherwise, the reset core performs reset_assert(), optional udelay(), and reset_deassert() as fallback.

Quoted 6 lines

drivers/reset/reset-uclass.c | 34 ++++++++++++++++++++++++++++++++++

  include/reset-uclass.h       | 12 ++++++++++++
  include/reset.h              | 41 +++++++++++++++++++++++++++++++++++++++++
  3 files changed, 87 insertions(+)

optional nits / thoughts below

Quoted 12 lines
include/reset-uclass.h +10 -0
@@ -76,6 +76,18 @@ struct reset_ops {
+     /**
+      * rst_reset - Reset a HW module.
+      *
+      * This optional function triggers a reset pulse on the reset line,
+      * asserting and then deasserting the reset signal. If not implemented,
+      * the reset core will use rst_assert followed by rst_deassert.
+      *
+      * @reset_ctl:  The reset signal to pulse.
+      * @delay_us:   Delay in microseconds between assert and deassert.
+      * @return 0 if OK, or a negative error code.
Quoted 8 lines

include/reset-uclass.h struct reset_ops { · line 90

Quoted 2 lines
include/reset-uclass.h +2 -0
+      */
+     int (*rst_reset)(struct reset_ctl *reset_ctl, ulong delay_us);

Please document that the core inserts a udelay(delay_us) between rst_assert and rst_deassert in the fallback path, and clarify whether an rst_reset implementation must honour delay_us or may treat it as a hint. Without that, authors don't really know what to do with the value.

ok. Will fix in v3.

Quoted 15 lines
Quoted 4 lines
drivers/reset/reset-uclass.c +2 -0
@@ -225,6 +226,39 @@ int reset_deassert_bulk(struct reset_ctl_bulk *bulk)
+int reset_reset_bulk(struct reset_ctl_bulk *bulk, ulong delay_us)
+{

drivers/reset/reset-uclass.c int reset_deassert_bulk(struct reset_ctl_bulk *bulk) · line 237

Quoted 10 lines
drivers/reset/reset-uclass.c +10 -0
+     int i, ret;
+
+     for (i = 0; i < bulk->count; i++) {
+             ret = reset_reset(&bulk->resets[i], delay_us);
+             if (ret < 0)
+                     return ret;
+     }
+
+     return 0;
+}
Quoted 7 lines

Just to check - pulsing each reset sequentially means the first finishes its full assert/delay/deassert before the next starts asserting. For the cadence_qspi case in 3/4, where multiple OSPI reset lines are expected to be asserted together, the previous code did assert_bulk() / udelay() / deassert_bulk() so all lines were held low simultaneously. The new behaviour is different. Is that intentional, and have you confirmed the cadence controller is happy with it?

You are right that behavior has changed but it is aligned with what Linux kernel is doing.
We are using only one reset line that's why not an issue for us. But it saves one firmware call (per reset line).

int reset_control_bulk_reset(int num_rstcs,
struct reset_control_bulk_data *rstcs)

{
         int ret, i;

         for (i = 0; i < num_rstcs; i++) {
                 ret = reset_control_reset(rstcs[i].rstc);
                 if (ret)
                         return ret;
         }

         return 0;
}
Quoted 5 lines

EXPORT_SYMBOL_GPL(reset_control_bulk_reset);

If it is problematic we can go back to assert_bulk/delay/deassert_bulk in cadence driver.

Well if it matches Linux we should be OK.

Regards,
Simon

author maintainer
#5 lore raw

PATCH v2 2/4 reset: Add sandbox tests for reset_reset() and reset_reset_bulk()

In reply to Michal Simek

Add DM test coverage for the new reset_reset() and reset_reset_bulk() API functions. The tests exercise the assert + deassert fallback path since the sandbox reset driver does not implement the rst_reset op.

---

Changes in v2:
- Add reset_count field to track reset pulse operations
- Implement sandbox_reset_reset() for rst_reset op
- Add sandbox_reset_get_count() to query reset pulse count
- Clear reset_count when reset is requested
- Update tests to verify reset pulse actually happened

 arch/sandbox/include/asm/reset.h   |  3 ++
 drivers/reset/sandbox-reset-test.c | 14 +++++++
 drivers/reset/sandbox-reset.c      | 31 ++++++++++++++
 test/dm/reset.c                    | 67 ++++++++++++++++++++++++++++++
 4 files changed, 115 insertions(+)
arch/sandbox/include/asm/reset.h +3 -0
index f0709b41c09f..2890e0dc09bd 100644
@@ -10,6 +10,7 @@ struct udevice;
 
 int sandbox_reset_query(struct udevice *dev, unsigned long id);
 int sandbox_reset_is_requested(struct udevice *dev, unsigned long id);
+int sandbox_reset_get_count(struct udevice *dev, unsigned long id);
 
 int sandbox_reset_test_get(struct udevice *dev);
 int sandbox_reset_test_get_devm(struct udevice *dev);
@@ -19,6 +20,8 @@ int sandbox_reset_test_assert(struct udevice *dev);
 int sandbox_reset_test_assert_bulk(struct udevice *dev);
 int sandbox_reset_test_deassert(struct udevice *dev);
 int sandbox_reset_test_deassert_bulk(struct udevice *dev);
+int sandbox_reset_test_reset(struct udevice *dev);
+int sandbox_reset_test_reset_bulk(struct udevice *dev);
 int sandbox_reset_test_free(struct udevice *dev);
 int sandbox_reset_test_release_bulk(struct udevice *dev);
 
drivers/reset/sandbox-reset-test.c +14 -0
index dfacb764bc77..64c205596c5e 100644
@@ -96,6 +96,20 @@ int sandbox_reset_test_deassert_bulk(struct udevice *dev)
 	return reset_deassert_bulk(sbrt->bulkp);
 }
 
+int sandbox_reset_test_reset(struct udevice *dev)
+{
+	struct sandbox_reset_test *sbrt = dev_get_priv(dev);
+
+	return reset_reset(sbrt->ctlp, 0);
+}
+
+int sandbox_reset_test_reset_bulk(struct udevice *dev)
+{
+	struct sandbox_reset_test *sbrt = dev_get_priv(dev);
+
+	return reset_reset_bulk(sbrt->bulkp, 0);
+}
+
 int sandbox_reset_test_free(struct udevice *dev)
 {
 	struct sandbox_reset_test *sbrt = dev_get_priv(dev);
drivers/reset/sandbox-reset.c +31 -0
index adf9eedcba6d..71fba5b15da0 100644
@@ -9,12 +9,14 @@
 #include <reset-uclass.h>
 #include <asm/io.h>
 #include <asm/reset.h>
+#include <linux/delay.h>
 
 #define SANDBOX_RESET_SIGNALS 101
 
 struct sandbox_reset_signal {
 	bool asserted;
 	bool requested;
+	int reset_count;
 };
 
 struct sandbox_reset {
@@ -31,6 +33,7 @@ static int sandbox_reset_request(struct reset_ctl *reset_ctl)
 		return -EINVAL;
 
 	sbr->signals[reset_ctl->id].requested = true;
+	sbr->signals[reset_ctl->id].reset_count = 0;
 	return 0;
 }
 
@@ -66,6 +69,21 @@ static int sandbox_reset_deassert(struct reset_ctl *reset_ctl)
 	return 0;
 }
 
+static int sandbox_reset_reset(struct reset_ctl *reset_ctl, ulong delay_us)
+{
+	struct sandbox_reset *sbr = dev_get_priv(reset_ctl->dev);
+
+	debug("%s(reset_ctl=%p, delay_us=%lu)\n", __func__, reset_ctl,
+	      delay_us);
+
+	sbr->signals[reset_ctl->id].asserted = true;
+	udelay(delay_us);
+	sbr->signals[reset_ctl->id].asserted = false;
+	sbr->signals[reset_ctl->id].reset_count++;
+
+	return 0;
+}
+
 static int sandbox_reset_bind(struct udevice *dev)
 {
 	debug("%s(dev=%p)\n", __func__, dev);
@@ -90,6 +108,7 @@ struct reset_ops sandbox_reset_reset_ops = {
 	.rfree = sandbox_reset_free,
 	.rst_assert = sandbox_reset_assert,
 	.rst_deassert = sandbox_reset_deassert,
+	.rst_reset = sandbox_reset_reset,
 };
 
 U_BOOT_DRIVER(sandbox_reset) = {
@@ -125,3 +144,15 @@ int sandbox_reset_is_requested(struct udevice *dev, unsigned long id)
 
 	return sbr->signals[id].requested;
 }
+
+int sandbox_reset_get_count(struct udevice *dev, unsigned long id)
+{
+	struct sandbox_reset *sbr = dev_get_priv(dev);
+
+	debug("%s(dev=%p, id=%ld)\n", __func__, dev, id);
+
+	if (id >= SANDBOX_RESET_SIGNALS)
+		return -EINVAL;
+
+	return sbr->signals[id].reset_count;
+}
test/dm/reset.c +67 -0

73 lines not on this page · raw message

Signature · 1 line
2.43.0
Reviewed-by on v2 2/4
#6 lore raw

Re: [PATCH v2 2/4] reset: Add sandbox tests for reset_reset() and reset_reset_bulk()

Hi Michal,

Quoted 23 lines · Michal Simek

reset: Add sandbox tests for reset_reset() and reset_reset_bulk()

Add DM test coverage for the new reset_reset() and reset_reset_bulk() API functions. The tests exercise the assert + deassert fallback path since the sandbox reset driver does not implement the rst_reset op.

arch/sandbox/include/asm/reset.h | 3 ++

 drivers/reset/sandbox-reset-test.c | 14 ++++++++
 drivers/reset/sandbox-reset.c      | 31 ++++++++++++++++++
 test/dm/reset.c                    | 67 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 115 insertions(+)
drivers/reset/sandbox-reset.c +4 -0
@@ -66,6 +69,21 @@ static int sandbox_reset_deassert(struct reset_ctl *reset_ctl)
      return 0;
 }
 
+static int sandbox_reset_reset(struct reset_ctl *reset_ctl, ulong delay_us)
+{
+     struct sandbox_reset *sbr = dev_get_priv(reset_ctl->dev);
+

drivers/reset/sandbox-reset.c static int sandbox_reset_deassert(struct reset_ctl *reset_ctl) · line 85

Quoted 10 lines
drivers/reset/sandbox-reset.c +10 -0
+     debug("%s(reset_ctl=%p, delay_us=%lu)\n", __func__, reset_ctl,
+           delay_us);
+
+     sbr->signals[reset_ctl->id].asserted = true;
+     udelay(delay_us);
+     sbr->signals[reset_ctl->id].asserted = false;
+     sbr->signals[reset_ctl->id].reset_count++;
+
+     return 0;
+}

Some optional nits / thoughts below.

The commit message says the tests exercise the fallback path since the sandbox reset driver doesn't have rst_reset op, this patch adds that method below - so the commit message could use an update.

If you want coverage for the fallback you could add a second sandbox-reset driver without rst_reset, or hack the rest to clear and restart ops->rst_reset,

Quoted 5 lines
drivers/reset/sandbox-reset-test.c +3 -0
@@ -96,6 +96,20 @@ int sandbox_reset_test_deassert_bulk(struct udevice *dev)
+int sandbox_reset_test_reset(struct udevice *dev)
+{
+     struct sandbox_reset_test *sbrt = dev_get_priv(dev);

drivers/reset/sandbox-reset-test.c int sandbox_reset_test_deassert_bulk(struct udevice *dev) · line 108

Quoted 10 lines
drivers/reset/sandbox-reset-test.c +10 -0
+
+     return reset_reset(sbrt->ctlp, 0);
+}
+
+int sandbox_reset_test_reset_bulk(struct udevice *dev)
+{
+     struct sandbox_reset_test *sbrt = dev_get_priv(dev);
+
+     return reset_reset_bulk(sbrt->bulkp, 0);
+}

You could pass a non-zero value here if you want to test the delay.

Regards,
Simon

author maintainer
#7 lore raw

Re: [PATCH v2 2/4] reset: Add sandbox tests for reset_reset() and reset_reset_bulk()

Quoted 39 lines · Simon Glass

Hi Michal,

Quoted 23 lines · Michal Simek

reset: Add sandbox tests for reset_reset() and reset_reset_bulk()

Add DM test coverage for the new reset_reset() and reset_reset_bulk() API functions. The tests exercise the assert + deassert fallback path since the sandbox reset driver does not implement the rst_reset op.

arch/sandbox/include/asm/reset.h | 3 ++

  drivers/reset/sandbox-reset-test.c | 14 ++++++++
  drivers/reset/sandbox-reset.c      | 31 ++++++++++++++++++
  test/dm/reset.c                    | 67 ++++++++++++++++++++++++++++++++++++++
  4 files changed, 115 insertions(+)
drivers/reset/sandbox-reset.c +4 -0
@@ -66,6 +69,21 @@ static int sandbox_reset_deassert(struct reset_ctl *reset_ctl)
       return 0;
  }
 
+static int sandbox_reset_reset(struct reset_ctl *reset_ctl, ulong delay_us)
+{
+     struct sandbox_reset *sbr = dev_get_priv(reset_ctl->dev);
+

drivers/reset/sandbox-reset.c static int sandbox_reset_deassert(struct reset_ctl *reset_ctl) · line 85

Quoted 10 lines
drivers/reset/sandbox-reset.c +10 -0
+     debug("%s(reset_ctl=%p, delay_us=%lu)\n", __func__, reset_ctl,
+           delay_us);
+
+     sbr->signals[reset_ctl->id].asserted = true;
+     udelay(delay_us);
+     sbr->signals[reset_ctl->id].asserted = false;
+     sbr->signals[reset_ctl->id].reset_count++;
+
+     return 0;
+}
Quoted 5 lines

Some optional nits / thoughts below.

The commit message says the tests exercise the fallback path since the sandbox reset driver doesn't have rst_reset op, this patch adds that method below - so the commit message could use an update.

Will update.

Quoted 14 lines

If you want coverage for the fallback you could add a second sandbox-reset driver without rst_reset, or hack the rest to clear and restart ops->rst_reset,

Quoted 9 lines
drivers/reset/sandbox-reset-test.c +7 -0
@@ -96,6 +96,20 @@ int sandbox_reset_test_deassert_bulk(struct udevice *dev)
+int sandbox_reset_test_reset(struct udevice *dev)
+{
+     struct sandbox_reset_test *sbrt = dev_get_priv(dev);
+
+     return reset_reset(sbrt->ctlp, 0);
+}
+
Quoted 8 lines

drivers/reset/sandbox-reset-test.c int sandbox_reset_test_deassert_bulk(struct udevice *dev) · line 111

Quoted 6 lines
drivers/reset/sandbox-reset-test.c +6 -0
+int sandbox_reset_test_reset_bulk(struct udevice *dev)
+{
+     struct sandbox_reset_test *sbrt = dev_get_priv(dev);
+
+     return reset_reset_bulk(sbrt->bulkp, 0);
+}

You could pass a non-zero value here if you want to test the delay.

udelay is called and because there is missing check for 0 value it does timer reading once. Don't think that make sense to delay tests.

Thanks,
Michal

#8 lore raw

Re: [PATCH v2 2/4] reset: Add sandbox tests for reset_reset() and reset_reset_bulk()

Hi Michal,

Quoted 74 lines · Michal Simek
Quoted 39 lines · Simon Glass

Hi Michal,

Quoted 23 lines · Michal Simek

reset: Add sandbox tests for reset_reset() and reset_reset_bulk()

Add DM test coverage for the new reset_reset() and reset_reset_bulk() API functions. The tests exercise the assert + deassert fallback path since the sandbox reset driver does not implement the rst_reset op.

arch/sandbox/include/asm/reset.h | 3 ++

  drivers/reset/sandbox-reset-test.c | 14 ++++++++
  drivers/reset/sandbox-reset.c      | 31 ++++++++++++++++++
  test/dm/reset.c                    | 67 ++++++++++++++++++++++++++++++++++++++
  4 files changed, 115 insertions(+)
drivers/reset/sandbox-reset.c +4 -0
@@ -66,6 +69,21 @@ static int sandbox_reset_deassert(struct reset_ctl *reset_ctl)
       return 0;
  }
 
+static int sandbox_reset_reset(struct reset_ctl *reset_ctl, ulong delay_us)
+{
+     struct sandbox_reset *sbr = dev_get_priv(reset_ctl->dev);
+

drivers/reset/sandbox-reset.c static int sandbox_reset_deassert(struct reset_ctl *reset_ctl) · line 85

Quoted 10 lines
drivers/reset/sandbox-reset.c +10 -0
+     debug("%s(reset_ctl=%p, delay_us=%lu)\n", __func__, reset_ctl,
+           delay_us);
+
+     sbr->signals[reset_ctl->id].asserted = true;
+     udelay(delay_us);
+     sbr->signals[reset_ctl->id].asserted = false;
+     sbr->signals[reset_ctl->id].reset_count++;
+
+     return 0;
+}
Quoted 5 lines

Some optional nits / thoughts below.

The commit message says the tests exercise the fallback path since the sandbox reset driver doesn't have rst_reset op, this patch adds that method below - so the commit message could use an update.

Will update.

Quoted 14 lines

If you want coverage for the fallback you could add a second sandbox-reset driver without rst_reset, or hack the rest to clear and restart ops->rst_reset,

Quoted 9 lines
drivers/reset/sandbox-reset-test.c +7 -0
@@ -96,6 +96,20 @@ int sandbox_reset_test_deassert_bulk(struct udevice *dev)
+int sandbox_reset_test_reset(struct udevice *dev)
+{
+     struct sandbox_reset_test *sbrt = dev_get_priv(dev);
+
+     return reset_reset(sbrt->ctlp, 0);
+}
+
Quoted 8 lines

drivers/reset/sandbox-reset-test.c int sandbox_reset_test_deassert_bulk(struct udevice *dev) · line 111

Quoted 6 lines
drivers/reset/sandbox-reset-test.c +6 -0
+int sandbox_reset_test_reset_bulk(struct udevice *dev)
+{
+     struct sandbox_reset_test *sbrt = dev_get_priv(dev);
+
+     return reset_reset_bulk(sbrt->bulkp, 0);
+}

You could pass a non-zero value here if you want to test the delay.

Quoted 2 lines

udelay is called and because there is missing check for 0 value it does timer reading once. Don't think that make sense to delay tests.

We try to avoid delays in tests, although 10us wouldn't matter. We do have timer_test_add_offset() but I don't think it helps with udelay()

Regards,
Simon

author maintainer
#9 lore raw

Re: [PATCH v2 2/4] reset: Add sandbox tests for reset_reset() and reset_reset_bulk()

Quoted 77 lines · Simon Glass

Hi Michal,

Quoted 74 lines · Michal Simek
Quoted 39 lines · Simon Glass

Hi Michal,

Quoted 23 lines · Michal Simek

reset: Add sandbox tests for reset_reset() and reset_reset_bulk()

Add DM test coverage for the new reset_reset() and reset_reset_bulk() API functions. The tests exercise the assert + deassert fallback path since the sandbox reset driver does not implement the rst_reset op.

arch/sandbox/include/asm/reset.h   |  3 ++
   drivers/reset/sandbox-reset-test.c | 14 ++++++++
   drivers/reset/sandbox-reset.c      | 31 ++++++++++++++++++
   test/dm/reset.c                    | 67 ++++++++++++++++++++++++++++++++++++++
   4 files changed, 115 insertions(+)
drivers/reset/sandbox-reset.c +4 -0
@@ -66,6 +69,21 @@ static int sandbox_reset_deassert(struct reset_ctl *reset_ctl)
        return 0;
   }
 
+static int sandbox_reset_reset(struct reset_ctl *reset_ctl, ulong delay_us)
+{
+     struct sandbox_reset *sbr = dev_get_priv(reset_ctl->dev);
+

drivers/reset/sandbox-reset.c static int sandbox_reset_deassert(struct reset_ctl *reset_ctl) · line 85

Quoted 10 lines
drivers/reset/sandbox-reset.c +10 -0
+     debug("%s(reset_ctl=%p, delay_us=%lu)\n", __func__, reset_ctl,
+           delay_us);
+
+     sbr->signals[reset_ctl->id].asserted = true;
+     udelay(delay_us);
+     sbr->signals[reset_ctl->id].asserted = false;
+     sbr->signals[reset_ctl->id].reset_count++;
+
+     return 0;
+}
Quoted 5 lines

Some optional nits / thoughts below.

The commit message says the tests exercise the fallback path since the sandbox reset driver doesn't have rst_reset op, this patch adds that method below - so the commit message could use an update.

Will update.

Quoted 22 lines

If you want coverage for the fallback you could add a second sandbox-reset driver without rst_reset, or hack the rest to clear and restart ops->rst_reset,

Quoted 5 lines
drivers/reset/sandbox-reset-test.c +3 -0
@@ -96,6 +96,20 @@ int sandbox_reset_test_deassert_bulk(struct udevice *dev)
+int sandbox_reset_test_reset(struct udevice *dev)
+{
+     struct sandbox_reset_test *sbrt = dev_get_priv(dev);

drivers/reset/sandbox-reset-test.c int sandbox_reset_test_deassert_bulk(struct udevice *dev) · line 108

Quoted 10 lines
drivers/reset/sandbox-reset-test.c +10 -0
+
+     return reset_reset(sbrt->ctlp, 0);
+}
+
+int sandbox_reset_test_reset_bulk(struct udevice *dev)
+{
+     struct sandbox_reset_test *sbrt = dev_get_priv(dev);
+
+     return reset_reset_bulk(sbrt->bulkp, 0);
+}

You could pass a non-zero value here if you want to test the delay.

Quoted 5 lines
Quoted 2 lines

udelay is called and because there is missing check for 0 value it does timer reading once. Don't think that make sense to delay tests.

We try to avoid delays in tests, although 10us wouldn't matter. We do have timer_test_add_offset() but I don't think it helps with udelay()

I have created new version and also test fallback which has 1us delay there. Please take a look at that new patch and this part should be covered.

M

author maintainer
#10 lore raw

PATCH v2 3/4 spi: cadence: Use reset_reset_bulk() for proper reset cycling

In reply to Michal Simek

Use the new reset_reset_bulk() API to properly cycle reset signals during probe instead of just deasserting them. This ensures the controller is properly reset before initialization.

---

Changes in v2:
- Pass 10us via parameter

 drivers/spi/cadence_qspi.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/spi/cadence_qspi.c +4 -12
index 2a4a49c5f1cf..984d4a39ded4 100644
@@ -31,6 +31,8 @@
 #define CQSPI_DISABLE_STIG_MODE		BIT(0)
 #define CQSPI_DMA_MODE			BIT(1)
 
+#define CQSPI_RESET_DELAY_US		10
+
 __weak int cadence_qspi_apb_dma_read(struct cadence_spi_priv *priv,
 				     const struct spi_mem_op *op)
 {
@@ -256,19 +258,9 @@ static int cadence_spi_probe(struct udevice *bus)
 
 	priv->resets = devm_reset_bulk_get_optional(bus);
 	if (priv->resets) {
-		/* Assert all OSPI reset lines */
-		ret = reset_assert_bulk(priv->resets);
-		if (ret) {
-			dev_err(bus, "Failed to assert OSPI reset: %d\n", ret);
-			return ret;
-		}
-
-		udelay(10);
-
-		/* Deassert all OSPI reset lines */
-		ret = reset_deassert_bulk(priv->resets);
+		ret = reset_reset_bulk(priv->resets, CQSPI_RESET_DELAY_US);
 		if (ret) {
-			dev_err(bus, "Failed to deassert OSPI reset: %d\n", ret);
+			dev_err(bus, "Failed to reset OSPI: %d\n", ret);
 			return ret;
 		}
 	}
Signature · 1 line
2.43.0
author maintainer
#11 lore raw

PATCH v2 4/4 reset: zynqmp: Implement rst_reset using PM_RESET_ACTION_PULSE

In reply to Michal Simek

Implement the rst_reset operation in the ZynqMP reset driver to use PM_RESET_ACTION_PULSE. This allows the reset controller to perform a reset pulse in a single firmware call instead of separate assert and deassert calls.

This matches the Linux kernel implementation of zynqmp_reset_reset().

---

(no changes since v1)

 drivers/reset/reset-zynqmp.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
drivers/reset/reset-zynqmp.c +11 -0
index d04e8eef3bb4..2b58f3a75b42 100644
@@ -45,6 +45,16 @@ static int zynqmp_reset_deassert(struct reset_ctl *rst)
 				      PM_RESET_ACTION_RELEASE);
 }
 
+static int zynqmp_reset_reset(struct reset_ctl *rst, ulong delay_us)
+{
+	struct zynqmp_reset_priv *priv = dev_get_priv(rst->dev);
+
+	dev_dbg(rst->dev, "%s(rst=%p) (id=%lu)\n", __func__, rst, rst->id);
+
+	return zynqmp_pm_reset_assert(priv->reset_id + rst->id,
+				      PM_RESET_ACTION_PULSE);
+}
+
 static int zynqmp_reset_request(struct reset_ctl *rst)
 {
 	struct zynqmp_reset_priv *priv = dev_get_priv(rst->dev);
@@ -74,6 +84,7 @@ const struct reset_ops zynqmp_reset_ops = {
 	.request = zynqmp_reset_request,
 	.rst_assert = zynqmp_reset_assert,
 	.rst_deassert = zynqmp_reset_deassert,
+	.rst_reset = zynqmp_reset_reset,
 };
 
 static const struct udevice_id zynqmp_reset_ids[] = {
Signature · 1 line
2.43.0