Thu May 9 12:10:00 2024 UTC (11d)
port-arm/58194: Resurrect vmt(4) from bitrot

On this architecture vmt(4) used to search for a node "/hypervisor" in the
FDT and probed the VMware hypervisor call only when the node was
found. However, things appear to have changed and VMware no longer provides
the FDT node.

Since vmt(4) doesn't actually need to read anything from FDT, and the
hypervisor call logically resides in virtual CPUs themselves, it would be
better to attach it directly to cpu, just like how it's probed on x86.


(pho)
diff -r1.12 -r1.13 src/distrib/sets/lists/modules/ad.aarch64
diff -r1.3 -r1.4 src/share/man/man4/vmt.4
diff -r1.74 -r1.75 src/sys/arch/aarch64/aarch64/cpu.c
diff -r0 -r1.1 src/sys/arch/aarch64/aarch64/vmt.c
diff -r1.44 -r1.45 src/sys/arch/aarch64/conf/files.aarch64
diff -r1.49 -r1.50 src/sys/arch/aarch64/include/cpu.h
diff -r1.214 -r1.215 src/sys/arch/evbarm/conf/GENERIC64
diff -r1.21 -r1.22 src/sys/arch/x86/x86/vmt.c
diff -r1.72 -r1.73 src/sys/dev/fdt/files.fdt
diff -r1.6 -r0 src/sys/dev/fdt/vmt_fdt.c
diff -r1.9 -r1.10 src/sys/dev/vmt/vmt_subr.c
diff -r1.285 -r1.286 src/sys/modules/Makefile
diff -r1.4 -r1.5 src/sys/modules/vmt/Makefile
Thu May 9 21:10:00 2024
Wed Feb 7 13:20:28 2024
src/sys/dev/fdt/vmt_fdt.c,v

anoncvs not yet been updated

cvs diff -r1.12 -r1.13 src/distrib/sets/lists/modules/ad.aarch64 (expand / switch to unified diff)

--- src/distrib/sets/lists/modules/ad.aarch64 2023/04/11 10:30:41 1.12
+++ src/distrib/sets/lists/modules/ad.aarch64 2024/05/09 12:09:58 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: ad.aarch64,v 1.12 2023/04/11 10:30:41 riastradh Exp $ 1# $NetBSD: ad.aarch64,v 1.13 2024/05/09 12:09:58 pho Exp $
2./@MODULEDIR@/amdgpu modules-base-kernel kmod 2./@MODULEDIR@/amdgpu modules-base-kernel kmod
3./@MODULEDIR@/amdgpu/amdgpu.kmod modules-base-kernel kmod 3./@MODULEDIR@/amdgpu/amdgpu.kmod modules-base-kernel kmod
4./@MODULEDIR@/bpfjit modules-base-kernel kmod,sljit 4./@MODULEDIR@/bpfjit modules-base-kernel kmod,sljit
5./@MODULEDIR@/bpfjit/bpfjit.kmod modules-base-kernel kmod,sljit 5./@MODULEDIR@/bpfjit/bpfjit.kmod modules-base-kernel kmod,sljit
6./@MODULEDIR@/compat_linux modules-base-kernel kmod 6./@MODULEDIR@/compat_linux modules-base-kernel kmod
7./@MODULEDIR@/compat_linux/compat_linux.kmod modules-base-kernel kmod 7./@MODULEDIR@/compat_linux/compat_linux.kmod modules-base-kernel kmod
8./@MODULEDIR@/compat_linux32 modules-base-kernel kmod 8./@MODULEDIR@/compat_linux32 modules-base-kernel kmod
9./@MODULEDIR@/compat_linux32/compat_linux32.kmod modules-base-kernel kmod 9./@MODULEDIR@/compat_linux32/compat_linux32.kmod modules-base-kernel kmod
10./@MODULEDIR@/compat_netbsd32 modules-base-kernel kmod 10./@MODULEDIR@/compat_netbsd32 modules-base-kernel kmod
11./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod modules-base-kernel kmod 11./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod modules-base-kernel kmod
12./@MODULEDIR@/compat_netbsd32_09 modules-base-kernel kmod 12./@MODULEDIR@/compat_netbsd32_09 modules-base-kernel kmod
13./@MODULEDIR@/compat_netbsd32_09/compat_netbsd32_09.kmod modules-base-kernel kmod 13./@MODULEDIR@/compat_netbsd32_09/compat_netbsd32_09.kmod modules-base-kernel kmod
14#./@MODULEDIR@/compat_netbsd32_10 modules-base-kernel kmod 14#./@MODULEDIR@/compat_netbsd32_10 modules-base-kernel kmod
@@ -67,13 +67,15 @@ @@ -67,13 +67,15 @@
67./@MODULEDIR@/drmkms_linux/drmkms_linux.kmod modules-base-kernel kmod 67./@MODULEDIR@/drmkms_linux/drmkms_linux.kmod modules-base-kernel kmod
68./@MODULEDIR@/drmkms_pci modules-base-kernel kmod 68./@MODULEDIR@/drmkms_pci modules-base-kernel kmod
69./@MODULEDIR@/drmkms_pci/drmkms_pci.kmod modules-base-kernel kmod 69./@MODULEDIR@/drmkms_pci/drmkms_pci.kmod modules-base-kernel kmod
70./@MODULEDIR@/drmkms_sched modules-base-kernel kmod 70./@MODULEDIR@/drmkms_sched modules-base-kernel kmod
71./@MODULEDIR@/drmkms_sched/drmkms_sched.kmod modules-base-kernel kmod 71./@MODULEDIR@/drmkms_sched/drmkms_sched.kmod modules-base-kernel kmod
72./@MODULEDIR@/drmkms_ttm modules-base-kernel kmod 72./@MODULEDIR@/drmkms_ttm modules-base-kernel kmod
73./@MODULEDIR@/drmkms_ttm/drmkms_ttm.kmod modules-base-kernel kmod 73./@MODULEDIR@/drmkms_ttm/drmkms_ttm.kmod modules-base-kernel kmod
74./@MODULEDIR@/exec_elf32 modules-base-kernel kmod 74./@MODULEDIR@/exec_elf32 modules-base-kernel kmod
75./@MODULEDIR@/exec_elf32/exec_elf32.kmod modules-base-kernel kmod 75./@MODULEDIR@/exec_elf32/exec_elf32.kmod modules-base-kernel kmod
76./@MODULEDIR@/exec_elf64 modules-base-kernel kmod 76./@MODULEDIR@/exec_elf64 modules-base-kernel kmod
77./@MODULEDIR@/exec_elf64/exec_elf64.kmod modules-base-kernel kmod 77./@MODULEDIR@/exec_elf64/exec_elf64.kmod modules-base-kernel kmod
78./@MODULEDIR@/sljit modules-base-kernel kmod,sljit 78./@MODULEDIR@/sljit modules-base-kernel kmod,sljit
79./@MODULEDIR@/sljit/sljit.kmod modules-base-kernel kmod,sljit 79./@MODULEDIR@/sljit/sljit.kmod modules-base-kernel kmod,sljit
 80./@MODULEDIR@/vmt modules-base-kernel kmod
 81./@MODULEDIR@/vmt/vmt.kmod modules-base-kernel kmod

cvs diff -r1.3 -r1.4 src/share/man/man4/vmt.4 (expand / switch to unified diff)

--- src/share/man/man4/vmt.4 2020/10/27 08:57:10 1.3
+++ src/share/man/man4/vmt.4 2024/05/09 12:09:58 1.4
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1.\" $NetBSD: vmt.4,v 1.3 2020/10/27 08:57:10 ryo Exp $ 1.\" $NetBSD: vmt.4,v 1.4 2024/05/09 12:09:58 pho Exp $
2.\" $OpenBSD: vmt.4,v 1.4 2010/10/26 05:07:31 jmc Exp $ 2.\" $OpenBSD: vmt.4,v 1.4 2010/10/26 05:07:31 jmc Exp $
3.\" 3.\"
4.\" Copyright (c) 2008 Marco Peereboom <marco@openbsd.org> 4.\" Copyright (c) 2008 Marco Peereboom <marco@openbsd.org>
5.\" Text was heavily borrowed from the IPMI spec V1.5 5.\" Text was heavily borrowed from the IPMI spec V1.5
6.\" 6.\"
7.\" Permission to use, copy, modify, and distribute this software for any 7.\" Permission to use, copy, modify, and distribute this software for any
8.\" purpose with or without fee is hereby granted, provided that the above 8.\" purpose with or without fee is hereby granted, provided that the above
9.\" copyright notice and this permission notice appear in all copies. 9.\" copyright notice and this permission notice appear in all copies.
10.\" 10.\"
11.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 11.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
12.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 12.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
13.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 13.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
14.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 14.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
15.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
16.\" ACTION OF CONTRACT, NEGLIGENCE OR TORTIOUS ACTION, ARISING OUT OF 16.\" ACTION OF CONTRACT, NEGLIGENCE OR TORTIOUS ACTION, ARISING OUT OF
17.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 17.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18.Dd October 6, 2013 18.Dd October 6, 2013
19.Dt VMT 4 x86 19.Dt VMT 4 x86
20.Os 20.Os
21.Sh NAME 21.Sh NAME
22.Nm vmt 22.Nm vmt
23.Nd VMware Tools driver 23.Nd VMware Tools driver
24.Sh SYNOPSIS 24.Sh SYNOPSIS
25.Cd "vmt0 at cpu0" 25.Cd "vmt0 at cpu0"
26.Cd "vmt0 at fdt?" 
27.Sh DESCRIPTION 26.Sh DESCRIPTION
28The 27The
29.Nm 28.Nm
30driver is a kernel level implementation of VMware Tools. 29driver is a kernel level implementation of VMware Tools.
31VMware Tools are intended to provide better support for operating systems 30VMware Tools are intended to provide better support for operating systems
32running inside virtual machines. 31running inside virtual machines.
33.Pp 32.Pp
34.Nm 33.Nm
35handles shutdown, reboot, resume requests from the host by sending 34handles shutdown, reboot, resume requests from the host by sending
36events using 35events using
37.Xr sysmon_pswitch 9 36.Xr sysmon_pswitch 9
38of type PSWITCH_TYPE_POWER, PSWITCH_TYPE_RESET, and PSWITCH_TYPE_SLEEP that 37of type PSWITCH_TYPE_POWER, PSWITCH_TYPE_RESET, and PSWITCH_TYPE_SLEEP that
39can be handled by 38can be handled by

cvs diff -r1.74 -r1.75 src/sys/arch/aarch64/aarch64/cpu.c (expand / switch to unified diff)

--- src/sys/arch/aarch64/aarch64/cpu.c 2024/02/07 04:20:26 1.74
+++ src/sys/arch/aarch64/aarch64/cpu.c 2024/05/09 12:09:58 1.75
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: cpu.c,v 1.74 2024/02/07 04:20:26 msaitoh Exp $ */ 1/* $NetBSD: cpu.c,v 1.75 2024/05/09 12:09:58 pho Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2017 Ryo Shimizu 4 * Copyright (c) 2017 Ryo Shimizu
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -17,27 +17,27 @@ @@ -17,27 +17,27 @@
17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, 19 * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
20 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 20 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
22 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
24 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 24 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
25 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 25 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
26 * POSSIBILITY OF SUCH DAMAGE. 26 * POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29#include <sys/cdefs.h> 29#include <sys/cdefs.h>
30__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.74 2024/02/07 04:20:26 msaitoh Exp $"); 30__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.75 2024/05/09 12:09:58 pho Exp $");
31 31
32#include "locators.h" 32#include "locators.h"
33#include "opt_arm_debug.h" 33#include "opt_arm_debug.h"
34#include "opt_ddb.h" 34#include "opt_ddb.h"
35#include "opt_fdt.h" 35#include "opt_fdt.h"
36#include "opt_multiprocessor.h" 36#include "opt_multiprocessor.h"
37 37
38#include <sys/param.h> 38#include <sys/param.h>
39#include <sys/atomic.h> 39#include <sys/atomic.h>
40#include <sys/cpu.h> 40#include <sys/cpu.h>
41#include <sys/device.h> 41#include <sys/device.h>
42#include <sys/kmem.h> 42#include <sys/kmem.h>
43#include <sys/reboot.h> 43#include <sys/reboot.h>
@@ -170,26 +170,31 @@ cpu_attach(device_t dv, cpuid_t id) @@ -170,26 +170,31 @@ cpu_attach(device_t dv, cpuid_t id)
170 return; 170 return;
171 } 171 }
172 172
173#ifdef DDB 173#ifdef DDB
174 db_machdep_init(ci); 174 db_machdep_init(ci);
175#endif 175#endif
176 176
177 cpu_init_counter(ci); 177 cpu_init_counter(ci);
178 178
179 /* These currently only check the BP. */ 179 /* These currently only check the BP. */
180 cpu_setup_rng(dv, ci); 180 cpu_setup_rng(dv, ci);
181 cpu_setup_aes(dv, ci); 181 cpu_setup_aes(dv, ci);
182 cpu_setup_chacha(dv, ci); 182 cpu_setup_chacha(dv, ci);
 183
 184 struct cpufeature_attach_args cfaa;
 185 memset(&cfaa, 0, sizeof(cfaa));
 186 cfaa.ci = ci;
 187 config_found(dv, &cfaa, NULL, CFARGS(.iattr = "cpufeaturebus"));
183} 188}
184 189
185struct cpuidtab { 190struct cpuidtab {
186 uint32_t cpu_partnum; 191 uint32_t cpu_partnum;
187 const char *cpu_name; 192 const char *cpu_name;
188 const char *cpu_vendor; 193 const char *cpu_vendor;
189 const char *cpu_architecture; 194 const char *cpu_architecture;
190}; 195};
191 196
192#define CPU_PARTMASK (CPU_ID_IMPLEMENTOR_MASK | CPU_ID_PARTNO_MASK) 197#define CPU_PARTMASK (CPU_ID_IMPLEMENTOR_MASK | CPU_ID_PARTNO_MASK)
193 198
194const struct cpuidtab cpuids[] = { 199const struct cpuidtab cpuids[] = {
195 { CPU_ID_CORTEXA35R0 & CPU_PARTMASK, "Cortex-A35", "Arm", "v8-A" }, 200 { CPU_ID_CORTEXA35R0 & CPU_PARTMASK, "Cortex-A35", "Arm", "v8-A" },

File Added: src/sys/arch/aarch64/aarch64/vmt.c
/* $NetBSD */

/*
 * Copyright (c) 2024 The NetBSD Foundation, Inc.
 * All rights reserved.
 *
 * This code is derived from software contributed to The NetBSD Foundation
 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
 * NASA Ames Research Center.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */

#include <sys/device.h>
#include <sys/module.h>

#include <dev/vmt/vmtreg.h>
#include <dev/vmt/vmtvar.h>

static int	vmt_match(device_t, cfdata_t, void *);
static void	vmt_attach(device_t, device_t, void *);
static int	vmt_detach(device_t, int);

CFATTACH_DECL_NEW(vmt, sizeof(struct vmt_softc),
	vmt_match, vmt_attach, vmt_detach, NULL);

static bool vmt_attached = false;

static int
vmt_match(device_t parent, cfdata_t match, void *aux)
{
	/* vmt should not attach to more than a single CPU. */
	if (vmt_attached)
		return 0;

	return vmt_probe();
}

static void
vmt_attach(device_t parent, device_t self, void *aux)
{
	struct vmt_softc *sc = device_private(self);

	aprint_naive("\n");
	aprint_normal(": VMware Tools driver\n");

	sc->sc_dev = self;
	vmt_common_attach(sc);

	vmt_attached = true;
}

static int
vmt_detach(device_t self, int flags)
{
	struct vmt_softc *sc = device_private(self);
	int rv;

	rv = vmt_common_detach(sc);
	if (rv != 0)
		return rv;

	vmt_attached = false;
	return 0;
}

MODULE(MODULE_CLASS_DRIVER, vmt, "sysmon_power,sysmon_taskq");

#ifdef _MODULE
#include "ioconf.c"
#endif

static int
vmt_modcmd(modcmd_t cmd, void *aux)
{
	int error = 0;

	switch (cmd) {
	case MODULE_CMD_INIT:
#ifdef _MODULE
		error = config_init_component(cfdriver_ioconf_vmt,
		    cfattach_ioconf_vmt, cfdata_ioconf_vmt);
#endif
		break;
	case MODULE_CMD_FINI:
#ifdef _MODULE
		error = config_fini_component(cfdriver_ioconf_vmt,
		    cfattach_ioconf_vmt, cfdata_ioconf_vmt);
#endif
		break;
	case MODULE_CMD_AUTOUNLOAD:
		error = EBUSY;
		break;
	default:
		error = ENOTTY;
		break;
	}

	return error;
}

cvs diff -r1.44 -r1.45 src/sys/arch/aarch64/conf/files.aarch64 (expand / switch to unified diff)

--- src/sys/arch/aarch64/conf/files.aarch64 2024/02/18 09:03:44 1.44
+++ src/sys/arch/aarch64/conf/files.aarch64 2024/05/09 12:09:58 1.45
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: files.aarch64,v 1.44 2024/02/18 09:03:44 andvar Exp $ 1# $NetBSD: files.aarch64,v 1.45 2024/05/09 12:09:58 pho Exp $
2 2
3defflag opt_cpuoptions.h AARCH64_ALIGNMENT_CHECK 3defflag opt_cpuoptions.h AARCH64_ALIGNMENT_CHECK
4defflag opt_cpuoptions.h AARCH64_EL0_STACK_ALIGNMENT_CHECK 4defflag opt_cpuoptions.h AARCH64_EL0_STACK_ALIGNMENT_CHECK
5defflag opt_cpuoptions.h AARCH64_EL1_STACK_ALIGNMENT_CHECK 5defflag opt_cpuoptions.h AARCH64_EL1_STACK_ALIGNMENT_CHECK
6defflag opt_cpuoptions.h AARCH64_HAVE_L2CTLR 6defflag opt_cpuoptions.h AARCH64_HAVE_L2CTLR
7defflag opt_cpuoptions.h AARCH64_DEVICE_MEM_NONPOSTED 7defflag opt_cpuoptions.h AARCH64_DEVICE_MEM_NONPOSTED
8defflag opt_cpuoptions.h ARMV81_HAFDBS 8defflag opt_cpuoptions.h ARMV81_HAFDBS
9 9
10defflag opt_cputypes.h CPU_ARMV8 10defflag opt_cputypes.h CPU_ARMV8
11defflag opt_cputypes.h CPU_CORTEX: CPU_ARMV8 11defflag opt_cputypes.h CPU_CORTEX: CPU_ARMV8
12defflag opt_cputypes.h CPU_THUNDERX: CPU_ARMV8 12defflag opt_cputypes.h CPU_THUNDERX: CPU_ARMV8
13 13
14# Interrupt implementation header definition 14# Interrupt implementation header definition
@@ -63,29 +63,34 @@ defflag opt_pmap.h PMAP_MI @@ -63,29 +63,34 @@ defflag opt_pmap.h PMAP_MI
63file dev/cons.c 63file dev/cons.c
64 64
65# DDB 65# DDB
66file arch/aarch64/aarch64/db_disasm.c ddb 66file arch/aarch64/aarch64/db_disasm.c ddb
67file arch/aarch64/aarch64/db_interface.c ddb|kgdb 67file arch/aarch64/aarch64/db_interface.c ddb|kgdb
68file arch/aarch64/aarch64/db_trace.c ddb 68file arch/aarch64/aarch64/db_trace.c ddb
69file arch/aarch64/aarch64/db_machdep.c ddb 69file arch/aarch64/aarch64/db_machdep.c ddb
70file arch/aarch64/aarch64/disasm.c ddb 70file arch/aarch64/aarch64/disasm.c ddb
71#file arch/aarch64/aarch64/kgdb_machdep.c kgdb # XXX: not implemented 71#file arch/aarch64/aarch64/kgdb_machdep.c kgdb # XXX: not implemented
72 72
73# mainbus files 73# mainbus files
74device mainbus { [addr = -1], [size = 0], [intr = -1] } 74device mainbus { [addr = -1], [size = 0], [intr = -1] }
75 75
76device cpu { } 76device cpufeaturebus {}
 77device cpu { }: cpufeaturebus
77file arch/aarch64/aarch64/cpu.c cpu 78file arch/aarch64/aarch64/cpu.c cpu
78 79
 80# VMware Tools driver
 81attach vmt at cpufeaturebus
 82file arch/aarch64/aarch64/vmt.c vmt
 83
79# bus_space(9) 84# bus_space(9)
80define bus_space_generic 85define bus_space_generic
81file arch/aarch64/aarch64/bus_space.c 86file arch/aarch64/aarch64/bus_space.c
82file arch/aarch64/aarch64/bus_space_asm_generic.S # bus_space_generic 87file arch/aarch64/aarch64/bus_space_asm_generic.S # bus_space_generic
83file arch/aarch64/aarch64/bus_space_notimpl.S 88file arch/aarch64/aarch64/bus_space_notimpl.S
84 89
85# Standard files 90# Standard files
86file arch/arm/arm/arm_cpu_topology.c 91file arch/arm/arm/arm_cpu_topology.c
87file arch/arm/arm/arm_generic_dma.c 92file arch/arm/arm/arm_generic_dma.c
88file arch/arm/arm/bootconfig.c 93file arch/arm/arm/bootconfig.c
89file arch/arm/arm/bus_stubs.c 94file arch/arm/arm/bus_stubs.c
90file arch/arm/arm/cpu_subr.c 95file arch/arm/arm/cpu_subr.c
91file arch/arm/arm32/bus_dma.c 96file arch/arm/arm32/bus_dma.c

cvs diff -r1.49 -r1.50 src/sys/arch/aarch64/include/cpu.h (expand / switch to unified diff)

--- src/sys/arch/aarch64/include/cpu.h 2023/02/25 00:40:22 1.49
+++ src/sys/arch/aarch64/include/cpu.h 2024/05/09 12:09:59 1.50
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: cpu.h,v 1.49 2023/02/25 00:40:22 riastradh Exp $ */ 1/* $NetBSD: cpu.h,v 1.50 2024/05/09 12:09:59 pho Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2014, 2020 The NetBSD Foundation, Inc. 4 * Copyright (c) 2014, 2020 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Matt Thomas of 3am Software Foundry. 8 * by Matt Thomas of 3am Software Foundry.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -237,21 +237,24 @@ cpu_dosoftints_ci(struct cpu_info *ci) @@ -237,21 +237,24 @@ cpu_dosoftints_ci(struct cpu_info *ci)
237 } 237 }
238#endif 238#endif
239} 239}
240 240
241static inline void 241static inline void
242cpu_dosoftints(void) 242cpu_dosoftints(void)
243{ 243{
244#if defined(__HAVE_FAST_SOFTINTS) && !defined(__HAVE_PIC_FAST_SOFTINTS) 244#if defined(__HAVE_FAST_SOFTINTS) && !defined(__HAVE_PIC_FAST_SOFTINTS)
245 KDASSERT(kpreempt_disabled()); 245 KDASSERT(kpreempt_disabled());
246 cpu_dosoftints_ci(curcpu()); 246 cpu_dosoftints_ci(curcpu());
247#endif 247#endif
248} 248}
249 249
 250struct cpufeature_attach_args {
 251 struct cpu_info *ci;
 252};
250 253
251#endif /* _KERNEL */ 254#endif /* _KERNEL */
252 255
253#endif /* _KERNEL || _KMEMUSER */ 256#endif /* _KERNEL || _KMEMUSER */
254 257
255#endif 258#endif
256 259
257#endif /* _AARCH64_CPU_H_ */ 260#endif /* _AARCH64_CPU_H_ */

cvs diff -r1.214 -r1.215 src/sys/arch/evbarm/conf/GENERIC64 (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/GENERIC64 2023/10/11 07:49:29 1.214
+++ src/sys/arch/evbarm/conf/GENERIC64 2024/05/09 12:09:59 1.215
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# 1#
2# $NetBSD: GENERIC64,v 1.214 2023/10/11 07:49:29 rin Exp $ 2# $NetBSD: GENERIC64,v 1.215 2024/05/09 12:09:59 pho Exp $
3# 3#
4# GENERIC ARM (aarch64) kernel 4# GENERIC ARM (aarch64) kernel
5# 5#
6 6
7include "arch/evbarm/conf/std.generic64" 7include "arch/evbarm/conf/std.generic64"
8include "arch/evbarm/conf/files.generic64" 8include "arch/evbarm/conf/files.generic64"
9include "arch/evbarm/conf/GENERIC.common" 9include "arch/evbarm/conf/GENERIC.common"
10 10
11maxusers 64 11maxusers 64
12 12
13options CPU_CORTEX 13options CPU_CORTEX
14options CPU_THUNDERX 14options CPU_THUNDERX
15options SOC_APPLE 15options SOC_APPLE
@@ -121,27 +121,27 @@ acpibut* at acpi? @@ -121,27 +121,27 @@ acpibut* at acpi?
121acpicppc* at acpi? 121acpicppc* at acpi?
122acpipcd* at acpi? 122acpipcd* at acpi?
123acpipcc* at acpi? 123acpipcc* at acpi?
124acpifan* at acpi? 124acpifan* at acpi?
125acpiged* at acpi? 125acpiged* at acpi?
126acpilid* at acpi? 126acpilid* at acpi?
127acpitz* at acpi? 127acpitz* at acpi?
128 128
129# CPUs 129# CPUs
130cpus* at fdt? pass 0 130cpus* at fdt? pass 0
131cpu* at fdt? pass 0 131cpu* at fdt? pass 0
132cpu* at acpi? 132cpu* at acpi?
133 133
134vmt* at fdt? # VMware Tools 134vmt0 at cpu0 # VMware Tools
135 135
136# Performance monitors 136# Performance monitors
137armpmu* at fdt? 137armpmu* at fdt?
138pseudo-device tprof 138pseudo-device tprof
139 139
140# CPU frequency scaling 140# CPU frequency scaling
141cpufreqdt* at cpu? 141cpufreqdt* at cpu?
142 142
143# Power State Coordination Interface (PSCI) 143# Power State Coordination Interface (PSCI)
144psci* at fdt? pass 0 144psci* at fdt? pass 0
145 145
146fclock* at fdt? pass 1 146fclock* at fdt? pass 1
147ffclock* at fdt? pass 1 147ffclock* at fdt? pass 1

cvs diff -r1.21 -r1.22 src/sys/arch/x86/x86/vmt.c (expand / switch to unified diff)

--- src/sys/arch/x86/x86/vmt.c 2020/10/27 08:57:11 1.21
+++ src/sys/arch/x86/x86/vmt.c 2024/05/09 12:09:59 1.22
@@ -1,36 +1,37 @@ @@ -1,36 +1,37 @@
1/* $NetBSD: vmt.c,v 1.21 2020/10/27 08:57:11 ryo Exp $ */ 1/* $NetBSD: vmt.c,v 1.22 2024/05/09 12:09:59 pho Exp $ */
2/* $OpenBSD: vmt.c,v 1.11 2011/01/27 21:29:25 dtucker Exp $ */ 2/* $OpenBSD: vmt.c,v 1.11 2011/01/27 21:29:25 dtucker Exp $ */
3 3
4/* 4/*
5 * Copyright (c) 2007 David Crawshaw <david@zentus.com> 5 * Copyright (c) 2007 David Crawshaw <david@zentus.com>
6 * Copyright (c) 2008 David Gwynne <dlg@openbsd.org> 6 * Copyright (c) 2008 David Gwynne <dlg@openbsd.org>
7 * 7 *
8 * Permission to use, copy, modify, and distribute this software for any 8 * Permission to use, copy, modify, and distribute this software for any
9 * purpose with or without fee is hereby granted, provided that the above 9 * purpose with or without fee is hereby granted, provided that the above
10 * copyright notice and this permission notice appear in all copies. 10 * copyright notice and this permission notice appear in all copies.
11 * 11 *
12 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 12 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
13 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 13 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
14 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 14 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
15 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 15 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
16 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 16 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
17 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 17 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
18 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 18 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 */ 19 */
20 20
21/* 21/*
22 * Protocol reverse engineered by Ken Kato: 22 * Protocol reverse engineered by Ken Kato:
23 * https://sites.google.com/site/chitchatvmback/backdoor 23 * https://sites.google.com/site/chitchatvmback/backdoor (dead link)
 24 * https://web.archive.org/web/20230325103442/https://sites.google.com/site/chitchatvmback/backdoor (archive)
24 */ 25 */
25 26
26#include <sys/param.h> 27#include <sys/param.h>
27#include <sys/types.h> 28#include <sys/types.h>
28#include <sys/device.h> 29#include <sys/device.h>
29#include <sys/module.h> 30#include <sys/module.h>
30#include <machine/cpuvar.h> 31#include <machine/cpuvar.h>
31 32
32#include <dev/sysmon/sysmonvar.h> 33#include <dev/sysmon/sysmonvar.h>
33#include <dev/vmt/vmtreg.h> 34#include <dev/vmt/vmtreg.h>
34#include <dev/vmt/vmtvar.h> 35#include <dev/vmt/vmtvar.h>
35 36
36static int vmt_match(device_t, cfdata_t, void *); 37static int vmt_match(device_t, cfdata_t, void *);

cvs diff -r1.72 -r1.73 src/sys/dev/fdt/files.fdt (expand / switch to unified diff)

--- src/sys/dev/fdt/files.fdt 2024/01/18 07:48:57 1.72
+++ src/sys/dev/fdt/files.fdt 2024/05/09 12:09:59 1.73
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: files.fdt,v 1.72 2024/01/18 07:48:57 skrll Exp $ 1# $NetBSD: files.fdt,v 1.73 2024/05/09 12:09:59 pho Exp $
2 2
3include "external/bsd/libfdt/conf/files.libfdt" 3include "external/bsd/libfdt/conf/files.libfdt"
4 4
5defflag opt_fdt.h FDTBASE : libfdt, ofw_subr 5defflag opt_fdt.h FDTBASE : libfdt, ofw_subr
6defflag opt_fdt.h FDT: FDTBASE 6defflag opt_fdt.h FDT: FDTBASE
7defparam opt_fdt.h FDT_MEMORY_RANGES 7defparam opt_fdt.h FDT_MEMORY_RANGES
8defparam opt_fdt.h FDT_DEFAULT_STDOUT_PATH 8defparam opt_fdt.h FDT_DEFAULT_STDOUT_PATH
9 9
10define fdt { [pass = 10] } : clk, pwm 10define fdt { [pass = 10] } : clk, pwm
11 11
12device simplebus: fdt 12device simplebus: fdt
13attach simplebus at fdt 13attach simplebus at fdt
14file dev/fdt/fdtbus.c fdt 14file dev/fdt/fdtbus.c fdt
@@ -206,20 +206,16 @@ file dev/fdt/arasan_sdhc_fdt.c arasan_s @@ -206,20 +206,16 @@ file dev/fdt/arasan_sdhc_fdt.c arasan_s
206device usbnopphy 206device usbnopphy
207attach usbnopphy at fdt 207attach usbnopphy at fdt
208file dev/fdt/usbnopphy.c usbnopphy 208file dev/fdt/usbnopphy.c usbnopphy
209 209
210# Simple Amplifier Audio Driver 210# Simple Amplifier Audio Driver
211device simpleamp 211device simpleamp
212attach simpleamp at fdt 212attach simpleamp at fdt
213file dev/fdt/simple_amplifier.c simpleamp 213file dev/fdt/simple_amplifier.c simpleamp
214 214
215# Broadcom GENET v5 215# Broadcom GENET v5
216attach genet at fdt with genet_fdt 216attach genet at fdt with genet_fdt
217file dev/fdt/genet_fdt.c genet_fdt 217file dev/fdt/genet_fdt.c genet_fdt
218 218
219# VMware Tools driver 
220attach vmt at fdt with vmt_fdt 
221file dev/fdt/vmt_fdt.c vmt_fdt 
222 
223# Google Goldfish RTC 219# Google Goldfish RTC
224attach gfrtc at fdt with gfrtc_fdt 220attach gfrtc at fdt with gfrtc_fdt
225file dev/fdt/gfrtc_fdt.c gfrtc_fdt 221file dev/fdt/gfrtc_fdt.c gfrtc_fdt

File Deleted: src/sys/dev/fdt/vmt_fdt.c

cvs diff -r1.9 -r1.10 src/sys/dev/vmt/vmt_subr.c (expand / switch to unified diff)

--- src/sys/dev/vmt/vmt_subr.c 2024/04/02 20:04:16 1.9
+++ src/sys/dev/vmt/vmt_subr.c 2024/05/09 12:09:59 1.10
@@ -1,36 +1,37 @@ @@ -1,36 +1,37 @@
1/* $NetBSD: vmt_subr.c,v 1.9 2024/04/02 20:04:16 christos Exp $ */ 1/* $NetBSD: vmt_subr.c,v 1.10 2024/05/09 12:09:59 pho Exp $ */
2/* $OpenBSD: vmt.c,v 1.11 2011/01/27 21:29:25 dtucker Exp $ */ 2/* $OpenBSD: vmt.c,v 1.11 2011/01/27 21:29:25 dtucker Exp $ */
3 3
4/* 4/*
5 * Copyright (c) 2007 David Crawshaw <david@zentus.com> 5 * Copyright (c) 2007 David Crawshaw <david@zentus.com>
6 * Copyright (c) 2008 David Gwynne <dlg@openbsd.org> 6 * Copyright (c) 2008 David Gwynne <dlg@openbsd.org>
7 * 7 *
8 * Permission to use, copy, modify, and distribute this software for any 8 * Permission to use, copy, modify, and distribute this software for any
9 * purpose with or without fee is hereby granted, provided that the above 9 * purpose with or without fee is hereby granted, provided that the above
10 * copyright notice and this permission notice appear in all copies. 10 * copyright notice and this permission notice appear in all copies.
11 * 11 *
12 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 12 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
13 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 13 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
14 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 14 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
15 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 15 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
16 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 16 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
17 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 17 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
18 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 18 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 */ 19 */
20 20
21/* 21/*
22 * Protocol reverse engineered by Ken Kato: 22 * Protocol reverse engineered by Ken Kato:
23 * https://sites.google.com/site/chitchatvmback/backdoor 23 * https://sites.google.com/site/chitchatvmback/backdoor (dead link)
 24 * https://web.archive.org/web/20230325103442/https://sites.google.com/site/chitchatvmback/backdoor (archive)
24 */ 25 */
25 26
26#include <sys/param.h> 27#include <sys/param.h>
27#include <sys/types.h> 28#include <sys/types.h>
28#include <sys/callout.h> 29#include <sys/callout.h>
29#include <sys/device.h> 30#include <sys/device.h>
30#include <sys/endian.h> 31#include <sys/endian.h>
31#include <sys/kernel.h> 32#include <sys/kernel.h>
32#include <sys/kmem.h> 33#include <sys/kmem.h>
33#include <sys/module.h> 34#include <sys/module.h>
34#include <sys/proc.h> 35#include <sys/proc.h>
35#include <sys/reboot.h> 36#include <sys/reboot.h>
36#include <sys/socket.h> 37#include <sys/socket.h>

cvs diff -r1.285 -r1.286 src/sys/modules/Makefile (expand / switch to unified diff)

--- src/sys/modules/Makefile 2024/04/02 22:37:34 1.285
+++ src/sys/modules/Makefile 2024/05/09 12:09:59 1.286
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.285 2024/04/02 22:37:34 riastradh Exp $ 1# $NetBSD: Makefile,v 1.286 2024/05/09 12:09:59 pho Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5.if !make(includes) 5.if !make(includes)
6# For all platforms 6# For all platforms
7 7
8# Modules for compatibility with earlier versions of NetBSD 8# Modules for compatibility with earlier versions of NetBSD
9 9
10SUBDIR+= compat_util 10SUBDIR+= compat_util
11SUBDIR+= compat_43 compat_sysctl_09_43 11SUBDIR+= compat_43 compat_sysctl_09_43
12SUBDIR+= compat_09 compat_10 compat_12 compat_13 compat_14 12SUBDIR+= compat_09 compat_10 compat_12 compat_13 compat_14
13SUBDIR+= compat_16 compat_20 compat_30 compat_40 compat_50 13SUBDIR+= compat_16 compat_20 compat_30 compat_40 compat_50
14SUBDIR+= compat_60 compat_70 compat_80 compat_90 compat_100 14SUBDIR+= compat_60 compat_70 compat_80 compat_90 compat_100
@@ -232,26 +232,31 @@ SUBDIR+= amdtemp @@ -232,26 +232,31 @@ SUBDIR+= amdtemp
232SUBDIR+= amdzentemp 232SUBDIR+= amdzentemp
233SUBDIR+= coretemp 233SUBDIR+= coretemp
234SUBDIR+= est 234SUBDIR+= est
235SUBDIR+= hdafg 235SUBDIR+= hdafg
236SUBDIR+= hdaudio 236SUBDIR+= hdaudio
237SUBDIR+= hdaudio_pci 237SUBDIR+= hdaudio_pci
238SUBDIR+= hdaudioverbose 238SUBDIR+= hdaudioverbose
239SUBDIR+= hpet 239SUBDIR+= hpet
240SUBDIR+= ichsmb 240SUBDIR+= ichsmb
241SUBDIR+= odcm 241SUBDIR+= odcm
242SUBDIR+= powernow 242SUBDIR+= powernow
243SUBDIR+= tco 243SUBDIR+= tco
244SUBDIR+= tprof_x86 244SUBDIR+= tprof_x86
 245.endif
 246
 247.if ${MACHINE_CPU} == "aarch64" || \
 248 ${MACHINE_ARCH} == "i386" || \
 249 ${MACHINE_ARCH} == "x86_64"
245SUBDIR+= vmt 250SUBDIR+= vmt
246.endif 251.endif
247 252
248.if ${HAVE_NVMM:Uno} == "yes" 253.if ${HAVE_NVMM:Uno} == "yes"
249SUBDIR+= nvmm 254SUBDIR+= nvmm
250.endif 255.endif
251 256
252# Builds on architectures with PCI bus 257# Builds on architectures with PCI bus
253.if \ 258.if \
254 ${MACHINE} == "evbarm" || \ 259 ${MACHINE} == "evbarm" || \
255 ${MACHINE_ARCH} == "i386" || \ 260 ${MACHINE_ARCH} == "i386" || \
256 ${MACHINE_ARCH} == "x86_64" 261 ${MACHINE_ARCH} == "x86_64"
257#SUBDIR+= hifn 262#SUBDIR+= hifn

cvs diff -r1.4 -r1.5 src/sys/modules/vmt/Makefile (expand / switch to unified diff)

--- src/sys/modules/vmt/Makefile 2020/10/27 08:57:11 1.4
+++ src/sys/modules/vmt/Makefile 2024/05/09 12:09:59 1.5
@@ -1,13 +1,18 @@ @@ -1,13 +1,18 @@
1# $NetBSD: Makefile,v 1.4 2020/10/27 08:57:11 ryo Exp $ 1# $NetBSD: Makefile,v 1.5 2024/05/09 12:09:59 pho Exp $
2 2
3.include "../Makefile.inc" 3.include "../Makefile.inc"
4 4
 5.if ${MACHINE_CPU} == "aarch64"
 6.PATH: ${S}/arch/aarch64/aarch64
 7.elif ${MACHINE_ARCH} == "i386" || \
 8 ${MACHINE_ARCH} == "x86_64"
5.PATH: ${S}/arch/x86/x86 9.PATH: ${S}/arch/x86/x86
 10.endif
6.PATH: ${S}/dev/vmt 11.PATH: ${S}/dev/vmt
7 12
8KMOD= vmt  13KMOD= vmt
9IOCONF= vmt.ioconf 14IOCONF= vmt.ioconf
10SRCS= vmt.c \ 15SRCS= vmt.c \
11 vmt_subr.c 16 vmt_subr.c
12 17
13.include <bsd.kmodule.mk> 18.include <bsd.kmodule.mk>