Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d799210 authored by Stepan Moskovchenko's avatar Stepan Moskovchenko Committed by Linus Torvalds
Browse files

lib/vsprintf.c: add %pa format specifier for phys_addr_t types 



Add the %pa format specifier for printing a phys_addr_t type and its
derivative types (such as resource_size_t), since the physical address
size on some platforms can vary based on build options, regardless of
the native integer type.

Signed-off-by: default avatarStepan Moskovchenko <stepanm@codeaurora.org>
Cc: Rob Landley <rob@landley.net>
Cc: George Spelvin <linux@horizon.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f3cbd435

Documentation/printk-formats.txt

+11 −3
Original line number Diff line number Diff line
@@ -53,6 +53,14 @@ Struct Resources: 
	For printing struct resources. The 'R' and 'r' specifiers result in a

	printed resource with ('R') or without ('r') a decoded flags member.



Physical addresses:



	%pa	0x01234567 or 0x0123456789abcdef



	For printing a phys_addr_t type (and its derivatives, such as

	resource_size_t) which can vary based on build options, regardless of

	the width of the CPU data path. Passed by reference.



Raw buffer as a hex string:

	%*ph	00 01 02  ...  3f

	%*phC	00:01:02: ... :3f
@@ -150,9 +158,9 @@ s64 SHOULD be printed with %lld/%llx, (long long): 
	printk("%lld", (long long)s64_var);



If <type> is dependent on a config option for its size (e.g., sector_t,

blkcnt_t, phys_addr_t, resource_size_t) or is architecture-dependent

for its size (e.g., tcflag_t), use a format specifier of its largest

possible type and explicitly cast to it.  Example:

blkcnt_t) or is architecture-dependent for its size (e.g., tcflag_t), use a

format specifier of its largest possible type and explicitly cast to it.

Example:



	printk("test: sector number/total blocks: %llu/%llu\n",

		(unsigned long long)sector, (unsigned long long)blockcount);

lib/vsprintf.c

+7 −0
Original line number Diff line number Diff line
@@ -1030,6 +1030,7 @@ int kptr_restrict __read_mostly; 
 *              N no separator

 *            The maximum supported length is 64 bytes of the input. Consider

 *            to use print_hex_dump() for the larger input.

 * - 'a' For a phys_addr_t type and its derivative types (passed by reference)

 *

 * Note: The difference between 'S' and 'F' is that on ia64 and ppc64

 * function pointers are really function descriptors, which contain a
@@ -1120,6 +1121,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, 
			return netdev_feature_string(buf, end, ptr, spec);

		}

		break;

	case 'a':

		spec.flags |= SPECIAL | SMALL | ZEROPAD;

		spec.field_width = sizeof(phys_addr_t) * 2 + 2;

		spec.base = 16;

		return number(buf, end,

			      (unsigned long long) *((phys_addr_t *)ptr), spec);

	}

	spec.flags |= SMALL;

	if (spec.field_width == -1) {