linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Anton Vorontsov <anton.vorontsov@linaro.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Kees Cook <keescook@chromium.org>,
	Colin Cross <ccross@android.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
	John Stultz <john.stultz@linaro.org>,
	arve@android.com, Rebecca Schultz Zavin <rebecca@android.com>,
	Jesper Juhl <jj@chaosbits.net>,
	Randy Dunlap <rdunlap@xenotime.net>,
	Stephen Boyd <sboyd@codeaurora.org>,
	Thomas Meyer <thomas@m3y3r.de>,
	Andrew Morton <akpm@linux-foundation.org>,
	Marco Stornelli <marco.stornelli@gmail.com>,
	WANG Cong <xiyou.wangcong@gmail.com>,
	linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org,
	linaro-kernel@lists.linaro.org, patches@linaro.org,
	kernel-team@android.com
Subject: [PATCH 06/11] persistent_ram: Make it possible to use memory outside of bootmem
Date: Fri, 11 May 2012 17:17:54 -0700	[thread overview]
Message-ID: <20120512001754.GF14782@lizard> (raw)
In-Reply-To: <20120512001506.GA8653@lizard>

This includes devices' memory (e.g. framebuffers or memory mapped
EEPROMs on a local bus), as well as the normal RAM that we don't use
for the main memory.

For the normal (but unused) ram we could use kmaps, but this assumes
highmem support, so we don't bother and just use the memory via
ioremap.

As a side effect, the following hack is possible: when used together
with pstore_ram (new ramoops) module, we can limit the normal RAM region
with mem= and then point ramoops to use the rest of the memory, e.g.

	mem=128M ramoops.mem_address=0x8000000

Sure, we could just reserve the region with memblock_reserve() early in
the arch/ code, and then register a pstore_ram platform device pointing
to the reserved region. It's still a viable option if platform wants
to do so.

Also, we might want to use IO accessors in case of a real device,
but for now we don't bother (the old ramoops wasn't using it either, so
at least we don't make things worse).

Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
---
 drivers/staging/android/persistent_ram.c |   18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/android/persistent_ram.c b/drivers/staging/android/persistent_ram.c
index ab8bff1..c16d7c2 100644
--- a/drivers/staging/android/persistent_ram.c
+++ b/drivers/staging/android/persistent_ram.c
@@ -23,6 +23,7 @@
 #include <linux/rslib.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include <asm/page.h>
 #include "persistent_ram.h"
 
 struct persistent_ram_buffer {
@@ -349,10 +350,25 @@ static void *persistent_ram_vmap(phys_addr_t start, size_t size)
 	return vaddr;
 }
 
+static void *persistent_ram_iomap(phys_addr_t start, size_t size)
+{
+	if (!request_mem_region(start, size, "persistent_ram")) {
+		pr_err("request mem region (0x%llx@0x%llx) failed\n",
+			(unsigned long long)size, (unsigned long long)start);
+		return NULL;
+	}
+
+	return ioremap(start, size);
+}
+
 static int persistent_ram_buffer_map(phys_addr_t start, phys_addr_t size,
 		struct persistent_ram_zone *prz)
 {
-	prz->vaddr = persistent_ram_vmap(start, size);
+	if (pfn_valid(start >> PAGE_SHIFT))
+		prz->vaddr = persistent_ram_vmap(start, size);
+	else
+		prz->vaddr = persistent_ram_iomap(start, size);
+
 	if (!prz->vaddr) {
 		pr_err("%s: Failed to map 0x%llx pages at 0x%llx\n", __func__,
 			(unsigned long long)size, (unsigned long long)start);
-- 
1.7.9.2


  parent reply	other threads:[~2012-05-12  0:19 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-12  0:15 [PATCH 0/11] Merge ramoops and persistent_ram, generic pstore RAM backend Anton Vorontsov
2012-05-12  0:17 ` [PATCH 01/11] persistent_ram: Remove prz->node Anton Vorontsov
2012-05-12  0:17 ` [PATCH 02/11] persistent_ram: Fix buffer size clamping during writes Anton Vorontsov
2012-05-13 16:56   ` Dan Carpenter
2012-05-13 20:38     ` Anton Vorontsov
2012-05-14  3:23   ` Colin Cross
2012-05-14  4:17     ` Greg Kroah-Hartman
2012-05-12  0:17 ` [PATCH 03/11] persistent_ram: Introduce persistent_ram_post_init() Anton Vorontsov
2012-05-12  0:17 ` [PATCH 04/11] persistent_ram: Introduce persistent_ram_new() Anton Vorontsov
2012-05-15  0:37   ` Colin Cross
2012-05-16  0:22     ` Anton Vorontsov
2012-05-12  0:17 ` [PATCH 05/11] persistent_ram: Introduce persistent_ram_vmap() Anton Vorontsov
2012-05-12  0:17 ` Anton Vorontsov [this message]
2012-06-06 21:10   ` [PATCH 06/11] persistent_ram: Make it possible to use memory outside of bootmem Colin Cross
2012-06-06 22:11     ` Anton Vorontsov
2012-05-12  0:18 ` [PATCH 07/11] persistent_ram: Introduce persistent_ram_free() Anton Vorontsov
2012-05-12  0:18 ` [PATCH 08/11] ramoops: Move to fs/pstore/ram.c Anton Vorontsov
2012-05-14 21:34   ` Kees Cook
2012-05-16  0:19     ` Anton Vorontsov
2012-05-15 15:12   ` Shuah Khan
2012-05-16  7:30     ` Anton Vorontsov
2012-05-16 15:17       ` Shuah Khan
2012-05-12  0:18 ` [PATCH 09/11] persistent_ram: Move to fs/pstore/ram_core.c Anton Vorontsov
2012-05-14 21:43   ` Kees Cook
2012-05-12  0:18 ` [PATCH 10/11] pstore/ram: Switch to persistent_ram routines Anton Vorontsov
2012-05-14 22:21   ` Kees Cook
2012-05-16  6:14     ` Anton Vorontsov
2012-05-16 12:44       ` Kees Cook
2012-05-12  0:18 ` [PATCH 11/11] pstore/ram: Add ECC support Anton Vorontsov
2012-05-14 22:22   ` Kees Cook
2012-05-14 15:58 ` [PATCH 0/11] Merge ramoops and persistent_ram, generic pstore RAM backend Greg Kroah-Hartman
2012-05-14 16:30   ` Shuah Khan
2012-05-14 20:45     ` Anton Vorontsov
2012-05-14 20:55       ` Shuah Khan
2012-05-15 15:53       ` Greg Kroah-Hartman
2012-05-15  6:07     ` Marco Stornelli

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=20120512001754.GF14782@lizard \
    --to=anton.vorontsov@linaro.org \
    --cc=akpm@linux-foundation.org \
    --cc=arnd@arndb.de \
    --cc=arve@android.com \
    --cc=ccross@android.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=jj@chaosbits.net \
    --cc=john.stultz@linaro.org \
    --cc=keescook@chromium.org \
    --cc=kernel-team@android.com \
    --cc=linaro-kernel@lists.linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marco.stornelli@gmail.com \
    --cc=patches@linaro.org \
    --cc=rdunlap@xenotime.net \
    --cc=rebecca@android.com \
    --cc=sboyd@codeaurora.org \
    --cc=thomas@m3y3r.de \
    --cc=xiyou.wangcong@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).