Remoteproc cleanups
v2 cover Remoteproc cleanups
The first patch removes code that became unnecessary when the recovery flow was redesigned.
The following patches moves the assignment of cached_table to the resource table loader, rather than core code, which allows this to made optional and finally drops the various dummy resource tables provided by drivers.
Then finally the last patch ensures that table_ptr isn't left pointing into memory of a stopped remoteproc.
Bjorn Andersson (8):
remoteproc: Remove depricated crash completion
remoteproc: Cache resource table size
remoteproc: Clone rproc_ops in rproc_alloc()
remoteproc: Merge rproc_ops and rproc_fw_ops
remoteproc: Don't handle empty resource table
remoteproc: Move resource table load logic to find
remoteproc: Drop dangling find_rsc_table dummies
remoteproc: Reset table_ptr on stop
drivers/remoteproc/qcom_adsp_pil.c | 8 +-- drivers/remoteproc/qcom_common.c | 19 ------- drivers/remoteproc/qcom_common.h | 4 -- drivers/remoteproc/qcom_q6v5_pil.c | 18 +------ drivers/remoteproc/qcom_wcnss.c | 8 +-- drivers/remoteproc/remoteproc_core.c | 83 ++++++++++++------------------ drivers/remoteproc/remoteproc_elf_loader.c | 59 ++++++++++----------- drivers/remoteproc/remoteproc_internal.h | 57 +++++++------------- drivers/remoteproc/st_slim_rproc.c | 32 ++---------- include/linux/remoteproc.h | 21 ++++++-- 10 files changed, 106 insertions(+), 203 deletions(-)
Signature · 1 line
2.15.0
PATCH v2 1/8 remoteproc: Remove depricated crash completion
The crash handling now happens in a single execution context, so there's no longer a need for a completion to synchronize this.
---
Changes since v1:
- None
drivers/remoteproc/remoteproc_core.c | 10 ---------- include/linux/remoteproc.h | 2 -- 2 files changed, 12 deletions(-)
drivers/remoteproc/remoteproc_core.c +0 -10
@@ -1028,10 +1028,6 @@ static int rproc_stop(struct rproc *rproc)return ret; } -/* if in crash state, unlock crash handler */ -if (rproc->state ==RPROC_CRASHED ) -complete_all (&rproc->crash_comp); - rproc->state =RPROC_OFFLINE ;dev_info (dev,"stopped remote processor %s\n" , rproc->name);
@@ -1057,8 +1053,6 @@ int rproc_trigger_recovery(struct rproc *rproc)dev_err (dev,"recovering %s\n" , rproc->name); -init_completion (&rproc->crash_comp); - ret =mutex_lock_interruptible (&rproc->lock);if (ret)return ret;
@@ -1067,9 +1061,6 @@ int rproc_trigger_recovery(struct rproc *rproc)if (ret) goto unlock_mutex; -/* wait until there is no more rproc users */ -wait_for_completion (&rproc->crash_comp); -/* load firmware */ ret =request_firmware (&firmware_p, rproc->firmware, dev);if (ret <0 ) {
@@ -1459,7 +1450,6 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,INIT_LIST_HEAD (&rproc->subdevs);INIT_WORK (&rproc->crash_handler, rproc_crash_handler_work); -init_completion (&rproc->crash_comp); rproc->state =RPROC_OFFLINE ;
include/linux/remoteproc.h +0 -2
@@ -406,7 +406,6 @@ enum rproc_crash_type {* @index: index of this rproc device * @crash_handler: workqueue for handling a crash * @crash_cnt: crash counter -* @crash_comp: completion used to sync crash handler and the rproc reload * @recovery_disabled: flag that state if recovery was disabled * @max_notifyid: largest allocated notify id. * @table_ptr: pointer to the resource table in effect
@@ -437,7 +436,6 @@ struct rproc {int index;struct work_struct crash_handler;unsigned int crash_cnt; -struct completion crash_comp;bool recovery_disabled;int max_notifyid;struct resource_table *table_ptr;
Signature · 1 line
2.15.0
PATCH v2 2/8 remoteproc: Cache resource table size
In reply to Bjorn AnderssonWe don't re-read the resource table during a recovery, so it is possible in the recovery path that the resource table has a different size than cached_table. Store the original size of cached_table to avoid these getting out of sync.
---
Changes since v1:
- None
drivers/remoteproc/remoteproc_core.c | 20 +++++++------------- include/linux/remoteproc.h | 2 ++ 2 files changed, 9 insertions(+), 13 deletions(-)
drivers/remoteproc/remoteproc_core.c +7 -13
@@ -732,7 +732,7 @@ static rproc_handle_resource_t rproc_loading_handlers[RSC_LAST] = { };/* handle firmware resource entries before booting the remote processor */ -static int rproc_handle_resources (struct rproc *rproc,int len, +static int rproc_handle_resources (struct rproc *rproc,rproc_handle_resource_t handlers[RSC_LAST ]) {struct device *dev = &rproc->dev;
@@ -742,7 +742,7 @@ static int rproc_handle_resources(struct rproc *rproc, int len,for (i =0 ; i < rproc->table_ptr->num; i++) {int offset = rproc->table_ptr->offset[i];struct fw_rsc_hdr *hdr = (void *)rproc->table_ptr + offset; -int avail = len - offset -sizeof (*hdr); +int avail = rproc->table_sz - offset -sizeof (*hdr);void *rsc = (void *)hdr +sizeof (*hdr);/* make sure table isn't truncated */
@@ -849,16 +849,9 @@ static void rproc_resource_cleanup(struct rproc *rproc)static int rproc_start (struct rproc *rproc,const struct firmware *fw) { -struct resource_table *table, *loaded_table; +struct resource_table *loaded_table;struct device *dev = &rproc->dev; -int ret, tablesz; - -/* look for the resource table */ - table =rproc_find_rsc_table (rproc, fw, &tablesz); -if (!table) { -dev_err (dev,"Resource table look up failed\n" ); -return -EINVAL ; - } +int ret;/* load the ELF segments to memory */ ret =rproc_load_segments (rproc, fw);
@@ -877,7 +870,7 @@ static int rproc_start(struct rproc *rproc, const struct firmware *fw)*/ loaded_table =rproc_find_loaded_rsc_table (rproc, fw);if (loaded_table) { -memcpy (loaded_table, rproc->cached_table, tablesz); +memcpy (loaded_table, rproc->cached_table, rproc->table_sz); rproc->table_ptr = loaded_table; }
@@ -951,12 +944,13 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw) goto clean_up; rproc->table_ptr = rproc->cached_table; + rproc->table_sz = tablesz;/* reset max_notifyid */ rproc->max_notifyid =-1 ;/* handle fw resources which are required to boot rproc */ - ret =rproc_handle_resources (rproc, tablesz, rproc_loading_handlers); + ret =rproc_handle_resources (rproc, rproc_loading_handlers);if (ret) {dev_err (dev,"Failed to process resources: %d\n" , ret); goto clean_up_resources;
include/linux/remoteproc.h +2 -0
@@ -410,6 +410,7 @@ enum rproc_crash_type {* @max_notifyid: largest allocated notify id. * @table_ptr: pointer to the resource table in effect * @cached_table: copy of the resource table +* @table_sz: size of @cached_table * @has_iommu: flag to indicate if remote processor is behind an MMU */ struct rproc {
@@ -440,6 +441,7 @@ struct rproc {int max_notifyid;struct resource_table *table_ptr;struct resource_table *cached_table; +size_t table_sz;bool has_iommu;bool auto_boot; };
Signature · 1 line
2.15.0
PATCH v2 3/8 remoteproc: Clone rproc_ops in rproc_alloc()
In reply to Bjorn AnderssonIn order to allow rproc_alloc() to, in a future patch, update entries in the "ops" struct we need to make a local copy of it.
---
Changes since v1:
- None
drivers/remoteproc/remoteproc_core.c | 9 ++++++++- include/linux/remoteproc.h | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-)
drivers/remoteproc/remoteproc_core.c +8 -1
@@ -1342,6 +1342,7 @@ static void rproc_type_release(struct device *dev)ida_simple_remove (&rproc_dev_index, rproc->index);kfree (rproc->firmware); +kfree (rproc->ops);kfree (rproc); }
@@ -1406,9 +1407,15 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,return NULL ; } + rproc->ops =kmemdup (ops,sizeof (*ops),GFP_KERNEL ); +if (!rproc->ops) { +kfree (p); +kfree (rproc); +return NULL ; + } + rproc->firmware = p; rproc->name = name; - rproc->ops = ops; rproc->priv = &rproc[1 ]; rproc->auto_boot = true;
include/linux/remoteproc.h +1 -1
@@ -419,7 +419,7 @@ struct rproc {const char *name;char *firmware;void *priv; -const struct rproc_ops *ops; +struct rproc_ops *ops;struct device dev;const struct rproc_fw_ops *fw_ops;atomic_t power;
Signature · 1 line
2.15.0
PATCH v2 4/8 remoteproc: Merge rproc_ops and rproc_fw_ops
In reply to Bjorn AnderssonThere 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.
---
Changes since v1:
- Fill load, sanity_check and get_boot_addr for st_slim
drivers/remoteproc/qcom_adsp_pil.c | 9 ++---- drivers/remoteproc/qcom_q6v5_pil.c | 9 ++---- drivers/remoteproc/qcom_wcnss.c | 9 ++---- drivers/remoteproc/remoteproc_core.c | 10 ++++-- drivers/remoteproc/remoteproc_elf_loader.c | 30 +++++++----------- drivers/remoteproc/remoteproc_internal.h | 51 +++++++++++------------------- drivers/remoteproc/st_slim_rproc.c | 22 ++++--------- include/linux/remoteproc.h | 17 ++++++++-- 8 files changed, 67 insertions(+), 90 deletions(-)
drivers/remoteproc/qcom_adsp_pil.c +2 -7
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,9 +282,9 @@ 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, -int *tablesz) +struct resource_table *rproc_elf_find_rsc_table (struct rproc *rproc, +const struct firmware *fw, +int *tablesz) {struct elf32_hdr *ehdr;struct elf32_shdr *shdr;
@@ -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);
drivers/remoteproc/remoteproc_internal.h +19 -32
92 lines not on this page · raw message
drivers/remoteproc/st_slim_rproc.c +7 -15
@@ -200,12 +200,6 @@ static void *slim_rproc_da_to_va(struct rproc *rproc, u64 da, int len)return va; } -static const struct rproc_ops slim_rproc_ops = { - .start = slim_rproc_start, - .stop = slim_rproc_stop, - .da_to_va = slim_rproc_da_to_va, -}; -/* * Firmware handler operations: sanity, boot address, load ... */
@@ -223,8 +217,14 @@ static struct resource_table *slim_rproc_find_rsc_table(struct rproc *rproc,return &empty_rsc_tbl; } -static struct rproc_fw_ops slim_rproc_fw_ops = { +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, };/**
@@ -249,7 +249,6 @@ struct st_slim_rproc *st_slim_rproc_alloc(struct platform_device *pdev,struct rproc *rproc;struct resource *res;int err, i; -const struct rproc_fw_ops *elf_ops;if (!fw_name)return ERR_PTR (-EINVAL );
@@ -267,13 +266,6 @@ struct st_slim_rproc *st_slim_rproc_alloc(struct platform_device *pdev, slim_rproc = rproc->priv; slim_rproc->rproc = rproc; - elf_ops = rproc->fw_ops; -/* Use some generic elf ops */ - slim_rproc_fw_ops.load = elf_ops->load; - slim_rproc_fw_ops.sanity_check = elf_ops->sanity_check; - - rproc->fw_ops = &slim_rproc_fw_ops; -/* get imem and dmem */ for (i =0 ; i <ARRAY_SIZE (mem_names); i++) { res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
include/linux/remoteproc.h +15 -2
@@ -324,6 +324,7 @@ struct rproc_mem_entry { };struct rproc ; +struct firmware ;/** * struct rproc_ops - platform-specific device handlers
@@ -331,12 +332,26 @@ struct rproc;* @stop: power off the device * @kick: kick a virtqueue (virtqueue id given as a parameter) * @da_to_va: optional platform hook to perform address translations +* @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 +* @sanity_check: sanity check the fw image +* @get_boot_addr: get boot address to entry point specified in firmware */ struct rproc_ops {int (*start)(struct rproc *rproc);int (*stop)(struct rproc *rproc);void (*kick)(struct rproc *rproc,int vqid);void * (*da_to_va)(struct rproc *rproc,u64 da,int len); +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); +int (*sanity_check)(struct rproc *rproc,const struct firmware *fw); +u32 (*get_boot_addr)(struct rproc *rproc,const struct firmware *fw); };/**
@@ -390,7 +405,6 @@ enum rproc_crash_type {* @priv: private data which belongs to the platform-specific rproc module * @ops: platform-specific start/stop rproc handlers * @dev: virtual device for refcounting and common remoteproc behavior -* @fw_ops: firmware-specific handlers * @power: refcount of users who need this rproc powered up * @state: state of the device * @lock: lock which protects concurrent manipulations of the rproc
@@ -421,7 +435,6 @@ struct rproc {void *priv;struct rproc_ops *ops;struct device dev; -const struct rproc_fw_ops *fw_ops;atomic_t power;unsigned int state;struct mutex lock;
Signature · 1 line
2.15.0
RE: [PATCH v2 4/8] remoteproc: Merge rproc_ops and rproc_fw_ops
Quoted 159 lines
-----Original Message-----
From: Bjorn Andersson [mailto:[email protected]]
Sent: Saturday, January 06, 2018 12:58 AM
To: Ohad Ben-Cohen <[email protected]>; Bjorn Andersson <[email protected]>
Cc: [email protected]; [email protected]; Loic PALLARDY <[email protected]>
Subject: [PATCH v2 4/8] remoteproc: Mergerproc_opsandrproc_fw_opsThere are currently a few different schemes used for overriding
fw_opsor parts offw_ops. Mergefw_opsintorproc_opsand 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.
Signed-off-by Bjorn Andersson <[email protected]>---
Changes since v1:
- Fill load,sanity_checkandget_boot_addrforst_slimdrivers/remoteproc/qcom_adsp_pil.c | 9 ++---- drivers/remoteproc/qcom_q6v5_pil.c | 9 ++---- drivers/remoteproc/qcom_wcnss.c | 9 ++---- drivers/remoteproc/remoteproc_core.c | 10 ++++-- drivers/remoteproc/remoteproc_elf_loader.c | 30 +++++++----------- drivers/remoteproc/remoteproc_internal.h | 51 +++++++++++--------------- ---- drivers/remoteproc/st_slim_rproc.c | 22 ++++--------- include/linux/remoteproc.h | 17 ++++++++-- 8 files changed, 67 insertions(+), 90 deletions(-)drivers/remoteproc/qcom_adsp_pil.c +0
-5@@ -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){
drivers/remoteproc/qcom_adsp_pil.c +2
-2struct 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 +0
-5@@ -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) {drivers/remoteproc/qcom_q6v5_pil.c +2
-2unsigned 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;drivers/remoteproc/qcom_q6v5_pil.c +0
-0qproc->rproc = rproc;drivers/remoteproc/qcom_wcnss.c +0
-5@@ -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){
drivers/remoteproc/qcom_wcnss.c +2
-2u32 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 +0
-2@@ -1437,8 +1437,14 @@ struct rproc *rproc_alloc(struct device *dev, constchar *name, atomic_set(&rproc->power, 0); -/* Set ELF as the default fw_ops handler */ - rproc->fw_ops = &rproc_elf_fw_ops;
drivers/remoteproc/remoteproc_core.c struct rproc *rproc_alloc(struct device *dev, const · line 1450
Quoted 10 lines
drivers/remoteproc/remoteproc_core.c +8
-0+/* 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; + }
Hi Bjorn,
Code looks good. I'll tested by end of the week, when I'll be back to the office.
Regards,
Loic
Quoted 350 lines
drivers/remoteproc/remoteproc_core.c +0
-0mutex_init (&rproc->lock);drivers/remoteproc/remoteproc_elf_loader.c +2
-2@@ -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.drivers/remoteproc/remoteproc_elf_loader.c +1
-1@@ -110,13 +110,13 @@ rproc_elf_sanity_check(struct rproc *rproc, conststruct 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 memorydrivers/remoteproc/remoteproc_elf_loader.c +1
-2@@ -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) {drivers/remoteproc/remoteproc_elf_loader.c +1
-0struct 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)drivers/remoteproc/remoteproc_elf_loader.c +3
-3@@ -282,9 +282,9 @@ 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, -int *tablesz) +struct resource_table *rproc_elf_find_rsc_table (struct rproc *rproc, +const struct firmware *fw, +int *tablesz) {struct elf32_hdr *ehdr;drivers/remoteproc/remoteproc_elf_loader.c +1
-0struct elf32_shdr *shdr;@@ -303,6 +303,7 @@ rproc_elf_find_rsc_table(struct rproc *rproc, conststruct firmware *fw, return table; } +EXPORT_SYMBOL (rproc_elf_find_rsc_table);/** *
rproc_elf_find_loaded_rsc_table()- find the loaded resource tabledrivers/remoteproc/remoteproc_elf_loader.c +2
-2@@ -315,8 +316,8 @@ rproc_elf_find_rsc_table(struct rproc *rproc, conststruct 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)
{drivers/remoteproc/remoteproc_elf_loader.c +1
-8struct 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);drivers/remoteproc/remoteproc_internal.h +0
-5@@ -25,26 +25,6 @@struct rproc ; -/** -* struct rproc_fw_ops - firmware format specific operations. -* @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
- * @sanity_check: sanity check the fw image
- * @get_boot_addr: get boot address to entry point specified in firmware
- */drivers/remoteproc/remoteproc_internal.h +0
-6-struct rproc_fw_ops { -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);
drivers/remoteproc/remoteproc_internal.h +0
-3-int (*load)(struct rproc *rproc,const struct firmware *fw); -int (*sanity_check)(struct rproc *rproc,const struct firmware *fw); - u32 (*get_boot_addr)(struct rproc *rproc, const struct firmware*fw);
drivers/remoteproc/remoteproc_internal.h +13
-6-}; -/* from remoteproc_core.c */ void rproc_release (struct kref *kref);irqreturn_t rproc_vq_interrupt (struct rproc *rproc,int vq_id);@@ -74,11 +54,20 @@ int rproc_alloc_vring(struct rproc_vdev *rvdev, int i);void *rproc_da_to_va (struct rproc *rproc,u64 da,int len);int rproc_trigger_recovery (struct rproc *rproc); +int rproc_elf_sanity_check (struct rproc *rproc,const struct firmware *fw); +u32 rproc_elf_get_boot_addr (struct rproc *rproc,const struct firmware *fw); +int rproc_elf_load_segments (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 resource_table *rproc_elf_find_loaded_rsc_table (struct rproc *rproc, +const struct firmware *fw); +static inline int rproc_fw_sanity_check (struct rproc *rproc,const struct firmware *fw) { -if (rproc->fw_ops->sanity_check) -return rproc->fw_ops->sanity_check (rproc, fw); +if (rproc->ops->sanity_check) +return rproc->ops->sanity_check (rproc, fw);return 0 ; }@@ -86,8 +75,8 @@ int rproc_fw_sanity_check(struct rproc *rproc, const struct firmware *fw)static inline u32 rproc_get_boot_addr (struct rproc *rproc,const struct firmware *fw) { -if (rproc->fw_ops->get_boot_addr) -return rproc->fw_ops->get_boot_addr (rproc, fw); +if (rproc->ops->get_boot_addr) +return rproc->ops->get_boot_addr (rproc, fw);return 0 ;}
drivers/remoteproc/remoteproc_internal.h +2
-2@@ -95,8 +84,8 @@ u32 rproc_get_boot_addr(struct rproc *rproc, const struct firmware *fw)static inline int rproc_load_segments (struct rproc *rproc,const struct firmware *fw) { -if (rproc->fw_ops->load) -return rproc->fw_ops->load (rproc, fw); +if (rproc->ops->load) +return rproc->ops->load (rproc, fw);return -EINVAL ;}
drivers/remoteproc/remoteproc_internal.h +2
-2@@ -106,8 +95,8 @@ struct resource_table *rproc_find_rsc_table(structrproc *rproc, const struct firmware *fw, int *tablesz) { - if (rproc->fw_ops->find_rsc_table) - return rproc->fw_ops->find_rsc_table(rproc, fw, tablesz); + if (rproc->ops->find_rsc_table) + return rproc->ops->find_rsc_table(rproc, fw, tablesz);return NULL ;}
drivers/remoteproc/remoteproc_internal.h +2
-4@@ -116,12 +105,10 @@ static inlinestruct resource_table *rproc_find_loaded_rsc_table (struct rproc *rproc,const struct firmware *fw) { -if (rproc->fw_ops->find_loaded_rsc_table) -return rproc->fw_ops->find_loaded_rsc_table (rproc, fw); +if (rproc->ops->find_loaded_rsc_table) +return rproc->ops->find_loaded_rsc_table (rproc, fw);return NULL ; } -extern const struct rproc_fw_ops rproc_elf_fw_ops; -#endif /* REMOTEPROC_INTERNAL_H */ drivers/remoteproc/st_slim_rproc.c +0
-6@@ -200,12 +200,6 @@ static void *slim_rproc_da_to_va(struct rproc *rproc, u64 da, int len)return va; } -static const struct rproc_ops slim_rproc_ops = { - .start = slim_rproc_start, - .stop = slim_rproc_stop, - .da_to_va = slim_rproc_da_to_va, -}; -/* * Firmware handler operations: sanity, boot address, load ... */
drivers/remoteproc/st_slim_rproc.c +7
-1@@ -223,8 +217,14 @@ static struct resource_table *slim_rproc_find_rsc_table(struct rproc *rproc, return &empty_rsc_tbl; } -static struct rproc_fw_ops slim_rproc_fw_ops = { +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, };/**
drivers/remoteproc/st_slim_rproc.c +0
-1@@ -249,7 +249,6 @@ struct st_slim_rproc *st_slim_rproc_alloc(structplatform_device *pdev, struct rproc *rproc;struct resource *res;int err, i; -const struct rproc_fw_ops *elf_ops;if (!fw_name)drivers/remoteproc/st_slim_rproc.c +0
-7return ERR_PTR (-EINVAL );@@ -267,13 +266,6 @@ struct st_slim_rproc *st_slim_rproc_alloc(structplatform_device *pdev, slim_rproc = rproc->priv; slim_rproc->rproc = rproc; - elf_ops = rproc->fw_ops; -/* Use some generic elf ops */ - slim_rproc_fw_ops.load = elf_ops->load; - slim_rproc_fw_ops.sanity_check = elf_ops->sanity_check; - - rproc->fw_ops = &slim_rproc_fw_ops; -/* get imem and dmem */ for (i =0 ; i <ARRAY_SIZE (mem_names); i++) {res = platform_get_resource_byname(pdev,
IORESOURCE_MEM,include/linux/remoteproc.h +4
-0@@ -324,6 +324,7 @@ struct rproc_mem_entry { };struct rproc ; +struct firmware ;/** * struct rproc_ops - platform-specific device handlers @@ -331,12 +332,26 @@ struct rproc;* @stop: power off the device * @kick: kick a virtqueue (virtqueue id given as a parameter) * @da_to_va: optional platform hook to perform address translations +* @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
+ * @sanity_check: sanity check the fw image
+ * @get_boot_addr: get boot address to entry point specified in firmware
*/
structrproc_ops{include/linux/remoteproc.h +5
-0int (*start)(struct rproc *rproc);int (*stop)(struct rproc *rproc);void (*kick)(struct rproc *rproc,int vqid);void * (*da_to_va)(struct rproc *rproc,u64 da,int len); +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);
include/linux/remoteproc.h +3
-0+int (*load)(struct rproc *rproc,const struct firmware *fw); +int (*sanity_check)(struct rproc *rproc,const struct firmware *fw); + u32 (*get_boot_addr)(struct rproc *rproc, const struct firmware*fw);
};/**
include/linux/remoteproc.h +0
-3@@ -390,7 +405,6 @@ enum rproc_crash_type {* @priv: private data which belongs to the platform-specific rproc module * @ops: platform-specific start/stop rproc handlers * @dev: virtual device for refcounting and common remoteproc behavior -* @fw_ops: firmware-specific handlers * @power: refcount of users who need this rproc powered up * @state: state of the device * @lock: lock which protects concurrent manipulations of the rproc @@ -421,7 +435,6 @@ struct rproc {void *priv;struct rproc_ops *ops;struct device dev; -const struct rproc_fw_ops *fw_ops;atomic_t power;unsigned int state;struct mutex lock; --2.15.0
PATCH v2 5/8 remoteproc: Don't handle empty resource table
In reply to Bjorn AnderssonAllow a NULL table_ptr to have the same meaning as a table with 0 entries, allowing a subsequent patch to skip the assignment step.
A few other places in the implementation does dereference table_ptr, but they are currently all coming from rproc_handle_resources().
---
Changes since v1:
- None
drivers/remoteproc/remoteproc_core.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/remoteproc/remoteproc_core.c +3 -0
@@ -739,6 +739,9 @@ static int rproc_handle_resources(struct rproc *rproc,rproc_handle_resource_t handler;int ret =0 , i; +if (!rproc->table_ptr) +return 0 ; +for (i =0 ; i < rproc->table_ptr->num; i++) {int offset = rproc->table_ptr->offset[i];struct fw_rsc_hdr *hdr = (void *)rproc->table_ptr + offset;
Signature · 1 line
2.15.0
PATCH v2 6/8 remoteproc: Move resource table load logic to find
In reply to Bjorn AnderssonExtend the previous operation of finding the resource table in the ELF with the extra step of populating the rproc struct with a copy and the size. This allows drivers to override the mechanism used for acquiring the resource table, or omit it for firmware that is known not to have a resource table.
This leaves the custom, dummy, find_rsc_table implementations found in some drivers dangling.
---
Changes since v1:
- None
drivers/remoteproc/remoteproc_core.c | 32 ++++++-------------------- drivers/remoteproc/remoteproc_elf_loader.c | 37 ++++++++++++++++++------------ drivers/remoteproc/remoteproc_internal.h | 16 +++++-------- include/linux/remoteproc.h | 2 ++ 4 files changed, 37 insertions(+), 50 deletions(-)
drivers/remoteproc/remoteproc_core.c +7 -25
@@ -907,8 +907,7 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw) {struct device *dev = &rproc->dev;const char *name = rproc->firmware; -struct resource_table *table; -int ret, tablesz; +int ret; ret =rproc_fw_sanity_check (rproc, fw);if (ret)
@@ -927,27 +926,11 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw) } rproc->bootaddr =rproc_get_boot_addr (rproc, fw); - ret = -EINVAL ; - -/* look for the resource table */ - table =rproc_find_rsc_table (rproc, fw, &tablesz); -if (!table) { -dev_err (dev,"Failed to find resource table\n" ); - goto clean_up; - } - -/* -* Create a copy of the resource table. When a virtio device starts -* and calls vring_new_virtqueue() the address of the allocated vring -* will be stored in the cached_table. Before the device is started, -* cached_table will be copied into device memory. -*/ - rproc->cached_table =kmemdup (table, tablesz,GFP_KERNEL ); -if (!rproc->cached_table) - goto clean_up; - rproc->table_ptr = rproc->cached_table; - rproc->table_sz = tablesz; +/* load resource table */ + ret =rproc_load_rsc_table (rproc, fw); +if (ret) + goto disable_iommu;/* reset max_notifyid */ rproc->max_notifyid =-1 ;
@@ -967,11 +950,10 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw) clean_up_resources:rproc_resource_cleanup (rproc); -clean_up:kfree (rproc->cached_table); rproc->cached_table =NULL ; rproc->table_ptr =NULL ; - +disable_iommu:rproc_disable_iommu (rproc);return ret; }
@@ -1443,7 +1425,7 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,/* 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->load_rsc_table = rproc_elf_load_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;
drivers/remoteproc/remoteproc_elf_loader.c +22 -15
@@ -268,42 +268,49 @@ find_table(struct device *dev, struct elf32_hdr *ehdr, size_t fw_size) }/** -* rproc_elf_find_rsc_table() - find the resource table +* rproc_elf_load_rsc_table() - load the resource table * @rproc: the rproc handle * @fw: the ELF firmware image -* @tablesz: place holder for providing back the table size * * This function finds the resource table inside the remote processor's -* firmware. It is used both upon the registration of @rproc (in order -* to look for and register the supported virito devices), and when the -* @rproc is booted. +* firmware, load it into the @cached_table and update @table_ptr. * -* Returns the pointer to the resource table if it is found, and write its -* size into @tablesz. If a valid table isn't found, NULL is returned -* (and @tablesz isn't set). +* Return: 0 on success, negative errno on failure. */ -struct resource_table *rproc_elf_find_rsc_table (struct rproc *rproc, -const struct firmware *fw, -int *tablesz) +int rproc_elf_load_rsc_table (struct rproc *rproc,const struct firmware *fw) {struct elf32_hdr *ehdr;struct elf32_shdr *shdr;struct device *dev = &rproc->dev;struct resource_table *table =NULL ;const u8 *elf_data = fw->data; +size_t tablesz; ehdr = (struct elf32_hdr *)elf_data; shdr =find_table (dev, ehdr, fw->size);if (!shdr) -return NULL ; +return -EINVAL ; table = (struct resource_table *)(elf_data + shdr->sh_offset); - *tablesz = shdr->sh_size; + tablesz = shdr->sh_size; + +/* +* Create a copy of the resource table. When a virtio device starts +* and calls vring_new_virtqueue() the address of the allocated vring +* will be stored in the cached_table. Before the device is started, +* cached_table will be copied into device memory. +*/ + rproc->cached_table =kmemdup (table, tablesz,GFP_KERNEL ); +if (!rproc->cached_table) +return -ENOMEM ; -return table; + rproc->table_ptr = rproc->cached_table; + rproc->table_sz = tablesz; + +return 0 ; } -EXPORT_SYMBOL (rproc_elf_find_rsc_table); +EXPORT_SYMBOL (rproc_elf_load_rsc_table);/** * rproc_elf_find_loaded_rsc_table() - find the loaded resource table
drivers/remoteproc/remoteproc_internal.h +6 -10
@@ -57,9 +57,7 @@ int rproc_trigger_recovery(struct rproc *rproc);int rproc_elf_sanity_check (struct rproc *rproc,const struct firmware *fw);u32 rproc_elf_get_boot_addr (struct rproc *rproc,const struct firmware *fw);int rproc_elf_load_segments (struct rproc *rproc,const struct firmware *fw); -struct resource_table *rproc_elf_find_rsc_table (struct rproc *rproc, -const struct firmware *fw, -int *tablesz); +int rproc_elf_load_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);
@@ -90,15 +88,13 @@ int rproc_load_segments(struct rproc *rproc, const struct firmware *fw)return -EINVAL ; } -static inline -struct resource_table *rproc_find_rsc_table (struct rproc *rproc, -const struct firmware *fw, -int *tablesz) +static inline int rproc_load_rsc_table (struct rproc *rproc, +const struct firmware *fw) { -if (rproc->ops->find_rsc_table) -return rproc->ops->find_rsc_table (rproc, fw, tablesz); +if (rproc->ops->load_rsc_table) +return rproc->ops->load_rsc_table (rproc, fw); -return NULL ; +return 0 ; } static inline
include/linux/remoteproc.h +2 -0
@@ -332,6 +332,7 @@ struct firmware;* @stop: power off the device * @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
@@ -344,6 +345,7 @@ struct rproc_ops {int (*stop)(struct rproc *rproc);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);
Signature · 1 line
2.15.0
PATCH v2 7/8 remoteproc: Drop dangling find_rsc_table dummies
In reply to Bjorn AnderssonAs the core now deals with the lack of a resource table, remove the dangling custom dummy implementations of find_rsc_table from drivers.
---
Changes since v1:
- None
drivers/remoteproc/qcom_adsp_pil.c | 1 - drivers/remoteproc/qcom_common.c | 19 ------------------- drivers/remoteproc/qcom_common.h | 4 ---- drivers/remoteproc/qcom_q6v5_pil.c | 11 ----------- drivers/remoteproc/qcom_wcnss.c | 1 - drivers/remoteproc/st_slim_rproc.c | 18 ------------------ include/linux/remoteproc.h | 4 ---- 7 files changed, 58 deletions(-)
drivers/remoteproc/qcom_adsp_pil.c +0 -1
@@ -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, };
drivers/remoteproc/qcom_common.c +0 -19
@@ -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);
drivers/remoteproc/qcom_common.h +0 -4
@@ -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);
drivers/remoteproc/qcom_q6v5_pil.c +0 -11
@@ -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, };
drivers/remoteproc/qcom_wcnss.c +0 -1
@@ -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, };
drivers/remoteproc/st_slim_rproc.c +0 -18
@@ -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,
include/linux/remoteproc.h +0 -4
@@ -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);
Signature · 1 line
2.15.0
PATCH v2 8/8 remoteproc: Reset table_ptr on stop
In reply to Bjorn AnderssonThe installed resource table is no longer accessible after stopping the remote, so update table_ptr to point to the local copy.
---
Changes since v1:
- None
drivers/remoteproc/remoteproc_core.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/remoteproc/remoteproc_core.c +3 -0
@@ -1000,6 +1000,9 @@ static int rproc_stop(struct rproc *rproc)/* remove any subdevices for the remote processor */ rproc_remove_subdevices (rproc); +/* the installed resource table is no longer accessible */ + rproc->table_ptr = rproc->cached_table; +/* power off the remote processor */ ret = rproc->ops->stop (rproc);if (ret) {
Signature · 1 line
2.15.0
Quoted 15 lines
-----Original Message-----
From: Bjorn Andersson [mailto:[email protected]]
Sent: Saturday, January 06, 2018 12:58 AM
To: Ohad Ben-Cohen <[email protected]>; Bjorn Andersson <[email protected]>
Cc: [email protected]; [email protected]; Loic PALLARDY <[email protected]>
Subject: [PATCH v2 0/8] Remoteproc cleanupsThe first patch removes code that became unnecessary when the recovery flow was
redesigned.
Quoted 7 lines
The following patches moves the assignment of
cached_tableto the resource
table loader, rather than core code, which allows this to made optional and finally drops the various dummy resource tables provided by drivers.Then finally the last patch ensures that
table_ptrisn't left pointing into memory of a stopped remoteproc.
I have tested this series on B2260 96Board for st-slim remote processor support.
Regards,
Loic
Quoted 26 lines
Bjorn Andersson (8):
remoteproc: Remove depricated crash completion
remoteproc: Cache resource table size
remoteproc: Clonerproc_opsinrproc_alloc()
remoteproc: Mergerproc_opsandrproc_fw_ops
remoteproc: Don't handle empty resource table
remoteproc: Move resource table load logic to find
remoteproc: Drop danglingfind_rsc_tabledummies
remoteproc: Resettable_ptron stopdrivers/remoteproc/qcom_adsp_pil.c | 8 +-- drivers/remoteproc/qcom_common.c | 19 ------- drivers/remoteproc/qcom_common.h | 4 -- drivers/remoteproc/qcom_q6v5_pil.c | 18 +------ drivers/remoteproc/qcom_wcnss.c | 8 +-- drivers/remoteproc/remoteproc_core.c | 83 ++++++++++++--------------- --- drivers/remoteproc/remoteproc_elf_loader.c | 59 ++++++++++----------- drivers/remoteproc/remoteproc_internal.h | 57 +++++++------------- drivers/remoteproc/st_slim_rproc.c | 32 ++---------- include/linux/remoteproc.h | 21 ++++++-- 10 files changed, 106 insertions(+), 203 deletions(-)--
2.15.0
Quoted 20 lines · Loic PALLARDY
Quoted 20 lines
-----Original Message-----
From: Bjorn Andersson [mailto:[email protected]]
Sent: Saturday, January 06, 2018 12:58 AM
To: Ohad Ben-Cohen <[email protected]>; Bjorn Andersson <[email protected]>
Cc: [email protected]; [email protected]; Loic PALLARDY <[email protected]>
Subject: [PATCH v2 0/8] Remoteproc cleanupsThe first patch removes code that became unnecessary when the recovery flow was
redesigned.The following patches moves the assignment of
cached_tableto the resource
table loader, rather than core code, which allows this to made optional and finally drops the various dummy resource tables provided by drivers.
Quoted 8 lines
Quoted 2 lines
Then finally the last patch ensures that
table_ptrisn't left pointing into memory of a stopped remoteproc.I have tested this series on B2260 96Board for st-slim remote processor support.
Reviewed-by Loic Pallardy <[email protected]>Tested-by Loic Pallardy <[email protected]>
Thanks Loic, very much appreciate you looking into this!
Regards,
Bjorn