aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2008-07-21 00:45:15 +0200
committerPierre Ossman <drzeus@drzeus.cx>2008-07-23 14:42:09 +0200
commit6cefd05f35177ad5d22d44519c680cf43f2ac86d (patch)
tree12d55e921315e34f7f60ffd17a01223a6966bdfd
parent48b5352ea1891455eb8e824cf7d92f66931a090f (diff)
downloadkernel_samsung_aries-6cefd05f35177ad5d22d44519c680cf43f2ac86d.zip
kernel_samsung_aries-6cefd05f35177ad5d22d44519c680cf43f2ac86d.tar.gz
kernel_samsung_aries-6cefd05f35177ad5d22d44519c680cf43f2ac86d.tar.bz2
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>
-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 17701c3..b27c1a2 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,
if (offset) {
if (data->flags & MMC_DATA_WRITE) {
buffer = sdhci_kmap_atomic(sg, &flags);
+ WARN_ON(((long)buffer & PAGE_MASK) > (PAGE_SIZE - 3));
memcpy(align, buffer, offset);
sdhci_kunmap_atomic(buffer, &flags);
}
@@ -510,6 +511,7 @@ static void sdhci_adma_table_post(struct sdhci_host *host,
size = 4 - (sg_dma_address(sg) & 0x3);
buffer = sdhci_kmap_atomic(sg, &flags);
+ WARN_ON(((long)buffer & PAGE_MASK) > (PAGE_SIZE - 3));
memcpy(buffer, align, size);
sdhci_kunmap_atomic(buffer, &flags);