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-07-06 00:32:13 +00:00
parent b8cf0a282a
commit 5c4b1d765f
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
5 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sys/arch/arm64/dev/pci_machdep.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: pci_machdep.c,v 1.6 2024/02/03 10:37:25 kettenis Exp $ */ /* $OpenBSD: pci_machdep.c,v 1.7 2024/07/05 22:53:57 patrick Exp $ */
/* /*
* Copyright (c) 2019 Mark Kettenis <kettenis@openbsd.org> * Copyright (c) 2019 Mark Kettenis <kettenis@openbsd.org>
@ -32,7 +32,7 @@ pci_intr_enable_msivec(struct pci_attach_args *pa, int num_vec)
pcireg_t reg; pcireg_t reg;
int mmc, mme, off; int mmc, mme, off;
if ((pa->pa_flags & PCI_FLAGS_MSI_ENABLED) == 0 || if ((pa->pa_flags & PCI_FLAGS_MSIVEC_ENABLED) == 0 ||
pci_get_capability(pc, tag, PCI_CAP_MSI, &off, &reg) == 0) pci_get_capability(pc, tag, PCI_CAP_MSI, &off, &reg) == 0)
return 1; return 1;

5
sys/dev/fdt/dwpcie.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: dwpcie.c,v 1.54 2024/07/02 19:44:37 patrick Exp $ */ /* $OpenBSD: dwpcie.c,v 1.55 2024/07/05 22:52:25 patrick Exp $ */
/* /*
* Copyright (c) 2018 Mark Kettenis <kettenis@openbsd.org> * Copyright (c) 2018 Mark Kettenis <kettenis@openbsd.org>
* *
@ -1505,6 +1505,9 @@ dwpcie_sc8280xp_init(struct dwpcie_softc *sc)
{ {
sc->sc_num_viewport = 8; sc->sc_num_viewport = 8;
if (OF_getproplen(sc->sc_node, "msi-map") <= 0)
return dwpcie_msi_init(sc);
return 0; return 0;
} }

4
sys/dev/pci/if_qwx_pci.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_qwx_pci.c,v 1.20 2024/06/11 10:06:35 stsp Exp $ */ /* $OpenBSD: if_qwx_pci.c,v 1.21 2024/07/05 21:24:13 patrick Exp $ */
/* /*
* Copyright 2023 Stefan Sperling <stsp@openbsd.org> * Copyright 2023 Stefan Sperling <stsp@openbsd.org>
@ -4130,11 +4130,13 @@ qwx_pci_intr(void *arg)
ret = 1; ret = 1;
} }
if (test_bit(QWX_FLAG_EXT_IRQ_ENABLED, sc->sc_flags)) {
for (i = 0; i < nitems(sc->ext_irq_grp); i++) { for (i = 0; i < nitems(sc->ext_irq_grp); i++) {
if (qwx_dp_service_srng(sc, i)) if (qwx_dp_service_srng(sc, i))
ret = 1; ret = 1;
} }
} }
}
return ret; return ret;
} }

14
sys/kern/vfs_subr.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: vfs_subr.c,v 1.319 2024/02/03 18:51:58 beck Exp $ */ /* $OpenBSD: vfs_subr.c,v 1.320 2024/07/05 05:42:08 jsg Exp $ */
/* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */ /* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */
/* /*
@ -2225,18 +2225,6 @@ reassignbuf(struct buf *bp)
bufinsvn(bp, listheadp); bufinsvn(bp, listheadp);
} }
/*
* Check if vnode represents a disk device
*/
int
vn_isdisk(struct vnode *vp, int *errp)
{
if (vp->v_type != VBLK && vp->v_type != VCHR)
return (0);
return (1);
}
#ifdef DDB #ifdef DDB
#include <machine/db_machdep.h> #include <machine/db_machdep.h>
#include <ddb/db_interface.h> #include <ddb/db_interface.h>

3
sys/sys/vnode.h
View file

@ -1,4 +1,4 @@
/* $OpenBSD: vnode.h,v 1.170 2024/02/03 18:51:58 beck Exp $ */ /* $OpenBSD: vnode.h,v 1.171 2024/07/05 05:42:08 jsg Exp $ */
/* $NetBSD: vnode.h,v 1.38 1996/02/29 20:59:05 cgd Exp $ */ /* $NetBSD: vnode.h,v 1.38 1996/02/29 20:59:05 cgd Exp $ */
/* /*
@ -642,7 +642,6 @@ void vn_initialize_syncerd(void);
void vn_syncer_add_to_worklist(struct vnode *, int); void vn_syncer_add_to_worklist(struct vnode *, int);
/* misc */ /* misc */
int vn_isdisk(struct vnode *, int *);
int getvnode(struct proc *, int, struct file **); int getvnode(struct proc *, int, struct file **);
/* uvm */ /* uvm */