From patchwork Tue Dec 21 23:20:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 76344 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 EF902B70A4 for ; Wed, 22 Dec 2010 10:21:08 +1100 (EST) Received: from localhost ([127.0.0.1]:49314 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PVBVx-0004gw-JJ for incoming@patchwork.ozlabs.org; Tue, 21 Dec 2010 18:21:05 -0500 Received: from [140.186.70.92] (port=40785 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PVBVN-0004gq-5c for qemu-devel@nongnu.org; Tue, 21 Dec 2010 18:20:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PVBVL-0003qu-Li for qemu-devel@nongnu.org; Tue, 21 Dec 2010 18:20:29 -0500 Received: from fmmailgate02.web.de ([217.72.192.227]:33509) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PVBVL-0003qj-8f for qemu-devel@nongnu.org; Tue, 21 Dec 2010 18:20:27 -0500 Received: from smtp03.web.de ( [172.20.0.65]) by fmmailgate02.web.de (Postfix) with ESMTP id AA5A219064AFF; Wed, 22 Dec 2010 00:20:24 +0100 (CET) Received: from [87.173.118.159] (helo=af.local) by smtp03.web.de with asmtp (WEB.DE 4.110 #2) id 1PVBVI-0007sl-00; Wed, 22 Dec 2010 00:20:24 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Wed, 22 Dec 2010 00:20:23 +0100 Message-Id: <1292973623-2455-1-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.3.4 MIME-Version: 1.0 X-Sender: Andreas.Faerber@web.de X-Provags-ID: V01U2FsdGVkX1+uRRNISfd7gtelMZk+8yyLHF7n33gFKVoLq3xe MIq3LiUKHV2SwLpqnV7BY7gJyX3IiXx40lXIdPuSHHFHxnyXHm S9EI4mWb2WXTdt+kpdOQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH, RFC] pci: allow PCI devices to fix address space 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 From: Hervé Poussineau v1: * Rebased. Signed-off-by: Hervé Poussineau Cc: Michael S. Tsirkin Signed-off-by: Andreas Färber --- Hello Michael, Could you please take a look at this? I'm out of my field here. The intention of the first part appears to be to save (val & ~mask), whereas the inline helper would've returned (val & mask). The second part makes existing code conditional on that value. Regards, Andreas hw/pci.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index ef00d20..4db4b1f 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -140,6 +140,7 @@ static void pci_update_irq_status(PCIDevice *dev) static void pci_device_reset(PCIDevice *dev) { int r; + uint16_t cmd; /* TODO: call the below unconditionally once all pci devices * are qdevified */ if (dev->qdev.info) { @@ -149,9 +150,10 @@ static void pci_device_reset(PCIDevice *dev) dev->irq_state = 0; pci_update_irq_status(dev); /* Clear all writeable bits */ - pci_word_test_and_clear_mask(dev->config + PCI_COMMAND, - pci_get_word(dev->wmask + PCI_COMMAND) | - pci_get_word(dev->w1cmask + PCI_COMMAND)); + cmd = pci_get_word(dev->config + PCI_COMMAND); + cmd &= ~(pci_get_word(dev->wmask + PCI_COMMAND) | + pci_get_word(dev->w1cmask + PCI_COMMAND)); + pci_set_word(dev->config + PCI_COMMAND, cmd); pci_word_test_and_clear_mask(dev->config + PCI_STATUS, pci_get_word(dev->wmask + PCI_STATUS) | pci_get_word(dev->w1cmask + PCI_STATUS)); @@ -163,11 +165,15 @@ static void pci_device_reset(PCIDevice *dev) continue; } - if (!(region->type & PCI_BASE_ADDRESS_SPACE_IO) && - region->type & PCI_BASE_ADDRESS_MEM_TYPE_64) { - pci_set_quad(dev->config + pci_bar(dev, r), region->type); - } else { - pci_set_long(dev->config + pci_bar(dev, r), region->type); + if ((region->type == PCI_BASE_ADDRESS_SPACE_IO && !(cmd & PCI_COMMAND_MEMORY)) || + (region->type == PCI_BASE_ADDRESS_SPACE_MEMORY && !(cmd & PCI_COMMAND_IO))) { + /* Reset region address, as it it is not read-only */ + if (!(region->type & PCI_BASE_ADDRESS_SPACE_IO) && + region->type & PCI_BASE_ADDRESS_MEM_TYPE_64) { + pci_set_quad(dev->config + pci_bar(dev, r), region->type); + } else { + pci_set_long(dev->config + pci_bar(dev, r), region->type); + } } } pci_update_mappings(dev);