openwrt/target/linux/brcm2708/patches-4.4/0588-drm-vc4-Verify-at-boot-that-CMA-doesn-t-cross-a-256M.patch
Stijn Segers b934aa2f21 kernel: update 17.01 kernel to 4.4.116
This bumps the 4.4. kernel in LEDE 17.01 to 4.4.116.
More Meltdown & Spectre mitigation.

* Refresh patches.
* Refresh x86/config for RETPOLINE.
* Deleted 8049-PCI-layerscape-Add-fsl-ls2085a-pcie-compatible-ID.patch (accepted upstream)
* Deleted 8050-PCI-layerscape-Fix-MSG-TLP-drop-setting.patch (accepted upstream)
* 650-pppoe_header_pad.patch does not apply anymore (code was replaced).

Bumps from 4.4.113 to 4.4.115 were handled by Kevin Darbyshire-Bryant.

Compile-tested on: ar71xx, ramips/mt7621, x86/64
Run-tested on: ar71xx, ramips/mt7621, x86/64

Signed-off-by: Stijn Segers <foss@volatilesystems.org>
2018-02-20 08:34:14 +01:00

80 lines
2.2 KiB
Diff

From bf4b7e8817115f839241e55add244cf60225e436 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Mon, 12 Oct 2015 08:58:08 -0700
Subject: [PATCH] drm/vc4: Verify at boot that CMA doesn't cross a 256MB
boundary.
I've seen lots of users cranking CMA up higher, so throw an error if
they do.
Signed-off-by: Eric Anholt <eric@anholt.net>
---
drivers/base/dma-contiguous.c | 1 +
drivers/gpu/drm/vc4/vc4_v3d.c | 18 ++++++++++++++++++
mm/cma.c | 2 ++
3 files changed, 21 insertions(+)
--- a/drivers/base/dma-contiguous.c
+++ b/drivers/base/dma-contiguous.c
@@ -35,6 +35,7 @@
#endif
struct cma *dma_contiguous_default_area;
+EXPORT_SYMBOL(dma_contiguous_default_area);
/*
* Default global CMA area size can be defined in kernel's .config.
--- a/drivers/gpu/drm/vc4/vc4_v3d.c
+++ b/drivers/gpu/drm/vc4/vc4_v3d.c
@@ -16,7 +16,10 @@
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "linux/init.h"
+#include "linux/cma.h"
#include "linux/component.h"
+#include "linux/dma-contiguous.h"
#include "linux/pm_runtime.h"
#include "vc4_drv.h"
#include "vc4_regs.h"
@@ -185,8 +188,23 @@ static int vc4_v3d_bind(struct device *d
struct drm_device *drm = dev_get_drvdata(master);
struct vc4_dev *vc4 = to_vc4_dev(drm);
struct vc4_v3d *v3d = NULL;
+ struct cma *cma;
int ret;
+ cma = dev_get_cma_area(dev);
+ if (!cma)
+ return -EINVAL;
+
+ if ((cma_get_base(cma) & 0xf0000000) !=
+ ((cma_get_base(cma) + cma_get_size(cma) - 1) & 0xf0000000)) {
+ DRM_ERROR("V3D requires that the CMA area (0x%08lx - 0x%08lx) "
+ "not span a 256MB boundary, or memory corruption "
+ "would happen.\n",
+ (long)cma_get_base(cma),
+ cma_get_base(cma) + cma_get_size(cma));
+ return -EINVAL;
+ }
+
v3d = devm_kzalloc(&pdev->dev, sizeof(*v3d), GFP_KERNEL);
if (!v3d)
return -ENOMEM;
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -47,11 +47,13 @@ phys_addr_t cma_get_base(const struct cm
{
return PFN_PHYS(cma->base_pfn);
}
+EXPORT_SYMBOL(cma_get_base);
unsigned long cma_get_size(const struct cma *cma)
{
return cma->count << PAGE_SHIFT;
}
+EXPORT_SYMBOL(cma_get_size);
static unsigned long cma_bitmap_aligned_mask(const struct cma *cma,
unsigned int align_order)