D33342.id99730.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D33342.id99730.diff
View Options

	Index: sys/arm64/arm64/gicv3_its.c
	===================================================================
	--- sys/arm64/arm64/gicv3_its.c
	+++ sys/arm64/arm64/gicv3_its.c
	@@ -1960,11 +1960,19 @@
	/* Register this device as a interrupt controller */
	xref = OF_xref_from_node(ofw_bus_get_node(dev));
	sc->sc_pic = intr_pic_register(dev, xref);
	- intr_pic_add_handler(device_get_parent(dev), sc->sc_pic,
	+ err = intr_pic_add_handler(device_get_parent(dev), sc->sc_pic,
	gicv3_its_intr, sc, sc->sc_irq_base, sc->sc_irq_length);
	+ if (err != 0) {
	+ device_printf(dev, "Failed to add PIC handler: %d\n", err);
	+ return (err);
	+ }

	/* Register this device to handle MSI interrupts */
	- intr_msi_register(dev, xref);
	+ err = intr_msi_register(dev, xref);
	+ if (err != 0) {
	+ device_printf(dev, "Failed to register for MSIs: %d\n", err);
	+ return (err);
	+ }

	return (0);
	}
	@@ -2021,11 +2029,19 @@

	di = device_get_ivars(dev);
	sc->sc_pic = intr_pic_register(dev, di->msi_xref);
	- intr_pic_add_handler(device_get_parent(dev), sc->sc_pic,
	+ err = intr_pic_add_handler(device_get_parent(dev), sc->sc_pic,
	gicv3_its_intr, sc, sc->sc_irq_base, sc->sc_irq_length);
	+ if (err != 0) {
	+ device_printf(dev, "Failed to add PIC handler: %d\n", err);
	+ return (err);
	+ }

	/* Register this device to handle MSI interrupts */
	- intr_msi_register(dev, di->msi_xref);
	+ err = intr_msi_register(dev, di->msi_xref);
	+ if (err != 0) {
	+ device_printf(dev, "Failed to register for MSIs: %d\n", err);
	+ return (err);
	+ }

	return (0);
	}