android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "swiotlb: fix data abort on pineapple tuivm and oemvm"

Browse Source
This commit is contained in:
qctecmdr 2022-10-14 04:55:21 -07:00 committed by Gerrit - the friendly Code Review server
commit 6e89d3034b
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/dma/swiotlb.c
View File

@ -476,24 +476,36 @@ static int swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs)
{ {
struct io_tlb_mem *mem = &io_tlb_default_mem; struct io_tlb_mem *mem = &io_tlb_default_mem;
unsigned long bytes = nslabs << IO_TLB_SHIFT; unsigned long bytes = nslabs << IO_TLB_SHIFT;
unsigned int area_order;
/* protect against double initialization */ /* protect against double initialization */
if (WARN_ON_ONCE(mem->nslabs)) if (WARN_ON_ONCE(mem->nslabs))
return -ENOMEM; return -ENOMEM;
if (!default_nareas)
swiotlb_adjust_nareas(num_possible_cpus());
area_order = get_order(array_size(sizeof(*mem->areas),
default_nareas));
mem->areas = (struct io_tlb_area *)
__get_free_pages(GFP_KERNEL | __GFP_ZERO, area_order);
if (!mem->areas)
return -ENOMEM;
mem->slots = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, mem->slots = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,
get_order(array_size(sizeof(*mem->slots), nslabs))); get_order(array_size(sizeof(*mem->slots), nslabs)));
if (!mem->slots) if (!mem->slots)
return -ENOMEM; goto error_slots;
if (!default_nareas)
swiotlb_adjust_nareas(num_possible_cpus());
set_memory_decrypted((unsigned long)tlb, bytes >> PAGE_SHIFT); set_memory_decrypted((unsigned long)tlb, bytes >> PAGE_SHIFT);
swiotlb_init_io_tlb_mem(mem, io_tlb_start, nslabs, 0, true, default_nareas); swiotlb_init_io_tlb_mem(mem, io_tlb_start, nslabs, 0, true, default_nareas);
swiotlb_print_info(); swiotlb_print_info();
return 0; return 0;
error_slots:
free_pages((unsigned long)mem->areas, area_order);
return -ENOMEM;
} }
int swiotlb_late_init_with_tblpaddr(char *tlb, int swiotlb_late_init_with_tblpaddr(char *tlb,