mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 23:27:06 +00:00
Code Issues Releases Wiki Activity

mmc: au1xmmc: handle highmem pages

Browse source 
Use kmap_atomic to map the scatterlist entry before using it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Christoph Hellwig 2018-05-28 08:14:21 +02:00 committed by Ulf Hansson
parent 52af318c93
commit a6720c023a
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/mmc/host/au1xmmc.c
View file

@ -40,6 +40,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <linux/highmem.h>
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/mmc/host.h> #include <linux/mmc/host.h>
#include <linux/slab.h> #include <linux/slab.h>
@ -405,7 +406,7 @@ static void au1xmmc_send_pio(struct au1xmmc_host *host)
/* This is the pointer to the data buffer */ /* This is the pointer to the data buffer */
sg = &data->sg[host->pio.index]; sg = &data->sg[host->pio.index];
sg_ptr = sg_virt(sg) + host->pio.offset; sg_ptr = kmap_atomic(sg_page(sg)) + sg->offset + host->pio.offset;
/* This is the space left inside the buffer */ /* This is the space left inside the buffer */
sg_len = data->sg[host->pio.index].length - host->pio.offset; sg_len = data->sg[host->pio.index].length - host->pio.offset;
@ -421,11 +422,12 @@ static void au1xmmc_send_pio(struct au1xmmc_host *host)
if (!(status & SD_STATUS_TH)) if (!(status & SD_STATUS_TH))
break; break;
val = *sg_ptr++; val = sg_ptr[count];
__raw_writel((unsigned long)val, HOST_TXPORT(host)); __raw_writel((unsigned long)val, HOST_TXPORT(host));
wmb(); /* drain writebuffer */ wmb(); /* drain writebuffer */
} }
kunmap_atomic(sg_ptr);
host->pio.len -= count; host->pio.len -= count;
host->pio.offset += count; host->pio.offset += count;
@ -462,7 +464,7 @@ static void au1xmmc_receive_pio(struct au1xmmc_host *host)
if (host->pio.index < host->dma.len) { if (host->pio.index < host->dma.len) {
sg = &data->sg[host->pio.index]; sg = &data->sg[host->pio.index];
sg_ptr = sg_virt(sg) + host->pio.offset; sg_ptr = kmap_atomic(sg_page(sg)) + sg->offset + host->pio.offset;
/* This is the space left inside the buffer */ /* This is the space left inside the buffer */
sg_len = sg_dma_len(&data->sg[host->pio.index]) - host->pio.offset; sg_len = sg_dma_len(&data->sg[host->pio.index]) - host->pio.offset;
@ -501,8 +503,10 @@ static void au1xmmc_receive_pio(struct au1xmmc_host *host)
val = __raw_readl(HOST_RXPORT(host)); val = __raw_readl(HOST_RXPORT(host));
if (sg_ptr) if (sg_ptr)
*sg_ptr++ = (unsigned char)(val & 0xFF); sg_ptr[count] = (unsigned char)(val & 0xFF);
} }
if (sg_ptr)
kunmap_atomic(sg_ptr);
host->pio.len -= count; host->pio.len -= count;
host->pio.offset += count; host->pio.offset += count;