From patchwork Thu Sep 13 20:12:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Baron X-Patchwork-Id: 183730 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B5A442C0079 for ; Fri, 14 Sep 2012 07:07:24 +1000 (EST) Received: from localhost ([::1]:60126 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCFmw-0001ww-8R for incoming@patchwork.ozlabs.org; Thu, 13 Sep 2012 16:13:26 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCFmO-0001DV-NW for qemu-devel@nongnu.org; Thu, 13 Sep 2012 16:12:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TCFmJ-0002wn-JW for qemu-devel@nongnu.org; Thu, 13 Sep 2012 16:12:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52209) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCFmJ-0002wV-Bo for qemu-devel@nongnu.org; Thu, 13 Sep 2012 16:12:47 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q8DKCjFk021614 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 13 Sep 2012 16:12:45 -0400 Received: from redhat.com (dhcp-185-114.bos.redhat.com [10.16.185.114]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q8DKCjLK002812; Thu, 13 Sep 2012 16:12:45 -0400 Date: Thu, 13 Sep 2012 16:12:45 -0400 From: Jason Baron To: qemu-devel@nongnu.org Message-Id: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, alex.williamson@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, agraf@suse.de, armbru@redhat.com, yamahata@valinux.co.jp, juzhang@redhat.com, kevin@koconnor.net, avi@redhat.com, mkletzan@redhat.com, lcapitulino@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH 15/25] q35: smbus: Remove PCI_STATUS_SIG_SYSTEM_ERROR and PCI_STATUS_DETECTED_PARITY from w1cmask X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jan Kiszka 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. Signed-off-by: Jan Kiszka Signed-off-by: Jason Baron --- hw/q35_smbus.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/hw/q35_smbus.c b/hw/q35_smbus.c index 0ee404e..42dfcb1 100644 --- a/hw/q35_smbus.c +++ b/hw/q35_smbus.c @@ -97,6 +97,10 @@ static int ich9_smbus_initfn(PCIDevice *d) pci_set_word(d->wmask + PCI_STATUS, PCI_STATUS_SIG_SYSTEM_ERROR | PCI_STATUS_DETECTED_PARITY); + 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 */