From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejHIR-0000OU-JA for qemu-devel@nongnu.org; Tue, 06 Feb 2018 23:25:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejHIQ-0003NP-PV for qemu-devel@nongnu.org; Tue, 06 Feb 2018 23:25:23 -0500 From: Andrey Smirnov Date: Tue, 6 Feb 2018 20:24:33 -0800 Message-Id: <20180207042438.15422-10-andrew.smirnov@gmail.com> In-Reply-To: <20180207042438.15422-1-andrew.smirnov@gmail.com> References: <20180207042438.15422-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v5 09/14] pci: Use pci_config_size in pci_data_* accessors List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-arm@nongnu.org Cc: Andrey Smirnov , Peter Maydell , Jason Wang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , "Michael S . Tsirkin" , qemu-devel@nongnu.org, yurovsky@gmail.com Use pci_config_size (as opposed to PCI_CONFIG_SPACE_SIZE) in pci_data_read() and pci_data_write(), so this function would work for both classic PCI and PCIe use-cases. Cc: Peter Maydell Cc: Jason Wang Cc: Philippe Mathieu-Daudé Cc: Marcel Apfelbaum Cc: Michael S. Tsirkin Cc: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Cc: yurovsky@gmail.com Signed-off-by: Andrey Smirnov --- hw/pci/pci_host.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hw/pci/pci_host.c b/hw/pci/pci_host.c index 5eaa935cb5..ea52ea07cd 100644 --- a/hw/pci/pci_host.c +++ b/hw/pci/pci_host.c @@ -89,30 +89,35 @@ uint32_t pci_host_config_read_common(PCIDevice *pci_dev, uint32_t addr, void pci_data_write(PCIBus *s, uint32_t addr, uint32_t val, int len) { PCIDevice *pci_dev = pci_dev_find_by_addr(s, addr); - uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE - 1); + uint32_t config_addr; if (!pci_dev) { return; } + config_addr = addr & (pci_config_size(pci_dev) - 1); + PCI_DPRINTF("%s: %s: addr=%02" PRIx32 " val=%08" PRIx32 " len=%d\n", __func__, pci_dev->name, config_addr, val, len); - pci_host_config_write_common(pci_dev, config_addr, PCI_CONFIG_SPACE_SIZE, + pci_host_config_write_common(pci_dev, config_addr, + pci_config_size(pci_dev), val, len); } uint32_t pci_data_read(PCIBus *s, uint32_t addr, int len) { PCIDevice *pci_dev = pci_dev_find_by_addr(s, addr); - uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE - 1); + uint32_t config_addr; uint32_t val; if (!pci_dev) { return ~0x0; } + config_addr = addr & (pci_config_size(pci_dev) - 1); + val = pci_host_config_read_common(pci_dev, config_addr, - PCI_CONFIG_SPACE_SIZE, len); + pci_config_size(pci_dev), len); PCI_DPRINTF("%s: %s: addr=%02"PRIx32" val=%08"PRIx32" len=%d\n", __func__, pci_dev->name, config_addr, val, len); -- 2.14.3