From patchwork Wed Aug 16 05:37:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 9903037 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1306A600CA for ; Wed, 16 Aug 2017 05:37:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 079BA27E5A for ; Wed, 16 Aug 2017 05:37:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EFA57288DD; Wed, 16 Aug 2017 05:37:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42A2127E5A for ; Wed, 16 Aug 2017 05:37:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751224AbdHPFhe (ORCPT ); Wed, 16 Aug 2017 01:37:34 -0400 Received: from mail-pf0-f175.google.com ([209.85.192.175]:34800 "EHLO mail-pf0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751068AbdHPFhd (ORCPT ); Wed, 16 Aug 2017 01:37:33 -0400 Received: by mail-pf0-f175.google.com with SMTP id o86so1908605pfj.1 for ; Tue, 15 Aug 2017 22:37:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=PKSGYdJEldxL+CAdsd1Lmtev+NvZ/mhijqYYvA3dJFQ=; b=Vea8Es/gg0jBPzbt3CqBH9WoVXgz9NWXKEsg3l+3tm+Cuur5OvDkhmpvh941IJPvsq +VC+uhbHmKbv45On2hAn9hI22KnYzai3nNIGkeZyGNQPny6TBRlgNstMZ/hXW06pNpi6 XhnmhQRKTVXO3DuYiLObqnVAKrcuQ3K+5fvz8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=PKSGYdJEldxL+CAdsd1Lmtev+NvZ/mhijqYYvA3dJFQ=; b=MRtK267zBBQT21ElCQMlKDIflVZGc+9Xg93Na6EidKOZu0rIoYo3VC8lIjq9r0pxN5 q9ve4YI/TnG+jy20X76DloXsPyYWS7+rsbz6TKnctcwlQOBSX8oeTJSbV11nj9XpsNKX sRG41LlYwfJ38jNSWjxauasSiWZF5f6v9hUKt0iOKQ5wyiHfSRVhihPB/BF5x7SGe3mm 7l3Wu79JuABrQEkkpNFubrkqUJBidYpRnpEPZ9QQfIM3LGbqx8YsjkY6sPFR9SiXSWKU oV1LdKHBsAAFAITw7rxrbCHqWx/iKwaxnxUbiyM/IhEK8qs6tKru4ywutwYIRbgfG8/A APPw== X-Gm-Message-State: AHYfb5jBp7yIExYhtb7/TtaVxaw2fXRkmZIImajZBxhDph3dj2l78/O8 yyZUHcY9sU+qnm36jMaf1g== X-Received: by 10.98.224.73 with SMTP id f70mr571921pfh.12.1502861852838; Tue, 15 Aug 2017 22:37:32 -0700 (PDT) Received: from localhost ([122.172.110.130]) by smtp.gmail.com with ESMTPSA id j1sm87692pgs.77.2017.08.15.22.37.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Aug 2017 22:37:31 -0700 (PDT) From: Viresh Kumar To: Rafael Wysocki Cc: Viresh Kumar , linux-pm@vger.kernel.org, Vincent Guittot , geert@linux-m68k.org, maxime.ripard@free-electrons.com, wens@csie.org, xuwei5@hisilicon.com, kgene@kernel.org, krzk@kernel.org, yamada.masahiro@socionext.com, jun.nie@linaro.org, baoyou.xie@linaro.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] cpufreq: dt-platdev: Automatically create cpufreq device with OPP v2 Date: Wed, 16 Aug 2017 11:07:27 +0530 Message-Id: X-Mailer: git-send-email 2.14.1.202.g24db08a6e8fe Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The initial idea of creating the cpufreq-dt-platdev.c file was to keep a list of platforms that use the "operating-points" (V1) bindings and create cpufreq device for them only, as we weren't sure which platforms would want the device to get created automatically as some had their own cpufreq drivers as well, or wanted to initialize cpufreq after doing some stuff from platform code. But that wasn't the case with platforms using "operating-points-v2" property. We wanted the device to get created automatically without the need of adding them to the whitelist. Though, we will still have some exceptions where we don't want to create the device automatically. Rename the earlier platform list as *whitelist* and create a new *blacklist* as well. The cpufreq-dt device will get created if: - The platform is there in the whitelist OR - The platform has "operating-points-v2" property in CPU0's DT node and isn't part of the blacklist . Reported-by: Geert Uytterhoeven Signed-off-by: Viresh Kumar Tested-by: Simon Horman Reviewed-by: Masahiro Yamada --- drivers/cpufreq/cpufreq-dt-platdev.c | 45 ++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 5 deletions(-) diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c index bcee384b3251..061b468512a2 100644 --- a/drivers/cpufreq/cpufreq-dt-platdev.c +++ b/drivers/cpufreq/cpufreq-dt-platdev.c @@ -9,11 +9,16 @@ #include #include +#include #include #include "cpufreq-dt.h" -static const struct of_device_id machines[] __initconst = { +/* + * Machines for which the cpufreq device is *always* created, mostly used for + * platforms using "operating-points" (V1) property. + */ +static const struct of_device_id whitelist[] __initconst = { { .compatible = "allwinner,sun4i-a10", }, { .compatible = "allwinner,sun5i-a10s", }, { .compatible = "allwinner,sun5i-a13", }, @@ -101,21 +106,51 @@ static const struct of_device_id machines[] __initconst = { { } }; +/* + * Machines for which the cpufreq device is *not* created, mostly used for + * platforms using "operating-points-v2" property. + */ +static const struct of_device_id blacklist[] __initconst = { + { } +}; + +static bool __init cpu0_node_has_opp_v2_prop(void) +{ + struct device_node *np = of_cpu_device_node_get(0); + bool ret = false; + + if (of_get_property(np, "operating-points-v2", NULL)) + ret = true; + + of_node_put(np); + return ret; +} + static int __init cpufreq_dt_platdev_init(void) { struct device_node *np = of_find_node_by_path("/"); const struct of_device_id *match; + const void *data = NULL; if (!np) return -ENODEV; - match = of_match_node(machines, np); + match = of_match_node(whitelist, np); + if (match) { + data = match->data; + goto create_pdev; + } + + if (cpu0_node_has_opp_v2_prop() && !of_match_node(blacklist, np)) + goto create_pdev; + of_node_put(np); - if (!match) - return -ENODEV; + return -ENODEV; +create_pdev: + of_node_put(np); return PTR_ERR_OR_ZERO(platform_device_register_data(NULL, "cpufreq-dt", - -1, match->data, + -1, data, sizeof(struct cpufreq_dt_platform_data))); } device_initcall(cpufreq_dt_platdev_init);