|
@@ -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);
|