Odroid XU4 fixes and upstream patches

This commit is contained in:
Igor Pecovnik 2016-01-29 12:45:40 +01:00
parent 357b08e41b
commit fd9f55157c
3 changed files with 1506 additions and 29 deletions

View file

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 3.10.94 Kernel Configuration
# Linux/arm 3.10.95 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@ -1152,6 +1152,8 @@ CONFIG_RFKILL_REGULATOR=m
# CONFIG_NET_9P is not set
# CONFIG_CAIF is not set
CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_NFC=m
CONFIG_NFC_NCI=m
CONFIG_NFC_HCI=m
@ -2667,6 +2669,7 @@ CONFIG_DRM_EXYNOS_HDMI=y
# CONFIG_DRM_EXYNOS_VIDI is not set
# CONFIG_DRM_EXYNOS_G2D is not set
# CONFIG_DRM_EXYNOS_IPP is not set
CONFIG_DRM_EXYNOS_EXPERIMENTAL_VSYNC=y
CONFIG_DRM_UDL=m
# CONFIG_DRM_ARMADA is not set
# CONFIG_DRM_TILCDC is not set
@ -2675,15 +2678,16 @@ CONFIG_DRM_UDL=m
# ARM GPU Configuration
#
CONFIG_MALI_MIDGARD=y
# CONFIG_MALI_TIMELINE_DISABLED is not set
# CONFIG_MALI_GATOR_SUPPORT is not set
CONFIG_MALI_MIPE_ENABLED=y
CONFIG_MALI_MIDGARD_DVFS=y
CONFIG_MALI_MIDGARD_RT_PM=y
# CONFIG_MALI_MIDGARD_ENABLE_TRACE is not set
CONFIG_MALI_MIDGARD_DEBUG_SYS=y
CONFIG_MALI_EXPERT=y
# CONFIG_MALI_DEVFREQ is not set
CONFIG_MALI_EXPERT=y
# CONFIG_MALI_DEBUG_SHADER_SPLIT_FS is not set
CONFIG_MALI_PLATFORM_FAKE=y
# CONFIG_MALI_PLATFORM_DEVICETREE is not set
CONFIG_MALI_PLATFORM_THIRDPARTY=y
CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="5422"
# CONFIG_MALI_DEBUG is not set
@ -4529,6 +4533,6 @@ CONFIG_BACKPORT_USB_NET_RNDIS_HOST=m
#
CONFIG_BACKPORT_USB_WDM=m
CONFIG_RTL8192CU=m
CONFIG_RTL8821AU=m
CONFIG_RTL8812AU=m
CONFIG_RTL8188EU=m
CONFIG_RTL8192DU=m

View file

@ -10,30 +10,6 @@ index 6944160a5631..f73ae0748cbc 100644
EXTRAVERSION =
NAME = TOSSUG Baby Fish
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 8ca636cf8618..1a00c33a5b7e 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -1355,12 +1355,19 @@ static int arm_iommu_mmap_attrs(struct device *dev, struct vm_area_struct *vma,
unsigned long uaddr = vma->vm_start;
unsigned long usize = vma->vm_end - vma->vm_start;
struct page **pages = __iommu_get_pages(cpu_addr, attrs);
+ unsigned long nr_pages = PAGE_ALIGN(size) >> PAGE_SHIFT;
+ unsigned long off = vma->vm_pgoff;
vma->vm_page_prot = __get_dma_pgprot(attrs, vma->vm_page_prot);
if (!pages)
return -ENXIO;
+ if (off >= nr_pages || (usize >> PAGE_SHIFT) > nr_pages - off)
+ return -ENXIO;
+
+ pages += off;
+
do {
int ret = vm_insert_page(vma, uaddr, *pages++);
if (ret) {
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index c019b7aaf776..553e00a432ec 100644
--- a/arch/arm/plat-orion/common.c

File diff suppressed because it is too large Load diff