| Message ID | 20160630131430.32096-3-thierry.reding@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Thu, Jun 30, 2016 at 03:14:30PM +0200, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > In practice this value will never be used and it hinders portability of > the driver, so remove it. > > Signed-off-by: Thierry Reding <treding@nvidia.com> > --- > drivers/pci/host/pci-tegra.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c > index f04b062e8c67..bbf77a49517d 100644 > --- a/drivers/pci/host/pci-tegra.c > +++ b/drivers/pci/host/pci-tegra.c > @@ -2249,8 +2249,6 @@ static int tegra_pcie_probe(struct platform_device *pdev) > if (err < 0) > return err; > > - pcibios_min_mem = 0; unsigned long pcibios_min_mem = 0x01000000; # arch/arm/mm/iomap.c #define PCIBIOS_MIN_MEM pcibios_min_mem # arch/arm/include/asm/pci.h PCIBIOS_MIN_MEM is used in __pci_assign_resource(). It looks to me like we still use pcibios_min_mem; am I missing something? > err = tegra_pcie_get_resources(pcie); > if (err < 0) { > dev_err(&pdev->dev, "failed to request resources: %d\n", err); > -- > 2.8.3 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jul 25, 2016 at 04:28:50PM -0500, Bjorn Helgaas wrote: > On Thu, Jun 30, 2016 at 03:14:30PM +0200, Thierry Reding wrote: > > From: Thierry Reding <treding@nvidia.com> > > > > In practice this value will never be used and it hinders portability of > > the driver, so remove it. > > > > Signed-off-by: Thierry Reding <treding@nvidia.com> > > --- > > drivers/pci/host/pci-tegra.c | 2 -- > > 1 file changed, 2 deletions(-) > > > > diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c > > index f04b062e8c67..bbf77a49517d 100644 > > --- a/drivers/pci/host/pci-tegra.c > > +++ b/drivers/pci/host/pci-tegra.c > > @@ -2249,8 +2249,6 @@ static int tegra_pcie_probe(struct platform_device *pdev) > > if (err < 0) > > return err; > > > > - pcibios_min_mem = 0; > > unsigned long pcibios_min_mem = 0x01000000; # arch/arm/mm/iomap.c > #define PCIBIOS_MIN_MEM pcibios_min_mem # arch/arm/include/asm/pci.h > > PCIBIOS_MIN_MEM is used in __pci_assign_resource(). > > It looks to me like we still use pcibios_min_mem; am I missing something? The problem is that pcibios_min_mem is only defined on 32-bit ARM, so we'd need to conditionalize (with a preprocessor macro) the usage. However it turns out that it's not necessary because PCIBIOS_MIN_MEM only serves as a lower bound during resource assignment. pci_bus_alloc_resource() will eventually end up assigning from one of the regions defined in device tree and the lowest we'll ever start any of the memory regions is 0x12000000 (Tegra124). So instead of conditionalizing I've simply dropped the assignment because the default works fine for Tegra. Thierry
On Tue, Jul 26, 2016 at 11:54:15AM +0200, Thierry Reding wrote: > On Mon, Jul 25, 2016 at 04:28:50PM -0500, Bjorn Helgaas wrote: > > On Thu, Jun 30, 2016 at 03:14:30PM +0200, Thierry Reding wrote: > > > From: Thierry Reding <treding@nvidia.com> > > > > > > In practice this value will never be used and it hinders portability of > > > the driver, so remove it. > > > > > > Signed-off-by: Thierry Reding <treding@nvidia.com> > > > --- > > > drivers/pci/host/pci-tegra.c | 2 -- > > > 1 file changed, 2 deletions(-) > > > > > > diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c > > > index f04b062e8c67..bbf77a49517d 100644 > > > --- a/drivers/pci/host/pci-tegra.c > > > +++ b/drivers/pci/host/pci-tegra.c > > > @@ -2249,8 +2249,6 @@ static int tegra_pcie_probe(struct platform_device *pdev) > > > if (err < 0) > > > return err; > > > > > > - pcibios_min_mem = 0; > > > > unsigned long pcibios_min_mem = 0x01000000; # arch/arm/mm/iomap.c > > #define PCIBIOS_MIN_MEM pcibios_min_mem # arch/arm/include/asm/pci.h > > > > PCIBIOS_MIN_MEM is used in __pci_assign_resource(). > > > > It looks to me like we still use pcibios_min_mem; am I missing something? > > The problem is that pcibios_min_mem is only defined on 32-bit ARM, so > we'd need to conditionalize (with a preprocessor macro) the usage. > However it turns out that it's not necessary because PCIBIOS_MIN_MEM > only serves as a lower bound during resource assignment. > > pci_bus_alloc_resource() will eventually end up assigning from one of > the regions defined in device tree and the lowest we'll ever start any > of the memory regions is 0x12000000 (Tegra124). > > So instead of conditionalizing I've simply dropped the assignment > because the default works fine for Tegra. Oh, I see, yep, that makes sense now. I merged this with the following changelog: PCI: tegra: Stop setting pcibios_min_mem pcibios_min_mem only exists on 32-bit ARM, so using it in pci-tegra.c prevents the driver from being used on other arches. In __pci_assign_resource(), we clip the available area based on PCIBIOS_MIN_MEM. On 32-bit ARM, this is pcibios_min_mem, with a default value of 0x01000000. For Tegra, we discover the space available for PCI resource allocation from the device tree, and the lowest address that will ever be available is 0x12000000 (on Tegra124). The Tegra windows are always higher than the default pcibios_min_mem, so the __pci_assign_resource() has no effect, so there's no need to adjust pcibios_min_mem here. Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c index f04b062e8c67..bbf77a49517d 100644 --- a/drivers/pci/host/pci-tegra.c +++ b/drivers/pci/host/pci-tegra.c @@ -2249,8 +2249,6 @@ static int tegra_pcie_probe(struct platform_device *pdev) if (err < 0) return err; - pcibios_min_mem = 0; - err = tegra_pcie_get_resources(pcie); if (err < 0) { dev_err(&pdev->dev, "failed to request resources: %d\n", err);