hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: 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:
Bjorn Andersson 2018-01-05 15:58:01 -08:00
parent fb98e2bdbd
commit 0f21f9cc9d
8 changed files with 67 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/remoteproc/qcom_adsp_pil.c
View File

@ -85,11 +85,6 @@ static int adsp_load(struct rproc *rproc, const struct firmware *fw)
adsp->mem_region, adsp->mem_phys, adsp->mem_size); 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) static int adsp_start(struct rproc *rproc)
{ {
struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv; struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
@ -182,6 +177,8 @@ static const struct rproc_ops adsp_ops = {
.start = adsp_start, .start = adsp_start,
.stop = adsp_stop, .stop = adsp_stop,
.da_to_va = adsp_da_to_va, .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) static irqreturn_t adsp_wdog_interrupt(int irq, void *dev)
@ -344,8 +341,6 @@ static int adsp_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
} }
rproc->fw_ops = &adsp_fw_ops;
adsp = (struct qcom_adsp *)rproc->priv; adsp = (struct qcom_adsp *)rproc->priv;
adsp->dev = &pdev->dev; adsp->dev = &pdev->dev;
adsp->rproc = rproc; adsp->rproc = rproc;

9
drivers/remoteproc/qcom_q6v5_pil.c
View File

@ -342,11 +342,6 @@ static int q6v5_load(struct rproc *rproc, const struct firmware *fw)
return 0; 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) static int q6v5_rmb_pbl_wait(struct q6v5 *qproc, int ms)
{ {
unsigned long timeout; unsigned long timeout;
@ -931,6 +926,8 @@ static const struct rproc_ops q6v5_ops = {
.start = q6v5_start, .start = q6v5_start,
.stop = q6v5_stop, .stop = q6v5_stop,
.da_to_va = q6v5_da_to_va, .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) static irqreturn_t q6v5_wdog_interrupt(int irq, void *dev)
@ -1150,8 +1147,6 @@ static int q6v5_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
} }
rproc->fw_ops = &q6v5_fw_ops;
qproc = (struct q6v5 *)rproc->priv; qproc = (struct q6v5 *)rproc->priv;
qproc->dev = &pdev->dev; qproc->dev = &pdev->dev;
qproc->rproc = rproc; qproc->rproc = rproc;

9
drivers/remoteproc/qcom_wcnss.c
View File

@ -156,11 +156,6 @@ static int wcnss_load(struct rproc *rproc, const struct firmware *fw)
wcnss->mem_region, wcnss->mem_phys, wcnss->mem_size); 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) static void wcnss_indicate_nv_download(struct qcom_wcnss *wcnss)
{ {
u32 val; u32 val;
@ -313,6 +308,8 @@ static const struct rproc_ops wcnss_ops = {
.start = wcnss_start, .start = wcnss_start,
.stop = wcnss_stop, .stop = wcnss_stop,
.da_to_va = wcnss_da_to_va, .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) static irqreturn_t wcnss_wdog_interrupt(int irq, void *dev)
@ -492,8 +489,6 @@ static int wcnss_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
} }
rproc->fw_ops = &wcnss_fw_ops;
wcnss = (struct qcom_wcnss *)rproc->priv; wcnss = (struct qcom_wcnss *)rproc->priv;
wcnss->dev = &pdev->dev; wcnss->dev = &pdev->dev;
wcnss->rproc = rproc; wcnss->rproc = rproc;

10
drivers/remoteproc/remoteproc_core.c
View File

@ -1437,8 +1437,14 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,
atomic_set(&rproc->power, 0); atomic_set(&rproc->power, 0);
/* Set ELF as the default fw_ops handler */ /* Default to ELF loader if no load function is specified */
rproc->fw_ops = &rproc_elf_fw_ops; 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); mutex_init(&rproc->lock);

30
drivers/remoteproc/remoteproc_elf_loader.c
View File

@ -39,8 +39,7 @@
* *
* Make sure this fw image is sane. * Make sure this fw image is sane.
*/ */
static int int rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw)
rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw)
{ {
const char *name = rproc->firmware; const char *name = rproc->firmware;
struct device *dev = &rproc->dev; struct device *dev = &rproc->dev;
@ -98,6 +97,7 @@ rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw)
return 0; return 0;
} }
EXPORT_SYMBOL(rproc_elf_sanity_check);
/** /**
* rproc_elf_get_boot_addr() - Get rproc's boot address. * 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 * Note that the boot address is not a configurable property of all remote
* processors. Some will always boot at a specific hard-coded address. * 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) u32 rproc_elf_get_boot_addr(struct rproc *rproc, const struct firmware *fw)
{ {
struct elf32_hdr *ehdr = (struct elf32_hdr *)fw->data; struct elf32_hdr *ehdr = (struct elf32_hdr *)fw->data;
return ehdr->e_entry; return ehdr->e_entry;
} }
EXPORT_SYMBOL(rproc_elf_get_boot_addr);
/** /**
* rproc_elf_load_segments() - load firmware segments to memory * 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 * directly allocate memory for every segment/resource. This is not yet
* supported, though. * supported, though.
*/ */
static int int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw)
rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw)
{ {
struct device *dev = &rproc->dev; struct device *dev = &rproc->dev;
struct elf32_hdr *ehdr; struct elf32_hdr *ehdr;
@ -207,6 +206,7 @@ rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw)
return ret; return ret;
} }
EXPORT_SYMBOL(rproc_elf_load_segments);
static struct elf32_shdr * static struct elf32_shdr *
find_table(struct device *dev, struct elf32_hdr *ehdr, size_t fw_size) 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 * size into @tablesz. If a valid table isn't found, NULL is returned
* (and @tablesz isn't set). * (and @tablesz isn't set).
*/ */
static struct resource_table * struct resource_table *rproc_elf_find_rsc_table(struct rproc *rproc,
rproc_elf_find_rsc_table(struct rproc *rproc, const struct firmware *fw, const struct firmware *fw,
int *tablesz) int *tablesz)
{ {
struct elf32_hdr *ehdr; struct elf32_hdr *ehdr;
struct elf32_shdr *shdr; struct elf32_shdr *shdr;
@ -303,6 +303,7 @@ rproc_elf_find_rsc_table(struct rproc *rproc, const struct firmware *fw,
return table; return table;
} }
EXPORT_SYMBOL(rproc_elf_find_rsc_table);
/** /**
* rproc_elf_find_loaded_rsc_table() - find the loaded resource 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. * 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. * If the table wasn't loaded yet the result is unspecified.
*/ */
static struct resource_table * struct resource_table *rproc_elf_find_loaded_rsc_table(struct rproc *rproc,
rproc_elf_find_loaded_rsc_table(struct rproc *rproc, const struct firmware *fw) const struct firmware *fw)
{ {
struct elf32_hdr *ehdr = (struct elf32_hdr *)fw->data; struct elf32_hdr *ehdr = (struct elf32_hdr *)fw->data;
struct elf32_shdr *shdr; 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); return rproc_da_to_va(rproc, shdr->sh_addr, shdr->sh_size);
} }
EXPORT_SYMBOL(rproc_elf_find_loaded_rsc_table);
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
};

51
drivers/remoteproc/remoteproc_internal.h
View File

@ -25,26 +25,6 @@
struct rproc; 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
*/
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);
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);
};
/* from remoteproc_core.c */ /* from remoteproc_core.c */
void rproc_release(struct kref *kref); void rproc_release(struct kref *kref);
irqreturn_t rproc_vq_interrupt(struct rproc *rproc, int vq_id); 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); void *rproc_da_to_va(struct rproc *rproc, u64 da, int len);
int rproc_trigger_recovery(struct rproc *rproc); 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 static inline
int rproc_fw_sanity_check(struct rproc *rproc, const struct firmware *fw) int rproc_fw_sanity_check(struct rproc *rproc, const struct firmware *fw)
{ {
if (rproc->fw_ops->sanity_check) if (rproc->ops->sanity_check)
return rproc->fw_ops->sanity_check(rproc, fw); return rproc->ops->sanity_check(rproc, fw);
return 0; return 0;
} }
@ -86,8 +75,8 @@ int rproc_fw_sanity_check(struct rproc *rproc, const struct firmware *fw)
static inline static inline
u32 rproc_get_boot_addr(struct rproc *rproc, const struct firmware *fw) u32 rproc_get_boot_addr(struct rproc *rproc, const struct firmware *fw)
{ {
if (rproc->fw_ops->get_boot_addr) if (rproc->ops->get_boot_addr)
return rproc->fw_ops->get_boot_addr(rproc, fw); return rproc->ops->get_boot_addr(rproc, fw);
return 0; return 0;
} }
@ -95,8 +84,8 @@ u32 rproc_get_boot_addr(struct rproc *rproc, const struct firmware *fw)
static inline static inline
int rproc_load_segments(struct rproc *rproc, const struct firmware *fw) int rproc_load_segments(struct rproc *rproc, const struct firmware *fw)
{ {
if (rproc->fw_ops->load) if (rproc->ops->load)
return rproc->fw_ops->load(rproc, fw); return rproc->ops->load(rproc, fw);
return -EINVAL; return -EINVAL;
} }
@ -106,8 +95,8 @@ struct resource_table *rproc_find_rsc_table(struct rproc *rproc,
const struct firmware *fw, const struct firmware *fw,
int *tablesz) int *tablesz)
{ {
if (rproc->fw_ops->find_rsc_table) if (rproc->ops->find_rsc_table)
return rproc->fw_ops->find_rsc_table(rproc, fw, tablesz); return rproc->ops->find_rsc_table(rproc, fw, tablesz);
return NULL; return NULL;
} }
@ -116,12 +105,10 @@ static inline
struct resource_table *rproc_find_loaded_rsc_table(struct rproc *rproc, struct resource_table *rproc_find_loaded_rsc_table(struct rproc *rproc,
const struct firmware *fw) const struct firmware *fw)
{ {
if (rproc->fw_ops->find_loaded_rsc_table) if (rproc->ops->find_loaded_rsc_table)
return rproc->fw_ops->find_loaded_rsc_table(rproc, fw); return rproc->ops->find_loaded_rsc_table(rproc, fw);
return NULL; return NULL;
} }
extern const struct rproc_fw_ops rproc_elf_fw_ops;
#endif /* REMOTEPROC_INTERNAL_H */ #endif /* REMOTEPROC_INTERNAL_H */

22
drivers/remoteproc/st_slim_rproc.c
View File

@ -200,12 +200,6 @@ static void *slim_rproc_da_to_va(struct rproc *rproc, u64 da, int len)
return va; 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 ... * 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; 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, .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 rproc *rproc;
struct resource *res; struct resource *res;
int err, i; int err, i;
const struct rproc_fw_ops *elf_ops;
if (!fw_name) if (!fw_name)
return ERR_PTR(-EINVAL); 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->priv;
slim_rproc->rproc = rproc; 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 */ /* get imem and dmem */
for (i = 0; i < ARRAY_SIZE(mem_names); i++) { for (i = 0; i < ARRAY_SIZE(mem_names); i++) {
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

17
include/linux/remoteproc.h
View File

@ -324,6 +324,7 @@ struct rproc_mem_entry {
}; };
struct rproc; struct rproc;
struct firmware;
/** /**
* struct rproc_ops - platform-specific device handlers * struct rproc_ops - platform-specific device handlers
@ -331,12 +332,26 @@ struct rproc;
* @stop: power off the device * @stop: power off the device
* @kick: kick a virtqueue (virtqueue id given as a parameter) * @kick: kick a virtqueue (virtqueue id given as a parameter)
* @da_to_va: optional platform hook to perform address translations * @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 { struct rproc_ops {
int (*start)(struct rproc *rproc); int (*start)(struct rproc *rproc);
int (*stop)(struct rproc *rproc); int (*stop)(struct rproc *rproc);
void (*kick)(struct rproc *rproc, int vqid); void (*kick)(struct rproc *rproc, int vqid);
void * (*da_to_va)(struct rproc *rproc, u64 da, int len); 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 * @priv: private data which belongs to the platform-specific rproc module
* @ops: platform-specific start/stop rproc handlers * @ops: platform-specific start/stop rproc handlers
* @dev: virtual device for refcounting and common remoteproc behavior * @dev: virtual device for refcounting and common remoteproc behavior
* @fw_ops: firmware-specific handlers
* @power: refcount of users who need this rproc powered up * @power: refcount of users who need this rproc powered up
* @state: state of the device * @state: state of the device
* @lock: lock which protects concurrent manipulations of the rproc * @lock: lock which protects concurrent manipulations of the rproc
@ -421,7 +435,6 @@ struct rproc {
void *priv; void *priv;
struct rproc_ops *ops; struct rproc_ops *ops;
struct device dev; struct device dev;
const struct rproc_fw_ops *fw_ops;
atomic_t power; atomic_t power;
unsigned int state; unsigned int state;
struct mutex lock; struct mutex lock;