openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mmc: atmel-mci: fix bad logic of sg_copy_{from,to}_buffer conversion 

The conversion to sg_copy_{from,to}_buffer has been done in the wrong
way. sg_copy_to_buffer is a copy from an SG list to a linear buffer so
it can't replace memcpy(buf + offset, &value, remaining) where buf is
the virtual address of the SG. Same for sg_copy_to_buffer but in the
opposite way.

Signed-off-by: Ludovic Desroches <ludovic.desroches@microchip.com>
Suggested-by: Douglas Gilbert <dgilbert@interlog.com>
Fixes: 5b4277814e ("mmc: atmel-mci: use sg_copy_{from,to}_buffer")
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Ludovic Desroches 2018-08-20 10:54:44 +02:00 committed by Ulf Hansson
parent 778a33959a
commit 19f5e9e015
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/mmc/host/atmel-mci.c
View File

@ -1976,7 +1976,7 @@ static void atmci_read_data_pio(struct atmel_mci *host)
do { do {
value = atmci_readl(host, ATMCI_RDR); value = atmci_readl(host, ATMCI_RDR);
if (likely(offset + 4 <= sg->length)) { if (likely(offset + 4 <= sg->length)) {
sg_pcopy_to_buffer(sg, 1, &value, sizeof(u32), offset); sg_pcopy_from_buffer(sg, 1, &value, sizeof(u32), offset);
offset += 4; offset += 4;
nbytes += 4; nbytes += 4;
@ -1993,7 +1993,7 @@ static void atmci_read_data_pio(struct atmel_mci *host)
} else { } else {
unsigned int remaining = sg->length - offset; unsigned int remaining = sg->length - offset;
sg_pcopy_to_buffer(sg, 1, &value, remaining, offset); sg_pcopy_from_buffer(sg, 1, &value, remaining, offset);
nbytes += remaining; nbytes += remaining;
flush_dcache_page(sg_page(sg)); flush_dcache_page(sg_page(sg));
@ -2003,7 +2003,7 @@ static void atmci_read_data_pio(struct atmel_mci *host)
goto done; goto done;
offset = 4 - remaining; offset = 4 - remaining;
sg_pcopy_to_buffer(sg, 1, (u8 *)&value + remaining, sg_pcopy_from_buffer(sg, 1, (u8 *)&value + remaining,
offset, 0); offset, 0);
nbytes += offset; nbytes += offset;
} }
@ -2042,7 +2042,7 @@ static void atmci_write_data_pio(struct atmel_mci *host)
do { do {
if (likely(offset + 4 <= sg->length)) { if (likely(offset + 4 <= sg->length)) {
sg_pcopy_from_buffer(sg, 1, &value, sizeof(u32), offset); sg_pcopy_to_buffer(sg, 1, &value, sizeof(u32), offset);
atmci_writel(host, ATMCI_TDR, value); atmci_writel(host, ATMCI_TDR, value);
offset += 4; offset += 4;
@ -2059,7 +2059,7 @@ static void atmci_write_data_pio(struct atmel_mci *host)
unsigned int remaining = sg->length - offset; unsigned int remaining = sg->length - offset;
value = 0; value = 0;
sg_pcopy_from_buffer(sg, 1, &value, remaining, offset); sg_pcopy_to_buffer(sg, 1, &value, remaining, offset);
nbytes += remaining; nbytes += remaining;
host->sg = sg = sg_next(sg); host->sg = sg = sg_next(sg);
@ -2070,7 +2070,7 @@ static void atmci_write_data_pio(struct atmel_mci *host)
} }
offset = 4 - remaining; offset = 4 - remaining;
sg_pcopy_from_buffer(sg, 1, (u8 *)&value + remaining, sg_pcopy_to_buffer(sg, 1, (u8 *)&value + remaining,
offset, 0); offset, 0);
atmci_writel(host, ATMCI_TDR, value); atmci_writel(host, ATMCI_TDR, value);
nbytes += offset; nbytes += offset;