[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 17/19] pci-host/q35: Move PAM initialization above SMRAM init
From: |
Xiaoyao Li |
Subject: |
[RFC PATCH 17/19] pci-host/q35: Move PAM initialization above SMRAM initialization |
Date: |
Mon, 31 Jul 2023 12:21:59 -0400 |
From: Isaku Yamahata <isaku.yamahata@intel.com>
In mch_realize(), process PAM initialization before SMRAM initialization so
that later patch can skill all the SMRAM related with a single check.
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
---
hw/pci-host/q35.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index 91c46df9ae31..ac1518a94ee4 100644
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -575,6 +575,16 @@ static void mch_realize(PCIDevice *d, Error **errp)
/* setup pci memory mapping */
pc_pci_as_mapping_init(mch->system_memory, mch->pci_address_space);
+ /* PAM */
+ init_pam(&mch->pam_regions[0], OBJECT(mch), mch->ram_memory,
+ mch->system_memory, mch->pci_address_space,
+ PAM_BIOS_BASE, PAM_BIOS_SIZE);
+ for (i = 0; i < ARRAY_SIZE(mch->pam_regions) - 1; ++i) {
+ init_pam(&mch->pam_regions[i + 1], OBJECT(mch), mch->ram_memory,
+ mch->system_memory, mch->pci_address_space,
+ PAM_EXPAN_BASE + i * PAM_EXPAN_SIZE, PAM_EXPAN_SIZE);
+ }
+
/* if *disabled* show SMRAM to all CPUs */
memory_region_init_alias(&mch->smram_region, OBJECT(mch), "smram-region",
mch->pci_address_space,
MCH_HOST_BRIDGE_SMRAM_C_BASE,
@@ -641,15 +651,6 @@ static void mch_realize(PCIDevice *d, Error **errp)
object_property_add_const_link(qdev_get_machine(), "smram",
OBJECT(&mch->smram));
-
- init_pam(&mch->pam_regions[0], OBJECT(mch), mch->ram_memory,
- mch->system_memory, mch->pci_address_space,
- PAM_BIOS_BASE, PAM_BIOS_SIZE);
- for (i = 0; i < ARRAY_SIZE(mch->pam_regions) - 1; ++i) {
- init_pam(&mch->pam_regions[i + 1], OBJECT(mch), mch->ram_memory,
- mch->system_memory, mch->pci_address_space,
- PAM_EXPAN_BASE + i * PAM_EXPAN_SIZE, PAM_EXPAN_SIZE);
- }
}
uint64_t mch_mcfg_base(void)
--
2.34.1
- [RFC PATCH 08/19] HostMem: Add private property to indicate to use kvm gmem, (continued)
- [RFC PATCH 08/19] HostMem: Add private property to indicate to use kvm gmem, Xiaoyao Li, 2023/07/31
- [RFC PATCH 10/19] kvm: Introduce support for memory_attributes, Xiaoyao Li, 2023/07/31
- [RFC PATCH 06/19] i386/pc: Drop pc_machine_kvm_type(), Xiaoyao Li, 2023/07/31
- [RFC PATCH 11/19] kvm/memory: Introduce the infrastructure to set the default shared/private value, Xiaoyao Li, 2023/07/31
- [RFC PATCH 12/19] i386/kvm: Set memory to default private for KVM_X86_SW_PROTECTED_VM, Xiaoyao Li, 2023/07/31
- [RFC PATCH 13/19] physmem: replace function name with __func__ in ram_block_discard_range(), Xiaoyao Li, 2023/07/31
- [RFC PATCH 14/19] physmem: Add ram_block_convert_range, Xiaoyao Li, 2023/07/31
- [RFC PATCH 15/19] kvm: handle KVM_EXIT_MEMORY_FAULT, Xiaoyao Li, 2023/07/31
- [RFC PATCH 16/19] trace/kvm: Add trace for page convertion between shared and private, Xiaoyao Li, 2023/07/31
- [RFC PATCH 17/19] pci-host/q35: Move PAM initialization above SMRAM initialization,
Xiaoyao Li <=
- [RFC PATCH 18/19] q35: Introduce smm_ranges property for q35-pci-host, Xiaoyao Li, 2023/07/31
- Re: [RFC PATCH 00/19] QEMU gmem implemention, Daniel P . Berrangé, 2023/07/31
- Re: [RFC PATCH 00/19] QEMU gmem implemention, Isaku Yamahata, 2023/07/31