linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] PCI: tegra: Remove stray call to pci_ioremap_io()
@ 2016-08-01  7:05 Thierry Reding
  2016-08-01  9:08 ` Jon Hunter
  2016-08-01 17:47 ` Bjorn Helgaas
  0 siblings, 2 replies; 3+ messages in thread
From: Thierry Reding @ 2016-08-01  7:05 UTC (permalink / raw)
  To: Bjorn Helgaas; +Cc: Jon Hunter, linux-pci, linux-tegra

From: Thierry Reding <treding@nvidia.com>

This was introduced by an unfortunate interaction between commits
45c64b6ac4ef ("PCI: tegra: Request host bridge window resources with
core function") and e6e9f471f5fe ("PCI: tegra: Use generic
pci_remap_iospace() rather than ARM32-specific one").

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 2544937620a5..6de0757b11e4 100644
--- a/drivers/pci/host/pci-tegra.c
+++ b/drivers/pci/host/pci-tegra.c
@@ -621,8 +621,6 @@ static int tegra_pcie_setup(int nr, struct pci_sys_data *sys)
 	if (err < 0)
 		return err;
 
-	pci_ioremap_io(pcie->pio.start, pcie->io.start);
-
 	pci_add_resource_offset(&sys->resources, &pcie->pio, sys->io_offset);
 	pci_add_resource_offset(&sys->resources, &pcie->mem, sys->mem_offset);
 	pci_add_resource_offset(&sys->resources, &pcie->prefetch,
-- 
2.9.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] PCI: tegra: Remove stray call to pci_ioremap_io()
  2016-08-01  7:05 [PATCH] PCI: tegra: Remove stray call to pci_ioremap_io() Thierry Reding
@ 2016-08-01  9:08 ` Jon Hunter
  2016-08-01 17:47 ` Bjorn Helgaas
  1 sibling, 0 replies; 3+ messages in thread
From: Jon Hunter @ 2016-08-01  9:08 UTC (permalink / raw)
  To: Thierry Reding, Bjorn Helgaas; +Cc: linux-pci, linux-tegra


On 01/08/16 08:05, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
> 
> This was introduced by an unfortunate interaction between commits
> 45c64b6ac4ef ("PCI: tegra: Request host bridge window resources with
> core function") and e6e9f471f5fe ("PCI: tegra: Use generic
> pci_remap_iospace() rather than ARM32-specific one").
> 
> 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 2544937620a5..6de0757b11e4 100644
> --- a/drivers/pci/host/pci-tegra.c
> +++ b/drivers/pci/host/pci-tegra.c
> @@ -621,8 +621,6 @@ static int tegra_pcie_setup(int nr, struct pci_sys_data *sys)
>  	if (err < 0)
>  		return err;
>  
> -	pci_ioremap_io(pcie->pio.start, pcie->io.start);
> -
>  	pci_add_resource_offset(&sys->resources, &pcie->pio, sys->io_offset);
>  	pci_add_resource_offset(&sys->resources, &pcie->mem, sys->mem_offset);
>  	pci_add_resource_offset(&sys->resources, &pcie->prefetch,

Fixes booting on some Tegra boards for me.

Acked-by: Jon Hunter <jonathanh@nvidia.com>
Tested-by: Jon Hunter <jonathanh@nvidia.com>

Cheers
Jon

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] PCI: tegra: Remove stray call to pci_ioremap_io()
  2016-08-01  7:05 [PATCH] PCI: tegra: Remove stray call to pci_ioremap_io() Thierry Reding
  2016-08-01  9:08 ` Jon Hunter
@ 2016-08-01 17:47 ` Bjorn Helgaas
  1 sibling, 0 replies; 3+ messages in thread
From: Bjorn Helgaas @ 2016-08-01 17:47 UTC (permalink / raw)
  To: Thierry Reding; +Cc: Bjorn Helgaas, Jon Hunter, linux-pci, linux-tegra

On Mon, Aug 01, 2016 at 09:05:39AM +0200, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
> 
> This was introduced by an unfortunate interaction between commits
> 45c64b6ac4ef ("PCI: tegra: Request host bridge window resources with
> core function") and e6e9f471f5fe ("PCI: tegra: Use generic
> pci_remap_iospace() rather than ARM32-specific one").
> 
> Signed-off-by: Thierry Reding <treding@nvidia.com>

Thanks, I re-did the merge and fixed my mistake.

> ---
>  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 2544937620a5..6de0757b11e4 100644
> --- a/drivers/pci/host/pci-tegra.c
> +++ b/drivers/pci/host/pci-tegra.c
> @@ -621,8 +621,6 @@ static int tegra_pcie_setup(int nr, struct pci_sys_data *sys)
>  	if (err < 0)
>  		return err;
>  
> -	pci_ioremap_io(pcie->pio.start, pcie->io.start);
> -
>  	pci_add_resource_offset(&sys->resources, &pcie->pio, sys->io_offset);
>  	pci_add_resource_offset(&sys->resources, &pcie->mem, sys->mem_offset);
>  	pci_add_resource_offset(&sys->resources, &pcie->prefetch,
> -- 
> 2.9.0
> 
> --
> 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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2016-08-01 17:58 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-01  7:05 [PATCH] PCI: tegra: Remove stray call to pci_ioremap_io() Thierry Reding
2016-08-01  9:08 ` Jon Hunter
2016-08-01 17:47 ` Bjorn Helgaas

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).