From: Andrew Murray <andrew.murray@arm.com> To: Rob Herring <robh@kernel.org> Cc: linux-pci@vger.kernel.org, Bjorn Helgaas <bhelgaas@google.com>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Linus Walleij <linus.walleij@linaro.org>, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 08/11] PCI: v3-semi: Use inbound resources for setup Date: Thu, 26 Sep 2019 09:39:25 +0100 [thread overview] Message-ID: <20190926083925.GX9720@e119886-lin.cambridge.arm.com> (raw) In-Reply-To: <20190924214630.12817-9-robh@kernel.org> On Tue, Sep 24, 2019 at 04:46:27PM -0500, Rob Herring wrote: > Now that the helpers provide the inbound resources in the host bridge > 'dma_ranges' resource list, convert the v3-semi host bridge to use > the resource list to setup the inbound addresses. > > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Cc: Bjorn Helgaas <bhelgaas@google.com> > Signed-off-by: Rob Herring <robh@kernel.org> Reviewed-by: Andrew Murray <andrew.murray@arm.com> > --- > drivers/pci/controller/pci-v3-semi.c | 38 ++++++++++++---------------- > 1 file changed, 16 insertions(+), 22 deletions(-) > > diff --git a/drivers/pci/controller/pci-v3-semi.c b/drivers/pci/controller/pci-v3-semi.c > index 090df766faf9..122b695da591 100644 > --- a/drivers/pci/controller/pci-v3-semi.c > +++ b/drivers/pci/controller/pci-v3-semi.c > @@ -613,28 +613,30 @@ static int v3_pci_setup_resource(struct v3_pci *v3, > } > > static int v3_get_dma_range_config(struct v3_pci *v3, > - struct of_pci_range *range, > + struct resource_entry *entry, > u32 *pci_base, u32 *pci_map) > { > struct device *dev = v3->dev; > - u64 cpu_end = range->cpu_addr + range->size - 1; > - u64 pci_end = range->pci_addr + range->size - 1; > + u64 cpu_addr = entry->res->start; > + u64 cpu_end = entry->res->end; > + u64 pci_end = cpu_end - entry->offset; > + u64 pci_addr = entry->res->start - entry->offset; > u32 val; > > - if (range->pci_addr & ~V3_PCI_BASE_M_ADR_BASE) { > + if (pci_addr & ~V3_PCI_BASE_M_ADR_BASE) { > dev_err(dev, "illegal range, only PCI bits 31..20 allowed\n"); > return -EINVAL; > } > - val = ((u32)range->pci_addr) & V3_PCI_BASE_M_ADR_BASE; > + val = ((u32)pci_addr) & V3_PCI_BASE_M_ADR_BASE; > *pci_base = val; > > - if (range->cpu_addr & ~V3_PCI_MAP_M_MAP_ADR) { > + if (cpu_addr & ~V3_PCI_MAP_M_MAP_ADR) { > dev_err(dev, "illegal range, only CPU bits 31..20 allowed\n"); > return -EINVAL; > } > - val = ((u32)range->cpu_addr) & V3_PCI_MAP_M_MAP_ADR; > + val = ((u32)cpu_addr) & V3_PCI_MAP_M_MAP_ADR; > > - switch (range->size) { > + switch (resource_size(entry->res)) { > case SZ_1M: > val |= V3_LB_BASE_ADR_SIZE_1MB; > break; > @@ -682,8 +684,8 @@ static int v3_get_dma_range_config(struct v3_pci *v3, > dev_dbg(dev, > "DMA MEM CPU: 0x%016llx -> 0x%016llx => " > "PCI: 0x%016llx -> 0x%016llx base %08x map %08x\n", > - range->cpu_addr, cpu_end, > - range->pci_addr, pci_end, > + cpu_addr, cpu_end, > + pci_addr, pci_end, > *pci_base, *pci_map); > > return 0; > @@ -692,24 +694,16 @@ static int v3_get_dma_range_config(struct v3_pci *v3, > static int v3_pci_parse_map_dma_ranges(struct v3_pci *v3, > struct device_node *np) > { > - struct of_pci_range range; > - struct of_pci_range_parser parser; > + struct pci_host_bridge *bridge = pci_host_bridge_from_priv(v3); > struct device *dev = v3->dev; > + struct resource_entry *entry; > int i = 0; > > - if (of_pci_dma_range_parser_init(&parser, np)) { > - dev_err(dev, "missing dma-ranges property\n"); > - return -EINVAL; > - } > - > - /* > - * Get the dma-ranges from the device tree > - */ > - for_each_of_pci_range(&parser, &range) { > + resource_list_for_each_entry(entry, &bridge->dma_ranges) { > int ret; > u32 pci_base, pci_map; > > - ret = v3_get_dma_range_config(v3, &range, &pci_base, &pci_map); > + ret = v3_get_dma_range_config(v3, entry, &pci_base, &pci_map); > if (ret) > return ret; > > -- > 2.20.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Murray <andrew.murray@arm.com> To: Rob Herring <robh@kernel.org> Cc: Bjorn Helgaas <bhelgaas@google.com>, linux-pci@vger.kernel.org, Linus Walleij <linus.walleij@linaro.org>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 08/11] PCI: v3-semi: Use inbound resources for setup Date: Thu, 26 Sep 2019 09:39:25 +0100 [thread overview] Message-ID: <20190926083925.GX9720@e119886-lin.cambridge.arm.com> (raw) In-Reply-To: <20190924214630.12817-9-robh@kernel.org> On Tue, Sep 24, 2019 at 04:46:27PM -0500, Rob Herring wrote: > Now that the helpers provide the inbound resources in the host bridge > 'dma_ranges' resource list, convert the v3-semi host bridge to use > the resource list to setup the inbound addresses. > > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Cc: Bjorn Helgaas <bhelgaas@google.com> > Signed-off-by: Rob Herring <robh@kernel.org> Reviewed-by: Andrew Murray <andrew.murray@arm.com> > --- > drivers/pci/controller/pci-v3-semi.c | 38 ++++++++++++---------------- > 1 file changed, 16 insertions(+), 22 deletions(-) > > diff --git a/drivers/pci/controller/pci-v3-semi.c b/drivers/pci/controller/pci-v3-semi.c > index 090df766faf9..122b695da591 100644 > --- a/drivers/pci/controller/pci-v3-semi.c > +++ b/drivers/pci/controller/pci-v3-semi.c > @@ -613,28 +613,30 @@ static int v3_pci_setup_resource(struct v3_pci *v3, > } > > static int v3_get_dma_range_config(struct v3_pci *v3, > - struct of_pci_range *range, > + struct resource_entry *entry, > u32 *pci_base, u32 *pci_map) > { > struct device *dev = v3->dev; > - u64 cpu_end = range->cpu_addr + range->size - 1; > - u64 pci_end = range->pci_addr + range->size - 1; > + u64 cpu_addr = entry->res->start; > + u64 cpu_end = entry->res->end; > + u64 pci_end = cpu_end - entry->offset; > + u64 pci_addr = entry->res->start - entry->offset; > u32 val; > > - if (range->pci_addr & ~V3_PCI_BASE_M_ADR_BASE) { > + if (pci_addr & ~V3_PCI_BASE_M_ADR_BASE) { > dev_err(dev, "illegal range, only PCI bits 31..20 allowed\n"); > return -EINVAL; > } > - val = ((u32)range->pci_addr) & V3_PCI_BASE_M_ADR_BASE; > + val = ((u32)pci_addr) & V3_PCI_BASE_M_ADR_BASE; > *pci_base = val; > > - if (range->cpu_addr & ~V3_PCI_MAP_M_MAP_ADR) { > + if (cpu_addr & ~V3_PCI_MAP_M_MAP_ADR) { > dev_err(dev, "illegal range, only CPU bits 31..20 allowed\n"); > return -EINVAL; > } > - val = ((u32)range->cpu_addr) & V3_PCI_MAP_M_MAP_ADR; > + val = ((u32)cpu_addr) & V3_PCI_MAP_M_MAP_ADR; > > - switch (range->size) { > + switch (resource_size(entry->res)) { > case SZ_1M: > val |= V3_LB_BASE_ADR_SIZE_1MB; > break; > @@ -682,8 +684,8 @@ static int v3_get_dma_range_config(struct v3_pci *v3, > dev_dbg(dev, > "DMA MEM CPU: 0x%016llx -> 0x%016llx => " > "PCI: 0x%016llx -> 0x%016llx base %08x map %08x\n", > - range->cpu_addr, cpu_end, > - range->pci_addr, pci_end, > + cpu_addr, cpu_end, > + pci_addr, pci_end, > *pci_base, *pci_map); > > return 0; > @@ -692,24 +694,16 @@ static int v3_get_dma_range_config(struct v3_pci *v3, > static int v3_pci_parse_map_dma_ranges(struct v3_pci *v3, > struct device_node *np) > { > - struct of_pci_range range; > - struct of_pci_range_parser parser; > + struct pci_host_bridge *bridge = pci_host_bridge_from_priv(v3); > struct device *dev = v3->dev; > + struct resource_entry *entry; > int i = 0; > > - if (of_pci_dma_range_parser_init(&parser, np)) { > - dev_err(dev, "missing dma-ranges property\n"); > - return -EINVAL; > - } > - > - /* > - * Get the dma-ranges from the device tree > - */ > - for_each_of_pci_range(&parser, &range) { > + resource_list_for_each_entry(entry, &bridge->dma_ranges) { > int ret; > u32 pci_base, pci_map; > > - ret = v3_get_dma_range_config(v3, &range, &pci_base, &pci_map); > + ret = v3_get_dma_range_config(v3, entry, &pci_base, &pci_map); > if (ret) > return ret; > > -- > 2.20.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-09-26 8:39 UTC|newest] Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-09-24 21:46 [PATCH 00/11] PCI dma-ranges parsing consolidation Rob Herring 2019-09-24 21:46 ` Rob Herring 2019-09-24 21:46 ` Rob Herring 2019-09-24 21:46 ` [PATCH 01/11] PCI: aardvark: Use pci_parse_request_of_pci_ranges() Rob Herring 2019-09-24 21:46 ` Rob Herring 2019-09-25 8:59 ` Thomas Petazzoni 2019-09-25 8:59 ` Thomas Petazzoni 2019-09-25 9:04 ` Andrew Murray 2019-09-25 9:04 ` Andrew Murray 2019-09-24 21:46 ` [PATCH 02/11] PCI: altera: " Rob Herring 2019-09-24 21:46 ` Rob Herring 2019-09-25 10:24 ` Andrew Murray 2019-09-25 10:24 ` Andrew Murray 2019-09-25 12:33 ` Rob Herring 2019-09-25 12:33 ` Rob Herring 2019-09-30 15:13 ` Andrew Murray 2019-09-30 15:13 ` Andrew Murray 2019-09-30 17:36 ` Rob Herring 2019-09-30 17:36 ` Rob Herring 2019-10-15 11:02 ` Lorenzo Pieralisi 2019-10-15 11:02 ` Lorenzo Pieralisi 2019-10-15 11:17 ` Rob Herring 2019-10-15 11:17 ` Rob Herring 2019-09-24 21:46 ` [PATCH 03/11] PCI: mediatek: " Rob Herring 2019-09-24 21:46 ` Rob Herring 2019-09-24 21:46 ` Rob Herring 2019-09-25 11:34 ` Andrew Murray 2019-09-25 11:34 ` Andrew Murray 2019-09-25 11:34 ` Andrew Murray 2019-09-24 21:46 ` [PATCH 04/11] PCI: versatile: Enable COMPILE_TEST Rob Herring 2019-09-24 21:46 ` Rob Herring 2019-09-26 8:12 ` Andrew Murray 2019-09-26 8:12 ` Andrew Murray 2019-09-24 21:46 ` [PATCH 05/11] PCI: versatile: Use pci_parse_request_of_pci_ranges() Rob Herring 2019-09-24 21:46 ` Rob Herring 2019-09-25 10:37 ` Andrew Murray 2019-09-25 10:37 ` Andrew Murray 2019-09-26 21:44 ` Rob Herring 2019-09-26 21:44 ` Rob Herring 2019-09-30 15:16 ` Andrew Murray 2019-09-30 15:16 ` Andrew Murray 2019-09-30 16:56 ` Peter Maydell 2019-09-30 16:56 ` Peter Maydell 2019-09-30 19:36 ` Andrew Murray 2019-09-30 19:36 ` Andrew Murray 2019-09-24 21:46 ` [PATCH 06/11] PCI: of: Add inbound resource parsing to helpers Rob Herring 2020-01-13 9:56 ` Bharat Kumar Gogada 2020-01-13 9:56 ` Bharat Kumar Gogada 2019-09-24 21:46 ` Rob Herring 2019-09-24 21:46 ` Rob Herring 2019-09-25 9:00 ` Thomas Petazzoni 2019-09-25 9:00 ` Thomas Petazzoni 2019-09-25 9:00 ` Thomas Petazzoni 2019-09-26 8:29 ` Andrew Murray 2019-09-26 8:29 ` Andrew Murray 2019-09-26 8:29 ` Andrew Murray 2019-09-26 10:43 ` Gustavo Pimentel 2019-09-26 10:43 ` Gustavo Pimentel 2019-09-26 10:43 ` Gustavo Pimentel 2019-09-27 16:12 ` Jingoo Han 2019-09-27 16:12 ` Jingoo Han 2019-09-27 16:12 ` Jingoo Han 2019-09-27 16:12 ` Jingoo Han 2019-09-27 16:12 ` Jingoo Han 2019-09-27 16:12 ` Jingoo Han 2019-09-24 21:46 ` [PATCH 07/11] PCI: ftpci100: Use inbound resources for setup Rob Herring 2019-09-24 21:46 ` Rob Herring 2019-09-26 8:39 ` Andrew Murray 2019-09-26 8:39 ` Andrew Murray 2019-09-24 21:46 ` [PATCH 08/11] PCI: v3-semi: " Rob Herring 2019-09-24 21:46 ` Rob Herring 2019-09-26 8:39 ` Andrew Murray [this message] 2019-09-26 8:39 ` Andrew Murray 2019-09-30 22:00 ` Linus Walleij 2019-09-30 22:00 ` Linus Walleij 2019-09-24 21:46 ` [PATCH 09/11] PCI: xgene: " Rob Herring 2019-09-24 21:46 ` Rob Herring 2019-09-26 8:39 ` Andrew Murray 2019-09-26 8:39 ` Andrew Murray 2019-09-24 21:46 ` [PATCH 10/11] PCI: iproc: " Rob Herring 2019-09-24 21:46 ` Rob Herring 2019-09-26 8:39 ` Andrew Murray 2019-09-26 8:39 ` Andrew Murray 2019-09-24 21:46 ` [PATCH 11/11] PCI: rcar: " Rob Herring 2019-09-24 21:46 ` Rob Herring 2019-09-26 8:47 ` Andrew Murray 2019-09-26 8:47 ` Andrew Murray 2019-09-26 12:53 ` Rob Herring 2019-09-26 12:53 ` Rob Herring 2019-09-26 13:32 ` Andrew Murray 2019-09-26 13:32 ` Andrew Murray 2019-09-26 8:49 ` [PATCH 00/11] PCI dma-ranges parsing consolidation Andrew Murray 2019-09-26 8:49 ` Andrew Murray 2019-09-26 8:49 ` Andrew Murray 2019-09-26 11:20 ` Marc Gonzalez 2019-09-26 11:20 ` Marc Gonzalez 2019-09-26 13:11 ` Rob Herring 2019-09-26 13:11 ` Rob Herring 2019-09-26 13:38 ` Andrew Murray 2019-09-26 13:38 ` Andrew Murray 2019-09-26 14:09 ` Marc Gonzalez 2019-09-26 14:09 ` Marc Gonzalez
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190926083925.GX9720@e119886-lin.cambridge.arm.com \ --to=andrew.murray@arm.com \ --cc=bhelgaas@google.com \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-pci@vger.kernel.org \ --cc=lorenzo.pieralisi@arm.com \ --cc=robh@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.