Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

remoteproc: mediatek: Make sure IPI buffer fits in L2TCM

The IPI buffer location is read from the firmware that we load to the
System Companion Processor, and it's not granted that both the SRAM
(L2TCM) size that is defined in the devicetree node is large enough
for that, and while this is especially true for multi-core SCP, it's
still useful to check on single-core variants as well.

Failing to perform this check may make this driver perform R/W
operations out of the L2TCM boundary, resulting (at best) in a
kernel panic.

To fix that, check that the IPI buffer fits, otherwise return a
failure and refuse to boot the relevant SCP core (or the SCP at
all, if this is single core).

Fixes: 3efa0ea743b7 ("remoteproc/mediatek: read IPI buffer offset from FW")
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20240321084614.45253-2-angelogioacchino.delregno@collabora.com
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>

authored by

AngeloGioacchino Del Regno and committed by
Mathieu Poirier
331f91d8 1961511c

+9 -1
+9 -1
drivers/remoteproc/mtk_scp.c
··· 132 132 static int scp_ipi_init(struct mtk_scp *scp, const struct firmware *fw) 133 133 { 134 134 int ret; 135 - size_t offset; 135 + size_t buf_sz, offset; 136 136 137 137 /* read the ipi buf addr from FW itself first */ 138 138 ret = scp_elf_read_ipi_buf_addr(scp, fw, &offset); ··· 143 143 return ret; 144 144 } 145 145 dev_info(scp->dev, "IPI buf addr %#010zx\n", offset); 146 + 147 + /* Make sure IPI buffer fits in the L2TCM range assigned to this core */ 148 + buf_sz = sizeof(*scp->recv_buf) + sizeof(*scp->send_buf); 149 + 150 + if (scp->sram_size < buf_sz + offset) { 151 + dev_err(scp->dev, "IPI buffer does not fit in SRAM.\n"); 152 + return -EOVERFLOW; 153 + } 146 154 147 155 scp->recv_buf = (struct mtk_share_obj __iomem *) 148 156 (scp->sram_base + offset);