Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51fe3a37 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

SCMI cleanups for v4.18

This contains all of the trivial review comments that were not
addressed as the series was already queued up for v4.17 and were not
critical to go as fixes.

They generally just improve code readability, fix kernel-docs, remove
unused/unnecessary code, follow standard function naming and simplifies
certain exit paths.

* tag 'scmi-updates-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux

:
  firmware: arm_scmi: simplify exit path by returning on error
  firmware: arm_scmi: improve exit paths and code readability
  firmware: arm_scmi: remove unnecessary bitmap_zero
  firmware: arm_scmi: drop unused `con_priv` structure member
  firmware: arm_scmi: rename scmi_xfer_{init,get,put}
  firmware: arm_scmi: rename get_transition_latency and add_opps_to_device
  firmware: arm_scmi: fix kernel-docs documentation
  firmware: arm_scmi: improve code readability using bitfield accessor macros

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f6b3f4ac 632de8f5

drivers/cpufreq/scmi-cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static int scmi_cpufreq_init(struct cpufreq_policy *policy) 
		return -ENODEV;

	}



	ret = handle->perf_ops->add_opps_to_device(handle, cpu_dev);

	ret = handle->perf_ops->device_opps_add(handle, cpu_dev);

	if (ret) {

		dev_warn(cpu_dev, "failed to add opps to the device\n");

		return ret;
@@ -164,7 +164,7 @@ static int scmi_cpufreq_init(struct cpufreq_policy *policy) 
	/* SCMI allows DVFS request for any domain from any CPU */

	policy->dvfs_possible_from_any_cpu = true;



	latency = handle->perf_ops->get_transition_latency(handle, cpu_dev);

	latency = handle->perf_ops->transition_latency_get(handle, cpu_dev);

	if (!latency)

		latency = CPUFREQ_ETERNAL;

drivers/firmware/arm_scmi/base.c

+24 −19
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ struct scmi_msg_resp_base_attributes { 
 * scmi_base_attributes_get() - gets the implementation details

 *	that are associated with the base protocol.

 *

 * @handle - SCMI entity handle

 * @handle: SCMI entity handle

 *

 * Return: 0 on success, else appropriate SCMI error.

 */
@@ -37,7 +37,7 @@ static int scmi_base_attributes_get(const struct scmi_handle *handle) 
	struct scmi_msg_resp_base_attributes *attr_info;

	struct scmi_revision_info *rev = handle->version;



	ret = scmi_one_xfer_init(handle, PROTOCOL_ATTRIBUTES,

	ret = scmi_xfer_get_init(handle, PROTOCOL_ATTRIBUTES,

				 SCMI_PROTOCOL_BASE, 0, sizeof(*attr_info), &t);

	if (ret)

		return ret;
@@ -49,15 +49,16 @@ static int scmi_base_attributes_get(const struct scmi_handle *handle) 
		rev->num_agents = attr_info->num_agents;

	}



	scmi_one_xfer_put(handle, t);

	scmi_xfer_put(handle, t);



	return ret;

}



/**

 * scmi_base_vendor_id_get() - gets vendor/subvendor identifier ASCII string.

 *

 * @handle - SCMI entity handle

 * @sub_vendor - specify true if sub-vendor ID is needed

 * @handle: SCMI entity handle

 * @sub_vendor: specify true if sub-vendor ID is needed

 *

 * Return: 0 on success, else appropriate SCMI error.

 */
@@ -80,7 +81,7 @@ scmi_base_vendor_id_get(const struct scmi_handle *handle, bool sub_vendor) 
		size = ARRAY_SIZE(rev->vendor_id);

	}



	ret = scmi_one_xfer_init(handle, cmd, SCMI_PROTOCOL_BASE, 0, size, &t);

	ret = scmi_xfer_get_init(handle, cmd, SCMI_PROTOCOL_BASE, 0, size, &t);

	if (ret)

		return ret;
@@ -88,7 +89,8 @@ scmi_base_vendor_id_get(const struct scmi_handle *handle, bool sub_vendor) 
	if (!ret)

		memcpy(vendor_id, t->rx.buf, size);



	scmi_one_xfer_put(handle, t);

	scmi_xfer_put(handle, t);



	return ret;

}
@@ -97,7 +99,7 @@ scmi_base_vendor_id_get(const struct scmi_handle *handle, bool sub_vendor) 
 *	implementation 32-bit version. The format of the version number is

 *	vendor-specific

 *

 * @handle - SCMI entity handle

 * @handle: SCMI entity handle

 *

 * Return: 0 on success, else appropriate SCMI error.

 */
@@ -109,7 +111,7 @@ scmi_base_implementation_version_get(const struct scmi_handle *handle) 
	struct scmi_xfer *t;

	struct scmi_revision_info *rev = handle->version;



	ret = scmi_one_xfer_init(handle, BASE_DISCOVER_IMPLEMENT_VERSION,

	ret = scmi_xfer_get_init(handle, BASE_DISCOVER_IMPLEMENT_VERSION,

				 SCMI_PROTOCOL_BASE, 0, sizeof(*impl_ver), &t);

	if (ret)

		return ret;
@@ -120,7 +122,8 @@ scmi_base_implementation_version_get(const struct scmi_handle *handle) 
		rev->impl_ver = le32_to_cpu(*impl_ver);

	}



	scmi_one_xfer_put(handle, t);

	scmi_xfer_put(handle, t);



	return ret;

}
@@ -128,8 +131,8 @@ scmi_base_implementation_version_get(const struct scmi_handle *handle) 
 * scmi_base_implementation_list_get() - gets the list of protocols it is

 *	OSPM is allowed to access

 *

 * @handle - SCMI entity handle

 * @protocols_imp - pointer to hold the list of protocol identifiers

 * @handle: SCMI entity handle

 * @protocols_imp: pointer to hold the list of protocol identifiers

 *

 * Return: 0 on success, else appropriate SCMI error.

 */
@@ -143,7 +146,7 @@ static int scmi_base_implementation_list_get(const struct scmi_handle *handle, 
	u32 tot_num_ret = 0, loop_num_ret;

	struct device *dev = handle->dev;



	ret = scmi_one_xfer_init(handle, BASE_DISCOVER_LIST_PROTOCOLS,

	ret = scmi_xfer_get_init(handle, BASE_DISCOVER_LIST_PROTOCOLS,

				 SCMI_PROTOCOL_BASE, sizeof(*num_skip), 0, &t);

	if (ret)

		return ret;
@@ -172,16 +175,17 @@ static int scmi_base_implementation_list_get(const struct scmi_handle *handle, 
		tot_num_ret += loop_num_ret;

	} while (loop_num_ret);



	scmi_one_xfer_put(handle, t);

	scmi_xfer_put(handle, t);



	return ret;

}



/**

 * scmi_base_discover_agent_get() - discover the name of an agent

 *

 * @handle - SCMI entity handle

 * @id - Agent identifier

 * @name - Agent identifier ASCII string

 * @handle: SCMI entity handle

 * @id: Agent identifier

 * @name: Agent identifier ASCII string

 *

 * An agent id of 0 is reserved to identify the platform itself.

 * Generally operating system is represented as "OSPM"
@@ -194,7 +198,7 @@ static int scmi_base_discover_agent_get(const struct scmi_handle *handle, 
	int ret;

	struct scmi_xfer *t;



	ret = scmi_one_xfer_init(handle, BASE_DISCOVER_AGENT,

	ret = scmi_xfer_get_init(handle, BASE_DISCOVER_AGENT,

				 SCMI_PROTOCOL_BASE, sizeof(__le32),

				 SCMI_MAX_STR_SIZE, &t);

	if (ret)
@@ -206,7 +210,8 @@ static int scmi_base_discover_agent_get(const struct scmi_handle *handle, 
	if (!ret)

		memcpy(name, t->rx.buf, SCMI_MAX_STR_SIZE);



	scmi_one_xfer_put(handle, t);

	scmi_xfer_put(handle, t);



	return ret;

}

drivers/firmware/arm_scmi/bus.c

+12 −10
Original line number Diff line number Diff line
@@ -125,13 +125,13 @@ scmi_device_create(struct device_node *np, struct device *parent, int protocol) 
	int id, retval;

	struct scmi_device *scmi_dev;



	id = ida_simple_get(&scmi_bus_id, 1, 0, GFP_KERNEL);

	if (id < 0)

		return NULL;



	scmi_dev = kzalloc(sizeof(*scmi_dev), GFP_KERNEL);

	if (!scmi_dev)

		goto no_mem;

		return NULL;



	id = ida_simple_get(&scmi_bus_id, 1, 0, GFP_KERNEL);

	if (id < 0)

		goto free_mem;



	scmi_dev->id = id;

	scmi_dev->protocol_id = protocol;
@@ -141,13 +141,15 @@ scmi_device_create(struct device_node *np, struct device *parent, int protocol) 
	dev_set_name(&scmi_dev->dev, "scmi_dev.%d", id);



	retval = device_register(&scmi_dev->dev);

	if (!retval)

		return scmi_dev;

	if (retval)

		goto put_dev;



	return scmi_dev;

put_dev:

	put_device(&scmi_dev->dev);

	kfree(scmi_dev);

no_mem:

	ida_simple_remove(&scmi_bus_id, id);

free_mem:

	kfree(scmi_dev);

	return NULL;

}
@@ -171,9 +173,9 @@ int scmi_protocol_register(int protocol_id, scmi_prot_init_fn_t fn) 
	spin_lock(&protocol_lock);

	ret = idr_alloc(&scmi_protocols, fn, protocol_id, protocol_id + 1,

			GFP_ATOMIC);

	spin_unlock(&protocol_lock);

	if (ret != protocol_id)

		pr_err("unable to allocate SCMI idr slot, err %d\n", ret);

	spin_unlock(&protocol_lock);



	return ret;

}

drivers/firmware/arm_scmi/clock.c

+12 −12
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static int scmi_clock_protocol_attributes_get(const struct scmi_handle *handle, 
	struct scmi_xfer *t;

	struct scmi_msg_resp_clock_protocol_attributes *attr;



	ret = scmi_one_xfer_init(handle, PROTOCOL_ATTRIBUTES,

	ret = scmi_xfer_get_init(handle, PROTOCOL_ATTRIBUTES,

				 SCMI_PROTOCOL_CLOCK, 0, sizeof(*attr), &t);

	if (ret)

		return ret;
@@ -90,7 +90,7 @@ static int scmi_clock_protocol_attributes_get(const struct scmi_handle *handle, 
		ci->max_async_req = attr->max_async_req;

	}



	scmi_one_xfer_put(handle, t);

	scmi_xfer_put(handle, t);

	return ret;

}
@@ -101,7 +101,7 @@ static int scmi_clock_attributes_get(const struct scmi_handle *handle, 
	struct scmi_xfer *t;

	struct scmi_msg_resp_clock_attributes *attr;



	ret = scmi_one_xfer_init(handle, CLOCK_ATTRIBUTES, SCMI_PROTOCOL_CLOCK,

	ret = scmi_xfer_get_init(handle, CLOCK_ATTRIBUTES, SCMI_PROTOCOL_CLOCK,

				 sizeof(clk_id), sizeof(*attr), &t);

	if (ret)

		return ret;
@@ -115,7 +115,7 @@ static int scmi_clock_attributes_get(const struct scmi_handle *handle, 
	else

		clk->name[0] = '\0';



	scmi_one_xfer_put(handle, t);

	scmi_xfer_put(handle, t);

	return ret;

}
@@ -132,7 +132,7 @@ scmi_clock_describe_rates_get(const struct scmi_handle *handle, u32 clk_id, 
	struct scmi_msg_clock_describe_rates *clk_desc;

	struct scmi_msg_resp_clock_describe_rates *rlist;



	ret = scmi_one_xfer_init(handle, CLOCK_DESCRIBE_RATES,

	ret = scmi_xfer_get_init(handle, CLOCK_DESCRIBE_RATES,

				 SCMI_PROTOCOL_CLOCK, sizeof(*clk_desc), 0, &t);

	if (ret)

		return ret;
@@ -186,7 +186,7 @@ scmi_clock_describe_rates_get(const struct scmi_handle *handle, u32 clk_id, 
		clk->list.num_rates = tot_rate_cnt;



err:

	scmi_one_xfer_put(handle, t);

	scmi_xfer_put(handle, t);

	return ret;

}
@@ -196,7 +196,7 @@ scmi_clock_rate_get(const struct scmi_handle *handle, u32 clk_id, u64 *value) 
	int ret;

	struct scmi_xfer *t;



	ret = scmi_one_xfer_init(handle, CLOCK_RATE_GET, SCMI_PROTOCOL_CLOCK,

	ret = scmi_xfer_get_init(handle, CLOCK_RATE_GET, SCMI_PROTOCOL_CLOCK,

				 sizeof(__le32), sizeof(u64), &t);

	if (ret)

		return ret;
@@ -211,7 +211,7 @@ scmi_clock_rate_get(const struct scmi_handle *handle, u32 clk_id, u64 *value) 
		*value |= (u64)le32_to_cpu(*(pval + 1)) << 32;

	}



	scmi_one_xfer_put(handle, t);

	scmi_xfer_put(handle, t);

	return ret;

}
@@ -222,7 +222,7 @@ static int scmi_clock_rate_set(const struct scmi_handle *handle, u32 clk_id, 
	struct scmi_xfer *t;

	struct scmi_clock_set_rate *cfg;



	ret = scmi_one_xfer_init(handle, CLOCK_RATE_SET, SCMI_PROTOCOL_CLOCK,

	ret = scmi_xfer_get_init(handle, CLOCK_RATE_SET, SCMI_PROTOCOL_CLOCK,

				 sizeof(*cfg), 0, &t);

	if (ret)

		return ret;
@@ -235,7 +235,7 @@ static int scmi_clock_rate_set(const struct scmi_handle *handle, u32 clk_id, 


	ret = scmi_do_xfer(handle, t);



	scmi_one_xfer_put(handle, t);

	scmi_xfer_put(handle, t);

	return ret;

}
@@ -246,7 +246,7 @@ scmi_clock_config_set(const struct scmi_handle *handle, u32 clk_id, u32 config) 
	struct scmi_xfer *t;

	struct scmi_clock_set_config *cfg;



	ret = scmi_one_xfer_init(handle, CLOCK_CONFIG_SET, SCMI_PROTOCOL_CLOCK,

	ret = scmi_xfer_get_init(handle, CLOCK_CONFIG_SET, SCMI_PROTOCOL_CLOCK,

				 sizeof(*cfg), 0, &t);

	if (ret)

		return ret;
@@ -257,7 +257,7 @@ scmi_clock_config_set(const struct scmi_handle *handle, u32 clk_id, u32 config) 


	ret = scmi_do_xfer(handle, t);



	scmi_one_xfer_put(handle, t);

	scmi_xfer_put(handle, t);

	return ret;

}

drivers/firmware/arm_scmi/common.h

+12 −10
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 * Copyright (C) 2018 ARM Ltd.

 */



#include <linux/bitfield.h>

#include <linux/completion.h>

#include <linux/device.h>

#include <linux/errno.h>
@@ -14,10 +15,10 @@ 
#include <linux/scmi_protocol.h>

#include <linux/types.h>



#define PROTOCOL_REV_MINOR_BITS	16

#define PROTOCOL_REV_MINOR_MASK	((1U << PROTOCOL_REV_MINOR_BITS) - 1)

#define PROTOCOL_REV_MAJOR(x)	((x) >> PROTOCOL_REV_MINOR_BITS)

#define PROTOCOL_REV_MINOR(x)	((x) & PROTOCOL_REV_MINOR_MASK)

#define PROTOCOL_REV_MINOR_MASK	GENMASK(15, 0)

#define PROTOCOL_REV_MAJOR_MASK	GENMASK(31, 16)

#define PROTOCOL_REV_MAJOR(x)	(u16)(FIELD_GET(PROTOCOL_REV_MAJOR_MASK, (x)))

#define PROTOCOL_REV_MINOR(x)	(u16)(FIELD_GET(PROTOCOL_REV_MINOR_MASK, (x)))

#define MAX_PROTOCOLS_IMP	16

#define MAX_OPPS		16
@@ -51,7 +52,10 @@ struct scmi_msg_resp_prot_version { 
 * @protocol_id: The identifier of the protocol used to send @id command

 * @seq: The token to identify the message. when a message/command returns,

 *	the platform returns the whole message header unmodified including

 *	 the token.

 *	the token

 * @status: Status of the transfer once it's complete

 * @poll_completion: Indicate if the transfer needs to be polled for

 *	completion or interrupt mode is used

 */

struct scmi_msg_hdr {

	u8 id;
@@ -82,18 +86,16 @@ struct scmi_msg { 
 *	buffer for the rx path as we use for the tx path.

 * @done: completion event

 */



struct scmi_xfer {

	void *con_priv;

	struct scmi_msg_hdr hdr;

	struct scmi_msg tx;

	struct scmi_msg rx;

	struct completion done;

};



void scmi_one_xfer_put(const struct scmi_handle *h, struct scmi_xfer *xfer);

void scmi_xfer_put(const struct scmi_handle *h, struct scmi_xfer *xfer);

int scmi_do_xfer(const struct scmi_handle *h, struct scmi_xfer *xfer);

int scmi_one_xfer_init(const struct scmi_handle *h, u8 msg_id, u8 prot_id,

int scmi_xfer_get_init(const struct scmi_handle *h, u8 msg_id, u8 prot_id,

		       size_t tx_size, size_t rx_size, struct scmi_xfer **p);

int scmi_handle_put(const struct scmi_handle *handle);

struct scmi_handle *scmi_handle_get(struct device *dev);