1 files changed, 16 insertions, 5 deletions

diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index 44e630eb3d94..728d421fffe9 100644
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -324,6 +324,7 @@ struct rproc_mem_entry {
 };
 
 struct rproc;
+struct firmware;
 
 /**
  * struct rproc_ops - platform-specific device handlers
@@ -331,12 +332,24 @@ 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
+ * @load_rsc_table:     load resource table from 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);
+        int (*load_rsc_table)(struct rproc *rproc, const struct firmware *fw);
+        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 +403,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
@@ -406,11 +418,11 @@ 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
  * @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 {
@@ -419,9 +431,8 @@ 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;
         unsigned int state;
         struct mutex lock;
@@ -437,11 +448,11 @@ 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;
         struct resource_table *cached_table;
+        size_t table_sz;
         bool has_iommu;
         bool auto_boot;
 };