From patchwork Fri Oct 2 10:31:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 34838 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 197F4B7BCF for ; Fri, 2 Oct 2009 21:30:11 +1000 (EST) Received: from localhost ([127.0.0.1]:59042 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MtgKt-0006Hk-QZ for incoming@patchwork.ozlabs.org; Fri, 02 Oct 2009 07:30:07 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mtfuf-0004wm-4o for qemu-devel@nongnu.org; Fri, 02 Oct 2009 07:03:01 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MtfuY-0004tm-ID for qemu-devel@nongnu.org; Fri, 02 Oct 2009 07:02:58 -0400 Received: from [199.232.76.173] (port=35483 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MtfuY-0004tT-6R for qemu-devel@nongnu.org; Fri, 02 Oct 2009 07:02:54 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:34754) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MtfuX-0000Ac-B7 for qemu-devel@nongnu.org; Fri, 02 Oct 2009 07:02:53 -0400 Received: from nm.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with ESMTP id 4FBBA49CF4; Fri, 2 Oct 2009 19:33:36 +0900 (JST) Received: from yamahata by nm.local.valinux.co.jp with local (Exim 4.69) (envelope-from ) id 1MtfQc-0006k6-Ip; Fri, 02 Oct 2009 19:31:58 +0900 From: Isaku Yamahata To: qemu-devel@nongnu.org, anthony@codemonkey.ws Date: Fri, 2 Oct 2009 19:31:49 +0900 Message-Id: <1254479517-25845-18-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1254479517-25845-1-git-send-email-yamahata@valinux.co.jp> References: <1254479517-25845-1-git-send-email-yamahata@valinux.co.jp> X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: yamahata@valinux.co.jp, "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH 17/25] pci: fix pci_default_write_config() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org When updated ROM expantion address of header type 0, it missed to update mappings. Add PCI_ROM_ADDRESS check whether to call pci_update_mappings() Cc: Michael S. Tsirkin Signed-off-by: Isaku Yamahata Acked-by: Michael S. Tsirkin --- hw/pci.c | 3 ++- hw/pci.h | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 1afcfb8..c9054c1 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -671,7 +671,8 @@ void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l) uint8_t wmask = d->wmask[addr]; d->config[addr] = (d->config[addr] & ~wmask) | (val & wmask); } - if (memcmp(orig + PCI_BASE_ADDRESS_0, d->config + PCI_BASE_ADDRESS_0, 24) + if ((memcmp(orig + PCI_BASE_ADDRESS_0, d->config + PCI_BASE_ADDRESS_0, 24) || + memcmp(orig + PCI_ROM_ADDRESS, d->config + PCI_ROM_ADDRESS, 4)) || ((orig[PCI_COMMAND] ^ d->config[PCI_COMMAND]) & (PCI_COMMAND_MEMORY | PCI_COMMAND_IO))) pci_update_mappings(d); diff --git a/hw/pci.h b/hw/pci.h index 66d899d..3ea5258 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -144,6 +144,7 @@ static inline int pci_bar_is_64bit(const PCIIORegion *r) #define PCI_SUBVENDOR_ID 0x2c /* obsolete, use PCI_SUBSYSTEM_VENDOR_ID */ #define PCI_SUBDEVICE_ID 0x2e /* obsolete, use PCI_SUBSYSTEM_ID */ +#define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1 reserved */ #define PCI_ROM_ADDRESS_ENABLE 0x01 /* Bits in the PCI Status Register (PCI 2.3 spec) */