image: Fix various test failures

With min() we must use the same type for each parameter. Fix two problems in trace.c which produce compiler warnings.

Signed-off-by Simon Glass <[email protected]>

---

 cmd/trace.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

This function can be called from the timer code on instrumented functions. Mark it as 'notrace' so that it doesn't cause infinite recursion.

Signed-off-by Simon Glass <[email protected]>

---

 lib/div64.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

A few of the functions in the timer uclass are not marked with 'notrace'. Fix this so that tracing can be used with CONFIG_TRACE.

Signed-off-by Simon Glass <[email protected]>

---

 drivers/timer/timer-uclass.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

drivers/timer/timer-uclass.c +1 -1

index 83d1a35..382c0f2 100644
@@ -22,7 +22,7 @@ DECLARE_GLOBAL_DATA_PTR;
  * tick, and no timer interrupt.
  */
 
-int timer_get_count(struct udevice *dev, u64 *count)
+int notrace timer_get_count(struct udevice *dev, u64 *count)
 {
        const struct timer_ops *ops = device_get_ops(dev);
 

Hi Simon,

Quoted 22 lines · Simon Glass

A few of the functions in the timer uclass are not marked with 'notrace'. Fix this so that tracing can be used with CONFIG_TRACE.

Signed-off-by Simon Glass <[email protected]>

---

 drivers/timer/timer-uclass.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

drivers/timer/timer-uclass.c +1 -1

index 83d1a35..382c0f2 100644
@@ -22,7 +22,7 @@ DECLARE_GLOBAL_DATA_PTR;
  * tick, and no timer interrupt.
  */
 
-int timer_get_count(struct udevice *dev, u64 *count)
+int notrace timer_get_count(struct udevice *dev, u64 *count)
 {
        const struct timer_ops *ops = device_get_ops(dev);
 

drivers/timer/timer-uclass.c int timer_get_count(struct udevice *dev, u64 *count) · line 32

Quoted 2 lines

drivers/timer/timer-uclass.c +0 -0

@@ -32,9 +32,9 @@ int timer_get_count(struct udevice *dev, u64 *count)
        return ops->get_count(dev, count);

Besides making timer_get_count() and timer_get_rate() APIs notrace, does it help to make the timer uclass ops notrace as well?

drivers/timer/timer-uclass.c int timer_get_count(struct udevice *dev, u64 *count) · line 37

Quoted 8 lines

drivers/timer/timer-uclass.c +2 -2

 }
 
-unsigned long timer_get_rate(struct udevice *dev)
+unsigned long notrace timer_get_rate(struct udevice *dev)
 {
-       struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
+       struct timer_dev_priv *uc_priv = dev->uclass_priv;

Why is this change needed?

drivers/timer/timer-uclass.c int timer_get_count(struct udevice *dev, u64 *count)

Quoted 5 lines

drivers/timer/timer-uclass.c +0 -1

        return uc_priv->clock_rate;
 }
--

Regards,
Bin

In some cases the timer must be accessible before driver model is active. Examples include when using CONFIG_TRACE to trace U-Boot's execution before driver model is set up. Enable this option to use an early timer. These functions must be supported by your timer driver: timer_early_get_count() and timer_early_get_rate().

Signed-off-by Simon Glass <[email protected]>

---

 drivers/timer/Kconfig | 10 ++++++++++
 include/timer.h       | 21 +++++++++++++++++++++
 lib/time.c            | 28 +++++++++++++++++++++-------
 3 files changed, 52 insertions(+), 7 deletions(-)

drivers/timer/Kconfig +10 -0

index ff65a73..cb18f12 100644
@@ -9,6 +9,16 @@ config TIMER
          will be used. The timer is usually a 32 bits free-running up
          counter. There may be no real tick, and no timer interrupt.
 
+config TIMER_EARLY
+       bool "Allow timer to be used early in U-Boot"
+       depends on TIMER
+       help
+         In some cases the timer must be accessible before driver model is
+         active. Examples include when using CONFIG_TRACE to trace U-Boot's
+         execution before driver model is set up. Enable this option to
+         use an early timer. These functions must be supported by your timer
+         driver: timer_early_get_count() and timer_early_get_rate().
+
 config ALTERA_TIMER
        bool "Altera timer support"
        depends on TIMER

include/timer.h +5 -0

index f14725c..a503bfd 100644
@@ -67,4 +67,25 @@ struct timer_dev_priv {
        unsigned long clock_rate;
 };
 
+/**
+ * timer_early_get_count() - Implement timer_get_count() before driver model
+ *
+ * If CONFIG_TIMER_EARLY is enabled, this function wil be called to return
+ * the current timer value before the proper driver model timer is ready.

Hi Simon,

Quoted 48 lines · Simon Glass

In some cases the timer must be accessible before driver model is active. Examples include when using CONFIG_TRACE to trace U-Boot's execution before driver model is set up. Enable this option to use an early timer. These functions must be supported by your timer driver: timer_early_get_count() and timer_early_get_rate().

Signed-off-by Simon Glass <[email protected]>

---

 drivers/timer/Kconfig | 10 ++++++++++
 include/timer.h       | 21 +++++++++++++++++++++
 lib/time.c            | 28 +++++++++++++++++++++-------
 3 files changed, 52 insertions(+), 7 deletions(-)

drivers/timer/Kconfig +10 -0

index ff65a73..cb18f12 100644
@@ -9,6 +9,16 @@ config TIMER
          will be used. The timer is usually a 32 bits free-running up
          counter. There may be no real tick, and no timer interrupt.
 
+config TIMER_EARLY
+       bool "Allow timer to be used early in U-Boot"
+       depends on TIMER
+       help
+         In some cases the timer must be accessible before driver model is
+         active. Examples include when using CONFIG_TRACE to trace U-Boot's
+         execution before driver model is set up. Enable this option to
+         use an early timer. These functions must be supported by your timer
+         driver: timer_early_get_count() and timer_early_get_rate().
+
 config ALTERA_TIMER
        bool "Altera timer support"
        depends on TIMER

include/timer.h +5 -0

index f14725c..a503bfd 100644
@@ -67,4 +67,25 @@ struct timer_dev_priv {
        unsigned long clock_rate;
 };
 
+/**
+ * timer_early_get_count() - Implement timer_get_count() before driver model
+ *
+ * If CONFIG_TIMER_EARLY is enabled, this function wil be called to return
+ * the current timer value before the proper driver model timer is ready.

include/timer.h struct timer_dev_priv { · line 84

Quoted 10 lines

include/timer.h +10 -0

+ * It should be implemented by one of the timer values. This is mostly useful
+ * for tracing.
+ */
+u64 timer_early_get_count(void);
+
+/**
+ * timer_early_get_rate() - Get the timer rate before driver model
+ *
+ * If CONFIG_TIMER_EARLY is enabled, this function wil be called to return
+ * the current timer rate  in Hz before the proper driver model timer is ready.

nits: two spaces between 'rate' and 'in'

include/timer.h struct timer_dev_priv { · line 87

Quoted 3 lines

include/timer.h +3 -0

+ * It should be implemented by one of the timer values. This is mostly useful
+ * for tracing. This corresponds to the clock_rate value in struct
+ * timer_dev_priv.

Is this supposed to be a hard-codeded value returned by the timer driver? The timer-uclass driver gets this clock rate from device tree, but I believe at that time when early timer is called, FDT blob might not be available yet.

include/timer.h struct timer_dev_priv { · line 91

Quoted 5 lines

include/timer.h +3 -0

+ */
+unsigned long timer_early_get_rate(void);
+
 #endif /* _TIMER_H_ */

[snip]

Regards,
Bin

When using the early timer, we need to manually trigger setting up the real timer. This will not happen automatically. Do this immediately after starting driver model.

Signed-off-by Simon Glass <[email protected]>

---

 common/board_f.c |  6 ++++++
 common/board_r.c | 14 ++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

Add support for the early timer so we can use tracing with sandbox again.

Signed-off-by Simon Glass <[email protected]>

---

 drivers/timer/sandbox_timer.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

drivers/timer/sandbox_timer.c +0 -0

index a8da936..4537c82 100644
@@ -18,9 +18,19 @@ void sandbox_timer_add_offset(unsigned long offset)
        sandbox_timer_offset += offset;
 }
 

Hi Simon,

Quoted 16 lines · Simon Glass

Add support for the early timer so we can use tracing with sandbox again.

Signed-off-by Simon Glass <[email protected]>

---

 drivers/timer/sandbox_timer.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

drivers/timer/sandbox_timer.c +0 -0

index a8da936..4537c82 100644
@@ -18,9 +18,19 @@ void sandbox_timer_add_offset(unsigned long offset)
        sandbox_timer_offset += offset;
 }
 

drivers/timer/sandbox_timer.c void sandbox_timer_add_offset(unsigned long offset) · line 28

Quoted 10 lines

drivers/timer/sandbox_timer.c +7 -2

-static int sandbox_timer_get_count(struct udevice *dev, u64 *count)
+u64 notrace timer_early_get_count(void)
 {
-       *count = os_get_nsec() / 1000 + sandbox_timer_offset * 1000;
+       return os_get_nsec() / 1000 + sandbox_timer_offset * 1000;
+}
+
+unsigned long notrace timer_early_get_rate(void)
+{
+       return 1000000;

Hard-coded?

Quoted 7 lines

drivers/timer/sandbox_timer.c +5 -0

+}
+
+static notrace int sandbox_timer_get_count(struct udevice *dev, u64 *count)
+{
+       *count = timer_early_get_count();
 

drivers/timer/sandbox_timer.c void sandbox_timer_add_offset(unsigned long offset)

Quoted 3 lines

drivers/timer/sandbox_timer.c +0 -1

        return 0;
 }
--

Regards,
Bin

Enable this so that tracing works with sandbox.

Signed-off-by Simon Glass <[email protected]>

---

 configs/sandbox_defconfig | 1 +
 1 file changed, 1 insertion(+)

Add a little more debugging to help when things go wrong.

Signed-off-by Simon Glass <[email protected]>

---

We must not free data that is managed by driver mode. Remove this line, which is a hangover from the pre-driver-model code.

This fixes a problem where 'sf probe' crashes U-Boot if the backing file for the SPI flash cannot be found.

Signed-off-by Simon Glass <[email protected]>

---

We must not free data that is managed by driver mode. Remove this line, which is a hangover from the pre-driver-model code.

This fixes a problem where 'sf probe' crashes U-Boot if the backing file for the SPI flash cannot be found.

Signed-off-by Simon Glass <[email protected]>

When an error number is provided we should use it, not change it. This fixes the SPI and SPI flash tests.

One of these is long-standing. The other seems to have been introduced by commit 1e90d9fd (sf: Move read_id code to sf_ops).

Signed-off-by Simon Glass <[email protected]>

Fixes 1e90d9fd (sf: Move read_id code to sf_ops)

---

These are working correctly again, so re-enable them.

Signed-off-by Simon Glass <[email protected]>

---

Recent changes have broken the FIT and vboot tests. Also the SPI tests have been wrong since before the last release and were disabled.

This series collects together the required fixes.

Note: The FIT and vboot tests are hard to run (in that each requires manual effort). At some point we should be able to bring these into Stephen Warren's test framework.