Commit 8119f4b9 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'scmi-updates-5.10' of... 

Merge tag 'scmi-updates-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/drivers

ARM SCMI updates for v5.10

Couple of main additions: SCMI system protocol support and ability to
build SCMI driver as a single module which is needed by some transports
like virtio as they may not be ready early during the boot. This also
includes constification of scmi ops and related function pointers.

* tag 'scmi-updates-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  firmware: arm_scmi: Enable building as a single module
  firmware: arm_scmi: Move scmi protocols registration into the driver
  firmware: arm_scmi: Move scmi bus init and exit calls into the driver
  firmware: smccc: Export both smccc functions
  firmware: arm_scmi: Fix NULL pointer dereference in mailbox_chan_free
  firmware: arm_scmi: Add SCMI device for system power protocol
  firmware: arm_scmi: Add system power protocol support
  firmware: arm_scmi: Constify static scmi-ops
  firmware: arm_scmi: Constify ops pointers in scmi_handle
  cpufreq: arm_scmi: Constify scmi_perf_ops pointers

Link: https://lore.kernel.org/r/20200914075018.2rvytvghxyutcbk4@bogus


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents bd2fad8c 66d90f6e

drivers/cpufreq/scmi-cpufreq.c

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static const struct scmi_handle *handle; 
static unsigned int scmi_cpufreq_get_rate(unsigned int cpu)

{

	struct cpufreq_policy *policy = cpufreq_cpu_get_raw(cpu);

	struct scmi_perf_ops *perf_ops = handle->perf_ops;

	const struct scmi_perf_ops *perf_ops = handle->perf_ops;

	struct scmi_data *priv = policy->driver_data;

	unsigned long rate;

	int ret;
@@ -50,7 +50,7 @@ scmi_cpufreq_set_target(struct cpufreq_policy *policy, unsigned int index) 
{

	int ret;

	struct scmi_data *priv = policy->driver_data;

	struct scmi_perf_ops *perf_ops = handle->perf_ops;

	const struct scmi_perf_ops *perf_ops = handle->perf_ops;

	u64 freq = policy->freq_table[index].frequency;



	ret = perf_ops->freq_set(handle, priv->domain_id, freq * 1000, false);
@@ -64,7 +64,7 @@ static unsigned int scmi_cpufreq_fast_switch(struct cpufreq_policy *policy, 
					     unsigned int target_freq)

{

	struct scmi_data *priv = policy->driver_data;

	struct scmi_perf_ops *perf_ops = handle->perf_ops;

	const struct scmi_perf_ops *perf_ops = handle->perf_ops;



	if (!perf_ops->freq_set(handle, priv->domain_id,

				target_freq * 1000, true)) {

drivers/firmware/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
menu "Firmware Drivers"



config ARM_SCMI_PROTOCOL

	bool "ARM System Control and Management Interface (SCMI) Message Protocol"

	tristate "ARM System Control and Management Interface (SCMI) Message Protocol"

	depends on ARM || ARM64 || COMPILE_TEST

	depends on MAILBOX

	help

drivers/firmware/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ obj-$(CONFIG_TI_SCI_PROTOCOL) += ti_sci.o 
obj-$(CONFIG_TRUSTED_FOUNDATIONS) += trusted_foundations.o

obj-$(CONFIG_TURRIS_MOX_RWTM)	+= turris-mox-rwtm.o



obj-$(CONFIG_ARM_SCMI_PROTOCOL)	+= arm_scmi/

obj-y				+= arm_scmi/

obj-y				+= broadcom/

obj-y				+= meson/

obj-$(CONFIG_GOOGLE_FIRMWARE)	+= google/

drivers/firmware/arm_scmi/Makefile

+4 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-y	= scmi-bus.o scmi-driver.o scmi-protocols.o scmi-transport.o

scmi-bus-y = bus.o

scmi-driver-y = driver.o notify.o

scmi-transport-y = shmem.o

scmi-transport-$(CONFIG_MAILBOX) += mailbox.o

scmi-transport-$(CONFIG_HAVE_ARM_SMCCC_DISCOVERY) += smc.o

scmi-protocols-y = base.o clock.o perf.o power.o reset.o sensors.o

scmi-protocols-y = base.o clock.o perf.o power.o reset.o sensors.o system.o

scmi-module-objs := $(scmi-bus-y) $(scmi-driver-y) $(scmi-protocols-y) \

		    $(scmi-transport-y)

obj-$(CONFIG_ARM_SCMI_PROTOCOL) += scmi-module.o

obj-$(CONFIG_ARM_SCMI_POWER_DOMAIN) += scmi_pm_domain.o

drivers/firmware/arm_scmi/bus.c

+2 −4
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static void scmi_devices_unregister(void) 
	bus_for_each_dev(&scmi_bus_type, NULL, NULL, __scmi_devices_unregister);

}



static int __init scmi_bus_init(void)

int __init scmi_bus_init(void)

{

	int retval;
@@ -240,12 +240,10 @@ static int __init scmi_bus_init(void) 


	return retval;

}

subsys_initcall(scmi_bus_init);



static void __exit scmi_bus_exit(void)

void __exit scmi_bus_exit(void)

{

	scmi_devices_unregister();

	bus_unregister(&scmi_bus_type);

	ida_destroy(&scmi_bus_id);

}
 
module_exit(scmi_bus_exit);

CRA Git | Maintained and supported by SUSTech CRA and CCSE