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-06-26 04:27:03 +00:00
parent fdb8624c1a
commit 7f3136b31c
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
43 changed files with 307 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sys/arch/amd64/amd64/intr.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: intr.c,v 1.60 2024/06/15 18:01:44 kettenis Exp $ */
/* $OpenBSD: intr.c,v 1.61 2024/06/25 12:02:48 kettenis Exp $ */
/* $NetBSD: intr.c,v 1.3 2003/03/03 22:16:20 fvdl Exp $ */
/*
@ -74,6 +74,7 @@ struct pic softintr_pic = {
};
int intr_suspended;
struct intrhand *intr_nowake;
/*
* Fill in default interrupt table (in case of spurious interrupt
@ -537,8 +538,10 @@ intr_handler(struct intrframe *frame, struct intrhand *ih)
* We may not be able to mask MSIs, so block non-wakeup
* interrupts while we're suspended.
*/
if (intr_suspended && (ih->ih_flags & IPL_WAKEUP) == 0)
if (intr_suspended && (ih->ih_flags & IPL_WAKEUP) == 0) {
intr_nowake = ih;
return 0;
}
#ifdef MULTIPROCESSOR
if (ih->ih_flags & IPL_MPSAFE)
@ -749,6 +752,13 @@ intr_disable_wakeup(void)
if (pic->pic_hwunmask)
pic->pic_hwunmask(pic, pin);
}
if (intr_nowake) {
printf("last non-wakeup interrupt: irq%d/%s\n",
*(int *)intr_nowake->ih_count.ec_data,
intr_nowake->ih_count.ec_name);
intr_nowake = NULL;
}
}
#endif

5
sys/arch/amd64/amd64/machdep.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: machdep.c,v 1.294 2024/06/07 16:53:35 kettenis Exp $ */
/* $OpenBSD: machdep.c,v 1.295 2024/06/26 01:40:49 jsg Exp $ */
/* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */
/*-
@ -1294,7 +1294,8 @@ set_sys_segment(struct sys_segment_descriptor *sd, void *base, size_t limit,
sd->sd_hibase = (u_int64_t)base >> 24;
}
void cpu_init_idt(void)
void
cpu_init_idt(void)
{
struct region_descriptor region;

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

@ -1,4 +1,4 @@
/* $OpenBSD: vmm_machdep.c,v 1.27 2024/05/13 01:15:50 jsg Exp $ */
/* $OpenBSD: vmm_machdep.c,v 1.28 2024/06/26 01:40:49 jsg Exp $ */
/*
* Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org>
*
@ -8370,7 +8370,8 @@ vmm_decode_perf_status_value(uint64_t val)
DPRINTF("(pstate ratio = 0x%llx)\n", (val & 0xffff));
}
void vmm_decode_perf_ctl_value(uint64_t val)
void
vmm_decode_perf_ctl_value(uint64_t val)
{
DPRINTF("(%s ", (val & PERF_CTL_TURBO) ? "TURBO" : "turbo");
DPRINTF("pstate req = 0x%llx)\n", (val & 0xfffF));