sync with OpenBSD -current
This commit is contained in:
parent
3110dbb17d
commit
d1109c2ac1
GPG key ID:
F42C07F07E2E35B7
30 changed files with 1016 additions and 235 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: autoconf.c,v 1.14 2022/09/08 10:22:06 kn Exp $ */
|
||||
/* $OpenBSD: autoconf.c,v 1.15 2024/07/17 15:21:59 kettenis Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2009 Miodrag Vallat.
|
||||
*
|
||||
|
|
@ -61,6 +61,8 @@ cpu_configure(void)
|
|||
|
||||
unmap_startup();
|
||||
|
||||
cpu_identify_cleanup();
|
||||
|
||||
#ifdef CRYPTO
|
||||
if (arm64_has_aes)
|
||||
cryptox_setup();
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: cpu.c,v 1.126 2024/07/14 09:48:48 jca Exp $ */
|
||||
/* $OpenBSD: cpu.c,v 1.127 2024/07/17 15:21:59 kettenis Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2016 Dale Rahn <drahn@dalerahn.com>
|
||||
|
|
@ -1024,6 +1024,40 @@ cpu_identify(struct cpu_info *ci)
|
|||
#endif
|
||||
}
|
||||
|
||||
void
|
||||
cpu_identify_cleanup(void)
|
||||
{
|
||||
uint64_t value;
|
||||
|
||||
/* ID_AA64ISAR0_EL1 */
|
||||
value = cpu_id_aa64isar0 & ID_AA64ISAR0_MASK;
|
||||
value &= ~ID_AA64ISAR0_TLB_MASK;
|
||||
cpu_id_aa64isar0 = value;
|
||||
|
||||
/* ID_AA64ISAR1_EL1 */
|
||||
value = cpu_id_aa64isar1 &= ID_AA64ISAR1_MASK;
|
||||
value &= ~ID_AA64ISAR1_SPECRES_MASK;
|
||||
cpu_id_aa64isar1 = value;
|
||||
|
||||
/* ID_AA64ISAR2_EL1 */
|
||||
value = cpu_id_aa64isar2 &= ID_AA64ISAR2_MASK;
|
||||
value &= ~ID_AA64ISAR2_CLRBHB_MASK;
|
||||
cpu_id_aa64isar2 = value;
|
||||
|
||||
/* ID_AA64PFR0_EL1 */
|
||||
value = 0;
|
||||
value |= cpu_id_aa64pfr0 & ID_AA64PFR0_FP_MASK;
|
||||
value |= cpu_id_aa64pfr0 & ID_AA64PFR0_ADV_SIMD_MASK;
|
||||
value |= cpu_id_aa64pfr0 & ID_AA64PFR0_DIT_MASK;
|
||||
cpu_id_aa64pfr0 = value;
|
||||
|
||||
/* ID_AA64PFR1_EL1 */
|
||||
value = 0;
|
||||
value |= cpu_id_aa64pfr1 & ID_AA64PFR1_BT_MASK;
|
||||
value |= cpu_id_aa64pfr1 & ID_AA64PFR1_SSBS_MASK;
|
||||
cpu_id_aa64pfr1 = value;
|
||||
}
|
||||
|
||||
void cpu_init(void);
|
||||
int cpu_start_secondary(struct cpu_info *ci, int, uint64_t);
|
||||
int cpu_clockspeed(int *);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: machdep.c,v 1.90 2024/07/03 21:04:04 kettenis Exp $ */
|
||||
/* $OpenBSD: machdep.c,v 1.91 2024/07/17 15:21:59 kettenis Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2014 Patrick Wildt <patrick@blueri.se>
|
||||
* Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
|
||||
|
|
@ -332,7 +332,6 @@ cpu_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp,
|
|||
{
|
||||
char *compatible;
|
||||
int node, len, error;
|
||||
uint64_t value;
|
||||
|
||||
/* all sysctl names at this level are terminal */
|
||||
if (namelen != 1)
|
||||
|
|
@ -351,25 +350,15 @@ cpu_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp,
|
|||
free(compatible, M_TEMP, len);
|
||||
return error;
|
||||
case CPU_ID_AA64ISAR0:
|
||||
value = cpu_id_aa64isar0 & ID_AA64ISAR0_MASK;
|
||||
value &= ~ID_AA64ISAR0_TLB_MASK;
|
||||
return sysctl_rdquad(oldp, oldlenp, newp, value);
|
||||
return sysctl_rdquad(oldp, oldlenp, newp, cpu_id_aa64isar0);
|
||||
case CPU_ID_AA64ISAR1:
|
||||
value = cpu_id_aa64isar1 & ID_AA64ISAR1_MASK;
|
||||
value &= ~ID_AA64ISAR1_SPECRES_MASK;
|
||||
return sysctl_rdquad(oldp, oldlenp, newp, value);
|
||||
case CPU_ID_AA64PFR0:
|
||||
value = 0;
|
||||
value |= cpu_id_aa64pfr0 & ID_AA64PFR0_FP_MASK;
|
||||
value |= cpu_id_aa64pfr0 & ID_AA64PFR0_ADV_SIMD_MASK;
|
||||
value |= cpu_id_aa64pfr0 & ID_AA64PFR0_DIT_MASK;
|
||||
return sysctl_rdquad(oldp, oldlenp, newp, value);
|
||||
case CPU_ID_AA64PFR1:
|
||||
value = 0;
|
||||
value |= cpu_id_aa64pfr1 & ID_AA64PFR1_BT_MASK;
|
||||
value |= cpu_id_aa64pfr1 & ID_AA64PFR1_SSBS_MASK;
|
||||
return sysctl_rdquad(oldp, oldlenp, newp, value);
|
||||
return sysctl_rdquad(oldp, oldlenp, newp, cpu_id_aa64isar1);
|
||||
case CPU_ID_AA64ISAR2:
|
||||
return sysctl_rdquad(oldp, oldlenp, newp, cpu_id_aa64isar2);
|
||||
case CPU_ID_AA64PFR0:
|
||||
return sysctl_rdquad(oldp, oldlenp, newp, cpu_id_aa64pfr0);
|
||||
case CPU_ID_AA64PFR1:
|
||||
return sysctl_rdquad(oldp, oldlenp, newp, cpu_id_aa64pfr1);
|
||||
case CPU_ID_AA64MMFR0:
|
||||
case CPU_ID_AA64MMFR1:
|
||||
case CPU_ID_AA64MMFR2:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: cpu.h,v 1.48 2024/07/10 11:01:24 kettenis Exp $ */
|
||||
/* $OpenBSD: cpu.h,v 1.49 2024/07/17 15:21:59 kettenis Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2016 Dale Rahn <drahn@dalerahn.com>
|
||||
*
|
||||
|
|
@ -63,9 +63,12 @@
|
|||
|
||||
extern uint64_t cpu_id_aa64isar0;
|
||||
extern uint64_t cpu_id_aa64isar1;
|
||||
extern uint64_t cpu_id_aa64isar2;
|
||||
extern uint64_t cpu_id_aa64pfr0;
|
||||
extern uint64_t cpu_id_aa64pfr1;
|
||||
|
||||
void cpu_identify_cleanup(void);
|
||||
|
||||
#include <machine/intr.h>
|
||||
#include <machine/frame.h>
|
||||
#include <machine/armreg.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: pf_ioctl.c,v 1.417 2024/05/13 01:15:53 jsg Exp $ */
|
||||
/* $OpenBSD: pf_ioctl.c,v 1.418 2024/07/18 14:46:28 bluhm Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2001 Daniel Hartmeier
|
||||
|
|
@ -287,7 +287,7 @@ pfattach(int num)
|
|||
*/
|
||||
pf_anchor_stack = cpumem_malloc(
|
||||
sizeof(struct pf_anchor_stackframe) * (PF_ANCHOR_STACK_MAX + 2),
|
||||
M_WAITOK|M_ZERO);
|
||||
M_PF);
|
||||
CPUMEM_FOREACH(sf, &cmi, pf_anchor_stack)
|
||||
sf[PF_ANCHOR_STACK_MAX].sf_stack_top = &sf[0];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: proc.h,v 1.363 2024/07/15 07:24:03 jsg Exp $ */
|
||||
/* $OpenBSD: proc.h,v 1.364 2024/07/17 09:54:14 claudio Exp $ */
|
||||
/* $NetBSD: proc.h,v 1.44 1996/04/22 01:23:21 christos Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -444,8 +444,8 @@ struct proc {
|
|||
#define P_BITS \
|
||||
("\20" "\01INKTR" "\02PROFPEND" "\03ALRMPEND" "\04SIGSUSPEND" \
|
||||
"\05CANTSLEEP" "\06WSLEEP" "\010SINTR" "\012SYSTEM" "\013TIMEOUT" \
|
||||
"\016WEXIT" "\020OWEUPC" "\024SUSPSINGLE" "\027XX" \
|
||||
"\030CONTINUED" "\033THREAD" "\034SUSPSIG" "\035SOFTDEP" "\037CPUPEG")
|
||||
"\016WEXIT" "\020OWEUPC" "\024SUSPSINGLE" "\030CONTINUED" "\033THREAD" \
|
||||
"\034SUSPSIG" "\037CPUPEG")
|
||||
|
||||
#define THREAD_PID_OFFSET 100000
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue