SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-09-06 01:21:03 +00:00
parent 9b453b8087
commit d592c28c93
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
298 changed files with 9365 additions and 4443 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sys/arch/amd64/amd64/conf.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: conf.c,v 1.81 2024/06/12 12:54:54 bluhm Exp $ */
/* $OpenBSD: conf.c,v 1.82 2024/09/04 07:45:08 jsg Exp $ */
/*
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@ -152,8 +152,6 @@ cdev_decl(nvram);
#include "drm.h"
#include "viocon.h"
cdev_decl(viocon);
#include "ccp.h"
cdev_decl(psp);
#include "wsdisplay.h"
#include "wskbd.h"
@ -292,7 +290,7 @@ struct cdevsw cdevsw[] =
cdev_fido_init(NFIDO,fido), /* 98: FIDO/U2F security keys */
cdev_pppx_init(NPPPX,pppac), /* 99: PPP Access Concentrator */
cdev_ujoy_init(NUJOY,ujoy), /* 100: USB joystick/gamecontroller */
cdev_psp_init(NCCP,psp), /* 101: PSP */
cdev_psp_init(NPSP,psp), /* 101: PSP */
};
int nchrdev = nitems(cdevsw);

4
sys/arch/amd64/amd64/trap.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: trap.c,v 1.105 2024/02/21 15:53:07 deraadt Exp $ */
/* $OpenBSD: trap.c,v 1.106 2024/09/04 07:54:51 mglocker Exp $ */
/* $NetBSD: trap.c,v 1.2 2003/05/04 23:51:56 fvdl Exp $ */
/*-
@ -182,7 +182,7 @@ upageflttrap(struct trapframe *frame, uint64_t cr2)
int signal, sicode, error;
/*
* If NX is not enabled, we cant distinguish between PROT_READ
* If NX is not enabled, we can't distinguish between PROT_READ
* and PROT_EXEC access, so try both.
*/
error = uvm_fault(&p->p_vmspace->vm_map, va, 0, access_type);

8
sys/arch/amd64/amd64/vmm_machdep.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: vmm_machdep.c,v 1.34 2024/09/03 13:36:19 dv Exp $ */
/* $OpenBSD: vmm_machdep.c,v 1.36 2024/09/04 16:12:40 dv Exp $ */
/*
* Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org>
*
@ -4181,7 +4181,8 @@ vcpu_run_vmx(struct vcpu *vcpu, struct vm_run_params *vrp)
break;
}
if (!(exitinfo & VMX_EXIT_INFO_HAVE_REASON)) {
printf("%s: cant read exit reason\n", __func__);
printf("%s: can't read exit reason\n",
__func__);
ret = EINVAL;
break;
}
@ -6281,7 +6282,8 @@ vmm_handle_cpuid(struct vcpu *vcpu)
*rdx = 0;
break;
case 0x80000000: /* Extended function level */
*rax = 0x8000001f; /* curcpu()->ci_pnfeatset */
/* We don't emulate past 0x8000001f currently. */
*rax = min(curcpu()->ci_pnfeatset, 0x8000001f);
*rbx = 0;
*rcx = 0;
*rdx = 0;

3
sys/arch/amd64/conf/GENERIC
View file

@ -1,4 +1,4 @@
# $OpenBSD: GENERIC,v 1.525 2024/08/14 14:40:45 patrick Exp $
# $OpenBSD: GENERIC,v 1.526 2024/09/04 07:45:08 jsg Exp $
#
# For further information on compiling SecBSD kernels, see the config(8)
# man page.
@ -123,6 +123,7 @@ ksmn* at pci? # AMD K17 temperature sensor
amas* at pci? disable # AMD memory configuration
pchtemp* at pci? # Intel C610 temperature sensor
ccp* at pci? # AMD Cryptographic Co-processor
psp* at ccp? # AMD Platform Security Processor
# National Semiconductor LM7[89] and compatible hardware monitors
lm0 at isa? port 0x290

4
sys/arch/amd64/conf/files.amd64
View file

@ -1,4 +1,4 @@
# $OpenBSD: files.amd64,v 1.110 2024/09/03 00:23:05 jsg Exp $
# $OpenBSD: files.amd64,v 1.111 2024/09/04 07:45:08 jsg Exp $
maxpartitions 16
maxusers 2 16 128
@ -65,8 +65,6 @@ file arch/amd64/amd64/powernow-k8.c !small_kernel
file arch/amd64/amd64/est.c !small_kernel
file arch/amd64/amd64/k1x-pstate.c !small_kernel
file dev/ic/psp.c ccp
include "dev/rasops/files.rasops"
include "dev/wsfont/files.wsfont"

4
sys/arch/amd64/include/conf.h
View file

@ -1,4 +1,4 @@
/* $OpenBSD: conf.h,v 1.10 2024/09/01 17:13:46 bluhm Exp $ */
/* $OpenBSD: conf.h,v 1.11 2024/09/04 07:45:08 jsg Exp $ */
/* $NetBSD: conf.h,v 1.2 1996/05/05 19:28:34 christos Exp $ */
/*
@ -55,5 +55,5 @@ cdev_decl(pctr);
#include "vmm.h"
cdev_decl(vmm);
#include "ccp.h"
#include "psp.h"
cdev_decl(psp);