ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* TCO watchdog fix 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQExBAABCAAbBQJY5QxEFBxwYm9uemluaUByZWRoYXQuY29tAAoJEL/70l94x66D
 gL0H/RLehEUCiuBTUfl9OFkh/7wM8P61AncvsaowwgkHUuW2Or1a9evYqpi2Bpom
 kFQOQnh7dTDHWt9JBxB9BW+8HWc7GlH85HifcsrngTxjF4vzVWTo6GRIT7LeXr6y
 6JHH+fG1fv6ny8oF2dhGsWHbmOzgAgTF6G35Lt3zVo3vjVdBuZzw0P71LGIjUTUM
 ErIQQV7f+oKoCy1A/TK2f4e0FCK3ehOcKoVW1hq39K9UV374JKR/is4MF+IMGHXa
 yjyammm526btDCQWx1uRKiA9eJ/n5VNgH+dWVROiWl2Ckw7y1+BtVHvBckNp8+KS
 AIKSyM1U44UHog6Lwnj0g3fGU50=
 =rrhr
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2017-04-06 09:27:49 +01:00
parent 1fde6ee885 8c9f42f3cf
commit 54d689988c
3 changed files with 0 additions and 8 deletions
hw
acpi
tco.c
isa
lpc_ich9.c
include/hw/i386
ich9.h

2
hw/acpi/tco.c
View File

@ -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);

5
hw/isa/lpc_ich9.c
View File

@ -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] &

1
include/hw/i386/ich9.h
View File

@ -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 */