Skip to content
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

Jump to bottom

staging: vc04_services: Fix bulk cache maintenance #1987

Merged
merged 1 commit into from May 3, 2017
Merged

staging: vc04_services: Fix bulk cache maintenance #1987

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 19 additions & 12 deletions drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
View file
Open in desktop
Expand Up @@ -501,8 +501,15 @@ create_pagelist(char __user *buf, size_t count, unsigned short type,
*/
sg_init_table(scatterlist, num_pages);
/* Now set the pages for each scatterlist */
for (i = 0; i < num_pages; i++)
sg_set_page(scatterlist + i, pages[i], PAGE_SIZE, 0);
for (i = 0; i < num_pages; i++) {
unsigned int len = PAGE_SIZE - offset;

if (len > count)
len = count;
sg_set_page(scatterlist + i, pages[i], len, offset);
offset = 0;
count -= len;
}

dma_buffers = dma_map_sg(g_dev,
scatterlist,
Expand All @@ -523,20 +530,20 @@ create_pagelist(char __user *buf, size_t count, unsigned short type,
u32 addr = sg_dma_address(sg);

/* Note: addrs is the address + page_count - 1
* The firmware expects the block to be page
* The firmware expects blocks after the first to be page-
* aligned and a multiple of the page size
*/
WARN_ON(len == 0);
WARN_ON(len & ~PAGE_MASK);
WARN_ON(addr & ~PAGE_MASK);
WARN_ON(k && (k != (dma_buffers - 1)) && (len & ~PAGE_MASK));
WARN_ON(k && (addr & ~PAGE_MASK));
if (k > 0 &&
((addrs[k - 1] & PAGE_MASK) |
((addrs[k - 1] & ~PAGE_MASK) + 1) << PAGE_SHIFT)
== addr) {
addrs[k - 1] += (len >> PAGE_SHIFT);
} else {
addrs[k++] = addr | ((len >> PAGE_SHIFT) - 1);
}
((addrs[k - 1] & PAGE_MASK) +
(((addrs[k - 1] & ~PAGE_MASK) + 1) << PAGE_SHIFT))
== (addr & PAGE_MASK))
addrs[k - 1] += ((len + PAGE_SIZE - 1) >> PAGE_SHIFT);
else
addrs[k++] = (addr & PAGE_MASK) |
(((len + PAGE_SIZE - 1) >> PAGE_SHIFT) - 1);
}

/* Partial cache lines (fragments) require special measures */
Expand Down