lkml.org 
[lkml]   [2021]   [Jul]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] x86/PCI: Handle PIRQ routing tables with no router device given
Hello Maciej,

05.07.2021 13:46, Maciej W. Rozycki:
> PIRQ routing tables provided by the PCI BIOS usually specify the PCI
> vendor:device ID as well as the bus address of the device implementing
> the PIRQ router, e.g.:
[...]
> linux-x86-pirq-router-nodev.diff

This one throws a panic in bus_find_device() here.
I can not yet get a good printout because scrollback does not work.
Maybe it is because of 4.14 kernel, and in order to apply it I had to
change pci_get_domain_bus_and_slot back to pci_get_bus_and_slot.
I'll try to also test with 5.x kernel later today.


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,28 @@ 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 (pirq_try_router(r, rt, dev))
> + pirq_router_dev = dev;
> + } else {
> + 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 */
> }
>

\
 
 \ /
  Last update: 2021-07-06 12:18    [W:0.229 / U:1.020 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site