From: Nikolai Zhubr <zhubr.2@gmail.com>
To: "Maciej W. Rozycki" <macro@orcam.me.uk>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>, Arnd Bergmann <arnd@kernel.org>,
x86@kernel.org, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] x86/PCI: Handle PIRQ routing tables with no router device given
Date: Thu, 08 Jul 2021 19:25:06 +0300 [thread overview]
Message-ID: <60E726E2.2050104@gmail.com> (raw)
In-Reply-To: <alpine.DEB.2.21.2107061320570.1711@angie.orcam.me.uk>
Hello Maciej,
06.07.2021 14:30, Maciej W. Rozycki:
> Changes from v1:
>
> - preinitialise `dev' in `pirq_find_router' for `for_each_pci_dev',
>
> - avoid calling `pirq_try_router' with null `dev'.
> ---
> arch/x86/pci/irq.c | 64 ++++++++++++++++++++++++++++++++++++-----------------
> 1 file changed, 44 insertions(+), 20 deletions(-)
>
> linux-x86-pirq-router-nodev.diff
Success!
Here is new log:
https://pastebin.com/QXaUsCV4
and --
# 8259A.pl
irq 0: 00, edge
irq 1: 00, edge
irq 2: 00, edge
irq 3: 00, edge
irq 4: 00, edge
irq 5: 00, edge
irq 6: 00, edge
irq 7: 00, edge
irq 8: 02, edge
irq 9: 02, level
irq 10: 02, edge
irq 11: 02, edge
irq 12: 02, edge
irq 13: 02, edge
irq 14: 02, edge
irq 15: 02, edge
Some notes:
- please ignore the backtrace from 8139too, it is expected and will be
worked on later;
- the message line " -> edge" looks somewhat strange, my guess is it
might be a small unintentional leftover of some bigger and more detailed
message/debugging, anyway, I'd humbly suppose "Triggering mode adjusted"
would look better.
Thank you!
Regards,
Nikolai
> Index: linux-macro-ide-tty/arch/x86/pci/irq.c
> ===================================================================
> --- linux-macro-ide-tty.orig/arch/x86/pci/irq.c
> +++ linux-macro-ide-tty/arch/x86/pci/irq.c
> @@ -908,10 +908,32 @@ static struct pci_dev *pirq_router_dev;
> * chipset" ?
> */
>
> +static bool __init pirq_try_router(struct irq_router *r,
> + struct irq_routing_table *rt,
> + struct pci_dev *dev)
> +{
> + struct irq_router_handler *h;
> +
> + DBG(KERN_DEBUG "PCI: Trying IRQ router for [%04x:%04x]\n",
> + dev->vendor, dev->device);
> +
> + for (h = pirq_routers; h->vendor; h++) {
> + /* First look for a router match */
> + if (rt->rtr_vendor == h->vendor&&
> + h->probe(r, dev, rt->rtr_device))
> + return true;
> + /* Fall back to a device match */
> + if (dev->vendor == h->vendor&&
> + h->probe(r, dev, dev->device))
> + return true;
> + }
> + return false;
> +}
> +
> static void __init pirq_find_router(struct irq_router *r)
> {
> struct irq_routing_table *rt = pirq_table;
> - struct irq_router_handler *h;
> + struct pci_dev *dev;
>
> #ifdef CONFIG_PCI_BIOS
> if (!rt->signature) {
> @@ -930,27 +952,29 @@ static void __init pirq_find_router(stru
> DBG(KERN_DEBUG "PCI: Attempting to find IRQ router for [%04x:%04x]\n",
> rt->rtr_vendor, rt->rtr_device);
>
> - pirq_router_dev = pci_get_domain_bus_and_slot(0, rt->rtr_bus,
> - rt->rtr_devfn);
> - if (!pirq_router_dev) {
> - DBG(KERN_DEBUG "PCI: Interrupt router not found at "
> - "%02x:%02x\n", rt->rtr_bus, rt->rtr_devfn);
> - return;
> + /* Use any vendor:device provided by the routing table or try all. */
> + if (rt->rtr_vendor) {
> + dev = pci_get_domain_bus_and_slot(0, rt->rtr_bus,
> + rt->rtr_devfn);
> + if (dev&& pirq_try_router(r, rt, dev))
> + pirq_router_dev = dev;
> + } else {
> + dev = NULL;
> + for_each_pci_dev(dev) {
> + if (pirq_try_router(r, rt, dev)) {
> + pirq_router_dev = dev;
> + break;
> + }
> + }
> }
>
> - for (h = pirq_routers; h->vendor; h++) {
> - /* First look for a router match */
> - if (rt->rtr_vendor == h->vendor&&
> - h->probe(r, pirq_router_dev, rt->rtr_device))
> - break;
> - /* Fall back to a device match */
> - if (pirq_router_dev->vendor == h->vendor&&
> - h->probe(r, pirq_router_dev, pirq_router_dev->device))
> - break;
> - }
> - dev_info(&pirq_router_dev->dev, "%s IRQ router [%04x:%04x]\n",
> - pirq_router.name,
> - pirq_router_dev->vendor, pirq_router_dev->device);
> + if (pirq_router_dev)
> + dev_info(&pirq_router_dev->dev, "%s IRQ router [%04x:%04x]\n",
> + pirq_router.name,
> + pirq_router_dev->vendor, pirq_router_dev->device);
> + else
> + DBG(KERN_DEBUG "PCI: Interrupt router not found at "
> + "%02x:%02x\n", rt->rtr_bus, rt->rtr_devfn);
>
> /* The device remains referenced for the kernel lifetime */
> }
>
next prev parent reply other threads:[~2021-07-08 16:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-06 11:30 [PATCH v2] x86/PCI: Handle PIRQ routing tables with no router device given Maciej W. Rozycki
2021-07-08 16:25 ` Nikolai Zhubr [this message]
2021-07-08 20:45 ` Maciej W. Rozycki
2021-07-08 22:39 ` Nikolai Zhubr
2021-07-08 23:35 ` Maciej W. Rozycki
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=60E726E2.2050104@gmail.com \
--to=zhubr.2@gmail.com \
--cc=arnd@kernel.org \
--cc=bhelgaas@google.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=macro@orcam.me.uk \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).