diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-04 12:11:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-04 12:11:57 -0400 |
| commit | 4d6d367232813af09d9a1d90e3259e3ac42ee8a8 (patch) | |
| tree | f8921106542eb5bac53f1ef5ac9fee46f1def42f /drivers/remoteproc/remoteproc_internal.h | |
| parent | d66e6737d454553e1e62109d8298ede5351178a4 (diff) | |
| parent | d09f53a735bae43806a77754312a45d3f1198342 (diff) | |
Merge tag 'remoteproc-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc
Pull remoteproc update from Ohad Ben-Cohen:
- Remoteproc Recovery - by Fernando Guzman Lugo
When a remote processor crash is detected, this mechanism will remove
all virtio children devices, wait until their drivers let go, hard
reset the remote processor and reload the firmware (resulting in the
relevant virtio children devices re-added). Essentially the entire
software stack is reset, together with the relevant hardware, so
users don't have to reset the entire phone.
- STE Modem driver is added - by Sjur Brændeland
- OMAP DSP boot address support is added - by Juan Gutierrez
- A handful of fixes/cleanups - Sjur Brændeland, Dan Carpenter, Emil
Goode
* tag 'remoteproc-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
remoteproc: Fix use of format specifyer
remoteproc: fix a potential NULL-dereference on cleanup
remoteproc: select VIRTIO to avoid build breakage
remoteproc: return -EFAULT on copy_from_user failure
remoteproc: snprintf() can return more than was printed
remoteproc: Add STE modem driver
remtoteproc: maintain max notifyid
remoteproc: create a 'recovery' debugfs entry
remoteproc: add actual recovery implementation
remoteproc: add rproc_report_crash function to notify rproc crashes
remoteproc: Add dependency to HAS_DMA
remoteproc/omap: set bootaddr support
Diffstat (limited to 'drivers/remoteproc/remoteproc_internal.h')
| -rw-r--r-- | drivers/remoteproc/remoteproc_internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/remoteproc/remoteproc_internal.h b/drivers/remoteproc/remoteproc_internal.h index a690ebe7aa51..7bb66482d061 100644 --- a/drivers/remoteproc/remoteproc_internal.h +++ b/drivers/remoteproc/remoteproc_internal.h | |||
| @@ -63,6 +63,7 @@ void rproc_free_vring(struct rproc_vring *rvring); | |||
| 63 | int rproc_alloc_vring(struct rproc_vdev *rvdev, int i); | 63 | int rproc_alloc_vring(struct rproc_vdev *rvdev, int i); |
| 64 | 64 | ||
| 65 | void *rproc_da_to_va(struct rproc *rproc, u64 da, int len); | 65 | void *rproc_da_to_va(struct rproc *rproc, u64 da, int len); |
| 66 | int rproc_trigger_recovery(struct rproc *rproc); | ||
| 66 | 67 | ||
| 67 | static inline | 68 | static inline |
| 68 | int rproc_fw_sanity_check(struct rproc *rproc, const struct firmware *fw) | 69 | int rproc_fw_sanity_check(struct rproc *rproc, const struct firmware *fw) |