diff options
| -rw-r--r-- | drivers/remoteproc/qcom_adsp_pil.c | 1 | ||||
| -rw-r--r-- | drivers/remoteproc/qcom_common.c | 19 | ||||
| -rw-r--r-- | drivers/remoteproc/qcom_common.h | 4 | ||||
| -rw-r--r-- | drivers/remoteproc/qcom_q6v5_pil.c | 11 | ||||
| -rw-r--r-- | drivers/remoteproc/qcom_wcnss.c | 1 | ||||
| -rw-r--r-- | drivers/remoteproc/st_slim_rproc.c | 18 | ||||
| -rw-r--r-- | include/linux/remoteproc.h | 4 |
7 files changed, 0 insertions, 58 deletions
diff --git a/drivers/remoteproc/qcom_adsp_pil.c b/drivers/remoteproc/qcom_adsp_pil.c index 56156c12bd73..373c167892d7 100644 --- a/drivers/remoteproc/qcom_adsp_pil.c +++ b/drivers/remoteproc/qcom_adsp_pil.c | |||
| @@ -177,7 +177,6 @@ static const struct rproc_ops adsp_ops = { | |||
| 177 | .start = adsp_start, | 177 | .start = adsp_start, |
| 178 | .stop = adsp_stop, | 178 | .stop = adsp_stop, |
| 179 | .da_to_va = adsp_da_to_va, | 179 | .da_to_va = adsp_da_to_va, |
| 180 | .find_rsc_table = qcom_mdt_find_rsc_table, | ||
| 181 | .load = adsp_load, | 180 | .load = adsp_load, |
| 182 | }; | 181 | }; |
| 183 | 182 | ||
diff --git a/drivers/remoteproc/qcom_common.c b/drivers/remoteproc/qcom_common.c index d487040b528b..6eb9161f80b3 100644 --- a/drivers/remoteproc/qcom_common.c +++ b/drivers/remoteproc/qcom_common.c | |||
| @@ -32,25 +32,6 @@ | |||
| 32 | 32 | ||
| 33 | static BLOCKING_NOTIFIER_HEAD(ssr_notifiers); | 33 | static BLOCKING_NOTIFIER_HEAD(ssr_notifiers); |
| 34 | 34 | ||
| 35 | /** | ||
| 36 | * qcom_mdt_find_rsc_table() - provide dummy resource table for remoteproc | ||
| 37 | * @rproc: remoteproc handle | ||
| 38 | * @fw: firmware header | ||
| 39 | * @tablesz: outgoing size of the table | ||
| 40 | * | ||
| 41 | * Returns a dummy table. | ||
| 42 | */ | ||
| 43 | struct resource_table *qcom_mdt_find_rsc_table(struct rproc *rproc, | ||
| 44 | const struct firmware *fw, | ||
| 45 | int *tablesz) | ||
| 46 | { | ||
| 47 | static struct resource_table table = { .ver = 1, }; | ||
| 48 | |||
| 49 | *tablesz = sizeof(table); | ||
| 50 | return &table; | ||
| 51 | } | ||
| 52 | EXPORT_SYMBOL_GPL(qcom_mdt_find_rsc_table); | ||
| 53 | |||
| 54 | static int glink_subdev_probe(struct rproc_subdev *subdev) | 35 | static int glink_subdev_probe(struct rproc_subdev *subdev) |
| 55 | { | 36 | { |
| 56 | struct qcom_rproc_glink *glink = to_glink_subdev(subdev); | 37 | struct qcom_rproc_glink *glink = to_glink_subdev(subdev); |
diff --git a/drivers/remoteproc/qcom_common.h b/drivers/remoteproc/qcom_common.h index 832e20271664..728be9834d8b 100644 --- a/drivers/remoteproc/qcom_common.h +++ b/drivers/remoteproc/qcom_common.h | |||
| @@ -27,10 +27,6 @@ struct qcom_rproc_ssr { | |||
| 27 | const char *name; | 27 | const char *name; |
| 28 | }; | 28 | }; |
| 29 | 29 | ||
| 30 | struct resource_table *qcom_mdt_find_rsc_table(struct rproc *rproc, | ||
| 31 | const struct firmware *fw, | ||
| 32 | int *tablesz); | ||
| 33 | |||
| 34 | void qcom_add_glink_subdev(struct rproc *rproc, struct qcom_rproc_glink *glink); | 30 | void qcom_add_glink_subdev(struct rproc *rproc, struct qcom_rproc_glink *glink); |
| 35 | void qcom_remove_glink_subdev(struct rproc *rproc, struct qcom_rproc_glink *glink); | 31 | void qcom_remove_glink_subdev(struct rproc *rproc, struct qcom_rproc_glink *glink); |
| 36 | 32 | ||
diff --git a/drivers/remoteproc/qcom_q6v5_pil.c b/drivers/remoteproc/qcom_q6v5_pil.c index 3ea668d9fd4c..b4e5e725848d 100644 --- a/drivers/remoteproc/qcom_q6v5_pil.c +++ b/drivers/remoteproc/qcom_q6v5_pil.c | |||
| @@ -303,16 +303,6 @@ static void q6v5_clk_disable(struct device *dev, | |||
| 303 | clk_disable_unprepare(clks[i]); | 303 | clk_disable_unprepare(clks[i]); |
| 304 | } | 304 | } |
| 305 | 305 | ||
| 306 | static struct resource_table *q6v5_find_rsc_table(struct rproc *rproc, | ||
| 307 | const struct firmware *fw, | ||
| 308 | int *tablesz) | ||
| 309 | { | ||
| 310 | static struct resource_table table = { .ver = 1, }; | ||
| 311 | |||
| 312 | *tablesz = sizeof(table); | ||
| 313 | return &table; | ||
| 314 | } | ||
| 315 | |||
| 316 | static int q6v5_xfer_mem_ownership(struct q6v5 *qproc, int *current_perm, | 306 | static int q6v5_xfer_mem_ownership(struct q6v5 *qproc, int *current_perm, |
| 317 | bool remote_owner, phys_addr_t addr, | 307 | bool remote_owner, phys_addr_t addr, |
| 318 | size_t size) | 308 | size_t size) |
| @@ -926,7 +916,6 @@ static const struct rproc_ops q6v5_ops = { | |||
| 926 | .start = q6v5_start, | 916 | .start = q6v5_start, |
| 927 | .stop = q6v5_stop, | 917 | .stop = q6v5_stop, |
| 928 | .da_to_va = q6v5_da_to_va, | 918 | .da_to_va = q6v5_da_to_va, |
| 929 | .find_rsc_table = q6v5_find_rsc_table, | ||
| 930 | .load = q6v5_load, | 919 | .load = q6v5_load, |
| 931 | }; | 920 | }; |
| 932 | 921 | ||
diff --git a/drivers/remoteproc/qcom_wcnss.c b/drivers/remoteproc/qcom_wcnss.c index e53fc6f268fc..3f0609236a76 100644 --- a/drivers/remoteproc/qcom_wcnss.c +++ b/drivers/remoteproc/qcom_wcnss.c | |||
| @@ -308,7 +308,6 @@ static const struct rproc_ops wcnss_ops = { | |||
| 308 | .start = wcnss_start, | 308 | .start = wcnss_start, |
| 309 | .stop = wcnss_stop, | 309 | .stop = wcnss_stop, |
| 310 | .da_to_va = wcnss_da_to_va, | 310 | .da_to_va = wcnss_da_to_va, |
| 311 | .find_rsc_table = qcom_mdt_find_rsc_table, | ||
| 312 | .load = wcnss_load, | 311 | .load = wcnss_load, |
| 313 | }; | 312 | }; |
| 314 | 313 | ||
diff --git a/drivers/remoteproc/st_slim_rproc.c b/drivers/remoteproc/st_slim_rproc.c index 1bce63a06424..1ffb1f0c43d6 100644 --- a/drivers/remoteproc/st_slim_rproc.c +++ b/drivers/remoteproc/st_slim_rproc.c | |||
| @@ -200,28 +200,10 @@ static void *slim_rproc_da_to_va(struct rproc *rproc, u64 da, int len) | |||
| 200 | return va; | 200 | return va; |
| 201 | } | 201 | } |
| 202 | 202 | ||
| 203 | /* | ||
| 204 | * Firmware handler operations: sanity, boot address, load ... | ||
| 205 | */ | ||
| 206 | |||
| 207 | static struct resource_table empty_rsc_tbl = { | ||
| 208 | .ver = 1, | ||
| 209 | .num = 0, | ||
| 210 | }; | ||
| 211 | |||
| 212 | static struct resource_table *slim_rproc_find_rsc_table(struct rproc *rproc, | ||
| 213 | const struct firmware *fw, | ||
| 214 | int *tablesz) | ||
| 215 | { | ||
| 216 | *tablesz = sizeof(empty_rsc_tbl); | ||
| 217 | return &empty_rsc_tbl; | ||
| 218 | } | ||
| 219 | |||
| 220 | static const struct rproc_ops slim_rproc_ops = { | 203 | static const struct rproc_ops slim_rproc_ops = { |
| 221 | .start = slim_rproc_start, | 204 | .start = slim_rproc_start, |
| 222 | .stop = slim_rproc_stop, | 205 | .stop = slim_rproc_stop, |
| 223 | .da_to_va = slim_rproc_da_to_va, | 206 | .da_to_va = slim_rproc_da_to_va, |
| 224 | .find_rsc_table = slim_rproc_find_rsc_table, | ||
| 225 | .get_boot_addr = rproc_elf_get_boot_addr, | 207 | .get_boot_addr = rproc_elf_get_boot_addr, |
| 226 | .load = rproc_elf_load_segments, | 208 | .load = rproc_elf_load_segments, |
| 227 | .sanity_check = rproc_elf_sanity_check, | 209 | .sanity_check = rproc_elf_sanity_check, |
diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index cc853745e3a1..728d421fffe9 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h | |||
| @@ -333,7 +333,6 @@ struct firmware; | |||
| 333 | * @kick: kick a virtqueue (virtqueue id given as a parameter) | 333 | * @kick: kick a virtqueue (virtqueue id given as a parameter) |
| 334 | * @da_to_va: optional platform hook to perform address translations | 334 | * @da_to_va: optional platform hook to perform address translations |
| 335 | * @load_rsc_table: load resource table from firmware image | 335 | * @load_rsc_table: load resource table from firmware image |
| 336 | * @find_rsc_table: find the resource table inside the firmware image | ||
| 337 | * @find_loaded_rsc_table: find the loaded resouce table | 336 | * @find_loaded_rsc_table: find the loaded resouce table |
| 338 | * @load: load firmeware to memory, where the remote processor | 337 | * @load: load firmeware to memory, where the remote processor |
| 339 | * expects to find it | 338 | * expects to find it |
| @@ -346,9 +345,6 @@ struct rproc_ops { | |||
| 346 | void (*kick)(struct rproc *rproc, int vqid); | 345 | void (*kick)(struct rproc *rproc, int vqid); |
| 347 | void * (*da_to_va)(struct rproc *rproc, u64 da, int len); | 346 | void * (*da_to_va)(struct rproc *rproc, u64 da, int len); |
| 348 | int (*load_rsc_table)(struct rproc *rproc, const struct firmware *fw); | 347 | int (*load_rsc_table)(struct rproc *rproc, const struct firmware *fw); |
| 349 | struct resource_table *(*find_rsc_table)(struct rproc *rproc, | ||
| 350 | const struct firmware *fw, | ||
| 351 | int *tablesz); | ||
| 352 | struct resource_table *(*find_loaded_rsc_table)( | 348 | struct resource_table *(*find_loaded_rsc_table)( |
| 353 | struct rproc *rproc, const struct firmware *fw); | 349 | struct rproc *rproc, const struct firmware *fw); |
| 354 | int (*load)(struct rproc *rproc, const struct firmware *fw); | 350 | int (*load)(struct rproc *rproc, const struct firmware *fw); |
