details: https://anonhg.NetBSD.org/src/rev/8ba6e0cce5e1
branches: ad-namecache
changeset: 982984:8ba6e0cce5e1
user: ad <ad%NetBSD.org@localhost>
date: Fri Jan 17 21:47:22 2020 +0000
description:
Sync with head.
diffstat:
sys/arch/aarch64/aarch64/bus_space_asm_generic.S | 12 +-
sys/arch/aarch64/aarch64/cpu.c | 21 +-
sys/arch/aarch64/aarch64/cpufunc.c | 23 +-
sys/arch/aarch64/aarch64/cpuswitch.S | 11 +-
sys/arch/aarch64/aarch64/fault.c | 6 +-
sys/arch/aarch64/aarch64/genassym.cf | 3 +-
sys/arch/aarch64/aarch64/locore.S | 7 +-
sys/arch/aarch64/aarch64/pmap.c | 12 +-
sys/arch/aarch64/conf/files.aarch64 | 3 +-
sys/arch/aarch64/include/cpu.h | 6 +-
sys/arch/aarch64/include/cpufunc.h | 3 +-
sys/arch/alpha/alpha/locore.s | 7 +-
sys/arch/amd64/amd64/genassym.cf | 3 +-
sys/arch/amd64/amd64/locore.S | 767 +---
sys/arch/amd64/amd64/machdep.c | 16 +-
sys/arch/amd64/amd64/spl.S | 3 +-
sys/arch/amd64/conf/ALL | 6 +-
sys/arch/amd64/conf/GENERIC | 6 +-
sys/arch/amd64/conf/files.amd64 | 6 +-
sys/arch/amd64/conf/kern.ldscript | 14 +-
sys/arch/amd64/include/param.h | 13 +-
sys/arch/amd64/include/proc.h | 4 +-
sys/arch/amd64/include/ptrace.h | 18 +-
sys/arch/arm/acpi/acpi_pci_graviton.c | 144 +
sys/arch/arm/acpi/acpi_pci_machdep.c | 85 +-
sys/arch/arm/acpi/acpi_pci_machdep.h | 17 +-
sys/arch/arm/acpi/acpi_pci_n1sdp.c | 193 +
sys/arch/arm/acpi/acpipchb.c | 150 +-
sys/arch/arm/acpi/files.acpi | 4 +-
sys/arch/arm/acpi/gicv3_acpi.c | 13 +-
sys/arch/arm/arm/arm_cpu_topology.c | 105 +
sys/arch/arm/arm32/arm32_boot.c | 18 +-
sys/arch/arm/arm32/cpu.c | 26 +-
sys/arch/arm/arm32/cpuswitch.S | 29 +-
sys/arch/arm/arm32/genassym.cf | 3 +-
sys/arch/arm/arm32/pmap.c | 40 +-
sys/arch/arm/conf/files.arm | 3 +-
sys/arch/arm/cortex/gicv3_its.c | 5 +-
sys/arch/arm/fdt/acpi_fdt.c | 12 +-
sys/arch/arm/fdt/cpu_fdt.c | 15 +-
sys/arch/arm/imx/fdt/files.imx6 | 26 +-
sys/arch/arm/imx/fdt/if_enet_imx.c | 92 +-
sys/arch/arm/imx/fdt/imx6_com.c | 23 +-
sys/arch/arm/imx/fdt/imx6_gpio.c | 10 +-
sys/arch/arm/imx/fdt/imx6_i2c.c | 6 +-
sys/arch/arm/imx/fdt/imx6_iomux.c | 22 +-
sys/arch/arm/imx/fdt/imx6_sdhc.c | 70 +-
sys/arch/arm/imx/fdt/imx7_gpc.c | 264 +
sys/arch/arm/imx/fdt/imx8mq_ccm.c | 207 +
sys/arch/arm/imx/fdt/imx8mq_ccm.h | 321 +
sys/arch/arm/imx/fdt/imx8mq_usbphy.c | 184 +
sys/arch/arm/imx/fdt/imx_ccm.c | 306 +
sys/arch/arm/imx/fdt/imx_ccm.h | 234 +
sys/arch/arm/imx/fdt/imx_ccm_composite.c | 201 +
sys/arch/arm/imx/fdt/imx_ccm_extclk.c | 99 +
sys/arch/arm/imx/fdt/imx_ccm_fixed.c | 48 +
sys/arch/arm/imx/fdt/imx_ccm_fixed_factor.c | 103 +
sys/arch/arm/imx/fdt/imx_ccm_gate.c | 67 +
sys/arch/arm/imx/if_enet.c | 6 +-
sys/arch/arm/imx/if_enet_imx6.c | 5 +-
sys/arch/arm/imx/if_enet_imx7.c | 5 +-
sys/arch/arm/imx/if_enetvar.h | 3 +-
sys/arch/arm/imx/imx6_board.c | 6 +-
sys/arch/arm/imx/imx6_pcie.c | 8 +-
sys/arch/arm/imx/imx6_usdhc.c | 6 +-
sys/arch/arm/imx/imx7_usdhc.c | 8 +-
sys/arch/arm/imx/imxgpio.c | 29 +-
sys/arch/arm/imx/imxgpiovar.h | 12 +-
sys/arch/arm/imx/imxuart.c | 52 +-
sys/arch/arm/include/arm32/pmap.h | 12 +-
sys/arch/arm/include/arm32/vmparam.h | 2 +-
sys/arch/arm/include/cpu.h | 4 +-
sys/arch/arm/include/cpu_topology.h | 59 +
sys/arch/arm/include/types.h | 14 +-
sys/arch/arm/sunxi/sun8i_crypto.c | 10 +-
sys/arch/arm/sunxi/sunxi_twi.c | 56 +-
sys/arch/emips/emips/locore_machdep.S | 229 +-
sys/arch/emips/emips/machdep.c | 12 +-
sys/arch/evbarm/conf/GENERIC64 | 24 +-
sys/arch/evbarm/conf/POGO | 22 +-
sys/arch/evbarm/conf/files.generic64 | 3 +-
sys/arch/evbarm/netwalker/netwalker_lcd.c | 20 +-
sys/arch/evbarm/netwalker/netwalker_spi.c | 44 +-
sys/arch/evbarm/netwalker/netwalker_usb.c | 22 +-
sys/arch/hppa/hppa/genassym.cf | 3 +-
sys/arch/hppa/hppa/locore.S | 6 +-
sys/arch/i386/conf/ALL | 6 +-
sys/arch/i386/i386/genassym.cf | 3 +-
sys/arch/i386/i386/locore.S | 8 +-
sys/arch/i386/i386/spl.S | 5 +-
sys/arch/i386/include/proc.h | 4 +-
sys/arch/i386/include/ptrace.h | 15 +-
sys/arch/ia64/stand/ia64/ski/ssc.c | 4 +-
sys/arch/m68k/m68k/switch_subr.s | 11 +-
sys/arch/macppc/conf/GENERIC | 6 +-
sys/arch/macppc/conf/INSTALL | 3 +-
sys/arch/macppc/conf/files.macppc | 7 +-
sys/arch/macppc/dev/ki2c.c | 92 +-
sys/arch/macppc/dev/lmu.c | 199 +
sys/arch/macppc/macppc/cpu.c | 6 +-
sys/arch/mips/mips/cpu_subr.c | 6 +-
sys/arch/mips/mips/genassym.cf | 3 +-
sys/arch/mips/mips/locore.S | 11 +-
sys/arch/mips/mips/mips_softint.c | 5 +-
sys/arch/powerpc/powerpc/genassym.cf | 3 +-
sys/arch/powerpc/powerpc/locore_subr.S | 13 +-
sys/arch/powerpc/powerpc/softint_machdep.c | 3 +-
sys/arch/riscv/riscv/genassym.cf | 3 +-
sys/arch/riscv/riscv/locore.S | 7 +-
sys/arch/sh3/sh3/locore_subr.S | 9 +-
sys/arch/sparc/sparc/locore.s | 74 +-
sys/arch/sparc64/sparc64/genassym.cf | 3 +-
sys/arch/sparc64/sparc64/locore.s | 7 +-
sys/arch/vax/vax/genassym.cf | 3 +-
sys/arch/vax/vax/pmap.c | 6 +-
sys/arch/vax/vax/subr.S | 3 +-
sys/arch/x68k/stand/boot/boot.c | 5 +-
sys/arch/x68k/stand/boot_ufs/Makefile | 14 +-
sys/arch/x68k/stand/boot_ufs/boot.S | 10 +-
sys/arch/x68k/stand/boot_ufs/boot_ufs.h | 4 +-
sys/arch/x68k/stand/boot_ufs/version | 2 +-
sys/arch/x68k/stand/boot_ustar/Makefile | 18 +-
sys/arch/x68k/stand/boot_ustar/boot_ustar.S | 8 +-
sys/arch/x68k/stand/boot_ustar/version | 2 +-
sys/arch/x68k/stand/xxboot/Makefile.xxboot | 46 +-
sys/arch/x68k/stand/xxboot/boot.S | 6 +-
sys/arch/x86/include/cpu.h | 4 +-
sys/arch/x86/include/pmap.h | 7 +-
sys/arch/x86/include/pmap_pv.h | 5 +-
sys/arch/x86/x86/cpu.c | 20 +-
sys/arch/x86/x86/cpu_topology.c | 10 +-
sys/arch/x86/x86/mpacpi.c | 10 +-
sys/arch/x86/x86/pmap.c | 276 +-
sys/arch/x86/x86/procfs_machdep.c | 6 +-
sys/arch/x86/x86/vm_machdep.c | 13 +-
sys/arch/x86/x86/x86_tlb.c | 131 +-
sys/arch/xen/x86/cpu.c | 10 +-
sys/arch/xen/xen/xbdback_xenbus.c | 7 +-
sys/arch/zaurus/conf/Makefile.zaurus.inc | 3 +-
sys/coda/coda_vfsops.c | 14 +-
sys/coda/coda_vfsops.h | 8 +-
sys/coda/coda_vnops.c | 6 +-
sys/compat/common/vfs_syscalls_20.c | 7 +-
sys/compat/common/vfs_syscalls_30.c | 7 +-
sys/compat/linux/arch/amd64/linux_exec_machdep.c | 6 +-
sys/compat/linux/common/linux_exec_elf32.c | 43 +-
sys/compat/netbsd32/netbsd32_compat_30.c | 6 +-
sys/conf/files | 4 +-
sys/ddb/db_proc.c | 10 +-
sys/dev/DEVNAMES | 3 +-
sys/dev/acpi/acpi.c | 25 +-
sys/dev/acpi/acpi_pci.c | 39 +-
sys/dev/acpi/acpi_pci.h | 7 +-
sys/dev/acpi/acpi_pci_link.c | 150 +-
sys/dev/acpi/acpica/OsdHardware.c | 15 +-
sys/dev/acpi/acpivar.h | 11 +-
sys/dev/ata/ld_ataraid.c | 6 +-
sys/dev/ata/wd.c | 26 +-
sys/dev/audio/alaw.c | 6 +-
sys/dev/audio/audio.c | 133 +-
sys/dev/audio/audiovar.h | 22 +-
sys/dev/audio/linear.c | 11 +-
sys/dev/audio/mulaw.c | 11 +-
sys/dev/cgd.c | 6 +-
sys/dev/dm/device-mapper.c | 7 +-
sys/dev/fdt/dwc3_fdt.c | 15 +-
sys/dev/fdt/fdtbus.c | 14 +-
sys/dev/hid/hidkbdmap.c | 5 +-
sys/dev/i2c/at24cxx.c | 8 +-
sys/dev/i2c/files.i2c | 3 +-
sys/dev/i2c/gttwsi_core.c | 98 +-
sys/dev/i2c/gttwsireg.h | 50 +-
sys/dev/i2c/gttwsivar.h | 13 +-
sys/dev/i2c/ihidev.c | 171 +-
sys/dev/i2c/ihidev.h | 4 +-
sys/dev/i2c/tsl256x.c | 7 +-
sys/dev/marvell/gttwsi.c | 16 +-
sys/dev/mii/ipgphy.c | 36 +-
sys/dev/nvmm/x86/nvmm_x86_vmx.c | 8 +-
sys/dev/pci/files.pci | 7 +-
sys/dev/pci/if_aq.c | 249 +-
sys/dev/pci/if_ixl.c | 1061 ++++-
sys/dev/pci/if_ixlvar.h | 52 +-
sys/dev/pci/if_rge.c | 2048 ++++++++++
sys/dev/pci/if_rgereg.h | 1865 +++++++++
sys/dev/pci/if_stge.c | 321 +-
sys/dev/pci/if_stgereg.h | 127 +-
sys/dev/pci/pci_subr.c | 77 +-
sys/dev/pci/piixpm.c | 156 +-
sys/dev/pci/piixpmreg.h | 8 +-
sys/dev/pckbport/wskbdmap_mfii.c | 5 +-
sys/dev/usb/TODO.usbmp | 7 +-
sys/dev/usb/files.usb | 7 +-
sys/dev/usb/if_axen.c | 6 +-
sys/dev/usb/if_otus.c | 52 +-
sys/dev/usb/if_otusvar.h | 4 +-
sys/dev/usb/if_upgt.c | 19 +-
sys/dev/usb/if_upgtvar.h | 3 +-
sys/dev/usb/if_urtwn.c | 14 +-
sys/dev/usb/if_urtwnvar.h | 3 +-
sys/dev/usb/if_zyd.c | 34 +-
sys/dev/usb/if_zydreg.h | 5 +-
sys/dev/usb/ukbd.c | 20 +-
sys/dev/usb/uyurex.c | 386 -
sys/dev/vnd.c | 6 +-
sys/external/bsd/drm2/dist/drm/drm_gem.c | 12 +-
sys/external/bsd/drm2/dist/drm/i915/i915_gem.c | 8 +-
sys/external/bsd/drm2/dist/drm/i915/i915_gem_fence.c | 8 +-
sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c | 10 +-
sys/external/bsd/drm2/include/asm/io.h | 17 +-
sys/external/bsd/drm2/include/linux/mm.h | 12 +-
sys/fs/adosfs/adlookup.c | 11 +-
sys/fs/adosfs/advfsops.c | 20 +-
sys/fs/adosfs/advnops.c | 7 +-
sys/fs/autofs/autofs_vfsops.c | 6 +-
sys/fs/autofs/autofs_vnops.c | 6 +-
sys/fs/cd9660/cd9660_vfsops.c | 16 +-
sys/fs/efs/efs_vfsops.c | 16 +-
sys/fs/filecorefs/filecore_vfsops.c | 17 +-
sys/fs/hfs/hfs_vfsops.c | 14 +-
sys/fs/msdosfs/msdosfs_vfsops.c | 17 +-
sys/fs/nilfs/nilfs_vfsops.c | 12 +-
sys/fs/ntfs/ntfs_subr.c | 6 +-
sys/fs/ntfs/ntfs_vfsops.c | 27 +-
sys/fs/ptyfs/ptyfs.h | 4 +-
sys/fs/ptyfs/ptyfs_vfsops.c | 10 +-
sys/fs/puffs/puffs_vfsops.c | 13 +-
sys/fs/smbfs/smbfs_vfsops.c | 10 +-
sys/fs/sysvbfs/sysvbfs_vfsops.c | 15 +-
sys/fs/sysvbfs/sysvbfs_vnops.c | 11 +-
sys/fs/tmpfs/tmpfs_vfsops.c | 15 +-
sys/fs/udf/udf_rename.c | 9 +-
sys/fs/udf/udf_subr.c | 23 +-
sys/fs/udf/udf_subr.h | 4 +-
sys/fs/udf/udf_vfsops.c | 12 +-
sys/fs/udf/udf_vnops.c | 9 +-
sys/fs/union/union_vfsops.c | 10 +-
sys/fs/union/union_vnops.c | 6 +-
sys/fs/unionfs/unionfs_vfsops.c | 8 +-
sys/fs/v7fs/v7fs_vfsops.c | 14 +-
sys/fs/v7fs/v7fs_vnops.c | 19 +-
sys/kern/core_elf32.c | 10 +-
sys/kern/exec_elf.c | 78 +-
sys/kern/exec_subr.c | 14 +-
sys/kern/init_main.c | 6 +-
sys/kern/kern_exec.c | 91 +-
sys/kern/kern_exit.c | 30 +-
sys/kern/kern_idle.c | 6 +-
sys/kern/kern_kthread.c | 9 +-
sys/kern/kern_lock.c | 34 +-
sys/kern/kern_lwp.c | 84 +-
sys/kern/kern_resource.c | 6 +-
sys/kern/kern_runq.c | 612 +-
sys/kern/kern_rwlock.c | 17 +-
sys/kern/kern_sleepq.c | 7 +-
sys/kern/kern_softint.c | 20 +-
sys/kern/kern_synch.c | 207 +-
sys/kern/sched_4bsd.c | 13 +-
sys/kern/subr_cpu.c | 191 +-
sys/kern/subr_lockdebug.c | 19 +-
sys/kern/vfs_bio.c | 6 +-
sys/kern/vfs_getcwd.c | 9 +-
sys/kern/vfs_lookup.c | 6 +-
sys/kern/vfs_mount.c | 8 +-
sys/kern/vfs_subr.c | 12 +-
sys/kern/vfs_syscalls.c | 10 +-
sys/kern/vfs_vnode.c | 97 +-
sys/kern/vfs_vnops.c | 12 +-
sys/miscfs/fdesc/fdesc.h | 4 +-
sys/miscfs/fdesc/fdesc_vfsops.c | 10 +-
sys/miscfs/genfs/genfs_io.c | 282 +-
sys/miscfs/genfs/genfs_node.h | 3 +-
sys/miscfs/genfs/layer_extern.h | 8 +-
sys/miscfs/genfs/layer_vfsops.c | 21 +-
sys/miscfs/kernfs/kernfs.h | 4 +-
sys/miscfs/kernfs/kernfs_vfsops.c | 10 +-
sys/miscfs/procfs/procfs.h | 4 +-
sys/miscfs/procfs/procfs_vfsops.c | 10 +-
sys/net/if_ethersubr.c | 8 +-
sys/netinet/ip_carp.c | 53 +-
sys/netinet/ip_carp.h | 5 +-
sys/nfs/nfs_bio.c | 7 +-
sys/nfs/nfs_export.c | 6 +-
sys/nfs/nfs_serv.c | 10 +-
sys/nfs/nfs_srvsubs.c | 6 +-
sys/nfs/nfs_vfsops.c | 13 +-
sys/opencrypto/cryptodev.c | 5 +-
sys/opencrypto/ocryptodev.c | 5 +-
sys/rump/include/rump/rump_namei.h | 2 +-
sys/rump/librump/rumpkern/Makefile.rumpkern | 4 +-
sys/rump/librump/rumpkern/lwproc.c | 12 +-
sys/rump/librump/rumpkern/scheduler.c | 6 +-
sys/rump/librump/rumpkern/vm.c | 6 +-
sys/rump/librump/rumpvfs/rump_vfs.c | 8 +-
sys/rump/librump/rumpvfs/rumpfs.c | 10 +-
sys/rump/librump/rumpvfs/vm_vfs.c | 12 +-
sys/sys/cpu.h | 4 +-
sys/sys/cpu_data.h | 44 +-
sys/sys/exec.h | 6 +-
sys/sys/lwp.h | 39 +-
sys/sys/mount.h | 20 +-
sys/sys/namei.h | 2 +-
sys/sys/param.h | 17 +-
sys/sys/sched.h | 15 +-
sys/sys/types.h | 4 +-
sys/ufs/chfs/chfs_vfsops.c | 20 +-
sys/ufs/chfs/chfs_vnode.c | 4 +-
sys/ufs/chfs/chfs_vnops.c | 10 +-
sys/ufs/ext2fs/ext2fs_vfsops.c | 8 +-
sys/ufs/ffs/ffs_quota2.c | 10 +-
sys/ufs/ffs/ffs_snapshot.c | 10 +-
sys/ufs/ffs/ffs_vfsops.c | 8 +-
sys/ufs/ffs/ffs_wapbl.c | 11 +-
sys/ufs/lfs/lfs_alloc.c | 7 +-
sys/ufs/lfs/lfs_pages.c | 15 +-
sys/ufs/lfs/lfs_rfw.c | 6 +-
sys/ufs/lfs/lfs_segment.c | 7 +-
sys/ufs/lfs/lfs_vfsops.c | 17 +-
sys/ufs/lfs/ulfs_extattr.c | 6 +-
sys/ufs/lfs/ulfs_extern.h | 6 +-
sys/ufs/lfs/ulfs_inode.c | 20 +-
sys/ufs/lfs/ulfs_quota2.c | 10 +-
sys/ufs/lfs/ulfs_vfsops.c | 13 +-
sys/ufs/ufs/ufs_extattr.c | 6 +-
sys/ufs/ufs/ufs_extern.h | 8 +-
sys/ufs/ufs/ufs_inode.c | 8 +-
sys/ufs/ufs/ufs_vfsops.c | 16 +-
sys/uvm/files.uvm | 3 +-
sys/uvm/uvm_anon.c | 6 +-
sys/uvm/uvm_aobj.c | 28 +-
sys/uvm/uvm_bio.c | 35 +-
sys/uvm/uvm_extern.h | 12 +-
sys/uvm/uvm_fault.c | 67 +-
sys/uvm/uvm_glue.c | 7 +-
sys/uvm/uvm_loan.c | 35 +-
sys/uvm/uvm_map.c | 51 +-
sys/uvm/uvm_map.h | 4 +-
sys/uvm/uvm_meter.c | 10 +-
sys/uvm/uvm_object.c | 7 +-
sys/uvm/uvm_object.h | 9 +-
sys/uvm/uvm_page.c | 179 +-
sys/uvm/uvm_page.h | 121 +-
sys/uvm/uvm_page_array.c | 9 +-
sys/uvm/uvm_page_status.c | 194 +
sys/uvm/uvm_pager.c | 18 +-
sys/uvm/uvm_pdaemon.c | 18 +-
sys/uvm/uvm_vnode.c | 111 +-
347 files changed, 12579 insertions(+), 4825 deletions(-)
diffs (truncated from 30323 to 300 lines):
diff -r 50ffcf3cc48e -r 8ba6e0cce5e1 sys/arch/aarch64/aarch64/bus_space_asm_generic.S
--- a/sys/arch/aarch64/aarch64/bus_space_asm_generic.S Thu Jan 16 16:45:30 2020 +0000
+++ b/sys/arch/aarch64/aarch64/bus_space_asm_generic.S Fri Jan 17 21:47:22 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space_asm_generic.S,v 1.1 2018/04/01 04:35:03 ryo Exp $ */
+/* $NetBSD: bus_space_asm_generic.S,v 1.1.10.1 2020/01/17 21:47:22 ad 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.1 2018/04/01 04:35:03 ryo Exp $")
+RCSID("$NetBSD: bus_space_asm_generic.S,v 1.1.10.1 2020/01/17 21:47:22 ad Exp $")
.macro generate_bsfunc funcname, dsbop
/* uint8_t {funcname}_bs_r_1(x0:tag, x1:addr, x2:offset) */
@@ -334,7 +334,7 @@
ldr w8, [x1, x2] /* value = *src */
subs x4, x4, #1 /* count-- */
add x2, x2, x9 /* src += delta */
- str w8, [x3], #2 /* *dst++ = value */
+ str w8, [x3], #4 /* *dst++ = value */
b.ne 1b
ret
#ifdef DIAGNOSTIC
@@ -363,7 +363,7 @@
ldr x8, [x1, x2] /* value = *src */
subs x4, x4, #1 /* count-- */
add x2, x2, x9 /* src += delta */
- str x8, [x3], #2 /* *dst++ = value */
+ str x8, [x3], #8 /* *dst++ = value */
b.ne 1b
ret
#ifdef DIAGNOSTIC
@@ -423,7 +423,7 @@
subs x4, x4, #1 /* count-- */
add x2, x2, x9 /* src += delta */
rev w8, w8
- str w8, [x3], #2 /* *dst++ = value */
+ str w8, [x3], #4 /* *dst++ = value */
b.ne 1b
ret
#ifdef DIAGNOSTIC
@@ -453,7 +453,7 @@
subs x4, x4, #1 /* count-- */
add x2, x2, x9 /* src += delta */
rev x8, x8
- str x8, [x3], #2 /* *dst++ = value */
+ str x8, [x3], #8 /* *dst++ = value */
b.ne 1b
ret
#ifdef DIAGNOSTIC
diff -r 50ffcf3cc48e -r 8ba6e0cce5e1 sys/arch/aarch64/aarch64/cpu.c
--- a/sys/arch/aarch64/aarch64/cpu.c Thu Jan 16 16:45:30 2020 +0000
+++ b/sys/arch/aarch64/aarch64/cpu.c Fri Jan 17 21:47:22 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.31 2019/12/28 19:18:31 jmcneill Exp $ */
+/* $NetBSD: cpu.c,v 1.31.2.1 2020/01/17 21:47:22 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 2019/12/28 19:18:31 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.31.2.1 2020/01/17 21:47:22 ad Exp $");
#include "locators.h"
#include "opt_arm_debug.h"
@@ -48,6 +48,7 @@
#include <aarch64/cpufunc.h>
#include <aarch64/machdep.h>
+#include <arm/cpu_topology.h>
#ifdef FDT
#include <arm/fdt/arm_fdtvar.h>
#endif
@@ -144,9 +145,9 @@
ci->ci_dev = dv;
dv->dv_private = ci;
- aarch64_gettopology(ci, ci->ci_id.ac_mpidr);
+ arm_cpu_do_topology(ci);
+ cpu_identify(ci->ci_dev, ci);
- cpu_identify(ci->ci_dev, ci);
#ifdef MULTIPROCESSOR
if (unit != 0) {
mi_cpu_attach(ci);
@@ -225,10 +226,14 @@
cpu_identify(device_t self, struct cpu_info *ci)
{
char model[128];
+ const char *m;
identify_aarch64_model(ci->ci_id.ac_midr, model, sizeof(model));
- if (ci->ci_index == 0)
- cpu_setmodel("%s", model);
+ if (ci->ci_index == 0) {
+ m = cpu_getmodel();
+ if (m == NULL || *m == 0)
+ cpu_setmodel("%s", model);
+ }
aprint_naive("\n");
aprint_normal(": %s\n", model);
@@ -304,8 +309,8 @@
dfr0 = reg_id_aa64dfr0_el1_read();
- aprint_debug_dev(self, "midr=0x%" PRIx32 "\n",
- (uint32_t)ci->ci_id.ac_midr);
+ aprint_debug_dev(self, "midr=0x%" PRIx32 " mpidr=0x%" PRIx32 "\n",
+ (uint32_t)ci->ci_id.ac_midr, (uint32_t)ci->ci_id.ac_mpidr);
aprint_normal_dev(self, "revID=0x%" PRIx64, id->ac_revidr);
/* ID_AA64DFR0_EL1 */
diff -r 50ffcf3cc48e -r 8ba6e0cce5e1 sys/arch/aarch64/aarch64/cpufunc.c
--- a/sys/arch/aarch64/aarch64/cpufunc.c Thu Jan 16 16:45:30 2020 +0000
+++ b/sys/arch/aarch64/aarch64/cpufunc.c Fri Jan 17 21:47:22 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.12 2019/12/20 21:05:33 ad Exp $ */
+/* $NetBSD: cpufunc.c,v 1.12.2.1 2020/01/17 21:47:22 ad Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -29,7 +29,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.12 2019/12/20 21:05:33 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.12.2.1 2020/01/17 21:47:22 ad Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -89,25 +89,6 @@
}
void
-aarch64_gettopology(struct cpu_info * const ci, uint64_t mpidr)
-{
-
- if (mpidr & MPIDR_MT) {
- cpu_topology_set(ci,
- __SHIFTOUT(mpidr, MPIDR_AFF2),
- __SHIFTOUT(mpidr, MPIDR_AFF1),
- __SHIFTOUT(mpidr, MPIDR_AFF0),
- 0);
- } else {
- cpu_topology_set(ci,
- __SHIFTOUT(mpidr, MPIDR_AFF1),
- __SHIFTOUT(mpidr, MPIDR_AFF0),
- 0,
- 0);
- }
-}
-
-void
aarch64_getcacheinfo(int unit)
{
struct cpu_info * const ci = curcpu();
diff -r 50ffcf3cc48e -r 8ba6e0cce5e1 sys/arch/aarch64/aarch64/cpuswitch.S
--- a/sys/arch/aarch64/aarch64/cpuswitch.S Thu Jan 16 16:45:30 2020 +0000
+++ b/sys/arch/aarch64/aarch64/cpuswitch.S Fri Jan 17 21:47:22 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuswitch.S,v 1.13 2019/12/20 07:16:43 ryo Exp $ */
+/* $NetBSD: cpuswitch.S,v 1.13.2.1 2020/01/17 21:47:22 ad Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -37,18 +37,16 @@
#include "opt_ddb.h"
#include "opt_kasan.h"
-RCSID("$NetBSD: cpuswitch.S,v 1.13 2019/12/20 07:16:43 ryo Exp $")
+RCSID("$NetBSD: cpuswitch.S,v 1.13.2.1 2020/01/17 21:47:22 ad Exp $")
/*
* At IPL_SCHED:
- * x0 = oldlwp (maybe be NULL)
+ * x0 = oldlwp
* x1 = newlwp
* x2 = returning
* returns x0-x2 unchanged
*/
ENTRY_NP(cpu_switchto)
- cbz x0, .Lrestore_lwp
-
/*
* Store the callee saved register on the stack.
*/
@@ -72,7 +70,6 @@
/* We are done with the old lwp */
-.Lrestore_lwp:
DISABLE_INTERRUPT
ldr x6, [x1, #L_PCB] /* x6 = lwp_getpcb(newlwp) */
ldr x4, [x6, #PCB_TF] /* get trapframe ptr (aka SP) */
@@ -178,7 +175,6 @@
* cpu_switchto() bottom half arranges to start this when softlwp.
* kernel thread is to yield CPU for the pinned_lwp in the above.
* curcpu()->ci_mtx_count += 1;
- * softlwp->l_ctxswtch = 0;
* this returns as if cpu_switchto_softint finished normally.
* }
*/
@@ -189,7 +185,6 @@
ldr w2, [x3, #CI_MTX_COUNT] /* ->ci_mtx_count */
add w2, w2, #1
str w2, [x3, #CI_MTX_COUNT]
- str wzr, [x0, #L_CTXSWTCH] /* softlwp->l_ctxswtch = 0 */
msr daif, x19 /* restore interrupt mask */
ldp x19, x20, [sp], #16 /* restore */
diff -r 50ffcf3cc48e -r 8ba6e0cce5e1 sys/arch/aarch64/aarch64/fault.c
--- a/sys/arch/aarch64/aarch64/fault.c Thu Jan 16 16:45:30 2020 +0000
+++ b/sys/arch/aarch64/aarch64/fault.c Fri Jan 17 21:47:22 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fault.c,v 1.10 2019/06/10 05:56:15 ryo Exp $ */
+/* $NetBSD: fault.c,v 1.10.4.1 2020/01/17 21:47:22 ad Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.10 2019/06/10 05:56:15 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.10.4.1 2020/01/17 21:47:22 ad Exp $");
#include "opt_compat_netbsd32.h"
#include "opt_ddb.h"
@@ -170,7 +170,7 @@
}
if ((eclass == ESR_EC_INSN_ABT_EL0) || (eclass == ESR_EC_INSN_ABT_EL1))
- ftype = VM_PROT_READ | VM_PROT_EXECUTE;
+ ftype = VM_PROT_EXECUTE;
else if (__SHIFTOUT(esr, ESR_ISS_DATAABORT_CM))
ftype = VM_PROT_READ;
else
diff -r 50ffcf3cc48e -r 8ba6e0cce5e1 sys/arch/aarch64/aarch64/genassym.cf
--- a/sys/arch/aarch64/aarch64/genassym.cf Thu Jan 16 16:45:30 2020 +0000
+++ b/sys/arch/aarch64/aarch64/genassym.cf Fri Jan 17 21:47:22 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.17 2019/12/28 17:19:43 jmcneill Exp $
+# $NetBSD: genassym.cf,v 1.17.2.1 2020/01/17 21:47:22 ad Exp $
#-
# Copyright (c) 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -148,7 +148,6 @@
define L_WCHAN offsetof(struct lwp, l_wchan)
define L_STAT offsetof(struct lwp, l_stat)
define L_PROC offsetof(struct lwp, l_proc)
-define L_CTXSWTCH offsetof(struct lwp, l_ctxswtch)
define L_PRIVATE offsetof(struct lwp, l_private)
define L_MD_FLAGS offsetof(struct lwp, l_md.md_flags)
define L_MD_UTF offsetof(struct lwp, l_md.md_utf)
diff -r 50ffcf3cc48e -r 8ba6e0cce5e1 sys/arch/aarch64/aarch64/locore.S
--- a/sys/arch/aarch64/aarch64/locore.S Thu Jan 16 16:45:30 2020 +0000
+++ b/sys/arch/aarch64/aarch64/locore.S Fri Jan 17 21:47:22 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.50 2020/01/08 05:41:07 ryo Exp $ */
+/* $NetBSD: locore.S,v 1.50.2.1 2020/01/17 21:47:22 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 2020/01/08 05:41:07 ryo Exp $")
+RCSID("$NetBSD: locore.S,v 1.50.2.1 2020/01/17 21:47:22 ad Exp $")
#ifdef AARCH64_DEVICE_MEM_STRONGLY_ORDERED
#define MAIR_DEVICE_MEM MAIR_DEVICE_nGnRnE
@@ -187,7 +187,8 @@
/* get cache configuration */
mrs x0, tpidr_el1 /* curcpu */
mrs x1, mpidr_el1
- bl aarch64_gettopology
+ mov x2, #0
+ bl arm_cpu_topology_set
mov x0, xzr
bl aarch64_getcacheinfo
diff -r 50ffcf3cc48e -r 8ba6e0cce5e1 sys/arch/aarch64/aarch64/pmap.c
--- a/sys/arch/aarch64/aarch64/pmap.c Thu Jan 16 16:45:30 2020 +0000
+++ b/sys/arch/aarch64/aarch64/pmap.c Fri Jan 17 21:47:22 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.60 2019/12/30 16:03:48 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.60.2.1 2020/01/17 21:47:22 ad Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@