iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'spi/topic/dma' into spi-next

Browse Source
This commit is contained in:
Mark Brown 2016-09-30 09:14:07 -07:00
commit c5aee51b7a
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/spi/spi.c
View File

@ -37,6 +37,7 @@
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/highmem.h>
#define CREATE_TRACE_POINTS #define CREATE_TRACE_POINTS
#include <trace/events/spi.h> #include <trace/events/spi.h>
@ -709,6 +710,13 @@ static int spi_map_buf(struct spi_master *master, struct device *dev,
{ {
const bool vmalloced_buf = is_vmalloc_addr(buf); const bool vmalloced_buf = is_vmalloc_addr(buf);
unsigned int max_seg_size = dma_get_max_seg_size(dev); unsigned int max_seg_size = dma_get_max_seg_size(dev);
#ifdef CONFIG_HIGHMEM
const bool kmap_buf = ((unsigned long)buf >= PKMAP_BASE &&
(unsigned long)buf < (PKMAP_BASE +
(LAST_PKMAP * PAGE_SIZE)));
#else
const bool kmap_buf = false;
#endif
int desc_len; int desc_len;
int sgs; int sgs;
struct page *vm_page; struct page *vm_page;
@ -716,7 +724,7 @@ static int spi_map_buf(struct spi_master *master, struct device *dev,
size_t min; size_t min;
int i, ret; int i, ret;
if (vmalloced_buf) { if (vmalloced_buf || kmap_buf) {
desc_len = min_t(int, max_seg_size, PAGE_SIZE); desc_len = min_t(int, max_seg_size, PAGE_SIZE);
sgs = DIV_ROUND_UP(len + offset_in_page(buf), desc_len); sgs = DIV_ROUND_UP(len + offset_in_page(buf), desc_len);
} else if (virt_addr_valid(buf)) { } else if (virt_addr_valid(buf)) {
@ -732,10 +740,13 @@ static int spi_map_buf(struct spi_master *master, struct device *dev,
for (i = 0; i < sgs; i++) { for (i = 0; i < sgs; i++) {
if (vmalloced_buf) { if (vmalloced_buf || kmap_buf) {
min = min_t(size_t, min = min_t(size_t,
len, desc_len - offset_in_page(buf)); len, desc_len - offset_in_page(buf));
vm_page = vmalloc_to_page(buf); if (vmalloced_buf)
vm_page = vmalloc_to_page(buf);
else
vm_page = kmap_to_page(buf);
if (!vm_page) { if (!vm_page) {
sg_free_table(sgt); sg_free_table(sgt);
return -ENOMEM; return -ENOMEM;