Skip to content

L
linux
Commit f507cd22 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Benjamin Herrenschmidt
Browse files
Options

ps3/block: Replace mtd/ps3vram by block/ps3vram 

Convert the PS3 Video RAM Storage Driver from an MTD driver to a plain block
device driver.

The ps3vram driver exposes unused video RAM on the PS3 as a block device
suitable for storage or swap.  Fast data transfer is achieved using a local
cache in system RAM and DMA transfers via the GPU.

The new driver is ca. 50% faster for reading, and ca. 10% for writing.
Signed-off-by: default avatarGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Acked-by: default avatarGeoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 9ead6497
Hide whitespace changes
Inline Side-by-side
Showing with 873 additions and 8 deletions
arch/powerpc/platforms/ps3/Kconfig
View file @ f507cd22
...@@ -128,6 +128,13 @@ config PS3_FLASH ...@@ -128,6 +128,13 @@ config PS3_FLASH
be disabled on the kernel command line using "ps3flash=off", to be disabled on the kernel command line using "ps3flash=off", to
not allocate this fixed buffer. not allocate this fixed buffer.
config PS3_VRAM
tristate "PS3 Video RAM Storage Driver"
depends on FB_PS3=y && BLOCK && m
help
This driver allows you to use excess PS3 video RAM as volatile
storage or system swap.
config PS3_LPM config PS3_LPM
tristate "PS3 Logical Performance Monitor support" tristate "PS3 Logical Performance Monitor support"
depends on PPC_PS3 depends on PPC_PS3
......
drivers/block/Makefile
View file @ f507cd22
...@@ -9,6 +9,7 @@ obj-$(CONFIG_MAC_FLOPPY) += swim3.o ...@@ -9,6 +9,7 @@ obj-$(CONFIG_MAC_FLOPPY) += swim3.o
obj-$(CONFIG_BLK_DEV_FD) += floppy.o obj-$(CONFIG_BLK_DEV_FD) += floppy.o
obj-$(CONFIG_AMIGA_FLOPPY) += amiflop.o obj-$(CONFIG_AMIGA_FLOPPY) += amiflop.o
obj-$(CONFIG_PS3_DISK) += ps3disk.o obj-$(CONFIG_PS3_DISK) += ps3disk.o
obj-$(CONFIG_PS3_VRAM) += ps3vram.o
obj-$(CONFIG_ATARI_FLOPPY) += ataflop.o obj-$(CONFIG_ATARI_FLOPPY) += ataflop.o
obj-$(CONFIG_AMIGA_Z2RAM) += z2ram.o obj-$(CONFIG_AMIGA_Z2RAM) += z2ram.o
obj-$(CONFIG_BLK_DEV_RAM) += brd.o obj-$(CONFIG_BLK_DEV_RAM) += brd.o
......
drivers/mtd/devices/ps3vram.c → drivers/block/ps3vram.c
View file @ f507cd22
/** /*
* ps3vram - Use extra PS3 video ram as MTD block device. * ps3vram - Use extra PS3 video ram as MTD block device.
* *
* Copyright 2009 Sony Corporation
*
* Based on the MTD ps3vram driver, which is
* Copyright (c) 2007-2008 Jim Paris <jim@jtan.com> * Copyright (c) 2007-2008 Jim Paris <jim@jtan.com>
* Added support RSX DMA Vivien Chappelier <vivien.chappelier@free.fr> * Added support RSX DMA Vivien Chappelier <vivien.chappelier@free.fr>
*/ */
#include <linux/io.h> #include <linux/blkdev.h>
#include <linux/mm.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/list.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/slab.h>
#include <linux/version.h>
#include <linux/gfp.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/mtd/mtd.h> #include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <asm/firmware.h>
#include <asm/lv1call.h> #include <asm/lv1call.h>
#include <asm/ps3.h> #include <asm/ps3.h>
#define DEVICE_NAME "ps3vram" #define DEVICE_NAME "ps3vram"
#define XDR_BUF_SIZE (2 * 1024 * 1024) /* XDR buffer (must be 1MiB aligned) */ #define XDR_BUF_SIZE (2 * 1024 * 1024) /* XDR buffer (must be 1MiB aligned) */
#define XDR_IOIF 0x0c000000 #define XDR_IOIF 0x0c000000
...@@ -49,8 +47,6 @@ ...@@ -49,8 +47,6 @@
#define L1GPU_CONTEXT_ATTRIBUTE_FB_BLIT 0x601 #define L1GPU_CONTEXT_ATTRIBUTE_FB_BLIT 0x601
struct mtd_info ps3vram_mtd;
#define CACHE_PAGE_PRESENT 1 #define CACHE_PAGE_PRESENT 1
#define CACHE_PAGE_DIRTY 2 #define CACHE_PAGE_DIRTY 2
...@@ -63,9 +59,16 @@ struct ps3vram_cache { ...@@ -63,9 +59,16 @@ struct ps3vram_cache {
unsigned int page_count; unsigned int page_count;
unsigned int page_size; unsigned int page_size;
struct ps3vram_tag *tags; struct ps3vram_tag *tags;
unsigned int hit;
unsigned int miss;
}; };
struct ps3vram_priv { struct ps3vram_priv {
struct request_queue *queue;
struct gendisk *gendisk;
u64 size;
u64 memory_handle; u64 memory_handle;
u64 context_handle; u64 context_handle;
u32 *ctrl; u32 *ctrl;
...@@ -76,43 +79,50 @@ struct ps3vram_priv { ...@@ -76,43 +79,50 @@ struct ps3vram_priv {
u32 *fifo_base; u32 *fifo_base;
u32 *fifo_ptr; u32 *fifo_ptr;
struct device *dev;
struct ps3vram_cache cache; struct ps3vram_cache cache;
/* Used to serialize cache/DMA operations */ /* Used to serialize cache/DMA operations */
struct mutex lock; struct mutex lock;
}; };
static int ps3vram_major;
static struct block_device_operations ps3vram_fops = {
.owner = THIS_MODULE,
};
#define DMA_NOTIFIER_HANDLE_BASE 0x66604200 /* first DMA notifier handle */ #define DMA_NOTIFIER_HANDLE_BASE 0x66604200 /* first DMA notifier handle */
#define DMA_NOTIFIER_OFFSET_BASE 0x1000 /* first DMA notifier offset */ #define DMA_NOTIFIER_OFFSET_BASE 0x1000 /* first DMA notifier offset */
#define DMA_NOTIFIER_SIZE 0x40 #define DMA_NOTIFIER_SIZE 0x40
#define NOTIFIER 7 /* notifier used for completion report */ #define NOTIFIER 7 /* notifier used for completion report */
/* A trailing '-' means to subtract off ps3fb_videomemory.size */ static char *size = "256M";
char *size = "256M-";
module_param(size, charp, 0); module_param(size, charp, 0);
MODULE_PARM_DESC(size, "memory size"); MODULE_PARM_DESC(size, "memory size");
static u32 *ps3vram_get_notifier(u32 *reports, int notifier) static u32 *ps3vram_get_notifier(u32 *reports, int notifier)
{ {
return (void *) reports + return (void *)reports + DMA_NOTIFIER_OFFSET_BASE +
DMA_NOTIFIER_OFFSET_BASE + DMA_NOTIFIER_SIZE * notifier;
DMA_NOTIFIER_SIZE * notifier;
} }
static void ps3vram_notifier_reset(struct mtd_info *mtd) static void ps3vram_notifier_reset(struct ps3_system_bus_device *dev)
{ {
struct ps3vram_priv *priv = dev->core.driver_data;
u32 *notify = ps3vram_get_notifier(priv->reports, NOTIFIER);
int i; int i;
struct ps3vram_priv *priv = mtd->priv;
u32 *notify = ps3vram_get_notifier(priv->reports, NOTIFIER);
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
notify[i] = 0xffffffff; notify[i] = 0xffffffff;
} }
static int ps3vram_notifier_wait(struct mtd_info *mtd, unsigned int timeout_ms) static int ps3vram_notifier_wait(struct ps3_system_bus_device *dev,
unsigned int timeout_ms)
{ {
struct ps3vram_priv *priv = mtd->priv; struct ps3vram_priv *priv = dev->core.driver_data;
u32 *notify = ps3vram_get_notifier(priv->reports, NOTIFIER); u32 *notify = ps3vram_get_notifier(priv->reports, NOTIFIER);
unsigned long timeout = jiffies + msecs_to_jiffies(timeout_ms); unsigned long timeout = jiffies + msecs_to_jiffies(timeout_ms);
...@@ -125,17 +135,18 @@ static int ps3vram_notifier_wait(struct mtd_info *mtd, unsigned int timeout_ms) ...@@ -125,17 +135,18 @@ static int ps3vram_notifier_wait(struct mtd_info *mtd, unsigned int timeout_ms)
return -ETIMEDOUT; return -ETIMEDOUT;
} }
static void ps3vram_init_ring(struct mtd_info *mtd) static void ps3vram_init_ring(struct ps3_system_bus_device *dev)
{ {
struct ps3vram_priv *priv = mtd->priv; struct ps3vram_priv *priv = dev->core.driver_data;
priv->ctrl[CTRL_PUT] = FIFO_BASE + FIFO_OFFSET; priv->ctrl[CTRL_PUT] = FIFO_BASE + FIFO_OFFSET;
priv->ctrl[CTRL_GET] = FIFO_BASE + FIFO_OFFSET; priv->ctrl[CTRL_GET] = FIFO_BASE + FIFO_OFFSET;
} }
static int ps3vram_wait_ring(struct mtd_info *mtd, unsigned int timeout_ms) static int ps3vram_wait_ring(struct ps3_system_bus_device *dev,
unsigned int timeout_ms)
{ {
struct ps3vram_priv *priv = mtd->priv; struct ps3vram_priv *priv = dev->core.driver_data;
unsigned long timeout = jiffies + msecs_to_jiffies(timeout_ms); unsigned long timeout = jiffies + msecs_to_jiffies(timeout_ms);
do { do {
...@@ -144,9 +155,9 @@ static int ps3vram_wait_ring(struct mtd_info *mtd, unsigned int timeout_ms) ...@@ -144,9 +155,9 @@ static int ps3vram_wait_ring(struct mtd_info *mtd, unsigned int timeout_ms)
msleep(1); msleep(1);
} while (time_before(jiffies, timeout)); } while (time_before(jiffies, timeout));
dev_dbg(priv->dev, "%s:%d: FIFO timeout (%08x/%08x/%08x)\n", __func__, dev_warn(&dev->core, "FIFO timeout (%08x/%08x/%08x)\n",
__LINE__, priv->ctrl[CTRL_PUT], priv->ctrl[CTRL_GET], priv->ctrl[CTRL_PUT], priv->ctrl[CTRL_GET],
priv->ctrl[CTRL_TOP]); priv->ctrl[CTRL_TOP]);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
...@@ -156,64 +167,65 @@ static void ps3vram_out_ring(struct ps3vram_priv *priv, u32 data) ...@@ -156,64 +167,65 @@ static void ps3vram_out_ring(struct ps3vram_priv *priv, u32 data)
*(priv->fifo_ptr)++ = data; *(priv->fifo_ptr)++ = data;
} }
static void ps3vram_begin_ring(struct ps3vram_priv *priv, u32 chan, static void ps3vram_begin_ring(struct ps3vram_priv *priv, u32 chan, u32 tag,
u32 tag, u32 size) u32 size)
{ {
ps3vram_out_ring(priv, (size << 18) | (chan << 13) | tag); ps3vram_out_ring(priv, (size << 18) | (chan << 13) | tag);
} }
static void ps3vram_rewind_ring(struct mtd_info *mtd) static void ps3vram_rewind_ring(struct ps3_system_bus_device *dev)
{ {
struct ps3vram_priv *priv = mtd->priv; struct ps3vram_priv *priv = dev->core.driver_data;
u64 status; int status;
ps3vram_out_ring(priv, 0x20000000 | (FIFO_BASE + FIFO_OFFSET)); ps3vram_out_ring(priv, 0x20000000 | (FIFO_BASE + FIFO_OFFSET));
priv->ctrl[CTRL_PUT] = FIFO_BASE + FIFO_OFFSET; priv->ctrl[CTRL_PUT] = FIFO_BASE + FIFO_OFFSET;
/* asking the HV for a blit will kick the fifo */ /* asking the HV for a blit will kick the FIFO */
status = lv1_gpu_context_attribute(priv->context_handle, status = lv1_gpu_context_attribute(priv->context_handle,
L1GPU_CONTEXT_ATTRIBUTE_FB_BLIT, L1GPU_CONTEXT_ATTRIBUTE_FB_BLIT, 0,
0, 0, 0, 0); 0, 0, 0);
if (status) if (status)
dev_err(priv->dev, "%s:%d: lv1_gpu_context_attribute failed\n", dev_err(&dev->core,
__func__, __LINE__); "%s: lv1_gpu_context_attribute failed %d\n", __func__,
status);
priv->fifo_ptr = priv->fifo_base; priv->fifo_ptr = priv->fifo_base;
} }
static void ps3vram_fire_ring(struct mtd_info *mtd) static void ps3vram_fire_ring(struct ps3_system_bus_device *dev)
{ {
struct ps3vram_priv *priv = mtd->priv; struct ps3vram_priv *priv = dev->core.driver_data;
u64 status; int status;
mutex_lock(&ps3_gpu_mutex); mutex_lock(&ps3_gpu_mutex);
priv->ctrl[CTRL_PUT] = FIFO_BASE + FIFO_OFFSET + priv->ctrl[CTRL_PUT] = FIFO_BASE + FIFO_OFFSET +
(priv->fifo_ptr - priv->fifo_base) * sizeof(u32); (priv->fifo_ptr - priv->fifo_base) * sizeof(u32);
/* asking the HV for a blit will kick the fifo */ /* asking the HV for a blit will kick the FIFO */
status = lv1_gpu_context_attribute(priv->context_handle, status = lv1_gpu_context_attribute(priv->context_handle,
L1GPU_CONTEXT_ATTRIBUTE_FB_BLIT, L1GPU_CONTEXT_ATTRIBUTE_FB_BLIT, 0,
0, 0, 0, 0); 0, 0, 0);
if (status) if (status)
dev_err(priv->dev, "%s:%d: lv1_gpu_context_attribute failed\n", dev_err(&dev->core,
__func__, __LINE__); "%s: lv1_gpu_context_attribute failed %d\n", __func__,
status);
if ((priv->fifo_ptr - priv->fifo_base) * sizeof(u32) > if ((priv->fifo_ptr - priv->fifo_base) * sizeof(u32) >
FIFO_SIZE - 1024) { FIFO_SIZE - 1024) {
dev_dbg(priv->dev, "%s:%d: fifo full, rewinding\n", __func__, dev_dbg(&dev->core, "FIFO full, rewinding\n");
__LINE__); ps3vram_wait_ring(dev, 200);
ps3vram_wait_ring(mtd, 200); ps3vram_rewind_ring(dev);
ps3vram_rewind_ring(mtd);
} }
mutex_unlock(&ps3_gpu_mutex); mutex_unlock(&ps3_gpu_mutex);
} }
static void ps3vram_bind(struct mtd_info *mtd) static void ps3vram_bind(struct ps3_system_bus_device *dev)
{ {
struct ps3vram_priv *priv = mtd->priv; struct ps3vram_priv *priv = dev->core.driver_data;
ps3vram_begin_ring(priv, UPLOAD_SUBCH, 0, 1); ps3vram_begin_ring(priv, UPLOAD_SUBCH, 0, 1);
ps3vram_out_ring(priv, 0x31337303); ps3vram_out_ring(priv, 0x31337303);
...@@ -229,13 +241,14 @@ static void ps3vram_bind(struct mtd_info *mtd) ...@@ -229,13 +241,14 @@ static void ps3vram_bind(struct mtd_info *mtd)
ps3vram_out_ring(priv, 0xfeed0000); /* DMA video RAM instance */ ps3vram_out_ring(priv, 0xfeed0000); /* DMA video RAM instance */
ps3vram_out_ring(priv, 0xfeed0001); /* DMA system RAM instance */ ps3vram_out_ring(priv, 0xfeed0001); /* DMA system RAM instance */
ps3vram_fire_ring(mtd); ps3vram_fire_ring(dev);
} }
static int ps3vram_upload(struct mtd_info *mtd, unsigned int src_offset, static int ps3vram_upload(struct ps3_system_bus_device *dev,
unsigned int dst_offset, int len, int count) unsigned int src_offset, unsigned int dst_offset,
int len, int count)
{ {
struct ps3vram_priv *priv = mtd->priv; struct ps3vram_priv *priv = dev->core.driver_data;
ps3vram_begin_ring(priv, UPLOAD_SUBCH, ps3vram_begin_ring(priv, UPLOAD_SUBCH,
NV_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN, 8); NV_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN, 8);
...@@ -248,26 +261,26 @@ static int ps3vram_upload(struct mtd_info *mtd, unsigned int src_offset, ...@@ -248,26 +261,26 @@ static int ps3vram_upload(struct mtd_info *mtd, unsigned int src_offset,
ps3vram_out_ring(priv, (1 << 8) | 1); ps3vram_out_ring(priv, (1 << 8) | 1);
ps3vram_out_ring(priv, 0); ps3vram_out_ring(priv, 0);
ps3vram_notifier_reset(mtd); ps3vram_notifier_reset(dev);
ps3vram_begin_ring(priv, UPLOAD_SUBCH, ps3vram_begin_ring(priv, UPLOAD_SUBCH,
NV_MEMORY_TO_MEMORY_FORMAT_NOTIFY, 1); NV_MEMORY_TO_MEMORY_FORMAT_NOTIFY, 1);
ps3vram_out_ring(priv, 0); ps3vram_out_ring(priv, 0);
ps3vram_begin_ring(priv, UPLOAD_SUBCH, 0x100, 1); ps3vram_begin_ring(priv, UPLOAD_SUBCH, 0x100, 1);
ps3vram_out_ring(priv, 0); ps3vram_out_ring(priv, 0);
ps3vram_fire_ring(mtd); ps3vram_fire_ring(dev);
if (ps3vram_notifier_wait(mtd, 200) < 0) { if (ps3vram_notifier_wait(dev, 200) < 0) {
dev_dbg(priv->dev, "%s:%d: notifier timeout\n", __func__, dev_warn(&dev->core, "%s: Notifier timeout\n", __func__);
__LINE__);
return -1; return -1;
} }
return 0; return 0;
} }
static int ps3vram_download(struct mtd_info *mtd, unsigned int src_offset, static int ps3vram_download(struct ps3_system_bus_device *dev,
unsigned int dst_offset, int len, int count) unsigned int src_offset, unsigned int dst_offset,
int len, int count)
{ {
struct ps3vram_priv *priv = mtd->priv; struct ps3vram_priv *priv = dev->core.driver_data;
ps3vram_begin_ring(priv, DOWNLOAD_SUBCH, ps3vram_begin_ring(priv, DOWNLOAD_SUBCH,
NV_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN, 8); NV_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN, 8);
...@@ -280,60 +293,56 @@ static int ps3vram_download(struct mtd_info *mtd, unsigned int src_offset, ...@@ -280,60 +293,56 @@ static int ps3vram_download(struct mtd_info *mtd, unsigned int src_offset,
ps3vram_out_ring(priv, (1 << 8) | 1); ps3vram_out_ring(priv, (1 << 8) | 1);
ps3vram_out_ring(priv, 0); ps3vram_out_ring(priv, 0);
ps3vram_notifier_reset(mtd); ps3vram_notifier_reset(dev);
ps3vram_begin_ring(priv, DOWNLOAD_SUBCH, ps3vram_begin_ring(priv, DOWNLOAD_SUBCH,
NV_MEMORY_TO_MEMORY_FORMAT_NOTIFY, 1); NV_MEMORY_TO_MEMORY_FORMAT_NOTIFY, 1);
ps3vram_out_ring(priv, 0); ps3vram_out_ring(priv, 0);
ps3vram_begin_ring(priv, DOWNLOAD_SUBCH, 0x100, 1); ps3vram_begin_ring(priv, DOWNLOAD_SUBCH, 0x100, 1);
ps3vram_out_ring(priv, 0); ps3vram_out_ring(priv, 0);
ps3vram_fire_ring(mtd); ps3vram_fire_ring(dev);
if (ps3vram_notifier_wait(mtd, 200) < 0) { if (ps3vram_notifier_wait(dev, 200) < 0) {
dev_dbg(priv->dev, "%s:%d: notifier timeout\n", __func__, dev_warn(&dev->core, "%s: Notifier timeout\n", __func__);
__LINE__);
return -1; return -1;
} }
return 0; return 0;
} }
static void ps3vram_cache_evict(struct mtd_info *mtd, int entry) static void ps3vram_cache_evict(struct ps3_system_bus_device *dev, int entry)
{ {
struct ps3vram_priv *priv = mtd->priv; struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_cache *cache = &priv->cache; struct ps3vram_cache *cache = &priv->cache;
if (cache->tags[entry].flags & CACHE_PAGE_DIRTY) { if (!(cache->tags[entry].flags & CACHE_PAGE_DIRTY))
dev_dbg(priv->dev, "%s:%d: flushing %d : 0x%08x\n", __func__, return;
__LINE__, entry, cache->tags[entry].address);
if (ps3vram_upload(mtd, dev_dbg(&dev->core, "Flushing %d: 0x%08x\n", entry,
CACHE_OFFSET + entry * cache->page_size, cache->tags[entry].address);
cache->tags[entry].address, if (ps3vram_upload(dev, CACHE_OFFSET + entry * cache->page_size,
DMA_PAGE_SIZE, cache->tags[entry].address, DMA_PAGE_SIZE,
cache->page_size / DMA_PAGE_SIZE) < 0) { cache->page_size / DMA_PAGE_SIZE) < 0) {
dev_dbg(priv->dev, "%s:%d: failed to upload from " dev_err(&dev->core,
"0x%x to 0x%x size 0x%x\n", __func__, __LINE__, "Failed to upload from 0x%x to " "0x%x size 0x%x\n",
entry * cache->page_size, entry * cache->page_size, cache->tags[entry].address,
cache->tags[entry].address, cache->page_size); cache->page_size);
}
cache->tags[entry].flags &= ~CACHE_PAGE_DIRTY;
} }
cache->tags[entry].flags &= ~CACHE_PAGE_DIRTY;
} }
static void ps3vram_cache_load(struct mtd_info *mtd, int entry, static void ps3vram_cache_load(struct ps3_system_bus_device *dev, int entry,
unsigned int address) unsigned int address)
{ {
struct ps3vram_priv *priv = mtd->priv; struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_cache *cache = &priv->cache; struct ps3vram_cache *cache = &priv->cache;
dev_dbg(priv->dev, "%s:%d: fetching %d : 0x%08x\n", __func__, __LINE__, dev_dbg(&dev->core, "Fetching %d: 0x%08x\n", entry, address);
entry, address); if (ps3vram_download(dev, address,
if (ps3vram_download(mtd,
address,
CACHE_OFFSET + entry * cache->page_size, CACHE_OFFSET + entry * cache->page_size,
DMA_PAGE_SIZE, DMA_PAGE_SIZE,
cache->page_size / DMA_PAGE_SIZE) < 0) { cache->page_size / DMA_PAGE_SIZE) < 0) {
dev_err(priv->dev, "%s:%d: failed to download from " dev_err(&dev->core,
"0x%x to 0x%x size 0x%x\n", __func__, __LINE__, address, "Failed to download from 0x%x to 0x%x size 0x%x\n",
entry * cache->page_size, cache->page_size); address, entry * cache->page_size, cache->page_size);
} }
cache->tags[entry].address = address; cache->tags[entry].address = address;
...@@ -341,22 +350,23 @@ static void ps3vram_cache_load(struct mtd_info *mtd, int entry, ...@@ -341,22 +350,23 @@ static void ps3vram_cache_load(struct mtd_info *mtd, int entry,
} }
static void ps3vram_cache_flush(struct mtd_info *mtd) static void ps3vram_cache_flush(struct ps3_system_bus_device *dev)
{ {
struct ps3vram_priv *priv = mtd->priv; struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_cache *cache = &priv->cache; struct ps3vram_cache *cache = &priv->cache;
int i; int i;
dev_dbg(priv->dev, "%s:%d: FLUSH\n", __func__, __LINE__); dev_dbg(&dev->core, "FLUSH\n");
for (i = 0; i < cache->page_count; i++) { for (i = 0; i < cache->page_count; i++) {
ps3vram_cache_evict(mtd, i); ps3vram_cache_evict(dev, i);
cache->tags[i].flags = 0; cache->tags[i].flags = 0;
} }
} }
static unsigned int ps3vram_cache_match(struct mtd_info *mtd, loff_t address) static unsigned int ps3vram_cache_match(struct ps3_system_bus_device *dev,
loff_t address)
{ {
struct ps3vram_priv *priv = mtd->priv; struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_cache *cache = &priv->cache; struct ps3vram_cache *cache = &priv->cache;
unsigned int base; unsigned int base;
unsigned int offset; unsigned int offset;
...@@ -370,86 +380,65 @@ static unsigned int ps3vram_cache_match(struct mtd_info *mtd, loff_t address) ...@@ -370,86 +380,65 @@ static unsigned int ps3vram_cache_match(struct mtd_info *mtd, loff_t address)
for (i = 0; i < cache->page_count; i++) { for (i = 0; i < cache->page_count; i++) {
if ((cache->tags[i].flags & CACHE_PAGE_PRESENT) && if ((cache->tags[i].flags & CACHE_PAGE_PRESENT) &&
cache->tags[i].address == base) { cache->tags[i].address == base) {
dev_dbg(priv->dev, "%s:%d: found entry %d : 0x%08x\n", cache->hit++;
__func__, __LINE__, i, cache->tags[i].address); dev_dbg(&dev->core, "Found entry %d: 0x%08x\n", i,
cache->tags[i].address);
return i; return i;
} }
} }
/* choose a random entry */ /* choose a random entry */
i = (jiffies + (counter++)) % cache->page_count; i = (jiffies + (counter++)) % cache->page_count;
dev_dbg(priv->dev, "%s:%d: using entry %d\n", __func__, __LINE__, i); dev_dbg(&dev->core, "Using entry %d\n", i);
ps3vram_cache_evict(mtd, i); ps3vram_cache_evict(dev, i);
ps3vram_cache_load(mtd, i, base); ps3vram_cache_load(dev, i, base);
cache->miss++;
return i; return i;
} }
static int ps3vram_cache_init(struct mtd_info *mtd) static int ps3vram_cache_init(struct ps3_system_bus_device *dev)
{ {
struct ps3vram_priv *priv = mtd->priv; struct ps3vram_priv *priv = dev->core.driver_data;
priv->cache.page_count = CACHE_PAGE_COUNT; priv->cache.page_count = CACHE_PAGE_COUNT;
priv->cache.page_size = CACHE_PAGE_SIZE; priv->cache.page_size = CACHE_PAGE_SIZE;
priv->cache.tags = kzalloc(sizeof(struct ps3vram_tag) * priv->cache.tags = kzalloc(sizeof(struct ps3vram_tag) *
CACHE_PAGE_COUNT, GFP_KERNEL); CACHE_PAGE_COUNT, GFP_KERNEL);
if (priv->cache.tags == NULL) { if (priv->cache.tags == NULL) {
dev_err(priv->dev, "%s:%d: could not allocate cache tags\n", dev_err(&dev->core, "Could not allocate cache tags\n");
__func__, __LINE__);
return -ENOMEM; return -ENOMEM;
} }
dev_info(priv->dev, "created ram cache: %d entries, %d KiB each\n", dev_info(&dev->core, "Created ram cache: %d entries, %d KiB each\n",
CACHE_PAGE_COUNT, CACHE_PAGE_SIZE / 1024); CACHE_PAGE_COUNT, CACHE_PAGE_SIZE / 1024);
return 0; return 0;
} }
static void ps3vram_cache_cleanup(struct mtd_info *mtd) static void ps3vram_cache_cleanup(struct ps3_system_bus_device *dev)
{ {
struct ps3vram_priv *priv = mtd->priv; struct ps3vram_priv *priv = dev->core.driver_data;
ps3vram_cache_flush(mtd); ps3vram_cache_flush(dev);
kfree(priv->cache.tags); kfree(priv->cache.tags);
} }
static int ps3vram_erase(struct mtd_info *mtd, struct erase_info *instr) static int ps3vram_read(struct ps3_system_bus_device *dev, loff_t from,
{ size_t len, size_t *retlen, u_char *buf)
struct ps3vram_priv *priv = mtd->priv;
if (instr->addr + instr->len > mtd->size)
return -EINVAL;
mutex_lock(&priv->lock);
ps3vram_cache_flush(mtd);
/* Set bytes to 0xFF */
memset_io(priv->ddr_base + instr->addr, 0xFF, instr->len);
mutex_unlock(&priv->lock);
instr->state = MTD_ERASE_DONE;
mtd_erase_callback(instr);
return 0;
}
static int ps3vram_read(struct mtd_info *mtd, loff_t from, size_t len,
size_t *retlen, u_char *buf)
{ {
struct ps3vram_priv *priv = mtd->priv; struct ps3vram_priv *priv = dev->core.driver_data;
unsigned int cached, count; unsigned int cached, count;
dev_dbg(priv->dev, "%s:%d: from=0x%08x len=0x%zx\n", __func__, __LINE__, dev_dbg(&dev->core, "%s: from=0x%08x len=0x%zx\n", __func__,
(unsigned int)from, len); (unsigned int)from, len);
if (from >= mtd->size) if (from >= priv->size)
return -EINVAL; return -EIO;
if (len > mtd->size - from) if (len > priv->size - from)
len = mtd->size - from; len = priv->size - from;
/* Copy from vram to buf */ /* Copy from vram to buf */
count = len; count = len;
...@@ -462,11 +451,11 @@ static int ps3vram_read(struct mtd_info *mtd, loff_t from, size_t len, ...@@ -462,11 +451,11 @@ static int ps3vram_read(struct mtd_info *mtd, loff_t from, size_t len,
mutex_lock(&priv->lock); mutex_lock(&priv->lock);
entry = ps3vram_cache_match(mtd, from); entry = ps3vram_cache_match(dev, from);
cached = CACHE_OFFSET + entry * priv->cache.page_size + offset; cached = CACHE_OFFSET + entry * priv->cache.page_size + offset;
dev_dbg(priv->dev, "%s:%d: from=%08x cached=%08x offset=%08x " dev_dbg(&dev->core, "%s: from=%08x cached=%08x offset=%08x "
"avail=%08x count=%08x\n", __func__, __LINE__, "avail=%08x count=%08x\n", __func__,
(unsigned int)from, cached, offset, avail, count); (unsigned int)from, cached, offset, avail, count);
if (avail > count) if (avail > count)
...@@ -484,17 +473,17 @@ static int ps3vram_read(struct mtd_info *mtd, loff_t from, size_t len, ...@@ -484,17 +473,17 @@ static int ps3vram_read(struct mtd_info *mtd, loff_t from, size_t len,
return 0; return 0;
} }
static int ps3vram_write(struct mtd_info *mtd, loff_t to, size_t len, static int ps3vram_write(struct ps3_system_bus_device *dev, loff_t to,
size_t *retlen, const u_char *buf) size_t len, size_t *retlen, const u_char *buf)
{ {
struct ps3vram_priv *priv = mtd->priv; struct ps3vram_priv *priv = dev->core.driver_data;
unsigned int cached, count; unsigned int cached, count;
if (to >= mtd->size) if (to >= priv->size)
return -EINVAL; return -EIO;
if (len > mtd->size - to) if (len > priv->size - to)
len = mtd->size - to; len = priv->size - to;
/* Copy from buf to vram */ /* Copy from buf to vram */
count = len; count = len;
...@@ -507,12 +496,12 @@ static int ps3vram_write(struct mtd_info *mtd, loff_t to, size_t len, ...@@ -507,12 +496,12 @@ static int ps3vram_write(struct mtd_info *mtd, loff_t to, size_t len,
mutex_lock(&priv->lock); mutex_lock(&priv->lock);
entry = ps3vram_cache_match(mtd, to); entry = ps3vram_cache_match(dev, to);
cached = CACHE_OFFSET + entry * priv->cache.page_size + offset; cached = CACHE_OFFSET + entry * priv->cache.page_size + offset;
dev_dbg(priv->dev, "%s:%d: to=%08x cached=%08x offset=%08x " dev_dbg(&dev->core, "%s: to=%08x cached=%08x offset=%08x "
"avail=%08x count=%08x\n", __func__, __LINE__, "avail=%08x count=%08x\n", __func__, (unsigned int)to,
(unsigned int)to, cached, offset, avail, count); cached, offset, avail, count);
if (avail > count) if (avail > count)
avail = count; avail = count;
...@@ -531,36 +520,114 @@ static int ps3vram_write(struct mtd_info *mtd, loff_t to, size_t len, ...@@ -531,36 +520,114 @@ static int ps3vram_write(struct mtd_info *mtd, loff_t to, size_t len,
return 0; return 0;
} }
static int ps3vram_proc_show(struct seq_file *m, void *v)
{
struct ps3vram_priv *priv = m->private;
seq_printf(m, "hit:%u\nmiss:%u\n", priv->cache.hit, priv->cache.miss);
return 0;
}
static int ps3vram_proc_open(struct inode *inode, struct file *file)
{
return single_open(file, ps3vram_proc_show, PDE(inode)->data);
}
static const struct file_operations ps3vram_proc_fops = {
.owner = THIS_MODULE,
.open = ps3vram_proc_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
static void __devinit ps3vram_proc_init(struct ps3_system_bus_device *dev)
{
struct ps3vram_priv *priv = dev->core.driver_data;
struct proc_dir_entry *pde;
pde = proc_create(DEVICE_NAME, 0444, NULL, &ps3vram_proc_fops);
if (!pde) {
dev_warn(&dev->core, "failed to create /proc entry\n");
return;
}
pde->owner = THIS_MODULE;
pde->data = priv;
}
static int ps3vram_make_request(struct request_queue *q, struct bio *bio)
{
struct ps3_system_bus_device *dev = q->queuedata;
int write = bio_data_dir(bio) == WRITE;
const char *op = write ? "write" : "read";
loff_t offset = bio->bi_sector << 9;
int error = 0;
struct bio_vec *bvec;
unsigned int i;
dev_dbg(&dev->core, "%s\n", __func__);
bio_for_each_segment(bvec, bio, i) {
/* PS3 is ppc64, so we don't handle highmem */
char *ptr = page_address(bvec->bv_page) + bvec->bv_offset;
size_t len = bvec->bv_len, retlen;
dev_dbg(&dev->core, " %s %zu bytes at offset %llu\n", op,
len, offset);
if (write)
error = ps3vram_write(dev, offset, len, &retlen, ptr);
else
error = ps3vram_read(dev, offset, len, &retlen, ptr);
if (error) {
dev_err(&dev->core, "%s failed\n", op);
goto out;
}
if (retlen != len) {
dev_err(&dev->core, "Short %s\n", op);
goto out;
}
offset += len;
}
dev_dbg(&dev->core, "%s completed\n", op);
out:
bio_endio(bio, error);
return 0;
}
static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev) static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev)
{ {
struct ps3vram_priv *priv; struct ps3vram_priv *priv;
int status; int error, status;
u64 ddr_lpar; struct request_queue *queue;
u64 ctrl_lpar; struct gendisk *gendisk;
u64 info_lpar; u64 ddr_lpar, ctrl_lpar, info_lpar, reports_lpar, ddr_size,
u64 reports_lpar; reports_size;
u64 ddr_size;
u64 reports_size;
int ret = -ENOMEM;
char *rest; char *rest;
ret = -EIO; priv = kzalloc(sizeof(*priv), GFP_KERNEL);
ps3vram_mtd.priv = kzalloc(sizeof(struct ps3vram_priv), GFP_KERNEL); if (!priv) {
if (!ps3vram_mtd.priv) error = -ENOMEM;
goto out; goto fail;
priv = ps3vram_mtd.priv; }
mutex_init(&priv->lock); mutex_init(&priv->lock);
priv->dev = &dev->core; dev->core.driver_data = priv;
priv = dev->core.driver_data;
/* Allocate XDR buffer (1MiB aligned) */ /* Allocate XDR buffer (1MiB aligned) */
priv->xdr_buf = (void *)__get_free_pages(GFP_KERNEL, priv->xdr_buf = (void *)__get_free_pages(GFP_KERNEL,
get_order(XDR_BUF_SIZE)); get_order(XDR_BUF_SIZE));
if (priv->xdr_buf == NULL) { if (priv->xdr_buf == NULL) {
dev_dbg(&dev->core, "%s:%d: could not allocate XDR buffer\n", dev_err(&dev->core, "Could not allocate XDR buffer\n");
__func__, __LINE__); error = -ENOMEM;
ret = -ENOMEM; goto fail_free_priv;
goto out_free_priv;
} }
/* Put FIFO at begginning of XDR buffer */ /* Put FIFO at begginning of XDR buffer */
...@@ -569,22 +636,17 @@ static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev) ...@@ -569,22 +636,17 @@ static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev)
/* XXX: Need to open GPU, in case ps3fb or snd_ps3 aren't loaded */ /* XXX: Need to open GPU, in case ps3fb or snd_ps3 aren't loaded */
if (ps3_open_hv_device(dev)) { if (ps3_open_hv_device(dev)) {
dev_err(&dev->core, "%s:%d: ps3_open_hv_device failed\n", dev_err(&dev->core, "ps3_open_hv_device failed\n");
__func__, __LINE__); error = -EAGAIN;
ret = -EAGAIN;
goto out_close_gpu; goto out_close_gpu;
} }
/* Request memory */ /* Request memory */
status = -1; status = -1;
ddr_size = memparse(size, &rest); ddr_size = ALIGN(memparse(size, &rest), 1024*1024);
if (*rest == '-') if (!ddr_size) {
ddr_size -= ps3fb_videomemory.size; dev_err(&dev->core, "Specified size is too small\n");
ddr_size = ALIGN(ddr_size, 1024*1024); error = -EINVAL;
if (ddr_size <= 0) {
dev_err(&dev->core, "%s:%d: specified size is too small\n",
__func__, __LINE__);
ret = -EINVAL;
goto out_close_gpu; goto out_close_gpu;
} }
...@@ -596,25 +658,22 @@ static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev) ...@@ -596,25 +658,22 @@ static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev)
break; break;
ddr_size -= 1024*1024; ddr_size -= 1024*1024;
} }
if (status || ddr_size <= 0) { if (status) {
dev_err(&dev->core, "%s:%d: lv1_gpu_memory_allocate failed\n", dev_err(&dev->core, "lv1_gpu_memory_allocate failed %d\n",
__func__, __LINE__); status);
ret = -ENOMEM; error = -ENOMEM;
goto out_free_xdr_buf; goto out_free_xdr_buf;
} }
/* Request context */ /* Request context */
status = lv1_gpu_context_allocate(priv->memory_handle, status = lv1_gpu_context_allocate(priv->memory_handle, 0,
0, &priv->context_handle, &ctrl_lpar,
&priv->context_handle, &info_lpar, &reports_lpar,
&ctrl_lpar,
&info_lpar,
&reports_lpar,
&reports_size); &reports_size);
if (status) { if (status) {
dev_err(&dev->core, "%s:%d: lv1_gpu_context_allocate failed\n", dev_err(&dev->core, "lv1_gpu_context_allocate failed %d\n",
__func__, __LINE__); status);
ret = -ENOMEM; error = -ENOMEM;
goto out_free_memory; goto out_free_memory;
} }
...@@ -623,82 +682,97 @@ static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev) ...@@ -623,82 +682,97 @@ static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev)
ps3_mm_phys_to_lpar(__pa(priv->xdr_buf)), ps3_mm_phys_to_lpar(__pa(priv->xdr_buf)),
XDR_BUF_SIZE, 0); XDR_BUF_SIZE, 0);
if (status) { if (status) {
dev_err(&dev->core, "%s:%d: lv1_gpu_context_iomap failed\n", dev_err(&dev->core, "lv1_gpu_context_iomap failed %d\n",
__func__, __LINE__); status);
ret = -ENOMEM; error = -ENOMEM;
goto out_free_context; goto out_free_context;
} }
priv->ddr_base = ioremap_flags(ddr_lpar, ddr_size, _PAGE_NO_CACHE); priv->ddr_base = ioremap_flags(ddr_lpar, ddr_size, _PAGE_NO_CACHE);
if (!priv->ddr_base) { if (!priv->ddr_base) {
dev_err(&dev->core, "%s:%d: ioremap failed\n", __func__, dev_err(&dev->core, "ioremap DDR failed\n");
__LINE__); error = -ENOMEM;
ret = -ENOMEM;
goto out_free_context; goto out_free_context;
} }
priv->ctrl = ioremap(ctrl_lpar, 64 * 1024); priv->ctrl = ioremap(ctrl_lpar, 64 * 1024);
if (!priv->ctrl) { if (!priv->ctrl) {
dev_err(&dev->core, "%s:%d: ioremap failed\n", __func__, dev_err(&dev->core, "ioremap CTRL failed\n");
__LINE__); error = -ENOMEM;
ret = -ENOMEM;
goto out_unmap_vram; goto out_unmap_vram;
} }
priv->reports = ioremap(reports_lpar, reports_size); priv->reports = ioremap(reports_lpar, reports_size);
if (!priv->reports) { if (!priv->reports) {
dev_err(&dev->core, "%s:%d: ioremap failed\n", __func__, dev_err(&dev->core, "ioremap REPORTS failed\n");
__LINE__); error = -ENOMEM;
ret = -ENOMEM;
goto out_unmap_ctrl; goto out_unmap_ctrl;
} }
mutex_lock(&ps3_gpu_mutex); mutex_lock(&ps3_gpu_mutex);
ps3vram_init_ring(&ps3vram_mtd); ps3vram_init_ring(dev);
mutex_unlock(&ps3_gpu_mutex); mutex_unlock(&ps3_gpu_mutex);
ps3vram_mtd.name = "ps3vram"; priv->size = ddr_size;
ps3vram_mtd.size = ddr_size;
ps3vram_mtd.flags = MTD_CAP_RAM; ps3vram_bind(dev);
ps3vram_mtd.erase = ps3vram_erase;
ps3vram_mtd.point = NULL;
ps3vram_mtd.unpoint = NULL;
ps3vram_mtd.read = ps3vram_read;
ps3vram_mtd.write = ps3vram_write;
ps3vram_mtd.owner = THIS_MODULE;
ps3vram_mtd.type = MTD_RAM;
ps3vram_mtd.erasesize = CACHE_PAGE_SIZE;
ps3vram_mtd.writesize = 1;
ps3vram_bind(&ps3vram_mtd);
mutex_lock(&ps3_gpu_mutex); mutex_lock(&ps3_gpu_mutex);
ret = ps3vram_wait_ring(&ps3vram_mtd, 100); error = ps3vram_wait_ring(dev, 100);
mutex_unlock(&ps3_gpu_mutex); mutex_unlock(&ps3_gpu_mutex);
if (ret < 0) { if (error < 0) {
dev_err(&dev->core, "%s:%d: failed to initialize channels\n", dev_err(&dev->core, "Failed to initialize channels\n");
__func__, __LINE__); error = -ETIMEDOUT;
ret = -ETIMEDOUT;
goto out_unmap_reports; goto out_unmap_reports;
} }
ps3vram_cache_init(&ps3vram_mtd); ps3vram_cache_init(dev);
ps3vram_proc_init(dev);
if (add_mtd_device(&ps3vram_mtd)) { queue = blk_alloc_queue(GFP_KERNEL);
dev_err(&dev->core, "%s:%d: add_mtd_device failed\n", if (!queue) {
__func__, __LINE__); dev_err(&dev->core, "blk_alloc_queue failed\n");
ret = -EAGAIN; error = -ENOMEM;
goto out_cache_cleanup; goto out_cache_cleanup;
} }
dev_info(&dev->core, "reserved %u MiB of gpu memory\n", priv->queue = queue;
(unsigned int)(ddr_size / 1024 / 1024)); queue->queuedata = dev;
blk_queue_make_request(queue, ps3vram_make_request);
blk_queue_max_phys_segments(queue, MAX_PHYS_SEGMENTS);
blk_queue_max_hw_segments(queue, MAX_HW_SEGMENTS);
blk_queue_max_segment_size(queue, MAX_SEGMENT_SIZE);
blk_queue_max_sectors(queue, SAFE_MAX_SECTORS);
gendisk = alloc_disk(1);
if (!gendisk) {
dev_err(&dev->core, "alloc_disk failed\n");
error = -ENOMEM;
goto fail_cleanup_queue;
}
priv->gendisk = gendisk;
gendisk->major = ps3vram_major;
gendisk->first_minor = 0;
gendisk->fops = &ps3vram_fops;
gendisk->queue = queue;
gendisk->private_data = dev;
gendisk->driverfs_dev = &dev->core;
strlcpy(gendisk->disk_name, DEVICE_NAME, sizeof(gendisk->disk_name));
set_capacity(gendisk, priv->size >> 9);
dev_info(&dev->core, "%s: Using %lu MiB of GPU memory\n",
gendisk->disk_name, get_capacity(gendisk) >> 11);
add_disk(gendisk);
return 0; return 0;
fail_cleanup_queue:
blk_cleanup_queue(queue);
out_cache_cleanup: out_cache_cleanup:
ps3vram_cache_cleanup(&ps3vram_mtd); remove_proc_entry(DEVICE_NAME, NULL);
ps3vram_cache_cleanup(dev);
out_unmap_reports: out_unmap_reports:
iounmap(priv->reports); iounmap(priv->reports);
out_unmap_ctrl: out_unmap_ctrl:
...@@ -713,21 +787,22 @@ static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev) ...@@ -713,21 +787,22 @@ static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev)
ps3_close_hv_device(dev); ps3_close_hv_device(dev);
out_free_xdr_buf: out_free_xdr_buf:
free_pages((unsigned long) priv->xdr_buf, get_order(XDR_BUF_SIZE)); free_pages((unsigned long) priv->xdr_buf, get_order(XDR_BUF_SIZE));
out_free_priv: fail_free_priv:
kfree(ps3vram_mtd.priv); kfree(priv);
ps3vram_mtd.priv = NULL; dev->core.driver_data = NULL;
out: fail:
return ret; return error;
} }
static int ps3vram_shutdown(struct ps3_system_bus_device *dev) static int ps3vram_remove(struct ps3_system_bus_device *dev)
{ {
struct ps3vram_priv *priv; struct ps3vram_priv *priv = dev->core.driver_data;
priv = ps3vram_mtd.priv;
del_mtd_device(&ps3vram_mtd); del_gendisk(priv->gendisk);
ps3vram_cache_cleanup(&ps3vram_mtd); put_disk(priv->gendisk);
blk_cleanup_queue(priv->queue);
remove_proc_entry(DEVICE_NAME, NULL);
ps3vram_cache_cleanup(dev);
iounmap(priv->reports); iounmap(priv->reports);
iounmap(priv->ctrl); iounmap(priv->ctrl);
iounmap(priv->ddr_base); iounmap(priv->ddr_base);
...@@ -736,33 +811,55 @@ static int ps3vram_shutdown(struct ps3_system_bus_device *dev) ...@@ -736,33 +811,55 @@ static int ps3vram_shutdown(struct ps3_system_bus_device *dev)
ps3_close_hv_device(dev); ps3_close_hv_device(dev);
free_pages((unsigned long) priv->xdr_buf, get_order(XDR_BUF_SIZE)); free_pages((unsigned long) priv->xdr_buf, get_order(XDR_BUF_SIZE));
kfree(priv); kfree(priv);
dev->core.driver_data = NULL;
return 0; return 0;
} }
static struct ps3_system_bus_driver ps3vram_driver = { static struct ps3_system_bus_driver ps3vram = {
.match_id = PS3_MATCH_ID_GPU, .match_id = PS3_MATCH_ID_GPU,
.match_sub_id = PS3_MATCH_SUB_ID_GPU_RAMDISK, .match_sub_id = PS3_MATCH_SUB_ID_GPU_RAMDISK,
.core.name = DEVICE_NAME, .core.name = DEVICE_NAME,
.core.owner = THIS_MODULE, .core.owner = THIS_MODULE,
.probe = ps3vram_probe, .probe = ps3vram_probe,
.remove = ps3vram_shutdown, .remove = ps3vram_remove,
.shutdown = ps3vram_shutdown, .shutdown = ps3vram_remove,
}; };
static int __init ps3vram_init(void) static int __init ps3vram_init(void)
{ {
return ps3_system_bus_driver_register(&ps3vram_driver); int error;
if (!firmware_has_feature(FW_FEATURE_PS3_LV1))
return -ENODEV;
error = register_blkdev(0, DEVICE_NAME);
if (error <= 0) {
pr_err("%s: register_blkdev failed %d\n", DEVICE_NAME, error);
return error;
}
ps3vram_major = error;
pr_info("%s: registered block device major %d\n", DEVICE_NAME,
ps3vram_major);
error = ps3_system_bus_driver_register(&ps3vram);
if (error)
unregister_blkdev(ps3vram_major, DEVICE_NAME);
return error;
} }
static void __exit ps3vram_exit(void) static void __exit ps3vram_exit(void)
{ {
ps3_system_bus_driver_unregister(&ps3vram_driver); ps3_system_bus_driver_unregister(&ps3vram);
unregister_blkdev(ps3vram_major, DEVICE_NAME);
} }
module_init(ps3vram_init); module_init(ps3vram_init);
module_exit(ps3vram_exit); module_exit(ps3vram_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Jim Paris <jim@jtan.com>"); MODULE_DESCRIPTION("PS3 Video RAM Storage Driver");
MODULE_DESCRIPTION("MTD driver for PS3 video RAM"); MODULE_AUTHOR("Sony Corporation");
MODULE_ALIAS(PS3_MODULE_ALIAS_GPU_RAMDISK); MODULE_ALIAS(PS3_MODULE_ALIAS_GPU_RAMDISK);
drivers/mtd/devices/Kconfig
View file @ f507cd22
...@@ -120,13 +120,6 @@ config MTD_PHRAM ...@@ -120,13 +120,6 @@ config MTD_PHRAM
doesn't have access to, memory beyond the mem=xxx limit, nvram, doesn't have access to, memory beyond the mem=xxx limit, nvram,
memory on the video card, etc... memory on the video card, etc...
config MTD_PS3VRAM
tristate "PS3 video RAM"
depends on FB_PS3
help
This driver allows you to use excess PS3 video RAM as volatile
storage or system swap.
config MTD_LART config MTD_LART
tristate "28F160xx flash driver for LART" tristate "28F160xx flash driver for LART"
depends on SA1100_LART depends on SA1100_LART
......
drivers/mtd/devices/Makefile
View file @ f507cd22
...@@ -16,4 +16,3 @@ obj-$(CONFIG_MTD_LART) += lart.o ...@@ -16,4 +16,3 @@ obj-$(CONFIG_MTD_LART) += lart.o
obj-$(CONFIG_MTD_BLOCK2MTD) += block2mtd.o obj-$(CONFIG_MTD_BLOCK2MTD) += block2mtd.o
obj-$(CONFIG_MTD_DATAFLASH) += mtd_dataflash.o obj-$(CONFIG_MTD_DATAFLASH) += mtd_dataflash.o
obj-$(CONFIG_MTD_M25P80) += m25p80.o obj-$(CONFIG_MTD_M25P80) += m25p80.o
obj-$(CONFIG_MTD_PS3VRAM) += ps3vram.o
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7