Page MenuHomeFreeBSD
Files F145322747

D35897.1777645700.diff
No OneTemporary
Actions

Size
4 KB
Referenced Files
None
Subscribers
None

D35897.1777645700.diff
View Options

diff --git a/sys/arm/allwinner/a10/a10_intc.c b/sys/arm/allwinner/a10/a10_intc.c
--- a/sys/arm/allwinner/a10/a10_intc.c
+++ b/sys/arm/allwinner/a10/a10_intc.c
@@ -236,7 +236,7 @@
if (pic == NULL)
return (ENXIO);
- return (intr_pic_claim_root(sc->sc_dev, xref, a10_intr, sc, 0));
+ return (intr_pic_claim_root(sc->sc_dev, xref, a10_intr, sc));
}
static void
diff --git a/sys/arm/arm/gic_acpi.c b/sys/arm/arm/gic_acpi.c
--- a/sys/arm/arm/gic_acpi.c
+++ b/sys/arm/arm/gic_acpi.c
@@ -227,8 +227,7 @@
/*
* Controller is root:
*/
- if (intr_pic_claim_root(dev, xref, arm_gic_intr, sc,
- GIC_LAST_SGI - GIC_FIRST_SGI + 1) != 0) {
+ if (intr_pic_claim_root(dev, xref, arm_gic_intr, sc) != 0) {
device_printf(dev, "could not set PIC as a root\n");
intr_pic_deregister(dev, xref);
goto cleanup;
diff --git a/sys/arm/arm/gic_fdt.c b/sys/arm/arm/gic_fdt.c
--- a/sys/arm/arm/gic_fdt.c
+++ b/sys/arm/arm/gic_fdt.c
@@ -153,8 +153,7 @@
*/
pxref = ofw_bus_find_iparent(ofw_bus_get_node(dev));
if (pxref == 0 || xref == pxref) {
- if (intr_pic_claim_root(dev, xref, arm_gic_intr, sc,
- GIC_LAST_SGI - GIC_FIRST_SGI + 1) != 0) {
+ if (intr_pic_claim_root(dev, xref, arm_gic_intr, sc) != 0) {
device_printf(dev, "could not set PIC as a root\n");
intr_pic_deregister(dev, xref);
goto cleanup;
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_intr.c b/sys/arm/broadcom/bcm2835/bcm2835_intr.c
--- a/sys/arm/broadcom/bcm2835/bcm2835_intr.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_intr.c
@@ -405,7 +405,7 @@
sc->intc_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
RF_ACTIVE);
if (sc->intc_irq_res == NULL) {
- if (intr_pic_claim_root(dev, xref, bcm2835_intc_intr, sc, 0) != 0) {
+ if (intr_pic_claim_root(dev, xref, bcm2835_intc_intr, sc) != 0) {
/* XXX clean up */
device_printf(dev, "could not set PIC as a root\n");
return (ENXIO);
diff --git a/sys/arm/broadcom/bcm2835/bcm2836.c b/sys/arm/broadcom/bcm2835/bcm2836.c
--- a/sys/arm/broadcom/bcm2835/bcm2836.c
+++ b/sys/arm/broadcom/bcm2835/bcm2836.c
@@ -646,7 +646,7 @@
if (pic == NULL)
return (ENXIO);
- return (intr_pic_claim_root(sc->bls_dev, xref, bcm_lintc_intr, sc, 0));
+ return (intr_pic_claim_root(sc->bls_dev, xref, bcm_lintc_intr, sc));
}
static int
diff --git a/sys/arm/ti/aintc.c b/sys/arm/ti/aintc.c
--- a/sys/arm/ti/aintc.c
+++ b/sys/arm/ti/aintc.c
@@ -230,7 +230,7 @@
if (pic == NULL)
return (ENXIO);
- return (intr_pic_claim_root(sc->sc_dev, xref, ti_aintc_intr, sc, 0));
+ return (intr_pic_claim_root(sc->sc_dev, xref, ti_aintc_intr, sc));
}
static int
diff --git a/sys/arm64/arm64/gic_v3_acpi.c b/sys/arm64/arm64/gic_v3_acpi.c
--- a/sys/arm64/arm64/gic_v3_acpi.c
+++ b/sys/arm64/arm64/gic_v3_acpi.c
@@ -345,8 +345,8 @@
}
}
- if (intr_pic_claim_root(dev, ACPI_INTR_XREF, arm_gic_v3_intr, sc,
- GIC_LAST_SGI - GIC_FIRST_SGI + 1) != 0) {
+ if (intr_pic_claim_root(dev, ACPI_INTR_XREF, arm_gic_v3_intr, sc)
+ != 0) {
err = ENXIO;
goto error;
}
diff --git a/sys/arm64/arm64/gic_v3_fdt.c b/sys/arm64/arm64/gic_v3_fdt.c
--- a/sys/arm64/arm64/gic_v3_fdt.c
+++ b/sys/arm64/arm64/gic_v3_fdt.c
@@ -161,8 +161,7 @@
/* Register xref */
OF_device_register_xref(xref, dev);
- if (intr_pic_claim_root(dev, xref, arm_gic_v3_intr, sc,
- GIC_LAST_SGI - GIC_FIRST_SGI + 1) != 0) {
+ if (intr_pic_claim_root(dev, xref, arm_gic_v3_intr, sc) != 0) {
err = ENXIO;
goto error;
}
diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c
--- a/sys/kern/subr_intr.c
+++ b/sys/kern/subr_intr.c
@@ -100,7 +100,6 @@
device_t intr_irq_root_dev;
static intr_irq_filter_t *irq_root_filter;
static void *irq_root_arg;
-static u_int irq_root_ipicount;
struct intr_pic_child {
SLIST_ENTRY(intr_pic_child) pc_next;
@@ -884,7 +883,7 @@
*/
int
intr_pic_claim_root(device_t dev, intptr_t xref, intr_irq_filter_t *filter,
- void *arg, u_int ipicount)
+ void *arg)
{
struct intr_pic *pic;
@@ -916,7 +915,6 @@
intr_irq_root_dev = dev;
irq_root_filter = filter;
irq_root_arg = arg;
- irq_root_ipicount = ipicount;
debugf("irq root set to %s\n", device_get_nameunit(dev));
return (0);
diff --git a/sys/riscv/riscv/plic.c b/sys/riscv/riscv/plic.c
--- a/sys/riscv/riscv/plic.c
+++ b/sys/riscv/riscv/plic.c
@@ -368,7 +368,7 @@
csr_set(sie, SIE_SEIE);
- return (intr_pic_claim_root(sc->dev, xref, plic_intr, sc, 0));
+ return (intr_pic_claim_root(sc->dev, xref, plic_intr, sc));
}
static void
diff --git a/sys/sys/intr.h b/sys/sys/intr.h
--- a/sys/sys/intr.h
+++ b/sys/sys/intr.h
@@ -110,7 +110,7 @@
struct intr_pic *intr_pic_register(device_t, intptr_t);
int intr_pic_deregister(device_t, intptr_t);
-int intr_pic_claim_root(device_t, intptr_t, intr_irq_filter_t *, void *, u_int);
+int intr_pic_claim_root(device_t, intptr_t, intr_irq_filter_t *, void *);
int intr_pic_add_handler(device_t, struct intr_pic *,
intr_child_irq_filter_t *, void *, uintptr_t, uintptr_t);
bool intr_is_per_cpu(struct resource *);

File Metadata

Mime Type
text/plain
Expires
Fri, May 1, 2:28 PM (9 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28527925
Default Alt Text
D35897.1777645700.diff (4 KB)

Event Timeline