From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: Petr Mladek <pmladek@suse.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-media@vger.kernel.org,
Dave Stevenson <dave.stevenson@raspberrypi.com>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com,
mchehab@kernel.org,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
Steven Rostedt <rostedt@goodmis.org>,
Joe Perches <joe@perches.com>,
Jani Nikula <jani.nikula@linux.intel.com>
Subject: [PATCH v2 1/1] lib/vsprintf: Add support for printing V4L2 and DRM fourccs
Date: Fri, 3 Apr 2020 12:11:56 +0300 [thread overview]
Message-ID: <20200403091156.7814-1-sakari.ailus@linux.intel.com> (raw)
Add a printk modifier %ppf (for pixel format) for printing V4L2 and DRM
pixel formats denoted by 4ccs. The 4cc encoding is the same for both so
the same implementation can be used.
Suggested-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
since v1:
- Improve documentation (add -BE suffix, refer to "FourCC".
- Use '%p4cc' conversion specifier instead of '%ppf'.
- Fix 31st bit handling in printing FourCC codes.
- Use string() correctly, to allow e.g. proper field width handling.
- Remove loop, use put_unaligned_le32() instead.
Documentation/core-api/printk-formats.rst | 12 +++++++++++
lib/vsprintf.c | 25 +++++++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/Documentation/core-api/printk-formats.rst b/Documentation/core-api/printk-formats.rst
index 8ebe46b1af39..550568520ab6 100644
--- a/Documentation/core-api/printk-formats.rst
+++ b/Documentation/core-api/printk-formats.rst
@@ -545,6 +545,18 @@ For printing netdev_features_t.
Passed by reference.
+V4L2 and DRM FourCC code (pixel format)
+---------------------------------------
+
+::
+
+ %p4cc
+
+Print a FourCC code used by V4L2 or DRM. The "-BE" suffix is added on big endian
+formats.
+
+Passed by reference.
+
Thanks
======
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 7c488a1ce318..93eea6a320da 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1721,6 +1721,28 @@ char *netdev_bits(char *buf, char *end, const void *addr,
return special_hex_number(buf, end, num, size);
}
+static noinline_for_stack
+char *fourcc_string(char *buf, char *end, const u32 *fourcc,
+ struct printf_spec spec, const char *fmt)
+{
+#define FOURCC_STRING_BE "-BE"
+ char s[sizeof(*fourcc) + sizeof(FOURCC_STRING_BE)] = { 0 };
+
+ if (check_pointer(&buf, end, fourcc, spec))
+ return buf;
+
+ if (fmt[1] != 'c' || fmt[2] != 'c')
+ return error_string(buf, end, "(%p4?)", spec);
+
+ put_unaligned_le32(*fourcc & ~BIT(31), s);
+
+ if (*fourcc & BIT(31))
+ strscpy(s + sizeof(*fourcc), FOURCC_STRING_BE,
+ sizeof(FOURCC_STRING_BE));
+
+ return string(buf, end, s, spec);
+}
+
static noinline_for_stack
char *address_val(char *buf, char *end, const void *addr,
struct printf_spec spec, const char *fmt)
@@ -2131,6 +2153,7 @@ char *fwnode_string(char *buf, char *end, struct fwnode_handle *fwnode,
* correctness of the format string and va_list arguments.
* - 'K' For a kernel pointer that should be hidden from unprivileged users
* - 'NF' For a netdev_features_t
+ * - '4cc' V4L2 or DRM FourCC code, with "-BE" suffix on big endian formats.
* - 'h[CDN]' For a variable-length buffer, it prints it as a hex string with
* a certain separator (' ' by default):
* C colon
@@ -2223,6 +2246,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
return restricted_pointer(buf, end, ptr, spec);
case 'N':
return netdev_bits(buf, end, ptr, spec, fmt);
+ case '4':
+ return fourcc_string(buf, end, ptr, spec, fmt);
case 'a':
return address_val(buf, end, ptr, spec, fmt);
case 'd':
--
2.20.1
next reply other threads:[~2020-04-03 9:12 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-03 9:11 Sakari Ailus [this message]
2020-04-03 9:31 ` Andy Shevchenko
2020-04-03 9:39 ` Sakari Ailus
2020-04-03 9:54 ` Andy Shevchenko
2020-04-03 10:10 ` Sakari Ailus
2020-04-03 10:24 ` Laurent Pinchart
2020-04-03 10:47 ` Sakari Ailus
2020-04-03 11:19 ` Mauro Carvalho Chehab
2020-04-03 11:54 ` Andy Shevchenko
2020-04-03 18:38 ` Joe Perches
2020-04-03 23:36 ` Sakari Ailus
2020-04-03 23:55 ` Joe Perches
2020-04-03 12:10 ` Rasmus Villemoes
2020-04-03 14:22 ` Mauro Carvalho Chehab
2020-04-03 16:56 ` Joe Perches
2020-04-03 17:32 ` Mauro Carvalho Chehab
2020-04-03 17:48 ` Joe Perches
2020-04-03 18:32 ` Andy Shevchenko
2020-04-04 0:14 ` Sakari Ailus
2020-04-04 0:21 ` Laurent Pinchart
2020-04-06 7:17 ` Sakari Ailus
2020-04-06 7:46 ` Mauro Carvalho Chehab
2020-04-06 10:44 ` Andy Shevchenko
2020-04-06 13:01 ` Joe Perches
2020-04-06 7:28 ` Sakari Ailus
2020-04-06 7:37 ` Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200403091156.7814-1-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=dave.stevenson@raspberrypi.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=hverkuil@xs4all.nl \
--cc=jani.nikula@linux.intel.com \
--cc=joe@perches.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=pmladek@suse.com \
--cc=rostedt@goodmis.org \
--cc=sergey.senozhatsky@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome