Commit 1eaf18e3 authored by Sudeep Holla's avatar Sudeep Holla
Browse files

firmware: arm_scmi: Move scmi protocols registration into the driver 

In preparation to enable building SCMI as a single module, let us move
the SCMI protocol registration call into the driver. This enables us
to also add unregistration of the SCMI protocols.

The main reason for this is to keep it simple instead of maintaining
it as separate modules and dealing with all possible initcall races
and deferred probe handling. We can move it as separate modules if
needed in future.

Link: https://lore.kernel.org/r/20200907195046.56615-4-sudeep.holla@arm.com


Tested-by: default avatarCristian Marussi <cristian.marussi@arm.com>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent 5a2f0a0b

drivers/firmware/arm_scmi/clock.c

+1 −6
Original line number Diff line number Diff line
@@ -364,9 +364,4 @@ static int scmi_clock_protocol_init(struct scmi_handle *handle) 
	return 0;

}



static int __init scmi_clock_init(void)

{

	return scmi_protocol_register(SCMI_PROTOCOL_CLOCK,

				      &scmi_clock_protocol_init);

}

subsys_initcall(scmi_clock_init);
 
DEFINE_SCMI_PROTOCOL_REGISTER_UNREGISTER(SCMI_PROTOCOL_CLOCK, clock)

drivers/firmware/arm_scmi/common.h

+21 −0
Original line number Diff line number Diff line
@@ -159,6 +159,27 @@ int scmi_base_protocol_init(struct scmi_handle *h); 
int __init scmi_bus_init(void);

void __exit scmi_bus_exit(void);



#define DECLARE_SCMI_REGISTER_UNREGISTER(func)		\

	int __init scmi_##func##_register(void);	\

	void __exit scmi_##func##_unregister(void)

DECLARE_SCMI_REGISTER_UNREGISTER(clock);

DECLARE_SCMI_REGISTER_UNREGISTER(perf);

DECLARE_SCMI_REGISTER_UNREGISTER(power);

DECLARE_SCMI_REGISTER_UNREGISTER(reset);

DECLARE_SCMI_REGISTER_UNREGISTER(sensors);

DECLARE_SCMI_REGISTER_UNREGISTER(system);



#define DEFINE_SCMI_PROTOCOL_REGISTER_UNREGISTER(id, name) \

int __init scmi_##name##_register(void) \

{ \

	return scmi_protocol_register((id), &scmi_##name##_protocol_init); \

} \

\

void __exit scmi_##name##_unregister(void) \

{ \

	scmi_protocol_unregister((id)); \

}



/* SCMI Transport */

/**

 * struct scmi_chan_info - Structure representing a SCMI channel information

drivers/firmware/arm_scmi/driver.c

+15 −1
Original line number Diff line number Diff line
@@ -933,14 +933,28 @@ static int __init scmi_driver_init(void) 
{

	scmi_bus_init();



	scmi_clock_register();

	scmi_perf_register();

	scmi_power_register();

	scmi_reset_register();

	scmi_sensors_register();

	scmi_system_register();



	return platform_driver_register(&scmi_driver);

}

module_init(scmi_driver_init);

subsys_initcall(scmi_driver_init);



static void __exit scmi_driver_exit(void)

{

	scmi_bus_exit();



	scmi_clock_unregister();

	scmi_perf_unregister();

	scmi_power_unregister();

	scmi_reset_unregister();

	scmi_sensors_unregister();

	scmi_system_unregister();



	platform_driver_unregister(&scmi_driver);

}

module_exit(scmi_driver_exit);

drivers/firmware/arm_scmi/perf.c

+1 −6
Original line number Diff line number Diff line
@@ -890,9 +890,4 @@ static int scmi_perf_protocol_init(struct scmi_handle *handle) 
	return 0;

}



static int __init scmi_perf_init(void)

{

	return scmi_protocol_register(SCMI_PROTOCOL_PERF,

				      &scmi_perf_protocol_init);

}

subsys_initcall(scmi_perf_init);
 
DEFINE_SCMI_PROTOCOL_REGISTER_UNREGISTER(SCMI_PROTOCOL_PERF, perf)

drivers/firmware/arm_scmi/power.c

+1 −6
Original line number Diff line number Diff line
@@ -301,9 +301,4 @@ static int scmi_power_protocol_init(struct scmi_handle *handle) 
	return 0;

}



static int __init scmi_power_init(void)

{

	return scmi_protocol_register(SCMI_PROTOCOL_POWER,

				      &scmi_power_protocol_init);

}

subsys_initcall(scmi_power_init);
 
DEFINE_SCMI_PROTOCOL_REGISTER_UNREGISTER(SCMI_PROTOCOL_POWER, power)

CRA Git | Maintained and supported by SUSTech CRA and CCSE