Skip to content

Commit e9d7b43

Browse files
ij-intelbp3tk0v
authored andcommitted
x86/pci/xen: Fix PCIBIOS_* return code handling
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: 3f2a230 ("xen: handled remapped IRQs when enabling a pcifront PCI device.") Signed-off-by: Ilpo Järvinen <[email protected]> Signed-off-by: Borislav Petkov (AMD) <[email protected]> Reviewed-by: Juergen Gross <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 7248520 commit e9d7b43

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/x86/pci/xen.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ static int xen_pcifront_enable_irq(struct pci_dev *dev)
3838
u8 gsi;
3939

4040
rc = pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &gsi);
41-
if (rc < 0) {
41+
if (rc) {
4242
dev_warn(&dev->dev, "Xen PCI: failed to read interrupt line: %d\n",
4343
rc);
44-
return rc;
44+
return pcibios_err_to_errno(rc);
4545
}
4646
/* In PV DomU the Xen PCI backend puts the PIRQ in the interrupt line.*/
4747
pirq = gsi;

0 commit comments

Comments
 (0)