Introduce addr_map library

Add a library that helps in translating between virtual and physical
addresses.  This library can be useful as a simple means to implement
map_physmem() and virt_to_phys() for platforms that need functionality
beyond the simple 1:1 mapping.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/include/addr_map.h b/include/addr_map.h
new file mode 100644 (file)
index 0000000..d55f5f6
--- /dev/null
+++ b/include/addr_map.h
@@ -0,0 +1,29 @@
+#ifndef __ADDR_MAP_H
+#define __ADDR_MAP_H
+
+/*
+ * Copyright 2008 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * Version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <asm/types.h>
+
+extern phys_addr_t addrmap_virt_to_phys(void *vaddr);
+extern unsigned long addrmap_phys_to_virt(phys_addr_t paddr);
+extern void addrmap_set_entry(unsigned long vaddr, phys_addr_t paddr,
+                               phys_size_t size, int idx);
+
+#endif

diff --git a/lib_generic/Makefile b/lib_generic/Makefile
index d62c39bef76eedfa2d04e9f9b0e120e3de75e196..3f040226e0e8d6417620eec63d377743ef76c372 100644 (file)
--- a/lib_generic/Makefile
+++ b/lib_generic/Makefile
@@ -25,6 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)libgeneric.a
 
+COBJS-$(CONFIG_ADDR_MAP) += addr_map.o
 COBJS-y += bzlib.o
 COBJS-y += bzlib_crctable.o
 COBJS-y += bzlib_decompress.o

diff --git a/lib_generic/addr_map.c b/lib_generic/addr_map.c
new file mode 100644 (file)
index 0000000..ff8532c
--- /dev/null
+++ b/lib_generic/addr_map.c
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2008 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * Version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <addr_map.h>
+
+static struct {
+       phys_addr_t paddr;
+       phys_size_t size;
+       unsigned long vaddr;
+} address_map[CONFIG_SYS_NUM_ADDR_MAP];
+
+phys_addr_t addrmap_virt_to_phys(void * vaddr)
+{
+       int i;
+
+       for (i = 0; i < CONFIG_SYS_NUM_ADDR_MAP; i++) {
+               u64 base, upper, addr;
+
+               if (address_map[i].size == 0)
+                       continue;
+
+               addr = (u64)((u32)vaddr);
+               base = (u64)(address_map[i].vaddr);
+               upper = (u64)(address_map[i].size) + base - 1;
+
+               if (addr >= base && addr <= upper) {
+                       return addr - address_map[i].vaddr + address_map[i].paddr;
+               }
+       }
+
+       return (phys_addr_t)(~0);
+}
+
+unsigned long addrmap_phys_to_virt(phys_addr_t paddr)
+{
+       int i;
+
+       for (i = 0; i < CONFIG_SYS_NUM_ADDR_MAP; i++) {
+               u64 base, upper, addr;
+
+               if (address_map[i].size == 0)
+                       continue;
+
+               addr = (u64)paddr;
+               base = (u64)(address_map[i].paddr);
+               upper = (u64)(address_map[i].size) + base - 1;
+
+               if (addr >= base && addr <= upper) {
+                       return paddr - address_map[i].paddr + address_map[i].vaddr;
+               }
+       }
+
+       return (unsigned long)(~0);
+}
+
+void addrmap_set_entry(unsigned long vaddr, phys_addr_t paddr,
+                       phys_size_t size, int idx)
+{
+       if (idx > CONFIG_SYS_NUM_ADDR_MAP)
+               return;
+
+       address_map[idx].vaddr = vaddr;
+       address_map[idx].paddr = paddr;
+       address_map[idx].size  = size;
+}