]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
x86/pci/xen: Fix PCIBIOS_* return code handling
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Mon, 27 May 2024 12:55:37 +0000 (15:55 +0300)
committerBorislav Petkov (AMD) <bp@alien8.de>
Mon, 24 Jun 2024 17:21:25 +0000 (19:21 +0200)
xen_pcifront_enable_irq() uses pci_read_config_byte() that returns
PCIBIOS_* codes. The error handling, however, assumes the codes are
normal errnos because it checks for < 0.

xen_pcifront_enable_irq() also returns the PCIBIOS_* code back to the
caller but the function is used as the (*pcibios_enable_irq) function
which should return normal errnos.

Convert the error check to plain non-zero check which works for
PCIBIOS_* return codes and convert the PCIBIOS_* return code using
pcibios_err_to_errno() into normal errno before returning it.

Fixes: 3f2a230caf21 ("xen: handled remapped IRQs when enabling a pcifront PCI device.")
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Juergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/20240527125538.13620-3-ilpo.jarvinen@linux.intel.com
arch/x86/pci/xen.c

index 652cd53e77f641bfaee8ae25f2a4b162b0cf63b5..0f2fe524f60dcd7d4c4853c2972c425a41d1ef0a 100644 (file)
@@ -38,10 +38,10 @@ static int xen_pcifront_enable_irq(struct pci_dev *dev)
        u8 gsi;
 
        rc = pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &gsi);
-       if (rc < 0) {
+       if (rc) {
                dev_warn(&dev->dev, "Xen PCI: failed to read interrupt line: %d\n",
                         rc);
-               return rc;
+               return pcibios_err_to_errno(rc);
        }
        /* In PV DomU the Xen PCI backend puts the PIRQ in the interrupt line.*/
        pirq = gsi;