[coreboot-gerrit] New patch to review for coreboot: f21e33a libpayload: arch/mips: add virt/bus/phy_to_bus/phy/virt operations

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8746

-gerrit

commit f21e33a8f15f5223b4de56cb8017beee8560bfa7
Author: Ionela Voinescu <ionela.voinescu at imgtec.com>
Date:   Mon Feb 2 14:48:12 2015 +0000

    libpayload: arch/mips: add virt/bus/phy_to_bus/phy/virt operations
    
    BUG=chrome-os-partner:31438
    TEST=tested on Pistachio FPGA and bring up board; works as
         expected
    BRANCH=none
    
    Change-Id: I368494f388b82969dda0ce73a38824791efce616
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: e4c2bbcbdbcf706062724cffe2d5f15953468ace
    Original-Change-Id: Id5c9b1d65c6ec87f2aba06995dc940c50afb041f
    Original-Signed-off-by: Ionela Voinescu <ionela.voinescu at imgtec.com>
    Original-Reviewed-on: https://chromium-review.googlesource.com/245386
    Original-Reviewed-by: David Hendricks <dhendrix at chromium.org>
---
 payloads/libpayload/arch/mips/virtual.c         |  3 ++-
 payloads/libpayload/include/mips/arch/virtual.h | 13 ++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/payloads/libpayload/arch/mips/virtual.c b/payloads/libpayload/arch/mips/virtual.c
index 9d22649..5c110d0 100644
--- a/payloads/libpayload/arch/mips/virtual.c
+++ b/payloads/libpayload/arch/mips/virtual.c
@@ -19,7 +19,8 @@
 
 #include <unistd.h>
 
-unsigned long virtual_offset = 0;
+unsigned long virt_to_phys_offset = 0;
+unsigned long virt_to_bus_offset = 0x60000000;
 
 int getpagesize(void)
 {
diff --git a/payloads/libpayload/include/mips/arch/virtual.h b/payloads/libpayload/include/mips/arch/virtual.h
index 70aea20..f470393 100644
--- a/payloads/libpayload/include/mips/arch/virtual.h
+++ b/payloads/libpayload/include/mips/arch/virtual.h
@@ -20,12 +20,15 @@
 #ifndef __MIPS_ARCH_VIRTUAL_H
 #define __MIPS_ARCH_VIRTUAL_H
 
-extern unsigned long virtual_offset;
+extern unsigned long virt_to_phys_offset;
+extern unsigned long virt_to_bus_offset;
 
-#define virt_to_phys(virt) ((unsigned long) (virt) + virtual_offset)
-#define phys_to_virt(phys) ((void *) ((unsigned long) (phys) - virtual_offset))
+#define virt_to_phys(virt)	((unsigned long) (virt) + virt_to_phys_offset)
+#define phys_to_virt(phys)	((void *) ((unsigned long) (phys) -	\
+				virt_to_phys_offset))
 
-#define virt_to_bus(addr) virt_to_phys(addr)
-#define bus_to_virt(addr) phys_to_virt(addr)
+#define virt_to_bus(virt)	((unsigned long) (virt) + virt_to_bus_offset)
+#define bus_to_virt(phys)	((void *) ((unsigned long) (phys) -	\
+				virt_to_bus_offset))
 
 #endif