Skip to contentSkip to conversation

reset: socfpga: Poll for reset status after deassert reset

PATCH Superseded Ley Foon Tan 3 participants 3 messages Jan 6, 2020 – Jan 8, 2020 Reset controller framework

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 reset: socfpga: Poll for reset status after deassert reset

In Cyclone 5 SoC platform, the first USB probing is failed but second probing is success. DWC2 USB driver read gsnpsid register right after de-assert reset, but controller is not ready yet and it returns gsnpsid 0. Polling reset status after de-assert reset to solve the issue.

Retry with this fix more than 10 times without issue.

---
v3:
- Remove _status callback and poll reset status after deassert reset

v2:
- https://patchwork.ozlabs.org/cover/1215174/

v1:
- https://patchwork.ozlabs.org/patch/1214841/

---
 drivers/reset/reset-socfpga.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/reset/reset-socfpga.c +12 -1
index 93ec9cfdb6..172028dcf6 100644
@@ -78,9 +78,20 @@ static int socfpga_reset_deassert(struct reset_ctl *reset_ctl)
 	int reg_width = sizeof(u32);
 	int bank = id / (reg_width * BITS_PER_BYTE);
 	int offset = id % (reg_width * BITS_PER_BYTE);
+	int i = 1000;
+	u32 status;
 
 	clrbits_le32(data->modrst_base + (bank * BANK_INCREMENT), BIT(offset));
-	return 0;
+
+	/* Poll until reset is completed. */
+	do {
+		status = readl(data->modrst_base + (bank * BANK_INCREMENT)) &
+			       BIT(offset);
+		if (!status)
+			return 0;
+	} while (i--);
+
+	return -ETIMEDOUT;
 }
 
 static int socfpga_reset_request(struct reset_ctl *reset_ctl)
Signature · 1 line
2.19.0
#1 lore raw

PATCH v3 1/1 reset: socfpga: Poll for reset status after deassert reset

Hi Ley,

Quoted 34 lines · Ley Foon Tan

In Cyclone 5 SoC platform, the first USB probing is failed but second probing is success. DWC2 USB driver read gsnpsid register right after de-assert reset, but controller is not ready yet and it returns gsnpsid 0. Polling reset status after de-assert reset to solve the issue.

Retry with this fix more than 10 times without issue.

---
v3:
- Remove _status callback and poll reset status after deassert reset

v2:
- https://patchwork.ozlabs.org/cover/1215174/

v1:
- https://patchwork.ozlabs.org/patch/1214841/

---
 drivers/reset/reset-socfpga.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/reset/reset-socfpga.c +2 -0
index 93ec9cfdb6..172028dcf6 100644
@@ -78,9 +78,20 @@ static int socfpga_reset_deassert(struct reset_ctl *reset_ctl)
        int reg_width = sizeof(u32);
        int bank = id / (reg_width * BITS_PER_BYTE);
        int offset = id % (reg_width * BITS_PER_BYTE);
+       int i = 1000;
+       u32 status;
 

drivers/reset/reset-socfpga.c static int socfpga_reset_deassert(struct reset_ctl *reset_ctl) · line 92

Quoted 10 lines
drivers/reset/reset-socfpga.c +8 -1
        clrbits_le32(data->modrst_base + (bank * BANK_INCREMENT), BIT(offset));
-       return 0;
+
+       /* Poll until reset is completed. */
+       do {
+               status = readl(data->modrst_base + (bank * BANK_INCREMENT)) &
+                              BIT(offset);
+               if (!status)
+                       return 0;
+       } while (i--);

This should be something like:

start = get_timer(0);

while (1) {
    existing code
    if (get_timer(start) > TIMEOUT_MS)
        return -ETIMEOUT;
    };

so that you actually have a timeout. At present the timeout is indeterminate.

Quoted 8 lines
drivers/reset/reset-socfpga.c +2 -1
+
+       return -ETIMEDOUT;
 }
 
 static int socfpga_reset_request(struct reset_ctl *reset_ctl)
--

2.19.0

Regards,
Simon

#2 lore raw

PATCH v3 1/1 reset: socfpga: Poll for reset status after deassert reset

Quoted 68 lines

-----Original Message-----
From: Simon Glass <[email protected]>
Sent: Wednesday, January 8, 2020 12:50 AM
To: Tan, Ley Foon <[email protected]>
Cc: U-Boot Mailing List <[email protected]>; Marek Vasut <[email protected]>; Simon Goldschmidt <[email protected]>; Joe Hershberger <[email protected]>; Ley Foon Tan <[email protected]>; See, Chin Liang <[email protected]>; Chee, Tien Fong <[email protected]>
Subject: Re: [PATCH v3] reset: socfpga: Poll for reset status after deassert reset

Hi Ley,

drivers/reset/reset-socfpga.c static int socfpga_reset_deassert(struct reset_ctl

Quoted 28 lines · Ley Foon Tan

In Cyclone 5 SoC platform, the first USB probing is failed but second probing is success. DWC2 USB driver read gsnpsid register right after de-assert reset, but controller is not ready yet and it returns gsnpsid 0. Polling reset status after de-assert reset to solve the issue.

Retry with this fix more than 10 times without issue.

---
v3:
- Remove _status callback and poll reset status after deassert reset

v2:
- https://patchwork.ozlabs.org/cover/1215174/

v1:
- https://patchwork.ozlabs.org/patch/1214841/

---
 drivers/reset/reset-socfpga.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
(quoted diff) +0 -0

b/drivers/reset/reset-socfpga.c index 93ec9cfdb6..172028dcf6 100644

drivers/reset/reset-socfpga.c +0 -0
@@ -78,9 +78,20 @@ static int socfpga_reset_deassert(struct reset_ctl

*reset_ctl)

drivers/reset/reset-socfpga.c static int socfpga_reset_deassert(struct reset_ctl *reset_ctl)

Quoted 7 lines
drivers/reset/reset-socfpga.c +2 -0
        int reg_width = sizeof(u32);
        int bank = id / (reg_width * BITS_PER_BYTE);
        int offset = id % (reg_width * BITS_PER_BYTE);
+       int i = 1000;
+       u32 status;
 
        clrbits_le32(data->modrst_base + (bank * BANK_INCREMENT),

BIT(offset));

drivers/reset/reset-socfpga.c static int socfpga_reset_deassert(struct reset_ctl *reset_ctl)

Quoted 5 lines
drivers/reset/reset-socfpga.c +4 -1
-       return 0;
+
+       /* Poll until reset is completed. */
+       do {
+               status = readl(data->modrst_base + (bank * BANK_INCREMENT))

&

drivers/reset/reset-socfpga.c static int socfpga_reset_deassert(struct reset_ctl *reset_ctl) · line 92

Quoted 4 lines
drivers/reset/reset-socfpga.c +4 -0
+                              BIT(offset);
+               if (!status)
+                       return 0;
+       } while (i--);

This should be something like:

Quoted 8 lines

start = get_timer(0);

while (1) {
    existing code
    if (get_timer(start) > TIMEOUT_MS)
        return -ETIMEOUT;
    };

so that you actually have a timeout. At present the timeout is indeterminate.

Okay, will change it.

Thanks.

Regards
Ley Foon