[coreboot-gerrit] New patch to review for coreboot: caef295 libpayload: mips: Add macros to convert to/from KSEG{0, 1} addresses

[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/9821

-gerrit

commit caef295fa647edc096115fc93a8b5a050183f4d2
Author: Andrew Bresticker <abrestic at chromium.org>
Date:   Fri Feb 6 11:17:35 2015 -0800

    libpayload: mips: Add macros to convert to/from KSEG{0,1} addresses
    
    Add helper macros to convert between physical addresses and KSEG{0,1}
    addresses.  Also get rid of the virt_to_{bus,phys}_offset variables
    as these are fixed values.
    
    As nobody seems to be using getpagesize() on MIPS, no need to keep
    virtual.c.
    
    BUG=chrome-os-partner:36258
    BRANCH=none
    TEST=Build and boot on Pistachio.
    
    Change-Id: Ia26c8eae53eb8f860747a6b321363776841d1a94
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: c422b02e9a2a20d130913b1cfb835ad74c39ddca
    Original-Change-Id: I9476cd225a08534830c700cba7bf9d3ef871757e
    Original-Signed-off-by: Andrew Bresticker <abrestic at chromium.org>
    Original-Signed-off-by: Vadim Bendebury <vbendeb at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/247190
---
 payloads/libpayload/arch/mips/Makefile.inc      |  1 -
 payloads/libpayload/arch/mips/virtual.c         | 28 -------------------------
 payloads/libpayload/include/mips/arch/virtual.h | 20 +++++++++++-------
 3 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/payloads/libpayload/arch/mips/Makefile.inc b/payloads/libpayload/arch/mips/Makefile.inc
index 223b3df..a6c4bd1 100644
--- a/payloads/libpayload/arch/mips/Makefile.inc
+++ b/payloads/libpayload/arch/mips/Makefile.inc
@@ -36,4 +36,3 @@ libc-y += sysinfo.c
 libc-y += string.c
 libc-y += timer.c
 libc-y += util.S
-libc-y += virtual.c
diff --git a/payloads/libpayload/arch/mips/virtual.c b/payloads/libpayload/arch/mips/virtual.c
deleted file mode 100644
index 5c110d0..0000000
--- a/payloads/libpayload/arch/mips/virtual.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * This file is part of the libpayload project.
- *
- * Copyright (C) 2014 Imagination Technologies
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <unistd.h>
-
-unsigned long virt_to_phys_offset = 0;
-unsigned long virt_to_bus_offset = 0x60000000;
-
-int getpagesize(void)
-{
-	return 4096;
-};
diff --git a/payloads/libpayload/include/mips/arch/virtual.h b/payloads/libpayload/include/mips/arch/virtual.h
index f470393..8c645e6 100644
--- a/payloads/libpayload/include/mips/arch/virtual.h
+++ b/payloads/libpayload/include/mips/arch/virtual.h
@@ -20,15 +20,19 @@
 #ifndef __MIPS_ARCH_VIRTUAL_H
 #define __MIPS_ARCH_VIRTUAL_H
 
-extern unsigned long virt_to_phys_offset;
-extern unsigned long virt_to_bus_offset;
+#define KSEG0_BASE		0x80000000
+#define KSEG1_BASE		0xA0000000
 
-#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 kseg0_to_phys(virt)	((unsigned long)(virt) - KSEG0_BASE)
+#define phys_to_kseg0(phys)	((void *)((unsigned long)(phys) + KSEG0_BASE))
 
-#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))
+#define kseg1_to_phys(virt)	((unsigned long)(virt) - KSEG1_BASE)
+#define phys_to_kseg1(phys)	((void *)((unsigned long)(phys) + KSEG1_BASE))
+
+#define virt_to_phys(virt)	((unsigned long)(virt))
+#define phys_to_virt(phys)	((void *)(unsigned long)(phys))
+
+#define virt_to_bus(virt)	kseg1_to_phys(virt)
+#define bus_to_virt(phys)	phys_to_kseg1(phys)
 
 #endif