Paths

Table of Contentst

a_bikeshed_string_for_sed_to_target.h"
Needs ReviewPublic
Actions

Authored by ehem_freebsd_m5p.com on Jun 23 2022, 1:27 AM.

Details

Reviewers

markj
jhb
kib
andrew
gnn
manu

Summary

Having two distinct names for the interrupt headers serves to interfere
with most efforts to converge the interrupt frameworks. Simply rename
all of them to "machine/a_bikeshed_string_for_sed_to_target.h". Another name could be substituted,
but right now simply have a random one for this commit.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 60078
Build 56962: arc lint + arc unit

Event Timeline

ehem_freebsd_m5p.com created this revision.Jun 23 2022, 1:27 AM

Herald added subscribers: jhibbits, rpokala, imp. · View Herald TranscriptJun 23 2022, 1:27 AM

ehem_freebsd_m5p.com requested review of this revision.Jun 23 2022, 1:27 AM

Harbormaster completed remote builds in B46072: Diff 107268.Jun 23 2022, 1:27 AM

So the theory is to continue pushing the various interrupt handling implementations closer together. I suspect the INTRNG team may have thought "intr.h" would distinguish their system as being potentially machine-independent, but I think this simply serves to inhibit merging.

As such a case of choosing "intr.h" versus "intr_machdep.h". I think "machine/intr.h" is better as "machine/" already marks them as potentially having architecture quirks. Ideally their similarity will increase, but this will take a while.

ehem_freebsd_m5p.com added a child revision: D32504: kern/intr: remove "irq" from kernel event API.Sep 9 2022, 9:59 PM

If it is felt __FreeBSD_version should be incremented and then check for header name, I've got that prepared. Simply an issue of need a reviewer to request that be done.

I was under the impression D35559 has the right reviewers, but no action has been observed. This is meant as a precursor to the updated D32504. This can improve several places, but does need someone to okay (and commit to the main tree). Then there are the child commits.

ehem_freebsd_m5p.com mentioned this in D36901: intr/x86: remove intr_bind() from x86.Oct 15 2022, 12:14 AM

ehem_freebsd_m5p.com mentioned this in D32504: kern/intr: remove "irq" from kernel event API.Nov 12 2022, 1:11 AM

Is there a reviewer in the house for D35559?

Ping for D35559. This will be in the way of most attempts to further merge the interrupt interfaces, so deciding the direction would be helpful.

reviews.freebsd.org, where commits go to die?

ehem_freebsd_m5p.com mentioned this in D39333: intrng: expose lower-level device interface for INTRNG.May 10 2023, 1:09 AM

So, most approaches to getting interrupt subsystems to converge are going to need something along the lines of D35559 at some point. Might it be possible to get a decision/activity on D35559?

My thinking was the shorter name machine/intr.h was better, since being in machine already marks the header as being potentially variable from architecture to architecture. Yet the opposite direction of moving arm(64)'s headers to machine/intr_machdep.h would also work. This really needs a decision as forward progress on convergence might be possible if there was activity here.

intrcompat: rename "machine/intr*.h" to "machine/a_bikeshed_string_for_sed_to_target.h"

Having two distinct names for the interrupt headers serves to interfere with most efforts to converge the interrupt frameworks. Simply rename all of them to "machine/a_bikeshed_string_for_sed_to_target.h". Another name could be substituted, but right now simply have a random one for this commit.

Herald added a reviewer: andrew. · View Herald TranscriptFri, Oct 18, 10:06 PM

Herald added a reviewer: andrew. · View Herald Transcript

Herald added a reviewer: gnn. · View Herald Transcript

Herald added a reviewer: manu. · View Herald Transcript

Herald added subscribers: riscv, olce, emaste. · View Herald Transcript

Harbormaster completed remote builds in B60078: Diff 145136.Fri, Oct 18, 10:06 PM

ehem_freebsd_m5p.com retitled this revision from intr: rename "machine/intr_machdep.h" headers to "machine/intr.h" to intrcompat: rename "machine/intr*.h" to "machine/a_bikeshed_string_for_Sed.Fri, Oct 18, 10:07 PM

ehem_freebsd_m5p.com edited the summary of this revision. (Show Details)

ehem_freebsd_m5p.com retitled this revision from intrcompat: rename "machine/intr*.h" to "machine/a_bikeshed_string_for_Sed to intrcompat: rename "machine/intr*.h" to "machine/a_bikeshed_string_for_sed_to_target.h".Fri, Oct 18, 10:15 PM

If someone is up for forward progress on this trivial issue, I recommend doing: (assuming your remote for FreeBSD-Github is "github")

git fetch github refs/pull/1431/head
git cherry-pick 7f0f39b57d08b14420823e7276c9222f37886468

This will likely need an update as files get renamed or modified on a routine basis. Since the Github branch was last updated 2 months ago, it will need (hopefully minor) adjustment.

Large Diff

This large diff affects 262 files. Files without inline comments have been collapsed. Expand All Files

Revision Contents
Changeset List

Path

Size

sys/

amd64/

acpica/

acpi_wakeup.c

2 lines

amd64/

2 lines

2 lines

2 lines

2 lines

ia32/

ia32_syscall.c

2 lines

include/

	a_bikeshed_string_for_sed_to_target.h
	intr_machdep.h

2 lines

intr_machdep.h

arm/

allwinner/

a10/

a10_intc.c

2 lines

a10_sramc.c

2 lines

a10_timer.c

2 lines

a20/

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

altera/

socfpga/

socfpga_a10_manager.c

2 lines

socfpga_manager.c

2 lines

socfpga_mp.c

2 lines

socfpga_rstmgr.c

2 lines

annapurna/

alpine/

alpine_machdep_mp.c

2 lines

arm/

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

broadcom/

bcm2835/

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

freescale/

imx/

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

vybrid/

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

include/

	a_bikeshed_string_for_sed_to_target.h
	intr.h

54 lines

intr.h

mv/

a37x0_spi.c

2 lines

armada38x/

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

nvidia/

tegra124/

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

qemu/

virt_mp.c

2 lines

qualcomm/

2 lines

2 lines

2 lines

2 lines

rockchip/

rk32xx_machdep.c

2 lines

ti/

aintc.c

2 lines

am335x/

am335x_gpio.c

2 lines

am335x_lcd_syscons.c

2 lines

am335x_scm_padconf.c

2 lines

omap4/

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

twl/

twl.c

2 lines

twl_clks.c

2 lines

twl_vreg.c

2 lines

xilinx/

zy7_mp.c

2 lines

arm64/

acpica/

acpi_iort.c

2 lines

arm64/

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

cavium/

thunder_pcie_common.c

2 lines

thunder_pcie_pem.c

2 lines

thunder_pcie_pem_fdt.c

2 lines

freescale/

imx/

imx7gpc.c

2 lines

include/

	a_bikeshed_string_for_sed_to_target.h
	intr.h

57 lines

intr.h

intel/

stratix10-soc-fpga-mgr.c

2 lines

stratix10-svc.c

2 lines

qoriq/

qoriq_dw_pci.c

2 lines

rockchip/

2 lines

2 lines

2 lines

2 lines

vmm/

io/

vgic_v3.c

2 lines

contrib/

ncsw/

user/

env/

xx.c

2 lines

vchiq/

interface/

vchiq_arm/

vchiq_kmod.c

2 lines

dev/

beri/

beri_mem.c

2 lines

beri_ring.c

2 lines

virtio/

network/

if_vtbe.c

2 lines

virtio.c

2 lines

virtio_block.c

2 lines

cesa/

cesa.c

2 lines

gpio/

dwgpio/

dwgpio.c

2 lines

pl061.c

2 lines

pl061_acpi.c

2 lines

hwpmc/

hwpmc_core.c

2 lines

hwpmc_uncore.c

2 lines

hwpmc_x86.c

2 lines

hyperv/

pcib/

vmbus_pcib.c

4 lines

vmbus/

vmbus.c

2 lines

x86/

vmbus_x86.c

2 lines

iicbus/

controller/

vybrid/

vf_i2c.c

2 lines

mmc/

host/

dwmmc.c

2 lines

ntb/

ntb_hw/

ntb_hw_intel.c

2 lines

ntb_hw_plx.c

2 lines

pci/

2 lines

2 lines

2 lines

2 lines

pci_host_generic_acpi.c

2 lines

pci_host_generic_fdt.c

4 lines

sdhci/

fsl_sdhci.c

2 lines

sound/

macio/

2 lines

2 lines

2 lines

2 lines

2 lines

tpm/

tpm_isa.c

2 lines

vmd/

vmd.c

2 lines

xen/

control/

control.c

2 lines

xilinx/

axi_quad_spi.c

2 lines

xlnx_pcib.c

2 lines

i386/

acpica/

acpi_wakeup.c

2 lines

i386/

2 lines

2 lines

2 lines

2 lines

2 lines

include/

a_bikeshed_string_for_sed_to_target.h

5 lines

intr_machdep.h

smp.h

2 lines

kern/

subr_intr.c

2 lines

powerpc/

aim/

mp_cpudep.c

2 lines

amigaone/

platform_amigaone.c

2 lines

include/

	a_bikeshed_string_for_sed_to_target.h
	intr_machdep.h

64 lines

mpc85xx/

2 lines

2 lines

2 lines

2 lines

ofw/

ofw_pcib_pci.c

2 lines

ofw_pcibus.c

2 lines

openpic_ofw.c

2 lines

powermac/

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

powernv/

opal_pci.c

2 lines

xive.c

2 lines

powerpc/

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

ps3/

ps3pic.c

2 lines

pseries/

rtas_pci.c

2 lines

vdevice.c

2 lines

xics.c

2 lines

psim/

openpic_iobus.c

2 lines

riscv/

include/

	a_bikeshed_string_for_sed_to_target.h
	intr.h

59 lines

riscv/

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

sifive/

fe310_aon.c

2 lines

fu740_pci_dw.c

2 lines

x86/

acpica/

madt.c

2 lines

include/

	a_bikeshed_string_for_sed_to_target.h
	intr_machdep.h

170 lines

intr_machdep.h

x86_smp.h

2 lines

xen/

arch-intr.h

2 lines

iommu/

intel_drv.c

2 lines

intel_intrmap.c

2 lines

intel_utils.c

2 lines

isa/

2 lines

2 lines

2 lines

2 lines

x86/

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

xen/

pv.c

3 lines

xen_apic.c

2 lines

intrcompat: rename "machine/intr*.h" to "machine/a_bikeshed_string_for_sed_to_target.h"Needs ReviewPublicActions

Details

Diff Detail

Event Timeline

Large Diff

Revision ContentsChangeset List

Diff 145136

sys/amd64/acpica/acpi_wakeup.c

sys/amd64/amd64/fpu.c

sys/amd64/amd64/machdep.c

sys/amd64/amd64/pmap.c

sys/amd64/amd64/trap.c

sys/amd64/ia32/ia32_syscall.c

sys/amd64/include/a_bikeshed_string_for_sed_to_target.h

sys/amd64/include/intr_machdep.h

sys/arm/allwinner/a10/a10_intc.c

sys/arm/allwinner/a10_sramc.c

sys/arm/allwinner/a10_timer.c

sys/arm/allwinner/a20/a20_cpu_cfg.c

sys/arm/allwinner/aw_gpio.c

sys/arm/allwinner/aw_mp.c

sys/arm/allwinner/aw_nmi.c

sys/arm/allwinner/aw_r_intc.c

sys/arm/allwinner/if_emac.c

sys/arm/altera/socfpga/socfpga_a10_manager.c

sys/arm/altera/socfpga/socfpga_manager.c

sys/arm/altera/socfpga/socfpga_mp.c

sys/arm/altera/socfpga/socfpga_rstmgr.c

sys/arm/annapurna/alpine/alpine_machdep_mp.c

sys/arm/arm/genassym.c

sys/arm/arm/generic_timer.c

sys/arm/arm/gic.c

sys/arm/arm/gic_acpi.c

sys/arm/arm/gic_fdt.c

sys/arm/arm/machdep_intr.c

sys/arm/arm/mp_machdep.c

sys/arm/arm/mpcore_timer.c

sys/arm/arm/nexus.c

sys/arm/arm/pl310.c

sys/arm/arm/platform.c

sys/arm/arm/pmu.c

sys/arm/arm/sp804.c

sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c

sys/arm/broadcom/bcm2835/bcm2835_ft5406.c

sys/arm/broadcom/bcm2835/bcm2835_gpio.c

sys/arm/broadcom/bcm2835/bcm2835_intr.c

sys/arm/broadcom/bcm2835/bcm2835_spi.c

sys/arm/broadcom/bcm2835/bcm2836.c

sys/arm/broadcom/bcm2835/bcm2836_mp.c

sys/arm/broadcom/bcm2835/bcm2838_pci.c

sys/arm/freescale/imx/imx6_audmux.c

sys/arm/freescale/imx/imx6_machdep.c

sys/arm/freescale/imx/imx6_mp.c

sys/arm/freescale/imx/imx6_sdma.c

sys/arm/freescale/imx/imx6_ssi.c

sys/arm/freescale/imx/imx_epit.c

sys/arm/freescale/imx/imx_gpio.c

sys/arm/freescale/imx/imx_gpt.c

sys/arm/freescale/imx/imx_spi.c

sys/arm/freescale/imx/imx_wdog.c

sys/arm/freescale/vybrid/vf_adc.c

sys/arm/freescale/vybrid/vf_anadig.c

sys/arm/freescale/vybrid/vf_ccm.c

sys/arm/freescale/vybrid/vf_dcu4.c

sys/arm/freescale/vybrid/vf_dmamux.c

sys/arm/freescale/vybrid/vf_edma.c

sys/arm/freescale/vybrid/vf_gpio.c

sys/arm/freescale/vybrid/vf_iomuxc.c

sys/arm/freescale/vybrid/vf_mscm.c

sys/arm/freescale/vybrid/vf_port.c

sys/arm/freescale/vybrid/vf_sai.c

sys/arm/freescale/vybrid/vf_spi.c

sys/arm/freescale/vybrid/vf_src.c

sys/arm/freescale/vybrid/vf_tcon.c

sys/arm/include/a_bikeshed_string_for_sed_to_target.h

sys/arm/include/intr.h

sys/arm/mv/a37x0_spi.c

sys/arm/mv/armada38x/armada38x_mp.c

sys/arm/mv/gpio.c

sys/arm/mv/ic.c

intrcompat: rename "machine/intr*.h" to "machine/a_bikeshed_string_for_sed_to_target.h"
Needs ReviewPublic
Actions

Revision Contents
Changeset List