From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E068C433ED for ; Tue, 13 Apr 2021 14:12:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 615FD61206 for ; Tue, 13 Apr 2021 14:12:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346421AbhDMOM2 (ORCPT ); Tue, 13 Apr 2021 10:12:28 -0400 Received: from foss.arm.com ([217.140.110.172]:43012 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346418AbhDMOM0 (ORCPT ); Tue, 13 Apr 2021 10:12:26 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id DD84E106F; Tue, 13 Apr 2021 07:12:06 -0700 (PDT) Received: from C02W217MHV2R.local (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0B9893F694; Tue, 13 Apr 2021 07:12:05 -0700 (PDT) Subject: Re: [PATCH kvm-unit-tests 3/8] pci-testdev: ioremap regions To: Andrew Jones , kvm@vger.kernel.org Cc: alexandru.elisei@arm.com, andre.przywara@arm.com, eric.auger@redhat.com References: <20210407185918.371983-1-drjones@redhat.com> <20210407185918.371983-4-drjones@redhat.com> From: Nikos Nikoleris Message-ID: Date: Tue, 13 Apr 2021 15:12:04 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.9.1 MIME-Version: 1.0 In-Reply-To: <20210407185918.371983-4-drjones@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On 07/04/2021 19:59, Andrew Jones wrote: > Don't assume the physical addresses used with PCI have already been > identity mapped. > > Signed-off-by: Andrew Jones This makes more sense now that I had a look at the next patch (4/8). Reviewed-by: Nikos Nikoleris > --- > lib/pci-host-generic.c | 5 ++--- > lib/pci-host-generic.h | 4 ++-- > lib/pci-testdev.c | 4 ++++ > 3 files changed, 8 insertions(+), 5 deletions(-) > > diff --git a/lib/pci-host-generic.c b/lib/pci-host-generic.c > index 818150dc0a66..de93b8feac39 100644 > --- a/lib/pci-host-generic.c > +++ b/lib/pci-host-generic.c > @@ -122,7 +122,7 @@ static struct pci_host_bridge *pci_dt_probe(void) > sizeof(host->addr_space[0]) * nr_addr_spaces); > assert(host != NULL); > > - host->start = base.addr; > + host->start = ioremap(base.addr, base.size); > host->size = base.size; > host->bus = bus; > host->bus_max = bus_max; > @@ -279,8 +279,7 @@ phys_addr_t pci_host_bridge_get_paddr(u64 pci_addr) > > static void __iomem *pci_get_dev_conf(struct pci_host_bridge *host, int devfn) > { > - return (void __iomem *)(unsigned long) > - host->start + (devfn << PCI_ECAM_DEVFN_SHIFT); > + return (void __iomem *)host->start + (devfn << PCI_ECAM_DEVFN_SHIFT); > } > > u8 pci_config_readb(pcidevaddr_t dev, u8 off) > diff --git a/lib/pci-host-generic.h b/lib/pci-host-generic.h > index fd30e7c74ed8..0ffe6380ec8f 100644 > --- a/lib/pci-host-generic.h > +++ b/lib/pci-host-generic.h > @@ -18,8 +18,8 @@ struct pci_addr_space { > }; > > struct pci_host_bridge { > - phys_addr_t start; > - phys_addr_t size; > + void __iomem *start; > + size_t size; > int bus; > int bus_max; > int nr_addr_spaces; > diff --git a/lib/pci-testdev.c b/lib/pci-testdev.c > index 039bb44781c1..4f2e5663b2d6 100644 > --- a/lib/pci-testdev.c > +++ b/lib/pci-testdev.c > @@ -185,7 +185,11 @@ int pci_testdev(void) > mem = ioremap(addr, PAGE_SIZE); > > addr = pci_bar_get_addr(&pci_dev, 1); > +#if defined(__i386__) || defined(__x86_64__) > io = (void *)(unsigned long)addr; > +#else > + io = ioremap(addr, PAGE_SIZE); > +#endif > > nr_tests += pci_testdev_all(mem, &pci_testdev_mem_ops); > nr_tests += pci_testdev_all(io, &pci_testdev_io_ops); >