Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp4951704pxb; Mon, 15 Feb 2021 05:52:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJwyvShYD67+yoSh1zll/uXdzF9Y615SGGnLfO79/4/9qLBdXDQb6i+rKT2kLgWWcNsXQRCo X-Received: by 2002:a17:906:a28a:: with SMTP id i10mr15876130ejz.422.1613397149637; Mon, 15 Feb 2021 05:52:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613397149; cv=none; d=google.com; s=arc-20160816; b=qJub/Tyc+k7SZNnTH175xsTbAop1xUf72BX7yZI1V1DvsMGlDUoiv1H88Zn0FRmame sDLWKymnaiyNHczWNBhPRcWP7Zfrj2MkGSoU1gO74DSJPXNNqvKMzb2IlGDTY6KpQTFg IrN0X8OkGfzhCJ7le+u7/EH2TsINdiB2RzmhKeM4mw3rLO2NQ4qUozzyHuT2/K445Gk0 C8dm3UVW/Kpzwp997Dt3GfIvsLM1BXhr+DRRBFNqX2AkJcI93LgHPNNYCHO8g6GGnlsw JQpcxKBXi+KsS6T5V3mZk8lTu7QIzAgmeF3NvZEMOrtz1BSTJBjBiDeXClmpUtoyGWfu gBkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:organization:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :ironport-sdr:ironport-sdr; bh=Iob092E0QlmqIBlg/Ja/HW0ETiQAXFDHQwQoNdk8cng=; b=giqXXsUgstyFgGdhM/OcQ2Zb3puWALKMWpKQq6CyYBKmkFN21QhXe+FOetdMTf6R09 o5fH8U8pobQGFJ4i1Lt+gubZzdz7jUYDCIuQMTqsO5ad5s4L8aJ+FxH6HwgaVkYKk2s6 0H11GMbs5gE5FljfyqK/7YdzQHIO9+H4eZfVIj8Y6s3ByDMBrd53UMsOS/coa6VHynEq pwM7zaw+LdcevqiQ0ORp4+rx8Ok1pxa121oZOnZgRsNzZXsvmzkmuunL+Eq49j8ixQ1L yRLRsM233wiNqkFOQdBNDpkJdMKSCSEo3AstIwKymm6SgI2kNK5dYLVUW46b44yoQDYZ tlgA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y6si13071245edp.379.2021.02.15.05.52.04; Mon, 15 Feb 2021 05:52:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230306AbhBONfS (ORCPT + 99 others); Mon, 15 Feb 2021 08:35:18 -0500 Received: from mga18.intel.com ([134.134.136.126]:14178 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230368AbhBONdk (ORCPT ); Mon, 15 Feb 2021 08:33:40 -0500 IronPort-SDR: 7PzYmWe7ijkXVwrojAs4N6XKLmUILvnmuiqyTo0o9qLYT5dPf/dksRjESm481WTCJgSqpzj57Q onnf7F6+lBvQ== X-IronPort-AV: E=McAfee;i="6000,8403,9895"; a="170340455" X-IronPort-AV: E=Sophos;i="5.81,180,1610438400"; d="scan'208";a="170340455" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2021 05:31:35 -0800 IronPort-SDR: WgaLDDO8hzHT59lq6F9XeQXfid+lKCKz7uljzLdWH/Oi4e7/mYnJqd0Gb1wEpYPIW7HwJdQXpB ekx7gKsylN/w== X-IronPort-AV: E=Sophos;i="5.81,180,1610438400"; d="scan'208";a="512203296" Received: from smile.fi.intel.com (HELO smile) ([10.237.68.40]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2021 05:31:32 -0800 Received: from andy by smile with local (Exim 4.94) (envelope-from ) id 1lBdyL-005CXG-0i; Mon, 15 Feb 2021 15:31:29 +0200 Date: Mon, 15 Feb 2021 15:31:29 +0200 From: Andy Shevchenko To: Sakari Ailus Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Petr Mladek , Dave Stevenson , dri-devel@lists.freedesktop.org, hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com, mchehab@kernel.org, Sergey Senozhatsky , Steven Rostedt , Joe Perches , Jani Nikula , Rasmus Villemoes Subject: Re: [PATCH v7 1/3] lib/vsprintf: Add support for printing V4L2 and DRM fourccs Message-ID: References: <20210215114030.11862-1-sakari.ailus@linux.intel.com> <20210215114030.11862-2-sakari.ailus@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210215114030.11862-2-sakari.ailus@linux.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Feb 15, 2021 at 01:40:28PM +0200, Sakari Ailus wrote: > Add a printk modifier %p4cc (for pixel format) for printing V4L2 and DRM > pixel formats denoted by fourccs. The fourcc encoding is the same for both > so the same implementation can be used. This version I almost like, feel free to add Reviewed-by: From: Andy Shevchenko after considering addressing below nit-picks. > Suggested-by: Mauro Carvalho Chehab > Signed-off-by: Sakari Ailus > Reviewed-by: Petr Mladek > Reviewed-by: Sergey Senozhatsky > --- > Documentation/core-api/printk-formats.rst | 16 ++++++++++ > lib/test_printf.c | 17 ++++++++++ > lib/vsprintf.c | 39 +++++++++++++++++++++++ > scripts/checkpatch.pl | 6 ++-- > 4 files changed, 76 insertions(+), 2 deletions(-) > > diff --git a/Documentation/core-api/printk-formats.rst b/Documentation/core-api/printk-formats.rst > index 160e710d992f..da2aa065dc42 100644 > --- a/Documentation/core-api/printk-formats.rst > +++ b/Documentation/core-api/printk-formats.rst > @@ -567,6 +567,22 @@ 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, including format endianness and > +its numerical value as hexadecimal. > + > +Passed by reference. > + > +Examples:: > + > + %p4cc BG12 little-endian (0x32314742) No examples with spaces / non-printable / non-ascii characters > + > Thanks > ====== > > diff --git a/lib/test_printf.c b/lib/test_printf.c > index 7d60f24240a4..9848510a2786 100644 > --- a/lib/test_printf.c > +++ b/lib/test_printf.c > @@ -647,6 +647,22 @@ static void __init fwnode_pointer(void) > software_node_unregister_nodes(softnodes); > } > > +static void __init fourcc_pointer(void) > +{ > + struct { > + u32 code; > + char *str; > + } const try[] = { > + { 0x3231564e, "NV12 little-endian (0x3231564e)", }, > + { 0xb231564e, "NV12 big-endian (0xb231564e)", }, > + { 0x10111213, ".... little-endian (0x10111213)", }, > + }; > + unsigned int i; > + > + for (i = 0; i < ARRAY_SIZE(try); i++) > + test(try[i].str, "%p4cc", &try[i].code); > +} > + > static void __init > errptr(void) > { > @@ -692,6 +708,7 @@ test_pointer(void) > flags(); > errptr(); > fwnode_pointer(); > + fourcc_pointer(); > } > > static void __init selftest(void) > diff --git a/lib/vsprintf.c b/lib/vsprintf.c > index 3b53c73580c5..432b5a2d1e90 100644 > --- a/lib/vsprintf.c > +++ b/lib/vsprintf.c > @@ -1733,6 +1733,42 @@ 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) > +{ > + char output[sizeof("1234 little-endian (0x01234567)")]; 1234 -> ABCD ? (Or XY12 to be closer to the reality) > + char *p = output; > + unsigned int i; > + u32 val; > + > + if (fmt[1] != 'c' || fmt[2] != 'c') > + return error_string(buf, end, "(%p4?)", spec); > + > + if (check_pointer(&buf, end, fourcc, spec)) > + return buf; > + > + val = *fourcc & ~BIT(31); > + > + for (i = 0; i < sizeof(*fourcc); i++) { > + unsigned char c = val >> (i * 8); > + > + /* Print non-control ASCII characters as-is, dot otherwise */ > + *p++ = isascii(c) && isprint(c) ? c : '.'; > + } > + > + strcpy(p, *fourcc & BIT(31) ? " big-endian" : " little-endian"); > + p += strlen(p); > + > + *p++ = ' '; > + *p++ = '('; > + p = special_hex_number(p, output + sizeof(output) - 2, *fourcc, sizeof(u32)); > + *p++ = ')'; > + *p = '\0'; > + > + return string(buf, end, output, spec); > +} > + > static noinline_for_stack > char *address_val(char *buf, char *end, const void *addr, > struct printf_spec spec, const char *fmt) > @@ -2162,6 +2198,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 endianness and raw numerical value. > * - 'h[CDN]' For a variable-length buffer, it prints it as a hex string with > * a certain separator (' ' by default): > * C colon > @@ -2259,6 +2296,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': > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl > index 92e888ed939f..79858e07d023 100755 > --- a/scripts/checkpatch.pl > +++ b/scripts/checkpatch.pl > @@ -6557,9 +6557,11 @@ sub process { > $specifier = $1; > $extension = $2; > $qualifier = $3; > - if ($extension !~ /[SsBKRraEehMmIiUDdgVCbGNOxtf]/ || > + if ($extension !~ /[4SsBKRraEehMmIiUDdgVCbGNOxtf]/ || > ($extension eq "f" && > - defined $qualifier && $qualifier !~ /^w/)) { > + defined $qualifier && $qualifier !~ /^w/) || > + ($extension eq "4" && > + defined $qualifier && $qualifier !~ /^cc/)) { > $bad_specifier = $specifier; > last; > } > -- > 2.29.2 > -- With Best Regards, Andy Shevchenko