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

Commit 0f21f9cc authored by Bjorn Andersson's avatar Bjorn Andersson
Browse files

remoteproc: Merge rproc_ops and rproc_fw_ops 



There are currently a few different schemes used for overriding fw_ops
or parts of fw_ops. Merge fw_ops into rproc_ops and expose the default
ELF-loader symbols so that they can be assigned by the drivers.

To keep backwards compatibility with the "default" case, a driver not
specifying the "load" operation is assumed to want the full ELF-loader
suit of functions.

Reviewed-By: default avatarLoic Pallardy <loic.pallardy@st.com>
Tested-By: default avatarLoic Pallardy <loic.pallardy@st.com>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent fb98e2bd

drivers/remoteproc/qcom_adsp_pil.c

+2 −7
Original line number Diff line number Diff line
@@ -85,11 +85,6 @@ static int adsp_load(struct rproc *rproc, const struct firmware *fw) 
			     adsp->mem_region, adsp->mem_phys, adsp->mem_size);

}



static const struct rproc_fw_ops adsp_fw_ops = {

	.find_rsc_table = qcom_mdt_find_rsc_table,

	.load = adsp_load,

};



static int adsp_start(struct rproc *rproc)

{

	struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
@@ -182,6 +177,8 @@ static const struct rproc_ops adsp_ops = { 
	.start = adsp_start,

	.stop = adsp_stop,

	.da_to_va = adsp_da_to_va,

	.find_rsc_table = qcom_mdt_find_rsc_table,

	.load = adsp_load,

};



static irqreturn_t adsp_wdog_interrupt(int irq, void *dev)
@@ -344,8 +341,6 @@ static int adsp_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}



	rproc->fw_ops = &adsp_fw_ops;



	adsp = (struct qcom_adsp *)rproc->priv;

	adsp->dev = &pdev->dev;

	adsp->rproc = rproc;

drivers/remoteproc/qcom_q6v5_pil.c

+2 −7
Original line number Diff line number Diff line
@@ -342,11 +342,6 @@ static int q6v5_load(struct rproc *rproc, const struct firmware *fw) 
	return 0;

}



static const struct rproc_fw_ops q6v5_fw_ops = {

	.find_rsc_table = q6v5_find_rsc_table,

	.load = q6v5_load,

};



static int q6v5_rmb_pbl_wait(struct q6v5 *qproc, int ms)

{

	unsigned long timeout;
@@ -931,6 +926,8 @@ static const struct rproc_ops q6v5_ops = { 
	.start = q6v5_start,

	.stop = q6v5_stop,

	.da_to_va = q6v5_da_to_va,

	.find_rsc_table = q6v5_find_rsc_table,

	.load = q6v5_load,

};



static irqreturn_t q6v5_wdog_interrupt(int irq, void *dev)
@@ -1150,8 +1147,6 @@ static int q6v5_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}



	rproc->fw_ops = &q6v5_fw_ops;



	qproc = (struct q6v5 *)rproc->priv;

	qproc->dev = &pdev->dev;

	qproc->rproc = rproc;

drivers/remoteproc/qcom_wcnss.c

+2 −7
Original line number Diff line number Diff line
@@ -156,11 +156,6 @@ static int wcnss_load(struct rproc *rproc, const struct firmware *fw) 
			     wcnss->mem_region, wcnss->mem_phys, wcnss->mem_size);

}



static const struct rproc_fw_ops wcnss_fw_ops = {

	.find_rsc_table = qcom_mdt_find_rsc_table,

	.load = wcnss_load,

};



static void wcnss_indicate_nv_download(struct qcom_wcnss *wcnss)

{

	u32 val;
@@ -313,6 +308,8 @@ static const struct rproc_ops wcnss_ops = { 
	.start = wcnss_start,

	.stop = wcnss_stop,

	.da_to_va = wcnss_da_to_va,

	.find_rsc_table = qcom_mdt_find_rsc_table,

	.load = wcnss_load,

};



static irqreturn_t wcnss_wdog_interrupt(int irq, void *dev)
@@ -492,8 +489,6 @@ static int wcnss_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}



	rproc->fw_ops = &wcnss_fw_ops;



	wcnss = (struct qcom_wcnss *)rproc->priv;

	wcnss->dev = &pdev->dev;

	wcnss->rproc = rproc;

drivers/remoteproc/remoteproc_core.c

+8 −2
Original line number Diff line number Diff line
@@ -1437,8 +1437,14 @@ struct rproc *rproc_alloc(struct device *dev, const char *name, 


	atomic_set(&rproc->power, 0);



	/* Set ELF as the default fw_ops handler */

	rproc->fw_ops = &rproc_elf_fw_ops;

	/* Default to ELF loader if no load function is specified */

	if (!rproc->ops->load) {

		rproc->ops->load = rproc_elf_load_segments;

		rproc->ops->find_rsc_table = rproc_elf_find_rsc_table;

		rproc->ops->find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table;

		rproc->ops->sanity_check = rproc_elf_sanity_check;

		rproc->ops->get_boot_addr = rproc_elf_get_boot_addr;

	}



	mutex_init(&rproc->lock);

drivers/remoteproc/remoteproc_elf_loader.c

+12 −18
Original line number Diff line number Diff line
@@ -39,8 +39,7 @@ 
 *

 * Make sure this fw image is sane.

 */

static int

rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw)

int rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw)

{

	const char *name = rproc->firmware;

	struct device *dev = &rproc->dev;
@@ -98,6 +97,7 @@ rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw) 


	return 0;

}

EXPORT_SYMBOL(rproc_elf_sanity_check);



/**

 * rproc_elf_get_boot_addr() - Get rproc's boot address.
@@ -110,13 +110,13 @@ rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw) 
 * Note that the boot address is not a configurable property of all remote

 * processors. Some will always boot at a specific hard-coded address.

 */

static

u32 rproc_elf_get_boot_addr(struct rproc *rproc, const struct firmware *fw)

{

	struct elf32_hdr *ehdr  = (struct elf32_hdr *)fw->data;



	return ehdr->e_entry;

}

EXPORT_SYMBOL(rproc_elf_get_boot_addr);



/**

 * rproc_elf_load_segments() - load firmware segments to memory
@@ -142,8 +142,7 @@ u32 rproc_elf_get_boot_addr(struct rproc *rproc, const struct firmware *fw) 
 * directly allocate memory for every segment/resource. This is not yet

 * supported, though.

 */

static int

rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw)

int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw)

{

	struct device *dev = &rproc->dev;

	struct elf32_hdr *ehdr;
@@ -207,6 +206,7 @@ rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw) 


	return ret;

}

EXPORT_SYMBOL(rproc_elf_load_segments);



static struct elf32_shdr *

find_table(struct device *dev, struct elf32_hdr *ehdr, size_t fw_size)
@@ -282,8 +282,8 @@ find_table(struct device *dev, struct elf32_hdr *ehdr, size_t fw_size) 
 * size into @tablesz. If a valid table isn't found, NULL is returned

 * (and @tablesz isn't set).

 */

static struct resource_table *

rproc_elf_find_rsc_table(struct rproc *rproc, const struct firmware *fw,

struct resource_table *rproc_elf_find_rsc_table(struct rproc *rproc,

						const struct firmware *fw,

						int *tablesz)

{

	struct elf32_hdr *ehdr;
@@ -303,6 +303,7 @@ rproc_elf_find_rsc_table(struct rproc *rproc, const struct firmware *fw, 


	return table;

}

EXPORT_SYMBOL(rproc_elf_find_rsc_table);



/**

 * rproc_elf_find_loaded_rsc_table() - find the loaded resource table
@@ -315,8 +316,8 @@ rproc_elf_find_rsc_table(struct rproc *rproc, const struct firmware *fw, 
 * Returns the pointer to the resource table if it is found or NULL otherwise.

 * If the table wasn't loaded yet the result is unspecified.

 */

static struct resource_table *

rproc_elf_find_loaded_rsc_table(struct rproc *rproc, const struct firmware *fw)

struct resource_table *rproc_elf_find_loaded_rsc_table(struct rproc *rproc,

						       const struct firmware *fw)

{

	struct elf32_hdr *ehdr = (struct elf32_hdr *)fw->data;

	struct elf32_shdr *shdr;
@@ -327,11 +328,4 @@ rproc_elf_find_loaded_rsc_table(struct rproc *rproc, const struct firmware *fw) 


	return rproc_da_to_va(rproc, shdr->sh_addr, shdr->sh_size);

}



const struct rproc_fw_ops rproc_elf_fw_ops = {

	.load = rproc_elf_load_segments,

	.find_rsc_table = rproc_elf_find_rsc_table,

	.find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table,

	.sanity_check = rproc_elf_sanity_check,

	.get_boot_addr = rproc_elf_get_boot_addr

};
 
EXPORT_SYMBOL(rproc_elf_find_loaded_rsc_table);