|
 |
686d41 |
From d659d62b9c094acea66f6f7506877f210a9dd182 Mon Sep 17 00:00:00 2001
|
|
|
8073c5 |
From: Andrea Arcangeli <aarcange@redhat.com>
|
|
|
8073c5 |
Date: Tue, 8 Oct 2013 17:07:23 +0200
|
|
|
8073c5 |
Subject: allow >1TB of RAM
|
|
|
686d41 |
MIME-Version: 1.0
|
|
|
686d41 |
Content-Type: text/plain; charset=UTF-8
|
|
|
686d41 |
Content-Transfer-Encoding: 8bit
|
|
|
8073c5 |
|
|
|
8073c5 |
RH-Author: Andrea Arcangeli <aarcange@redhat.com>
|
|
|
8073c5 |
Message-id: <1381252043-13480-2-git-send-email-aarcange@redhat.com>
|
|
|
8073c5 |
Patchwork-id: 54785
|
|
|
8073c5 |
O-Subject: [RHEL-7.0 seabios PATCH] allow >1TB of RAM
|
|
|
8073c5 |
Bugzilla: 1016974
|
|
|
8073c5 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
8073c5 |
RH-Acked-by: Gleb Natapov <gleb@redhat.com>
|
|
|
8073c5 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
8073c5 |
|
|
|
8073c5 |
Receive bits 40-48 from qemu to setup e820 maps with more than 1TB of ram.
|
|
|
8073c5 |
|
|
|
8073c5 |
Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
|
|
|
8073c5 |
---
|
|
|
8073c5 |
src/cmos.h | 7 ++++---
|
|
|
8073c5 |
src/post.c | 7 ++++---
|
|
|
8073c5 |
2 files changed, 8 insertions(+), 6 deletions(-)
|
|
|
8073c5 |
|
|
|
686d41 |
(cherry picked from commit 0dea1df1f9b9a64bd9e71dd1a7b4c6cc9962afa0)
|
|
|
686d41 |
Signed-off-by: Paweł Poławski <ppolawsk@redhat.com>
|
|
|
8073c5 |
---
|
|
|
8073c5 |
src/fw/paravirt.c | 7 ++++---
|
|
|
8073c5 |
src/hw/rtc.h | 7 ++++---
|
|
|
8073c5 |
2 files changed, 8 insertions(+), 6 deletions(-)
|
|
|
8073c5 |
|
|
|
8073c5 |
diff --git a/src/fw/paravirt.c b/src/fw/paravirt.c
|
|
|
686d41 |
index fba4e52d..090d6555 100644
|
|
|
8073c5 |
--- a/src/fw/paravirt.c
|
|
|
8073c5 |
+++ b/src/fw/paravirt.c
|
|
|
7fc37f |
@@ -516,9 +516,10 @@ qemu_cfg_e820(void)
|
|
|
8073c5 |
}
|
|
|
8073c5 |
|
|
|
8073c5 |
// Check for memory over 4Gig in cmos
|
|
|
8073c5 |
- u64 high = ((rtc_read(CMOS_MEM_HIGHMEM_LOW) << 16)
|
|
|
8073c5 |
- | ((u32)rtc_read(CMOS_MEM_HIGHMEM_MID) << 24)
|
|
|
8073c5 |
- | ((u64)rtc_read(CMOS_MEM_HIGHMEM_HIGH) << 32));
|
|
|
8073c5 |
+ u64 high = ((rtc_read(CMOS_MEM_HIGHMEM_16) << 16)
|
|
|
8073c5 |
+ | ((u32)rtc_read(CMOS_MEM_HIGHMEM_24) << 24)
|
|
|
8073c5 |
+ | ((u64)rtc_read(CMOS_MEM_HIGHMEM_32) << 32)
|
|
|
8073c5 |
+ | ((u64)rtc_read(CMOS_MEM_HIGHMEM_40) << 40));
|
|
|
8073c5 |
RamSizeOver4G = high;
|
|
|
8073c5 |
e820_add(0x100000000ull, high, E820_RAM);
|
|
|
8073c5 |
dprintf(1, "RamSizeOver4G: 0x%016llx [cmos]\n", RamSizeOver4G);
|
|
|
8073c5 |
diff --git a/src/hw/rtc.h b/src/hw/rtc.h
|
|
|
686d41 |
index 252e73a4..c4369f81 100644
|
|
|
8073c5 |
--- a/src/hw/rtc.h
|
|
|
8073c5 |
+++ b/src/hw/rtc.h
|
|
|
8073c5 |
@@ -41,9 +41,10 @@
|
|
|
8073c5 |
#define CMOS_BIOS_BOOTFLAG1 0x38
|
|
|
8073c5 |
#define CMOS_BIOS_DISKTRANSFLAG 0x39
|
|
|
8073c5 |
#define CMOS_BIOS_BOOTFLAG2 0x3d
|
|
|
8073c5 |
-#define CMOS_MEM_HIGHMEM_LOW 0x5b
|
|
|
8073c5 |
-#define CMOS_MEM_HIGHMEM_MID 0x5c
|
|
|
8073c5 |
-#define CMOS_MEM_HIGHMEM_HIGH 0x5d
|
|
|
8073c5 |
+#define CMOS_MEM_HIGHMEM_16 0x5b
|
|
|
8073c5 |
+#define CMOS_MEM_HIGHMEM_24 0x5c
|
|
|
8073c5 |
+#define CMOS_MEM_HIGHMEM_32 0x5d
|
|
|
8073c5 |
+#define CMOS_MEM_HIGHMEM_40 0x5e
|
|
|
8073c5 |
#define CMOS_BIOS_SMP_COUNT 0x5f
|
|
|
8073c5 |
|
|
|
8073c5 |
// RTC register flags
|
|
|
8073c5 |
--
|
|
|
686d41 |
2.31.1
|
|
|
8073c5 |
|