diff options
| author | Bjorn Andersson <bjorn.andersson@linaro.org> | 2016-12-30 12:21:38 +0100 |
|---|---|---|
| committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2016-12-30 12:26:31 +0100 |
| commit | a0c10687ec9506b5e14fe3dd47832a77f2f2500c (patch) | |
| tree | a5e95d4bc6a67db98db71b5e288f6adc2deacc8f /include | |
| parent | remoteproc: fix vdev reference management (diff) | |
| download | linux-a0c10687ec9506b5e14fe3dd47832a77f2f2500c.tar.xz linux-a0c10687ec9506b5e14fe3dd47832a77f2f2500c.zip | |
Revert "remoteproc: Merge table_ptr and cached_table pointers"
Following any fw_rsc_vdev entries in the resource table are two variable
length arrays, the first one reference vring resources and the second
one is the virtio config space. The virtio config space is used by
virtio to communicate status and configuration changes and must as such
be shared with the remote.
The reverted commit incorrectly made any changes to the virtio config
space only affect the local copy, in an attempt to allowing memory
protection of the shared resource table.
This reverts commit cda8529346935fc86f476999ac4fbfe4e17abf11.
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/remoteproc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index e2f3a3281d8f..8265d351c9f0 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -408,7 +408,8 @@ enum rproc_crash_type { * @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: our copy of the resource table + * @table_ptr: pointer to the resource table in effect + * @cached_table: copy of the resource table * @has_iommu: flag to indicate if remote processor is behind an MMU */ struct rproc { @@ -440,6 +441,7 @@ struct rproc { bool recovery_disabled; int max_notifyid; struct resource_table *table_ptr; + struct resource_table *cached_table; bool has_iommu; bool auto_boot; }; |