From patchwork Mon Jun 26 15:55:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 106362 Delivered-To: patch@linaro.org Received: by 10.140.101.48 with SMTP id t45csp168160qge; Mon, 26 Jun 2017 08:57:51 -0700 (PDT) X-Received: by 10.98.40.132 with SMTP id o126mr817452pfo.238.1498492671864; Mon, 26 Jun 2017 08:57:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498492671; cv=none; d=google.com; s=arc-20160816; b=IzTI7klNCkcPzZr48TcXDMUorE/fjVRW8t+3B1Kzgc+iR/pIirqxb0n5qvQbEn09JJ acI2eypAm0bD8mXHzjY4wbB1c3ORJEdKnUhTzekbAEkF6wEwxv6k0u4Dqgy3kOIHB2bo pbXJ4R7mXQ6f+03Bf9xGoD8bLLRmZVLy1q097r0P/yoBte2OfMqA4i7RKLgB/sASxLFt R26p/+IJyZpvyE7yEyod7H0e4OB3AerUEXop+rRA4io9B1nJtXdW5AJWGAYQj5sXfnYe EogbEDdZsUSsjfLe1V1pbkI5IMD1/WHTO8NcYFCeeEIfvklHTdIZgx3WrbvjOFukG0wK kQMg== 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:arc-authentication-results; bh=whYqI+zFb+sHEvnEQyRPyaJrZZjXiUSMt9b8R8bCJ2U=; b=044WMQXVVrfM9d6qYuuQYC5jk+/wsaQp23NOxx1IHQouxxams23PBpecIJktuMcGis R6ODIax1N/vSMmWtUgeBogE4zuMXj1Kle03ZxTNMOBb/CZMl01V9tGBvbYehkawGmtlq 6HNCBY4MW6QFGl5NDAA7dLV7WIwkgS0ZLoXg+e/y7vPiHgiKiJ9E68H/hD0A++VjlBPt qlzRDG0njJxOOXou1XiNr5iJYFal9jL8hkNBPiZarUSVa7lkM1muhos2Sxcvo+CarhiW qwgbxqVQAU1Wv8OY/bIbjjxcc9Kv+XjinFBPY0d2PmnCqUHyFbXs9IINWiElXrfQv19A dToQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d89si265342pfl.148.2017.06.26.08.57.51; Mon, 26 Jun 2017 08:57:51 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752571AbdFZP52 (ORCPT + 25 others); Mon, 26 Jun 2017 11:57:28 -0400 Received: from foss.arm.com ([217.140.101.70]:46138 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751704AbdFZPz7 (ORCPT ); Mon, 26 Jun 2017 11:55:59 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 65CCB16EA; Mon, 26 Jun 2017 08:55:39 -0700 (PDT) Received: from e107155-lin.cambridge.arm.com (e107155-lin.cambridge.arm.com [10.1.211.34]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id AAE633F4FF; Mon, 26 Jun 2017 08:55:37 -0700 (PDT) From: Sudeep Holla To: ALKML , LKML , DTML Cc: Sudeep Holla , Roy Franz , Harb Abdulhamid , Nishanth Menon , Arnd Bergmann , Loc Ho , Alexey Klimov , Matt Sealey Subject: [PATCH 9/9] firmware: arm_scmi: probe and initialise all the supported protocols Date: Mon, 26 Jun 2017 16:55:13 +0100 Message-Id: <1498492513-29771-10-git-send-email-sudeep.holla@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498492513-29771-1-git-send-email-sudeep.holla@arm.com> References: <1498492513-29771-1-git-send-email-sudeep.holla@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that we have basic support for all the protocols in the specification, let's probe them individually and initialise them. Signed-off-by: Sudeep Holla --- drivers/firmware/arm_scmi/common.h | 5 +++ drivers/firmware/arm_scmi/driver.c | 71 +++++++++++++++++++++++++++++++++++++- 2 files changed, 75 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h index 7473dfcad4ee..d7c73a8d260b 100644 --- a/drivers/firmware/arm_scmi/common.h +++ b/drivers/firmware/arm_scmi/common.h @@ -118,4 +118,9 @@ int scmi_version_get(const struct scmi_handle *h, u8 protocol, u32 *version); void scmi_setup_protocol_implemented(const struct scmi_handle *handle, u8 *prot_imp); +typedef int (*scmi_init_fn_t)(struct scmi_handle *); int scmi_base_protocol_init(struct scmi_handle *h); +int scmi_perf_protocol_init(struct scmi_handle *h); +int scmi_sensors_protocol_init(struct scmi_handle *h); +int scmi_power_protocol_init(struct scmi_handle *h); +int scmi_clock_protocol_init(struct scmi_handle *h); diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c index 45f31eaf085a..d3d289f7a174 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -157,6 +157,12 @@ struct scmi_shared_mem { u8 msg_payload[0]; }; +struct scmi_protocol_match { + u8 protocol_id; + scmi_init_fn_t fn; + char name[32]; +}; + static int scmi_linux_errmap[] = { /* better than switch case as long as return value is continuous */ 0, /* SCMI_SUCCESS */ @@ -680,6 +686,41 @@ static int scmi_xfer_info_init(struct scmi_info *sinfo) return 0; } +static const struct scmi_protocol_match scmi_protocols[] = { + { + .protocol_id = SCMI_PROTOCOL_PERF, + .fn = scmi_perf_protocol_init, + .name = "scmi-cpufreq", + }, { + .protocol_id = SCMI_PROTOCOL_CLOCK, + .fn = scmi_clock_protocol_init, + .name = "scmi-clocks", + }, { + .protocol_id = SCMI_PROTOCOL_POWER, + .fn = scmi_power_protocol_init, + .name = "scmi-power-domain", + }, { + .protocol_id = SCMI_PROTOCOL_SENSOR, + .fn = scmi_sensors_protocol_init, + .name = "scmi-hwmon", + }, + {} +}; + +static const struct scmi_protocol_match *scmi_protocol_match_get(u8 protocol_id) +{ + int i; + const struct scmi_protocol_match *match = NULL, *loop = scmi_protocols; + + for (i = 0; i < ARRAY_SIZE(scmi_protocols); i++, loop++) + if (loop->protocol_id == protocol_id) { + match = loop; + break; + } + + return match; +} + static int scmi_probe(struct platform_device *pdev) { int ret = -EINVAL; @@ -690,7 +731,7 @@ static int scmi_probe(struct platform_device *pdev) const struct scmi_desc *desc; struct scmi_info *info = NULL; struct device *dev = &pdev->dev; - struct device_node *shmem, *np = dev->of_node; + struct device_node *child, *shmem, *np = dev->of_node; desc = of_match_device(scmi_of_match, dev)->data; @@ -755,6 +796,34 @@ static int scmi_probe(struct platform_device *pdev) list_add_tail(&info->node, &scmi_list); mutex_unlock(&scmi_list_mutex); + for_each_available_child_of_node(np, child) { + int init_ret; + u32 protocol_id; + const struct scmi_protocol_match *match; + + if (of_property_read_u32(child, "reg", &protocol_id)) + continue; + + protocol_id &= MSG_PROTOCOL_ID_MASK; + + if (!scmi_is_protocol_implemented(handle, protocol_id)) { + dev_err(dev, "SCMI protocol %d not implemented\n", + protocol_id); + continue; + } + + match = scmi_protocol_match_get(protocol_id); + if (match) { + init_ret = match->fn(handle); + if (!init_ret) + of_platform_device_create(child, match->name, + dev); + else + dev_err(dev, "SCMI protocol %d init error %d\n", + protocol_id, init_ret); + } + } + return 0; out: if (!IS_ERR(info->tx_chan))