| Message ID | 20180528061421.25708-1-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 28 May 2018 at 08:14, Christoph Hellwig <hch@lst.de> wrote: > Use kmap_atomic to map the scatterlist entry before using it. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Thanks, applied for next! Kind regards Uffe > --- > > Changes since v1: > - pass the correct pointer to kunmap_atomic > > drivers/mmc/host/au1xmmc.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c > index ed77fbfa4774..9b4be67330dd 100644 > --- a/drivers/mmc/host/au1xmmc.c > +++ b/drivers/mmc/host/au1xmmc.c > @@ -40,6 +40,7 @@ > #include <linux/interrupt.h> > #include <linux/dma-mapping.h> > #include <linux/scatterlist.h> > +#include <linux/highmem.h> > #include <linux/leds.h> > #include <linux/mmc/host.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 */ > 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 */ > 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)) > break; > > - val = *sg_ptr++; > + val = sg_ptr[count]; > > __raw_writel((unsigned long)val, HOST_TXPORT(host)); > wmb(); /* drain writebuffer */ > } > + kunmap_atomic(sg_ptr); > > host->pio.len -= 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) { > 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 */ > 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)); > > 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.offset += count; > -- > 2.17.0 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c index ed77fbfa4774..9b4be67330dd 100644 --- a/drivers/mmc/host/au1xmmc.c +++ b/drivers/mmc/host/au1xmmc.c @@ -40,6 +40,7 @@ #include <linux/interrupt.h> #include <linux/dma-mapping.h> #include <linux/scatterlist.h> +#include <linux/highmem.h> #include <linux/leds.h> #include <linux/mmc/host.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 */ 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 */ 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)) break; - val = *sg_ptr++; + val = sg_ptr[count]; __raw_writel((unsigned long)val, HOST_TXPORT(host)); wmb(); /* drain writebuffer */ } + kunmap_atomic(sg_ptr); host->pio.len -= 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) { 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 */ 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)); 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.offset += count;
Use kmap_atomic to map the scatterlist entry before using it. Signed-off-by: Christoph Hellwig <hch@lst.de> --- Changes since v1: - pass the correct pointer to kunmap_atomic drivers/mmc/host/au1xmmc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)