Use __GFP_DMA32 for allocationsti-5.0.11.p7-k4.9

GC320 cannot access memory with address >32 bits. Explicitly request
all the allocations to be in DMA32 zone by setting __GFP_DMA32 flag.

All omap bo allocations are in DMA32 zone, so no special care is needed
for handling omap bo buffers in the driver.

Signed-off-by: Gowtham Tammana <g-tammana@ti.com>

2 files changed, 6 insertions, 5 deletions

diff --git a/src/hal/os/linux/kernel/gc_hal_kernel_allocator.c b/src/hal/os/linux/kernel/gc_hal_kernel_allocator.c
index 11c7add..d07d859 100755
--- a/src/hal/os/linux/kernel/gc_hal_kernel_allocator.c
+++ b/src/hal/os/linux/kernel/gc_hal_kernel_allocator.c
@@ -183,7 +183,7 @@ _NonContiguousAlloc(
 
     if (!pages)
     {
-        pages = vmalloc(size);
+        pages = __vmalloc(size, GFP_KERNEL | __GFP_DMA32, PAGE_KERNEL);
 
         if (!pages)
         {
@@ -194,7 +194,7 @@ _NonContiguousAlloc(
 
     for (i = 0; i < NumPages; i++)
     {
-        p = alloc_page(GFP_KERNEL | __GFP_HIGHMEM | gcdNOWARN);
+        p = alloc_page(GFP_KERNEL | __GFP_DMA32 | gcdNOWARN);
 
         if (!p)
         {
@@ -381,7 +381,7 @@ _DefaultAlloc(
         if (Mdl->u.contiguousPages == gcvNULL)
         {
             Mdl->u.contiguousPages =
-                alloc_pages(GFP_KERNEL | __GFP_HIGHMEM | gcdNOWARN, order);
+                alloc_pages(GFP_KERNEL | __GFP_DMA32 | gcdNOWARN, order);
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
             Mdl->exact = gcvFALSE;
diff --git a/src/hal/os/linux/kernel/gc_hal_kernel_os.c b/src/hal/os/linux/kernel/gc_hal_kernel_os.c
index 2b477df..f8ec4ab 100755
--- a/src/hal/os/linux/kernel/gc_hal_kernel_os.c
+++ b/src/hal/os/linux/kernel/gc_hal_kernel_os.c
@@ -706,7 +706,7 @@ gckOS_Construct(
         gcmkONERROR(gcvSTATUS_OUT_OF_MEMORY);
     }
 
-    os->paddingPage = alloc_page(GFP_KERNEL | __GFP_HIGHMEM | gcdNOWARN);
+    os->paddingPage = alloc_page(GFP_KERNEL | __GFP_DMA32 | gcdNOWARN);
     if (os->paddingPage == gcvNULL)
     {
         /* Out of memory. */
@@ -1073,7 +1073,8 @@ gckOS_AllocateMemory(
 
     if (Bytes > PAGE_SIZE)
     {
-        memory = (gctPOINTER) vmalloc(Bytes);
+        memory = (gctPOINTER) __vmalloc(Bytes,
+                        GFP_KERNEL | __GFP_DMA32, PAGE_KERNEL);
     }
     else
     {