| Message ID | CACRpkda_6=qWRQDpTy67MFc=-fYRhqWDPx0NnNG5mjXQLyAAkw@mail.gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
Hi Linus, On Wed, Jun 21, 2017 at 05:14:13PM +0200, Linus Walleij wrote: > On Wed, Jun 21, 2017 at 12:45 PM, Lorenzo Pieralisi > <lorenzo.pieralisi@arm.com> wrote: > > > Sorry I miss yet another usage of struct pci_bus before bus is > > scanned in faraday_pci_parse_map_dma_ranges(), all these config > > accessors want is to access bus number 0 and writei/read some config > > values in there, please confirm. > > > > Updated patch here: > > I fixed it. This was needed: > diff --git a/drivers/pci/host/pci-ftpci100.c b/drivers/pci/host/pci-ftpci100.c > index 86f8a3d1c1da..5162dffc102b 100644 > --- a/drivers/pci/host/pci-ftpci100.c > +++ b/drivers/pci/host/pci-ftpci100.c > @@ -450,6 +450,8 @@ static int faraday_pci_probe(struct platform_device *pdev) > struct resource *io; > struct pci_host_bridge *host; > struct clk *clk; > + unsigned char max_bus_speed = PCI_SPEED_33MHz; > + unsigned char cur_bus_speed = PCI_SPEED_33MHz; I could not fix it myself since we do not have the same code base, I can't find any clock handling in the mainline as per v4.12-rc6. Is the ftpci100.c clock handling being queued for this merge window ? This patch: https://patchwork.ozlabs.org/patch/778716/ fixes a commit that is not in v4.12-rc6, I need some input to understand how to proceed. Thanks, Lorenzo > int ret; > u32 val; > LIST_HEAD(res); > @@ -553,27 +555,27 @@ static int faraday_pci_probe(struct platform_device *pdev) > unsigned long rate; > u32 val; > > - faraday_pci_read_config(p->bus, 0, > - FARADAY_PCI_STATUS_CMD, 4, &val); > + faraday_raw_pci_read_config(p, 0, 0, > + FARADAY_PCI_STATUS_CMD, 4, &val); > rate = clk_get_rate(p->bus_clk); > > if ((rate == 33000000) && (val & PCI_STATUS_66MHZ_CAPABLE)) { > dev_info(dev, "33MHz bus is 66MHz capable\n"); > - p->bus->max_bus_speed = PCI_SPEED_66MHz; > + max_bus_speed = PCI_SPEED_66MHz; > ret = clk_set_rate(p->bus_clk, 66000000); > if (ret) > dev_err(dev, "failed to set bus clock\n"); > } else { > dev_info(dev, "33MHz only bus\n"); > - p->bus->max_bus_speed = PCI_SPEED_33MHz; > + max_bus_speed = PCI_SPEED_33MHz; > } > > /* Bumping the clock may fail so read back the rate */ > rate = clk_get_rate(p->bus_clk); > if (rate == 33000000) > - p->bus->cur_bus_speed = PCI_SPEED_33MHz; > + cur_bus_speed = PCI_SPEED_33MHz; > if (rate == 66000000) > - p->bus->cur_bus_speed = PCI_SPEED_66MHz; > + cur_bus_speed = PCI_SPEED_66MHz; > } > > ret = faraday_pci_parse_map_dma_ranges(p, dev->of_node); > @@ -587,6 +589,8 @@ static int faraday_pci_probe(struct platform_device *pdev) > return ret; > } > p->bus = host->bus; > + p->bus->max_bus_speed = max_bus_speed; > + p->bus->cur_bus_speed = cur_bus_speed; > > pci_bus_assign_resources(p->bus); > pci_bus_add_devices(p->bus); > > > I'll send a modified and tested version of your patch. > > Yours, > Linus Walleij
On Wed, Jun 21, 2017 at 5:41 PM, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> wrote: > Is the ftpci100.c clock handling being queued for this merge window ? Yups, it's in Bjorn's tree and visible in linux-next. > This patch: > > https://patchwork.ozlabs.org/patch/778716/ > > fixes a commit that is not in v4.12-rc6, I need some input to understand > how to proceed. Yeah that is just a fix I had to do when fixing this other issue. It's cool, I just sent a patch. If Bjorn applied your series he can just apply this on top and all will be fine (for me). Yours, Linus Walleij
diff --git a/drivers/pci/host/pci-ftpci100.c b/drivers/pci/host/pci-ftpci100.c index 86f8a3d1c1da..5162dffc102b 100644 --- a/drivers/pci/host/pci-ftpci100.c +++ b/drivers/pci/host/pci-ftpci100.c @@ -450,6 +450,8 @@ static int faraday_pci_probe(struct platform_device *pdev) struct resource *io; struct pci_host_bridge *host; struct clk *clk; + unsigned char max_bus_speed = PCI_SPEED_33MHz; + unsigned char cur_bus_speed = PCI_SPEED_33MHz; int ret; u32 val; LIST_HEAD(res); @@ -553,27 +555,27 @@ static int faraday_pci_probe(struct platform_device *pdev) unsigned long rate; u32 val; - faraday_pci_read_config(p->bus, 0, - FARADAY_PCI_STATUS_CMD, 4, &val); + faraday_raw_pci_read_config(p, 0, 0, + FARADAY_PCI_STATUS_CMD, 4, &val); rate = clk_get_rate(p->bus_clk); if ((rate == 33000000) && (val & PCI_STATUS_66MHZ_CAPABLE)) { dev_info(dev, "33MHz bus is 66MHz capable\n"); - p->bus->max_bus_speed = PCI_SPEED_66MHz; + max_bus_speed = PCI_SPEED_66MHz; ret = clk_set_rate(p->bus_clk, 66000000); if (ret) dev_err(dev, "failed to set bus clock\n"); } else { dev_info(dev, "33MHz only bus\n"); - p->bus->max_bus_speed = PCI_SPEED_33MHz; + max_bus_speed = PCI_SPEED_33MHz; } /* Bumping the clock may fail so read back the rate */ rate = clk_get_rate(p->bus_clk); if (rate == 33000000) - p->bus->cur_bus_speed = PCI_SPEED_33MHz; + cur_bus_speed = PCI_SPEED_33MHz; if (rate == 66000000) - p->bus->cur_bus_speed = PCI_SPEED_66MHz; + cur_bus_speed = PCI_SPEED_66MHz; } ret = faraday_pci_parse_map_dma_ranges(p, dev->of_node); @@ -587,6 +589,8 @@ static int faraday_pci_probe(struct platform_device *pdev) return ret; } p->bus = host->bus; + p->bus->max_bus_speed = max_bus_speed; + p->bus->cur_bus_speed = cur_bus_speed; pci_bus_assign_resources(p->bus); pci_bus_add_devices(p->bus);