Commit 54d68998 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 1fde6ee8 8c9f42f3

hw/acpi/tco.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

hw/isa/lpc_ich9.c

+0 −5
Original line number Diff line number Diff line
@@ -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] &

include/hw/i386/ich9.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */