vsprintf: Support phys_addr_t specifier unconditionally
Subsystems (2)
PATCH 1/3 vsprintf: Support phys_addr_t specifier unconditionally
From: Thierry Reding <[email protected]>
When phys_addr_t printf specifier support was first introduced in commit 1eebd14b7902 ("vsprintf: Add modifier for phys_addr_t"), it was enabled only if CONFIG_CMD_NET was selected. Since physical addresses are not unique to networking support it doesn't make sense to conditionally add it in those cases only. Move support for it outside of the CMD_NET guard so that the specifier is always supported.
--- lib/vsprintf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/vsprintf.c +1 -1
@@ -457,7 +457,6 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr,return device_path_string (buf, end, ptr, field_width, precision, flags);#endif -#ifdef CONFIG_CMD_NET case 'a' : flags |=SPECIAL |ZEROPAD ;
@@ -469,6 +468,7 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr,break ; }break ; +#ifdef CONFIG_CMD_NET case 'm' : flags |=SPECIAL ;/* Fallthrough */
Signature · 1 line
2.20.1
PATCH 2/3 sandbox: Use correct phys_{addr, size}_t for PHYS_64BIT=y
From: Thierry Reding <[email protected]>
If 64-bit physical addresses support is enabled, make sure the sandox defines the correct types for phys_addr_t and phys_size_t.
--- arch/sandbox/include/asm/types.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/sandbox/include/asm/types.h +6 -6
@@ -18,21 +18,21 @@ typedef unsigned short umode_t;/* * Number of bits in a C 'long' on this architecture. */ -#ifdef CONFIG_PHYS64 +#ifdef CONFIG_PHYS_64BIT #define BITS_PER_LONG 64 -#else /* CONFIG_PHYS64 */ +#else /* CONFIG_PHYS_64BIT */ #define BITS_PER_LONG 32 -#endif /* CONFIG_PHYS64 */ +#endif /* CONFIG_PHYS_64BIT */ -#ifdef CONFIG_PHYS64 +#ifdef CONFIG_PHYS_64BIT typedef unsigned long long dma_addr_t ;typedef u64 phys_addr_t ;typedef u64 phys_size_t ; -#else /* CONFIG_PHYS64 */ +#else /* CONFIG_PHYS_64BIT */ typedef unsigned long dma_addr_t ;typedef u32 phys_addr_t ;typedef u32 phys_size_t ; -#endif /* CONFIG_PHYS64 */ +#endif /* CONFIG_PHYS_64BIT */ #endif /* __KERNEL__ */
Signature · 1 line
2.20.1
PATCH 2/3 sandbox: Use correct phys_{addr, size}_t for PHYS_64BIT=y
Quoted 11 lines · Thierry Reding
From: Thierry Reding <[email protected]>
If 64-bit physical addresses support is enabled, make sure the sandox defines the correct types for
phys_addr_tandphys_size_t.Signed-off-by Thierry Reding <[email protected]>--- arch/sandbox/include/asm/types.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
Applied to u-boot-dm, thanks!
PATCH 3/3 sandbox: Properly print physical addresses
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
Use the %pap printf specifier to print physical addresses. The physical address is passed by reference and hence avoids the need to play tricks with the preprocessor to use the correct specifier.
--- arch/sandbox/lib/pci_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sandbox/lib/pci_io.c +1 -1
@@ -34,7 +34,7 @@ int pci_map_physmem(phys_addr_t paddr, unsigned long *lenp,return 0 ; } -debug ("%s: failed: addr=%x\n" , __func__, paddr); +debug ("%s: failed: addr=%pap\n" , __func__, &paddr);return -ENOSYS ; }
Signature · 1 line
2.20.1
PATCH 1/3 vsprintf: Support phys_addr_t specifier unconditionally
In reply to Thierry RedingQuoted 10 lines · Thierry Reding
From: Thierry Reding <[email protected]>
When
phys_addr_tprintf specifier support was first introduced in commit1eebd14b7902("vsprintf: Add modifier forphys_addr_t"), it was enabled only ifCONFIG_CMD_NETwas selected. Since physical addresses are not unique to networking support it doesn't make sense to conditionally add it in those cases only. Move support for it outside of theCMD_NETguard so that the specifier is always supported.
Quoted 4 lines
Signed-off-by Thierry Reding <[email protected]>--- lib/vsprintf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Is there a code-size impact here? Perhaps instead it should be a new Kconfig option, implied by CMD_NET?
Regards,
Simon
PATCH 1/3 vsprintf: Support phys_addr_t specifier unconditionally
Quoted 11 lines · Simon Glass
Quoted 10 lines · Thierry Reding
From: Thierry Reding <[email protected]>
When
phys_addr_tprintf specifier support was first introduced in commit1eebd14b7902("vsprintf: Add modifier forphys_addr_t"), it was enabled only ifCONFIG_CMD_NETwas selected. Since physical addresses are not unique to networking support it doesn't make sense to conditionally add it in those cases only. Move support for it outside of theCMD_NETguard so that the specifier is always supported.
Quoted 7 lines
Quoted 4 lines
Signed-off-by Thierry Reding <[email protected]>--- lib/vsprintf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Is there a code-size impact here? Perhaps instead it should be a new
Kconfigoption, implied byCMD_NET?
There's a tiny code-size impact needed for the extra "case" statement, etc. But it shouldn't be more than maybe a handful of instructions. I don't think we can reasonable guard this by a Kconfig option because this specifier is used to print physical addresses, which can happen pretty much anywhere. A quick grep on a recent master shows that this is used in a number of different drivers:
$ git grep -n '".*%pa.*"'
arch/arm/lib/cache-cp15.c:66: debug("%s: start=%pa, size=%zu, option=%llx\n", __func__, &start, size,
arch/arm/lib/cache-cp15.c:69: debug("%s: start=%pa, size=%zu, option=0x%x\n", __func__, &start, size,
arch/arm/lib/cache.c:84: debug("mapping memory %pa-%pa non-cached\n", &start, &end);
arch/arm/lib/cache.c:102: debug("allocated %zu bytes of uncached memory @%pa\n", size, &next);
drivers/pinctrl/pinctrl-single.c:52: dev_dbg(dev, " invalid register offset 0x%pa\n", ®);
drivers/pinctrl/pinctrl-single.c:69: dev_dbg(dev, " reg/val 0x%pa/0x%08x\n", ®, val);
drivers/spi/fsl_dspi.c:653: debug("DSPI: regs=%pa, max-frequency=%d, endianess=%s, num-cs=%d\n",
drivers/video/tegra.c:330: debug("LCD frame buffer at %pa, size %x\n", &priv->frame_buffer,Guarding the specifier with a Kconfig symbol would require extending the list of dependencies everytime someone else starts using it, which means that people (i.e. reviewers) actually have to know about this, remember it and very closely look at the printf format string to detect whether a %pa is used or not.
Note also that while the above seems like only a small number of users, there are potentially a lot more that actually print out a physical address but use some other specifier to do so. You only really need the %pa if you need to support code across platforms where phys_addr_t has a different size.
Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190401/7c7e9d52/attachment.sig>