From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Xu Subject: [PATCH v3 07/25] pci: Add pci_bar_set_addr() Date: Mon, 14 Nov 2016 17:19:03 -0500 Message-ID: <1479161961-20304-8-git-send-email-peterx@redhat.com> References: <1479161961-20304-1-git-send-email-peterx@redhat.com> Cc: drjones@redhat.com, agordeev@redhat.com, jan.kiszka@web.de, rkrcmar@redhat.com, pbonzini@redhat.com, peterx@redhat.com To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:59546 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964933AbcKNWTh (ORCPT ); Mon, 14 Nov 2016 17:19:37 -0500 In-Reply-To: <1479161961-20304-1-git-send-email-peterx@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: From: Alexander Gordeev Because the counterpart to pci_bar_set_addr() setter is pci_bar_addr() getter, these names become inconsistent. Rename pci_bar_addr() to pci_bar_get_addr() also to make the resulting names conform to each other. Cc: Thomas Huth Cc: Andrew Jones Cc: Peter Xu Reviewed-by: Andrew Jones Signed-off-by: Alexander Gordeev --- lib/pci.c | 12 +++++++++++- lib/pci.h | 3 ++- x86/vmexit.c | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/lib/pci.c b/lib/pci.c index 3bf45fb..74936f3 100644 --- a/lib/pci.c +++ b/lib/pci.c @@ -32,7 +32,7 @@ static uint32_t pci_bar_get(pcidevaddr_t dev, int bar_num) return pci_config_readl(dev, PCI_BASE_ADDRESS_0 + bar_num * 4); } -phys_addr_t pci_bar_addr(pcidevaddr_t dev, int bar_num) +phys_addr_t pci_bar_get_addr(pcidevaddr_t dev, int bar_num) { uint32_t bar = pci_bar_get(dev, bar_num); uint32_t mask = pci_bar_mask(bar); @@ -44,6 +44,16 @@ phys_addr_t pci_bar_addr(pcidevaddr_t dev, int bar_num) return pci_translate_addr(dev, addr); } +void pci_bar_set_addr(pcidevaddr_t dev, int bar_num, phys_addr_t addr) +{ + int off = PCI_BASE_ADDRESS_0 + bar_num * 4; + + pci_config_writel(dev, off, (uint32_t)addr); + + if (pci_bar_is64(dev, bar_num)) + pci_config_writel(dev, off + 4, (uint32_t)(addr >> 32)); +} + /* * To determine the amount of address space needed by a PCI device, * one must save the original value of the BAR, write a value of diff --git a/lib/pci.h b/lib/pci.h index 8eec236..1c20308 100644 --- a/lib/pci.h +++ b/lib/pci.h @@ -29,7 +29,8 @@ extern pcidevaddr_t pci_find_dev(uint16_t vendor_id, uint16_t device_id); * It is expected the caller is aware of the device BAR layout and never * tries to address the middle of a 64-bit register. */ -extern phys_addr_t pci_bar_addr(pcidevaddr_t dev, int bar_num); +extern phys_addr_t pci_bar_get_addr(pcidevaddr_t dev, int bar_num); +extern void pci_bar_set_addr(pcidevaddr_t dev, int bar_num, phys_addr_t addr); extern phys_addr_t pci_bar_size(pcidevaddr_t dev, int bar_num); extern bool pci_bar_is64(pcidevaddr_t dev, int bar_num); extern bool pci_bar_is_memory(pcidevaddr_t dev, int bar_num); diff --git a/x86/vmexit.c b/x86/vmexit.c index c2e1e49..2d99d5f 100644 --- a/x86/vmexit.c +++ b/x86/vmexit.c @@ -392,10 +392,10 @@ int main(int ac, char **av) continue; } if (pci_bar_is_memory(pcidev, i)) { - membar = pci_bar_addr(pcidev, i); + membar = pci_bar_get_addr(pcidev, i); pci_test.memaddr = ioremap(membar, PAGE_SIZE); } else { - pci_test.iobar = pci_bar_addr(pcidev, i); + pci_test.iobar = pci_bar_get_addr(pcidev, i); } } printf("pci-testdev at 0x%x membar %lx iobar %x\n", -- 2.7.4