Skip to content

ipc: Fix page table DMA transfer size #3659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 2 commits into from
Dec 3, 2020
Merged

ipc: Fix page table DMA transfer size #3659

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24e0abb
ipc: Fix page table size calculation
caseorum Dec 1, 2020
8c4b5a4
ipc: Use DMA attribute for min. ptable copy size
caseorum Dec 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/ipc/ipc-host-ptable.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ static int ipc_get_page_descriptors(struct dma *dmac, uint8_t *page_table,
struct dma_sg_config config;
struct dma_sg_elem elem;
struct dma_chan_data *chan;
uint32_t dma_copy_align;
int ret = 0;

/* get DMA channel from DMAC */
Expand All @@ -109,8 +110,14 @@ static int ipc_get_page_descriptors(struct dma *dmac, uint8_t *page_table,
elem.src = ring->phy_addr;

/* source buffer size is always PAGE_SIZE bytes */
/* 20 bits for each page, round up to 32 */
elem.size = (ring->pages * 5 * 16 + 31) / 32;
/* 20 bits for each page, round up to minimum DMA copy size */
ret = dma_get_attribute(dmac, DMA_ATTR_COPY_ALIGNMENT, &dma_copy_align);
if (ret < 0) {
tr_err(&ipc_tr, "ipc_get_page_descriptors(): dma_get_attribute() failed");
goto out;
}
elem.size = (ring->pages * 20 + 7) / 8;
elem.size = ALIGN_UP(elem.size, dma_copy_align);
config.elem_array.elems = &elem;
config.elem_array.count = 1;

Expand Down