From patchwork Fri Aug 4 14:31:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 109407 Delivered-To: patch@linaro.org Received: by 10.140.101.6 with SMTP id t6csp2234598qge; Fri, 4 Aug 2017 07:32:32 -0700 (PDT) X-Received: by 10.99.97.68 with SMTP id v65mr2569782pgb.200.1501857152681; Fri, 04 Aug 2017 07:32:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501857152; cv=none; d=google.com; s=arc-20160816; b=waO9qvTLxXw76EnYrCZV3tNX454J9eYI/zFLf2vOF0Oyr4HWjmU7elQ9cEKPN3GUOt t3WmXZ0tsHmMhtNSAnOhvvN3J5jtHFCgHuSYiJj7NKuiEkxp8G852DghoEG43UjS/j21 0zlXI5T/bfeVC5yhGxBPr/ZiPNpmLyMpvHJ+Nez+OB2Siq+9gP8DGQ+KgiQWsuh3o8Qp d+zDocT4hF8IRMShG2/wiI5OzkvSu74MQxXbJIw7w6hgX7B1lqqeyqMbz3b7rdDmh7cZ k7KuOh+YW4/qNoSZx7MQSuQOLxcPmBbrnKk7RAcQud//MgmuBUtc4jI3T4vtAUBrHnGG GdSA== 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=vI86L/dmFLMCePIjCzGFyFVpdiWyB9ismvFX+L2592Q=; b=U9eh0IBRJsJrQ5EgZ3uOnICHki9JAJdz/rj36a/SRp672+jygpf2m4D5YPV6TaLT/y fgLxh31PDTFsalmuUefEj3GJ32j0pp13N5YyQWL2TC7n4vL7hU+dSrkQ1cVqqxd74mnC DRx+whe9QgbICORci2W1yj82c1W9pE+ItrokGXpeK4ni8ZUIx1fcs95jPpxIjs36zwu9 aqOKU2Ftzi5fmNCHXtWe0Q4UKmwmPwcoCJyGgg/HlJVk8zw9YhJ6qGrjetARsNshppRw wAwmHxfiLmdo+hispzVJjbijeV+I9OASfj/QFmUNDxQIl1ZLWEQ6aswx1q1YLEcSXGhA biqQ== 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 f6si1029133pgc.774.2017.08.04.07.32.32; Fri, 04 Aug 2017 07:32:32 -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 S1752561AbdHDOc3 (ORCPT + 25 others); Fri, 4 Aug 2017 10:32:29 -0400 Received: from foss.arm.com ([217.140.101.70]:54318 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752519AbdHDOc0 (ORCPT ); Fri, 4 Aug 2017 10:32:26 -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 297BF1596; Fri, 4 Aug 2017 07:32:26 -0700 (PDT) Received: from e107155-lin.cambridge.arm.com (unknown [10.1.210.28]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 0C8CF3F3E1; Fri, 4 Aug 2017 07:32:23 -0700 (PDT) From: Sudeep Holla To: ALKML , LKML , DTML Cc: Sudeep Holla , Roy Franz , Harb Abdulhamid , Nishanth Menon , Arnd Bergmann , Loc Ho , Alexey Klimov , Ryan Harkin , Jassi Brar Subject: [PATCH v2 09/18] firmware: arm_scmi: probe and initialise all the supported protocols Date: Fri, 4 Aug 2017 15:31:35 +0100 Message-Id: <1501857104-11279-10-git-send-email-sudeep.holla@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1501857104-11279-1-git-send-email-sudeep.holla@arm.com> References: <1501857104-11279-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. Cc: Arnd Bergmann Signed-off-by: Sudeep Holla --- drivers/firmware/arm_scmi/common.h | 5 +++ drivers/firmware/arm_scmi/driver.c | 80 +++++++++++++++++++++++++++++++++++++- 2 files changed, 84 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 601d0d7210d9..6f31761043e2 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 */ @@ -687,6 +693,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_mailbox_check(struct device_node *np) { struct of_phandle_args arg; @@ -778,7 +819,7 @@ static int scmi_probe(struct platform_device *pdev) const struct scmi_desc *desc; struct scmi_info *info; struct device *dev = &pdev->dev; - struct device_node *np = dev->of_node; + struct device_node *child, *np = dev->of_node; /* Only mailbox method supported, check for the presence of one */ if (scmi_mailbox_check(np)) { @@ -817,6 +858,43 @@ static int scmi_probe(struct platform_device *pdev) return ret; } + for_each_available_child_of_node(np, child) { + int init_ret; + u32 prot_id; + const struct scmi_protocol_match *match; + + if (of_property_read_u32(child, "reg", &prot_id)) + continue; + + prot_id &= MSG_PROTOCOL_ID_MASK; + + if (!scmi_is_protocol_implemented(handle, prot_id)) { + dev_err(dev, "SCMI protocol %d not implemented\n", + prot_id); + continue; + } + + match = scmi_protocol_match_get(prot_id); + if (match) { + struct platform_device *cdev; + + cdev = of_platform_device_create(child, match->name, + dev); + if (!cdev) { + dev_err(dev, "failed to create %s device\n", + match->name); + continue; + } + + init_ret = match->fn(handle); + if (init_ret) { + dev_err(dev, "SCMI protocol %d init error %d\n", + prot_id, init_ret); + of_platform_device_destroy(&cdev->dev, NULL); + } + } + } + mutex_lock(&scmi_list_mutex); list_add_tail(&info->node, &scmi_list); mutex_unlock(&scmi_list_mutex);