GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QEMU: Only call `pci_assign_irqs` with non-NULL dev 

Do not call `pci_assign_irqs` with a NULL device pointer.

Change-Id: Ide9ae38dedd881ed673ba1838a1e29529b306937
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55900
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Angel Pons 2021-06-28 14:00:57 +02:00 committed by Patrick Georgi
parent 5124c131ba
commit c76c59aa6a
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mainboard/emulation/qemu-i440fx/mainboard.c
View File

@ -24,8 +24,11 @@ static void qemu_nb_init(struct device *dev)
pc_keyboard_init(NO_AUX_DEVICE);
/* setup IRQ routing */
for (i = 0; i < 32; i++)
pci_assign_irqs(pcidev_on_root(i, 0), qemu_i440fx_irqs + (i % 4));
for (i = 0; i < 32; i++) {
struct device *d = pcidev_on_root(i, 0);
if (d)
pci_assign_irqs(d, qemu_i440fx_irqs + (i % 4));
}
}
static void qemu_nb_read_resources(struct device *dev)

14
src/mainboard/emulation/qemu-q35/mainboard.c
View File

@ -31,11 +31,17 @@ static void qemu_nb_init(struct device *dev)
pc_keyboard_init(NO_AUX_DEVICE);
/* setup IRQ routing for pci slots */
for (i = 0; i < 25; i++)
pci_assign_irqs(pcidev_on_root(i, 0), qemu_q35_irqs + (i % 4));
for (i = 0; i < 25; i++) {
struct device *d = pcidev_on_root(i, 0);
if (d)
pci_assign_irqs(d, qemu_q35_irqs + (i % 4));
}
/* setup IRQ routing southbridge devices */
for (i = 25; i < 32; i++)
pci_assign_irqs(pcidev_on_root(i, 0), qemu_q35_irqs);
for (i = 25; i < 32; i++) {
struct device *d = pcidev_on_root(i, 0);
if (d)
pci_assign_irqs(d, qemu_q35_irqs);
}
}
static void qemu_nb_read_resources(struct device *dev)