target/linux/bcm27xx/patches-5.4/950-0447-PCI-of-Add-inbound-resource-parsing-to-helpers.patch

   1 From 125a18144253e3a3f4bcad24484ee9b590dc47c6 Mon Sep 17 00:00:00 2001
   2 From: Rob Herring <robh@kernel.org>
   3 Date: Wed, 30 Oct 2019 17:30:57 -0500
   4 Subject: [PATCH] PCI: of: Add inbound resource parsing to helpers
   5
   6 Extend devm_of_pci_get_host_bridge_resources() and
   7 pci_parse_request_of_pci_ranges() helpers to also parse the inbound
   8 addresses from DT 'dma-ranges' and populate a resource list with the
   9 translated addresses. This will help ensure 'dma-ranges' is always
  10 parsed in a consistent way.
  11
  12 Tested-by: Srinath Mannam <srinath.mannam@broadcom.com>
  13 Tested-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> # for AArdvark
  14 Signed-off-by: Rob Herring <robh@kernel.org>
  15 Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  16 Reviewed-by: Srinath Mannam <srinath.mannam@broadcom.com>
  17 Reviewed-by: Andrew Murray <andrew.murray@arm.com>
  18 Acked-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
  19 Cc: Jingoo Han <jingoohan1@gmail.com>
  20 Cc: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
  21 Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  22 Cc: Bjorn Helgaas <bhelgaas@google.com>
  23 Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  24 Cc: Will Deacon <will@kernel.org>
  25 Cc: Linus Walleij <linus.walleij@linaro.org>
  26 Cc: Toan Le <toan@os.amperecomputing.com>
  27 Cc: Ley Foon Tan <lftan@altera.com>
  28 Cc: Tom Joseph <tjoseph@cadence.com>
  29 Cc: Ray Jui <rjui@broadcom.com>
  30 Cc: Scott Branden <sbranden@broadcom.com>
  31 Cc: bcm-kernel-feedback-list@broadcom.com
  32 Cc: Ryder Lee <ryder.lee@mediatek.com>
  33 Cc: Karthikeyan Mitran <m.karthikeyan@mobiveil.co.in>
  34 Cc: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
  35 Cc: Simon Horman <horms@verge.net.au>
  36 Cc: Shawn Lin <shawn.lin@rock-chips.com>
  37 Cc: Heiko Stuebner <heiko@sntech.de>
  38 Cc: Michal Simek <michal.simek@xilinx.com>
  39 Cc: rfi@lists.rocketboards.org
  40 Cc: linux-mediatek@lists.infradead.org
  41 Cc: linux-renesas-soc@vger.kernel.org
  42 Cc: linux-rockchip@lists.infradead.org
  43 (cherry picked from commit 331f63457165a30c708280de2c77f1742c6351dc)
  44 ---
  45  .../pci/controller/dwc/pcie-designware-host.c |  8 +--
  46  drivers/pci/controller/pci-aardvark.c         |  3 +-
  47  drivers/pci/controller/pci-ftpci100.c         |  4 +-
  48  drivers/pci/controller/pci-host-common.c      |  2 +-
  49  drivers/pci/controller/pci-v3-semi.c          |  8 +--
  50  drivers/pci/controller/pci-versatile.c        |  3 +-
  51  drivers/pci/controller/pci-xgene.c            |  4 +-
  52  drivers/pci/controller/pcie-altera.c          |  5 +-
  53  drivers/pci/controller/pcie-cadence-host.c    |  2 +-
  54  drivers/pci/controller/pcie-iproc-platform.c  |  4 +-
  55  drivers/pci/controller/pcie-mediatek.c        |  4 +-
  56  drivers/pci/controller/pcie-mobiveil.c        |  4 +-
  57  drivers/pci/controller/pcie-rcar.c            |  3 +-
  58  drivers/pci/controller/pcie-rockchip-host.c   |  4 +-
  59  drivers/pci/controller/pcie-xilinx-nwl.c      |  4 +-
  60  drivers/pci/controller/pcie-xilinx.c          |  4 +-
  61  drivers/pci/of.c                              | 61 ++++++++++++++++---
  62  drivers/pci/pci.h                             |  8 ++-
  63  include/linux/pci.h                           |  9 ++-
  64  19 files changed, 96 insertions(+), 48 deletions(-)
  65
  66 --- a/drivers/pci/controller/dwc/pcie-designware-host.c
  67 +++ b/drivers/pci/controller/dwc/pcie-designware-host.c
  68 @@ -345,12 +345,8 @@ int dw_pcie_host_init(struct pcie_port *
  69         if (!bridge)
  70                 return -ENOMEM;
  71
  72 -       ret = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff,
  73 -                                       &bridge->windows, &pp->io_base);
  74 -       if (ret)
  75 -               return ret;
  76 -
  77 -       ret = devm_request_pci_bus_resources(dev, &bridge->windows);
  78 +       ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows,
  79 +                                             &bridge->dma_ranges, NULL);
  80         if (ret)
  81                 return ret;
  82
  83 --- a/drivers/pci/controller/pci-aardvark.c
  84 +++ b/drivers/pci/controller/pci-aardvark.c
  85 @@ -1019,7 +1019,8 @@ static int advk_pcie_probe(struct platfo
  86                 return ret;
  87         }
  88
  89 -       ret = advk_pcie_parse_request_of_pci_ranges(pcie);
  90 +       ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows,
  91 +                                             &bridge->dma_ranges, &bus);
  92         if (ret) {
  93                 dev_err(dev, "Failed to parse resources\n");
  94                 return ret;
  95 --- a/drivers/pci/controller/pci-ftpci100.c
  96 +++ b/drivers/pci/controller/pci-ftpci100.c
  97 @@ -480,8 +480,8 @@ static int faraday_pci_probe(struct plat
  98         if (IS_ERR(p->base))
  99                 return PTR_ERR(p->base);
 100
 101 -       ret = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff,
 102 -                                                   &res, &io_base);
 103 +       ret = pci_parse_request_of_pci_ranges(dev, &host->windows,
 104 +                                             &host->dma_ranges, NULL);
 105         if (ret)
 106                 return ret;
 107
 108 --- a/drivers/pci/controller/pci-host-common.c
 109 +++ b/drivers/pci/controller/pci-host-common.c
 110 @@ -27,7 +27,7 @@ static struct pci_config_window *gen_pci
 111         struct pci_config_window *cfg;
 112
 113         /* Parse our PCI ranges and request their resources */
 114 -       err = pci_parse_request_of_pci_ranges(dev, resources, &bus_range);
 115 +       err = pci_parse_request_of_pci_ranges(dev, resources, NULL, &bus_range);
 116         if (err)
 117                 return ERR_PTR(err);
 118
 119 --- a/drivers/pci/controller/pci-v3-semi.c
 120 +++ b/drivers/pci/controller/pci-v3-semi.c
 121 @@ -793,12 +793,8 @@ static int v3_pci_probe(struct platform_
 122         if (IS_ERR(v3->config_base))
 123                 return PTR_ERR(v3->config_base);
 124
 125 -       ret = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff, &res,
 126 -                                                   &io_base);
 127 -       if (ret)
 128 -               return ret;
 129 -
 130 -       ret = devm_request_pci_bus_resources(dev, &res);
 131 +       ret = pci_parse_request_of_pci_ranges(dev, &host->windows,
 132 +                                             &host->dma_ranges, NULL);
 133         if (ret)
 134                 return ret;
 135
 136 --- a/drivers/pci/controller/pci-versatile.c
 137 +++ b/drivers/pci/controller/pci-versatile.c
 138 @@ -141,7 +141,8 @@ static int versatile_pci_probe(struct pl
 139         if (IS_ERR(versatile_cfg_base[1]))
 140                 return PTR_ERR(versatile_cfg_base[1]);
 141
 142 -       ret = versatile_pci_parse_request_of_pci_ranges(dev, &pci_res);
 143 +       ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows,
 144 +                                             NULL, NULL);
 145         if (ret)
 146                 return ret;
 147
 148 --- a/drivers/pci/controller/pci-xgene.c
 149 +++ b/drivers/pci/controller/pci-xgene.c
 150 @@ -634,8 +634,8 @@ static int xgene_pcie_probe(struct platf
 151         if (ret)
 152                 return ret;
 153
 154 -       ret = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff, &res,
 155 -                                                   &iobase);
 156 +       ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows,
 157 +                                             &bridge->dma_ranges, NULL);
 158         if (ret)
 159                 return ret;
 160
 161 --- a/drivers/pci/controller/pcie-altera.c
 162 +++ b/drivers/pci/controller/pcie-altera.c
 163 @@ -833,9 +833,8 @@ static int altera_pcie_probe(struct plat
 164                 return ret;
 165         }
 166
 167 -       INIT_LIST_HEAD(&pcie->resources);
 168 -
 169 -       ret = altera_pcie_parse_request_of_pci_ranges(pcie);
 170 +       ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows,
 171 +                                             &bridge->dma_ranges, NULL);
 172         if (ret) {
 173                 dev_err(dev, "Failed add resources\n");
 174                 return ret;
 175 --- a/drivers/pci/controller/pcie-cadence-host.c
 176 +++ b/drivers/pci/controller/pcie-cadence-host.c
 177 @@ -216,7 +216,7 @@ static int cdns_pcie_host_init(struct de
 178         int err;
 179
 180         /* Parse our PCI ranges and request their resources */
 181 -       err = pci_parse_request_of_pci_ranges(dev, resources, &bus_range);
 182 +       err = pci_parse_request_of_pci_ranges(dev, resources, NULL, &bus_range);
 183         if (err)
 184                 return err;
 185
 186 --- a/drivers/pci/controller/pcie-iproc-platform.c
 187 +++ b/drivers/pci/controller/pcie-iproc-platform.c
 188 @@ -97,8 +97,8 @@ static int iproc_pcie_pltfm_probe(struct
 189         if (IS_ERR(pcie->phy))
 190                 return PTR_ERR(pcie->phy);
 191
 192 -       ret = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff, &resources,
 193 -                                                   &iobase);
 194 +       ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows,
 195 +                                             &bridge->dma_ranges, NULL);
 196         if (ret) {
 197                 dev_err(dev, "unable to get PCI host bridge resources\n");
 198                 return ret;
 199 --- a/drivers/pci/controller/pcie-mediatek.c
 200 +++ b/drivers/pci/controller/pcie-mediatek.c
 201 @@ -1027,8 +1027,8 @@ static int mtk_pcie_setup(struct mtk_pci
 202         resource_size_t io_base;
 203         int err;
 204
 205 -       err = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff,
 206 -                                                   windows, &io_base);
 207 +       err = pci_parse_request_of_pci_ranges(dev, windows,
 208 +                                             &host->dma_ranges, &bus);
 209         if (err)
 210                 return err;
 211
 212 --- a/drivers/pci/controller/pcie-mobiveil.c
 213 +++ b/drivers/pci/controller/pcie-mobiveil.c
 214 @@ -883,8 +883,8 @@ static int mobiveil_pcie_probe(struct pl
 215         INIT_LIST_HEAD(&pcie->resources);
 216
 217         /* parse the host bridge base addresses from the device tree file */
 218 -       ret = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff,
 219 -                                                   &pcie->resources, &iobase);
 220 +       ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows,
 221 +                                             &bridge->dma_ranges, NULL);
 222         if (ret) {
 223                 dev_err(dev, "Getting bridge resources failed\n");
 224                 return ret;
 225 --- a/drivers/pci/controller/pcie-rcar.c
 226 +++ b/drivers/pci/controller/pcie-rcar.c
 227 @@ -1144,7 +1144,8 @@ static int rcar_pcie_probe(struct platfo
 228         pcie->dev = dev;
 229         platform_set_drvdata(pdev, pcie);
 230
 231 -       err = pci_parse_request_of_pci_ranges(dev, &pcie->resources, NULL);
 232 +       err = pci_parse_request_of_pci_ranges(dev, &pcie->resources,
 233 +                                             &bridge->dma_ranges, NULL);
 234         if (err)
 235                 goto err_free_bridge;
 236
 237 --- a/drivers/pci/controller/pcie-rockchip-host.c
 238 +++ b/drivers/pci/controller/pcie-rockchip-host.c
 239 @@ -995,8 +995,8 @@ static int rockchip_pcie_probe(struct pl
 240         if (err < 0)
 241                 goto err_deinit_port;
 242
 243 -       err = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff,
 244 -                                                   &res, &io_base);
 245 +       err = pci_parse_request_of_pci_ranges(dev, &bridge->windows,
 246 +                                             &bridge->dma_ranges, &bus_res);
 247         if (err)
 248                 goto err_remove_irq_domain;
 249
 250 --- a/drivers/pci/controller/pcie-xilinx-nwl.c
 251 +++ b/drivers/pci/controller/pcie-xilinx-nwl.c
 252 @@ -845,8 +845,8 @@ static int nwl_pcie_probe(struct platfor
 253                 return err;
 254         }
 255
 256 -       err = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff, &res,
 257 -                                                   &iobase);
 258 +       err = pci_parse_request_of_pci_ranges(dev, &bridge->windows,
 259 +                                             &bridge->dma_ranges, NULL);
 260         if (err) {
 261                 dev_err(dev, "Getting bridge resources failed\n");
 262                 return err;
 263 --- a/drivers/pci/controller/pcie-xilinx.c
 264 +++ b/drivers/pci/controller/pcie-xilinx.c
 265 @@ -647,8 +647,8 @@ static int xilinx_pcie_probe(struct plat
 266                 return err;
 267         }
 268
 269 -       err = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff, &res,
 270 -                                                   &iobase);
 271 +       err = pci_parse_request_of_pci_ranges(dev, &bridge->windows,
 272 +                                             &bridge->dma_ranges, NULL);
 273         if (err) {
 274                 dev_err(dev, "Getting bridge resources failed\n");
 275                 return err;
 276 --- a/drivers/pci/of.c
 277 +++ b/drivers/pci/of.c
 278 @@ -257,14 +257,16 @@ EXPORT_SYMBOL_GPL(of_pci_check_probe_onl
 279   */
 280  int devm_of_pci_get_host_bridge_resources(struct device *dev,
 281                         unsigned char busno, unsigned char bus_max,
 282 -                       struct list_head *resources, resource_size_t *io_base)
 283 +                       struct list_head *resources,
 284 +                       struct list_head *ib_resources,
 285 +                       resource_size_t *io_base)
 286  {
 287         struct device_node *dev_node = dev->of_node;
 288         struct resource *res, tmp_res;
 289         struct resource *bus_range;
 290         struct of_pci_range range;
 291         struct of_pci_range_parser parser;
 292 -       char range_type[4];
 293 +       const char *range_type;
 294         int err;
 295
 296         if (io_base)
 297 @@ -298,12 +300,12 @@ int devm_of_pci_get_host_bridge_resource
 298         for_each_of_pci_range(&parser, &range) {
 299                 /* Read next ranges element */
 300                 if ((range.flags & IORESOURCE_TYPE_BITS) == IORESOURCE_IO)
 301 -                       snprintf(range_type, 4, " IO");
 302 +                       range_type = "IO";
 303                 else if ((range.flags & IORESOURCE_TYPE_BITS) == IORESOURCE_MEM)
 304 -                       snprintf(range_type, 4, "MEM");
 305 +                       range_type = "MEM";
 306                 else
 307 -                       snprintf(range_type, 4, "err");
 308 -               dev_info(dev, "  %s %#010llx..%#010llx -> %#010llx\n",
 309 +                       range_type = "err";
 310 +               dev_info(dev, "  %6s %#012llx..%#012llx -> %#012llx\n",
 311                          range_type, range.cpu_addr,
 312                          range.cpu_addr + range.size - 1, range.pci_addr);
 313
 314 @@ -340,6 +342,48 @@ int devm_of_pci_get_host_bridge_resource
 315                 pci_add_resource_offset(resources, res, res->start - range.pci_addr);
 316         }
 317
 318 +       /* Check for dma-ranges property */
 319 +       if (!ib_resources)
 320 +               return 0;
 321 +       err = of_pci_dma_range_parser_init(&parser, dev_node);
 322 +       if (err)
 323 +               return 0;
 324 +
 325 +       dev_dbg(dev, "Parsing dma-ranges property...\n");
 326 +       for_each_of_pci_range(&parser, &range) {
 327 +               struct resource_entry *entry;
 328 +               /*
 329 +                * If we failed translation or got a zero-sized region
 330 +                * then skip this range
 331 +                */
 332 +               if (((range.flags & IORESOURCE_TYPE_BITS) != IORESOURCE_MEM) ||
 333 +                   range.cpu_addr == OF_BAD_ADDR || range.size == 0)
 334 +                       continue;
 335 +
 336 +               dev_info(dev, "  %6s %#012llx..%#012llx -> %#012llx\n",
 337 +                        "IB MEM", range.cpu_addr,
 338 +                        range.cpu_addr + range.size - 1, range.pci_addr);
 339 +
 340 +
 341 +               err = of_pci_range_to_resource(&range, dev_node, &tmp_res);
 342 +               if (err)
 343 +                       continue;
 344 +
 345 +               res = devm_kmemdup(dev, &tmp_res, sizeof(tmp_res), GFP_KERNEL);
 346 +               if (!res) {
 347 +                       err = -ENOMEM;
 348 +                       goto failed;
 349 +               }
 350 +
 351 +               /* Keep the resource list sorted */
 352 +               resource_list_for_each_entry(entry, ib_resources)
 353 +                       if (entry->res->start > res->start)
 354 +                               break;
 355 +
 356 +               pci_add_resource_offset(&entry->node, res,
 357 +                                       res->start - range.pci_addr);
 358 +       }
 359 +
 360         return 0;
 361
 362  failed:
 363 @@ -482,6 +526,7 @@ EXPORT_SYMBOL_GPL(of_irq_parse_and_map_p
 364
 365  int pci_parse_request_of_pci_ranges(struct device *dev,
 366                                     struct list_head *resources,
 367 +                                   struct list_head *ib_resources,
 368                                     struct resource **bus_range)
 369  {
 370         int err, res_valid = 0;
 371 @@ -489,8 +534,10 @@ int pci_parse_request_of_pci_ranges(stru
 372         struct resource_entry *win, *tmp;
 373
 374         INIT_LIST_HEAD(resources);
 375 +       if (ib_resources)
 376 +               INIT_LIST_HEAD(ib_resources);
 377         err = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff, resources,
 378 -                                                   &iobase);
 379 +                                                   ib_resources, &iobase);
 380         if (err)
 381                 return err;
 382
 383 --- a/drivers/pci/pci.h
 384 +++ b/drivers/pci/pci.h
 385 @@ -637,11 +637,15 @@ static inline void pci_release_bus_of_no
 386  #if defined(CONFIG_OF_ADDRESS)
 387  int devm_of_pci_get_host_bridge_resources(struct device *dev,
 388                         unsigned char busno, unsigned char bus_max,
 389 -                       struct list_head *resources, resource_size_t *io_base);
 390 +                       struct list_head *resources,
 391 +                       struct list_head *ib_resources,
 392 +                       resource_size_t *io_base);
 393  #else
 394  static inline int devm_of_pci_get_host_bridge_resources(struct device *dev,
 395                         unsigned char busno, unsigned char bus_max,
 396 -                       struct list_head *resources, resource_size_t *io_base)
 397 +                       struct list_head *resources,
 398 +                       struct list_head *ib_resources,
 399 +                       resource_size_t *io_base)
 400  {
 401         return -EINVAL;
 402  }
 403 --- a/include/linux/pci.h
 404 +++ b/include/linux/pci.h
 405 @@ -2278,6 +2278,7 @@ struct irq_domain;
 406  struct irq_domain *pci_host_bridge_of_msi_domain(struct pci_bus *bus);
 407  int pci_parse_request_of_pci_ranges(struct device *dev,
 408                                     struct list_head *resources,
 409 +                                   struct list_head *ib_resources,
 410                                     struct resource **bus_range);
 411
 412  /* Arch may override this (weak) */
 413 @@ -2286,9 +2287,11 @@ struct device_node *pcibios_get_phb_of_n
 414  #else  /* CONFIG_OF */
 415  static inline struct irq_domain *
 416  pci_host_bridge_of_msi_domain(struct pci_bus *bus) { return NULL; }
 417 -static inline int pci_parse_request_of_pci_ranges(struct device *dev,
 418 -                                                 struct list_head *resources,
 419 -                                                 struct resource **bus_range)
 420 +static inline int
 421 +pci_parse_request_of_pci_ranges(struct device *dev,
 422 +                               struct list_head *resources,
 423 +                               struct list_head *ib_resources,
 424 +                               struct resource **bus_range)
 425  {
 426         return -EINVAL;
 427  }