--- src/fw/pciinit.c | 3 +++ src/resume.c | 9 --------- 2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/fw/pciinit.c b/src/fw/pciinit.c index b3e359d7..6727546d 100644 --- a/src/fw/pciinit.c +++ b/src/fw/pciinit.c @@ -382,6 +382,9 @@ void pci_resume(void) if (!CONFIG_QEMU) { return; } + make_bios_writable(); + extern volatile u32 mmconfig; + mmconfig = 0;
if (PiixPmBDF >= 0) { piix4_pm_config_setup(PiixPmBDF); diff --git a/src/resume.c b/src/resume.c index 10b873c3..fb0b8a89 100644 --- a/src/resume.c +++ b/src/resume.c @@ -96,15 +96,6 @@ s3_resume(void) return; }
- make_bios_writable(); - // reset mmconfig to make sure that we don't use PCIe to - // resume PCIe - dprintf(1, "resetting mmconfig\n"); - extern volatile u32 mmconfig; - mmconfig = 0; - dprintf(1, "mmconfig: 0x%x\n", mmconfig); -// make_bios_readonly(); - pic_setup(); smm_setup(); smp_resume(); -- 2.45.2