diff -Nru seabios-1.7.4/debian/changelog seabios-1.7.4/debian/changelog --- seabios-1.7.4/debian/changelog 2014-09-11 02:24:48.000000000 +0000 +++ seabios-1.7.4/debian/changelog 2015-08-26 21:28:53.000000000 +0000 @@ -1,10 +1,8 @@ -seabios (1.7.4-4ubuntu0.1) trusty; urgency=medium +seabios (1.7.4-4ubuntu1) trusty-proposed; urgency=medium - * apply resume-restore-piix-pm-config-registers-after-resume.patch: - This enables resume to work properly if a VM has suspended to memory. - (LP: #1366868) + * Turn off VGA_ALLOCATE_EXTRA_STACK (LP: #1404396) - -- Chris J Arges Wed, 10 Sep 2014 21:23:42 -0500 + -- Serge Hallyn Wed, 26 Aug 2015 15:25:11 -0500 seabios (1.7.4-4) unstable; urgency=low diff -Nru seabios-1.7.4/debian/control seabios-1.7.4/debian/control --- seabios-1.7.4/debian/control 2014-02-06 20:39:53.000000000 +0000 +++ seabios-1.7.4/debian/control 2015-08-26 20:25:59.000000000 +0000 @@ -1,7 +1,8 @@ Source: seabios Section: misc Priority: extra -Maintainer: Debian QEMU Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian QEMU Team Uploaders: Aurelien Jarno , Riku Voipio , Vagrant Cascadian , diff -Nru seabios-1.7.4/debian/patches/resume-restore-piix-pm-config-registers-after-resume.patch seabios-1.7.4/debian/patches/resume-restore-piix-pm-config-registers-after-resume.patch --- seabios-1.7.4/debian/patches/resume-restore-piix-pm-config-registers-after-resume.patch 2014-09-11 02:23:30.000000000 +0000 +++ seabios-1.7.4/debian/patches/resume-restore-piix-pm-config-registers-after-resume.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,104 +0,0 @@ -From 744820d1220699f842800ac9e18b273ffe4cf246 Mon Sep 17 00:00:00 2001 -From: Marcel Apfelbaum -Date: Wed, 15 Jan 2014 14:20:06 +0200 -Subject: [PATCH] resume: restore piix pm config registers after resume - -On resume, the OS queries the power management event that -caused it. In order to complete this task, it executes some -reads to the piix pm io space. This all happens before the -OS has a chance to restore the PCI config space for devices, -so it is bios's responsibility to make sure the pm IO space -is configured correctly. (During suspend, the piix pm -configuration space is lost). - -Note: For 'ordinary' pci devices the config space is -saved by the OS on sleep and restored on resume. - -Signed-off-by: Marcel Apfelbaum -Acked-by: Michael S. Tsirkin -(cherry picked from commit 40d020f56226aee7c75a6c29f471c4b866765732) -Signed-off-by: Chris J Arges ---- - src/fw/pciinit.c | 24 +++++++++++++++++++++--- - src/resume.c | 2 ++ - src/util.h | 1 + - 3 files changed, 24 insertions(+), 3 deletions(-) - -diff --git a/src/fw/pciinit.c b/src/fw/pciinit.c -index a24b8ff..11c92ae 100644 ---- a/src/fw/pciinit.c -+++ b/src/fw/pciinit.c -@@ -230,10 +230,8 @@ static void apple_macio_setup(struct pci_device *pci, void *arg) - pci_set_io_region_addr(pci, 0, 0x80800000, 0); - } - --/* PIIX4 Power Management device (for ACPI) */ --static void piix4_pm_setup(struct pci_device *pci, void *arg) -+static void piix4_pm_config_setup(u16 bdf) - { -- u16 bdf = pci->bdf; - // acpi sci is hardwired to 9 - pci_config_writeb(bdf, PCI_INTERRUPT_LINE, 9); - -@@ -241,6 +239,15 @@ static void piix4_pm_setup(struct pci_device *pci, void *arg) - pci_config_writeb(bdf, 0x80, 0x01); /* enable PM io space */ - pci_config_writel(bdf, 0x90, PORT_SMB_BASE | 1); - pci_config_writeb(bdf, 0xd2, 0x09); /* enable SMBus io space */ -+} -+ -+static int PiixPmBDF = -1; -+ -+/* PIIX4 Power Management device (for ACPI) */ -+static void piix4_pm_setup(struct pci_device *pci, void *arg) -+{ -+ PiixPmBDF = pci->bdf; -+ piix4_pm_config_setup(pci->bdf); - - acpi_pm1a_cnt = PORT_ACPI_PM_BASE + 0x04; - pmtimer_setup(PORT_ACPI_PM_BASE + 0x08); -@@ -295,6 +302,17 @@ static const struct pci_device_id pci_device_tbl[] = { - PCI_DEVICE_END, - }; - -+void pci_resume(void) -+{ -+ if (!CONFIG_QEMU) { -+ return; -+ } -+ -+ if (PiixPmBDF >= 0) { -+ piix4_pm_config_setup(PiixPmBDF); -+ } -+} -+ - static void pci_bios_init_device(struct pci_device *pci) - { - u16 bdf = pci->bdf; -diff --git a/src/resume.c b/src/resume.c -index d69429c..9ad2e4f 100644 ---- a/src/resume.c -+++ b/src/resume.c -@@ -101,6 +101,8 @@ s3_resume(void) - pic_setup(); - smm_setup(); - -+ pci_resume(); -+ - s3_resume_vga(); - - make_bios_readonly(); -diff --git a/src/util.h b/src/util.h -index 1b7d525..b8acbfa 100644 ---- a/src/util.h -+++ b/src/util.h -@@ -99,6 +99,7 @@ void mtrr_setup(void); - // fw/pciinit.c - extern const u8 pci_irqs[4]; - void pci_setup(void); -+void pci_resume(void); - - // fw/pirtable.c - extern struct pir_header *PirAddr; --- -1.9.1 - diff -Nru seabios-1.7.4/debian/patches/series seabios-1.7.4/debian/patches/series --- seabios-1.7.4/debian/patches/series 2014-09-11 02:23:18.000000000 +0000 +++ seabios-1.7.4/debian/patches/series 2015-08-26 20:26:48.000000000 +0000 @@ -1,3 +1,3 @@ vgabios-Make-sure-exported-structs-use-PACKED.diff vgabios-attempt-to-detect-old-x86emu-and-force-a-fault.diff -resume-restore-piix-pm-config-registers-after-resume.patch +turn-vga-allocate-extra-stack-off diff -Nru seabios-1.7.4/debian/patches/turn-vga-allocate-extra-stack-off seabios-1.7.4/debian/patches/turn-vga-allocate-extra-stack-off --- seabios-1.7.4/debian/patches/turn-vga-allocate-extra-stack-off 1970-01-01 00:00:00.000000000 +0000 +++ seabios-1.7.4/debian/patches/turn-vga-allocate-extra-stack-off 2015-08-26 20:27:48.000000000 +0000 @@ -0,0 +1,13 @@ +Index: seabios-1.7.4/vgasrc/Kconfig +=================================================================== +--- seabios-1.7.4.orig/vgasrc/Kconfig ++++ seabios-1.7.4/vgasrc/Kconfig +@@ -71,7 +71,7 @@ menu "VGA ROM" + config VGA_ALLOCATE_EXTRA_STACK + depends on BUILD_VGABIOS + bool "Allocate an internal stack for 16bit interrupt entry point" +- default y ++ default n + help + Attempt to allocate (via BIOS PMM call) an internal stack + for the legacy 16bit 0x10 interrupt entry point. This