Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 118db787 authored by Petr Tesarik's avatar Petr Tesarik Committed by Greg Kroah-Hartman
Browse files

sh: boards: Fix CEU buffer size passed to dma_declare_coherent_memory() 



[ Upstream commit fb60211f377b69acffead3147578f86d0092a7a5 ]

In all these cases, the last argument to dma_declare_coherent_memory() is
the buffer end address, but the expected value should be the size of the
reserved region.

Fixes: 39fb9930 ("media: arch: sh: ap325rxa: Use new renesas-ceu camera driver")
Fixes: c2f9b05f ("media: arch: sh: ecovec: Use new renesas-ceu camera driver")
Fixes: f3590dc3 ("media: arch: sh: kfr2r09: Use new renesas-ceu camera driver")
Fixes: 186c446f ("media: arch: sh: migor: Use new renesas-ceu camera driver")
Fixes: 1a3c230b ("media: arch: sh: ms7724se: Use new renesas-ceu camera driver")
Signed-off-by: default avatarPetr Tesarik <petr.tesarik.ext@huawei.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarJacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: default avatarJohn Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Link: https://lore.kernel.org/r/20230724120742.2187-1-petrtesarik@huaweicloud.com


Signed-off-by: default avatarJohn Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 89099d73

arch/sh/boards/mach-ap325rxa/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ static int __init ap325rxa_devices_setup(void) 
	device_initialize(&ap325rxa_ceu_device.dev);

	dma_declare_coherent_memory(&ap325rxa_ceu_device.dev,

			ceu_dma_membase, ceu_dma_membase,

			ceu_dma_membase + CEU_BUFFER_MEMORY_SIZE - 1);

			CEU_BUFFER_MEMORY_SIZE);



	platform_device_add(&ap325rxa_ceu_device);

arch/sh/boards/mach-ecovec24/setup.c

+2 −4
Original line number Diff line number Diff line
@@ -1442,15 +1442,13 @@ static int __init arch_setup(void) 
	device_initialize(&ecovec_ceu_devices[0]->dev);

	dma_declare_coherent_memory(&ecovec_ceu_devices[0]->dev,

				    ceu0_dma_membase, ceu0_dma_membase,

				    ceu0_dma_membase +

				    CEU_BUFFER_MEMORY_SIZE - 1);

				    CEU_BUFFER_MEMORY_SIZE);

	platform_device_add(ecovec_ceu_devices[0]);



	device_initialize(&ecovec_ceu_devices[1]->dev);

	dma_declare_coherent_memory(&ecovec_ceu_devices[1]->dev,

				    ceu1_dma_membase, ceu1_dma_membase,

				    ceu1_dma_membase +

				    CEU_BUFFER_MEMORY_SIZE - 1);

				    CEU_BUFFER_MEMORY_SIZE);

	platform_device_add(ecovec_ceu_devices[1]);



	gpiod_add_lookup_table(&cn12_power_gpiod_table);

arch/sh/boards/mach-kfr2r09/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ static int __init kfr2r09_devices_setup(void) 
	device_initialize(&kfr2r09_ceu_device.dev);

	dma_declare_coherent_memory(&kfr2r09_ceu_device.dev,

			ceu_dma_membase, ceu_dma_membase,

			ceu_dma_membase + CEU_BUFFER_MEMORY_SIZE - 1);

			CEU_BUFFER_MEMORY_SIZE);



	platform_device_add(&kfr2r09_ceu_device);

arch/sh/boards/mach-migor/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ static int __init migor_devices_setup(void) 
	device_initialize(&migor_ceu_device.dev);

	dma_declare_coherent_memory(&migor_ceu_device.dev,

			ceu_dma_membase, ceu_dma_membase,

			ceu_dma_membase + CEU_BUFFER_MEMORY_SIZE - 1);

			CEU_BUFFER_MEMORY_SIZE);



	platform_device_add(&migor_ceu_device);

arch/sh/boards/mach-se/7724/setup.c

+2 −4
Original line number Diff line number Diff line
@@ -939,15 +939,13 @@ static int __init devices_setup(void) 
	device_initialize(&ms7724se_ceu_devices[0]->dev);

	dma_declare_coherent_memory(&ms7724se_ceu_devices[0]->dev,

				    ceu0_dma_membase, ceu0_dma_membase,

				    ceu0_dma_membase +

				    CEU_BUFFER_MEMORY_SIZE - 1);

				    CEU_BUFFER_MEMORY_SIZE);

	platform_device_add(ms7724se_ceu_devices[0]);



	device_initialize(&ms7724se_ceu_devices[1]->dev);

	dma_declare_coherent_memory(&ms7724se_ceu_devices[1]->dev,

				    ceu1_dma_membase, ceu1_dma_membase,

				    ceu1_dma_membase +

				    CEU_BUFFER_MEMORY_SIZE - 1);

				    CEU_BUFFER_MEMORY_SIZE);

	platform_device_add(ms7724se_ceu_devices[1]);



	return platform_add_devices(ms7724se_devices,