diff options
| author | Espen Fjellvær Olsen <espen@mrfjo.org> | 2013-01-08 21:30:59 +0100 |
|---|---|---|
| committer | Espen Fjellvær Olsen <espen@mrfjo.org> | 2013-01-09 18:46:56 +0100 |
| commit | 49017aa9e80dbdb44cbfe8f4aa3b5edd9466705c (patch) | |
| tree | 8a22b8d121d4ce41c2f4a590eb9fbf186af5f368 /arch/arm/mach-exynos/mach-midas.c | |
| parent | 5528b5d5c43f0c38903db0e672581ec4176ae523 (diff) | |
| download | kernel_samsung_smdk4412-49017aa9e80dbdb44cbfe8f4aa3b5edd9466705c.zip kernel_samsung_smdk4412-49017aa9e80dbdb44cbfe8f4aa3b5edd9466705c.tar.gz kernel_samsung_smdk4412-49017aa9e80dbdb44cbfe8f4aa3b5edd9466705c.tar.bz2 | |
Update to the exynos-mem security issue from Samsung I9300 Update7
p2: includes the secmem changes as well as Andreis MFC addition as well
Change-Id: I144c2b42586f07b737fba09742315683cbab36ef
Diffstat (limited to 'arch/arm/mach-exynos/mach-midas.c')
| -rw-r--r-- | arch/arm/mach-exynos/mach-midas.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/mach-midas.c b/arch/arm/mach-exynos/mach-midas.c index fc6c224..bf8776e 100644 --- a/arch/arm/mach-exynos/mach-midas.c +++ b/arch/arm/mach-exynos/mach-midas.c @@ -3423,11 +3423,36 @@ static void __init exynos4_reserve(void) CONFIG_VIDEO_SAMSUNG_MEMSIZE_FIMC1 * SZ_1K, 0x65800000, 0); if (ret != 0) panic("alloc failed for FIMC1\n"); + else { + static struct cma_region fimc_reg = { + .name = "fimc1", + .size = CONFIG_VIDEO_SAMSUNG_MEMSIZE_FIMC1 * SZ_1K, + .start = 0x65800000, + .reserved = 1, + }; + + if (cma_early_region_register(&fimc_reg)) + pr_err("S5P/CMA: Failed to register '%s'\n", + fimc_reg.name); + } #endif #if defined(CONFIG_USE_MFC_CMA) && defined(CONFIG_MACH_M0) ret = dma_declare_contiguous(&s5p_device_mfc.dev, 0x02800000, 0x5C800000, 0); + + if (ret == 0) { + static struct cma_region mfc_reg = { + .name = "mfc", + .size = 0x02800000, + .start = 0x5C800000, + .reserved = 1, + }; + + if (cma_early_region_register(&mfc_reg)) + pr_err("S5P/CMA: Failed to register '%s'\n", + mfc_reg.name); + } #endif if (ret != 0) printk(KERN_ERR "%s Fail\n", __func__); |