samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Fix issues in qdf aligned memory alloc function

Browse Source 
1. Alloc size should be passed as input and output parameter since we need
   to pass the exact alloc_size while freeing the memory.

2. use qdf_align() to calculate the aligned physical address.

3. In DBR component, pass correct arguments to qdf_aligned_malloc() to fix
   the compilation errors.
   Alloc size should be passed as input and output parameter since we need
   to pass the exact alloc_size while freeing the DMA memory.

Change-Id: I83051b8aa54bbf3bb663902d8f17f2c3c55e57bf
CRs-Fixed: 2462441
This commit is contained in:
Shashikala Prabhu
2019-07-30 21:45:39 +05:30
committed by nshrivas
parent 0ebbf5a1de
commit ec527358c2
3 changed files with 112 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
qdf/linux/src/qdf_mem.c
View File

@@ -1435,31 +1435,57 @@ void qdf_mem_multi_pages_free(qdf_device_t osdev,
qdf_export_symbol(qdf_mem_multi_pages_free);
#endif
void *qdf_aligned_malloc_fl(qdf_size_t size, uint32_t ring_base_align,
void *qdf_aligned_malloc_fl(uint32_t *size,
void **vaddr_unaligned,
qdf_dma_addr_t *paddr_unaligned,
qdf_dma_addr_t *paddr_aligned,
uint32_t align,
const char *func, uint32_t line)
{
void *vaddr_aligned;
uint32_t align_alloc_size;
*vaddr_unaligned = qdf_mem_malloc_fl(size, func, line);
*vaddr_unaligned = qdf_mem_malloc_fl((qdf_size_t)*size, func,
line);
if (!*vaddr_unaligned) {
qdf_warn("Failed to alloc %zuB @ %s:%d", size, func, line);
qdf_warn("Failed to alloc %uB @ %s:%d", *size, func, line);
return NULL;
}
if ((unsigned long)(*vaddr_unaligned) % ring_base_align) {
*paddr_unaligned = qdf_mem_virt_to_phys(*vaddr_unaligned);
/* Re-allocate additional bytes to align base address only if
* above allocation returns unaligned address. Reason for
* trying exact size allocation above is, OS tries to allocate
* blocks of size power-of-2 pages and then free extra pages.
* e.g., of a ring size of 1MB, the allocation below will
* request 1MB plus 7 bytes for alignment, which will cause a
* 2MB block allocation,and that is failing sometimes due to
* memory fragmentation.
*/
if ((unsigned long)(*paddr_unaligned) & (align - 1)) {
align_alloc_size = *size + align - 1;
qdf_mem_free(*vaddr_unaligned);
*vaddr_unaligned = qdf_mem_malloc_fl(size + ring_base_align - 1,
func, line);
*vaddr_unaligned = qdf_mem_malloc_fl(
(qdf_size_t)align_alloc_size, func, line);
if (!*vaddr_unaligned) {
qdf_warn("Failed to alloc %zuB @ %s:%d",
size, func, line);
qdf_warn("Failed to alloc %uB @ %s:%d",
align_alloc_size, func, line);
return NULL;
}
*paddr_unaligned = qdf_mem_virt_to_phys(
*vaddr_unaligned);
*size = align_alloc_size;
}
vaddr_aligned = (*vaddr_unaligned) +
((unsigned long)(*vaddr_unaligned) % ring_base_align);
*paddr_aligned = (qdf_dma_addr_t)qdf_align
((unsigned long)(*paddr_unaligned), align);
vaddr_aligned = (void *)((unsigned long)(*vaddr_unaligned) +
((unsigned long)(*paddr_aligned) -
(unsigned long)(*paddr_unaligned)));
return vaddr_aligned;
}
@@ -1859,36 +1885,56 @@ qdf_export_symbol(qdf_mem_free_consistent);
#endif /* MEMORY_DEBUG */
void *qdf_aligned_mem_alloc_consistent_fl(
qdf_device_t osdev, void *dev, qdf_size_t size,
qdf_device_t osdev, uint32_t *size,
void **vaddr_unaligned, qdf_dma_addr_t *paddr_unaligned,
qdf_dma_addr_t *paddr_aligned, uint32_t ring_base_align,
qdf_dma_addr_t *paddr_aligned, uint32_t align,
const char *func, uint32_t line)
{
void *vaddr_aligned;
uint32_t align_alloc_size;
*vaddr_unaligned = qdf_mem_alloc_consistent(osdev, dev, size,
paddr_unaligned);
*vaddr_unaligned = qdf_mem_alloc_consistent(
osdev, osdev->dev, (qdf_size_t)*size, paddr_unaligned);
if (!*vaddr_unaligned) {
qdf_warn("Failed to alloc %zuB @ %s:%d", size, func, line);
qdf_warn("Failed to alloc %uB @ %s:%d",
*size, func, line);
return NULL;
}
if ((unsigned long)(*vaddr_unaligned) % ring_base_align) {
qdf_mem_free_consistent(osdev, dev, size, *vaddr_unaligned,
/* Re-allocate additional bytes to align base address only if
* above allocation returns unaligned address. Reason for
* trying exact size allocation above is, OS tries to allocate
* blocks of size power-of-2 pages and then free extra pages.
* e.g., of a ring size of 1MB, the allocation below will
* request 1MB plus 7 bytes for alignment, which will cause a
* 2MB block allocation,and that is failing sometimes due to
* memory fragmentation.
*/
if ((unsigned long)(*paddr_unaligned) & (align - 1)) {
align_alloc_size = *size + align - 1;
qdf_mem_free_consistent(osdev, osdev->dev, *size,
*vaddr_unaligned,
*paddr_unaligned, 0);
*vaddr_unaligned = qdf_mem_alloc_consistent(osdev, dev,
size + ring_base_align - 1, paddr_unaligned);
*vaddr_unaligned = qdf_mem_alloc_consistent(
osdev, osdev->dev, align_alloc_size,
paddr_unaligned);
if (!*vaddr_unaligned) {
qdf_warn("Failed to alloc %zuB @ %s:%d",
size, func, line);
qdf_warn("Failed to alloc %uB @ %s:%d",
align_alloc_size, func, line);
return NULL;
}
*size = align_alloc_size;
}
vaddr_aligned = *vaddr_unaligned +
((unsigned long)(*vaddr_unaligned) % ring_base_align);
*paddr_aligned = *paddr_unaligned + ((unsigned long)(vaddr_aligned) -
(unsigned long)(*vaddr_unaligned));
*paddr_aligned = (qdf_dma_addr_t)qdf_align(
(unsigned long)(*paddr_unaligned), align);
vaddr_aligned = (void *)((unsigned long)(*vaddr_unaligned) +
((unsigned long)(*paddr_aligned) -
(unsigned long)(*paddr_unaligned)));
return vaddr_aligned;
}