From 9a26711c293a07cb5911b5f12b531d9993bac6f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonathan=20Neusch=C3=A4fer?= <j.neuschaefer@gmx.net>
Date: Thu, 24 Nov 2016 08:10:12 +0100
Subject: [PATCH] UPSTREAM: arch/riscv/mcall.c: Return the correct memory base
 and size

BUG=None
BRANCH=None
TEST=None

Signed-off-by: Jonathan Neuschfer <j.neuschaefer@gmx.net>
Reviewed-on: https://review.coreboot.org/17594
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>

Change-Id: Ibf471787ccb4f5393b0af737a9f7fc47b853a41a
Reviewed-on: https://chromium-review.googlesource.com/417070
Commit-Ready: Furquan Shaikh <furquan@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
---
 src/arch/riscv/mcall.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/arch/riscv/mcall.c b/src/arch/riscv/mcall.c
index fdc02bef2b..aa61ae464a 100644
--- a/src/arch/riscv/mcall.c
+++ b/src/arch/riscv/mcall.c
@@ -28,6 +28,7 @@
 #include <arch/barrier.h>
 #include <arch/errno.h>
 #include <atomic.h>
+#include <commonlib/configstring.h>
 #include <console/console.h>
 #include <mcall.h>
 #include <string.h>
@@ -36,10 +37,13 @@
 uintptr_t mcall_query_memory(uintptr_t id, memory_block_info *info)
 {
 	if (id == 0) {
-		mprv_write_ulong(&info->base, 2U*GiB);
+		uintptr_t base;
+		size_t size;
 
-		/* TODO: Return the correct value */
-		mprv_write_ulong(&info->size, 1*GiB);
+		query_mem(configstring(), &base, &size);
+
+		mprv_write_ulong(&info->base, base);
+		mprv_write_ulong(&info->size, size);
 		return 0;
 	}