Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/thorpej-futex]: src/sys/uvm Sync w/ HEAD.
details: https://anonhg.NetBSD.org/src/rev/9d89b10943b3
branches: thorpej-futex
changeset: 947492:9d89b10943b3
user: thorpej <thorpej%NetBSD.org@localhost>
date: Mon Dec 14 14:37:44 2020 +0000
description:
Sync w/ HEAD.
diffstat:
sys/arch/aarch64/aarch64/aarch64_machdep.c | 21 +-
sys/arch/aarch64/aarch64/aarch64_reboot.c | 7 +-
sys/arch/aarch64/aarch64/bus_space.c | 10 +-
sys/arch/aarch64/aarch64/bus_space_asm_generic.S | 6 +-
sys/arch/aarch64/aarch64/cpu.c | 6 +-
sys/arch/aarch64/aarch64/db_disasm.c | 7 +-
sys/arch/aarch64/aarch64/db_interface.c | 7 +-
sys/arch/aarch64/aarch64/db_machdep.c | 14 +-
sys/arch/aarch64/aarch64/db_trace.c | 7 +-
sys/arch/aarch64/aarch64/exec_machdep.c | 7 +-
sys/arch/aarch64/aarch64/fault.c | 7 +-
sys/arch/aarch64/aarch64/fpu.c | 5 +-
sys/arch/aarch64/aarch64/genassym.cf | 9 +-
sys/arch/aarch64/aarch64/kobj_machdep.c | 6 +-
sys/arch/aarch64/aarch64/netbsd32_machdep.c | 7 +-
sys/arch/aarch64/aarch64/pmap.c | 34 +-
sys/arch/aarch64/aarch64/pmap_page.S | 18 +-
sys/arch/aarch64/aarch64/pmapboot.c | 31 +-
sys/arch/aarch64/aarch64/trap.c | 6 +-
sys/arch/aarch64/include/asan.h | 9 +-
sys/arch/aarch64/include/cpu.h | 5 +-
sys/arch/aarch64/include/cpufunc.h | 12 +-
sys/arch/aarch64/include/sljit_machdep.h | 5 +-
sys/arch/aarch64/include/vmparam.h | 18 +-
sys/arch/acorn32/mainbus/fd.c | 11 +-
sys/arch/acorn32/podulebus/podulebus.c | 8 +-
sys/arch/algor/algor/algor_p4032_intr.c | 10 +-
sys/arch/algor/algor/algor_p5064_intr.c | 10 +-
sys/arch/algor/algor/algor_p6032_intr.c | 10 +-
sys/arch/algor/pci/pcib.c | 10 +-
sys/arch/alpha/common/bus_dma.c | 24 +-
sys/arch/alpha/eisa/eisa_machdep.c | 49 +-
sys/arch/alpha/isa/isadma_bounce.c | 124 +-
sys/arch/alpha/jensenio/pckbc_jensenio.c | 9 +-
sys/arch/alpha/pci/dwlpx_dma.c | 10 +-
sys/arch/alpha/pci/mcpcia.c | 10 +-
sys/arch/alpha/pci/sio.c | 9 +-
sys/arch/alpha/sableio/pckbc_sableio.c | 9 +-
sys/arch/alpha/tc/ioasic.c | 10 +-
sys/arch/alpha/tc/tc_3000_300.c | 10 +-
sys/arch/alpha/tc/tc_3000_500.c | 10 +-
sys/arch/alpha/tc/tc_dma_3000_500.c | 8 +-
sys/arch/amd64/amd64/cpufunc.S | 12 +-
sys/arch/amd64/amd64/netbsd32_machdep.c | 18 +-
sys/arch/amd64/conf/ALL | 5 +-
sys/arch/amd64/include/cpufunc.h | 5 +-
sys/arch/amd64/include/msan.h | 4 +-
sys/arch/amd64/include/vmparam.h | 4 +-
sys/arch/amigappc/amigappc/pic_amiga.c | 8 +-
sys/arch/arc/arc/bus_dma.c | 22 +-
sys/arch/arc/arc/p_dti_arcstation.c | 6 +-
sys/arch/arc/isa/isabus.c | 8 +-
sys/arch/arc/isa/isadma_bounce.c | 146 +-
sys/arch/arc/jazz/bus_dma_jazz.c | 15 +-
sys/arch/arc/jazz/pckbc_jazzio.c | 10 +-
sys/arch/arc/pci/necpb.c | 10 +-
sys/arch/arm/acpi/acpi_cpu_md.c | 365 +
sys/arch/arm/acpi/acpi_machdep.c | 9 +-
sys/arch/arm/acpi/acpi_platform.c | 201 +-
sys/arch/arm/acpi/acpipchb.c | 50 +-
sys/arch/arm/acpi/cpu_acpi.c | 6 +-
sys/arch/arm/acpi/files.acpi | 10 +-
sys/arch/arm/altera/cycv_platform.c | 5 +-
sys/arch/arm/arm/arm_machdep.c | 17 +-
sys/arch/arm/arm/armv6_start.S | 16 +-
sys/arch/arm/arm/bcopyinout.S | 6 +-
sys/arch/arm/arm/core_machdep.c | 20 +-
sys/arch/arm/arm/cpu_exec.c | 29 +-
sys/arch/arm/arm/cpu_subr.c | 12 +-
sys/arch/arm/arm/cpufunc.c | 26 +-
sys/arch/arm/arm/disassem.c | 6 +-
sys/arch/arm/arm/psci.c | 6 +-
sys/arch/arm/arm32/arm32_boot.c | 9 +-
sys/arch/arm/arm32/arm32_kvminit.c | 9 +-
sys/arch/arm/arm32/arm32_machdep.c | 18 +-
sys/arch/arm/arm32/bus_dma.c | 57 +-
sys/arch/arm/arm32/cpuswitch.S | 7 +-
sys/arch/arm/arm32/db_interface.c | 21 +-
sys/arch/arm/arm32/db_machdep.c | 6 +-
sys/arch/arm/arm32/exception.S | 12 +-
sys/arch/arm/arm32/irq_dispatch.S | 7 +-
sys/arch/arm/arm32/kobj_machdep.c | 10 +-
sys/arch/arm/at91/at91aic.c | 10 +-
sys/arch/arm/at91/at91dbgu.c | 10 +-
sys/arch/arm/broadcom/bcm2835_dmac.h | 18 +-
sys/arch/arm/broadcom/bcm2835_emmc.c | 5 +-
sys/arch/arm/broadcom/bcm2835_genfb.c | 14 +-
sys/arch/arm/broadcom/bcm2835_sdhost.c | 5 +-
sys/arch/arm/broadcom/bcm283x_platform.c | 349 +-
sys/arch/arm/clps711x/clpscom.c | 8 +-
sys/arch/arm/cortex/a9tmr.c | 6 +-
sys/arch/arm/cortex/armperiph.c | 3 +-
sys/arch/arm/cortex/gic.c | 6 +-
sys/arch/arm/cortex/gic_reg.h | 3 +-
sys/arch/arm/cortex/gic_v2m.c | 9 +-
sys/arch/arm/cortex/gicv3.c | 144 +-
sys/arch/arm/cortex/gicv3.h | 7 +-
sys/arch/arm/cortex/gicv3_its.c | 13 +-
sys/arch/arm/ep93xx/ep93xx_intr.c | 10 +-
sys/arch/arm/ep93xx/epcom.c | 8 +-
sys/arch/arm/fdt/cpu_fdt.c | 8 +-
sys/arch/arm/fdt/gic_fdt.c | 8 +-
sys/arch/arm/fdt/gicv3_fdt.c | 89 +-
sys/arch/arm/footbridge/footbridge_com.c | 14 +-
sys/arch/arm/footbridge/footbridge_intr.h | 3 +-
sys/arch/arm/footbridge/footbridge_irqhandler.c | 8 +-
sys/arch/arm/footbridge/isa/isa_machdep.c | 10 +-
sys/arch/arm/gemini/gemini_ipi.c | 8 +-
sys/arch/arm/gemini/gemini_lpchc.c | 10 +-
sys/arch/arm/gemini/gemini_pci.c | 10 +-
sys/arch/arm/imx/fdt/imx_ccm_div.c | 6 +-
sys/arch/arm/imx/files.imx23 | 10 +-
sys/arch/arm/imx/imx23_pinctrl.c | 107 +-
sys/arch/arm/imx/imx23_pinctrlvar.h | 4 +-
sys/arch/arm/imx/imx23_usb.c | 4 +-
sys/arch/arm/imx/imx51_ipuv3.c | 10 +-
sys/arch/arm/imx/imxuart.c | 12 +-
sys/arch/arm/include/cdefs.h | 9 +-
sys/arch/arm/include/cpufunc.h | 2 +
sys/arch/arm/include/db_machdep.h | 7 +-
sys/arch/arm/include/locore.h | 6 +-
sys/arch/arm/include/mutex.h | 8 +-
sys/arch/arm/include/ptrace.h | 25 +-
sys/arch/arm/include/trap.h | 8 +-
sys/arch/arm/iomd/iomd_irq.S | 54 +-
sys/arch/arm/iomd/iomd_irqhandler.c | 12 +-
sys/arch/arm/iomd/iomdkbc.c | 14 +-
sys/arch/arm/ixp12x0/ixp12x0_com.c | 8 +-
sys/arch/arm/ixp12x0/ixp12x0_intr.c | 8 +-
sys/arch/arm/marvell/mvsoc_sdhc.c | 8 +-
sys/arch/arm/ofw/ofw_irq.S | 45 +-
sys/arch/arm/ofw/ofw_irqhandler.c | 12 +-
sys/arch/arm/omap/omap_gpio.c | 10 +-
sys/arch/arm/rockchip/rk3399_pcie_phy.c | 6 +-
sys/arch/arm/s3c2xx0/s3c2440_dma.c | 6 +-
sys/arch/arm/s3c2xx0/s3c24x0_lcd.c | 12 +-
sys/arch/arm/s3c2xx0/s3c2800_pci.c | 8 +-
sys/arch/arm/s3c2xx0/sscom.c | 8 +-
sys/arch/arm/sa11x0/sa1111.c | 10 +-
sys/arch/arm/sa11x0/sa11x0_com.c | 10 +-
sys/arch/arm/sa11x0/sa11x0_irq.S | 27 +-
sys/arch/arm/sa11x0/sa11x0_irqhandler.c | 10 +-
sys/arch/arm/samsung/exynos_platform.c | 5 +-
sys/arch/arm/xilinx/zynq_uart.c | 12 +-
sys/arch/arm/xscale/becc_icu.c | 8 +-
sys/arch/arm/xscale/i80200_irq.S | 8 +-
sys/arch/arm/xscale/i80321_icu.c | 8 +-
sys/arch/arm/xscale/ixp425_intr.c | 8 +-
sys/arch/arm/xscale/pxa2x0_gpio.c | 10 +-
sys/arch/arm/xscale/pxa2x0_lcd.c | 12 +-
sys/arch/arm/zynq/zynq_uart.c | 12 +-
sys/arch/bebox/bebox/mainbus.c | 12 +-
sys/arch/bebox/bebox/pic_bebox.c | 8 +-
sys/arch/cesfic/cesfic/isr.c | 10 +-
sys/arch/cesfic/dev/zs.c | 9 +-
sys/arch/cobalt/cobalt/interrupt.c | 10 +-
sys/arch/dreamcast/conf/majors.dreamcast | 3 +-
sys/arch/emips/emips/bus_dma.c | 23 +-
sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c | 37 +-
sys/arch/evbarm/beagle/beagle_machdep.c | 6 +-
sys/arch/evbarm/conf/GENERIC64 | 5 +-
sys/arch/evbarm/conf/IMX23_OLINUXINO | 6 +-
sys/arch/evbarm/conf/README.evbarm | 4 +-
sys/arch/evbarm/conf/RPI | 5 +-
sys/arch/evbarm/conf/files.fdt | 3 +-
sys/arch/evbarm/conf/mk.rpi | 6 +-
sys/arch/evbarm/fdt/fdt_machdep.c | 186 +-
sys/arch/evbarm/fdt/fdt_memory.c | 172 -
sys/arch/evbarm/fdt/fdt_memory.h | 44 -
sys/arch/evbarm/fdt/platform.h | 6 +-
sys/arch/evbarm/gemini/gemini_machdep.c | 12 +-
sys/arch/evbarm/gumstix/gumstix_machdep.c | 27 +-
sys/arch/evbarm/ifpga/ifpga_intr.c | 6 +-
sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c | 10 +-
sys/arch/evbarm/imx31/imx31lk_start.S | 10 +-
sys/arch/evbarm/iq80310/iq80310_intr.c | 8 +-
sys/arch/evbarm/osk5912/osk5912_machdep.c | 21 +-
sys/arch/evbarm/rpi/rpi_vcmbox.c | 35 +-
sys/arch/evbarm/rpi/vcprop.h | 14 +-
sys/arch/evbarm/rpi/vcprop_subr.c | 165 +-
sys/arch/evbarm/tisdp24xx/if_sm_gpmc.c | 4 +-
sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c | 6 +-
sys/arch/evbarm/tisdp24xx/sdp24xx_start.S | 4 +-
sys/arch/evbarm/zynq/zynq_machdep.c | 34 +-
sys/arch/evbmips/gdium/gdium_intr.c | 10 +-
sys/arch/evbmips/loongson/loongson_intr.c | 10 +-
sys/arch/evbmips/malta/malta_intr.c | 10 +-
sys/arch/evbmips/malta/pci/pcib.c | 10 +-
sys/arch/evbppc/conf/INSTALL.inc | 4 +-
sys/arch/evbppc/conf/RB800 | 11 +-
sys/arch/evbppc/explora/dev/fb_elb.c | 9 +-
sys/arch/evbppc/explora/dev/pckbc_elb.c | 9 +-
sys/arch/evbppc/pmppc/dev/cpc_mainbus.c | 12 +-
sys/arch/evbppc/pmppc/pic_cpc700.c | 8 +-
sys/arch/evbppc/virtex/design_gsrd1.c | 11 +-
sys/arch/evbppc/walnut/dev/pckbc_pbus.c | 9 +-
sys/arch/evbsh3/ap_ms104_sh4/ap_ms104_sh4_intr.c | 10 +-
sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c | 18 +-
sys/arch/evbsh3/evbsh3/bus_dma.c | 23 +-
sys/arch/ews4800mips/dev/ewskbd.c | 10 +-
sys/arch/ews4800mips/ews4800mips/bus_dma.c | 24 +-
sys/arch/ews4800mips/sbd/fb_sbdio.c | 11 +-
sys/arch/hp300/conf/INSTALL | 11 +-
sys/arch/hp300/conf/RAMDISK | 7 +-
sys/arch/hp300/dev/hpib.c | 8 +-
sys/arch/hp300/dev/ppi.c | 14 +-
sys/arch/hp300/hp300/autoconf.c | 12 +-
sys/arch/hp300/hp300/intr.c | 10 +-
sys/arch/hpc/hpc/config_hook.c | 14 +-
sys/arch/hpcarm/dev/wzero3_kbd.c | 12 +-
sys/arch/hpcarm/hpcarm/softintr.c | 13 +-
sys/arch/hpcmips/dev/plum.c | 9 +-
sys/arch/hpcmips/dev/plumiobus.c | 8 +-
sys/arch/hpcmips/dev/plumohci.c | 9 +-
sys/arch/hpcmips/dev/ucbsnd.c | 15 +-
sys/arch/hpcmips/hpcmips/bus_dma.c | 29 +-
sys/arch/hpcmips/tx/tx39icu.c | 18 +-
sys/arch/hpcmips/tx/txcom.c | 20 +-
sys/arch/hpcmips/vr/flash_vrip.c | 8 +-
sys/arch/hpcmips/vr/vr4181giu.c | 8 +-
sys/arch/hpcmips/vr/vrc4172gpio.c | 10 +-
sys/arch/hpcmips/vr/vrgiu.c | 10 +-
sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c | 17 +-
sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c | 15 +-
sys/arch/hpcsh/hpcsh/bus_space.c | 10 +-
sys/arch/hppa/dev/apic.c | 17 +-
sys/arch/hppa/hppa/mainbus.c | 33 +-
sys/arch/hppa/include/proc.h | 4 +-
sys/arch/hppa/include/types.h | 6 +-
sys/arch/ia64/ia64/interrupt.c | 14 +-
sys/arch/m68k/include/proc.h | 4 +-
sys/arch/mac68k/mac68k/pram.c | 6 +-
sys/arch/mips/adm5120/dev/wdc_extio.c | 10 +-
sys/arch/mips/include/proc.h | 6 +-
sys/arch/mips/include/types.h | 7 +-
sys/arch/mips/rmi/rmixl_spl.S | 6 +-
sys/arch/mipsco/isa/isa_machdep.c | 10 +-
sys/arch/mipsco/mipsco/bus_dma.c | 23 +-
sys/arch/mmeye/dev/mmeyepcmcia.c | 18 +-
sys/arch/mvme68k/mvme68k/bus_dma.c | 24 +-
sys/arch/mvme68k/mvme68k/isr.c | 8 +-
sys/arch/mvmeppc/mvmeppc/mainbus.c | 12 +-
sys/arch/news68k/news68k/isr.c | 8 +-
sys/arch/newsmips/apbus/apbus.c | 10 +-
sys/arch/newsmips/apbus/xafb.c | 9 +-
sys/arch/newsmips/dev/fb.c | 9 +-
sys/arch/newsmips/dev/hb.c | 8 +-
sys/arch/newsmips/newsmips/bus.c | 23 +-
sys/arch/next68k/dev/if_xe.c | 7 +-
sys/arch/next68k/dev/nextdisplay.c | 10 +-
sys/arch/next68k/dev/nextkbd.c | 11 +-
sys/arch/next68k/next68k/isr.c | 8 +-
sys/arch/ofppc/conf/GENERIC | 5 +-
sys/arch/ofppc/pci/gt_mainbus.c | 10 +-
sys/arch/ofppc/pci/ofwpci.c | 9 +-
sys/arch/playstation2/dev/if_smap.c | 12 +-
sys/arch/playstation2/dev/ohci_sbus.c | 11 +-
sys/arch/playstation2/playstation2/bus_dma.c | 24 +-
sys/arch/playstation2/playstation2/bus_space.c | 14 +-
sys/arch/pmax/pmax/bus_dma.c | 23 +-
sys/arch/pmax/tc/dt.c | 10 +-
sys/arch/powerpc/booke/pci/pq3pci.c | 6 +-
sys/arch/prep/pci/gten.c | 10 +-
sys/arch/prep/pci/pci_machdep.c | 10 +-
sys/arch/prep/pnpbus/pnpbus.c | 22 +-
sys/arch/prep/prep/mainbus.c | 12 +-
sys/arch/riscv/conf/GENERIC | 6 +-
sys/arch/riscv/conf/files.riscv | 4 +-
sys/arch/riscv/conf/kern.ldscript | 2 +
sys/arch/riscv/htif/htif.c | 4 +-
sys/arch/riscv/htif/htif_cons.c | 4 +-
sys/arch/riscv/htif/htif_disk.c | 4 +-
sys/arch/riscv/htif/htif_var.h | 3 +-
sys/arch/riscv/include/frame.h | 10 +-
sys/arch/riscv/include/insn.h | 3 +-
sys/arch/riscv/include/locore.h | 17 +-
sys/arch/riscv/include/pmap.h | 4 +-
sys/arch/riscv/include/pte.h | 19 +-
sys/arch/riscv/include/reg.h | 43 +-
sys/arch/riscv/include/sysreg.h | 128 +-
sys/arch/riscv/include/vmparam.h | 12 +-
sys/arch/riscv/riscv/autoconf.c | 4 +-
sys/arch/riscv/riscv/clock_machdep.c | 6 +-
sys/arch/riscv/riscv/core_machdep.c | 6 +-
sys/arch/riscv/riscv/cpu_mainbus.c | 4 +-
sys/arch/riscv/riscv/cpu_subr.c | 4 +-
sys/arch/riscv/riscv/db_disasm.c | 4 +-
sys/arch/riscv/riscv/db_machdep.c | 6 +-
sys/arch/riscv/riscv/db_trace.c | 4 +-
sys/arch/riscv/riscv/exec_machdep.c | 5 +-
sys/arch/riscv/riscv/fixup.c | 4 +-
sys/arch/riscv/riscv/genassym.cf | 35 +-
sys/arch/riscv/riscv/kobj_machdep.c | 4 +-
sys/arch/riscv/riscv/locore.S | 50 +-
sys/arch/riscv/riscv/mainbus.c | 4 +-
sys/arch/riscv/riscv/netbsd32_machdep.c | 4 +-
sys/arch/riscv/riscv/process_machdep.c | 4 +-
sys/arch/riscv/riscv/procfs_machdep.c | 4 +-
sys/arch/riscv/riscv/riscv_machdep.c | 6 +-
sys/arch/riscv/riscv/sig_machdep.c | 4 +-
sys/arch/riscv/riscv/softint_machdep.c | 4 +-
sys/arch/riscv/riscv/spl.S | 109 +-
sys/arch/riscv/riscv/stubs.c | 4 +-
sys/arch/riscv/riscv/sys_machdep.c | 4 +-
sys/arch/riscv/riscv/trap.c | 109 +-
sys/arch/riscv/riscv/vm_machdep.c | 14 +-
sys/arch/rs6000/mca/mca_machdep.c | 10 +-
sys/arch/rs6000/mca/mcadma_machdep.c | 12 +-
sys/arch/rs6000/rs6000/pic_iocc.c | 8 +-
sys/arch/sgimips/dev/int.c | 10 +-
sys/arch/sgimips/dev/zs_kbd.c | 12 +-
sys/arch/sgimips/gio/grtwo.c | 12 +-
sys/arch/sgimips/gio/light.c | 12 +-
sys/arch/sgimips/gio/newport.c | 12 +-
sys/arch/sgimips/hpc/pckbc_hpc.c | 9 +-
sys/arch/sh3/dev/sci.c | 8 +-
sys/arch/sh3/dev/scif.c | 8 +-
sys/arch/sh3/sh3/vm_machdep.c | 6 +-
sys/arch/shark/isa/isa_irq.S | 22 +-
sys/arch/shark/isa/isa_irqhandler.c | 12 +-
sys/arch/shark/isa/isa_shark_machdep.c | 8 +-
sys/arch/shark/ofw/if_cs_ofisa_machdep.c | 8 +-
sys/arch/shark/ofw/igsfb_ofbus.c | 10 +-
sys/arch/sparc/dev/bootbus.c | 8 +-
sys/arch/sparc/dev/ebus.c | 8 +-
sys/arch/sparc/dev/fd.c | 13 +-
sys/arch/sparc/dev/pckbc_js.c | 9 +-
sys/arch/sparc/dev/sbus.c | 7 +-
sys/arch/sparc/dev/sw.c | 8 +-
sys/arch/sparc/dev/vme_machdep.c | 10 +-
sys/arch/sparc/include/proc.h | 4 +-
sys/arch/sparc/include/types.h | 2 +-
sys/arch/sparc/sparc/clock.c | 15 +-
sys/arch/sparc/sparc/cpu.c | 10 +-
sys/arch/sparc/sparc/cpuunit.c | 7 +-
sys/arch/sparc/sparc/intr.c | 10 +-
sys/arch/sparc/sparc/machdep.c | 40 +-
sys/arch/sparc/sparc/msiiep.c | 8 +-
sys/arch/sparc/sparc/pmap.c | 62 +-
sys/arch/sparc64/dev/pcf8591_envctrl.c | 64 +-
sys/arch/sparc64/include/proc.h | 4 +-
sys/arch/sun2/dev/sc_mbmem.c | 10 +-
sys/arch/sun3/dev/cg4.c | 8 +-
sys/arch/sun3/dev/eeprom.c | 8 +-
sys/arch/sun3/dev/fd.c | 13 +-
sys/arch/sun3/dev/si.c | 11 +-
sys/arch/sun3/dev/si_sebuf.c | 10 +-
sys/arch/sun3/dev/xd.c | 10 +-
sys/arch/sun3/dev/xy.c | 10 +-
sys/arch/sun68k/sun68k/bus.c | 35 +-
sys/arch/sun68k/sun68k/isr.c | 8 +-
sys/arch/sun68k/sun68k/vme_sun68k.c | 9 +-
sys/arch/vax/uba/qv.c | 10 +-
sys/arch/vax/uba/qvkbd.c | 7 +-
sys/arch/vax/vax/bus_dma.c | 25 +-
sys/arch/vax/vax/multicpu.c | 12 +-
sys/arch/vax/vsa/lcg.c | 8 +-
sys/arch/vax/vsa/smg.c | 8 +-
sys/arch/vax/vsa/spx.c | 10 +-
sys/arch/x86/include/machdep.h | 3 +-
sys/arch/x86/include/specialreg.h | 19 +-
sys/arch/x86/pci/msipic.c | 10 +-
sys/arch/x86/x86/intr.c | 10 +-
sys/arch/x86/x86/pmap.c | 9 +-
sys/arch/x86/x86/procfs_machdep.c | 12 +-
sys/arch/x86/x86/vm_machdep.c | 6 +-
sys/arch/xen/xen/evtchn.c | 6 +-
sys/arch/xen/xen/hypervisor.c | 11 +-
sys/arch/xen/xen/privcmd.c | 23 +-
sys/arch/xen/xen/xen_clock.c | 10 +-
sys/arch/xen/xen/xenevt.c | 15 +-
sys/arch/zaurus/dev/w100.c | 8 +-
sys/arch/zaurus/dev/zkbd.c | 14 +-
sys/coda/coda.h | 8 +-
sys/coda/coda_vfsops.c | 14 +-
sys/coda/coda_vnops.c | 182 +-
sys/coda/coda_vnops.h | 3 +-
sys/compat/linux/common/linux_misc_notalpha.c | 110 +-
sys/compat/linux/common/linux_socket.c | 59 +-
sys/compat/netbsd32/netbsd32.h | 3 +-
sys/compat/netbsd32/netbsd32_core.c | 44 +-
sys/conf/majors | 3 +-
sys/conf/param.c | 8 +-
sys/crypto/aes/arch/arm/aes_neon.c | 6 +-
sys/dev/acpi/acpi.c | 22 +-
sys/dev/acpi/acpi_cppc.c | 440 +
sys/dev/acpi/acpi_cpu.c | 19 +-
sys/dev/acpi/acpi_cpu.h | 86 +-
sys/dev/acpi/acpi_cpu_cstate.c | 13 +-
sys/dev/acpi/acpi_cpu_pstate.c | 27 +-
sys/dev/acpi/acpi_cpu_tstate.c | 50 +-
sys/dev/acpi/acpi_dev.c | 220 +
sys/dev/acpi/acpi_mcfg.c | 8 +-
sys/dev/acpi/acpi_pcc.c | 389 +
sys/dev/acpi/acpi_pcc.h | 38 +
sys/dev/acpi/acpi_pcd.c | 81 +
sys/dev/acpi/acpi_quirks.c | 62 +-
sys/dev/acpi/acpivar.h | 4 +-
sys/dev/acpi/ahcisata_acpi.c | 7 +-
sys/dev/acpi/amdccp_acpi.c | 24 +-
sys/dev/acpi/atppc_acpi.c | 25 +-
sys/dev/acpi/dwiic_acpi.c | 7 +-
sys/dev/acpi/ehci_acpi.c | 7 +-
sys/dev/acpi/fdc_acpi.c | 23 +-
sys/dev/acpi/files.acpi | 18 +-
sys/dev/acpi/genet_acpi.c | 6 +-
sys/dev/acpi/lpt_acpi.c | 23 +-
sys/dev/acpi/mpu_acpi.c | 23 +-
sys/dev/acpi/pckbc_acpi.c | 33 +-
sys/dev/acpi/plgpio_acpi.c | 7 +-
sys/dev/acpi/spic_acpi.c | 14 +-
sys/dev/acpi/virtio_acpi.c | 7 +-
sys/dev/acpi/wb_acpi.c | 13 +-
sys/dev/acpi/xhci_acpi.c | 7 +-
sys/dev/audio/audio.c | 105 +-
sys/dev/fdt/display_timing.h | 8 +-
sys/dev/fdt/fdt_ddb.h | 8 +-
sys/dev/fdt/fdt_memory.c | 244 +
sys/dev/fdt/fdt_memory.h | 48 +
sys/dev/fdt/fdt_port.h | 4 +-
sys/dev/fdt/fdtvar.h | 8 +-
sys/dev/fdt/files.fdt | 5 +-
sys/dev/fdt/panel_fdt.h | 4 +-
sys/dev/fdt/syscon.h | 8 +-
sys/dev/hyperv/if_hvn.c | 25 +-
sys/dev/i2c/adm1021.c | 30 +-
sys/dev/i2c/g760a.c | 14 +-
sys/dev/i2c/hytp14.c | 3 +-
sys/dev/i2c/pcf8574.c | 16 +-
sys/dev/i2c/si70xx.c | 5 +-
sys/dev/ic/ath.c | 8 +-
sys/dev/ic/athn.c | 7 +-
sys/dev/ic/atppc.c | 6 +-
sys/dev/ic/ibm561.c | 29 +-
sys/dev/ic/isp_netbsd.c | 6 +-
sys/dev/ic/nvme.c | 15 +-
sys/dev/mii/igphy.c | 5 +-
sys/dev/mii/ihphy.c | 5 +-
sys/dev/mii/makphy.c | 7 +-
sys/dev/pci/if_iavf.c | 50 +-
sys/dev/pci/if_wm.c | 170 +-
sys/dev/pci/ixgbe/ixgbe.c | 149 +-
sys/dev/pci/ixgbe/ixgbe.h | 12 +-
sys/dev/pci/ixgbe/ixgbe_type.h | 10 +-
sys/dev/pci/ixgbe/ixgbe_vf.c | 4 +-
sys/dev/pci/ixgbe/ixgbe_x540.c | 2 +-
sys/dev/pci/pcidevs | 286 +-
sys/dev/pci/pcidevs.h | 288 +-
sys/dev/pci/pcidevs_data.h | 14428 +++++----
sys/dev/pci/xhci_pci.c | 6 +-
sys/dev/sdmmc/if_bwfm_sdio.c | 13 +-
sys/dev/tprof/tprof.c | 62 +-
sys/dev/usb/ehci.c | 6 +-
sys/dev/usb/ohci.c | 205 +-
sys/dev/usb/ohcivar.h | 11 +-
sys/dev/usb/uhid.c | 386 +-
sys/dev/usb/uhidev.c | 432 +-
sys/dev/usb/uhidev.h | 35 +-
sys/dev/vmt/vmt_subr.c | 4 +-
sys/dev/wscons/wsdisplay_vcons.c | 6 +-
sys/dev/wsfont/Liberation_Mono_12x21.h | 5047 +++
sys/dev/wsfont/files.wsfont | 8 +-
sys/dev/wsfont/wsfont.c | 52 +-
sys/dist/pf/net/pf_table.c | 6 +-
sys/external/bsd/acpica/dist/changes.txt | 173 +-
sys/external/bsd/acpica/dist/common/ahpredef.c | 5 +
sys/external/bsd/acpica/dist/common/ahuuids.c | 13 +-
sys/external/bsd/acpica/dist/common/dmtbinfo1.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslbtypes.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslcodegen.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslcompiler.h | 1 -
sys/external/bsd/acpica/dist/compiler/aslcompiler.l | 6 +-
sys/external/bsd/acpica/dist/compiler/aslload.c | 9 +-
sys/external/bsd/acpica/dist/compiler/aslmap.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslmessages.c | 88 +-
sys/external/bsd/acpica/dist/compiler/aslmessages.h | 10 +-
sys/external/bsd/acpica/dist/compiler/aslnamesp.c | 35 +-
sys/external/bsd/acpica/dist/compiler/aslopcodes.c | 6 +
sys/external/bsd/acpica/dist/compiler/aslparseop.c | 26 +
sys/external/bsd/acpica/dist/compiler/aslprepkg.c | 17 +-
sys/external/bsd/acpica/dist/compiler/aslprimaries.y | 10 +-
sys/external/bsd/acpica/dist/compiler/aslrules.y | 4 +
sys/external/bsd/acpica/dist/compiler/asltypes.y | 1 +
sys/external/bsd/acpica/dist/compiler/aslutils.c | 8 +-
sys/external/bsd/acpica/dist/compiler/aslxref.c | 11 +-
sys/external/bsd/acpica/dist/debugger/dbexec.c | 42 +-
sys/external/bsd/acpica/dist/debugger/dbinput.c | 13 +-
sys/external/bsd/acpica/dist/debugger/dbmethod.c | 183 +-
sys/external/bsd/acpica/dist/disassembler/dmbuffer.c | 4 +
sys/external/bsd/acpica/dist/disassembler/dmcstyle.c | 2 +-
sys/external/bsd/acpica/dist/events/evregion.c | 59 +-
sys/external/bsd/acpica/dist/events/evrgnini.c | 11 +-
sys/external/bsd/acpica/dist/executer/exregion.c | 70 +-
sys/external/bsd/acpica/dist/generate/lint/std32.lnt | 2 +-
sys/external/bsd/acpica/dist/generate/lint/std64.lnt | 2 +-
sys/external/bsd/acpica/dist/generate/release/build.sh | 2 +-
sys/external/bsd/acpica/dist/generate/release/release.sh | 4 +-
sys/external/bsd/acpica/dist/generate/unix/acpihelp/Makefile | 4 +-
sys/external/bsd/acpica/dist/include/accommon.h | 2 +-
sys/external/bsd/acpica/dist/include/acconfig.h | 2 +-
sys/external/bsd/acpica/dist/include/acdebug.h | 6 +
sys/external/bsd/acpica/dist/include/acexcep.h | 4 +-
sys/external/bsd/acpica/dist/include/aclocal.h | 1 +
sys/external/bsd/acpica/dist/include/acpixf.h | 2 +-
sys/external/bsd/acpica/dist/include/acpredef.h | 23 +-
sys/external/bsd/acpica/dist/include/actbl1.h | 16 +-
sys/external/bsd/acpica/dist/include/actypes.h | 16 +-
sys/external/bsd/acpica/dist/include/acuuid.h | 13 +-
sys/external/bsd/acpica/dist/include/platform/aclinux.h | 3 +-
sys/external/bsd/acpica/dist/namespace/nsalloc.c | 2 +-
sys/external/bsd/acpica/dist/namespace/nsarguments.c | 4 +-
sys/external/bsd/acpica/dist/namespace/nspredef.c | 9 +-
sys/external/bsd/acpica/dist/namespace/nsprepkg.c | 38 +-
sys/external/bsd/acpica/dist/namespace/nsrepair2.c | 39 +-
sys/external/bsd/acpica/dist/namespace/nsxfeval.c | 1 +
sys/external/bsd/acpica/dist/namespace/nsxfobj.c | 3 +-
sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c | 2 +-
sys/external/bsd/acpica/dist/parser/psparse.c | 4 +-
sys/external/bsd/acpica/dist/resources/rsxface.c | 1 +
sys/external/bsd/acpica/dist/tables/tbxface.c | 2 +
sys/external/bsd/acpica/dist/tools/acpiexec/aemain.c | 2 +-
sys/external/bsd/acpica/dist/tools/acpihelp/acpihelp.h | 7 +-
sys/external/bsd/acpica/dist/tools/acpihelp/ahdecode.c | 1 +
sys/external/bsd/acpica/dist/tools/acpihelp/ahmain.c | 13 +-
sys/external/bsd/acpica/dist/utilities/utcache.c | 1 +
sys/external/bsd/acpica/dist/utilities/utosi.c | 4 +-
sys/external/bsd/acpica/dist/utilities/utpredef.c | 4 +-
sys/external/bsd/acpica/dist/utilities/utprint.c | 1 +
sys/external/bsd/acpica/dist/utilities/utstrsuppt.c | 30 +-
sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c | 2 +
sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.h | 4 +-
sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_acpi.c | 9 +-
sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.c | 11 +-
sys/external/isc/libsodium/dist/build-aux/config.guess | 1 +
sys/external/isc/libsodium/dist/config.guess | 1 +
sys/fs/ptyfs/ptyfs.h | 4 +-
sys/fs/ptyfs/ptyfs_subr.c | 6 +-
sys/fs/ptyfs/ptyfs_vnops.c | 12 +-
sys/fs/tmpfs/tmpfs_vnops.c | 11 +-
sys/kern/compat_stub.c | 3 +-
sys/kern/files.kern | 4 +-
sys/kern/init_main.c | 29 +-
sys/kern/init_sysent.c | 6 +-
sys/kern/kern_clock.c | 6 +-
sys/kern/kern_condvar.c | 5 +-
sys/kern/kern_core.c | 24 +-
sys/kern/kern_entropy.c | 8 +-
sys/kern/kern_event.c | 8 +-
sys/kern/kern_exec.c | 10 +-
sys/kern/kern_exit.c | 6 +-
sys/kern/kern_sig.c | 20 +-
sys/kern/kern_subr.c | 18 +-
sys/kern/kern_time.c | 1381 +-
sys/kern/subr_ipi.c | 42 +-
sys/kern/subr_log.c | 13 +-
sys/kern/subr_tftproot.c | 5 +-
sys/kern/sys_pipe.c | 10 +-
sys/kern/sys_ptrace.c | 27 +-
sys/kern/sys_ptrace_common.c | 60 +-
sys/kern/sys_select.c | 26 +-
sys/kern/sys_socket.c | 6 +-
sys/kern/syscalls.c | 6 +-
sys/kern/syscalls.master | 4 +-
sys/kern/syscalls_autoload.c | 6 +-
sys/kern/systrace_args.c | 2 +-
sys/kern/tty.c | 16 +-
sys/kern/tty_pty.c | 16 +-
sys/kern/uipc_domain.c | 5 +-
sys/kern/uipc_socket.c | 26 +-
sys/kern/uipc_usrreq.c | 26 +-
sys/kern/vfs_cache.c | 10 +-
sys/kern/vfs_mount.c | 17 +-
sys/kern/vfs_vnops.c | 11 +-
sys/lib/libx86emu/files.x86emu | 1 +
sys/modules/Makefile | 3 +-
sys/modules/compat_netbsd32/Makefile | 7 +-
sys/modules/compat_netbsd32_coredump/Makefile | 17 +
sys/modules/coredump/Makefile | 21 +-
sys/net/if_bridge.c | 18 +-
sys/net/if_pppoe.c | 167 +-
sys/net/if_sppp.h | 71 +-
sys/net/if_spppsubr.c | 3456 +-
sys/net/if_spppvar.h | 74 +-
sys/net/if_wg.c | 40 +-
sys/net80211/ieee80211_crypto_ccmp.c | 8 +-
sys/net80211/ieee80211_crypto_tkip.c | 10 +-
sys/net80211/ieee80211_crypto_wep.c | 10 +-
sys/net80211/ieee80211_node.c | 6 +-
sys/netinet/files.ipfilter | 3 +-
sys/netinet/ip_mroute.c | 39 +-
sys/netinet/tcp_usrreq.c | 8 +-
sys/rump/dev/lib/libpci/rumpdev_bus_dma.c | 6 +-
sys/rump/dev/lib/libpci_usbhc/Makefile | 3 +-
sys/rump/dev/lib/libpci_usbhc/PCI_USBHC.ioconf | 3 +-
sys/rump/dev/lib/libusb/USB.ioconf | 4 +-
sys/rump/include/rump-sys/kern.h | 3 +-
sys/rump/include/rump/rump.h | 3 +-
sys/rump/include/rump/rump_syscalls.h | 9 +-
sys/rump/include/sys/sleeptab.h | 44 +
sys/rump/librump/rumpkern/intr.c | 6 +-
sys/rump/librump/rumpkern/rump.c | 34 +-
sys/rump/librump/rumpkern/rump_syscalls.c | 41 +-
sys/rump/librump/rumpkern/scheduler.c | 14 +-
sys/rump/librump/rumpkern/sleepq.c | 31 +-
sys/rump/librump/rumpkern/vm.c | 35 +-
sys/rump/librump/rumpnet/net_stub.c | 12 +-
sys/rump/librump/rumpvfs/vm_vfs.c | 14 +-
sys/rump/rump.sysmap | 1 +
sys/secmodel/keylock/secmodel_keylock.c | 5 +-
sys/secmodel/securelevel/secmodel_securelevel.c | 5 +-
sys/stand/efiboot/boot.c | 3 +-
sys/stand/efiboot/bootaa64/efibootaa64.c | 19 +-
sys/stand/efiboot/bootarm/efibootarm.c | 7 +-
sys/stand/efiboot/efiblock.c | 39 +-
sys/stand/efiboot/efiboot_machdep.h | 3 +-
sys/sys/bus_proto.h | 4 +-
sys/sys/cdefs.h | 8 +-
sys/sys/compat_stub.h | 4 +-
sys/sys/device.h | 6 +-
sys/sys/param.h | 16 +-
sys/sys/proc.h | 4 +-
sys/sys/ptrace.h | 4 +-
sys/sys/select.h | 5 +-
sys/sys/signalvar.h | 3 +-
sys/sys/sleepq.h | 97 +-
sys/sys/sleeptab.h | 136 +
sys/sys/socketvar.h | 7 +-
sys/sys/syscall.h | 4 +-
sys/sys/syscallargs.h | 6 +-
sys/sys/timevar.h | 119 +-
sys/sys/un.h | 3 +-
sys/ufs/lfs/ulfs_quota2.c | 5 +-
sys/ufs/ufs/ufs_quota2.c | 5 +-
sys/uvm/uvm_aobj.c | 35 +-
sys/uvm/uvm_bio.c | 6 +-
sys/uvm/uvm_init.c | 7 +-
sys/uvm/uvm_mremap.c | 10 +-
sys/uvm/uvm_pdaemon.c | 120 +-
638 files changed, 24964 insertions(+), 13989 deletions(-)
diffs (truncated from 65862 to 300 lines):
diff -r 88f3b2117aec -r 9d89b10943b3 sys/arch/aarch64/aarch64/aarch64_machdep.c
--- a/sys/arch/aarch64/aarch64/aarch64_machdep.c Tue Nov 03 16:05:51 2020 +0000
+++ b/sys/arch/aarch64/aarch64/aarch64_machdep.c Mon Dec 14 14:37:44 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: aarch64_machdep.c,v 1.53 2020/10/22 07:31:15 skrll Exp $ */
+/* $NetBSD: aarch64_machdep.c,v 1.53.2.1 2020/12/14 14:37:44 thorpej Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.53 2020/10/22 07:31:15 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.53.2.1 2020/12/14 14:37:44 thorpej Exp $");
#include "opt_arm_debug.h"
#include "opt_cpuoptions.h"
@@ -72,8 +72,8 @@
#include <aarch64/vmparam.h>
#include <aarch64/kcore.h>
-#include <arch/evbarm/fdt/platform.h>
#include <arm/fdt/arm_fdtvar.h>
+#include <dev/fdt/fdt_memory.h>
#ifdef VERBOSE_INIT_ARM
#define VPRINTF(...) printf(__VA_ARGS__)
@@ -150,8 +150,8 @@
vaddr_t data_start = (vaddr_t)__data_start;
vaddr_t rodata_start = (vaddr_t)__rodata_start;
- /* add KSEG mappings of whole memory */
- const pt_entry_t ksegattr =
+ /* add direct mappings of whole memory */
+ const pt_entry_t dmattr =
LX_BLKPAG_ATTR_NORMAL_WB |
LX_BLKPAG_AP_RW |
LX_BLKPAG_PXN |
@@ -164,9 +164,8 @@
(uint64_t)bootconfig.dram[blk].pages * PAGE_SIZE);
pmapboot_enter_range(AARCH64_PA_TO_KVA(start), start,
- end - start, ksegattr, printf);
+ end - start, dmattr, printf);
}
- aarch64_dcache_wbinv_all();
/* Disable translation table walks using TTBR0 */
uint64_t tcr = reg_tcr_el1_read();
@@ -194,7 +193,7 @@
VPRINTF("%s: kernel phys start %lx end %lx+%lx\n", __func__,
kernstart_phys, kernend_phys, kernend_extra);
- fdt_add_reserved_memory_range(kernstart_phys,
+ fdt_memory_remove_range(kernstart_phys,
kernend_phys - kernstart_phys + kernend_extra);
}
@@ -216,7 +215,7 @@
*
* 0xffff_bfff_ffff_ffff End of direct mapped
* 0xffff_0000_0000_0000 Start of direct mapped
- * = AARCH64_KSEG_START
+ * = AARCH64_DIRECTMAP_START
*
* Hole: 0xfffe_ffff_ffff_ffff
* 0x0001_0000_0000_0000
@@ -605,9 +604,9 @@
*handled = true;
if ((v < data_start) && (prot & VM_PROT_WRITE))
return EFAULT;
- } else if (IN_RANGE(v, AARCH64_KSEG_START, AARCH64_KSEG_END)) {
+ } else if (IN_RANGE(v, AARCH64_DIRECTMAP_START, AARCH64_DIRECTMAP_END)) {
/*
- * if defined PMAP_MAP_POOLPAGE, direct mapped address (KSEG)
+ * if defined PMAP_MAP_POOLPAGE, direct mapped address
* will be appeared as kvm(3) address.
*/
paddr_t pa = AARCH64_KVA_TO_PA(v);
diff -r 88f3b2117aec -r 9d89b10943b3 sys/arch/aarch64/aarch64/aarch64_reboot.c
--- a/sys/arch/aarch64/aarch64/aarch64_reboot.c Tue Nov 03 16:05:51 2020 +0000
+++ b/sys/arch/aarch64/aarch64/aarch64_reboot.c Mon Dec 14 14:37:44 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: aarch64_reboot.c,v 1.3 2018/11/09 04:05:27 mrg Exp $ */
+/* $NetBSD: aarch64_reboot.c,v 1.3.12.1 2020/12/14 14:37:44 thorpej Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -122,7 +122,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aarch64_reboot.c,v 1.3 2018/11/09 04:05:27 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aarch64_reboot.c,v 1.3.12.1 2020/12/14 14:37:44 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -136,7 +136,8 @@
#include <aarch64/machdep.h>
#include <aarch64/armreg.h>
#include <aarch64/locore.h>
-#include <aarch64/cpufunc.h>
+
+#include <arm/cpufunc.h>
void (*cpu_reset_address0)(void);
void (*cpu_reset_address)(void);
diff -r 88f3b2117aec -r 9d89b10943b3 sys/arch/aarch64/aarch64/bus_space.c
--- a/sys/arch/aarch64/aarch64/bus_space.c Tue Nov 03 16:05:51 2020 +0000
+++ b/sys/arch/aarch64/aarch64/bus_space.c Mon Dec 14 14:37:44 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.11 2020/10/15 21:14:15 jmcneill Exp $ */
+/* $NetBSD: bus_space.c,v 1.11.2.1 2020/12/14 14:37:44 thorpej Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: bus_space.c,v 1.11 2020/10/15 21:14:15 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bus_space.c,v 1.11.2.1 2020/12/14 14:37:44 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -615,13 +615,13 @@
switch (flags) {
case BUS_SPACE_BARRIER_READ:
- dmb(ishld);
+ dsb(ld);
break;
case BUS_SPACE_BARRIER_WRITE:
- dmb(ishst);
+ dsb(st);
break;
case BUS_SPACE_BARRIER_READ|BUS_SPACE_BARRIER_WRITE:
- dmb(ish);
+ dsb(sy);
break;
}
}
diff -r 88f3b2117aec -r 9d89b10943b3 sys/arch/aarch64/aarch64/bus_space_asm_generic.S
--- a/sys/arch/aarch64/aarch64/bus_space_asm_generic.S Tue Nov 03 16:05:51 2020 +0000
+++ b/sys/arch/aarch64/aarch64/bus_space_asm_generic.S Mon Dec 14 14:37:44 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space_asm_generic.S,v 1.4 2020/09/24 16:15:49 ryo Exp $ */
+/* $NetBSD: bus_space_asm_generic.S,v 1.4.2.1 2020/12/14 14:37:44 thorpej Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -29,7 +29,7 @@
#include <aarch64/asm.h>
#include "assym.h"
-RCSID("$NetBSD: bus_space_asm_generic.S,v 1.4 2020/09/24 16:15:49 ryo Exp $")
+RCSID("$NetBSD: bus_space_asm_generic.S,v 1.4.2.1 2020/12/14 14:37:44 thorpej Exp $")
.macro generate_bsfunc funcname, dsbop
/* uint8_t {funcname}_bs_r_1(x0:tag, x1:addr, x2:offset) */
@@ -83,7 +83,7 @@
END(\funcname\()_bs_r_2_swap)
-/* uint32_t {funcname}_bs_r_4_swap(x0:tag, x2:addr, x3:offset) */
+/* uint32_t {funcname}_bs_r_4_swap(x0:tag, x1:addr, x2:offset) */
ENTRY_NP(\funcname\()_bs_r_4_swap)
\dsbop
ldr w8, [x0, #BS_STRIDE]
diff -r 88f3b2117aec -r 9d89b10943b3 sys/arch/aarch64/aarch64/cpu.c
--- a/sys/arch/aarch64/aarch64/cpu.c Tue Nov 03 16:05:51 2020 +0000
+++ b/sys/arch/aarch64/aarch64/cpu.c Mon Dec 14 14:37:44 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.56 2020/10/10 08:22:57 jmcneill Exp $ */
+/* $NetBSD: cpu.c,v 1.56.2.1 2020/12/14 14:37:44 thorpej Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.56 2020/10/10 08:22:57 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.56.2.1 2020/12/14 14:37:44 thorpej Exp $");
#include "locators.h"
#include "opt_arm_debug.h"
@@ -52,10 +52,10 @@
#include <aarch64/armreg.h>
#include <aarch64/cpu.h>
-#include <aarch64/cpufunc.h>
#include <aarch64/cpu_counter.h>
#include <aarch64/machdep.h>
+#include <arm/cpufunc.h>
#include <arm/cpu_topology.h>
#ifdef FDT
#include <arm/fdt/arm_fdtvar.h>
diff -r 88f3b2117aec -r 9d89b10943b3 sys/arch/aarch64/aarch64/db_disasm.c
--- a/sys/arch/aarch64/aarch64/db_disasm.c Tue Nov 03 16:05:51 2020 +0000
+++ b/sys/arch/aarch64/aarch64/db_disasm.c Mon Dec 14 14:37:44 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.c,v 1.10 2020/07/09 23:43:41 ryo Exp $ */
+/* $NetBSD: db_disasm.c,v 1.10.2.1 2020/12/14 14:37:44 thorpej Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.10 2020/07/09 23:43:41 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.10.2.1 2020/12/14 14:37:44 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd32.h"
@@ -41,10 +41,11 @@
#include <ddb/db_access.h>
#include <ddb/db_user.h>
-#include <aarch64/cpufunc.h>
#include <aarch64/machdep.h>
#include <arch/aarch64/aarch64/disasm.h>
+#include <arm/cpufunc.h>
+
static uint32_t
db_disasm_readword(uintptr_t address)
{
diff -r 88f3b2117aec -r 9d89b10943b3 sys/arch/aarch64/aarch64/db_interface.c
--- a/sys/arch/aarch64/aarch64/db_interface.c Tue Nov 03 16:05:51 2020 +0000
+++ b/sys/arch/aarch64/aarch64/db_interface.c Mon Dec 14 14:37:44 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.10 2020/09/14 10:53:02 ryo Exp $ */
+/* $NetBSD: db_interface.c,v 1.10.2.1 2020/12/14 14:37:44 thorpej Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.10 2020/09/14 10:53:02 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.10.2.1 2020/12/14 14:37:44 thorpej Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -38,7 +38,8 @@
#include <aarch64/db_machdep.h>
#include <aarch64/machdep.h>
#include <aarch64/pmap.h>
-#include <aarch64/cpufunc.h>
+
+#include <arm/cpufunc.h>
#include <ddb/db_access.h>
#include <ddb/db_command.h>
diff -r 88f3b2117aec -r 9d89b10943b3 sys/arch/aarch64/aarch64/db_machdep.c
--- a/sys/arch/aarch64/aarch64/db_machdep.c Tue Nov 03 16:05:51 2020 +0000
+++ b/sys/arch/aarch64/aarch64/db_machdep.c Mon Dec 14 14:37:44 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.28 2020/10/22 07:31:15 skrll Exp $ */
+/* $NetBSD: db_machdep.c,v 1.28.2.1 2020/12/14 14:37:44 thorpej Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.28 2020/10/22 07:31:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.28.2.1 2020/12/14 14:37:44 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd32.h"
@@ -52,6 +52,8 @@
#include <aarch64/locore.h>
#include <aarch64/pmap.h>
+#include <arm/cpufunc.h>
+
#include <ddb/db_access.h>
#include <ddb/db_command.h>
#include <ddb/db_output.h>
@@ -1050,8 +1052,8 @@
if ((ncpu > 1) && (db_newcpu != NULL)) {
db_onproc = db_newcpu;
db_newcpu = NULL;
- membar_producer();
- __asm __volatile ("sev; sev; sev");
+ dsb(ishst);
+ sev();
continue; /* redo DDB on new cpu */
}
#endif /* MULTIPROCESSOR */
@@ -1062,8 +1064,8 @@
#ifdef MULTIPROCESSOR
if (ncpu > 1) {
Home |
Main Index |
Thread Index |
Old Index