From patchwork Tue Jul 31 16:13:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 143199 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp5521425ljj; Tue, 31 Jul 2018 09:14:02 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdX2b9t5KeaLOKIyWIKB8sZBWkl8XZ/kOh2IYPrgirqGdmj3CBPuFuJru8SsnRK9C4oEHIT X-Received: by 2002:a62:229a:: with SMTP id p26-v6mr23005161pfj.53.1533053642190; Tue, 31 Jul 2018 09:14:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533053642; cv=none; d=google.com; s=arc-20160816; b=liQbhQ6xQICrlPZJTHCM1tuK6+8DlXkJ/fTHdRykMZFgaWQsNjw9qOOq06DWey5jPP MymsWdkd3SGAOlWD3Dt+80kw5bzhFSO/jNYgoioOy3ZjSCyU+qv3mr5d4d8luGlR6zd0 7XgdzwWBOU8pXyc936/l/Yfyt9PFpz+BCJHyG8aEF+5oqdKrOcH3mw8xG6DrJwvIB1Ub Swtg0H2mf4Yf5MD4GwC6esULrkBM4pzbMSASz2EcaUCXeh2JmnwirAqeUGzhppeSCe/8 pCOGjwUWg408yleND0fOIOiiZDI4PveeAYP6FLL8ciXMKa48jWnmMek16gu2S4hAPa42 K8Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=0+4xU3LQjP5NBavrf6IET5qA3bhywT6/Vh+ut+tLFvU=; b=cC0Am9eSQjXnfCnSbJU5JxKSyPNsvFnD3f1T+dGJFWqxEU2OOz497TckqB9eLj8Vxh zxk2M5JSFPbwD0oHFsnLuyDpAKwh+yUCU22o+yyffTR403VWwjR7bawHaXci8fvuMSwD LSVGP4E2CQA0CFstFp0BNMhsNePSLjfXBdo5bC5pZ+HxTmhznLU0Vh4McBiOJBBehbC2 +WMMzCkm0ePVbbUOfHJB5MzIY2w2houOrKqlBQa//mQgAUUJxu7NIaPGK4ABaBRnlk4b bASXRrUV7WIroAxxb6Nms4ADSaL+yQDMvaFAb702YufdUbSj7IToetjtUjHKq1mNwDaE bYlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WWctfzyZ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j5-v6si14409822pgt.226.2018.07.31.09.14.01; Tue, 31 Jul 2018 09:14:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=@linaro.org header.s=google header.b=WWctfzyZ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732617AbeGaRzA (ORCPT + 31 others); Tue, 31 Jul 2018 13:55:00 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:40791 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732593AbeGaRy7 (ORCPT ); Tue, 31 Jul 2018 13:54:59 -0400 Received: by mail-wr1-f65.google.com with SMTP id h15-v6so17261209wrs.7 for ; Tue, 31 Jul 2018 09:13:57 -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:in-reply-to:references; bh=0+4xU3LQjP5NBavrf6IET5qA3bhywT6/Vh+ut+tLFvU=; b=WWctfzyZtwl+wXQLK/cmDi9TO+ae3QkmWeuUnQnUhXUn/+unCAifhqbgMA7WBmLUkj Zxla0n5a0nlwqrKhHTtaB372wgc+n7yZcJ7cLtMJoYal3oVwHz56OBI11nOM2tpremwz VnOcFVQX8hUWjfcUVAh0+Nw4JNWTHJn1hfXwI= 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:in-reply-to :references; bh=0+4xU3LQjP5NBavrf6IET5qA3bhywT6/Vh+ut+tLFvU=; b=Jty49wkvXinEJWv3ViyrbvGNBblGI31lDquO23EGtieJySwHv5r2V3u12IXfgd0v5L GsVgQ+ha0rPZE/IZahb1f7hy2kH6b1BJEQKMT45D5VHI4C4YwSNytXRiJcGkRJ6xA191 3xf1xWRl/V3fqreL5FMTPMxzxuJT1PZzCaNTG9Xi/Oh7OV4VyQSRrmwAK8IiGcgBArJr A5fL9fy8oE27bfNBV96N5K9K2357ztMGO6fnZzowEGfHPX7vjpfG1P7W2slnXdcM79kv Jdt+jlKOWgu5Bp0Sjrus4DaVe66vR0SR2gc/ddaN/m0EI+au3NAMgvV4XWs3bDpgwHNu GhXA== X-Gm-Message-State: AOUpUlGreQ5TlOceFb+636reFuFIlAABQun5IjPZHL61qHU0A8SV08U5 gA+m5ZtCu4U30erDUM0oaNnRGA== X-Received: by 2002:a5d:56d0:: with SMTP id m16-v6mr2935899wrw.58.1533053637120; Tue, 31 Jul 2018 09:13:57 -0700 (PDT) Received: from localhost.localdomain ([212.45.67.2]) by smtp.googlemail.com with ESMTPSA id t186-v6sm3643457wmf.14.2018.07.31.09.13.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 31 Jul 2018 09:13:56 -0700 (PDT) From: Georgi Djakov To: linux-pm@vger.kernel.org, gregkh@linuxfoundation.org Cc: rjw@rjwysocki.net, robh+dt@kernel.org, mturquette@baylibre.com, khilman@baylibre.com, vincent.guittot@linaro.org, skannan@codeaurora.org, bjorn.andersson@linaro.org, amit.kucheria@linaro.org, seansw@qti.qualcomm.com, daidavid1@codeaurora.org, evgreen@chromium.org, mark.rutland@arm.com, lorenzo.pieralisi@arm.com, abailon@baylibre.com, arnd@arndb.de, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, georgi.djakov@linaro.org Subject: [PATCH v7 8/8] interconnect: Allow endpoints translation via DT Date: Tue, 31 Jul 2018 19:13:40 +0300 Message-Id: <20180731161340.13000-9-georgi.djakov@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180731161340.13000-1-georgi.djakov@linaro.org> References: <20180731161340.13000-1-georgi.djakov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently we support only platform data for specifying the interconnect endpoints. As now the endpoints are hard-coded into the consumer driver this may lead to complications when a single driver is used by multiple SoCs, which may have different interconnect topology. To avoid cluttering the consumer drivers, introduce a translation function to help us get the board specific interconnect data from device-tree. Signed-off-by: Georgi Djakov --- drivers/interconnect/core.c | 62 ++++++++++++++++++++++++++++++++++++ include/linux/interconnect.h | 7 ++++ 2 files changed, 69 insertions(+) diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c index 9fef180cf77e..d1b6adff0a3d 100644 --- a/drivers/interconnect/core.c +++ b/drivers/interconnect/core.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -251,6 +252,67 @@ static int apply_constraints(struct icc_path *path) return ret; } +struct icc_path *of_icc_get(struct device *dev, const char *name) +{ + struct device_node *np = NULL; + struct of_phandle_args src_args, dst_args; + u32 src_id, dst_id; + int idx = 0; + int ret; + + if (!dev || !dev->of_node) + return ERR_PTR(-ENODEV); + + np = dev->of_node; + + /* + * When the consumer DT node do not have "interconnects" property + * return a NULL path to skip setting constraints. + */ + if (!of_find_property(np, "interconnects", NULL)) + return NULL; + + /* + * We use a combination of phandle and specifier for endpoint. For now + * lets support only global ids and extend this is the future if needed + * without breaking DT compatibility. + */ + if (name) { + idx = of_property_match_string(np, "interconnect-names", name); + if (idx < 0) + return ERR_PTR(idx); + } + + ret = of_parse_phandle_with_args(np, "interconnects", + "#interconnect-cells", idx * 2, + &src_args); + if (ret) + return ERR_PTR(ret); + + of_node_put(src_args.np); + + if (!src_args.args_count || src_args.args_count > 1) + return ERR_PTR(-EINVAL); + + src_id = src_args.args[0]; + + ret = of_parse_phandle_with_args(np, "interconnects", + "#interconnect-cells", idx * 2 + 1, + &dst_args); + if (ret) + return ERR_PTR(ret); + + of_node_put(dst_args.np); + + if (!dst_args.args_count || dst_args.args_count > 1) + return ERR_PTR(-EINVAL); + + dst_id = dst_args.args[0]; + + return icc_get(dev, src_id, dst_id); +} +EXPORT_SYMBOL_GPL(of_icc_get); + /** * icc_set() - set constraints on an interconnect path between two endpoints * @path: reference to the path returned by icc_get() diff --git a/include/linux/interconnect.h b/include/linux/interconnect.h index 593215371fd6..ae6744da9bc2 100644 --- a/include/linux/interconnect.h +++ b/include/linux/interconnect.h @@ -17,6 +17,7 @@ struct device; struct icc_path *icc_get(struct device *dev, const int src_id, const int dst_id); +struct icc_path *of_icc_get(struct device *dev, const char *name); void icc_put(struct icc_path *path); int icc_set(struct icc_path *path, u32 avg_bw, u32 peak_bw); @@ -28,6 +29,12 @@ static inline struct icc_path *icc_get(struct device *dev, const int src_id, return NULL; } +static inline struct icc_path *of_icc_get(struct device *dev, + const char *name) +{ + return NULL; +} + static inline void icc_put(struct icc_path *path) { }