Commit 9115c20a authored by Cristian Marussi's avatar Cristian Marussi Committed by Sudeep Holla
Browse files

firmware: arm_scmi: Move protocol registration helpers 



Move protocol registration helpers and logic out of bus.c compilation
unit into driver.c.

No functional change.

Signed-off-by: default avatarCristian Marussi <cristian.marussi@arm.com>
Link: https://lore.kernel.org/r/20221222185049.737625-4-cristian.marussi@arm.com


Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent 05a2801d

drivers/firmware/arm_scmi/bus.c

+0 −68
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
#include "common.h"



static DEFINE_IDA(scmi_bus_id);

static DEFINE_IDR(scmi_protocols);

static DEFINE_SPINLOCK(protocol_lock);



static const struct scmi_device_id *

scmi_dev_match_id(struct scmi_device *scmi_dev, struct scmi_driver *scmi_drv)
@@ -76,30 +74,6 @@ struct scmi_device *scmi_child_dev_find(struct device *parent, 
	return to_scmi_dev(dev);

}



const struct scmi_protocol *scmi_protocol_get(int protocol_id)

{

	const struct scmi_protocol *proto;



	proto = idr_find(&scmi_protocols, protocol_id);

	if (!proto || !try_module_get(proto->owner)) {

		pr_warn("SCMI Protocol 0x%x not found!\n", protocol_id);

		return NULL;

	}



	pr_debug("Found SCMI Protocol 0x%x\n", protocol_id);



	return proto;

}



void scmi_protocol_put(int protocol_id)

{

	const struct scmi_protocol *proto;



	proto = idr_find(&scmi_protocols, protocol_id);

	if (proto)

		module_put(proto->owner);

}



static int scmi_dev_probe(struct device *dev)

{

	struct scmi_driver *scmi_drv = to_scmi_driver(dev->driver);
@@ -232,48 +206,6 @@ void scmi_set_handle(struct scmi_device *scmi_dev) 
		scmi_device_link_add(&scmi_dev->dev, scmi_dev->handle->dev);

}



int scmi_protocol_register(const struct scmi_protocol *proto)

{

	int ret;



	if (!proto) {

		pr_err("invalid protocol\n");

		return -EINVAL;

	}



	if (!proto->instance_init) {

		pr_err("missing init for protocol 0x%x\n", proto->id);

		return -EINVAL;

	}



	spin_lock(&protocol_lock);

	ret = idr_alloc(&scmi_protocols, (void *)proto,

			proto->id, proto->id + 1, GFP_ATOMIC);

	spin_unlock(&protocol_lock);

	if (ret != proto->id) {

		pr_err("unable to allocate SCMI idr slot for 0x%x - err %d\n",

		       proto->id, ret);

		return ret;

	}



	pr_debug("Registered SCMI Protocol 0x%x\n", proto->id);



	return 0;

}

EXPORT_SYMBOL_GPL(scmi_protocol_register);



void scmi_protocol_unregister(const struct scmi_protocol *proto)

{

	spin_lock(&protocol_lock);

	idr_remove(&scmi_protocols, proto->id);

	spin_unlock(&protocol_lock);



	pr_debug("Unregistered SCMI Protocol 0x%x\n", proto->id);



	return;

}

EXPORT_SYMBOL_GPL(scmi_protocol_unregister);



static int __scmi_devices_unregister(struct device *dev, void *data)

{

	struct scmi_device *scmi_dev = to_scmi_dev(dev);

drivers/firmware/arm_scmi/common.h

+0 −3
Original line number Diff line number Diff line
@@ -106,9 +106,6 @@ void scmi_setup_protocol_implemented(const struct scmi_protocol_handle *ph, 
int __init scmi_bus_init(void);

void __exit scmi_bus_exit(void);



const struct scmi_protocol *scmi_protocol_get(int protocol_id);

void scmi_protocol_put(int protocol_id);



int scmi_protocol_acquire(const struct scmi_handle *handle, u8 protocol_id);

void scmi_protocol_release(const struct scmi_handle *handle, u8 protocol_id);

drivers/firmware/arm_scmi/driver.c

+67 −0
Original line number Diff line number Diff line
@@ -51,6 +51,9 @@ enum scmi_error_codes { 
	SCMI_ERR_PROTOCOL = -10,/* Protocol Error */

};



static DEFINE_IDR(scmi_protocols);

static DEFINE_SPINLOCK(protocol_lock);



/* List of all SCMI devices active in system */

static LIST_HEAD(scmi_list);

/* Protection for the entire list */
@@ -194,6 +197,70 @@ static inline int scmi_to_linux_errno(int errno) 
	return -EIO;

}



static const struct scmi_protocol *scmi_protocol_get(int protocol_id)

{

	const struct scmi_protocol *proto;



	proto = idr_find(&scmi_protocols, protocol_id);

	if (!proto || !try_module_get(proto->owner)) {

		pr_warn("SCMI Protocol 0x%x not found!\n", protocol_id);

		return NULL;

	}



	pr_debug("Found SCMI Protocol 0x%x\n", protocol_id);



	return proto;

}



static void scmi_protocol_put(int protocol_id)

{

	const struct scmi_protocol *proto;



	proto = idr_find(&scmi_protocols, protocol_id);

	if (proto)

		module_put(proto->owner);

}



int scmi_protocol_register(const struct scmi_protocol *proto)

{

	int ret;



	if (!proto) {

		pr_err("invalid protocol\n");

		return -EINVAL;

	}



	if (!proto->instance_init) {

		pr_err("missing init for protocol 0x%x\n", proto->id);

		return -EINVAL;

	}



	spin_lock(&protocol_lock);

	ret = idr_alloc(&scmi_protocols, (void *)proto,

			proto->id, proto->id + 1, GFP_ATOMIC);

	spin_unlock(&protocol_lock);

	if (ret != proto->id) {

		pr_err("unable to allocate SCMI idr slot for 0x%x - err %d\n",

		       proto->id, ret);

		return ret;

	}



	pr_debug("Registered SCMI Protocol 0x%x\n", proto->id);



	return 0;

}

EXPORT_SYMBOL_GPL(scmi_protocol_register);



void scmi_protocol_unregister(const struct scmi_protocol *proto)

{

	spin_lock(&protocol_lock);

	idr_remove(&scmi_protocols, proto->id);

	spin_unlock(&protocol_lock);



	pr_debug("Unregistered SCMI Protocol 0x%x\n", proto->id);

}

EXPORT_SYMBOL_GPL(scmi_protocol_unregister);



void scmi_notification_instance_data_set(const struct scmi_handle *handle,

					 void *priv)

{