diff options
| author | Sudeep Holla <sudeep.holla@arm.com> | 2017-06-06 11:39:08 +0100 | 
|---|---|---|
| committer | Sudeep Holla <sudeep.holla@arm.com> | 2018-02-28 16:37:57 +0000 | 
| commit | bc40081d9825c7ed34501ebfc0a533047a07b16c (patch) | |
| tree | 3f277f02d00915618b60c59074cab60ff577540d | |
| parent | 5179c523c1eae4b80fbafe9656bc24a375217cac (diff) | |
firmware: arm_scmi: probe and initialise all the supported protocols
Now that we have basic support for all the protocols in the
specification, let's probe them individually and initialise them.
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
| -rw-r--r-- | drivers/firmware/arm_scmi/driver.c | 51 | 
1 files changed, 50 insertions, 1 deletions
diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c index 49875cd68365..f242b2e7c4b1 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -466,6 +466,21 @@ void scmi_setup_protocol_implemented(const struct scmi_handle *handle,  	info->protocols_imp = prot_imp;  } +static bool +scmi_is_protocol_implemented(const struct scmi_handle *handle, u8 prot_id) +{ +	int i; +	struct scmi_info *info = handle_to_scmi_info(handle); + +	if (!info->protocols_imp) +		return false; + +	for (i = 0; i < MAX_PROTOCOLS_IMP; i++) +		if (info->protocols_imp[i] == prot_id) +			return true; +	return false; +} +  /**   * scmi_handle_get() - Get the  SCMI handle for a device   * @@ -661,6 +676,23 @@ static inline int scmi_mbox_chan_setup(struct scmi_info *info)  	return 0;  } +static inline void +scmi_create_protocol_device(struct device_node *np, struct scmi_info *info, +			    int prot_id) +{ +	struct scmi_device *sdev; + +	sdev = scmi_device_create(np, info->dev, prot_id); +	if (!sdev) { +		dev_err(info->dev, "failed to create %d protocol device\n", +			prot_id); +		return; +	} + +	/* setup handle now as the transport is ready */ +	scmi_set_handle(sdev); +} +  static int scmi_probe(struct platform_device *pdev)  {  	int ret; @@ -668,7 +700,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)) { @@ -711,6 +743,23 @@ 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) { +		u32 prot_id; + +		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; +		} + +		scmi_create_protocol_device(child, info, prot_id); +	} +  	return 0;  }  | 
