Re: [PATCH 1/2] test: dm: pinmux: Handle %pa in pinctrl-single mux output

2023-08-20 Thread Simon Glass
On Sat, 12 Aug 2023 at 21:32, Marek Vasut
 wrote:
>
> The pinctrl-single driver uses %pa to print register value
> in its single_get_pin_muxing() output. Handle this properly
> in the test based on CONFIG_PHYS_64BIT .
>
> Signed-off-by: Marek Vasut 
> ---
> Cc: Simon Glass 
> ---
>  test/dm/pinmux.c | 92 +++-
>  1 file changed, 51 insertions(+), 41 deletions(-)

Reviewed-by: Simon Glass 

Applied to u-boot-dm, thanks!


Re: [PATCH 1/2] test: dm: pinmux: Handle %pa in pinctrl-single mux output

2023-08-13 Thread Simon Glass
On Sat, 12 Aug 2023 at 21:32, Marek Vasut
 wrote:
>
> The pinctrl-single driver uses %pa to print register value
> in its single_get_pin_muxing() output. Handle this properly
> in the test based on CONFIG_PHYS_64BIT .
>
> Signed-off-by: Marek Vasut 
> ---
> Cc: Simon Glass 
> ---
>  test/dm/pinmux.c | 92 +++-
>  1 file changed, 51 insertions(+), 41 deletions(-)

Reviewed-by: Simon Glass 


[PATCH 1/2] test: dm: pinmux: Handle %pa in pinctrl-single mux output

2023-08-12 Thread Marek Vasut
The pinctrl-single driver uses %pa to print register value
in its single_get_pin_muxing() output. Handle this properly
in the test based on CONFIG_PHYS_64BIT .

Signed-off-by: Marek Vasut 
---
Cc: Simon Glass 
---
 test/dm/pinmux.c | 92 +++-
 1 file changed, 51 insertions(+), 41 deletions(-)

diff --git a/test/dm/pinmux.c b/test/dm/pinmux.c
index 265df4ccb97..6880b2d2cd9 100644
--- a/test/dm/pinmux.c
+++ b/test/dm/pinmux.c
@@ -15,6 +15,16 @@ static char buf[64];
ut_asserteq_str(expected, (char *)&buf); \
 } while (0)
 
+#define test_muxing_regaddr(selector, regaddr, expected) do { \
+   char estr[64] = { 0 }; \
+   if (IS_ENABLED(CONFIG_PHYS_64BIT)) \
+   snprintf(estr, sizeof(estr), "0x%016llx %s", (u64)regaddr, 
expected); \
+   else \
+   snprintf(estr, sizeof(estr), "0x%08x %s", (u32)regaddr, 
expected); \
+   ut_assertok(pinctrl_get_pin_muxing(dev, selector, buf, sizeof(buf))); \
+   ut_asserteq_str(estr, (char *)&buf); \
+} while (0)
+
 #define test_name(selector, expected) do { \
ut_assertok(pinctrl_get_pin_name(dev, selector, buf, sizeof(buf))); \
ut_asserteq_str(expected, (char *)&buf); \
@@ -79,14 +89,14 @@ static int dm_test_pinctrl_single(struct unit_test_state 
*uts)
test_name(0, "PIN0");
test_name(141, "PIN141");
test_name(142, "Error");
-   test_muxing(0, "0x 0x UNCLAIMED");
-   test_muxing(18, "0x0048 0x0006 pinmux_pwm_pins");
-   test_muxing(28, "0x0070 0x0030 pinmux_uart0_pins");
-   test_muxing(29, "0x0074 0x pinmux_uart0_pins");
-   test_muxing(100, "0x0190 0x000c pinmux_spi0_pins");
-   test_muxing(101, "0x0194 0x000c pinmux_spi0_pins");
-   test_muxing(102, "0x0198 0x0023 pinmux_spi0_pins");
-   test_muxing(103, "0x019c 0x000c pinmux_spi0_pins");
+   test_muxing_regaddr(0, 0x0, "0x UNCLAIMED");
+   test_muxing_regaddr(18, 0x48, "0x0006 pinmux_pwm_pins");
+   test_muxing_regaddr(28, 0x70, "0x0030 pinmux_uart0_pins");
+   test_muxing_regaddr(29, 0x74, "0x pinmux_uart0_pins");
+   test_muxing_regaddr(100, 0x190, "0x000c pinmux_spi0_pins");
+   test_muxing_regaddr(101, 0x194, "0x000c pinmux_spi0_pins");
+   test_muxing_regaddr(102, 0x198, "0x0023 pinmux_spi0_pins");
+   test_muxing_regaddr(103, 0x19c, "0x000c pinmux_spi0_pins");
ret = pinctrl_get_pin_muxing(dev, 142, buf, sizeof(buf));
ut_asserteq(-EINVAL, ret);
ut_assertok(uclass_get_device_by_name(UCLASS_I2C, "i2c@0", &dev));
@@ -97,39 +107,39 @@ static int dm_test_pinctrl_single(struct unit_test_state 
*uts)
test_name(0, "PIN0");
test_name(159, "PIN159");
test_name(160, "Error");
-   test_muxing(0, "0x 0x UNCLAIMED");
-   test_muxing(34, "0x0010 0x0200 pinmux_i2c0_pins");
-   test_muxing(35, "0x0010 0x2000 pinmux_i2c0_pins");
-   test_muxing(130, "0x0040 0x0200 pinmux_lcd_pins");
-   test_muxing(131, "0x0040 0x2000 pinmux_lcd_pins");
-   test_muxing(132, "0x0040 0x0002 pinmux_lcd_pins");
-   test_muxing(133, "0x0040 0x0020 pinmux_lcd_pins");
-   test_muxing(134, "0x0040 0x0200 pinmux_lcd_pins");
-   test_muxing(135, "0x0040 0x2000 pinmux_lcd_pins");
-   test_muxing(136, "0x0044 0x0002 pinmux_lcd_pins");
-   test_muxing(137, "0x0044 0x0020 pinmux_lcd_pins");
-   test_muxing(138, "0x0044 0x0200 pinmux_lcd_pins");
-   test_muxing(139, "0x0044 0x2000 pinmux_lcd_pins");
-   test_muxing(140, "0x0044 0x0002 pinmux_lcd_pins");
-   test_muxing(141, "0x0044 0x0020 pinmux_lcd_pins");
-   test_muxing(142, "0x0044 0x0200 pinmux_lcd_pins");
-   test_muxing(143, "0x0044 0x2000 pinmux_lcd_pins");
-   test_muxing(144, "0x0048 0x0002 pinmux_lcd_pins");
-   test_muxing(145, "0x0048 0x0020 pinmux_lcd_pins");
-   test_muxing(146, "0x0048 0x UNCLAIMED");
-   test_muxing(147, "0x0048 0x UNCLAIMED");
-   test_muxing(148, "0x0048 0x UNCLAIMED");
-   test_muxing(149, "0x0048 0x UNCLAIMED");
-   test_muxing(150, "0x0048 0x0200 pinmux_lcd_pins");
-   test_muxing(151, "0x0048 0x UNCLAIMED");
-   test_muxing(152, "0x004c 0x0002 pinmux_lcd_pins");
-   test_muxing(153, "0x004c 0x0020 pinmux_lcd_pins");
-   test_muxing(154, "0x004c 0x UNCLAIMED");
-   test_muxing(155, "0x004c 0x UNCLAIMED");
-   test_muxing(156, "0x004c 0x UNCLAIMED");
-   test_muxing(157, "0x004c 0x UNCLAIMED");
-   test_muxing(158, "0x004c 0x0200 pinmux_lcd_pins");
-   test_muxing(159, "0x004c 0x UNCLAIMED"