aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/sdhci.c
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2008-07-20 18:45:15 -0400
committerPierre Ossman <drzeus@drzeus.cx>2008-07-23 08:42:09 -0400
commit6cefd05f35177ad5d22d44519c680cf43f2ac86d (patch)
tree12d55e921315e34f7f60ffd17a01223a6966bdfd /drivers/mmc/host/sdhci.c
parent48b5352ea1891455eb8e824cf7d92f66931a090f (diff)
sdhci: add warnings for bad buffers in ADMA path
The ADMA code path assumes that the 3 byte alignment fix doesn't cross a page boundary. I'm not convinced this is worth supporting, but at least print a warning in the off chance we'll actually see such a request. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc/host/sdhci.c')
-rw-r--r--drivers/mmc/host/sdhci.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 17701c3da733..b27c1a28a7ca 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -389,6 +389,7 @@ static int sdhci_adma_table_pre(struct sdhci_host *host,
389 if (offset) { 389 if (offset) {
390 if (data->flags & MMC_DATA_WRITE) { 390 if (data->flags & MMC_DATA_WRITE) {
391 buffer = sdhci_kmap_atomic(sg, &flags); 391 buffer = sdhci_kmap_atomic(sg, &flags);
392 WARN_ON(((long)buffer & PAGE_MASK) > (PAGE_SIZE - 3));
392 memcpy(align, buffer, offset); 393 memcpy(align, buffer, offset);
393 sdhci_kunmap_atomic(buffer, &flags); 394 sdhci_kunmap_atomic(buffer, &flags);
394 } 395 }
@@ -510,6 +511,7 @@ static void sdhci_adma_table_post(struct sdhci_host *host,
510 size = 4 - (sg_dma_address(sg) & 0x3); 511 size = 4 - (sg_dma_address(sg) & 0x3);
511 512
512 buffer = sdhci_kmap_atomic(sg, &flags); 513 buffer = sdhci_kmap_atomic(sg, &flags);
514 WARN_ON(((long)buffer & PAGE_MASK) > (PAGE_SIZE - 3));
513 memcpy(buffer, align, size); 515 memcpy(buffer, align, size);
514 sdhci_kunmap_atomic(buffer, &flags); 516 sdhci_kunmap_atomic(buffer, &flags);
515 517