* [Qemu-devel] [PULL 0/1] PC fix for 2.9.0-rc4
@ 2017-04-05 15:26 Paolo Bonzini
2017-04-05 15:26 ` [Qemu-devel] [PULL 1/1] tco: do not generate an NMI Paolo Bonzini
2017-04-06 10:35 ` [Qemu-devel] [PULL 0/1] PC fix for 2.9.0-rc4 Peter Maydell
0 siblings, 2 replies; 3+ messages in thread
From: Paolo Bonzini @ 2017-04-05 15:26 UTC (permalink / raw)
To: qemu-devel
The following changes since commit 87cc4c61020addea6a001b94b662596b1896d1b3:
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2017-04-04 11:40:55 +0100)
are available in the git repository at:
git://github.com/bonzini/qemu.git tags/for-upstream
for you to fetch changes up to 8c9f42f3cf3598e8bb612b3f81cd12632efd3ca4:
tco: do not generate an NMI (2017-04-05 17:23:52 +0200)
----------------------------------------------------------------
* TCO watchdog fix
----------------------------------------------------------------
Paolo Bonzini (1):
tco: do not generate an NMI
hw/acpi/tco.c | 2 --
hw/isa/lpc_ich9.c | 5 -----
include/hw/i386/ich9.h | 1 -
3 files changed, 8 deletions(-)
--
2.9.3
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Qemu-devel] [PULL 1/1] tco: do not generate an NMI
2017-04-05 15:26 [Qemu-devel] [PULL 0/1] PC fix for 2.9.0-rc4 Paolo Bonzini
@ 2017-04-05 15:26 ` Paolo Bonzini
2017-04-06 10:35 ` [Qemu-devel] [PULL 0/1] PC fix for 2.9.0-rc4 Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2017-04-05 15:26 UTC (permalink / raw)
To: qemu-devel
This behavior is not indicated in the datasheet and can confuse the OS.
The TCO can trap NMIs from SERR# or IOCHK# and convert them to SMIs; but
any other TCO event is either delivered as an SMI or completely disabled.
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/acpi/tco.c | 2 --
hw/isa/lpc_ich9.c | 5 -----
include/hw/i386/ich9.h | 1 -
3 files changed, 8 deletions(-)
diff --git a/hw/acpi/tco.c b/hw/acpi/tco.c
index b4adac8..05b9d7b 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 59930dd..a0866c3 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 18dcca7..673d13d 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 */
--
2.9.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PULL 0/1] PC fix for 2.9.0-rc4
2017-04-05 15:26 [Qemu-devel] [PULL 0/1] PC fix for 2.9.0-rc4 Paolo Bonzini
2017-04-05 15:26 ` [Qemu-devel] [PULL 1/1] tco: do not generate an NMI Paolo Bonzini
@ 2017-04-06 10:35 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2017-04-06 10:35 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: QEMU Developers
On 5 April 2017 at 16:26, Paolo Bonzini <pbonzini@redhat.com> wrote:
> The following changes since commit 87cc4c61020addea6a001b94b662596b1896d1b3:
>
> Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2017-04-04 11:40:55 +0100)
>
> are available in the git repository at:
>
> git://github.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 8c9f42f3cf3598e8bb612b3f81cd12632efd3ca4:
>
> tco: do not generate an NMI (2017-04-05 17:23:52 +0200)
>
> ----------------------------------------------------------------
> * TCO watchdog fix
>
> ----------------------------------------------------------------
> Paolo Bonzini (1):
> tco: do not generate an NMI
>
> hw/acpi/tco.c | 2 --
> hw/isa/lpc_ich9.c | 5 -----
> include/hw/i386/ich9.h | 1 -
> 3 files changed, 8 deletions(-)
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-04-06 10:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-05 15:26 [Qemu-devel] [PULL 0/1] PC fix for 2.9.0-rc4 Paolo Bonzini
2017-04-05 15:26 ` [Qemu-devel] [PULL 1/1] tco: do not generate an NMI Paolo Bonzini
2017-04-06 10:35 ` [Qemu-devel] [PULL 0/1] PC fix for 2.9.0-rc4 Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.