sync with OpenBSD -current
This commit is contained in:
parent
9bb6d42f92
commit
efa57bf0d2
GPG key ID:
F42C07F07E2E35B7
33 changed files with 279 additions and 223 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: cpu.c,v 1.106 2024/02/28 00:53:16 jsg Exp $ */
|
||||
/* $OpenBSD: cpu.c,v 1.107 2024/03/01 15:57:43 kettenis Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2016 Dale Rahn <drahn@dalerahn.com>
|
||||
|
|
@ -266,6 +266,13 @@ void cpu_opp_kstat_attach(struct cpu_info *ci);
|
|||
void
|
||||
cpu_identify(struct cpu_info *ci)
|
||||
{
|
||||
static uint64_t prev_id_aa64isar0;
|
||||
static uint64_t prev_id_aa64isar1;
|
||||
static uint64_t prev_id_aa64isar2;
|
||||
static uint64_t prev_id_aa64mmfr0;
|
||||
static uint64_t prev_id_aa64mmfr1;
|
||||
static uint64_t prev_id_aa64pfr0;
|
||||
static uint64_t prev_id_aa64pfr1;
|
||||
uint64_t midr, impl, part;
|
||||
uint64_t clidr, id;
|
||||
uint32_t ctr, ccsidr, sets, ways, line;
|
||||
|
|
@ -482,6 +489,19 @@ cpu_identify(struct cpu_info *ci)
|
|||
if (impl == CPU_IMPL_APPLE)
|
||||
ci->ci_serror = cpu_serror_apple;
|
||||
|
||||
/*
|
||||
* Skip printing CPU features if they are identical to the
|
||||
* previous CPU.
|
||||
*/
|
||||
if (READ_SPECIALREG(id_aa64isar0_el1) == prev_id_aa64isar0 &&
|
||||
READ_SPECIALREG(id_aa64isar1_el1) == prev_id_aa64isar1 &&
|
||||
READ_SPECIALREG(id_aa64isar2_el1) == prev_id_aa64isar2 &&
|
||||
READ_SPECIALREG(id_aa64mmfr0_el1) == prev_id_aa64mmfr0 &&
|
||||
READ_SPECIALREG(id_aa64mmfr1_el1) == prev_id_aa64mmfr1 &&
|
||||
READ_SPECIALREG(id_aa64pfr0_el1) == prev_id_aa64pfr0 &&
|
||||
READ_SPECIALREG(id_aa64pfr1_el1) == prev_id_aa64pfr1)
|
||||
return;
|
||||
|
||||
/*
|
||||
* Print CPU features encoded in the ID registers.
|
||||
*/
|
||||
|
|
@ -787,6 +807,14 @@ cpu_identify(struct cpu_info *ci)
|
|||
sep = ",";
|
||||
}
|
||||
|
||||
prev_id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1);
|
||||
prev_id_aa64isar1 = READ_SPECIALREG(id_aa64isar1_el1);
|
||||
prev_id_aa64isar2 = READ_SPECIALREG(id_aa64isar2_el1);
|
||||
prev_id_aa64mmfr0 = READ_SPECIALREG(id_aa64mmfr0_el1);
|
||||
prev_id_aa64mmfr1 = READ_SPECIALREG(id_aa64mmfr1_el1);
|
||||
prev_id_aa64pfr0 = READ_SPECIALREG(id_aa64pfr0_el1);
|
||||
prev_id_aa64pfr1 = READ_SPECIALREG(id_aa64pfr1_el1);
|
||||
|
||||
#ifdef CPU_DEBUG
|
||||
id = READ_SPECIALREG(id_aa64afr0_el1);
|
||||
printf("\nID_AA64AFR0_EL1: 0x%016llx", id);
|
||||
|
|
|
|||
|
|
@ -771,6 +771,7 @@ static const struct intel_device_info xehpsdv_info = {
|
|||
|
||||
static const struct intel_device_info dg2_info = {
|
||||
DG2_FEATURES,
|
||||
.require_force_probe = 1,
|
||||
};
|
||||
|
||||
static const struct intel_device_info ats_m_info = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_vmx.c,v 1.81 2024/02/15 13:24:45 jan Exp $ */
|
||||
/* $OpenBSD: if_vmx.c,v 1.82 2024/02/29 22:09:33 jan Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2013 Tsubai Masanari
|
||||
|
|
@ -18,6 +18,7 @@
|
|||
|
||||
#include "bpfilter.h"
|
||||
#include "kstat.h"
|
||||
#include "vlan.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/device.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$OpenBSD: pcidevs,v 1.2064 2024/02/29 10:09:54 jsg Exp $
|
||||
$OpenBSD: pcidevs,v 1.2065 2024/03/01 08:34:42 jsg Exp $
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -8537,6 +8537,7 @@ product QUMRANET VIO1_NET 0x1041 Virtio 1.x Network
|
|||
product QUMRANET VIO1_BLOCK 0x1042 Virtio 1.x Storage
|
||||
product QUMRANET VIO1_CONS 0x1043 Virtio 1.x Console
|
||||
product QUMRANET VIO1_RNG 0x1044 Virtio 1.x RNG
|
||||
product QUMRANET VIO1_MEM 0x1045 Virtio 1.x Memory Balloon
|
||||
product QUMRANET VIO1_SCSI 0x1048 Virtio 1.x SCSI
|
||||
product QUMRANET VIO1_GPU 0x1050 Virtio 1.x GPU
|
||||
product QUMRANET VIO1_INPUT 0x1052 Virtio 1.x Input
|
||||
|
|
@ -8702,6 +8703,10 @@ product REDHAT SERIAL2 0x0003 Qemu Serial 2x
|
|||
product REDHAT SERIAL4 0x0004 Qemu Serial 4x
|
||||
product REDHAT SDMMC 0x0007 SD/MMC
|
||||
product REDHAT HB 0x0008 Host
|
||||
product REDHAT PCIE 0x000c PCIE
|
||||
product REDHAT XHCI 0x000d xHCI
|
||||
product REDHAT PCI 0x000e PCI
|
||||
product REDHAT NVME 0x0010 NVMe
|
||||
product REDHAT QXL 0x0100 QXL Video
|
||||
|
||||
/* Rendition products */
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
|
||||
*
|
||||
* generated from:
|
||||
* OpenBSD: pcidevs,v 1.2064 2024/02/29 10:09:54 jsg Exp
|
||||
* OpenBSD: pcidevs,v 1.2065 2024/03/01 08:34:42 jsg Exp
|
||||
*/
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
||||
|
|
@ -8542,6 +8542,7 @@
|
|||
#define PCI_PRODUCT_QUMRANET_VIO1_BLOCK 0x1042 /* Virtio 1.x Storage */
|
||||
#define PCI_PRODUCT_QUMRANET_VIO1_CONS 0x1043 /* Virtio 1.x Console */
|
||||
#define PCI_PRODUCT_QUMRANET_VIO1_RNG 0x1044 /* Virtio 1.x RNG */
|
||||
#define PCI_PRODUCT_QUMRANET_VIO1_MEM 0x1045 /* Virtio 1.x Memory Balloon */
|
||||
#define PCI_PRODUCT_QUMRANET_VIO1_SCSI 0x1048 /* Virtio 1.x SCSI */
|
||||
#define PCI_PRODUCT_QUMRANET_VIO1_GPU 0x1050 /* Virtio 1.x GPU */
|
||||
#define PCI_PRODUCT_QUMRANET_VIO1_INPUT 0x1052 /* Virtio 1.x Input */
|
||||
|
|
@ -8707,6 +8708,10 @@
|
|||
#define PCI_PRODUCT_REDHAT_SERIAL4 0x0004 /* Qemu Serial 4x */
|
||||
#define PCI_PRODUCT_REDHAT_SDMMC 0x0007 /* SD/MMC */
|
||||
#define PCI_PRODUCT_REDHAT_HB 0x0008 /* Host */
|
||||
#define PCI_PRODUCT_REDHAT_PCIE 0x000c /* PCIE */
|
||||
#define PCI_PRODUCT_REDHAT_XHCI 0x000d /* xHCI */
|
||||
#define PCI_PRODUCT_REDHAT_PCI 0x000e /* PCI */
|
||||
#define PCI_PRODUCT_REDHAT_NVME 0x0010 /* NVMe */
|
||||
#define PCI_PRODUCT_REDHAT_QXL 0x0100 /* QXL Video */
|
||||
|
||||
/* Rendition products */
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
|
||||
*
|
||||
* generated from:
|
||||
* OpenBSD: pcidevs,v 1.2064 2024/02/29 10:09:54 jsg Exp
|
||||
* OpenBSD: pcidevs,v 1.2065 2024/03/01 08:34:42 jsg Exp
|
||||
*/
|
||||
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
|
@ -30763,6 +30763,10 @@ static const struct pci_known_product pci_known_products[] = {
|
|||
PCI_VENDOR_QUMRANET, PCI_PRODUCT_QUMRANET_VIO1_RNG,
|
||||
"Virtio 1.x RNG",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_QUMRANET, PCI_PRODUCT_QUMRANET_VIO1_MEM,
|
||||
"Virtio 1.x Memory Balloon",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_QUMRANET, PCI_PRODUCT_QUMRANET_VIO1_SCSI,
|
||||
"Virtio 1.x SCSI",
|
||||
|
|
@ -31383,6 +31387,22 @@ static const struct pci_known_product pci_known_products[] = {
|
|||
PCI_VENDOR_REDHAT, PCI_PRODUCT_REDHAT_HB,
|
||||
"Host",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_REDHAT, PCI_PRODUCT_REDHAT_PCIE,
|
||||
"PCIE",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_REDHAT, PCI_PRODUCT_REDHAT_XHCI,
|
||||
"xHCI",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_REDHAT, PCI_PRODUCT_REDHAT_PCI,
|
||||
"PCI",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_REDHAT, PCI_PRODUCT_REDHAT_NVME,
|
||||
"NVMe",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_REDHAT, PCI_PRODUCT_REDHAT_QXL,
|
||||
"QXL Video",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: uipc_syscalls.c,v 1.217 2024/02/03 22:50:09 mvs Exp $ */
|
||||
/* $OpenBSD: uipc_syscalls.c,v 1.218 2024/03/01 14:15:01 bluhm Exp $ */
|
||||
/* $NetBSD: uipc_syscalls.c,v 1.19 1996/02/09 19:00:48 christos Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -1560,12 +1560,12 @@ sys_ypconnect(struct proc *p, void *v, register_t *retval)
|
|||
|
||||
if (p->p_p->ps_flags & PS_CHROOT)
|
||||
return EACCES;
|
||||
KERNEL_LOCK();
|
||||
name = pool_get(&namei_pool, PR_WAITOK);
|
||||
snprintf(name, MAXPATHLEN, "/var/yp/binding/%s.2", domainname);
|
||||
NDINIT(&nid, 0, NOFOLLOW|LOCKLEAF|KERNELPATH, UIO_SYSSPACE, name, p);
|
||||
nid.ni_pledge = PLEDGE_RPATH;
|
||||
|
||||
KERNEL_LOCK();
|
||||
error = namei(&nid);
|
||||
pool_put(&namei_pool, name);
|
||||
if (error)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue