[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/6] [fixup] add ESMRAMC default
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 1/6] [fixup] add ESMRAMC default |
Date: |
Mon, 20 Apr 2015 11:19:15 +0200 |
---
hw/pci-host/q35.c | 1 +
include/hw/pci-host/q35.h | 7 ++++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index 79bab15..9735db2 100644
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -351,6 +351,7 @@ static void mch_reset(DeviceState *qdev)
MCH_HOST_BRIDGE_PCIEXBAR_DEFAULT);
d->config[MCH_HOST_BRIDGE_SMRAM] = MCH_HOST_BRIDGE_SMRAM_DEFAULT;
+ d->config[MCH_HOST_BRIDGE_ESMRAMC] = MCH_HOST_BRIDGE_ESMRAMC_DEFAULT;
mch_update(mch);
}
diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h
index e5d5a22..9704ccd 100644
--- a/include/hw/pci-host/q35.h
+++ b/include/hw/pci-host/q35.h
@@ -129,7 +129,6 @@ typedef struct Q35PCIHost {
#define MCH_HOST_BRIDGE_SMRAM 0x9d
#define MCH_HOST_BRIDGE_SMRAM_SIZE 2
-#define MCH_HOST_BRIDGE_SMRAM_DEFAULT ((uint8_t)0x2)
#define MCH_HOST_BRIDGE_SMRAM_D_OPEN ((uint8_t)(1 << 6))
#define MCH_HOST_BRIDGE_SMRAM_D_CLS ((uint8_t)(1 << 5))
#define MCH_HOST_BRIDGE_SMRAM_D_LCK ((uint8_t)(1 << 4))
@@ -140,6 +139,8 @@ typedef struct Q35PCIHost {
#define MCH_HOST_BRIDGE_SMRAM_C_END 0xc0000
#define MCH_HOST_BRIDGE_SMRAM_C_SIZE 0x20000
#define MCH_HOST_BRIDGE_UPPER_SYSTEM_BIOS_END 0x100000
+#define MCH_HOST_BRIDGE_SMRAM_DEFAULT \
+ MCH_HOST_BRIDGE_SMRAM_C_BASE_SEG
#define MCH_HOST_BRIDGE_ESMRAMC 0x9e
#define MCH_HOST_BRIDGE_ESMRAMC_H_SMRAME ((uint8_t)(1 << 7))
@@ -152,6 +153,10 @@ typedef struct Q35PCIHost {
#define MCH_HOST_BRIDGE_ESMRAMC_TSEG_SZ_2MB ((uint8_t)(0x1 << 1))
#define MCH_HOST_BRIDGE_ESMRAMC_TSEG_SZ_8MB ((uint8_t)(0x2 << 1))
#define MCH_HOST_BRIDGE_ESMRAMC_T_EN ((uint8_t)1)
+#define MCH_HOST_BRIDGE_ESMRAMC_DEFAULT \
+ (MCH_HOST_BRIDGE_ESMRAMC_SM_CACHE | \
+ MCH_HOST_BRIDGE_ESMRAMC_SM_L1 | \
+ MCH_HOST_BRIDGE_ESMRAMC_SM_L2)
/* D1:F0 PCIE* port*/
#define MCH_PCIE_DEV 1
--
1.8.3.1
- [Qemu-devel] [PATCH 1/6] [fixup] add ESMRAMC default,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 2/6] add SMRAM+ESMRAMC wmask, Gerd Hoffmann, 2015/04/20
- [Qemu-devel] [PATCH 5/6] [wip] tseg, part1, not (yet) tested, Gerd Hoffmann, 2015/04/20
- Re: [Qemu-devel] [PATCH 5/6] [wip] tseg, part1, not (yet) tested, Paolo Bonzini, 2015/04/20
- Re: [Qemu-devel] [PATCH 5/6] [wip] tseg, part1, not (yet) tested, Laszlo Ersek, 2015/04/21
- Re: [Qemu-devel] [PATCH 5/6] [wip] tseg, part1, not (yet) tested, Gerd Hoffmann, 2015/04/21
- Re: [Qemu-devel] [PATCH 5/6] [wip] tseg, part1, not (yet) tested, Paolo Bonzini, 2015/04/21
- Re: [Qemu-devel] [PATCH 5/6] [wip] tseg, part1, not (yet) tested, Gerd Hoffmann, 2015/04/21
- Re: [Qemu-devel] [PATCH 5/6] [wip] tseg, part1, not (yet) tested, Laszlo Ersek, 2015/04/21
- Re: [Qemu-devel] [PATCH 5/6] [wip] tseg, part1, not (yet) tested, Gerd Hoffmann, 2015/04/22