diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-04-06 09:27:49 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-04-06 09:27:49 +0100 |
| commit | 54d689988c847271d87b3eb113712147129fb811 (patch) | |
| tree | 29698f0c769de5fa61fcc61a98c20a5701571861 | |
| parent | 1fde6ee885d3e778acb326cab9f7037939839537 (diff) | |
| parent | 8c9f42f3cf3598e8bb612b3f81cd12632efd3ca4 (diff) | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* TCO watchdog fix
# gpg: Signature made Wed 05 Apr 2017 16:24:52 BST
# gpg: using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream:
tco: do not generate an NMI
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/acpi/tco.c | 2 | ||||
| -rw-r--r-- | hw/isa/lpc_ich9.c | 5 | ||||
| -rw-r--r-- | include/hw/i386/ich9.h | 1 |
3 files changed, 0 insertions, 8 deletions
diff --git a/hw/acpi/tco.c b/hw/acpi/tco.c index b4adac88cd..05b9d7ba36 100644 --- a/hw/acpi/tco.c +++ b/hw/acpi/tco.c @@ -75,8 +75,6 @@ static void tco_timer_expired(void *opaque) if (pm->smi_en & ICH9_PMIO_SMI_EN_TCO_EN) { ich9_generate_smi(); - } else { - ich9_generate_nmi(); } tr->tco.rld = tr->tco.tmr; tco_timer_reload(tr); diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 59930dd9d0..a0866c3856 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -312,11 +312,6 @@ void ich9_generate_smi(void) cpu_interrupt(first_cpu, CPU_INTERRUPT_SMI); } -void ich9_generate_nmi(void) -{ - cpu_interrupt(first_cpu, CPU_INTERRUPT_NMI); -} - static int ich9_lpc_sci_irq(ICH9LPCState *lpc) { switch (lpc->d.config[ICH9_LPC_ACPI_CTRL] & diff --git a/include/hw/i386/ich9.h b/include/hw/i386/ich9.h index 18dcca7ebc..673d13d28f 100644 --- a/include/hw/i386/ich9.h +++ b/include/hw/i386/ich9.h @@ -21,7 +21,6 @@ void ich9_lpc_pm_init(PCIDevice *pci_lpc, bool smm_enabled); I2CBus *ich9_smb_init(PCIBus *bus, int devfn, uint32_t smb_io_base); void ich9_generate_smi(void); -void ich9_generate_nmi(void); #define ICH9_CC_SIZE (16 * 1024) /* 16KB. Chipset configuration registers */ |