xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "remoteproc: stm32: use correct format strings on 64-bit"

Browse Source 
This reverts commit f0b0a4de78 which is
commit 03bd158e1535e68bcd2b1e095b0ebcad7c84bd20 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I8f629e3f572a8af3ab30cc2bb8c98ac3eadd97e7
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-05-20 10:45:47 +00:00
parent b05356dd8a
commit a626900b07
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/remoteproc/Kconfig
View File

@@ -249,7 +249,7 @@ config ST_SLIM_REMOTEPROC
config STM32_RPROC config STM32_RPROC
tristate "STM32 remoteproc support" tristate "STM32 remoteproc support"
depends on ARCH_STM32 || COMPILE_TEST depends on ARCH_STM32
depends on REMOTEPROC depends on REMOTEPROC
select MAILBOX select MAILBOX
help help

6
drivers/remoteproc/stm32_rproc.c
View File

@@ -117,10 +117,10 @@ static int stm32_rproc_mem_alloc(struct rproc *rproc,
struct device *dev = rproc->dev.parent; struct device *dev = rproc->dev.parent;
void *va; void *va;
dev_dbg(dev, "map memory: %pad+%zx\n", &mem->dma, mem->len); dev_dbg(dev, "map memory: %pa+%x\n", &mem->dma, mem->len);
va = ioremap_wc(mem->dma, mem->len); va = ioremap_wc(mem->dma, mem->len);
if (IS_ERR_OR_NULL(va)) { if (IS_ERR_OR_NULL(va)) {
dev_err(dev, "Unable to map memory region: %pad+0x%zx\n", dev_err(dev, "Unable to map memory region: %pa+%x\n",
&mem->dma, mem->len); &mem->dma, mem->len);
return -ENOMEM; return -ENOMEM;
} }
@@ -608,7 +608,7 @@ stm32_rproc_get_loaded_rsc_table(struct rproc *rproc, size_t *table_sz)
ddata->rsc_va = devm_ioremap_wc(dev, rsc_pa, RSC_TBL_SIZE); ddata->rsc_va = devm_ioremap_wc(dev, rsc_pa, RSC_TBL_SIZE);
if (IS_ERR_OR_NULL(ddata->rsc_va)) { if (IS_ERR_OR_NULL(ddata->rsc_va)) {
dev_err(dev, "Unable to map memory region: %pa+%x\n", dev_err(dev, "Unable to map memory region: %pa+%zx\n",
&rsc_pa, RSC_TBL_SIZE); &rsc_pa, RSC_TBL_SIZE);
ddata->rsc_va = NULL; ddata->rsc_va = NULL;
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);