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-03 17:41:29 +00:00
parent 0d61274b26
commit bef867f8da
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
81 changed files with 6365 additions and 372 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sys/dev/acpi/acpi.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: acpi.c,v 1.429 2024/05/29 12:21:33 kettenis Exp $ */
/* $OpenBSD: acpi.c,v 1.430 2024/06/02 11:08:41 kettenis Exp $ */
/*
* Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
* Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@ -611,6 +611,10 @@ acpi_getpci(struct aml_node *node, void *arg)
aml_nodename(node));
/* Collect device power state information. */
if (aml_evalinteger(sc, node, "_S0W", 0, NULL, &val) == 0)
pci->_s0w = val;
else
pci->_s0w = -1;
if (aml_evalinteger(sc, node, "_S3D", 0, NULL, &val) == 0)
pci->_s3d = val;
else
@ -721,6 +725,10 @@ acpi_pci_min_powerstate(pci_chipset_tag_t pc, pcitag_t tag)
TAILQ_FOREACH(pdev, &acpi_pcidevs, next) {
if (pdev->bus == bus && pdev->dev == dev && pdev->fun == fun) {
switch (acpi_softc->sc_state) {
case ACPI_STATE_S0:
defaultstate = PCI_PMCSR_STATE_D3;
state = pdev->_s0w;
break;
case ACPI_STATE_S3:
defaultstate = PCI_PMCSR_STATE_D3;
state = MAX(pdev->_s3d, pdev->_s3w);

3
sys/dev/acpi/amltypes.h
View file

@ -1,4 +1,4 @@
/* $OpenBSD: amltypes.h,v 1.49 2022/09/12 17:42:31 kettenis Exp $ */
/* $OpenBSD: amltypes.h,v 1.50 2024/06/02 11:08:41 kettenis Exp $ */
/*
* Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
*
@ -358,6 +358,7 @@ struct acpi_pci {
int dev;
int fun;
int _s0w;
int _s3d;
int _s3w;
int _s4d;

4
sys/dev/ic/nvme.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: nvme.c,v 1.115 2024/05/28 00:24:44 jsg Exp $ */
/* $OpenBSD: nvme.c,v 1.116 2024/06/03 12:01:57 mglocker Exp $ */
/*
* Copyright (c) 2014 David Gwynne <dlg@openbsd.org>
@ -1742,8 +1742,6 @@ nvme_hibernate_io(dev_t dev, daddr_t blkno, vaddr_t addr, size_t size,
my->cq_head = 0;
my->cqe_phase = NVME_CQE_PHASE;
pmap_extract(pmap_kernel(), (vaddr_t)page, &page_phys);
memset(&qsqe, 0, sizeof(qsqe));
qsqe.opcode = NVM_ADMIN_ADD_IOCQ;
htolem64(&qsqe.prp1,

13
sys/dev/pci/drm/drm_linux.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: drm_linux.c,v 1.112 2024/03/30 13:33:20 mpi Exp $ */
/* $OpenBSD: drm_linux.c,v 1.113 2024/06/03 12:48:25 claudio Exp $ */
/*
* Copyright (c) 2013 Jonathan Gray <jsg@openbsd.org>
* Copyright (c) 2015, 2016 Mark Kettenis <kettenis@openbsd.org>
@ -114,14 +114,13 @@ void
__set_current_state(int state)
{
struct proc *p = curproc;
int s;
KASSERT(state == TASK_RUNNING);
SCHED_LOCK(s);
SCHED_LOCK();
unsleep(p);
p->p_stat = SONPROC;
atomic_clearbits_int(&p->p_flag, P_WSLEEP);
SCHED_UNLOCK(s);
SCHED_UNLOCK();
}
void
@ -159,11 +158,11 @@ schedule_timeout_uninterruptible(long timeout)
int
wake_up_process(struct proc *p)
{
int s, rv;
int rv;
SCHED_LOCK(s);
SCHED_LOCK();
rv = wakeup_proc(p, 0);
SCHED_UNLOCK(s);
SCHED_UNLOCK();
return rv;
}