From: ddaney@caviumnetworks•com (David Daney)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 2/6] PCI: generic: Only fixup irqs for bus we are creating.
Date: Thu, 17 Sep 2015 10:13:21 -0700 [thread overview]
Message-ID: <55FAF4B1.1070109@caviumnetworks.com> (raw)
In-Reply-To: <20150916103232.GB17510@red-moon>
On 09/16/2015 03:32 AM, Lorenzo Pieralisi wrote:
> On Tue, Sep 15, 2015 at 06:49:24PM +0100, David Daney wrote:
>> On 09/15/2015 10:36 AM, Will Deacon wrote:
>>> Hi David,
>>>
>>> On Sat, Sep 12, 2015 at 12:21:55AM +0100, David Daney wrote:
>>>> From: David Daney <david.daney@cavium•com>
>>>>
>>>> Use pci_walk_bus() to restrict the fixup irq actions to only the bus
>>>> being created.
>>>>
>>>> If we create multiple buses with pci-host-generic, or there are buses
>>>> created by other drivers, we don't want to call pci_fixup_irqs() which
>>>> operates on all devices, not just the devices on the bus being added.
>>>> The consequence is that either the fixups are done more than once, or
>>>> in some cases incorrect fixups could be applied.
>>>>
>>>> Signed-off-by: David Daney <david.daney@cavium•com>
>>>> ---
>>>> drivers/pci/host/pci-host-generic.c | 8 +++++++-
>>>> 1 file changed, 7 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c
>>>> index 265dd25..a0fb241 100644
>>>> --- a/drivers/pci/host/pci-host-generic.c
>>>> +++ b/drivers/pci/host/pci-host-generic.c
>>>> @@ -205,6 +205,12 @@ static int gen_pci_parse_map_cfg_windows(struct gen_pci *pci)
>>>> return 0;
>>>> }
>>>>
>>>> +static int gen_pci_fixup_irq_cb(struct pci_dev *dev, void *arg)
>>>> +{
>>>> + pdev_fixup_irq(dev, pci_common_swizzle, of_irq_parse_and_map_pci);
>>>> + return 0;
>>>> +}
>>>> +
>>>> static int gen_pci_probe(struct platform_device *pdev)
>>>> {
>>>> int err;
>>>> @@ -262,7 +268,7 @@ static int gen_pci_probe(struct platform_device *pdev)
>>>> return -ENODEV;
>>>> }
>>>>
>>>> - pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);
>>>> + pci_walk_bus(bus, gen_pci_fixup_irq_cb, NULL);
>>>
>>> Any chance we could put something in the core PCI code for this? I think
>>> any host controller wanting to work with arm64 is potentially going to
>>> run into the same problem.
>>
>> Good idea.
>>
>> I will move the walking code into setup-irq.c (the current home of
>> pci_fixup_irqs()), and make it part of patch 1/6.
>
> For arm64 we could even compile out pci_fixup_irqs() since the IRQ mapping
> is done in pcibios_add_device() through DT, I agree on CONFIG_ARM this
> needs fixing though, so yes, make it common code and patch all host
> controllers that make use of pci_fixup_irqs() since that's a common
> issue as far as I can see (ARM pcibios works around it by having a
> IRQ mapping function per bus and it provides an API to initialize
> multiple host controllers at once and fixing up IRQs before devices
> are added, still, for host controllers that do not use that
> functionality - eg drivers/pci/host/pcie-designware.c - if there are
> multiple host controllers instances we run into the same problem).
Patching up other PCI bus drivers would be deferred to a different patch
set, as I have no way to test it.
>
> Side note: do you have any PCI host controller where mapping IRQs through
> of_irq_parse_and_map_pci() does not work ? If yes, why ?
>
The of_irq_parse_and_map_pci() call in arch/arm64/kernel/pci.c
(pcibios_add_device) seems to work for me.
I did send a patch recently to make it quite emitting erroneous error
messages for PCI devices that have no irq pin.
David Daney
next prev parent reply other threads:[~2015-09-17 17:13 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-11 23:21 [PATCH 0/6] PCI: generic: Misc. bug fixes and enhanced support for MSI David Daney
2015-09-11 23:21 ` [PATCH 1/6] PCI: Make global and export pdev_fixup_irq() David Daney
2015-09-11 23:21 ` [PATCH 2/6] PCI: generic: Only fixup irqs for bus we are creating David Daney
2015-09-15 17:36 ` Will Deacon
2015-09-15 17:49 ` David Daney
2015-09-16 10:32 ` Lorenzo Pieralisi
2015-09-17 17:13 ` David Daney [this message]
2015-09-11 23:21 ` [PATCH 3/6] PCI: generic: Quit clobbering our pci_ops David Daney
2015-09-15 17:40 ` Will Deacon
2015-09-11 23:21 ` [PATCH 4/6] PCI: generic: Correct, and avoid overflow, in bus_max calculation David Daney
2015-09-15 17:49 ` Will Deacon
2015-09-15 18:02 ` David Daney
2015-09-15 18:35 ` Will Deacon
2015-09-15 18:45 ` David Daney
2015-09-16 10:41 ` Will Deacon
2015-09-16 11:28 ` Lorenzo Pieralisi
2015-09-16 17:29 ` Will Deacon
2015-09-16 17:39 ` David Daney
2015-09-11 23:21 ` [PATCH 5/6] PCI: generic: Pass proper starting bus number to pci_scan_root_bus() David Daney
2015-09-15 17:55 ` Will Deacon
2015-09-11 23:21 ` [PATCH 6/6] PCI: generic: Allow bus default MSI controller to be specified David Daney
2015-09-15 17:53 ` Will Deacon
2015-09-15 18:25 ` David Daney
2015-09-15 18:06 ` [PATCH 0/6] PCI: generic: Misc. bug fixes and enhanced support for MSI David Daney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55FAF4B1.1070109@caviumnetworks.com \
--to=ddaney@caviumnetworks$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox