details: https://anonhg.NetBSD.org/src/rev/7b8c35b5f63b
branches: ad-namecache
changeset: 744159:7b8c35b5f63b
user: ad <ad%NetBSD.org@localhost>
date: Sat Jan 25 22:38:36 2020 +0000
description:
Sync with head.
diffstat:
sys/arch/aarch64/aarch64/aarch64_machdep.c | 7 +-
sys/arch/aarch64/aarch64/cpu.c | 12 +-
sys/arch/aarch64/aarch64/locore.S | 54 +-
sys/arch/aarch64/aarch64/start.S | 21 +-
sys/arch/aarch64/conf/files.aarch64 | 9 +-
sys/arch/aarch64/include/asm.h | 10 +-
sys/arch/aarch64/include/vmparam.h | 17 +-
sys/arch/acorn32/conf/EB7500ATX | 5 +-
sys/arch/acorn32/conf/GENERIC | 5 +-
sys/arch/acorn32/conf/INSTALL | 5 +-
sys/arch/acorn32/conf/LOWMEM_WSCONS | 3 +-
sys/arch/acorn32/conf/NC | 3 +-
sys/arch/algor/conf/P4032 | 7 +-
sys/arch/algor/conf/P5064 | 7 +-
sys/arch/algor/conf/P6032 | 5 +-
sys/arch/alpha/alpha/pmap.c | 30 +-
sys/arch/alpha/conf/GENERIC | 11 +-
sys/arch/alpha/conf/INSTALL | 7 +-
sys/arch/alpha/conf/RAWHIDE | 4 +-
sys/arch/amd64/conf/ALL | 15 +-
sys/arch/amd64/conf/GENERIC | 13 +-
sys/arch/amd64/conf/MODULAR | 3 +-
sys/arch/amd64/conf/XEN3_DOM0 | 7 +-
sys/arch/amd64/include/param.h | 13 +-
sys/arch/amd64/include/vmparam.h | 13 +-
sys/arch/arc/conf/ARCTIC | 3 +-
sys/arch/arc/conf/GENERIC | 8 +-
sys/arch/arc/conf/M403 | 3 +-
sys/arch/arc/conf/MIMORI | 5 +-
sys/arch/arc/conf/PICA | 3 +-
sys/arch/arc/conf/RPC44 | 5 +-
sys/arch/arm/acpi/acpi_machdep.c | 36 +-
sys/arch/arm/acpi/acpi_pci_machdep.c | 108 +-
sys/arch/arm/acpi/acpi_simplefb.c | 10 +-
sys/arch/arm/acpi/acpipchb.c | 12 +-
sys/arch/arm/arm/arm_machdep.c | 4 +-
sys/arch/arm/arm32/cpu.c | 17 +-
sys/arch/arm/arm32/pmap.c | 179 +-
sys/arch/arm/broadcom/bcm2835_intr.c | 14 +-
sys/arch/arm/broadcom/bcm2835_vcaudio.c | 17 +-
sys/arch/arm/broadcom/bcm2835_vcaudioreg.h | 10 +-
sys/arch/arm/conf/files.arm | 6 +-
sys/arch/arm/fdt/cpu_fdt.c | 7 +-
sys/arch/arm/include/arm32/param.h | 6 +-
sys/arch/arm/include/arm32/pmap.h | 6 +-
sys/arch/arm/include/arm32/pte.h | 4 +-
sys/arch/arm/include/cpu.h | 6 +-
sys/arch/arm/include/types.h | 3 +-
sys/arch/arm/sunxi/sun8i_crypto.c | 6 +-
sys/arch/bebox/conf/GENERIC | 5 +-
sys/arch/cats/conf/GENERIC | 7 +-
sys/arch/cats/conf/INSTALL | 8 +-
sys/arch/cobalt/conf/GENERIC | 9 +-
sys/arch/cobalt/conf/INSTALL | 9 +-
sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c | 6 +-
sys/arch/evbarm/beagle/beagle_machdep.c | 6 +-
sys/arch/evbarm/conf/ARMADILLO-IOT-G3 | 3 +-
sys/arch/evbarm/conf/ARMADILLO210 | 3 +-
sys/arch/evbarm/conf/ARMADILLO9 | 3 +-
sys/arch/evbarm/conf/CUBOX | 3 +-
sys/arch/evbarm/conf/CUBOX-I | 3 +-
sys/arch/evbarm/conf/DUOVERO | 3 +-
sys/arch/evbarm/conf/GENERIC | 3 +-
sys/arch/evbarm/conf/GENERIC64 | 3 +-
sys/arch/evbarm/conf/GUMSTIX | 3 +-
sys/arch/evbarm/conf/HDL_G | 3 +-
sys/arch/evbarm/conf/HPT5325 | 3 +-
sys/arch/evbarm/conf/IMX6UL-STARTER | 3 +-
sys/arch/evbarm/conf/IXDP425 | 5 +-
sys/arch/evbarm/conf/IYONIX | 5 +-
sys/arch/evbarm/conf/LUBBOCK | 1 -
sys/arch/evbarm/conf/MARVELL_NAS | 3 +-
sys/arch/evbarm/conf/MINI2440 | 3 +-
sys/arch/evbarm/conf/MMNET_GENERIC | 5 +-
sys/arch/evbarm/conf/MPCSA_GENERIC | 7 +-
sys/arch/evbarm/conf/MV2120 | 3 +-
sys/arch/evbarm/conf/OPENBLOCKS_A6 | 3 +-
sys/arch/evbarm/conf/OPENBLOCKS_AX3 | 3 +-
sys/arch/evbarm/conf/PEPPER | 3 +-
sys/arch/evbarm/conf/RPI | 3 +-
sys/arch/evbarm/conf/RPI_INSTALL | 4 +-
sys/arch/evbarm/conf/SHEEVAPLUG | 3 +-
sys/arch/evbarm/conf/SMDK2410 | 3 +-
sys/arch/evbarm/conf/SMDK2800 | 3 +-
sys/arch/evbarm/conf/TWINTAIL | 5 +-
sys/arch/evbarm/conf/ZAO425 | 5 +-
sys/arch/evbarm/conf/std.generic | 4 +-
sys/arch/evbarm/fdt/fdt_machdep.c | 9 +-
sys/arch/evbarm/gumstix/gumstix_machdep.c | 4 +-
sys/arch/evbarm/imx7/imx7_machdep.c | 6 +-
sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c | 6 +-
sys/arch/evbmips/conf/ADM5120 | 5 +-
sys/arch/evbmips/conf/ADM5120-NB | 5 +-
sys/arch/evbmips/conf/ADM5120-USB | 5 +-
sys/arch/evbmips/conf/ALCHEMY | 5 +-
sys/arch/evbmips/conf/AP30 | 5 +-
sys/arch/evbmips/conf/CI20 | 5 +-
sys/arch/evbmips/conf/DB120 | 5 +-
sys/arch/evbmips/conf/ERLITE | 5 +-
sys/arch/evbmips/conf/LINKITSMART7688 | 3 +-
sys/arch/evbmips/conf/MALTA | 8 +-
sys/arch/evbmips/conf/MERAKI | 5 +-
sys/arch/evbmips/conf/RB153 | 5 +-
sys/arch/evbmips/conf/RB433UAH | 5 +-
sys/arch/evbmips/conf/SBMIPS | 5 +-
sys/arch/evbmips/conf/WGT624V3 | 5 +-
sys/arch/evbmips/conf/XLSATX | 5 +-
sys/arch/evbppc/conf/EXPLORA451 | 3 +-
sys/arch/evbppc/conf/OPENBLOCKS266 | 5 +-
sys/arch/evbppc/conf/OPENBLOCKS266_OPT | 4 +-
sys/arch/evbppc/conf/OPENBLOCKS600 | 5 +-
sys/arch/evbppc/conf/PMPPC | 5 +-
sys/arch/evbppc/conf/WALNUT | 3 +-
sys/arch/ews4800mips/conf/GENERIC | 5 +-
sys/arch/ews4800mips/conf/RAMDISK | 3 +-
sys/arch/hpcarm/conf/IPAQ | 3 +-
sys/arch/hpcarm/conf/JORNADA720 | 5 +-
sys/arch/hpcarm/conf/JORNADA820 | 5 +-
sys/arch/hpcarm/conf/NETBOOKPRO | 5 +-
sys/arch/hpcarm/conf/WZERO3 | 5 +-
sys/arch/hppa/conf/GENERIC | 10 +-
sys/arch/i386/conf/ALL | 18 +-
sys/arch/i386/conf/GENERIC | 16 +-
sys/arch/i386/conf/GENERIC_PS2TINY | 3 +-
sys/arch/i386/conf/GENERIC_TINY | 8 +-
sys/arch/i386/conf/INSTALL_FLOPPY | 11 +-
sys/arch/i386/conf/INSTALL_TINY | 7 +-
sys/arch/i386/conf/NET4501 | 5 +-
sys/arch/i386/conf/XEN3PAE_DOM0 | 6 +-
sys/arch/i386/stand/bootxx/bootxx_msdos/Makefile | 4 +-
sys/arch/i386/stand/efiboot/devopen.c | 6 +-
sys/arch/ia64/conf/GENERIC.SKI | 5 +-
sys/arch/iyonix/conf/GENERIC | 5 +-
sys/arch/landisk/conf/GENERIC | 5 +-
sys/arch/mac68k/conf/GENERIC | 5 +-
sys/arch/macppc/conf/GENERIC | 9 +-
sys/arch/macppc/stand/bootxx/bootxx.c | 6 +-
sys/arch/mips/cavium/dev/octeon_gmx.c | 14 +-
sys/arch/mipsco/conf/GENERIC | 3 +-
sys/arch/mipsco/conf/RC3230 | 3 +-
sys/arch/mmeye/conf/GENERIC | 5 +-
sys/arch/mmeye/conf/MMEYE_WLF | 5 +-
sys/arch/mmeye/conf/MMTA | 3 +-
sys/arch/mmeye/conf/MMTAICE | 3 +-
sys/arch/mmeye/conf/MMTAROMNEW | 3 +-
sys/arch/mvmeppc/conf/GENERIC | 5 +-
sys/arch/news68k/conf/GENERIC | 5 +-
sys/arch/news68k/conf/GENERIC_TINY | 5 +-
sys/arch/news68k/conf/LIBERO | 3 +-
sys/arch/news68k/conf/NEWS1200 | 3 +-
sys/arch/newsmips/conf/GENERIC | 5 +-
sys/arch/pmax/conf/GENERIC | 5 +-
sys/arch/pmax/conf/GENERIC64 | 5 +-
sys/arch/pmax/conf/INSTALL | 3 +-
sys/arch/pmax/conf/INSTALL64 | 3 +-
sys/arch/powerpc/powerpc/lock_stubs.S | 12 +-
sys/arch/prep/conf/GENERIC | 5 +-
sys/arch/rs6000/conf/GENERIC | 5 +-
sys/arch/sbmips/conf/GENERIC | 5 +-
sys/arch/sgimips/conf/GENERIC32_IP12 | 5 +-
sys/arch/sgimips/conf/GENERIC32_IP2x | 5 +-
sys/arch/sgimips/conf/GENERIC32_IP3x | 8 +-
sys/arch/shark/conf/GENERIC | 5 +-
sys/arch/sparc/conf/GENERIC | 7 +-
sys/arch/sparc/conf/INSTALL | 5 +-
sys/arch/sparc64/conf/GENERIC | 13 +-
sys/arch/sparc64/conf/NONPLUS64 | 7 +-
sys/arch/sparc64/include/vmparam.h | 13 +-
sys/arch/sun3/include/pmap.h | 8 +-
sys/arch/sun3/include/pmap3.h | 4 +-
sys/arch/sun3/include/pmap3x.h | 4 +-
sys/arch/vax/conf/GENERIC | 5 +-
sys/arch/vax/conf/INSTALL | 3 +-
sys/arch/vax/conf/VAX780 | 3 +-
sys/arch/x68k/stand/README | 57 +
sys/arch/x68k/stand/boot/Makefile | 7 +-
sys/arch/x68k/stand/boot/boot.ldscript | 3 +-
sys/arch/x68k/stand/boot_ufs/Makefile | 31 +-
sys/arch/x68k/stand/boot_ufs/boot.S | 67 +-
sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript | 8 +-
sys/arch/x68k/stand/boot_ufs/version | 3 +-
sys/arch/x68k/stand/boot_ustar/Makefile | 32 +-
sys/arch/x68k/stand/boot_ustar/boot_ustar.S | 27 +-
sys/arch/x68k/stand/boot_ustar/boot_ustar.ldscript | 7 +-
sys/arch/x68k/stand/boot_ustar/version | 3 +-
sys/arch/x68k/stand/libiocs/iocscall.h | 3 +-
sys/arch/x68k/stand/xxboot/Makefile.xxboot | 42 +-
sys/arch/x68k/stand/xxboot/boot.S | 68 +-
sys/arch/x68k/stand/xxboot/version | 3 +-
sys/arch/x68k/stand/xxboot/xxboot.ldscript | 9 +-
sys/arch/x86/x86/cpu_topology.c | 7 +-
sys/arch/x86/x86/vm_machdep.c | 10 +-
sys/compat/common/compat_50_quota.c | 181 +
sys/compat/common/files.common | 3 +-
sys/compat/common/vfs_syscalls_50.c | 125 +-
sys/compat/netbsd32/netbsd32_lwp.c | 26 +-
sys/compat/netbsd32/netbsd32_syscall.h | 4 +-
sys/compat/netbsd32/netbsd32_syscallargs.h | 10 +-
sys/compat/netbsd32/netbsd32_syscalls.c | 12 +-
sys/compat/netbsd32/netbsd32_syscalls_autoload.c | 6 +-
sys/compat/netbsd32/netbsd32_sysent.c | 12 +-
sys/compat/netbsd32/netbsd32_systrace_args.c | 20 +-
sys/compat/netbsd32/syscalls.master | 8 +-
sys/conf/compat_netbsd80.config | 4 +-
sys/conf/compat_netbsd90.config | 6 +-
sys/conf/files | 32 +-
sys/conf/majors | 4 +-
sys/dev/Makefile | 4 +-
sys/dev/acpi/acpi_pci.c | 8 +-
sys/dev/acpi/xhci_acpi.c | 15 +-
sys/dev/ata/wd.c | 17 +-
sys/dev/audio/audiodef.h | 6 +-
sys/dev/dm/dm.h | 16 +-
sys/dev/dm/dm_target.c | 18 +-
sys/dev/dm/dm_target_delay.c | 8 +-
sys/dev/dm/dm_target_error.c | 8 +-
sys/dev/dm/dm_target_flakey.c | 8 +-
sys/dev/dm/dm_target_linear.c | 6 +-
sys/dev/dm/dm_target_mirror.c | 10 +-
sys/dev/dm/dm_target_snapshot.c | 16 +-
sys/dev/dm/dm_target_stripe.c | 8 +-
sys/dev/dm/dm_target_zero.c | 8 +-
sys/dev/eisa/files.eisa | 7 +-
sys/dev/eisa/if_fea.c | 529 -
sys/dev/fdt/dwcmmc_fdt.c | 7 +-
sys/dev/fdt/pwm_backlight.c | 21 +-
sys/dev/filemon/Makefile | 8 -
sys/dev/filemon/filemon.c | 445 -
sys/dev/filemon/filemon.h | 62 -
sys/dev/filemon/filemon_wrapper.c | 456 -
sys/dev/filemon/mknod-sh | 22 -
sys/dev/files.audio | 4 +-
sys/dev/hdaudio/hdafg.c | 10 +-
sys/dev/ic/Makefile | 5 +-
sys/dev/ic/ahcisata_core.c | 9 +-
sys/dev/ic/ahcisatavar.h | 3 +-
sys/dev/ic/dwc_mmc.c | 99 +-
sys/dev/ic/dwc_mmc_reg.h | 8 +-
sys/dev/ic/dwc_mmc_var.h | 5 +-
sys/dev/ic/pdq.c | 1835 ---
sys/dev/ic/pdq_ifsubr.c | 712 -
sys/dev/ic/pdqreg.h | 1089 -
sys/dev/ic/pdqvar.h | 519 -
sys/dev/ic/rrunner.c | 3648 ------
sys/dev/ic/rrunnerreg.h | 541 -
sys/dev/ic/rrunnervar.h | 265 -
sys/dev/ic/smc83c170.c | 76 +-
sys/dev/ic/tropic.c | 1744 --
sys/dev/ic/tropicreg.h | 555 -
sys/dev/ic/tropicvar.h | 117 -
sys/dev/isa/files.isa | 9 +-
sys/dev/isa/if_tr_isa.c | 266 -
sys/dev/isa/if_tribm_isa.c | 189 -
sys/dev/isa/if_trtcm_isa.c | 356 -
sys/dev/isapnp/files.isapnp | 6 +-
sys/dev/isapnp/if_tr_isapnp.c | 138 -
sys/dev/mca/files.mca | 6 +-
sys/dev/mca/if_tr_mca.c | 227 -
sys/dev/md.c | 6 +-
sys/dev/pci/ahcisata_pci.c | 16 +-
sys/dev/pci/files.pci | 23 +-
sys/dev/pci/if_aq.c | 10 +-
sys/dev/pci/if_de.c | 5882 ----------
sys/dev/pci/if_devar.h | 1115 -
sys/dev/pci/if_esh_pci.c | 192 -
sys/dev/pci/if_fpa.c | 493 -
sys/dev/pci/if_le_pci.c | 346 -
sys/dev/pci/if_levar.h | 53 -
sys/dev/pci/if_wm.c | 180 +-
sys/dev/pci/ixgbe/ix_txrx.c | 27 +-
sys/dev/pci/ixgbe/ixgbe.c | 18 +-
sys/dev/pci/ixgbe/ixgbe.h | 4 +-
sys/dev/pci/ixgbe/ixgbe_netbsd.c | 41 +-
sys/dev/pci/ixgbe/ixv.c | 14 +-
sys/dev/pci/pci_subr.c | 36 +-
sys/dev/pci/pciconf.c | 196 +-
sys/dev/pci/pcidevs | 13 +-
sys/dev/pci/pcidevs.h | 15 +-
sys/dev/pci/pcidevs_data.h | 2554 ++--
sys/dev/pci/pcireg.h | 60 +-
sys/dev/pcmcia/files.pcmcia | 6 +-
sys/dev/pcmcia/if_tr_pcmcia.c | 333 -
sys/dev/sun/kbd.c | 12 +-
sys/dev/tc/files.tc | 7 +-
sys/dev/tc/if_fta.c | 120 -
sys/dev/videomode/edid.c | 7 +-
sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_gk104.c | 18 +-
sys/external/bsd/drm2/dist/drm/radeon/radeon_gart.c | 6 +-
sys/external/bsd/drm2/dist/drm/radeon/radeon_vce.c | 40 +-
sys/external/bsd/drm2/dist/include/drm/drm_cache.h | 8 +-
sys/external/bsd/drm2/include/asm/io.h | 11 +-
sys/external/bsd/drm2/include/drm/bus_dma_hacks.h | 6 +-
sys/external/bsd/drm2/include/drm/drm_os_netbsd.h | 10 +-
sys/external/bsd/drm2/include/linux/acpi.h | 4 +-
sys/external/bsd/drm2/include/linux/mm.h | 3 +-
sys/external/bsd/drm2/include/linux/pci.h | 4 +-
sys/external/bsd/drm2/linux/linux_pci.c | 15 +-
sys/external/bsd/drm2/radeon/radeon_pci.c | 20 +-
sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c | 21 +-
sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c | 44 +-
sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.c | 323 +-
sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.h | 43 +-
sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kern_lib.c | 8 +-
sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_shim.c | 15 +-
sys/kern/init_sysctl.c | 11 +-
sys/kern/init_sysent.c | 6 +-
sys/kern/kern_exec.c | 10 +-
sys/kern/kern_exit.c | 5 +-
sys/kern/kern_idle.c | 28 +-
sys/kern/kern_lock.c | 20 +-
sys/kern/kern_lwp.c | 11 +-
sys/kern/kern_module.c | 8 +-
sys/kern/kern_mutex.c | 7 +-
sys/kern/kern_pax.c | 44 +-
sys/kern/kern_runq.c | 20 +-
sys/kern/kern_rwlock.c | 40 +-
sys/kern/kern_sig.c | 7 +-
sys/kern/kern_softint.c | 28 +-
sys/kern/kern_synch.c | 5 +-
sys/kern/kern_timeout.c | 26 +-
sys/kern/kern_turnstile.c | 12 +-
sys/kern/subr_asan.c | 18 +-
sys/kern/subr_kmem.c | 86 +-
sys/kern/subr_lockdebug.c | 80 +-
sys/kern/subr_msan.c | 8 +-
sys/kern/subr_pool.c | 8 +-
sys/kern/sys_lwp.c | 30 +-
sys/kern/syscalls.c | 6 +-
sys/kern/syscalls.master | 5 +-
sys/kern/syscalls_autoload.c | 8 +-
sys/kern/systrace_args.c | 2 +-
sys/kern/tty.c | 6 +-
sys/kern/vfs_vnode.c | 13 +-
sys/lib/libsa/dosfs.c | 16 +-
sys/lib/libsa/ext2fs.c | 4 +-
sys/modules/Makefile | 6 +-
sys/modules/compat_50/Makefile | 3 +-
sys/modules/filemon/Makefile | 20 -
sys/modules/filemon/filemon.ioconf | 7 -
sys/modules/if_strip/Makefile | 15 -
sys/modules/if_strip/strip.ioconf | 7 -
sys/net/Makefile | 8 +-
sys/net/bpf.c | 5 +-
sys/net/files.net | 11 +-
sys/net/if.c | 8 +-
sys/net/if_fddi.h | 95 -
sys/net/if_fddisubr.c | 654 -
sys/net/if_hippi.h | 80 -
sys/net/if_hippisubr.c | 294 -
sys/net/if_media.c | 17 +-
sys/net/if_strip.c | 2010 ---
sys/net/if_stripvar.h | 60 -
sys/net/if_token.h | 127 -
sys/net/if_tokensubr.c | 526 -
sys/netinet/if_arp.c | 101 +-
sys/netinet/ip_carp.c | 11 +-
sys/netinet/ip_encap.c | 11 +-
sys/netinet/sctp_pcb.c | 27 +-
sys/netinet/sctp_pcb.h | 12 +-
sys/netinet/sctputil.c | 49 +-
sys/netinet/sctputil.h | 4 +-
sys/netinet6/in6.c | 6 +-
sys/netinet6/in6_ifattach.c | 5 +-
sys/netinet6/nd6.c | 11 +-
sys/netinet6/nd6_nbr.c | 6 +-
sys/rump/include/rump/rump_syscalls.h | 4 +-
sys/rump/librump/rumpkern/rump_syscalls.c | 6 +-
sys/stand/efiboot/Makefile.efiboot | 4 +-
sys/stand/efiboot/boot.c | 12 +-
sys/stand/efiboot/bootaa64/Makefile | 4 +-
sys/stand/efiboot/bootarm/Makefile | 4 +-
sys/stand/efiboot/efiacpi.c | 42 +-
sys/stand/efiboot/exec.c | 9 +-
sys/stand/efiboot/prompt.c | 26 +-
sys/sys/exec.h | 4 +-
sys/sys/lwp.h | 11 +-
sys/sys/param.h | 4 +-
sys/sys/pax.h | 4 +-
sys/sys/rwlock.h | 11 +-
sys/sys/syscall.h | 4 +-
sys/sys/syscallargs.h | 4 +-
sys/sys/userret.h | 7 +-
sys/sys/vnode.h | 4 +-
sys/uvm/uvm_km.c | 9 +-
sys/uvm/uvm_page.c | 20 +-
sys/uvm/uvm_page.h | 18 +-
sys/uvm/uvm_pdpolicy_clock.c | 21 +-
387 files changed, 4171 insertions(+), 29622 deletions(-)
diffs (truncated from 45282 to 300 lines):
diff -r 5db64552ddc4 -r 7b8c35b5f63b sys/arch/aarch64/aarch64/aarch64_machdep.c
--- a/sys/arch/aarch64/aarch64/aarch64_machdep.c Sat Jan 25 21:45:00 2020 +0000
+++ b/sys/arch/aarch64/aarch64/aarch64_machdep.c Sat Jan 25 22:38:36 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: aarch64_machdep.c,v 1.37 2020/01/08 05:41:07 ryo Exp $ */
+/* $NetBSD: aarch64_machdep.c,v 1.37.2.1 2020/01/25 22:38:36 ad 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.37 2020/01/08 05:41:07 ryo Exp $");
+__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.37.2.1 2020/01/25 22:38:36 ad Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -99,7 +99,8 @@
/* filled in before cleaning bss. keep in .data */
u_long kern_vtopdiff __attribute__((__section__(".data")));
-long kernend_extra; /* extra physicalmemory allocated from round_page(_end[]) */
+/* extra physical memory allocated from round_page(_end[]) */
+long kernend_extra;
/* dump configuration */
int cpu_dump(void);
diff -r 5db64552ddc4 -r 7b8c35b5f63b sys/arch/aarch64/aarch64/cpu.c
--- a/sys/arch/aarch64/aarch64/cpu.c Sat Jan 25 21:45:00 2020 +0000
+++ b/sys/arch/aarch64/aarch64/cpu.c Sat Jan 25 22:38:36 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.31.2.1 2020/01/17 21:47:22 ad Exp $ */
+/* $NetBSD: cpu.c,v 1.31.2.2 2020/01/25 22:38:36 ad 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.31.2.1 2020/01/17 21:47:22 ad Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.31.2.2 2020/01/25 22:38:36 ad Exp $");
#include "locators.h"
#include "opt_arm_debug.h"
@@ -35,13 +35,13 @@
#include "opt_multiprocessor.h"
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/atomic.h>
+#include <sys/cpu.h>
#include <sys/device.h>
-#include <sys/cpu.h>
#include <sys/kmem.h>
#include <sys/reboot.h>
#include <sys/sysctl.h>
+#include <sys/systm.h>
#include <aarch64/armreg.h>
#include <aarch64/cpu.h>
@@ -161,7 +161,7 @@
cpu_identify1(dv, ci);
#if 0
/* already done in locore */
- aarch64_getcacheinfo(unit);
+ aarch64_getcacheinfo(unit);
#endif
aarch64_printcacheinfo(dv);
cpu_identify2(dv, ci);
@@ -229,7 +229,7 @@
const char *m;
identify_aarch64_model(ci->ci_id.ac_midr, model, sizeof(model));
- if (ci->ci_index == 0) {
+ if (ci->ci_index == 0) {
m = cpu_getmodel();
if (m == NULL || *m == 0)
cpu_setmodel("%s", model);
diff -r 5db64552ddc4 -r 7b8c35b5f63b sys/arch/aarch64/aarch64/locore.S
--- a/sys/arch/aarch64/aarch64/locore.S Sat Jan 25 21:45:00 2020 +0000
+++ b/sys/arch/aarch64/aarch64/locore.S Sat Jan 25 22:38:36 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.50.2.1 2020/01/17 21:47:22 ad Exp $ */
+/* $NetBSD: locore.S,v 1.50.2.2 2020/01/25 22:38:36 ad Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -38,7 +38,7 @@
#include <aarch64/hypervisor.h>
#include "assym.h"
-RCSID("$NetBSD: locore.S,v 1.50.2.1 2020/01/17 21:47:22 ad Exp $")
+RCSID("$NetBSD: locore.S,v 1.50.2.2 2020/01/25 22:38:36 ad Exp $")
#ifdef AARCH64_DEVICE_MEM_STRONGLY_ORDERED
#define MAIR_DEVICE_MEM MAIR_DEVICE_nGnRnE
@@ -80,12 +80,6 @@
#define PRINT(string) bl xprint; .asciz string; .align 2
-/* load far effective address (pc relative) */
-.macro ADDR, reg, addr
- adrp \reg, \addr
- add \reg, \reg, #:lo12:\addr
-.endm
-
.text
.align 3
ASENTRY_NP(aarch64_start)
@@ -94,7 +88,7 @@
mov x28, sp
/* set stack pointer for boot */
- ADDR x0, bootstk
+ adrl x0, bootstk
mov sp, x0
bl clear_bss
@@ -165,11 +159,11 @@
DPRINTREG("PC = ", x20)
/* set exception vector */
- ADDR x0, _C_LABEL(el1_vectors)
+ adrl x0, _C_LABEL(el1_vectors)
msr vbar_el1, x0
/* set lwp0 stack */
- ADDR x0, lwp0uspace
+ adrl x0, lwp0uspace
add x0, x0, #(UPAGES * PAGE_SIZE)
sub x0, x0, #TF_SIZE /* lwp0space + USPACE - TF_SIZE */
mov sp, x0 /* define lwp0 ksp bottom */
@@ -180,7 +174,7 @@
msr tpidrro_el0, xzr
/* set curcpu() */
- ADDR x0, cpu_info_store /* cpu_info_store is cpu_info[0] */
+ adrl x0, cpu_info_store /* cpu_info_store is cpu_info[0] */
msr tpidr_el1, x0 /* curcpu is cpu_info[0] */
DPRINTREG("curcpu = ", x0);
@@ -193,7 +187,7 @@
bl aarch64_getcacheinfo
#ifdef KASAN
- ADDR x0, lwp0uspace
+ adrl x0, lwp0uspace
bl _C_LABEL(kasan_early_init)
#endif
@@ -216,8 +210,8 @@
ASENTRY_NP(clear_bss)
/* Zero the BSS. The size must be aligned 16, usually it should be. */
- ADDR x14, __bss_start__
- ADDR x15, __bss_end__
+ adrl x14, __bss_start__
+ adrl x15, __bss_end__
b 2f
1: stp xzr, xzr, [x14], #16
2: cmp x14, x15
@@ -267,7 +261,7 @@
mov x3, xzr /* x3 = level */
levelloop:
/* lock_level[] and lock_turn[] are always accessed via PA(devmap) */
- ADDR x0, kern_vtopdiff
+ adrl x0, kern_vtopdiff
ldr x0, [x0]
ldr x4, =lock_level
sub x4, x4, x0
@@ -308,7 +302,7 @@
locore_lock_exit:
#ifdef DEBUG_LOCORE_PRINT_LOCK
/* lock_level[] and lock_turn[] are always accessed via PA(devmap) */
- ADDR x0, kern_vtopdiff
+ adrl x0, kern_vtopdiff
ldr x0, [x0]
ldr x1, =lock_level
sub x1, x1, x0
@@ -369,7 +363,7 @@
* resolve own cpuindex. my mpidr is stored in
* extern uint64_t cpu_mpidr[MAXCPUS]
*/
- ADDR x0, _C_LABEL(cpu_mpidr)
+ adrl x0, _C_LABEL(cpu_mpidr)
mov x1, xzr
1:
add x1, x1, #1
@@ -388,7 +382,7 @@
/* set stack pointer for boot */
mov x1, #BOOT_AP_STACKSIZE
mul x1, x1, x27
- ADDR x0, bootstk
+ adrl x0, bootstk
add sp, x0, x1 /* sp = bootstk + (BOOT_AP_STACKSIZE * cpuindex) */
bl 1f
@@ -434,7 +428,7 @@
CPU_DPRINTREG("PC = ", x20)
/* set exception vector */
- ADDR x0, _C_LABEL(el1_vectors)
+ adrl x0, _C_LABEL(el1_vectors)
msr vbar_el1, x0
/* lwp-private = NULL */
@@ -444,7 +438,7 @@
/* set curcpu(), and fill curcpu()->ci_{midr,mpidr} */
mov x0, #CPU_INFO_SIZE
mul x0, x27, x0
- ADDR x1, _C_LABEL(cpu_info_store)
+ adrl x1, _C_LABEL(cpu_info_store)
add x0, x0, x1 /* x0 = &cpu_info_store[cpuindex] */
msr tpidr_el1, x0 /* tpidr_el1 = curcpu() = x0 */
@@ -455,7 +449,7 @@
mov x0, #32
udiv x1, x27, x0
- ADDR x0, _C_LABEL(aarch64_cpu_hatched)
+ adrl x0, _C_LABEL(aarch64_cpu_hatched)
add x28, x0, x1, lsl #2 /* x28 = &aarch64_cpu_hatched[cpuindex/32] */
mov x0, #1
mov x2, #32
@@ -474,7 +468,7 @@
mov x0, #32
udiv x1, x27, x0
- ADDR x0, _C_LABEL(aarch64_cpu_mbox)
+ adrl x0, _C_LABEL(aarch64_cpu_mbox)
add x28, x0, x1, lsl #2 /* x28 = &aarch64_cpu_mbox[cpuindex/32] */
/* wait for the mailbox start bit to become true */
@@ -732,13 +726,13 @@
/* save ttbr[01]_el1 for AP */
mrs x0, ttbr0_el1
mrs x1, ttbr1_el1
- ADDR x2, ttbr_save
+ adrl x2, ttbr_save
stp x0, x1, [x2]
ret
load_ttbrs:
/* load ttbr[01]_el1 */
- ADDR x2, ttbr_save
+ adrl x2, ttbr_save
ldp x0, x1, [x2]
msr ttbr0_el1, x0
msr ttbr1_el1, x1
@@ -814,7 +808,7 @@
mov x4, #LX_BLKPAG_ATTR_NORMAL_NC|LX_BLKPAG_AP_RW /* attr */
mov x3, #L2_SIZE /* blocksize */
adr x0, start /* va = start */
- ADDR x2, _end
+ adrl x2, _end
sub x2, x2, x0 /* size = _end - start */
add x2, x2, #BOOTPAGE_ALLOC_MAX /* for bootpage_alloc() */
mov x1, x0 /* pa */
@@ -822,7 +816,7 @@
cbnz x0, init_mmutable_error
#ifdef FDT
- ADDR x8, _C_LABEL(fdt_addr_r)
+ adrl x8, _C_LABEL(fdt_addr_r)
ldr x8, [x8]
VPRINT("Creating VA=PA tables for FDT\n")
@@ -847,7 +841,7 @@
orr x4, x4, #LX_BLKPAG_UXN
mov x3, #L2_SIZE /* blocksize */
adr x1, start /* pa = start */
- ADDR x2, _end
+ adrl x2, _end
sub x2, x2, x1 /* size = _end - start */
ldr x0, =start /* va */
bl pmapboot_enter
@@ -865,7 +859,7 @@
/* return PA of allocated page */
ENTRY_NP(bootpage_alloc)
/* x2 = kernend_extra */
- ADDR x3, kernend_extra
+ adrl x3, kernend_extra
ldr x2, [x3]
/* if (kernend_extra < 0) return NULL */
mov x0, xzr
@@ -873,7 +867,7 @@
bmi bootpage_alloc_done
/* x0 = PA of _end[] */
- ADDR x1, kern_vtopdiff
+ adrl x1, kern_vtopdiff
ldr x1, [x1]
ldr x0, =ARM_BOOTSTRAP_LxPT
sub x0, x0, x1
diff -r 5db64552ddc4 -r 7b8c35b5f63b sys/arch/aarch64/aarch64/start.S
--- a/sys/arch/aarch64/aarch64/start.S Sat Jan 25 21:45:00 2020 +0000
+++ b/sys/arch/aarch64/aarch64/start.S Sat Jan 25 22:38:36 2020 +0000
@@ -1,4 +1,4 @@