From patchwork Fri Nov 12 17:46:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 320282 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oACHkiJG020258 for ; Fri, 12 Nov 2010 17:46:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755952Ab0KLRqW (ORCPT ); Fri, 12 Nov 2010 12:46:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49747 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751288Ab0KLRqV (ORCPT ); Fri, 12 Nov 2010 12:46:21 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oACHkK44004161 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 12 Nov 2010 12:46:20 -0500 Received: from s20.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oACHkJUM011529; Fri, 12 Nov 2010 12:46:19 -0500 From: Alex Williamson Subject: [PATCH v2 2/9] pci: Remove pci_enable_capability_support() To: kvm@vger.kernel.org, mst@redhat.com Cc: qemu-devel@nongnu.org, alex.williamson@redhat.com, chrisw@redhat.com Date: Fri, 12 Nov 2010 10:46:19 -0700 Message-ID: <20101112174616.3169.58332.stgit@s20.home> In-Reply-To: <20101112173929.3169.47618.stgit@s20.home> References: <20101112173929.3169.47618.stgit@s20.home> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 12 Nov 2010 17:46:45 +0000 (UTC) diff --git a/hw/device-assignment.c b/hw/device-assignment.c index bde231d..311c197 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -1292,7 +1292,12 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev) PCIRegion *pci_region = dev->real_device.regions; int next_cap_pt = 0; + pci_dev->cap.supported = 1; + pci_dev->cap.start = PCI_CAPABILITY_CONFIG_DEFAULT_START_ADDR; pci_dev->cap.length = 0; + pci_dev->config[PCI_STATUS] |= PCI_STATUS_CAP_LIST; + pci_dev->config[PCI_CAPABILITY_LIST] = pci_dev->cap.start; + #ifdef KVM_CAP_IRQ_ROUTING #ifdef KVM_CAP_DEVICE_MSI /* Expose MSI capability @@ -1468,9 +1473,10 @@ static int assigned_initfn(struct PCIDevice *pci_dev) dev->h_busnr = dev->host.bus; dev->h_devfn = PCI_DEVFN(dev->host.dev, dev->host.func); - if (pci_enable_capability_support(pci_dev, 0, NULL, - assigned_device_pci_cap_write_config, - assigned_device_pci_cap_init) < 0) + pci_register_capability_handlers(pci_dev, NULL, + assigned_device_pci_cap_write_config); + + if (assigned_device_pci_cap_init(pci_dev) < 0) goto out; /* assign device to guest */ diff --git a/hw/pci.c b/hw/pci.c index 4bc5882..607eb27 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -787,6 +787,8 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, config_write = pci_default_write_config; pci_dev->config_read = config_read; pci_dev->config_write = config_write; + pci_dev->cap.config_read = pci_default_cap_read_config; + pci_dev->cap.config_write = pci_default_cap_write_config; bus->devices[devfn] = pci_dev; pci_dev->irq = qemu_allocate_irqs(pci_set_irq, pci_dev, PCI_NUM_PINS); pci_dev->version_id = 2; /* Current pci device vmstate version */ @@ -1894,35 +1896,21 @@ PCIDevice *pci_create_simple_multifunction(PCIBus *bus, int devfn, return dev; } -int pci_enable_capability_support(PCIDevice *pci_dev, - uint32_t config_start, - PCICapConfigReadFunc *config_read, - PCICapConfigWriteFunc *config_write, - PCICapConfigInitFunc *config_init) +void pci_register_capability_handlers(PCIDevice *pdev, + PCICapConfigReadFunc *config_read, + PCICapConfigWriteFunc *config_write) { - if (!pci_dev) - return -ENODEV; - - pci_dev->config[0x06] |= 0x10; // status = capabilities - - if (config_start == 0) - pci_dev->cap.start = PCI_CAPABILITY_CONFIG_DEFAULT_START_ADDR; - else if (config_start >= 0x40 && config_start < 0xff) - pci_dev->cap.start = config_start; - else - return -EINVAL; + if (config_read) { + pdev->cap.config_read = config_read; + } else { + pdev->cap.config_read = pci_default_cap_read_config; + } - if (config_read) - pci_dev->cap.config_read = config_read; - else - pci_dev->cap.config_read = pci_default_cap_read_config; - if (config_write) - pci_dev->cap.config_write = config_write; - else - pci_dev->cap.config_write = pci_default_cap_write_config; - pci_dev->cap.supported = 1; - pci_dev->config[PCI_CAPABILITY_LIST] = pci_dev->cap.start; - return config_init(pci_dev); + if (config_write) { + pdev->cap.config_write = config_write; + } else { + pdev->cap.config_write = pci_default_cap_write_config; + } } PCIDevice *pci_create(PCIBus *bus, int devfn, const char *name) @@ -2046,12 +2034,16 @@ int pci_add_capability_at_offset(PCIDevice *pdev, uint8_t cap_id, config[PCI_CAP_LIST_ID] = cap_id; config[PCI_CAP_LIST_NEXT] = pdev->config[PCI_CAPABILITY_LIST]; pdev->config[PCI_CAPABILITY_LIST] = offset; - pdev->config[PCI_STATUS] |= PCI_STATUS_CAP_LIST; memset(pdev->used + offset, 0xFF, size); /* Make capability read-only by default */ memset(pdev->wmask + offset, 0, size); /* Check capability by default */ memset(pdev->cmask + offset, 0xFF, size); + + pdev->config[PCI_STATUS] |= PCI_STATUS_CAP_LIST; + pdev->cap.supported = 1; + pdev->cap.start = pdev->cap.start ? MIN(pdev->cap.start, offset) : offset; + return offset; } @@ -2079,8 +2071,10 @@ void pci_del_capability(PCIDevice *pdev, uint8_t cap_id, uint8_t size) memset(pdev->cmask + offset, 0, size); memset(pdev->used + offset, 0, size); - if (!pdev->config[PCI_CAPABILITY_LIST]) + if (!pdev->config[PCI_CAPABILITY_LIST]) { pdev->config[PCI_STATUS] &= ~PCI_STATUS_CAP_LIST; + pdev->cap.start = pdev->cap.length = 0; + } } /* Reserve space for capability at a known offset (to call after load). */ diff --git a/hw/pci.h b/hw/pci.h index 334e928..0712e55 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -87,7 +87,6 @@ typedef void PCICapConfigWriteFunc(PCIDevice *pci_dev, uint32_t address, uint32_t val, int len); typedef uint32_t PCICapConfigReadFunc(PCIDevice *pci_dev, uint32_t address, int len); -typedef int PCICapConfigInitFunc(PCIDevice *pci_dev); typedef struct PCIIORegion { pcibus_t addr; /* current PCI mapping address. -1 means not mapped */ @@ -228,11 +227,9 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num, void pci_map_option_rom(PCIDevice *pdev, int region_num, pcibus_t addr, pcibus_t size, int type); -int pci_enable_capability_support(PCIDevice *pci_dev, - uint32_t config_start, - PCICapConfigReadFunc *config_read, - PCICapConfigWriteFunc *config_write, - PCICapConfigInitFunc *config_init); +void pci_register_capability_handlers(PCIDevice *pci_dev, + PCICapConfigReadFunc *config_read, + PCICapConfigWriteFunc *config_write); int pci_map_irq(PCIDevice *pci_dev, int pin);