diff mbox

[v3,20/26] q35: smbus: Remove PCI_STATUS_SIG_SYSTEM_ERROR and PCI_STATUS_DETECTED_PARITY from w1cmask

Message ID 1b6424bdbc20646537f4ebc8218ffdfac6560cea.1350677362.git.jbaron@redhat.com
State New
Headers show

Commit Message

Jason Baron Oct. 19, 2012, 8:43 p.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

Both bits are added to the write-1-to-clear mask by default. As the
smbus device does not allow writes at all, we have to remove it from
that mask, also to avoid triggering a runtime assertion.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Jason Baron <jbaron@redhat.com>
---
 hw/smbus_ich9.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

Comments

Michael S. Tsirkin Oct. 21, 2012, 12:26 p.m. UTC | #1 
On Fri, Oct 19, 2012 at 04:43:38PM -0400, Jason Baron wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Both bits are added to the write-1-to-clear mask by default. As the
> smbus device does not allow writes at all, we have to remove it from
> that mask, also to avoid triggering a runtime assertion.
> 
> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> Signed-off-by: Jason Baron <jbaron@redhat.com>

Is this patch still needed?
What does it mean that smbus does not allow writes at all?
What's the assertion triggered here?

> ---
>  hw/smbus_ich9.c |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/hw/smbus_ich9.c b/hw/smbus_ich9.c
> index 8c2cd44..e856063 100644
> --- a/hw/smbus_ich9.c
> +++ b/hw/smbus_ich9.c
> @@ -94,6 +94,10 @@ static int ich9_smbus_initfn(PCIDevice *d)
>  {
>      ICH9SMBState *s = ICH9_SMB_DEVICE(d);
>  
> +    pci_set_word(d->w1cmask + PCI_STATUS,
> +                 pci_get_word(d->w1cmask + PCI_STATUS) &
> +                 ~(PCI_STATUS_SIG_SYSTEM_ERROR | PCI_STATUS_DETECTED_PARITY));
> +
>      /* TODO? D31IP.SMIP in chipset configuration space */
>      pci_config_set_interrupt_pin(d->config, 0x01); /* interrupt pin 1 */
>  
> -- 
> 1.7.1
diff mbox

Patch

diff --git a/hw/smbus_ich9.c b/hw/smbus_ich9.c
index 8c2cd44..e856063 100644
--- a/hw/smbus_ich9.c
+++ b/hw/smbus_ich9.c
@@ -94,6 +94,10 @@  static int ich9_smbus_initfn(PCIDevice *d)
 {
     ICH9SMBState *s = ICH9_SMB_DEVICE(d);
 
+    pci_set_word(d->w1cmask + PCI_STATUS,
+                 pci_get_word(d->w1cmask + PCI_STATUS) &
+                 ~(PCI_STATUS_SIG_SYSTEM_ERROR | PCI_STATUS_DETECTED_PARITY));
+
     /* TODO? D31IP.SMIP in chipset configuration space */
     pci_config_set_interrupt_pin(d->config, 0x01); /* interrupt pin 1 */