| Message ID | 1478520048-25430-1-git-send-email-horms+renesas@verge.net.au (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Mon, Nov 07, 2016 at 01:00:48PM +0100, Simon Horman wrote: > From: Phil Edworthy <phil.edworthy@renesas.com> > > Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > --- > > Phil, this is from the 3.3.2 BSP. > Is it appropriate for mainline? I see there is also an infrastructure patch (by you) required for this change: one to add pci_fixup_irqs_local(). I'll hold off on posting that pending your answer to the question above. > --- > drivers/pci/host/pcie-rcar.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c > index 62700d1896f4..06e7a75094c7 100644 > --- a/drivers/pci/host/pcie-rcar.c > +++ b/drivers/pci/host/pcie-rcar.c > @@ -472,7 +472,7 @@ static int rcar_pcie_enable(struct rcar_pcie *pcie) > return -ENODEV; > } > > - pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci); > + pci_fixup_irqs_local(bus, pci_common_swizzle, of_irq_parse_and_map_pci); > > pci_bus_size_bridges(bus); > pci_bus_assign_resources(bus); > -- > 2.7.0.rc3.207.g0ac5344 > -- 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
Hi Simon, On 07 November 2016 12:01, Simon Horman wrote: > From: Phil Edworthy <phil.edworthy@renesas.com> > > Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > --- > > Phil, this is from the 3.3.2 BSP. > Is it appropriate for mainline? No, this is not for upstream. The pci_fixup_irqs_local function was an RFC that should be solved in a more generic way. See https://patchwork.kernel.org/patch/9220653 BR Phil > --- > drivers/pci/host/pcie-rcar.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c > index 62700d1896f4..06e7a75094c7 100644 > --- a/drivers/pci/host/pcie-rcar.c > +++ b/drivers/pci/host/pcie-rcar.c > @@ -472,7 +472,7 @@ static int rcar_pcie_enable(struct rcar_pcie *pcie) > return -ENODEV; > } > > - pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci); > + pci_fixup_irqs_local(bus, pci_common_swizzle, > of_irq_parse_and_map_pci); > > pci_bus_size_bridges(bus); > pci_bus_assign_resources(bus); > -- > 2.7.0.rc3.207.g0ac5344 -- 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, Nov 07, 2016 at 01:32:28PM +0000, Phil Edworthy wrote: > Hi Simon, > > On 07 November 2016 12:01, Simon Horman wrote: > > From: Phil Edworthy <phil.edworthy@renesas.com> > > > > Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > --- > > > > Phil, this is from the 3.3.2 BSP. > > Is it appropriate for mainline? > No, this is not for upstream. The pci_fixup_irqs_local function was an RFC > that should be solved in a more generic way. > See https://patchwork.kernel.org/patch/9220653 Thanks, got it. -- 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/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index 62700d1896f4..06e7a75094c7 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c @@ -472,7 +472,7 @@ static int rcar_pcie_enable(struct rcar_pcie *pcie) return -ENODEV; } - pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci); + pci_fixup_irqs_local(bus, pci_common_swizzle, of_irq_parse_and_map_pci); pci_bus_size_bridges(bus); pci_bus_assign_resources(bus);