From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 681C2ECE588 for ; Tue, 15 Oct 2019 12:01:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 465E821925 for ; Tue, 15 Oct 2019 12:01:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727304AbfJOMBw (ORCPT ); Tue, 15 Oct 2019 08:01:52 -0400 Received: from mga17.intel.com ([192.55.52.151]:7898 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726540AbfJOMBw (ORCPT ); Tue, 15 Oct 2019 08:01:52 -0400 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Oct 2019 05:01:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,299,1566889200"; d="scan'208";a="195261519" Received: from smile.fi.intel.com (HELO smile) ([10.237.68.40]) by fmsmga007.fm.intel.com with ESMTP; 15 Oct 2019 05:01:49 -0700 Received: from andy by smile with local (Exim 4.92.2) (envelope-from ) id 1iKLWP-0007QW-3v; Tue, 15 Oct 2019 15:01:49 +0300 Date: Tue, 15 Oct 2019 15:01:49 +0300 From: Andy Shevchenko To: Dmitry Torokhov Cc: "Rafael J. Wysocki" , Heikki Krogerus , Mika Westerberg , Linus Walleij , Ard Biesheuvel , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org Subject: Re: [PATCH v5 03/14] efi/apple-properties: use PROPERTY_ENTRY_U8_ARRAY_LEN Message-ID: <20191015120149.GD32742@smile.fi.intel.com> References: <20191011230721.206646-1-dmitry.torokhov@gmail.com> <20191011230721.206646-4-dmitry.torokhov@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191011230721.206646-4-dmitry.torokhov@gmail.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org On Fri, Oct 11, 2019 at 04:07:10PM -0700, Dmitry Torokhov wrote: > Let's switch to using PROPERTY_ENTRY_U8_ARRAY_LEN() to initialize > property entries. Also, when dumping data, rely on local variables > instead of poking into the property entry structure directly. > > Signed-off-by: Dmitry Torokhov > --- > drivers/firmware/efi/apple-properties.c | 18 ++++++++---------- > 1 file changed, 8 insertions(+), 10 deletions(-) > > diff --git a/drivers/firmware/efi/apple-properties.c b/drivers/firmware/efi/apple-properties.c > index 0e206c9e0d7a..5ccf39986a14 100644 > --- a/drivers/firmware/efi/apple-properties.c > +++ b/drivers/firmware/efi/apple-properties.c > @@ -53,7 +53,8 @@ static void __init unmarshal_key_value_pairs(struct dev_header *dev_header, > > for (i = 0; i < dev_header->prop_count; i++) { > int remaining = dev_header->len - (ptr - (void *)dev_header); > - u32 key_len, val_len; > + u32 key_len, val_len, entry_len; > + const u8 *entry_data; > char *key; > > if (sizeof(key_len) > remaining) > @@ -85,17 +86,14 @@ static void __init unmarshal_key_value_pairs(struct dev_header *dev_header, > ucs2_as_utf8(key, ptr + sizeof(key_len), > key_len - sizeof(key_len)); > > - entry[i].name = key; > - entry[i].length = val_len - sizeof(val_len); > - entry[i].is_array = !!entry[i].length; > - entry[i].type = DEV_PROP_U8; > - entry[i].pointer.u8_data = ptr + key_len + sizeof(val_len); > - > + entry_data = ptr + key_len + sizeof(val_len); > + entry_len = val_len - sizeof(val_len); > + entry[i] = PROPERTY_ENTRY_U8_ARRAY_LEN(key, entry_data, > + entry_len); I would rather leave on one line. Nevertheless, Reviewed-by: Andy Shevchenko > if (dump_properties) { > - dev_info(dev, "property: %s\n", entry[i].name); > + dev_info(dev, "property: %s\n", key); > print_hex_dump(KERN_INFO, pr_fmt(), DUMP_PREFIX_OFFSET, > - 16, 1, entry[i].pointer.u8_data, > - entry[i].length, true); > + 16, 1, entry_data, entry_len, true); > } > > ptr += key_len + val_len; > -- > 2.23.0.700.g56cf767bdb-goog > -- With Best Regards, Andy Shevchenko