remoteproc: Drop dangling find_rsc_table dummies
As the core now deals with the lack of a resource table, remove the dangling custom dummy implementations of find_rsc_table from drivers. Reviewed-By: Loic Pallardy <loic.pallardy@st.com> Tested-By: Loic Pallardy <loic.pallardy@st.com> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
parent
58b6409067
commit
4f6fd5a037
|
@ -177,7 +177,6 @@ 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,
|
||||
};
|
||||
|
||||
|
|
|
@ -32,25 +32,6 @@
|
|||
|
||||
static BLOCKING_NOTIFIER_HEAD(ssr_notifiers);
|
||||
|
||||
/**
|
||||
* qcom_mdt_find_rsc_table() - provide dummy resource table for remoteproc
|
||||
* @rproc: remoteproc handle
|
||||
* @fw: firmware header
|
||||
* @tablesz: outgoing size of the table
|
||||
*
|
||||
* Returns a dummy table.
|
||||
*/
|
||||
struct resource_table *qcom_mdt_find_rsc_table(struct rproc *rproc,
|
||||
const struct firmware *fw,
|
||||
int *tablesz)
|
||||
{
|
||||
static struct resource_table table = { .ver = 1, };
|
||||
|
||||
*tablesz = sizeof(table);
|
||||
return &table;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(qcom_mdt_find_rsc_table);
|
||||
|
||||
static int glink_subdev_probe(struct rproc_subdev *subdev)
|
||||
{
|
||||
struct qcom_rproc_glink *glink = to_glink_subdev(subdev);
|
||||
|
|
|
@ -27,10 +27,6 @@ struct qcom_rproc_ssr {
|
|||
const char *name;
|
||||
};
|
||||
|
||||
struct resource_table *qcom_mdt_find_rsc_table(struct rproc *rproc,
|
||||
const struct firmware *fw,
|
||||
int *tablesz);
|
||||
|
||||
void qcom_add_glink_subdev(struct rproc *rproc, struct qcom_rproc_glink *glink);
|
||||
void qcom_remove_glink_subdev(struct rproc *rproc, struct qcom_rproc_glink *glink);
|
||||
|
||||
|
|
|
@ -303,16 +303,6 @@ static void q6v5_clk_disable(struct device *dev,
|
|||
clk_disable_unprepare(clks[i]);
|
||||
}
|
||||
|
||||
static struct resource_table *q6v5_find_rsc_table(struct rproc *rproc,
|
||||
const struct firmware *fw,
|
||||
int *tablesz)
|
||||
{
|
||||
static struct resource_table table = { .ver = 1, };
|
||||
|
||||
*tablesz = sizeof(table);
|
||||
return &table;
|
||||
}
|
||||
|
||||
static int q6v5_xfer_mem_ownership(struct q6v5 *qproc, int *current_perm,
|
||||
bool remote_owner, phys_addr_t addr,
|
||||
size_t size)
|
||||
|
@ -926,7 +916,6 @@ 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,
|
||||
};
|
||||
|
||||
|
|
|
@ -308,7 +308,6 @@ 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,
|
||||
};
|
||||
|
||||
|
|
|
@ -200,28 +200,10 @@ static void *slim_rproc_da_to_va(struct rproc *rproc, u64 da, int len)
|
|||
return va;
|
||||
}
|
||||
|
||||
/*
|
||||
* Firmware handler operations: sanity, boot address, load ...
|
||||
*/
|
||||
|
||||
static struct resource_table empty_rsc_tbl = {
|
||||
.ver = 1,
|
||||
.num = 0,
|
||||
};
|
||||
|
||||
static struct resource_table *slim_rproc_find_rsc_table(struct rproc *rproc,
|
||||
const struct firmware *fw,
|
||||
int *tablesz)
|
||||
{
|
||||
*tablesz = sizeof(empty_rsc_tbl);
|
||||
return &empty_rsc_tbl;
|
||||
}
|
||||
|
||||
static const struct rproc_ops slim_rproc_ops = {
|
||||
.start = slim_rproc_start,
|
||||
.stop = slim_rproc_stop,
|
||||
.da_to_va = slim_rproc_da_to_va,
|
||||
.find_rsc_table = slim_rproc_find_rsc_table,
|
||||
.get_boot_addr = rproc_elf_get_boot_addr,
|
||||
.load = rproc_elf_load_segments,
|
||||
.sanity_check = rproc_elf_sanity_check,
|
||||
|
|
|
@ -333,7 +333,6 @@ struct firmware;
|
|||
* @kick: kick a virtqueue (virtqueue id given as a parameter)
|
||||
* @da_to_va: optional platform hook to perform address translations
|
||||
* @load_rsc_table: load resource table from firmware image
|
||||
* @find_rsc_table: find the resource table inside the firmware image
|
||||
* @find_loaded_rsc_table: find the loaded resouce table
|
||||
* @load: load firmeware to memory, where the remote processor
|
||||
* expects to find it
|
||||
|
@ -346,9 +345,6 @@ struct rproc_ops {
|
|||
void (*kick)(struct rproc *rproc, int vqid);
|
||||
void * (*da_to_va)(struct rproc *rproc, u64 da, int len);
|
||||
int (*load_rsc_table)(struct rproc *rproc, const struct firmware *fw);
|
||||
struct resource_table *(*find_rsc_table)(struct rproc *rproc,
|
||||
const struct firmware *fw,
|
||||
int *tablesz);
|
||||
struct resource_table *(*find_loaded_rsc_table)(
|
||||
struct rproc *rproc, const struct firmware *fw);
|
||||
int (*load)(struct rproc *rproc, const struct firmware *fw);
|
||||
|
|
Loading…
Reference in a new issue