Commit 202f9977 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'qcom-drivers-for-4.21' of... 

Merge tag 'qcom-drivers-for-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/drivers

Qualcomm ARM Based Driver Updates for v4.21

* Fix llcc license, includes, and error checks
* Remove use of memcpy in cmd-db and fix API breakage
* Add QCS404 compatible to SMD-RPM
* Minor fixes for QMI
* Add irq clear handling in QCOM Geni SE during init

* tag 'qcom-drivers-for-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux

:
  drm: msm: Check cmd_db_read_aux_data() for failure
  soc: qcom: smd-rpm: Add QCS404 compatible
  soc: qcom: llcc-slice: Remove duplicated include from llcc-slice.c
  soc: qcom: cmd-db: Stop memcpy()ing in cmd_db_read_aux_data()
  soc: qcom: cmd-db: Remove memcpy()ing from cmd_db_get_header()
  soc: qcom: Drop help text for QCOM_QMI_HELPERS
  soc: qcom: qmi_interface: Limit txn ids to U16_MAX
  soc: qcom: llcc-slice: Add error checks for API functions
  soc: qcom/llcc: add MODULE_LICENSE tag
  soc: qcom: Add irq clear handling during SE init

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e5734beb b601f731

Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.txt

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ resources. 
		    "qcom,rpm-msm8916"

		    "qcom,rpm-msm8974"

		    "qcom,rpm-msm8998"

		    "qcom,rpm-qcs404"



- qcom,smd-channels:

	Usage: required

drivers/gpu/drm/msm/adreno/a6xx_gmu.c

+24 −35
Original line number Diff line number Diff line
@@ -902,26 +902,6 @@ static int a6xx_gmu_memory_probe(struct a6xx_gmu *gmu) 
	return ret;

}



/* Get the list of RPMh voltage levels from cmd-db */

static int a6xx_gmu_rpmh_arc_cmds(const char *id, void *vals, int size)

{

	u32 len = cmd_db_read_aux_data_len(id);



	if (!len)

		return 0;



	if (WARN_ON(len > size))

		return -EINVAL;



	cmd_db_read_aux_data(id, vals, len);



	/*

	 * The data comes back as an array of unsigned shorts so adjust the

	 * count accordingly

	 */

	return len >> 1;

}



/* Return the 'arc-level' for the given frequency */

static u32 a6xx_gmu_get_arc_level(struct device *dev, unsigned long freq)

{
@@ -949,11 +929,30 @@ static u32 a6xx_gmu_get_arc_level(struct device *dev, unsigned long freq) 
}



static int a6xx_gmu_rpmh_arc_votes_init(struct device *dev, u32 *votes,

		unsigned long *freqs, int freqs_count,

		u16 *pri, int pri_count,

		u16 *sec, int sec_count)

		unsigned long *freqs, int freqs_count, const char *id)

{

	int i, j;

	const u16 *pri, *sec;

	size_t pri_count, sec_count;



	pri = cmd_db_read_aux_data(id, &pri_count);

	if (IS_ERR(pri))

		return PTR_ERR(pri);

	/*

	 * The data comes back as an array of unsigned shorts so adjust the

	 * count accordingly

	 */

	pri_count >>= 1;

	if (!pri_count)

		return -EINVAL;



	sec = cmd_db_read_aux_data("mx.lvl", &sec_count);

	if (IS_ERR(sec))

		return PTR_ERR(sec);



	sec_count >>= 1;

	if (!sec_count)

		return -EINVAL;



	/* Construct a vote for each frequency */

	for (i = 0; i < freqs_count; i++) {
@@ -1012,25 +1011,15 @@ static int a6xx_gmu_rpmh_votes_init(struct a6xx_gmu *gmu) 
	struct a6xx_gpu *a6xx_gpu = container_of(gmu, struct a6xx_gpu, gmu);

	struct adreno_gpu *adreno_gpu = &a6xx_gpu->base;

	struct msm_gpu *gpu = &adreno_gpu->base;



	u16 gx[16], cx[16], mx[16];

	u32 gxcount, cxcount, mxcount;

	int ret;



	/* Get the list of available voltage levels for each component */

	gxcount = a6xx_gmu_rpmh_arc_cmds("gfx.lvl", gx, sizeof(gx));

	cxcount = a6xx_gmu_rpmh_arc_cmds("cx.lvl", cx, sizeof(cx));

	mxcount = a6xx_gmu_rpmh_arc_cmds("mx.lvl", mx, sizeof(mx));



	/* Build the GX votes */

	ret = a6xx_gmu_rpmh_arc_votes_init(&gpu->pdev->dev, gmu->gx_arc_votes,

		gmu->gpu_freqs, gmu->nr_gpu_freqs,

		gx, gxcount, mx, mxcount);

		gmu->gpu_freqs, gmu->nr_gpu_freqs, "gfx.lvl");



	/* Build the CX votes */

	ret |= a6xx_gmu_rpmh_arc_votes_init(gmu->dev, gmu->cx_arc_votes,

		gmu->gmu_freqs, gmu->nr_gmu_freqs,

		cx, cxcount, mx, mxcount);

		gmu->gmu_freqs, gmu->nr_gmu_freqs, "cx.lvl");



	return ret;

}

drivers/soc/qcom/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -75,11 +75,6 @@ config QCOM_QMI_HELPERS 
	tristate

	depends on ARCH_QCOM || COMPILE_TEST

	depends on NET

	help

	  Helper library for handling QMI encoded messages.  QMI encoded

	  messages are used in communication between the majority of QRTR

	  clients and this helpers provide the common functionality needed for

	  doing this from a kernel driver.



config QCOM_RMTFS_MEM

	tristate "Qualcomm Remote Filesystem memory driver"

drivers/soc/qcom/cmd-db.c

+29 −64
Original line number Diff line number Diff line
@@ -101,8 +101,7 @@ static bool cmd_db_magic_matches(const struct cmd_db_header *header) 


static struct cmd_db_header *cmd_db_header;





static inline void *rsc_to_entry_header(struct rsc_hdr *hdr)

static inline const void *rsc_to_entry_header(const struct rsc_hdr *hdr)

{

	u16 offset = le16_to_cpu(hdr->header_offset);
@@ -110,7 +109,7 @@ static inline void *rsc_to_entry_header(struct rsc_hdr *hdr) 
}



static inline void *

rsc_offset(struct rsc_hdr *hdr, struct entry_header *ent)

rsc_offset(const struct rsc_hdr *hdr, const struct entry_header *ent)

{

	u16 offset = le16_to_cpu(hdr->data_offset);

	u16 loffset = le16_to_cpu(ent->offset);
@@ -134,11 +133,11 @@ int cmd_db_ready(void) 
}

EXPORT_SYMBOL(cmd_db_ready);



static int cmd_db_get_header(const char *id, struct entry_header *eh,

			     struct rsc_hdr *rh)

static int cmd_db_get_header(const char *id, const struct entry_header **eh,

			     const struct rsc_hdr **rh)

{

	struct rsc_hdr *rsc_hdr;

	struct entry_header *ent;

	const struct rsc_hdr *rsc_hdr;

	const struct entry_header *ent;

	int ret, i, j;

	u8 query[8];
@@ -146,9 +145,6 @@ static int cmd_db_get_header(const char *id, struct entry_header *eh, 
	if (ret)

		return ret;



	if (!eh || !rh)

		return -EINVAL;



	/* Pad out query string to same length as in DB */

	strncpy(query, id, sizeof(query));
@@ -159,16 +155,15 @@ static int cmd_db_get_header(const char *id, struct entry_header *eh, 


		ent = rsc_to_entry_header(rsc_hdr);

		for (j = 0; j < le16_to_cpu(rsc_hdr->cnt); j++, ent++) {

			if (memcmp(ent->id, query, sizeof(ent->id)) == 0)

				break;

		}



		if (j < le16_to_cpu(rsc_hdr->cnt)) {

			memcpy(eh, ent, sizeof(*ent));

			memcpy(rh, rsc_hdr, sizeof(*rh));

			if (memcmp(ent->id, query, sizeof(ent->id)) == 0) {

				if (eh)

					*eh = ent;

				if (rh)

					*rh = rsc_hdr;

				return 0;

			}

		}

	}



	return -ENODEV;

}
@@ -186,68 +181,39 @@ static int cmd_db_get_header(const char *id, struct entry_header *eh, 
u32 cmd_db_read_addr(const char *id)

{

	int ret;

	struct entry_header ent;

	struct rsc_hdr rsc_hdr;

	const struct entry_header *ent;



	ret = cmd_db_get_header(id, &ent, &rsc_hdr);

	ret = cmd_db_get_header(id, &ent, NULL);



	return ret < 0 ? 0 : le32_to_cpu(ent.addr);

	return ret < 0 ? 0 : le32_to_cpu(ent->addr);

}

EXPORT_SYMBOL(cmd_db_read_addr);



/**

 * cmd_db_read_aux_data() - Query command db for aux data.

 *

 *  @id: Resource to retrieve AUX Data on.

 *  @data: Data buffer to copy returned aux data to. Returns size on NULL

 *  @len: Caller provides size of data buffer passed in.

 *  @id: Resource to retrieve AUX Data on

 *  @len: size of data buffer returned

 *

 *  Return: size of data on success, errno otherwise

 *  Return: pointer to data on success, error pointer otherwise

 */

int cmd_db_read_aux_data(const char *id, u8 *data, size_t len)

const void *cmd_db_read_aux_data(const char *id, size_t *len)

{

	int ret;

	struct entry_header ent;

	struct rsc_hdr rsc_hdr;

	u16 ent_len;



	if (!data)

		return -EINVAL;

	const struct entry_header *ent;

	const struct rsc_hdr *rsc_hdr;



	ret = cmd_db_get_header(id, &ent, &rsc_hdr);

	if (ret)

		return ret;



	ent_len = le16_to_cpu(ent.len);

	if (len < ent_len)

		return -EINVAL;

		return ERR_PTR(ret);



	len = min_t(u16, ent_len, len);

	memcpy(data, rsc_offset(&rsc_hdr, &ent), len);

	if (len)

		*len = le16_to_cpu(ent->len);



	return len;

	return rsc_offset(rsc_hdr, ent);

}

EXPORT_SYMBOL(cmd_db_read_aux_data);



/**

 * cmd_db_read_aux_data_len - Get the length of the auxiliary data stored in DB.

 *

 * @id: Resource to retrieve AUX Data.

 *

 * Return: size on success, 0 on error

 */

size_t cmd_db_read_aux_data_len(const char *id)

{

	int ret;

	struct entry_header ent;

	struct rsc_hdr rsc_hdr;



	ret = cmd_db_get_header(id, &ent, &rsc_hdr);



	return ret < 0 ? 0 : le16_to_cpu(ent.len);

}

EXPORT_SYMBOL(cmd_db_read_aux_data_len);



/**

 * cmd_db_read_slave_id - Get the slave ID for a given resource address

 *
@@ -258,15 +224,14 @@ EXPORT_SYMBOL(cmd_db_read_aux_data_len); 
enum cmd_db_hw_type cmd_db_read_slave_id(const char *id)

{

	int ret;

	struct entry_header ent;

	struct rsc_hdr rsc_hdr;

	const struct entry_header *ent;

	u32 addr;



	ret = cmd_db_get_header(id, &ent, &rsc_hdr);

	ret = cmd_db_get_header(id, &ent, NULL);

	if (ret < 0)

		return CMD_DB_HW_INVALID;



	addr = le32_to_cpu(ent.addr);

	addr = le32_to_cpu(ent->addr);

	return (addr >> SLAVE_ID_SHIFT) & SLAVE_ID_MASK;

}

EXPORT_SYMBOL(cmd_db_read_slave_id);

drivers/soc/qcom/llcc-slice.c

+15 −2
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ EXPORT_SYMBOL_GPL(llcc_slice_getd); 
 */

void llcc_slice_putd(struct llcc_slice_desc *desc)

{

	if (!IS_ERR_OR_NULL(desc))

		kfree(desc);

}

EXPORT_SYMBOL_GPL(llcc_slice_putd);
@@ -142,6 +143,9 @@ int llcc_slice_activate(struct llcc_slice_desc *desc) 
	int ret;

	u32 act_ctrl_val;



	if (IS_ERR_OR_NULL(desc))

		return -EINVAL;



	mutex_lock(&drv_data->lock);

	if (test_bit(desc->slice_id, drv_data->bitmap)) {

		mutex_unlock(&drv_data->lock);
@@ -176,6 +180,9 @@ int llcc_slice_deactivate(struct llcc_slice_desc *desc) 
	u32 act_ctrl_val;

	int ret;



	if (IS_ERR_OR_NULL(desc))

		return -EINVAL;



	mutex_lock(&drv_data->lock);

	if (!test_bit(desc->slice_id, drv_data->bitmap)) {

		mutex_unlock(&drv_data->lock);
@@ -203,6 +210,9 @@ EXPORT_SYMBOL_GPL(llcc_slice_deactivate); 
 */

int llcc_get_slice_id(struct llcc_slice_desc *desc)

{

	if (IS_ERR_OR_NULL(desc))

		return -EINVAL;



	return desc->slice_id;

}

EXPORT_SYMBOL_GPL(llcc_get_slice_id);
@@ -213,6 +223,9 @@ EXPORT_SYMBOL_GPL(llcc_get_slice_id); 
 */

size_t llcc_get_slice_size(struct llcc_slice_desc *desc)

{

	if (IS_ERR_OR_NULL(desc))

		return 0;



	return desc->slice_size;

}

EXPORT_SYMBOL_GPL(llcc_get_slice_size);
@@ -360,5 +373,5 @@ int qcom_llcc_probe(struct platform_device *pdev, 
	return ret;

}

EXPORT_SYMBOL_GPL(qcom_llcc_probe);



MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("Qualcomm Last Level Cache Controller");

CRA Git | Maintained and supported by SUSTech CRA and CCSE