From patchwork Mon Apr 9 00:21:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132986 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp736232ljb; Sun, 8 Apr 2018 19:55:45 -0700 (PDT) X-Google-Smtp-Source: AIpwx48hNhrwZB/zI3oGJQpDhdyrth9p79tUPoFy1ZLZibNfyT93VNWfqXnGQV19TmH/gdGHknAn X-Received: by 10.167.131.203 with SMTP id j11mr27859104pfn.101.1523242545791; Sun, 08 Apr 2018 19:55:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523242545; cv=none; d=google.com; s=arc-20160816; b=evVG1yJdtEJGTzfb4O2Q1+xY7nMdCcPf8KhXJTw6IwD4ikQYmuo1PbLpS6yWGRMyHo j5ZVuMNTCdQJqY9GCbNIHMXkK06eIhqsqBJoaXu/cVzeW1r2dgC0ozODipsXKEHx4czi +8dOrFHvuqXpSzJ8jtA9DWjIUfIrGaHJOf1LOl/wwYPHPJkPhXTe6HYHYSnC4CUWPFG6 g6qrnp2YLix1ZoCtkhdDVtpozFVuJmnQRAxOzbIUaIA0+G7cK8HFiNjNTSSKPnbA+2Qx +mvcjGOEsjKBMRSYqkv5ShrSmQUFa4wZyJzvs7UMywNlW+l4KuXce64jxT1hppgEu2gS C82Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=kakoV9CdMkuL/glL+w+l5739qxSEUeGhjkDRELCkEkI=; b=szlY3jSXkE37lmb33NYfPiXPNeh4ZyW8Gsg8LGXThQ9YDveoSXtzLC+hy6GYIozHUn JvZjs2HPbMsVbvdg8oygA+JR8ElpWdCJkFyp6241JQdFBj+IXLXiSA5enfTm3gZOEDWL Zmt34jDcQqTTmDIfv/vRHv9bYkUkJXX0fAz9ZGUcUQ45nj751eCqKhnkC2UEZgD9C2Ke gi0Op1L4Crgst+Sy+1vmuUP/EE3hfKWAMTGxDIUVwfsaLnrcf108QSdD77wM1ntXK09+ dQT7Zy0bINsixwt6SXOdSj9RtA/1Wry7MuATZWyGF2bOyMPdxOU3xxEnimSxi0DiKWei /q2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=LfpozW9b; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y2-v6si13664513pli.242.2018.04.08.19.55.45; Sun, 08 Apr 2018 19:55:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=LfpozW9b; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758138AbeDICzl (ORCPT + 11 others); Sun, 8 Apr 2018 22:55:41 -0400 Received: from mail-bn3nam01on0139.outbound.protection.outlook.com ([104.47.33.139]:14848 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755228AbeDIAZr (ORCPT ); Sun, 8 Apr 2018 20:25:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=kakoV9CdMkuL/glL+w+l5739qxSEUeGhjkDRELCkEkI=; b=LfpozW9bv6E2YCHc38HvKFbLEpp4fy8CCfaHrBGzrp93fUY//NGKhjd0fJspz3IeUwzRckZm+qbauCjVsvqJiZTRmFA7tTZbIMLmyn/GYGKeJkiDn744YQv81gb6GLjb2iW4PGB8xyr0LeC7mOlyljJXvFLH1Tkvw4LnUt78l6o= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1013.namprd21.prod.outlook.com (52.132.133.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.696.0; Mon, 9 Apr 2018 00:25:39 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059%2]) with mapi id 15.20.0696.003; Mon, 9 Apr 2018 00:25:39 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Ulf Hansson , "Rafael J . Wysocki" , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 134/161] PM / domains: Fix up domain-idle-states OF parsing Thread-Topic: [PATCH AUTOSEL for 4.14 134/161] PM / domains: Fix up domain-idle-states OF parsing Thread-Index: AQHTz5i8U2QhzCmslEakZ+z4lRC8sw== Date: Mon, 9 Apr 2018 00:21:43 +0000 Message-ID: <20180409001936.162706-134-alexander.levin@microsoft.com> References: <20180409001936.162706-1-alexander.levin@microsoft.com> In-Reply-To: <20180409001936.162706-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1013; 7:Pi/KMvGFMl0TbZ1GcNYkGsi8YhMWw26ahBTF4dLyENqMTshly59q3IaitF3Reig3aZXfvNDXK2YSAImHQYxqb8zHC3oRwLr/lzwK47Dj1NYrQDHwsv7Q0GbavIf6uejJSoTO21ymRlbVZLpK1fo2MJTFvmMa5R+yFlStcMuJ4ZZpdlrAI+loQdqrVC3fTgqZV6IS1okBnfAMjTi0eyXEtVoDkf5F5Uk/+77GRjgyKagkrUPYv/oy1xaf1YnexRn6; 20:W1GfnhtVwM9rS9iUW3FHuk+ukw7KYfqpxDjD1feWR9bAE3bylrI3hZ1p+M2wEbl5MqsyS8w69H+Um9hYMrp4XAh81Ro9m9GgKy/UIayOwXQdwZaL7625CJ/JVn9RCEd1PTi2WXGfsf6SiTGA3EkxUkGqnk+LK4vKTmtWlwnFGew= X-MS-Office365-Filtering-Correlation-Id: 69fd2398-45a2-424e-6e8a-08d59db06c1f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(3008032)(48565401081)(2017052603328)(7193020); SRVR:DM5PR2101MB1013; x-ms-traffictypediagnostic: DM5PR2101MB1013: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(131327999870524)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR2101MB1013; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1013; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(366004)(376002)(396003)(39860400002)(39380400002)(189003)(199004)(3280700002)(2616005)(8936002)(7736002)(476003)(446003)(11346002)(53936002)(3660700001)(86362001)(86612001)(81156014)(2906002)(186003)(81166006)(105586002)(1076002)(8676002)(26005)(97736004)(25786009)(6512007)(3846002)(68736007)(72206003)(106356001)(5660300001)(6486002)(6666003)(6116002)(14454004)(4326008)(305945005)(6436002)(2501003)(5250100002)(10290500003)(478600001)(2900100001)(59450400001)(22452003)(110136005)(316002)(99286004)(66066001)(10090500001)(107886003)(76176011)(102836004)(54906003)(6506007)(36756003)(486006)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1013; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: s701McDk1IN1u/O3M58j8YX2DGoKX19seN1yXgYhXXusSRZdPOqx6Nvl9pRVmpFW2QFjjDjmWdf7CaEk62ZUQ8RU+qwae42nNRd9zI4Cj7Gw9YB5c1Ph7rG6tMm0+bGHr7/gQ2iBiHL1GQmUU0LF+meuSp0vwTDhzCpFz6LfxYA1xTjoIK+MZxKuBlogGXYfcpA+wZB+elQfHlLDpKFIY3kaTkO1bFPuVKJkZSr1E1guLF6+T5lwLCNUPVKfCa+ay5IE543MVslMgd1C8C6n5AsNyg7yUMAN8uXggKpnwiJ3WHaLnIVTDIW31ernVE6NV7wZLJ6HhzHPI3S0mleSxSaMkgeES4RT6dfJQgPIOES4ilO+ijQAKsjaip3g/9xZPMJ1bkB9u1poYi/uCMxnmnfZ/PmcPTcu40NK/dqp6do= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69fd2398-45a2-424e-6e8a-08d59db06c1f X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:21:43.2061 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1013 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ulf Hansson [ Upstream commit a3381e3a65cbaf612c8f584906c4dba27e84267c ] Commit b539cc82d493 (PM / Domains: Ignore domain-idle-states that are not compatible), made it possible to ignore non-compatible domain-idle-states OF nodes. However, in case that happens while doing the OF parsing, the number of elements in the allocated array would exceed the numbers actually needed, thus wasting memory. Fix this by pre-iterating the genpd OF node and counting the number of compatible domain-idle-states nodes, before doing the allocation. While doing this, it makes sense to rework the code a bit to avoid open coding, of parts responsible for the OF node iteration. Let's also take the opportunity to clarify the function header for of_genpd_parse_idle_states(), about what is being returned in case of errors. Fixes: b539cc82d493 (PM / Domains: Ignore domain-idle-states that are not compatible) Signed-off-by: Ulf Hansson Reviewed-by: Lina Iyer Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/base/power/domain.c | 76 +++++++++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 31 deletions(-) -- 2.15.1 diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 70f8904f46a3..b3b78079aa9f 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -2206,6 +2206,38 @@ static int genpd_parse_state(struct genpd_power_state *genpd_state, return 0; } +static int genpd_iterate_idle_states(struct device_node *dn, + struct genpd_power_state *states) +{ + int ret; + struct of_phandle_iterator it; + struct device_node *np; + int i = 0; + + ret = of_count_phandle_with_args(dn, "domain-idle-states", NULL); + if (ret <= 0) + return ret; + + /* Loop over the phandles until all the requested entry is found */ + of_for_each_phandle(&it, ret, dn, "domain-idle-states", NULL, 0) { + np = it.node; + if (!of_match_node(idle_state_match, np)) + continue; + if (states) { + ret = genpd_parse_state(&states[i], np); + if (ret) { + pr_err("Parsing idle state node %pOF failed with err %d\n", + np, ret); + of_node_put(np); + return ret; + } + } + i++; + } + + return i; +} + /** * of_genpd_parse_idle_states: Return array of idle states for the genpd. * @@ -2215,49 +2247,31 @@ static int genpd_parse_state(struct genpd_power_state *genpd_state, * * Returns the device states parsed from the OF node. The memory for the states * is allocated by this function and is the responsibility of the caller to - * free the memory after use. + * free the memory after use. If no domain idle states is found it returns + * -EINVAL and in case of errors, a negative error code. */ int of_genpd_parse_idle_states(struct device_node *dn, struct genpd_power_state **states, int *n) { struct genpd_power_state *st; - struct device_node *np; - int i = 0; - int err, ret; - int count; - struct of_phandle_iterator it; - const struct of_device_id *match_id; + int ret; - count = of_count_phandle_with_args(dn, "domain-idle-states", NULL); - if (count <= 0) - return -EINVAL; + ret = genpd_iterate_idle_states(dn, NULL); + if (ret <= 0) + return ret < 0 ? ret : -EINVAL; - st = kcalloc(count, sizeof(*st), GFP_KERNEL); + st = kcalloc(ret, sizeof(*st), GFP_KERNEL); if (!st) return -ENOMEM; - /* Loop over the phandles until all the requested entry is found */ - of_for_each_phandle(&it, err, dn, "domain-idle-states", NULL, 0) { - np = it.node; - match_id = of_match_node(idle_state_match, np); - if (!match_id) - continue; - ret = genpd_parse_state(&st[i++], np); - if (ret) { - pr_err - ("Parsing idle state node %pOF failed with err %d\n", - np, ret); - of_node_put(np); - kfree(st); - return ret; - } + ret = genpd_iterate_idle_states(dn, st); + if (ret <= 0) { + kfree(st); + return ret < 0 ? ret : -EINVAL; } - *n = i; - if (!i) - kfree(st); - else - *states = st; + *states = st; + *n = ret; return 0; }