evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Trivial remoteproc fixes by Suman Anna, Wei Yongjun and Thomas Meyer.

Browse source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJR3XhWAAoJELLolMlTRIoMwI8QALCsx4CUra3x56M4ZzP2Hvq/
 rIabfAGqzEwWKPRlyuPciraNfRmBmyRHkXjfJ+MI6Ct1u25ryZaPWSu4pCaYOYjJ
 1AX0nEC/JUiKdizxSLupOs40VG4wJkR6CfbvxqxwE+KpB72kQ2acH8RuZfUpxfHJ
 NE+rb7QtZXJGOj2DJZIjJcBSBWtA4YWblddjDQMlAeihMz/XT7zTB/q0WpiGH1JR
 0oEgE7BaQmV0794JXPHqfVXJ/wh1yDkfB0W/I+rV6hICC8SQOorJ8hhK8pBJJ28S
 /XjXigGb0ycrmhNwM0TbL5IAgu71OT2mFsi3pwRi62pINBh+QErMcwIOlAtPU0hW
 vdNiScoQFcNsFD4kiiDOUyqEzUkOulH5Tu4nJ2QXLQKEkEf7Q1LOYOaxH0u/4/oS
 RQ7HnR1IZO0gnoBKUyNl4NWQL4pcs2XIhdpoXBMXN3c8Ge6xOcguM59sR1GQaT15
 CF82MHSPqgzyKjwx0qPEi24wDZ7GdYx5nKzuALg7IA4hhQmr541wswjBdtneQ4H7
 GK8lj7wVECZimdStxptDJjp3iHEfpfUYx8hGr9fJi0bhUhGSniZn4xGG94qoERNq
 xWSmlVyd1ePt5wSXt+mfIMdScjXBcvWB4k0QSaZVsFP8oCJ+PLjvuPEXSEB9ude4
 88WZMJGjQhnE3Y5EUZr9
 =dN3q
 -----END PGP SIGNATURE-----

Merge tag 'remoteproc-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc

Pull remoteproc fixes from Ohad Ben-Cohen:
 "Trivial remoteproc fixes by Suman Anna, Wei Yongjun and Thomas Meyer"

* tag 'remoteproc-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
  remoteproc: Cocci spatch "memdup.spatch"
  remoteproc: free carveout memories only after unmapping them
  remoteproc/omap: fix a sparse warning
  remoteproc: fix checkpatch errors in remoteproc code
  remoteproc: fix error return code in rproc_fw_boot()
This commit is contained in:
Linus Torvalds 2013-07-11 12:35:09 -07:00
commit 0edcd16a4d
4 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/remoteproc/remoteproc_core.c
View file

@ -762,13 +762,6 @@ static void rproc_resource_cleanup(struct rproc *rproc)
kfree(entry); kfree(entry);
} }
/* clean up carveout allocations */
list_for_each_entry_safe(entry, tmp, &rproc->carveouts, node) {
dma_free_coherent(dev->parent, entry->len, entry->va, entry->dma);
list_del(&entry->node);
kfree(entry);
}
/* clean up iommu mapping entries */ /* clean up iommu mapping entries */
list_for_each_entry_safe(entry, tmp, &rproc->mappings, node) { list_for_each_entry_safe(entry, tmp, &rproc->mappings, node) {
size_t unmapped; size_t unmapped;
@ -783,6 +776,13 @@ static void rproc_resource_cleanup(struct rproc *rproc)
list_del(&entry->node); list_del(&entry->node);
kfree(entry); kfree(entry);
} }
/* clean up carveout allocations */
list_for_each_entry_safe(entry, tmp, &rproc->carveouts, node) {
dma_free_coherent(dev->parent, entry->len, entry->va, entry->dma);
list_del(&entry->node);
kfree(entry);
}
} }
/* /*
@ -815,18 +815,17 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
} }
rproc->bootaddr = rproc_get_boot_addr(rproc, fw); rproc->bootaddr = rproc_get_boot_addr(rproc, fw);
ret = -EINVAL;
/* look for the resource table */ /* look for the resource table */
table = rproc_find_rsc_table(rproc, fw, &tablesz); table = rproc_find_rsc_table(rproc, fw, &tablesz);
if (!table) { if (!table) {
ret = -EINVAL;
goto clean_up; goto clean_up;
} }
/* Verify that resource table in loaded fw is unchanged */ /* Verify that resource table in loaded fw is unchanged */
if (rproc->table_csum != crc32(0, table, tablesz)) { if (rproc->table_csum != crc32(0, table, tablesz)) {
dev_err(dev, "resource checksum failed, fw changed?\n"); dev_err(dev, "resource checksum failed, fw changed?\n");
ret = -EINVAL;
goto clean_up; goto clean_up;
} }
@ -852,8 +851,10 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
* copy this information to device memory. * copy this information to device memory.
*/ */
loaded_table = rproc_find_loaded_rsc_table(rproc, fw); loaded_table = rproc_find_loaded_rsc_table(rproc, fw);
if (!loaded_table) if (!loaded_table) {
ret = -EINVAL;
goto clean_up; goto clean_up;
}
memcpy(loaded_table, rproc->cached_table, tablesz); memcpy(loaded_table, rproc->cached_table, tablesz);
@ -913,11 +914,10 @@ static void rproc_fw_config_virtio(const struct firmware *fw, void *context)
* will be stored in the cached_table. Before the device is started, * will be stored in the cached_table. Before the device is started,
* cached_table will be copied into devic memory. * cached_table will be copied into devic memory.
*/ */
rproc->cached_table = kmalloc(tablesz, GFP_KERNEL); rproc->cached_table = kmemdup(table, tablesz, GFP_KERNEL);
if (!rproc->cached_table) if (!rproc->cached_table)
goto out; goto out;
memcpy(rproc->cached_table, table, tablesz);
rproc->table_ptr = rproc->cached_table; rproc->table_ptr = rproc->cached_table;
/* count the number of notify-ids */ /* count the number of notify-ids */

1
drivers/remoteproc/remoteproc_debugfs.c
View file

@ -248,6 +248,5 @@ void __init rproc_init_debugfs(void)
void __exit rproc_exit_debugfs(void) void __exit rproc_exit_debugfs(void)
{ {
if (rproc_dbg)
debugfs_remove(rproc_dbg); debugfs_remove(rproc_dbg);
} }

2
include/linux/platform_data/remoteproc-omap.h
View file

@ -50,7 +50,7 @@ void __init omap_rproc_reserve_cma(void);
#else #else
void __init omap_rproc_reserve_cma(void) static inline void __init omap_rproc_reserve_cma(void)
{ {
} }