From: Geert.Uytterhoeven@sonycom•com
To: linuxppc-dev@ozlabs•org, linux-kernel@vger•kernel.org
Cc: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom•com>
Subject: [patch 1/7] ps3: Preallocate bootmem memory for the PS3 FLASH ROM storage driver
Date: Fri, 25 May 2007 10:36:08 +0200 [thread overview]
Message-ID: <20070525083632.177254000@sonycom.com> (raw)
In-Reply-To: 20070525083607.784351000@sonycom.com
Preallocate 256 KiB of bootmem memory for the PS3 FLASH ROM storage driver.
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom•com>
Signed-off-by: Geoff Levand <geoffrey.levand@am•sony.com>
---
arch/powerpc/platforms/ps3/setup.c | 19 ++++++++++++++++++-
include/asm-powerpc/ps3.h | 1 +
2 files changed, 19 insertions(+), 1 deletion(-)
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -99,7 +99,8 @@ static void ps3_panic(char *str)
while(1);
}
-#if defined(CONFIG_FB_PS3) || defined(CONFIG_FB_PS3_MODULE)
+#if defined(CONFIG_FB_PS3) || defined(CONFIG_FB_PS3_MODULE) || \
+ defined(CONFIG_PS3_FLASH_MODULE) || defined(CONFIG_PS3_FLASH_MODULE)
static void prealloc(struct ps3_prealloc *p)
{
if (!p->size)
@@ -115,7 +116,9 @@ static void prealloc(struct ps3_prealloc
printk(KERN_INFO "%s: %lu bytes at %p\n", p->name, p->size,
p->address);
}
+#endif
+#if defined(CONFIG_FB_PS3) || defined(CONFIG_FB_PS3_MODULE)
struct ps3_prealloc ps3fb_videomemory = {
.name = "ps3fb videomemory",
.size = CONFIG_FB_PS3_DEFAULT_SIZE_M*1024*1024,
@@ -138,6 +141,18 @@ early_param("ps3fb", early_parse_ps3fb);
#define prealloc_ps3fb_videomemory() do { } while (0)
#endif
+#if defined(CONFIG_PS3_FLASH) || defined(CONFIG_PS3_FLASH_MODULE)
+struct ps3_prealloc ps3flash_bounce_buffer = {
+ .name = "ps3flash bounce buffer",
+ .size = 256*1024,
+ .align = 256*1024
+};
+EXPORT_SYMBOL_GPL(ps3flash_bounce_buffer);
+#define prealloc_ps3flash_bounce_buffer() prealloc(&ps3flash_bounce_buffer)
+#else
+#define prealloc_ps3flash_bounce_buffer() do { } while (0)
+#endif
+
static int ps3_set_dabr(u64 dabr)
{
enum {DABR_USER = 1, DABR_KERNEL = 2,};
@@ -167,6 +182,8 @@ static void __init ps3_setup_arch(void)
#endif
prealloc_ps3fb_videomemory();
+ prealloc_ps3flash_bounce_buffer();
+
ppc_md.power_save = ps3_power_save;
DBG(" <- %s:%d\n", __func__, __LINE__);
--- a/include/asm-powerpc/ps3.h
+++ b/include/asm-powerpc/ps3.h
@@ -442,6 +442,7 @@ struct ps3_prealloc {
};
extern struct ps3_prealloc ps3fb_videomemory;
+extern struct ps3_prealloc ps3flash_bounce_buffer;
#endif
--
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- Sony Network and Software Technology Center Europe (NSCE)
Geert.Uytterhoeven@sonycom•com ------- The Corporate Village, Da Vincilaan 7-D1
Voice +32-2-7008453 Fax +32-2-7008622 ---------------- B-1935 Zaventem, Belgium
next prev parent reply other threads:[~2007-05-25 8:37 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-25 8:36 [patch 0/7] RFC: PS3 Storage Drivers Geert.Uytterhoeven
2007-05-25 8:36 ` Geert.Uytterhoeven [this message]
2007-05-25 22:35 ` [patch 1/7] ps3: Preallocate bootmem memory for the PS3 FLASH ROM storage driver Benjamin Herrenschmidt
2007-05-26 8:51 ` Geert Uytterhoeven
2007-05-26 22:17 ` Benjamin Herrenschmidt
2007-05-27 18:24 ` Arnd Bergmann
2007-05-25 8:36 ` [patch 2/7] ps3: Extract ps3_repository_find_bus() Geert.Uytterhoeven
2007-05-25 8:36 ` [patch 3/7] ps3: Storage Driver Core Geert.Uytterhoeven
2007-05-25 8:36 ` [patch 4/7] ps3: Storage Driver Probing Geert.Uytterhoeven
2007-05-25 16:18 ` Arnd Bergmann
2007-05-25 17:09 ` Geoff Levand
2007-05-25 19:48 ` Geert Uytterhoeven
2007-05-25 22:54 ` Benjamin Herrenschmidt
2007-05-25 22:47 ` Benjamin Herrenschmidt
2007-05-26 8:56 ` Geert Uytterhoeven
2007-05-25 8:36 ` [patch 5/7] ps3: Disk Storage Driver Geert.Uytterhoeven
2007-05-25 11:45 ` Olaf Hering
2007-05-25 19:43 ` Geert Uytterhoeven
2007-05-25 20:47 ` Olaf Hering
2007-05-25 16:26 ` Arnd Bergmann
2007-05-25 19:40 ` Geert Uytterhoeven
2007-05-25 20:43 ` Arnd Bergmann
2007-05-25 21:22 ` Geert Uytterhoeven
2007-05-25 22:45 ` Arnd Bergmann
2007-05-25 22:53 ` Benjamin Herrenschmidt
2007-05-25 22:48 ` Benjamin Herrenschmidt
2007-05-25 8:36 ` [patch 6/7] ps3: ROM " Geert.Uytterhoeven
2007-05-25 11:24 ` Olaf Hering
2007-05-25 22:45 ` Benjamin Herrenschmidt
2007-05-26 8:52 ` Geert Uytterhoeven
2007-05-26 22:18 ` Benjamin Herrenschmidt
2007-05-29 9:55 ` Christoph Hellwig
2007-05-25 16:50 ` Arnd Bergmann
2007-05-25 19:36 ` Geert Uytterhoeven
2007-05-25 21:04 ` Arnd Bergmann
2007-05-29 10:51 ` Christoph Hellwig
2007-05-29 10:49 ` Christoph Hellwig
2007-05-29 11:11 ` Geert Uytterhoeven
2007-05-29 11:31 ` Benjamin Herrenschmidt
2007-05-30 10:13 ` Christoph Hellwig
2007-05-30 11:45 ` Benjamin Herrenschmidt
2007-05-30 17:18 ` Geoff Levand
2007-05-29 16:21 ` Geert Uytterhoeven
2007-05-30 10:01 ` Christoph Hellwig
2007-05-25 8:36 ` [patch 7/7] ps3: FLASH " Geert.Uytterhoeven
2007-05-29 9:53 ` Christoph Hellwig
2007-05-29 9:57 ` Geert Uytterhoeven
2007-05-29 10:51 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070525083632.177254000@sonycom.com \
--to=geert.uytterhoeven@sonycom$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linuxppc-dev@ozlabs$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox