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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 84A76C54FD0 for ; Fri, 24 Apr 2020 19:26:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5D1C420857 for ; Fri, 24 Apr 2020 19:26:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="aaVLBGt9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727031AbgDXT0K (ORCPT ); Fri, 24 Apr 2020 15:26:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1725970AbgDXT0J (ORCPT ); Fri, 24 Apr 2020 15:26:09 -0400 Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9FD4DC09B048 for ; Fri, 24 Apr 2020 12:26:09 -0700 (PDT) Received: by mail-pl1-x644.google.com with SMTP id n24so4076834plp.13 for ; Fri, 24 Apr 2020 12:26:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=6Ak3wRUTbhX3b+AZt5O65BJGsm25sMRWic48F76A9hM=; b=aaVLBGt9xNHi+hCZ8vzCgEF7XWOZEZmPr0Phaz77zFbq5WMywT6yHSh9e8GCu8ociu aGr7G3Cchq8usek7UA7iq6OS8pshLesDZoZqje7Aui6a8mp1OHLDByvI9C73O1SqdDiZ mx0zwH44LI86AaesZXFM2Ajhmo0vIU9IhlS4Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=6Ak3wRUTbhX3b+AZt5O65BJGsm25sMRWic48F76A9hM=; b=O7JcluRFkTaJDO7USvRVpFrHZEn5EZBkNk4Z9K2Xlj6AOIH44R4AeRiuQeCnBdcZSq cKm+Lv2uaJ2vVm1vpYpeOCD0ksAIC6Bso74ycWAuKCjIp3JdATSaGTQpwc22HiA6j7+n GRAljMx6ZQzDTTZ1rNcel8OHOe1pPqUbGWitw1qN+H6SXqq/8p7TgrtQk0CXxv5ibjyc qTB6/8rcneAB4MYdvfynYFGcKOpeRm6OZcS8WONNDnKRZ7+NYnOine6vX1vMHna5CbuE 3oRMzhEi2fSqbGlKbXNad1CLxuu8HcRtsJAecQbcLLeTE3IbzHrXPknUqbnHCVdRjeVF TRLg== X-Gm-Message-State: AGi0PuYpRNCko5tHF8xOcjUaNEwWimZ/p3TYHNkf5Ox4bsbi2vJDV5Ml mfAjueCrrqxObtuTFsWvbyZP9Q== X-Google-Smtp-Source: APiQypL6ZHQVIk0jDGsuJs8ztATvWT/HuDC1iXb3RFCHlfbimDatC7NnMcHjF8PcL7UjBVc67o/vfw== X-Received: by 2002:a17:902:8b82:: with SMTP id ay2mr11186391plb.285.1587756369143; Fri, 24 Apr 2020 12:26:09 -0700 (PDT) Received: from localhost ([2620:15c:202:1:4fff:7a6b:a335:8fde]) by smtp.gmail.com with ESMTPSA id g6sm5227594pjx.48.2020.04.24.12.26.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 24 Apr 2020 12:26:08 -0700 (PDT) Date: Fri, 24 Apr 2020 12:26:07 -0700 From: Matthias Kaehlcke To: Georgi Djakov Cc: vireshk@kernel.org, nm@ti.com, sboyd@kernel.org, robh+dt@kernel.org, rjw@rjwysocki.net, saravanak@google.com, sibis@codeaurora.org, rnayak@codeaurora.org, bjorn.andersson@linaro.org, vincent.guittot@linaro.org, jcrouse@codeaurora.org, evgreen@chromium.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v7 5/7] OPP: Add sanity checks in _read_opp_key() Message-ID: <20200424192607.GB4525@google.com> References: <20200424155404.10746-1-georgi.djakov@linaro.org> <20200424155404.10746-6-georgi.djakov@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20200424155404.10746-6-georgi.djakov@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On Fri, Apr 24, 2020 at 06:54:02PM +0300, Georgi Djakov wrote: > When we read the OPP keys, it would be nice to do some sanity checks > of the values we get from DT and see if they match with the information > that is populated in the OPP table. Let's pass a pointer of the table, > so that we can do some validation. > > Signed-off-by: Georgi Djakov > --- > v7: > New patch. > > drivers/opp/of.c | 19 ++++++++++++++++--- > 1 file changed, 16 insertions(+), 3 deletions(-) > > diff --git a/drivers/opp/of.c b/drivers/opp/of.c > index 978e445b0cdb..2b590fe2e69a 100644 > --- a/drivers/opp/of.c > +++ b/drivers/opp/of.c > @@ -574,8 +574,8 @@ void dev_pm_opp_of_remove_table(struct device *dev) > } > EXPORT_SYMBOL_GPL(dev_pm_opp_of_remove_table); > > -static int _read_opp_key(struct dev_pm_opp *new_opp, struct device_node *np, > - bool *rate_not_available) > +static int _read_opp_key(struct dev_pm_opp *new_opp, struct opp_table *table, > + struct device_node *np, bool *rate_not_available) > { > struct property *peak, *avg; > u32 *peak_bw, *avg_bw; > @@ -603,6 +603,12 @@ static int _read_opp_key(struct dev_pm_opp *new_opp, struct device_node *np, > * opp-avg-kBps = ; > */ > count = peak->length / sizeof(u32); > + if (table->path_count != count) { > + pr_err("%s: Mismatch between opp-peak-kBps and paths (%d %d)\n", > + __func__, count, table->path_count); > + return -EINVAL; > + } > + > peak_bw = kmalloc_array(count, sizeof(*peak_bw), GFP_KERNEL); > if (!peak_bw) > return -ENOMEM; > @@ -624,6 +630,13 @@ static int _read_opp_key(struct dev_pm_opp *new_opp, struct device_node *np, > avg = of_find_property(np, "opp-avg-kBps", NULL); > if (peak && avg) { > count = avg->length / sizeof(u32); > + if (table->path_count != count) { > + pr_err("%s: Mismatch between opp-avg-kBps and paths (%d %d)\n", > + __func__, count, table->path_count); > + ret = -EINVAL; > + goto free_peak_bw; > + } > + > avg_bw = kmalloc_array(count, sizeof(*avg_bw), GFP_KERNEL); > if (!avg_bw) { > ret = -ENOMEM; > @@ -695,7 +708,7 @@ static struct dev_pm_opp *_opp_add_static_v2(struct opp_table *opp_table, > if (!new_opp) > return ERR_PTR(-ENOMEM); > > - ret = _read_opp_key(new_opp, np, &rate_not_available); > + ret = _read_opp_key(new_opp, opp_table, np, &rate_not_available); > if (ret < 0) { > if (!opp_table->is_genpd) > dev_err(dev, "%s: opp key field not found\n", __func__); Reviewed-by: Matthias Kaehlcke