From patchwork Wed Feb 7 04:24:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10204635 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6404E602D8 for ; Wed, 7 Feb 2018 04:37:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F94728D97 for ; Wed, 7 Feb 2018 04:37:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5297528D9A; Wed, 7 Feb 2018 04:37:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BC4E928D97 for ; Wed, 7 Feb 2018 04:37:58 +0000 (UTC) Received: from localhost ([::1]:47579 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejHUb-0003CB-Vm for patchwork-qemu-devel@patchwork.kernel.org; Tue, 06 Feb 2018 23:37:58 -0500 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 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]:41032) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ejHIM-0003GZ-3Q; Tue, 06 Feb 2018 23:25:18 -0500 Received: by mail-pg0-x244.google.com with SMTP id 141so2035813pgd.8; Tue, 06 Feb 2018 20:25:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SMj0MMeROKDaG5Nv95TjP+f98fkZRiE//o478QBuDX0=; b=WQzH1dFweYw07WFBSLKSXM3cNVkh19fzEQY9Nz7bmEOoyaTubYYu03SFXFw74xtWBg BT/vueiNExbERS0/XUWx2ZkZz7ogDGIk10kD+wZaUX8lBJqHHgM4TNJ/cJdJ6B4AzvZv zF9zEtZYvIynCyyah8rrcEeHMTxftD6BMj1lk6pdGWg9sgQJLIl+5pdZrVaSIDVYBzTU B+eDj2L2ei+KStE/pdbPfkBY+Eq95/BEmCkIMlZfhlZLNj3/EZXOqFyn8Imuv+zAx3gS BebU+yMApzvORHeitIhX6NR+cd+3C57XzodbSELScxsfV3OUsAaSpuZ0XiPVAIKkEkZv ulnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SMj0MMeROKDaG5Nv95TjP+f98fkZRiE//o478QBuDX0=; b=Mnw1SZjLMPn2+BTsPaHtlZ6DMNnRlwSZpK43UdYJrukHuInwlymF39JBzj/fwpM9xc pcjnQ1Bw/yWTdURDuJzFu/Scvc7GPEjd02YtSgyycIrA50u+xRCcabEZpqL5aRwYH65v aM2y+2+alacwQNua+/MvLP4ZEIl3lnjHwmyk/4rAMZYKEM9IPYufhFn89muh8J5lzOh2 MLGLTuOWEyTKtsh47OsMTxQ55/VUtDNmW3fxSnG1fBDyPFwgkiIeAGjt79MbeD/TKPa+ 3lXQjl1vJelz+5z7+qU4aEO0tYUATTaLlUiRfG2TEPKB5RpgIfthc9LWaaAU4NncBbZH VvqQ== X-Gm-Message-State: APf1xPDIklcuKlRjOe0KShwTUqiAAi+r6uqmq++sVAbkAQb1mjkff1dk HUdRKP2iFtK3EOv1qLB4Ako3BvMx X-Google-Smtp-Source: AH8x225vqUiY739zfnh0pkRBM+NX9fjnHiJZ39QijG2u5hLWgxmgAY/90K8HvbEm93HzWmskPopgLw== X-Received: by 10.101.102.73 with SMTP id z9mr3727227pgv.448.1517977516923; Tue, 06 Feb 2018 20:25:16 -0800 (PST) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id x8sm1076095pfk.123.2018.02.06.20.25.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Feb 2018 20:25:16 -0800 (PST) From: Andrey Smirnov To: qemu-arm@nongnu.org Date: Tue, 6 Feb 2018 20:24:33 -0800 Message-Id: <20180207042438.15422-10-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180207042438.15422-1-andrew.smirnov@gmail.com> References: <20180207042438.15422-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::244 Subject: [Qemu-devel] [PATCH v5 09/14] pci: Use pci_config_size in pci_data_* accessors X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , "Michael S . Tsirkin" , Andrey Smirnov , Jason Wang , Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, yurovsky@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Philippe Mathieu-Daudé --- 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);