Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/thorpej-i2c-spi-conf]: src/sys Sync with HEAD.
details: https://anonhg.NetBSD.org/src/rev/f991f5260feb
branches: thorpej-i2c-spi-conf
changeset: 378808:f991f5260feb
user: thorpej <thorpej%NetBSD.org@localhost>
date: Sun Aug 01 22:41:59 2021 +0000
description:
Sync with HEAD.
diffstat:
sys/altq/altq_cbq.c | 47 +-
sys/altq/altq_cbq.h | 14 +-
sys/altq/altq_rmclass.c | 169 +-
sys/altq/altq_rmclass.h | 81 +-
sys/arch/aarch64/aarch64/cctr_machdep.c | 36 -
sys/arch/aarch64/aarch64/cpu.c | 8 +-
sys/arch/aarch64/conf/files.aarch64 | 8 +-
sys/arch/aarch64/conf/majors.aarch64 | 4 +-
sys/arch/aarch64/include/armreg.h | 7 +-
sys/arch/acorn32/podulebus/if_ie.c | 6 +-
sys/arch/algor/conf/P4032 | 7 +-
sys/arch/algor/conf/P5064 | 7 +-
sys/arch/algor/conf/P6032 | 7 +-
sys/arch/algor/conf/majors.algor | 4 +-
sys/arch/alpha/alpha/autoconf.c | 118 +-
sys/arch/alpha/alpha/core_machdep.c | 5 +-
sys/arch/alpha/alpha/db_disasm.c | 216 +-
sys/arch/alpha/alpha/db_instruction.h | 18 +-
sys/arch/alpha/alpha/db_trace.c | 6 +-
sys/arch/alpha/alpha/dec_alphabook1.c | 6 +-
sys/arch/alpha/alpha/dec_axppci_33.c | 14 +-
sys/arch/alpha/alpha/dec_eb66.c | 11 +-
sys/arch/alpha/alpha/dec_kn300.c | 5 +-
sys/arch/alpha/alpha/fp_complete.c | 210 +-
sys/arch/alpha/alpha/genassym.cf | 18 +-
sys/arch/alpha/alpha/interrupt.c | 12 +-
sys/arch/alpha/alpha/lock_stubs.s | 332 +-
sys/arch/alpha/alpha/locore.s | 86 +-
sys/arch/alpha/alpha/machdep.c | 24 +-
sys/arch/alpha/alpha/mainbus.c | 7 +-
sys/arch/alpha/alpha/patch.c | 45 +-
sys/arch/alpha/alpha/pmap.c | 123 +-
sys/arch/alpha/alpha/pmap_subr.s | 165 +
sys/arch/alpha/alpha/trap.c | 339 +-
sys/arch/alpha/alpha/vm_machdep.c | 26 +-
sys/arch/alpha/common/bus_dma.c | 12 +-
sys/arch/alpha/common/sgmap_common.c | 13 +-
sys/arch/alpha/common/sgmap_typedep.c | 170 +-
sys/arch/alpha/common/shared_intr.c | 35 +-
sys/arch/alpha/conf/GENERIC | 46 +-
sys/arch/alpha/conf/INSTALL | 35 +-
sys/arch/alpha/conf/majors.alpha | 4 +-
sys/arch/alpha/conf/std.alpha | 6 +-
sys/arch/alpha/include/alpha.h | 20 +-
sys/arch/alpha/include/bus_defs.h | 8 +-
sys/arch/alpha/include/cpu.h | 5 +-
sys/arch/alpha/include/fpu.h | 102 +-
sys/arch/alpha/include/intr.h | 10 +-
sys/arch/alpha/include/mutex.h | 3 +-
sys/arch/alpha/include/param.h | 10 +-
sys/arch/alpha/include/pci_machdep.h | 18 +-
sys/arch/alpha/include/proc.h | 4 +-
sys/arch/alpha/include/rwlock.h | 38 +-
sys/arch/alpha/isa/isapnp_machdep.c | 5 +-
sys/arch/alpha/jensenio/jensenio_bus_intio.c | 5 +-
sys/arch/alpha/jensenio/jensenio_bus_io.c | 5 +-
sys/arch/alpha/jensenio/jensenio_bus_mem.c | 5 +-
sys/arch/alpha/jensenio/jensenio_dma.c | 5 +-
sys/arch/alpha/jensenio/jensenio_intr.c | 54 +-
sys/arch/alpha/mcbus/mcbus.c | 5 +-
sys/arch/alpha/mcbus/mcmem.c | 5 +-
sys/arch/alpha/pci/apecs.c | 58 +-
sys/arch/alpha/pci/apecs_bus_io.c | 5 +-
sys/arch/alpha/pci/apecs_bus_mem.c | 5 +-
sys/arch/alpha/pci/apecs_dma.c | 5 +-
sys/arch/alpha/pci/apecs_pci.c | 44 +-
sys/arch/alpha/pci/cia.c | 80 +-
sys/arch/alpha/pci/cia_bwx_bus_io.c | 5 +-
sys/arch/alpha/pci/cia_bwx_bus_mem.c | 5 +-
sys/arch/alpha/pci/cia_dma.c | 196 +-
sys/arch/alpha/pci/cia_pci.c | 44 +-
sys/arch/alpha/pci/cia_swiz_bus_io.c | 5 +-
sys/arch/alpha/pci/cia_swiz_bus_mem.c | 5 +-
sys/arch/alpha/pci/ciavar.h | 14 +-
sys/arch/alpha/pci/dwlpx.c | 20 +-
sys/arch/alpha/pci/dwlpx_bus_io.c | 5 +-
sys/arch/alpha/pci/dwlpx_bus_mem.c | 5 +-
sys/arch/alpha/pci/dwlpx_dma.c | 5 +-
sys/arch/alpha/pci/dwlpx_pci.c | 12 +-
sys/arch/alpha/pci/irongate.c | 37 +-
sys/arch/alpha/pci/irongate_bus_io.c | 5 +-
sys/arch/alpha/pci/irongate_bus_mem.c | 5 +-
sys/arch/alpha/pci/irongate_dma.c | 5 +-
sys/arch/alpha/pci/irongate_pci.c | 54 +-
sys/arch/alpha/pci/lca.c | 102 +-
sys/arch/alpha/pci/lca_bus_io.c | 5 +-
sys/arch/alpha/pci/lca_bus_mem.c | 5 +-
sys/arch/alpha/pci/lca_dma.c | 5 +-
sys/arch/alpha/pci/lca_pci.c | 78 +-
sys/arch/alpha/pci/lcareg.h | 42 +-
sys/arch/alpha/pci/lcavar.h | 4 +-
sys/arch/alpha/pci/mcpcia.c | 18 +-
sys/arch/alpha/pci/mcpcia_bus_io.c | 5 +-
sys/arch/alpha/pci/mcpcia_bus_mem.c | 5 +-
sys/arch/alpha/pci/mcpcia_dma.c | 6 +-
sys/arch/alpha/pci/mcpcia_pci.c | 12 +-
sys/arch/alpha/pci/pci_1000.c | 35 +-
sys/arch/alpha/pci/pci_1000.h | 33 -
sys/arch/alpha/pci/pci_1000a.c | 33 +-
sys/arch/alpha/pci/pci_1000a.h | 33 -
sys/arch/alpha/pci/pci_2100_a50.c | 47 +-
sys/arch/alpha/pci/pci_2100_a50.h | 30 -
sys/arch/alpha/pci/pci_2100_a500.c | 72 +-
sys/arch/alpha/pci/pci_2100_a500.h | 3 +-
sys/arch/alpha/pci/pci_550.c | 43 +-
sys/arch/alpha/pci/pci_550.h | 30 -
sys/arch/alpha/pci/pci_6600.c | 42 +-
sys/arch/alpha/pci/pci_6600.h | 5 -
sys/arch/alpha/pci/pci_alphabook1.c | 28 +-
sys/arch/alpha/pci/pci_alphabook1.h | 30 -
sys/arch/alpha/pci/pci_axppci_33.c | 48 +-
sys/arch/alpha/pci/pci_axppci_33.h | 30 -
sys/arch/alpha/pci/pci_eb164.c | 47 +-
sys/arch/alpha/pci/pci_eb164.h | 30 -
sys/arch/alpha/pci/pci_eb64plus.c | 37 +-
sys/arch/alpha/pci/pci_eb64plus.h | 30 -
sys/arch/alpha/pci/pci_eb66.c | 37 +-
sys/arch/alpha/pci/pci_eb66.h | 30 -
sys/arch/alpha/pci/pci_kn20aa.c | 37 +-
sys/arch/alpha/pci/pci_kn20aa.h | 30 -
sys/arch/alpha/pci/pci_kn300.c | 44 +-
sys/arch/alpha/pci/pci_kn300.h | 33 -
sys/arch/alpha/pci/pci_kn8ae.c | 46 +-
sys/arch/alpha/pci/pci_kn8ae.h | 33 -
sys/arch/alpha/pci/pci_machdep.c | 74 +-
sys/arch/alpha/pci/pci_sgmap_pte32.c | 5 +-
sys/arch/alpha/pci/pci_sgmap_pte64.c | 5 +-
sys/arch/alpha/pci/pci_up1000.c | 17 +-
sys/arch/alpha/pci/pci_up1000.h | 32 -
sys/arch/alpha/pci/sio_pic.c | 84 +-
sys/arch/alpha/pci/sioreg.h | 9 +-
sys/arch/alpha/pci/siovar.h | 3 +-
sys/arch/alpha/pci/tsc.c | 13 +-
sys/arch/alpha/pci/tsp_bus_io.c | 5 +-
sys/arch/alpha/pci/tsp_bus_mem.c | 5 +-
sys/arch/alpha/pci/tsp_dma.c | 229 +-
sys/arch/alpha/pci/tsp_pci.c | 42 +-
sys/arch/alpha/pci/tsreg.h | 21 +-
sys/arch/alpha/pci/tsvar.h | 15 +-
sys/arch/alpha/pci/ttwoga.c | 20 +-
sys/arch/alpha/pci/ttwoga_bus_io.c | 5 +-
sys/arch/alpha/pci/ttwoga_bus_mem.c | 5 +-
sys/arch/alpha/pci/ttwoga_pci.c | 55 +-
sys/arch/alpha/tc/tc_bus_mem.c | 5 +-
sys/arch/alpha/tc/tc_dma.c | 5 +-
sys/arch/alpha/tc/tc_dma_3000_500.c | 5 +-
sys/arch/alpha/tc/tc_sgmap.c | 5 +-
sys/arch/alpha/tlsb/kftxx.c | 5 +-
sys/arch/alpha/tlsb/tlsb.c | 5 +-
sys/arch/alpha/tlsb/tlsbmem.c | 5 +-
sys/arch/amd64/conf/ALL | 7 +-
sys/arch/amd64/conf/XEN3_DOM0 | 7 +-
sys/arch/amd64/conf/majors.amd64 | 4 +-
sys/arch/arm/amlogic/gxlphy.c | 9 +-
sys/arch/arm/arm/cpufunc.c | 10 +-
sys/arch/arm/arm32/cpu.c | 9 +-
sys/arch/arm/broadcom/bcm2835_gpio.c | 6 +-
sys/arch/arm/conf/majors.arm32 | 4 +-
sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts | 3 +-
sys/arch/arm/fdt/acpi_fdt.c | 120 +-
sys/arch/arm/fdt/files.fdt | 5 +-
sys/arch/arm/imx/imx51_ccm.c | 8 +-
sys/arch/arm/imx/imx51_ccmreg.h | 6 +-
sys/arch/arm/include/param.h | 5 +-
sys/arch/arm/ixp12x0/ixp12x0_clk.c | 6 +-
sys/arch/arm/nvidia/tegra_cec.c | 6 +-
sys/arch/arm/omap/omap3_ehci.c | 6 +-
sys/arch/arm/rockchip/rk_anxdp.c | 6 +-
sys/arch/arm/rockchip/rk_platform.c | 17 +-
sys/arch/arm/sunxi/sunxi_platform.c | 25 +-
sys/arch/arm/xscale/ixp425_npe.c | 12 +-
sys/arch/arm/xscale/ixp425_npereg.h | 4 +-
sys/arch/atari/pci/pci_vga.c | 6 +-
sys/arch/cats/conf/GENERIC | 5 +-
sys/arch/cesfic/cesfic/pmap_bootstrap.c | 6 +-
sys/arch/cobalt/conf/majors.cobalt | 4 +-
sys/arch/cobalt/conf/std.cobalt | 5 +-
sys/arch/cobalt/stand/boot/tlp.c | 4 +-
sys/arch/dreamcast/dev/pvr.c | 6 +-
sys/arch/emips/conf/RAMDISK | 4 +-
sys/arch/emips/ebus/ace_ebus.c | 6 +-
sys/arch/emips/ebus/flash_ebus.c | 6 +-
sys/arch/emips/stand/common/ace.c | 4 +-
sys/arch/emips/stand/common/raw.c | 4 +-
sys/arch/epoc32/conf/majors.epoc32 | 4 +-
sys/arch/epoc32/epoc32/intr.c | 5 +-
sys/arch/evbarm/conf/GENERIC.common | 3 +-
sys/arch/evbarm/conf/GENERIC64 | 2 +-
sys/arch/evbarm/conf/HDL_G | 5 +-
sys/arch/evbarm/conf/HPT5325 | 5 +-
sys/arch/evbarm/conf/MINI2440 | 5 +-
sys/arch/evbarm/conf/MMNET_GENERIC | 7 +-
sys/arch/evbarm/conf/MPCSA_GENERIC | 7 +-
sys/arch/evbarm/conf/POGO | 1 -
sys/arch/evbarm/conf/README.evbarm | 3 +-
sys/arch/evbarm/conf/SHEEVAPLUG | 5 +-
sys/arch/evbarm/conf/SMDK2410 | 5 +-
sys/arch/evbarm/conf/TS7200 | 5 +-
sys/arch/evbarm/conf/TWINTAIL | 5 +-
sys/arch/evbarm/conf/std.hdl_g | 4 +-
sys/arch/evbarm/ifpga/plcom_ifpga.c | 11 +-
sys/arch/evbarm/ifpga/plmmc_ifpga.c | 11 +-
sys/arch/evbmips/conf/majors.evbmips | 4 +-
sys/arch/evbmips/stand/sbmips/common/blkdev.c | 4 +-
sys/arch/evbppc/conf/OPENBLOCKS266_OPT | 5 +-
sys/arch/evbppc/conf/PMPPC | 5 +-
sys/arch/evbppc/conf/majors.evbppc | 4 +-
sys/arch/evbppc/conf/std.explora | 5 +-
sys/arch/hp300/dev/ct.c | 16 +-
sys/arch/hp300/dev/ctreg.h | 26 +-
sys/arch/hp300/dev/hpib.c | 136 +-
sys/arch/hp300/dev/hpibvar.h | 43 +-
sys/arch/hp300/dev/mt.c | 7 +-
sys/arch/hp300/dev/rd.c | 396 +-
sys/arch/hp300/dev/rdreg.h | 78 +-
sys/arch/hp300/dev/rdvar.h | 6 +-
sys/arch/hp300/hp300/pmap_bootstrap.c | 6 +-
sys/arch/hp300/stand/Makefile.buildboot | 4 +-
sys/arch/hp300/stand/common/autoconf.c | 3 +-
sys/arch/hp300/stand/common/ct.c | 6 +-
sys/arch/hp300/stand/common/grfreg.h | 87 -
sys/arch/hp300/stand/common/hpibvar.h | 18 +-
sys/arch/hp300/stand/common/ite.c | 24 +-
sys/arch/hp300/stand/common/ite_tc.c | 4 +-
sys/arch/hp300/stand/common/rd.c | 6 +-
sys/arch/hpcarm/conf/majors.hpcarm | 4 +-
sys/arch/hpcarm/conf/std.hpcarm | 5 +-
sys/arch/hpcmips/conf/GENERIC | 7 +-
sys/arch/hpcmips/conf/TX3922 | 5 +-
sys/arch/hpcmips/conf/VR41XX | 7 +-
sys/arch/hpcmips/conf/majors.hpcmips | 4 +-
sys/arch/hpcmips/conf/std.hpcmips | 5 +-
sys/arch/hpcmips/include/sysconf.h | 4 +-
sys/arch/hppa/conf/GENERIC | 7 +-
sys/arch/hppa/dev/ssio.c | 4 +-
sys/arch/hppa/dev/sti_sgc.c | 18 +-
sys/arch/hppa/hppa/intr.c | 6 +-
sys/arch/i386/conf/ALL | 7 +-
sys/arch/i386/conf/XEN3PAE_DOM0 | 5 +-
sys/arch/i386/conf/majors.i386 | 4 +-
sys/arch/i386/stand/boot/boot2.c | 15 +-
sys/arch/i386/stand/bootxx/boot1.c | 5 +-
sys/arch/i386/stand/efiboot/boot.c | 17 +-
sys/arch/i386/stand/lib/exec_multiboot2.c | 5 +-
sys/arch/ia64/conf/majors.ia64 | 4 +-
sys/arch/ia64/ia64/trap.c | 6 +-
sys/arch/landisk/conf/GENERIC | 7 +-
sys/arch/landisk/conf/majors.landisk | 4 +-
sys/arch/landisk/dev/btn_obio.c | 5 +-
sys/arch/landisk/dev/button.c | 12 +-
sys/arch/landisk/dev/buttonvar.h | 4 +-
sys/arch/m68k/060sp/dist/isp.s | 6 +-
sys/arch/m68k/fpsp/round.sa | 4 +-
sys/arch/m68k/m68k/db_disasm.c | 6 +-
sys/arch/mac68k/mac68k/pmap_bootstrap.c | 6 +-
sys/arch/macppc/conf/files.macppc | 15 +-
sys/arch/macppc/dev/fancontrol.c | 119 +
sys/arch/macppc/dev/fancontrolvar.h | 53 +
sys/arch/macppc/dev/fcu.c | 514 +
sys/arch/macppc/dev/lmu.c | 6 +-
sys/arch/macppc/dev/pbms.c | 4 +-
sys/arch/macppc/dev/psoc.c | 18 +-
sys/arch/macppc/dev/snapper.c | 25 +-
sys/arch/macppc/stand/fixcoff/fixcoff.c | 23 +-
sys/arch/mips/include/vmparam.h | 3 +-
sys/arch/mips/rmi/rmixlreg.h | 6 +-
sys/arch/mips/sibyte/include/sb1250_mac.h | 2 +-
sys/arch/mipsco/stand/common/saio.c | 4 +-
sys/arch/mvme68k/dev/sbicvar.h | 4 +-
sys/arch/ofppc/conf/GENERIC | 5 +-
sys/arch/or1k/conf/majors.or1k | 4 +-
sys/arch/playstation2/conf/DEBUG | 5 +-
sys/arch/playstation2/conf/majors.playstation2 | 4 +-
sys/arch/pmax/conf/RAMDISK | 4 +-
sys/arch/pmax/conf/RAMDISK64 | 4 +-
sys/arch/pmax/conf/std.pmax | 5 +-
sys/arch/pmax/conf/std.pmax64 | 5 +-
sys/arch/pmax/ibus/sii.c | 8 +-
sys/arch/pmax/stand/common/rz.c | 4 +-
sys/arch/powerpc/booke/spe_subr.S | 4 +-
sys/arch/powerpc/conf/majors.powerpc | 4 +-
sys/arch/powerpc/oea/pmap.c | 185 +-
sys/arch/powerpc/powerpc/db_interface.c | 6 +-
sys/arch/powerpc/stand/mkbootimage/rs6000_bootrec.h | 4 +-
sys/arch/prep/conf/GENERIC | 8 +-
sys/arch/prep/pnpbus/fdc_pnpbus.c | 6 +-
sys/arch/prep/stand/boot/siop.c | 20 +-
sys/arch/riscv/include/param.h | 5 +-
sys/arch/sandpoint/conf/GENERIC | 6 +-
sys/arch/sgimips/conf/majors.sgimips | 4 +-
sys/arch/sgimips/sgimips/machdep.c | 6 +-
sys/arch/sh3/sh3/exception_vector.S | 4 +-
sys/arch/sh3/sh3/locore_subr.S | 21 +-
sys/arch/sh3/sh3/pmap.c | 4 +-
sys/arch/shark/conf/std.ofwgencfg | 5 +-
sys/arch/shark/conf/std.shark | 5 +-
sys/arch/sparc/sparc/autoconf.c | 8 +-
sys/arch/sparc/stand/bootblk/bootblk.fth | 6 +-
sys/arch/sparc64/conf/majors.sparc64 | 4 +-
sys/arch/sparc64/dev/iommuvar.h | 4 +-
sys/arch/sparc64/dev/vdsk.c | 5 +-
sys/arch/sparc64/doc/TODO | 14 +-
sys/arch/sparc64/include/hypervisor.h | 13 +-
sys/arch/sparc64/include/sparc64.h | 4 +-
sys/arch/sparc64/sparc64/autoconf.c | 100 +-
sys/arch/sparc64/sparc64/intr.c | 74 +-
sys/arch/sparc64/sparc64/ofw_machdep.c | 50 +-
sys/arch/usermode/usermode/pmap.c | 6 +-
sys/arch/vax/vax/db_disasm.c | 6 +-
sys/arch/x68k/conf/GENERIC | 7 +-
sys/arch/x68k/conf/majors.x68k | 4 +-
sys/arch/x86/conf/files.x86 | 6 +-
sys/arch/x86/include/smbios_machdep.h | 35 +
sys/arch/x86/include/smbiosvar.h | 293 -
sys/arch/x86/include/specialreg.h | 8 +-
sys/arch/x86/pci/pci_ranges.c | 6 +-
sys/arch/x86/x86/bios32.c | 145 +-
sys/arch/x86/x86/platform.c | 346 -
sys/arch/x86/x86/procfs_machdep.c | 38 +-
sys/arch/x86/x86/x86_ipmi.c | 6 +-
sys/arch/xen/xen/xbdback_xenbus.c | 9 +-
sys/arch/xen/xen/xenevt.c | 6 +-
sys/arch/zaurus/conf/majors.zaurus | 4 +-
sys/arch/zaurus/zaurus/autoconf.c | 6 +-
sys/coda/coda_opstats.h | 6 +-
sys/coda/coda_vnops.c | 5 +-
sys/compat/common/tty_60.c | 5 +-
sys/conf/files | 3 +-
sys/conf/majors | 3 +-
sys/conf/majors.usb | 6 +-
sys/ddb/db_panic.c | 5 +-
sys/dev/DEVNAMES | 4 +-
sys/dev/acpi/acpi_dev.c | 6 +-
sys/dev/acpi/acpi_timer.c | 17 +-
sys/dev/audio/alaw.c | 5 +-
sys/dev/audio/audio.c | 69 +-
sys/dev/audio/audiobell.c | 8 +-
sys/dev/audio/linear.c | 5 +-
sys/dev/audio/mulaw.c | 5 +-
sys/dev/bi/kdbreg.h | 4 +-
sys/dev/cardbus/fwohci_cardbus.c | 6 +-
sys/dev/dev_verbose.c | 17 +-
sys/dev/dev_verbose.h | 41 +-
sys/dev/devlist2h.awk | 84 +-
sys/dev/dm/dm_ioctl.c | 10 +-
sys/dev/dm/dm_target_flakey.c | 6 +-
sys/dev/dtv/dtv_device.c | 7 +-
sys/dev/eisa/ahb.c | 78 +-
sys/dev/eisa/ahbreg.h | 67 +-
sys/dev/eisa/depca_eisa.c | 15 +-
sys/dev/eisa/eisadevs | 9 +-
sys/dev/eisa/eisadevs.h | 12 +-
sys/dev/eisa/eisadevs_data.h | 39 +-
sys/dev/eisa/if_tlp_eisa.c | 16 +-
sys/dev/eisa/mlx_eisa.c | 60 +-
sys/dev/fdt/fdt_memory.c | 30 +-
sys/dev/files.dev | 3 +-
sys/dev/firmload.c | 10 +-
sys/dev/fss.c | 20 +-
sys/dev/gpib/rd.c | 6 +-
sys/dev/hdaudio/hdaudio.c | 5 +-
sys/dev/hdaudio/hdaudiodevs.h | 6 +-
sys/dev/hdaudio/hdaudiodevs_data.h | 6 +-
sys/dev/hid/hidkbdmap.c | 5 +-
sys/dev/hpc/files.hpcio | 4 +-
sys/dev/hpc/hpcfbio.h | 4 +-
sys/dev/i2c/adm1021.c | 8 +-
sys/dev/i2c/dbcool.c | 6 +-
sys/dev/i2c/dstemp.c | 8 +-
sys/dev/i2c/fcu.c | 512 -
sys/dev/i2c/files.i2c | 7 +-
sys/dev/i2c/lm75.c | 6 +-
sys/dev/i2c/pcagpio.c | 6 +-
sys/dev/i2c/pcf8574.c | 6 +-
sys/dev/i2c/ssdfb_i2c.c | 5 +-
sys/dev/ic/adw.c | 8 +-
sys/dev/ic/ahcisata_core.c | 24 +-
sys/dev/ic/ahcisatareg.h | 8 +-
sys/dev/ic/aic79xx.c | 8 +-
sys/dev/ic/aic7xxx.c | 8 +-
sys/dev/ic/ax88190.c | 26 +-
sys/dev/ic/com.c | 12 +-
sys/dev/ic/cs89x0.c | 10 +-
sys/dev/ic/dl10019.c | 26 +-
sys/dev/ic/dp8390.c | 28 +-
sys/dev/ic/dp8390var.h | 4 +-
sys/dev/ic/lemacreg.h | 4 +-
sys/dev/ic/mb86950.c | 8 +-
sys/dev/ic/mb86960.c | 16 +-
sys/dev/ic/mb86960var.h | 6 +-
sys/dev/ic/mfireg.h | 4 +-
sys/dev/ic/mpt_mpilib.h | 4 +-
sys/dev/ic/siisatareg.h | 4 +-
sys/dev/ic/ssdfb.c | 17 +-
sys/dev/ic/ssdfbvar.h | 3 +-
sys/dev/ieee1394/fwdma.c | 6 +-
sys/dev/isa/README.seagate | 4 +-
sys/dev/isa/itesio_isa.c | 404 +-
sys/dev/isa/itesio_isavar.h | 30 +-
sys/dev/isa/sbdsp.c | 6 +-
sys/dev/isa/tcic2_isa.c | 6 +-
sys/dev/kloader.c | 14 +-
sys/dev/marvell/gtidmac.c | 6 +-
sys/dev/microcode/aic7xxx/aicasm.c | 6 +-
sys/dev/mii/Makefile.miidevs | 22 +-
sys/dev/mii/devlist2h.awk | 171 -
sys/dev/mii/gentbi.c | 9 +-
sys/dev/mii/mii_physubr.c | 48 +-
sys/dev/mii/mii_verbose.c | 42 +-
sys/dev/mii/mii_verbose.h | 13 +-
sys/dev/mii/miidevs.h | 600 +-
sys/dev/mii/miidevs_data.h | 1093 +-
sys/dev/mii/miivar.h | 5 +-
sys/dev/mii/ukphy.c | 8 +-
sys/dev/pci/ichsmb.c | 5 +-
sys/dev/pci/if_ena.c | 717 +-
sys/dev/pci/if_enavar.h | 70 +-
sys/dev/pci/if_iwm.c | 187 +-
sys/dev/pci/if_mcx.c | 6 +-
sys/dev/pci/if_vge.c | 6 +-
sys/dev/pci/if_vgereg.h | 2 +-
sys/dev/pci/if_vr.c | 6 +-
sys/dev/pci/ixgbe/ix_txrx.c | 8 +-
sys/dev/pci/ixgbe/ixgbe.c | 79 +-
sys/dev/pci/ixgbe/ixgbe.h | 5 +-
sys/dev/pci/ixgbe/ixgbe_common.c | 8 +-
sys/dev/pci/ixgbe/ixv.c | 74 +-
sys/dev/pci/machfb.c | 6 +-
sys/dev/pci/pci_subr.c | 10 +-
sys/dev/pci/pcidevs | 91 +-
sys/dev/pci/pcidevs.h | 97 +-
sys/dev/pci/pcidevs_data.h | 8596 +++++----
sys/dev/pci/pcireg.h | 17 +-
sys/dev/pci/pucdata.c | 13 +-
sys/dev/pci/radeonfb.c | 6 +-
sys/dev/pci/xmm7360.c | 9 +-
sys/dev/pckbport/synapticsvar.h | 9 +-
sys/dev/qbus/if_de.c | 6 +-
sys/dev/qbus/if_il.c | 6 +-
sys/dev/raidframe/rf_alloclist.c | 16 +-
sys/dev/raidframe/rf_aselect.c | 48 +-
sys/dev/raidframe/rf_callback.c | 44 +-
sys/dev/raidframe/rf_callback.h | 13 +-
sys/dev/raidframe/rf_copyback.c | 14 +-
sys/dev/raidframe/rf_cvscan.c | 42 +-
sys/dev/raidframe/rf_cvscan.h | 3 +-
sys/dev/raidframe/rf_dagdegrd.c | 30 +-
sys/dev/raidframe/rf_dagdegwr.c | 26 +-
sys/dev/raidframe/rf_dagffrd.c | 20 +-
sys/dev/raidframe/rf_dagffwr.c | 50 +-
sys/dev/raidframe/rf_dagfuncs.c | 36 +-
sys/dev/raidframe/rf_dagutils.c | 123 +-
sys/dev/raidframe/rf_dagutils.h | 24 +-
sys/dev/raidframe/rf_desc.h | 3 +-
sys/dev/raidframe/rf_diskqueue.c | 81 +-
sys/dev/raidframe/rf_diskqueue.h | 7 +-
sys/dev/raidframe/rf_driver.c | 77 +-
sys/dev/raidframe/rf_driver.h | 4 +-
sys/dev/raidframe/rf_evenodd.c | 10 +-
sys/dev/raidframe/rf_fifo.c | 21 +-
sys/dev/raidframe/rf_fifo.h | 3 +-
sys/dev/raidframe/rf_map.c | 150 +-
sys/dev/raidframe/rf_map.h | 36 +-
sys/dev/raidframe/rf_mcpair.c | 30 +-
sys/dev/raidframe/rf_mcpair.h | 8 +-
sys/dev/raidframe/rf_netbsd.h | 37 +-
sys/dev/raidframe/rf_netbsdkintf.c | 78 +-
sys/dev/raidframe/rf_paritylogDiskMgr.c | 36 +-
sys/dev/raidframe/rf_parityscan.c | 22 +-
sys/dev/raidframe/rf_pqdegdags.c | 6 +-
sys/dev/raidframe/rf_psstatus.c | 24 +-
sys/dev/raidframe/rf_psstatus.h | 4 +-
sys/dev/raidframe/rf_raid.h | 4 +-
sys/dev/raidframe/rf_raid1.c | 17 +-
sys/dev/raidframe/rf_reconbuffer.c | 10 +-
sys/dev/raidframe/rf_reconstruct.c | 45 +-
sys/dev/raidframe/rf_reconstruct.h | 4 +-
sys/dev/raidframe/rf_reconutil.c | 8 +-
sys/dev/raidframe/rf_revent.c | 35 +-
sys/dev/raidframe/rf_revent.h | 6 +-
sys/dev/raidframe/rf_shutdown.c | 6 +-
sys/dev/raidframe/rf_sstf.c | 115 +-
sys/dev/raidframe/rf_sstf.h | 5 +-
sys/dev/raidframe/rf_states.c | 22 +-
sys/dev/raidframe/rf_stripelocks.c | 43 +-
sys/dev/raidframe/rf_stripelocks.h | 10 +-
sys/dev/sdmmc/if_bwfm_sdio.c | 6 +-
sys/dev/smbios.c | 338 +
sys/dev/smbios_platform.c | 321 +
sys/dev/smbiosvar.h | 297 +
sys/dev/spi/mcp23s17.c | 6 +-
sys/dev/spi/ssdfb_spi.c | 41 +-
sys/dev/usb/FILES | 1 -
sys/dev/usb/TODO.usbmp | 44 +-
sys/dev/usb/files.usb | 8 +-
sys/dev/usb/if_mue.c | 4 +-
sys/dev/usb/ohci.c | 6 +-
sys/dev/usb/uaudio.c | 229 +-
sys/dev/usb/uchcom.c | 60 +-
sys/dev/usb/ucom.c | 6 +-
sys/dev/usb/ukbd.c | 5 +-
sys/dev/usb/umcs.h | 90 +-
sys/dev/usb/usbdevices.config | 5 +-
sys/dev/usb/usbdevs.h | 6 +-
sys/dev/usb/usbdevs_data.h | 6 +-
sys/dev/usb/usbnet.h | 10 +-
sys/dev/usb/usbroothub.c | 8 +-
sys/dev/usb/uscanner.c | 726 -
sys/dev/veriexec.c | 8 +-
sys/dev/vnd.c | 44 +-
sys/external/bsd/acpica/dist/changes.txt | 42 +
sys/external/bsd/acpica/dist/common/ahtable.c | 42 +-
sys/external/bsd/acpica/dist/common/dmtable.c | 116 +-
sys/external/bsd/acpica/dist/common/dmtbdump2.c | 230 +-
sys/external/bsd/acpica/dist/common/dmtbdump3.c | 60 +
sys/external/bsd/acpica/dist/common/dmtbinfo1.c | 13 +
sys/external/bsd/acpica/dist/common/dmtbinfo2.c | 203 +-
sys/external/bsd/acpica/dist/common/dmtbinfo3.c | 24 +
sys/external/bsd/acpica/dist/compiler/aslcompiler.h | 4 +
sys/external/bsd/acpica/dist/compiler/aslmessages.c | 6 +-
sys/external/bsd/acpica/dist/compiler/aslmessages.h | 4 +-
sys/external/bsd/acpica/dist/compiler/aslutils.c | 40 +
sys/external/bsd/acpica/dist/compiler/asluuid.c | 47 -
sys/external/bsd/acpica/dist/compiler/dtcompiler.h | 16 +
sys/external/bsd/acpica/dist/compiler/dtfield.c | 4 +-
sys/external/bsd/acpica/dist/compiler/dtio.c | 6 +-
sys/external/bsd/acpica/dist/compiler/dttable1.c | 338 +-
sys/external/bsd/acpica/dist/compiler/dttable2.c | 169 +
sys/external/bsd/acpica/dist/compiler/dttemplate.h | 212 +-
sys/external/bsd/acpica/dist/compiler/dtutils.c | 19 +
sys/external/bsd/acpica/dist/executer/exfield.c | 6 +-
sys/external/bsd/acpica/dist/executer/exserial.c | 12 +
sys/external/bsd/acpica/dist/include/acbuffer.h | 9 +
sys/external/bsd/acpica/dist/include/acconfig.h | 1 +
sys/external/bsd/acpica/dist/include/acdisasm.h | 37 +-
sys/external/bsd/acpica/dist/include/acpixf.h | 2 +-
sys/external/bsd/acpica/dist/include/actbinfo.h | 9 +
sys/external/bsd/acpica/dist/include/actbl1.h | 43 +-
sys/external/bsd/acpica/dist/include/actbl2.h | 156 +
sys/external/bsd/acpica/dist/include/acutils.h | 5 +
sys/external/bsd/acpica/dist/namespace/nsrepair2.c | 7 +
sys/external/bsd/acpica/dist/tools/acpiexec/aeinstall.c | 1 +
sys/external/bsd/acpica/dist/tools/acpiexec/aeregion.c | 17 +
sys/external/bsd/acpica/dist/tools/acpisrc/astable.c | 9 +
sys/external/bsd/acpica/dist/utilities/utdelete.c | 8 +
sys/external/bsd/acpica/dist/utilities/utprint.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utuuid.c | 48 +
sys/external/bsd/compiler_rt/dist/lib/builtins/arm/aeabi_cfcmp.S | 10 +-
sys/external/bsd/compiler_rt/dist/lib/builtins/arm/divmodsi4.S | 5 +-
sys/external/bsd/compiler_rt/dist/lib/builtins/arm/divsi3.S | 5 +-
sys/external/bsd/compiler_rt/dist/lib/builtins/arm/modsi3.S | 5 +-
sys/external/bsd/drm2/linux/linux_rcu.c | 5 +-
sys/external/bsd/drm2/linux/linux_reservation.c | 5 +-
sys/external/bsd/ena-com/ena_plat.h | 6 +-
sys/fs/adosfs/advnops.c | 64 +-
sys/fs/autofs/autofs_vnops.c | 5 +-
sys/fs/cd9660/cd9660_node.h | 9 +-
sys/fs/cd9660/cd9660_vnops.c | 108 +-
sys/fs/efs/efs_vnops.c | 72 +-
sys/fs/filecorefs/filecore_node.h | 8 +-
sys/fs/filecorefs/filecore_vnops.c | 61 +-
sys/fs/hfs/hfs_vnops.c | 133 +-
sys/fs/msdosfs/denode.h | 9 +-
sys/fs/msdosfs/msdosfs_lookup.c | 6 +-
sys/fs/msdosfs/msdosfs_vnops.c | 17 +-
sys/fs/nilfs/nilfs_vnops.c | 7 +-
sys/fs/ntfs/ntfs_vnops.c | 5 +-
sys/fs/ptyfs/ptyfs_vnops.c | 71 +-
sys/fs/puffs/puffs_vnops.c | 93 +-
sys/fs/sysvbfs/sysvbfs.c | 5 +-
sys/fs/tmpfs/tmpfs_fifoops.c | 57 +-
sys/fs/tmpfs/tmpfs_fifoops.h | 39 +-
sys/fs/tmpfs/tmpfs_specops.c | 56 +-
sys/fs/tmpfs/tmpfs_specops.h | 39 +-
sys/fs/tmpfs/tmpfs_vnops.c | 33 +-
sys/fs/tmpfs/tmpfs_vnops.h | 16 +-
sys/fs/udf/udf_allocation.c | 6 +-
sys/fs/udf/udf_subr.c | 12 +-
sys/fs/udf/udf_vfsops.c | 6 +-
sys/fs/udf/udf_vnops.c | 7 +-
sys/fs/union/union_vnops.c | 70 +-
sys/fs/unionfs/unionfs_subr.c | 3 -
sys/fs/unionfs/unionfs_vnops.c | 37 +
sys/fs/v7fs/v7fs_extern.c | 59 +-
sys/kern/kern_acct.c | 29 +-
sys/kern/kern_core.c | 12 +-
sys/kern/kern_descrip.c | 50 +-
sys/kern/kern_ksyms.c | 10 +-
sys/kern/kern_ktrace_vfs.c | 10 +-
sys/kern/kern_module_vfs.c | 19 +-
sys/kern/kern_pmf.c | 4 +-
sys/kern/subr_cprng.c | 5 +-
sys/kern/subr_exec_fd.c | 14 +-
sys/kern/subr_kobj_vfs.c | 12 +-
sys/kern/subr_pool.c | 32 +-
sys/kern/subr_psref.c | 5 +-
sys/kern/sys_futex.c | 5 +-
sys/kern/tty_ptm.c | 6 +-
sys/kern/vfs_bio.c | 15 +-
sys/kern/vfs_cache.c | 5 +-
sys/kern/vfs_getcwd.c | 5 +-
sys/kern/vfs_lockf.c | 8 +-
sys/kern/vfs_lookup.c | 66 +-
sys/kern/vfs_syscalls.c | 50 +-
sys/kern/vfs_vnops.c | 146 +-
sys/kern/vfs_xattr.c | 26 +-
sys/kern/vnode_if.c | 43 +-
sys/kern/vnode_if.src | 12 +-
sys/lib/libkern/arch/powerpc/Makefile.inc | 13 +-
sys/miscfs/deadfs/dead_vnops.c | 35 +-
sys/miscfs/fdesc/fdesc_vnops.c | 19 +-
sys/miscfs/fifofs/fifo.h | 87 +-
sys/miscfs/fifofs/fifo_vnops.c | 5 +-
sys/miscfs/genfs/genfs.h | 3 +-
sys/miscfs/genfs/genfs_vnops.c | 29 +-
sys/miscfs/kernfs/kernfs_vnops.c | 109 +-
sys/miscfs/procfs/procfs_vnops.c | 75 +-
sys/miscfs/specfs/spec_vnops.c | 53 +-
sys/miscfs/specfs/specdev.h | 105 +-
sys/modules/lua/lua.c | 24 +-
sys/modules/panic/panic.c | 6 +-
sys/net/bpf.c | 5 +-
sys/net/if.c | 41 +-
sys/net/if.h | 6 +-
sys/net/if_bridge.c | 6 +-
sys/net/if_stats.c | 9 +-
sys/net/if_stats.h | 4 +-
sys/net/if_vlan.c | 80 +-
sys/net/lagg/if_lagg.c | 6 +-
sys/net/lagg/if_lagg_lacp.c | 8 +-
sys/net80211/ieee80211_ioctl.c | 6 +-
sys/net80211/ieee80211_output.c | 8 +-
sys/net80211/ieee80211_proto.c | 10 +-
sys/net80211/ieee80211_proto.h | 8 +-
sys/netatalk/at_print.c | 7 +-
sys/netinet/sctp_output.c | 30 +-
sys/netinet/sctputil.c | 8 +-
sys/netinet/tcp_congctl.c | 10 +-
sys/netinet/tcp_input.c | 6 +-
sys/netinet/tcp_subr.c | 6 +-
sys/netinet/tcp_var.h | 4 +-
sys/netinet6/in6.h | 6 +-
sys/nfs/nfs_vnops.c | 87 +-
sys/nfs/nfsnode.h | 10 +-
sys/rump/Makefile.rump | 7 +-
sys/rump/include/opt/opt_rumpkernel.h | 5 +-
sys/rump/include/rump/rump_namei.h | 4 +-
sys/rump/include/rump/rumpvnode_if.h | 7 +-
sys/rump/librump/rumpdev/Makefile.rumpdev | 3 +-
sys/rump/librump/rumpkern/devsw.c | 2 -
sys/rump/librump/rumpnet/net_stub.c | 12 +-
sys/rump/librump/rumpvfs/rumpfs.c | 58 +-
sys/rump/librump/rumpvfs/rumpvnode_if.c | 22 +-
sys/rump/net/Makefile.rumpnetcomp | 8 +-
sys/rump/net/lib/libaltq/Makefile | 17 +
sys/rump/net/lib/libaltq/altq_component.c | 72 +
sys/rump/net/lib/libshmif/if_shmem.c | 8 +-
sys/stand/efiboot/Makefile.efiboot | 5 +-
sys/stand/efiboot/boot.c | 60 +-
sys/stand/efiboot/efiacpi.c | 25 +-
sys/stand/efiboot/efiblock.c | 308 +-
sys/stand/efiboot/efiblock.h | 5 +-
sys/stand/efiboot/efiboot.h | 5 +-
sys/stand/efiboot/efirng.c | 6 +-
sys/stand/efiboot/efiwatchdog.c | 40 +
sys/stand/efiboot/exec.c | 4 +-
sys/stand/efiboot/smbios.c | 40 +-
sys/stand/efiboot/version | 4 +-
sys/sys/disk.h | 4 +-
sys/sys/extattr.h | 19 +-
sys/sys/filedesc.h | 4 +-
sys/sys/namei.h | 5 +-
sys/sys/namei.src | 3 +-
sys/sys/param.h | 31 +-
sys/sys/pool.h | 8 +-
sys/sys/sysctl.h | 4 +-
sys/sys/timevar.h | 11 +-
sys/sys/vnode.h | 5 +-
sys/sys/vnode_if.h | 122 +-
sys/ufs/chfs/chfs_build.c | 10 +-
sys/ufs/chfs/chfs_gc.c | 14 +-
sys/ufs/chfs/chfs_readinode.c | 3 +-
sys/ufs/chfs/chfs_scan.c | 10 +-
sys/ufs/chfs/chfs_vnops.c | 58 +-
sys/ufs/chfs/chfs_write.c | 6 +-
sys/ufs/ext2fs/ext2fs_vnops.c | 95 +-
sys/ufs/ffs/ffs_vnops.c | 97 +-
sys/ufs/lfs/lfs_vfsops.c | 6 +-
sys/ufs/lfs/lfs_vnops.c | 97 +-
sys/ufs/lfs/ulfs_extattr.c | 22 +-
sys/ufs/lfs/ulfs_extern.h | 12 +-
sys/ufs/lfs/ulfs_quota1.c | 10 +-
sys/ufs/lfs/ulfs_quota1_subr.c | 8 +-
sys/ufs/mfs/mfs_extern.h | 3 +-
sys/ufs/mfs/mfs_vnops.c | 63 +-
sys/ufs/mfs/mfsnode.h | 30 +-
sys/ufs/ufs/ufs_extattr.c | 22 +-
sys/ufs/ufs/ufs_extern.h | 13 +-
sys/ufs/ufs/ufs_quota1.c | 10 +-
sys/uvm/pmap/pmap_pvt.c | 5 +-
sys/uvm/uvm_map.c | 10 +-
sys/uvm/uvm_mmap.c | 5 +-
702 files changed, 18433 insertions(+), 14808 deletions(-)
diffs (truncated from 59401 to 300 lines):
diff -r 79e08aa0bbda -r f991f5260feb sys/altq/altq_cbq.c
--- a/sys/altq/altq_cbq.c Thu Jun 17 04:46:16 2021 +0000
+++ b/sys/altq/altq_cbq.c Sun Aug 01 22:41:59 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_cbq.c,v 1.32 2018/11/15 10:23:55 maxv Exp $ */
+/* $NetBSD: altq_cbq.c,v 1.32.16.1 2021/08/01 22:41:59 thorpej Exp $ */
/* $KAME: altq_cbq.c,v 1.21 2005/04/13 03:44:24 suz Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_cbq.c,v 1.32 2018/11/15 10:23:55 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_cbq.c,v 1.32.16.1 2021/08/01 22:41:59 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_altq.h"
@@ -226,7 +226,7 @@ get_class_stats(class_stats_t *statsp, s
statsp->minidle = cl->minidle_;
statsp->offtime = cl->offtime_;
statsp->qmax = qlimit(cl->q_);
- statsp->ns_per_byte = cl->ns_per_byte_;
+ statsp->ps_per_byte = cl->ps_per_byte_;
statsp->wrr_allot = cl->w_allotment_;
statsp->qcnt = qlen(cl->q_);
statsp->avgidle = cl->avgidle_;
@@ -306,6 +306,7 @@ cbq_remove_altq(struct pf_altq *a)
return (0);
}
+#define NSEC_TO_PSEC(s) ((uint64_t)(s) * 1000 * 1000)
int
cbq_add_queue(struct pf_altq *a)
{
@@ -363,33 +364,28 @@ cbq_add_queue(struct pf_altq *a)
/*
* check parameters
*/
- switch (opts->flags & CBQCLF_CLASSMASK) {
- case CBQCLF_ROOTCLASS:
+ if ((opts->flags & CBQCLF_ROOTCLASS) != 0) {
if (parent != NULL)
return (EINVAL);
if (cbqp->ifnp.root_)
return (EINVAL);
- break;
- case CBQCLF_DEFCLASS:
+ }
+ if ((opts->flags & CBQCLF_DEFCLASS) != 0) {
if (cbqp->ifnp.default_)
return (EINVAL);
- break;
- case 0:
+ }
+ if ((opts->flags & CBQCLF_CLASSMASK) == 0) {
if (a->qid == 0)
return (EINVAL);
- break;
- default:
- /* more than two flags bits set */
- return (EINVAL);
}
/*
* create a class. if this is a root class, initialize the
* interface.
*/
- if ((opts->flags & CBQCLF_CLASSMASK) == CBQCLF_ROOTCLASS) {
+ if ((opts->flags & CBQCLF_ROOTCLASS) != 0) {
error = rmc_init(cbqp->ifnp.ifq_, &cbqp->ifnp,
- opts->ns_per_byte, cbqrestart, a->qlimit, RM_MAXQUEUED,
+ NSEC_TO_PSEC(opts->ns_per_byte), cbqrestart, a->qlimit, RM_MAXQUEUED,
opts->maxidle, opts->minidle, opts->offtime,
opts->flags);
if (error != 0)
@@ -397,7 +393,7 @@ cbq_add_queue(struct pf_altq *a)
cl = cbqp->ifnp.root_;
} else {
cl = rmc_newclass(a->priority,
- &cbqp->ifnp, opts->ns_per_byte,
+ &cbqp->ifnp, NSEC_TO_PSEC(opts->ns_per_byte),
rmc_delay_action, a->qlimit, parent, borrow,
opts->maxidle, opts->minidle, opts->offtime,
opts->pktsize, opts->flags);
@@ -412,7 +408,7 @@ cbq_add_queue(struct pf_altq *a)
/* save the allocated class */
cbqp->cbq_class_tbl[i] = cl;
- if ((opts->flags & CBQCLF_CLASSMASK) == CBQCLF_DEFCLASS)
+ if ((opts->flags & CBQCLF_DEFCLASS) != 0)
cbqp->ifnp.default_ = cl;
return (0);
@@ -686,7 +682,7 @@ cbq_modify_class(struct cbq_modify_class
if ((cl = clh_to_clp(cbqp, acp->cbq_class_handle)) == NULL)
return (EINVAL);
- if (rmc_modclass(cl, acp->cbq_class.nano_sec_per_byte,
+ if (rmc_modclass(cl, acp->cbq_class.pico_sec_per_byte,
acp->cbq_class.maxq, acp->cbq_class.maxidle,
acp->cbq_class.minidle, acp->cbq_class.offtime,
acp->cbq_class.pktsize) < 0)
@@ -727,9 +723,9 @@ cbq_class_create(cbq_state_t *cbqp, stru
* create a class. if this is a root class, initialize the
* interface.
*/
- if ((spec->flags & CBQCLF_CLASSMASK) == CBQCLF_ROOTCLASS) {
+ if ((spec->flags & CBQCLF_ROOTCLASS) != 0) {
error = rmc_init(cbqp->ifnp.ifq_, &cbqp->ifnp,
- spec->nano_sec_per_byte, cbqrestart, spec->maxq,
+ spec->pico_sec_per_byte, cbqrestart, spec->maxq,
RM_MAXQUEUED, spec->maxidle, spec->minidle, spec->offtime,
spec->flags);
if (error)
@@ -737,7 +733,7 @@ cbq_class_create(cbq_state_t *cbqp, stru
cl = cbqp->ifnp.root_;
} else {
cl = rmc_newclass(spec->priority,
- &cbqp->ifnp, spec->nano_sec_per_byte,
+ &cbqp->ifnp, spec->pico_sec_per_byte,
rmc_delay_action, spec->maxq, parent, borrow,
spec->maxidle, spec->minidle, spec->offtime,
spec->pktsize, spec->flags);
@@ -754,9 +750,9 @@ cbq_class_create(cbq_state_t *cbqp, stru
/* save the allocated class */
cbqp->cbq_class_tbl[i] = cl;
- if ((spec->flags & CBQCLF_CLASSMASK) == CBQCLF_DEFCLASS)
+ if ((spec->flags & CBQCLF_CLASSMASK) != 0)
cbqp->ifnp.default_ = cl;
- if ((spec->flags & CBQCLF_CLASSMASK) == CBQCLF_CTLCLASS)
+ if ((spec->flags & CBQCLF_CTLCLASS) != 0)
cbqp->ifnp.ctl_ = cl;
return (0);
@@ -836,14 +832,11 @@ cbq_set_enable(struct cbq_interface *ep,
switch (enable) {
case ENABLE:
- if (cbqp->ifnp.root_ == NULL || cbqp->ifnp.default_ == NULL ||
- cbqp->ifnp.ctl_ == NULL) {
+ if (cbqp->ifnp.root_ == NULL || cbqp->ifnp.default_ == NULL) {
if (cbqp->ifnp.root_ == NULL)
printf("No Root Class for %s\n", ifacename);
if (cbqp->ifnp.default_ == NULL)
printf("No Default Class for %s\n", ifacename);
- if (cbqp->ifnp.ctl_ == NULL)
- printf("No Control Class for %s\n", ifacename);
error = EINVAL;
} else if ((error = altq_enable(cbqp->ifnp.ifq_)) == 0) {
cbqp->cbq_qlen = 0;
diff -r 79e08aa0bbda -r f991f5260feb sys/altq/altq_cbq.h
--- a/sys/altq/altq_cbq.h Thu Jun 17 04:46:16 2021 +0000
+++ b/sys/altq/altq_cbq.h Sun Aug 01 22:41:59 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_cbq.h,v 1.8 2006/10/12 19:59:08 peter Exp $ */
+/* $NetBSD: altq_cbq.h,v 1.8.158.1 2021/08/01 22:41:59 thorpej Exp $ */
/* $KAME: altq_cbq.h,v 1.12 2003/10/03 05:05:15 kjc Exp $ */
/*
@@ -81,15 +81,15 @@ typedef struct _cbq_class_stats_ {
/* other static class parameters useful for debugging */
int priority;
- int maxidle;
- int minidle;
- int offtime;
+ int64_t maxidle;
+ int64_t minidle;
+ int64_t offtime;
int qmax;
- int ns_per_byte;
+ uint64_t ps_per_byte;
int wrr_allot;
int qcnt; /* # packets in queue */
- int avgidle;
+ int64_t avgidle;
/* red and rio related info */
int qtype;
@@ -112,7 +112,7 @@ struct cbq_interface {
typedef struct cbq_class_spec {
u_int priority;
- u_int nano_sec_per_byte;
+ uint64_t pico_sec_per_byte;
u_int maxq;
u_int maxidle;
int minidle;
diff -r 79e08aa0bbda -r f991f5260feb sys/altq/altq_rmclass.c
--- a/sys/altq/altq_rmclass.c Thu Jun 17 04:46:16 2021 +0000
+++ b/sys/altq/altq_rmclass.c Sun Aug 01 22:41:59 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_rmclass.c,v 1.22 2011/11/19 22:51:18 tls Exp $ */
+/* $NetBSD: altq_rmclass.c,v 1.22.66.1 2021/08/01 22:41:59 thorpej Exp $ */
/* $KAME: altq_rmclass.c,v 1.19 2005/04/13 03:44:25 suz Exp $ */
/*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_rmclass.c,v 1.22 2011/11/19 22:51:18 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_rmclass.c,v 1.22.66.1 2021/08/01 22:41:59 thorpej Exp $");
/* #ident "@(#)rm_class.c 1.48 97/12/05 SMI" */
@@ -62,6 +62,7 @@
#include <sys/cprng.h>
#include <net/if.h>
+#include <net/if_types.h>
#ifdef ALTQ3_COMPAT
#include <netinet/in.h>
#include <netinet/in_systm.h>
@@ -80,11 +81,13 @@
#define reset_cutoff(ifd) { ifd->cutoff_ = RM_MAXDEPTH; }
+#define PSEC_TO_NSEC(t) ((t) / 1000)
+
/*
* Local routines.
*/
-static int rmc_satisfied(struct rm_class *, struct timeval *);
+static int rmc_satisfied(struct rm_class *, struct timespec *);
static void rmc_wrr_set_weights(struct rm_ifdat *);
static void rmc_depth_compute(struct rm_class *);
static void rmc_depth_recompute(rm_class_t *);
@@ -97,8 +100,8 @@ static void _rmc_dropq(rm_class_t *);
static mbuf_t *_rmc_getq(rm_class_t *);
static mbuf_t *_rmc_pollq(rm_class_t *);
-static int rmc_under_limit(struct rm_class *, struct timeval *);
-static void rmc_tl_satisfied(struct rm_ifdat *, struct timeval *);
+static int rmc_under_limit(struct rm_class *, struct timespec *);
+static void rmc_tl_satisfied(struct rm_ifdat *, struct timespec *);
static void rmc_drop_action(struct rm_class *);
static void rmc_restart(struct rm_class *);
static void rmc_root_overlimit(struct rm_class *, struct rm_class *);
@@ -192,7 +195,7 @@ static void rmc_root_overlimit(struct rm
* offtime = offtime * (8.0 / nsecPerByte);
*/
struct rm_class *
-rmc_newclass(int pri, struct rm_ifdat *ifd, u_int nsecPerByte,
+rmc_newclass(int pri, struct rm_ifdat *ifd, uint64_t psecPerByte,
void (*action)(rm_class_t *, rm_class_t *), int maxq,
struct rm_class *parent, struct rm_class *borrow, u_int maxidle,
int minidle, u_int offtime, int pktsize, int flags)
@@ -240,10 +243,10 @@ rmc_newclass(int pri, struct rm_ifdat *i
cl->leaf_ = 1;
cl->ifdat_ = ifd;
cl->pri_ = pri;
- cl->allotment_ = RM_NS_PER_SEC / nsecPerByte; /* Bytes per sec */
+ cl->allotment_ = (u_int)(RM_PS_PER_SEC / psecPerByte); /* Bytes per sec */
cl->depth_ = 0;
cl->qthresh_ = 0;
- cl->ns_per_byte_ = nsecPerByte;
+ cl->ps_per_byte_ = psecPerByte;
qlimit(cl->q_) = maxq;
qtype(cl->q_) = Q_DROPHEAD;
@@ -251,18 +254,18 @@ rmc_newclass(int pri, struct rm_ifdat *i
cl->flags_ = flags;
#if 1 /* minidle is also scaled in ALTQ */
- cl->minidle_ = (minidle * (int)nsecPerByte) / 8;
+ cl->minidle_ = ((int64_t)minidle * (int64_t)psecPerByte) / 8;
if (cl->minidle_ > 0)
cl->minidle_ = 0;
#else
cl->minidle_ = minidle;
#endif
- cl->maxidle_ = (maxidle * nsecPerByte) / 8;
+ cl->maxidle_ = ((int64_t)maxidle * (int64_t)psecPerByte) / 8;
if (cl->maxidle_ == 0)
cl->maxidle_ = 1;
#if 1 /* offtime is also scaled in ALTQ */
cl->avgidle_ = cl->maxidle_;
- cl->offtime_ = ((offtime * nsecPerByte) / 8) >> RM_FILTER_GAIN;
+ cl->offtime_ = (((int64_t)offtime * (int64_t)psecPerByte) / 8) >> RM_FILTER_GAIN;
if (cl->offtime_ == 0)
cl->offtime_ = 1;
#else
@@ -284,7 +287,7 @@ rmc_newclass(int pri, struct rm_ifdat *i
if (flags & RMCF_CLEARDSCP)
red_flags |= RIOF_CLEARDSCP;
#endif
- red_pkttime = nsecPerByte * pktsize / 1000;
+ red_pkttime = PSEC_TO_NSEC(psecPerByte) * pktsize / 1000;
if (flags & RMCF_RED) {
cl->red_ = red_alloc(0, 0,
@@ -345,7 +348,7 @@ rmc_newclass(int pri, struct rm_ifdat *i
}
int
Home |
Main Index |
Thread Index |
Old Index