summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorGeoff Levand <geoffrey.levand@am.sony.com>2009-01-07 17:22:07 -0800
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-01-08 16:25:15 +1100
commit2efd72af0f18860927084df618f7419c82f69be3 (patch)
tree7409fa1d06a6463787c3cb5283c21243e95e6291 /drivers/mtd
parent60c0c5987b0996a7c7c4c6d90f63ed413c368a71 (diff)
downloadlinux-2efd72af0f18860927084df618f7419c82f69be3.tar.bz2
mtd/ps3vram: Use _PAGE_NO_CACHE in memory ioremap
Use _PAGE_NO_CACHE for gpu memory ioremap. Also, add __iomem attribute to gpu memory pointer and change use of memset() to memset_io(). Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/devices/ps3vram.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/mtd/devices/ps3vram.c b/drivers/mtd/devices/ps3vram.c
index d5924142d909..d21e9beb7ed2 100644
--- a/drivers/mtd/devices/ps3vram.c
+++ b/drivers/mtd/devices/ps3vram.c
@@ -6,6 +6,7 @@
*/
#include <linux/io.h>
+#include <linux/mm.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/list.h>
@@ -69,7 +70,7 @@ struct ps3vram_priv {
u64 context_handle;
u32 *ctrl;
u32 *reports;
- u8 *base;
+ u8 __iomem *ddr_base;
u8 *xdr_buf;
u32 *fifo_base;
@@ -425,7 +426,7 @@ static int ps3vram_erase(struct mtd_info *mtd, struct erase_info *instr)
ps3vram_cache_flush(mtd);
/* Set bytes to 0xFF */
- memset(priv->base + instr->addr, 0xFF, instr->len);
+ memset_io(priv->ddr_base + instr->addr, 0xFF, instr->len);
mutex_unlock(&priv->lock);
@@ -628,8 +629,9 @@ static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev)
goto out_free_context;
}
- priv->base = ioremap(ddr_lpar, ddr_size);
- if (!priv->base) {
+ priv->ddr_base = ioremap_flags(ddr_lpar, ddr_size, _PAGE_NO_CACHE);
+
+ if (!priv->ddr_base) {
dev_err(&dev->core, "%s:%d: ioremap failed\n", __func__,
__LINE__);
ret = -ENOMEM;
@@ -702,7 +704,7 @@ out_unmap_reports:
out_unmap_ctrl:
iounmap(priv->ctrl);
out_unmap_vram:
- iounmap(priv->base);
+ iounmap(priv->ddr_base);
out_free_context:
lv1_gpu_context_free(priv->context_handle);
out_free_memory:
@@ -728,7 +730,7 @@ static int ps3vram_shutdown(struct ps3_system_bus_device *dev)
ps3vram_cache_cleanup(&ps3vram_mtd);
iounmap(priv->reports);
iounmap(priv->ctrl);
- iounmap(priv->base);
+ iounmap(priv->ddr_base);
lv1_gpu_context_free(priv->context_handle);
lv1_gpu_memory_free(priv->memory_handle);
ps3_close_hv_device(dev);