From: Sepherosa Ziehau Date: Fri, 13 Jan 2012 08:43:24 +0000 (+0800) Subject: MachIntrABI: intr_{config,cpuid} -> legacy_intr_{config,cpuid} X-Git-Tag: v3.0.0~92 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/bec969af044db02dcd095f5e5eaea0423bd5d2d7 MachIntrABI: intr_{config,cpuid} -> legacy_intr_{config,cpuid} So these two functions will not be misused on MSI. No functional changes --- diff --git a/sys/bus/isa/i386/isa.c b/sys/bus/isa/i386/isa.c index d635d098b7..326acf43dd 100644 --- a/sys/bus/isa/i386/isa.c +++ b/sys/bus/isa/i386/isa.c @@ -108,7 +108,7 @@ isa_alloc_resource(device_t bus, device_t child, int type, int *rid, case SYS_RES_IRQ: if (*rid >= ISA_NIRQ) return 0; - cpuid = machintr_intr_cpuid(start); + cpuid = machintr_legacy_intr_cpuid(start); break; case SYS_RES_DRQ: if (*rid >= ISA_NDRQ) diff --git a/sys/bus/isa/i386/isa_compat.c b/sys/bus/isa/i386/isa_compat.c index db2a2f2213..30555420dd 100644 --- a/sys/bus/isa/i386/isa_compat.c +++ b/sys/bus/isa/i386/isa_compat.c @@ -217,7 +217,7 @@ isa_compat_probe(device_t dev) int intr = ffs(dvp->id_irq) - 1; bus_set_resource(dev, SYS_RES_IRQ, 0, intr, 1, - machintr_intr_cpuid(intr)); + machintr_legacy_intr_cpuid(intr)); } if (dvp->id_drq != old.id_drq) { bus_set_resource(dev, SYS_RES_DRQ, 0, diff --git a/sys/bus/isa/isa_common.c b/sys/bus/isa/isa_common.c index 5944d35265..83d6926018 100644 --- a/sys/bus/isa/isa_common.c +++ b/sys/bus/isa/isa_common.c @@ -284,7 +284,7 @@ isa_find_irq(device_t child, irq != -1; irq = find_next_bit(mask, irq)) { bus_set_resource(child, SYS_RES_IRQ, i, - irq, 1, machintr_intr_cpuid(irq)); + irq, 1, machintr_legacy_intr_cpuid(irq)); res[i] = bus_alloc_resource(child, SYS_RES_IRQ, &i, 0, ~0, 1, 0 /* !RF_ACTIVE */ ); diff --git a/sys/bus/isa/isahint.c b/sys/bus/isa/isahint.c index 71e1e77723..11f6dcd335 100644 --- a/sys/bus/isa/isahint.c +++ b/sys/bus/isa/isahint.c @@ -72,7 +72,7 @@ isahint_add_device(device_t parent, const char *name, int unit) if (resource_int_value(name, unit, "irq", &start) == 0 && start > 0) { bus_set_resource(child, SYS_RES_IRQ, 0, start, 1, - machintr_intr_cpuid(start)); + machintr_legacy_intr_cpuid(start)); } if (resource_int_value(name, unit, "drq", &start) == 0 && start >= 0) diff --git a/sys/bus/isa/x86_64/isa.c b/sys/bus/isa/x86_64/isa.c index b91ca6ab8a..12f1441b2e 100644 --- a/sys/bus/isa/x86_64/isa.c +++ b/sys/bus/isa/x86_64/isa.c @@ -102,7 +102,7 @@ isa_alloc_resource(device_t bus, device_t child, int type, int *rid, case SYS_RES_IRQ: if (*rid >= ISA_NIRQ) return 0; - cpuid = machintr_intr_cpuid(start); + cpuid = machintr_legacy_intr_cpuid(start); break; case SYS_RES_DRQ: if (*rid >= ISA_NDRQ) diff --git a/sys/bus/pci/pci.c b/sys/bus/pci/pci.c index 27c9c11141..c5f6134c5b 100644 --- a/sys/bus/pci/pci.c +++ b/sys/bus/pci/pci.c @@ -2912,7 +2912,7 @@ pci_assign_interrupt(device_t bus, device_t dev, int force_route) /* Add this IRQ as rid 0 interrupt resource. */ resource_list_add(&dinfo->resources, SYS_RES_IRQ, 0, irq, irq, 1, - machintr_intr_cpuid(irq)); + machintr_legacy_intr_cpuid(irq)); } void diff --git a/sys/dev/acpica5/Osd/OsdInterrupt.c b/sys/dev/acpica5/Osd/OsdInterrupt.c index 5d3a818bbf..c255e7c657 100644 --- a/sys/dev/acpica5/Osd/OsdInterrupt.c +++ b/sys/dev/acpica5/Osd/OsdInterrupt.c @@ -95,7 +95,7 @@ AcpiOsInstallInterruptHandler(UINT32 InterruptNumber, /* Set up the interrupt resource. */ sc->acpi_irq_rid = 0; bus_set_resource(sc->acpi_dev, SYS_RES_IRQ, 0, InterruptNumber, 1, - machintr_intr_cpuid(InterruptNumber)); + machintr_legacy_intr_cpuid(InterruptNumber)); sc->acpi_irq = bus_alloc_resource_any(sc->acpi_dev, SYS_RES_IRQ, &sc->acpi_irq_rid, flags); if (sc->acpi_irq == NULL) { diff --git a/sys/dev/acpica5/acpi_resource.c b/sys/dev/acpica5/acpi_resource.c index 7ca398499e..a4d62e9bc5 100644 --- a/sys/dev/acpica5/acpi_resource.c +++ b/sys/dev/acpica5/acpi_resource.c @@ -597,7 +597,7 @@ acpi_res_set_irq(device_t dev, void *context, u_int8_t *irq, int count, return; bus_set_resource(dev, SYS_RES_IRQ, cp->ar_nirq++, *irq, 1, - machintr_intr_cpuid(*irq)); + machintr_legacy_intr_cpuid(*irq)); } static void @@ -614,7 +614,7 @@ acpi_res_set_ext_irq(device_t dev, void *context, u_int32_t *irq, int count, return; bus_set_resource(dev, SYS_RES_IRQ, cp->ar_nirq++, *irq, 1, - machintr_intr_cpuid(*irq)); + machintr_legacy_intr_cpuid(*irq)); } static void diff --git a/sys/dev/disk/advansys/adv_isa.c b/sys/dev/disk/advansys/adv_isa.c index 1f1d7656e7..b59df2c61f 100644 --- a/sys/dev/disk/advansys/adv_isa.c +++ b/sys/dev/disk/advansys/adv_isa.c @@ -313,7 +313,7 @@ adv_isa_probe(device_t dev) int chip_irq = adv_get_chip_irq(adv); bus_set_resource(dev, SYS_RES_IRQ, 0, chip_irq, 1, - machintr_intr_cpuid(chip_irq)); + machintr_legacy_intr_cpuid(chip_irq)); } else { adv_set_chip_irq(adv, irq); } diff --git a/sys/dev/disk/aic/aic_isa.c b/sys/dev/disk/aic/aic_isa.c index f6805bd204..521b7b6a57 100644 --- a/sys/dev/disk/aic/aic_isa.c +++ b/sys/dev/disk/aic/aic_isa.c @@ -160,7 +160,7 @@ aic_isa_probe(device_t dev) int irq = PORTA_IRQ(porta); bus_set_resource(dev, SYS_RES_IRQ, 0, irq, 1, - machintr_intr_cpuid(irq)); + machintr_legacy_intr_cpuid(irq)); } if ((aic->flags & AIC_DMA_ENABLE) && isa_get_drq(dev) == -1) bus_set_resource(dev, SYS_RES_DRQ, 0, PORTA_DRQ(porta), 1, -1); diff --git a/sys/dev/disk/ata/ata-pci.c b/sys/dev/disk/ata/ata-pci.c index c70fa6e3f4..7dfb2d7c04 100644 --- a/sys/dev/disk/ata/ata-pci.c +++ b/sys/dev/disk/ata/ata-pci.c @@ -341,7 +341,7 @@ ata_pci_match(device_t dev) } else if (pci_get_slot(dev) == 2 && start && end) { bus_set_resource(dev, SYS_RES_IRQ, 0, start, end, - machintr_intr_cpuid(start)); + machintr_legacy_intr_cpuid(start)); start = end = 0; return "Promise TX4 ATA100 controller (channel 2+3)"; } @@ -821,7 +821,7 @@ ata_pci_alloc_resource(device_t dev, device_t child, int type, int *rid, if (ATA_MASTERDEV(dev)) { int irq = (unit == 0 ? 14 : 15); - cpuid = machintr_intr_cpuid(irq); + cpuid = machintr_legacy_intr_cpuid(irq); return BUS_ALLOC_RESOURCE(device_get_parent(dev), child, SYS_RES_IRQ, rid, irq, irq, 1, flags, cpuid); diff --git a/sys/dev/disk/buslogic/bt_isa.c b/sys/dev/disk/buslogic/bt_isa.c index e02096c2e7..240510240b 100644 --- a/sys/dev/disk/buslogic/bt_isa.c +++ b/sys/dev/disk/buslogic/bt_isa.c @@ -170,7 +170,7 @@ bt_isa_probe(device_t dev) bus_set_resource(dev, SYS_RES_DRQ, 0, info.drq, 1, -1); bus_set_resource(dev, SYS_RES_IRQ, 0, info.irq, 1, - machintr_intr_cpuid(info.irq)); + machintr_legacy_intr_cpuid(info.irq)); return (0); } diff --git a/sys/dev/disk/nata/ata-chipset.c b/sys/dev/disk/nata/ata-chipset.c index 7191ab4cd8..938b6c2fd5 100644 --- a/sys/dev/disk/nata/ata-chipset.c +++ b/sys/dev/disk/nata/ata-chipset.c @@ -3467,7 +3467,7 @@ ata_promise_ident(device_t dev) } else if (pci_get_slot(dev) == 2 && start && end) { bus_set_resource(dev, SYS_RES_IRQ, 0, start, end, - machintr_intr_cpuid(start)); + machintr_legacy_intr_cpuid(start)); strcat(buffer, " (channel 2+3)"); } else { diff --git a/sys/dev/disk/nata/ata-pci.c b/sys/dev/disk/nata/ata-pci.c index d22e36bba3..5d2164894b 100644 --- a/sys/dev/disk/nata/ata-pci.c +++ b/sys/dev/disk/nata/ata-pci.c @@ -330,7 +330,7 @@ ata_pci_alloc_resource(device_t dev, device_t child, int type, int *rid, if (controller->legacy) { int irq = (unit == 0 ? 14 : 15); - cpuid = machintr_intr_cpuid(irq); + cpuid = machintr_legacy_intr_cpuid(irq); res = BUS_ALLOC_RESOURCE(device_get_parent(dev), child, SYS_RES_IRQ, rid, irq, irq, 1, flags, cpuid); diff --git a/sys/dev/misc/psm/psm.c b/sys/dev/misc/psm/psm.c index 6737ed199f..152349d445 100644 --- a/sys/dev/misc/psm/psm.c +++ b/sys/dev/misc/psm/psm.c @@ -1103,7 +1103,7 @@ psmidentify(driver_t *driver, device_t parent) if (irq <= 0) return; bus_set_resource(psm, SYS_RES_IRQ, KBDC_RID_AUX, irq, 1, - machintr_intr_cpuid(irq)); + machintr_legacy_intr_cpuid(irq)); } #define endprobe(v) do { \ @@ -4644,7 +4644,7 @@ create_a_copy(device_t atkbdc, device_t me) /* move our resource to the found device */ irq = bus_get_resource_start(me, SYS_RES_IRQ, 0); bus_set_resource(psm, SYS_RES_IRQ, KBDC_RID_AUX, irq, 1, - machintr_intr_cpuid(irq)); + machintr_legacy_intr_cpuid(irq)); /* ...then probe and attach it */ return (device_probe_and_attach(psm)); @@ -4676,7 +4676,7 @@ psmcpnp_probe(device_t dev) device_printf(dev, "irq resource info is missing; " "assuming irq %ld\n", irq); bus_set_resource(dev, SYS_RES_IRQ, rid, irq, 1, - machintr_intr_cpuid(irq)); + machintr_legacy_intr_cpuid(irq)); } res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_SHAREABLE); bus_release_resource(dev, SYS_RES_IRQ, rid, res); diff --git a/sys/dev/netif/cs/if_cs.c b/sys/dev/netif/cs/if_cs.c index 52e70553c6..0c94869fef 100644 --- a/sys/dev/netif/cs/if_cs.c +++ b/sys/dev/netif/cs/if_cs.c @@ -427,7 +427,7 @@ cs_cs89x0_probe(device_t dev) if (!error) { bus_set_resource(dev, SYS_RES_IRQ, 0, - irq, 1, machintr_intr_cpuid(irq)); + irq, 1, machintr_legacy_intr_cpuid(irq)); } } } diff --git a/sys/dev/netif/ed/if_ed.c b/sys/dev/netif/ed/if_ed.c index b588257c0c..16ada2324d 100644 --- a/sys/dev/netif/ed/if_ed.c +++ b/sys/dev/netif/ed/if_ed.c @@ -419,7 +419,7 @@ ed_probe_WD80x3_generic(device_t dev, int flags, u_short *intr_vals[]) int intr_val = intr_vals[0][iptr]; error = bus_set_resource(dev, SYS_RES_IRQ, 0, - intr_val, 1, machintr_intr_cpuid(intr_val)); + intr_val, 1, machintr_legacy_intr_cpuid(intr_val)); } if (error) return (error); @@ -448,7 +448,7 @@ ed_probe_WD80x3_generic(device_t dev, int flags, u_short *intr_vals[]) int intr_val = intr_vals[1][iptr]; error = bus_set_resource(dev, SYS_RES_IRQ, 0, - intr_val, 1, machintr_intr_cpuid(intr_val)); + intr_val, 1, machintr_legacy_intr_cpuid(intr_val)); } if (error) return (error); @@ -1380,7 +1380,7 @@ ed_probe_HP_pclanp(device_t dev, int port_rid, int flags) int intr_val = ed_hpp_intr_val[irq]; bus_set_resource(dev, SYS_RES_IRQ, 0, intr_val, 1, - machintr_intr_cpuid(intr_val)); + machintr_legacy_intr_cpuid(intr_val)); } else { if (conf_irq != ed_hpp_intr_val[irq]) return (ENXIO); diff --git a/sys/dev/netif/ep/if_ep_isa.c b/sys/dev/netif/ep/if_ep_isa.c index 5e2bf372a0..3eb590b1a6 100644 --- a/sys/dev/netif/ep/if_ep_isa.c +++ b/sys/dev/netif/ep/if_ep_isa.c @@ -261,7 +261,7 @@ ep_isa_identify(driver_t *driver, device_t parent) device_set_desc_copy(child, desc); device_set_driver(child, driver); bus_set_resource(child, SYS_RES_IRQ, 0, irq, 1, - machintr_intr_cpuid(irq)); + machintr_legacy_intr_cpuid(irq)); bus_set_resource(child, SYS_RES_IOPORT, 0, ioport, EP_IOSIZE, -1); if (bootverbose) { diff --git a/sys/dev/netif/ex/if_ex_isa.c b/sys/dev/netif/ex/if_ex_isa.c index c4f174dee2..a82404265b 100644 --- a/sys/dev/netif/ex/if_ex_isa.c +++ b/sys/dev/netif/ex/if_ex_isa.c @@ -149,7 +149,7 @@ ex_isa_identify (driver_t *driver, device_t parent) device_set_desc_copy(child, desc); device_set_driver(child, driver); bus_set_resource(child, SYS_RES_IRQ, 0, irq, 1, - machintr_intr_cpuid(irq)); + machintr_legacy_intr_cpuid(irq)); bus_set_resource(child, SYS_RES_IOPORT, 0, ioport, EX_IOSIZE, -1); ++count; @@ -223,7 +223,7 @@ ex_isa_probe(device_t dev) } else { irq = ee2irq[tmp]; bus_set_resource(dev, SYS_RES_IRQ, 0, irq, 1, - machintr_intr_cpuid(irq)); + machintr_legacy_intr_cpuid(irq)); } if (irq == 0) { diff --git a/sys/dev/netif/fe/if_fe_isa.c b/sys/dev/netif/fe/if_fe_isa.c index 8615bbca78..e2c9774554 100644 --- a/sys/dev/netif/fe/if_fe_isa.c +++ b/sys/dev/netif/fe/if_fe_isa.c @@ -308,7 +308,7 @@ fe_probe_fmv(device_t dev) /* Just use the probed value. */ bus_set_resource(dev, SYS_RES_IRQ, 0, intr, 1, - machintr_intr_cpuid(intr)); + machintr_legacy_intr_cpuid(intr)); } else if (irq != irqmap[n]) { /* Don't match. */ sc->stability |= UNSTABLE_IRQ; @@ -789,7 +789,7 @@ fe_probe_jli(device_t dev) } else if (error && xirq != NO_IRQ) { /* Just use the probed IRQ value. */ bus_set_resource(dev, SYS_RES_IRQ, 0, xirq, 1, - machintr_intr_cpuid(xirq)); + machintr_legacy_intr_cpuid(xirq)); } else if (!error && xirq == NO_IRQ) { /* No problem. Go ahead. */ } else if (irq == xirq) { diff --git a/sys/dev/powermng/intpm/intpm.c b/sys/dev/powermng/intpm/intpm.c index a2d5f859a3..fb1a56128a 100644 --- a/sys/dev/powermng/intpm/intpm.c +++ b/sys/dev/powermng/intpm/intpm.c @@ -186,7 +186,7 @@ intsmb_attach(device_t dev) rid = 0; if (sc->cfg_irq9) { bus_set_resource(dev, SYS_RES_IRQ, rid, 9, 1, - machintr_intr_cpuid(9)); + machintr_legacy_intr_cpuid(9)); } sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c index 99a8f3392d..b6f427ce95 100644 --- a/sys/dev/sound/isa/mss.c +++ b/sys/dev/sound/isa/mss.c @@ -2114,7 +2114,7 @@ opti_init(device_t dev, struct mss_info *mss) u_int32_t irq = isa_get_irq(dev); u_int32_t drq = isa_get_drq(dev); bus_set_resource(dev, SYS_RES_IRQ, 0, irq, 1, - machintr_intr_cpuid(irq)); + machintr_legacy_intr_cpuid(irq)); bus_set_resource(dev, SYS_RES_DRQ, mss->drq1_rid, drq, 1, -1); if (flags & DV_F_DUAL_DMA) { bus_set_resource(dev, SYS_RES_DRQ, 1, diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 895777fd41..60e042904e 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -2848,7 +2848,7 @@ bus_alloc_legacy_irq_resource(device_t dev, int *rid, u_long irq, u_int flags) if (dev->parent == 0) return(0); return BUS_ALLOC_RESOURCE(dev->parent, dev, SYS_RES_IRQ, rid, - irq, irq, 1, flags, machintr_intr_cpuid(irq)); + irq, irq, 1, flags, machintr_legacy_intr_cpuid(irq)); } int diff --git a/sys/platform/pc32/acpica5/acpi_fadt.c b/sys/platform/pc32/acpica5/acpi_fadt.c index 1942138c7b..4f752ab981 100644 --- a/sys/platform/pc32/acpica5/acpi_fadt.c +++ b/sys/platform/pc32/acpica5/acpi_fadt.c @@ -189,7 +189,7 @@ acpi_sci_config(void) if (acpi_sci_trig != INTR_TRIGGER_CONFORM) { KKASSERT(acpi_sci_pola != INTR_POLARITY_CONFORM); - machintr_intr_config(acpi_sci_irq, + machintr_legacy_intr_config(acpi_sci_irq, acpi_sci_trig, acpi_sci_pola); return; } @@ -206,7 +206,7 @@ acpi_sci_config(void) last_cnt = get_interrupt_counter(acpi_sci_irq, 0); - machintr_intr_config(acpi_sci_irq, + machintr_legacy_intr_config(acpi_sci_irq, mode->sci_trig, mode->sci_pola); sci_desc = register_int(acpi_sci_irq, diff --git a/sys/platform/pc32/apic/ioapic_abi.c b/sys/platform/pc32/apic/ioapic_abi.c index cb3166b417..455fef4632 100644 --- a/sys/platform/pc32/apic/ioapic_abi.c +++ b/sys/platform/pc32/apic/ioapic_abi.c @@ -493,9 +493,10 @@ static void ioapic_abi_intr_enable(int); static void ioapic_abi_intr_disable(int); static void ioapic_abi_intr_setup(int, int); static void ioapic_abi_intr_teardown(int); -static void ioapic_abi_intr_config(int, + +static void ioapic_abi_legacy_intr_config(int, enum intr_trigger, enum intr_polarity); -static int ioapic_abi_intr_cpuid(int); +static int ioapic_abi_legacy_intr_cpuid(int); static int ioapic_abi_msi_alloc(int [], int, int); static void ioapic_abi_msi_release(const int [], int, int); @@ -517,8 +518,9 @@ struct machintr_abi MachIntrABI_IOAPIC = { .intr_enable = ioapic_abi_intr_enable, .intr_setup = ioapic_abi_intr_setup, .intr_teardown = ioapic_abi_intr_teardown, - .intr_config = ioapic_abi_intr_config, - .intr_cpuid = ioapic_abi_intr_cpuid, + + .legacy_intr_config = ioapic_abi_legacy_intr_config, + .legacy_intr_cpuid = ioapic_abi_legacy_intr_cpuid, .msi_alloc = ioapic_abi_msi_alloc, .msi_release = ioapic_abi_msi_release, @@ -891,7 +893,8 @@ ioapic_find_legacy_by_irq(int irq, enum intr_trigger trig, } static void -ioapic_abi_intr_config(int irq, enum intr_trigger trig, enum intr_polarity pola) +ioapic_abi_legacy_intr_config(int irq, enum intr_trigger trig, + enum intr_polarity pola) { struct ioapic_irqinfo *info; struct ioapic_irqmap *map = NULL; @@ -1024,7 +1027,7 @@ ioapic_conf_legacy_extint(int irq) } static int -ioapic_abi_intr_cpuid(int irq) +ioapic_abi_legacy_intr_cpuid(int irq) { const struct ioapic_irqmap *map = NULL; int cpuid; diff --git a/sys/platform/pc32/i386/nexus.c b/sys/platform/pc32/i386/nexus.c index cf438021e0..829e045894 100644 --- a/sys/platform/pc32/i386/nexus.c +++ b/sys/platform/pc32/i386/nexus.c @@ -474,7 +474,7 @@ static int nexus_config_intr(device_t bus, device_t chile, int irq, enum intr_trigger trig, enum intr_polarity pola) { - machintr_intr_config(irq, trig, pola); + machintr_legacy_intr_config(irq, trig, pola); return 0; } diff --git a/sys/platform/pc32/icu/icu_abi.c b/sys/platform/pc32/icu/icu_abi.c index 3e637b1959..9ad7750fb0 100644 --- a/sys/platform/pc32/icu/icu_abi.c +++ b/sys/platform/pc32/icu/icu_abi.c @@ -112,8 +112,10 @@ static void icu_abi_intr_enable(int); static void icu_abi_intr_disable(int); static void icu_abi_intr_setup(int, int); static void icu_abi_intr_teardown(int); -static void icu_abi_intr_config(int, enum intr_trigger, enum intr_polarity); -static int icu_abi_intr_cpuid(int); + +static void icu_abi_legacy_intr_config(int, enum intr_trigger, + enum intr_polarity); +static int icu_abi_legacy_intr_cpuid(int); static int icu_abi_msi_alloc(int [], int, int); static void icu_abi_msi_release(const int [], int, int); @@ -132,8 +134,9 @@ struct machintr_abi MachIntrABI_ICU = { .intr_enable = icu_abi_intr_enable, .intr_setup = icu_abi_intr_setup, .intr_teardown = icu_abi_intr_teardown, - .intr_config = icu_abi_intr_config, - .intr_cpuid = icu_abi_intr_cpuid, + + .legacy_intr_config = icu_abi_legacy_intr_config, + .legacy_intr_cpuid = icu_abi_legacy_intr_cpuid, .msi_alloc = icu_abi_msi_alloc, .msi_release = icu_abi_msi_release, @@ -346,7 +349,7 @@ icu_abi_initmap(void) } static void -icu_abi_intr_config(int irq, enum intr_trigger trig, +icu_abi_legacy_intr_config(int irq, enum intr_trigger trig, enum intr_polarity pola __unused) { struct icu_irqmap *map; @@ -379,7 +382,7 @@ icu_abi_intr_config(int irq, enum intr_trigger trig, } static int -icu_abi_intr_cpuid(int irq __unused) +icu_abi_legacy_intr_cpuid(int irq __unused) { return 0; } diff --git a/sys/platform/pc64/acpica5/acpi_fadt.c b/sys/platform/pc64/acpica5/acpi_fadt.c index 1942138c7b..4f752ab981 100644 --- a/sys/platform/pc64/acpica5/acpi_fadt.c +++ b/sys/platform/pc64/acpica5/acpi_fadt.c @@ -189,7 +189,7 @@ acpi_sci_config(void) if (acpi_sci_trig != INTR_TRIGGER_CONFORM) { KKASSERT(acpi_sci_pola != INTR_POLARITY_CONFORM); - machintr_intr_config(acpi_sci_irq, + machintr_legacy_intr_config(acpi_sci_irq, acpi_sci_trig, acpi_sci_pola); return; } @@ -206,7 +206,7 @@ acpi_sci_config(void) last_cnt = get_interrupt_counter(acpi_sci_irq, 0); - machintr_intr_config(acpi_sci_irq, + machintr_legacy_intr_config(acpi_sci_irq, mode->sci_trig, mode->sci_pola); sci_desc = register_int(acpi_sci_irq, diff --git a/sys/platform/pc64/apic/ioapic_abi.c b/sys/platform/pc64/apic/ioapic_abi.c index 681b3ade7a..3159ea7883 100644 --- a/sys/platform/pc64/apic/ioapic_abi.c +++ b/sys/platform/pc64/apic/ioapic_abi.c @@ -491,9 +491,10 @@ static void ioapic_abi_intr_enable(int); static void ioapic_abi_intr_disable(int); static void ioapic_abi_intr_setup(int, int); static void ioapic_abi_intr_teardown(int); -static void ioapic_abi_intr_config(int, + +static void ioapic_abi_legacy_intr_config(int, enum intr_trigger, enum intr_polarity); -static int ioapic_abi_intr_cpuid(int); +static int ioapic_abi_legacy_intr_cpuid(int); static int ioapic_abi_msi_alloc(int [], int, int); static void ioapic_abi_msi_release(const int [], int, int); @@ -514,8 +515,9 @@ struct machintr_abi MachIntrABI_IOAPIC = { .intr_enable = ioapic_abi_intr_enable, .intr_setup = ioapic_abi_intr_setup, .intr_teardown = ioapic_abi_intr_teardown, - .intr_config = ioapic_abi_intr_config, - .intr_cpuid = ioapic_abi_intr_cpuid, + + .legacy_intr_config = ioapic_abi_legacy_intr_config, + .legacy_intr_cpuid = ioapic_abi_legacy_intr_cpuid, .msi_alloc = ioapic_abi_msi_alloc, .msi_release = ioapic_abi_msi_release, @@ -888,7 +890,8 @@ ioapic_find_legacy_by_irq(int irq, enum intr_trigger trig, } static void -ioapic_abi_intr_config(int irq, enum intr_trigger trig, enum intr_polarity pola) +ioapic_abi_legacy_intr_config(int irq, enum intr_trigger trig, + enum intr_polarity pola) { struct ioapic_irqinfo *info; struct ioapic_irqmap *map = NULL; @@ -1021,7 +1024,7 @@ ioapic_conf_legacy_extint(int irq) } static int -ioapic_abi_intr_cpuid(int irq) +ioapic_abi_legacy_intr_cpuid(int irq) { const struct ioapic_irqmap *map = NULL; int cpuid; diff --git a/sys/platform/pc64/icu/icu_abi.c b/sys/platform/pc64/icu/icu_abi.c index d6a7ce9b93..cc8112b2a0 100644 --- a/sys/platform/pc64/icu/icu_abi.c +++ b/sys/platform/pc64/icu/icu_abi.c @@ -110,8 +110,10 @@ static void icu_abi_intr_enable(int); static void icu_abi_intr_disable(int); static void icu_abi_intr_setup(int, int); static void icu_abi_intr_teardown(int); -static void icu_abi_intr_config(int, enum intr_trigger, enum intr_polarity); -static int icu_abi_intr_cpuid(int); + +static void icu_abi_legacy_intr_config(int, enum intr_trigger, + enum intr_polarity); +static int icu_abi_legacy_intr_cpuid(int); static int icu_abi_msi_alloc(int [], int, int); static void icu_abi_msi_release(const int [], int, int); @@ -130,8 +132,9 @@ struct machintr_abi MachIntrABI_ICU = { .intr_enable = icu_abi_intr_enable, .intr_setup = icu_abi_intr_setup, .intr_teardown = icu_abi_intr_teardown, - .intr_config = icu_abi_intr_config, - .intr_cpuid = icu_abi_intr_cpuid, + + .legacy_intr_config = icu_abi_legacy_intr_config, + .legacy_intr_cpuid = icu_abi_legacy_intr_cpuid, .msi_alloc = icu_abi_msi_alloc, .msi_release = icu_abi_msi_release, @@ -344,7 +347,7 @@ icu_abi_initmap(void) } static void -icu_abi_intr_config(int irq, enum intr_trigger trig, +icu_abi_legacy_intr_config(int irq, enum intr_trigger trig, enum intr_polarity pola __unused) { struct icu_irqmap *map; @@ -377,7 +380,7 @@ icu_abi_intr_config(int irq, enum intr_trigger trig, } static int -icu_abi_intr_cpuid(int irq __unused) +icu_abi_legacy_intr_cpuid(int irq __unused) { return 0; } diff --git a/sys/platform/pc64/x86_64/nexus.c b/sys/platform/pc64/x86_64/nexus.c index d3b69e31f4..fd6993d407 100644 --- a/sys/platform/pc64/x86_64/nexus.c +++ b/sys/platform/pc64/x86_64/nexus.c @@ -472,7 +472,7 @@ static int nexus_config_intr(device_t bus, device_t chile, int irq, enum intr_trigger trig, enum intr_polarity pola) { - machintr_intr_config(irq, trig, pola); + machintr_legacy_intr_config(irq, trig, pola); return 0; } diff --git a/sys/platform/vkernel/platform/machintr.c b/sys/platform/vkernel/platform/machintr.c index 166315ee54..b109857cea 100644 --- a/sys/platform/vkernel/platform/machintr.c +++ b/sys/platform/vkernel/platform/machintr.c @@ -56,7 +56,7 @@ static void dummy_intr_disable(int); static void dummy_intr_enable(int); static void dummy_intr_setup(int, int); static void dummy_intr_teardown(int); -static int dummy_intr_cpuid(int); +static int dummy_legacy_intr_cpuid(int); static void dummy_finalize(void); static void dummy_intrcleanup(void); static void dummy_stabilize(void); @@ -67,7 +67,7 @@ struct machintr_abi MachIntrABI = { .intr_enable = dummy_intr_enable, .intr_setup = dummy_intr_setup, .intr_teardown = dummy_intr_teardown, - .intr_cpuid = dummy_intr_cpuid, + .legacy_intr_cpuid = dummy_legacy_intr_cpuid, .finalize = dummy_finalize, .cleanup = dummy_intrcleanup, @@ -110,7 +110,7 @@ dummy_stabilize(void) } static int -dummy_intr_cpuid(int irq __unused) +dummy_legacy_intr_cpuid(int irq __unused) { return 0; } diff --git a/sys/platform/vkernel64/platform/machintr.c b/sys/platform/vkernel64/platform/machintr.c index ba83191d87..5e4302f420 100644 --- a/sys/platform/vkernel64/platform/machintr.c +++ b/sys/platform/vkernel64/platform/machintr.c @@ -56,7 +56,7 @@ static void dummy_intr_disable(int); static void dummy_intr_enable(int); static void dummy_intr_setup(int, int); static void dummy_intr_teardown(int); -static int dummy_intr_cpuid(int); +static int dummy_legacy_intr_cpuid(int); static void dummy_finalize(void); static void dummy_intrcleanup(void); static void dummy_stabilize(void); @@ -67,7 +67,7 @@ struct machintr_abi MachIntrABI = { .intr_enable = dummy_intr_enable, .intr_setup = dummy_intr_setup, .intr_teardown = dummy_intr_teardown, - .intr_cpuid = dummy_intr_cpuid, + .legacy_intr_cpuid = dummy_legacy_intr_cpuid, .finalize = dummy_finalize, .cleanup = dummy_intrcleanup, @@ -110,7 +110,7 @@ dummy_stabilize(void) } static int -dummy_intr_cpuid(int irq __unused) +dummy_legacy_intr_cpuid(int irq __unused) { return 0; } diff --git a/sys/sys/machintr.h b/sys/sys/machintr.h index 8fa54bf26a..17e1d251e1 100644 --- a/sys/sys/machintr.h +++ b/sys/sys/machintr.h @@ -60,19 +60,21 @@ enum machintr_type { MACHINTR_GENERIC, MACHINTR_ICU, MACHINTR_IOAPIC }; struct machintr_abi { enum machintr_type type; - void (*intr_disable)(int); /* hardware disable intr */ - void (*intr_enable)(int); /* hardware enable intr */ - void (*intr_setup)(int, int); /* setup intr */ - void (*intr_teardown)(int); /* tear down intr */ - void (*intr_config) /* config intr */ - (int, enum intr_trigger, enum intr_polarity); - int (*intr_cpuid)(int); /* intr target cpu */ - - int (*msi_alloc) /* alloc count intrs on cpu */ + void (*intr_disable)(int intr); /* hardware disable intr */ + void (*intr_enable)(int intr); /* hardware enable intr */ + void (*intr_setup)(int intr, int flags); + /* setup intr */ + void (*intr_teardown)(int intr); /* tear down intr */ + + void (*legacy_intr_config) /* config legacy intr */ + (int intr, enum intr_trigger trig, enum intr_polarity pola); + int (*legacy_intr_cpuid)(int intr); /* legacy intr target cpu */ + + int (*msi_alloc) /* alloc count MSIs on cpu */ (int intrs[], int count, int cpuid); - void (*msi_release) /* release count intrs on cpu */ + void (*msi_release) /* release count MSIs on cpu */ (const int intrs[], int count, int cpuid); - void (*msi_map) /* addr/data for intr on cpu */ + void (*msi_map) /* addr/data for MSI on cpu */ (int intr, uint64_t *addr, uint32_t *data, int cpuid); void (*finalize)(void); /* final before ints enabled */ @@ -80,7 +82,7 @@ struct machintr_abi { void (*setdefault)(void); /* set default vectors */ void (*stabilize)(void); /* stable before ints enabled */ void (*initmap)(void); /* init irq mapping */ - void (*rman_setup)(struct rman *); /* setup rman */ + void (*rman_setup)(struct rman *rm); /* setup rman */ }; #define machintr_intr_enable(intr) MachIntrABI.intr_enable(intr) @@ -90,9 +92,10 @@ struct machintr_abi { #define machintr_intr_teardown(intr) \ MachIntrABI.intr_teardown((intr)) -#define machintr_intr_config(intr, trig, pola) \ - MachIntrABI.intr_config((intr), (trig), (pola)) -#define machintr_intr_cpuid(intr) MachIntrABI.intr_cpuid((intr)) +#define machintr_legacy_intr_config(intr, trig, pola) \ + MachIntrABI.legacy_intr_config((intr), (trig), (pola)) +#define machintr_legacy_intr_cpuid(intr) \ + MachIntrABI.legacy_intr_cpuid((intr)) extern struct machintr_abi MachIntrABI;