sync
This commit is contained in:
parent
3751effe59
commit
29ec20d7b2
GPG key ID:
F42C07F07E2E35B7
33 changed files with 213 additions and 288 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: profile.h,v 1.5 2021/09/04 22:15:33 bluhm Exp $ */
|
||||
/* $OpenBSD: profile.h,v 1.6 2023/06/27 10:11:15 cheloha Exp $ */
|
||||
/* $NetBSD: profile.h,v 1.3 2003/11/28 23:22:45 fvdl Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -72,6 +72,6 @@ __asm(" .globl __mcount \n" \
|
|||
|
||||
|
||||
#ifdef _KERNEL
|
||||
#define MCOUNT_ENTER (void)&s; __asm__("cli");
|
||||
#define MCOUNT_EXIT __asm__("sti");
|
||||
#define MCOUNT_ENTER s = intr_disable()
|
||||
#define MCOUNT_EXIT intr_restore(s)
|
||||
#endif /* _KERNEL */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_iwx.c,v 1.172 2023/06/21 23:24:10 mlarkin Exp $ */
|
||||
/* $OpenBSD: if_iwx.c,v 1.173 2023/06/27 15:31:27 stsp Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2014, 2016 genua gmbh <info@genua.de>
|
||||
|
|
@ -10430,6 +10430,7 @@ static const struct pci_matchid iwx_devices[] = {
|
|||
/* _14 is an MA device, not yet supported */
|
||||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_15,},
|
||||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_16,},
|
||||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_17,},
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -10520,6 +10521,8 @@ static const struct iwx_dev_info iwx_dev_info_table[] = {
|
|||
IWX_DEV_INFO(0x2725, 0x1674, iwx_2ax_cfg_ty_gf_a0), /* killer_1675x */
|
||||
IWX_DEV_INFO(0x51f0, 0x1691, iwx_2ax_cfg_so_gf4_a0), /* killer_1690s */
|
||||
IWX_DEV_INFO(0x51f0, 0x1692, iwx_2ax_cfg_so_gf4_a0), /* killer_1690i */
|
||||
IWX_DEV_INFO(0x51f1, 0x1691, iwx_2ax_cfg_so_gf4_a0),
|
||||
IWX_DEV_INFO(0x51f1, 0x1692, iwx_2ax_cfg_so_gf4_a0),
|
||||
IWX_DEV_INFO(0x54f0, 0x1691, iwx_2ax_cfg_so_gf4_a0), /* killer_1690s */
|
||||
IWX_DEV_INFO(0x54f0, 0x1692, iwx_2ax_cfg_so_gf4_a0), /* killer_1690i */
|
||||
IWX_DEV_INFO(0x7a70, 0x0090, iwx_2ax_cfg_so_gf_a0_long),
|
||||
|
|
@ -11122,7 +11125,6 @@ iwx_attach(struct device *parent, struct device *self, void *aux)
|
|||
case PCI_PRODUCT_INTEL_WL_22500_9:
|
||||
case PCI_PRODUCT_INTEL_WL_22500_10:
|
||||
case PCI_PRODUCT_INTEL_WL_22500_11:
|
||||
case PCI_PRODUCT_INTEL_WL_22500_12:
|
||||
case PCI_PRODUCT_INTEL_WL_22500_13:
|
||||
/* _14 is an MA device, not yet supported */
|
||||
case PCI_PRODUCT_INTEL_WL_22500_15:
|
||||
|
|
@ -11137,6 +11139,19 @@ iwx_attach(struct device *parent, struct device *self, void *aux)
|
|||
sc->sc_tx_with_siso_diversity = 0;
|
||||
sc->sc_uhb_supported = 1;
|
||||
break;
|
||||
case PCI_PRODUCT_INTEL_WL_22500_12:
|
||||
case PCI_PRODUCT_INTEL_WL_22500_17:
|
||||
sc->sc_fwname = IWX_SO_A_GF_A_FW;
|
||||
sc->sc_pnvm_name = IWX_SO_A_GF_A_PNVM;
|
||||
sc->sc_device_family = IWX_DEVICE_FAMILY_AX210;
|
||||
sc->sc_integrated = 1;
|
||||
sc->sc_ltr_delay = IWX_SOC_FLAGS_LTR_APPLY_DELAY_2500;
|
||||
sc->sc_low_latency_xtal = 1;
|
||||
sc->sc_xtal_latency = 12000;
|
||||
sc->sc_tx_with_siso_diversity = 0;
|
||||
sc->sc_uhb_supported = 0;
|
||||
sc->sc_imr_enabled = 1;
|
||||
break;
|
||||
default:
|
||||
printf("%s: unknown adapter type\n", DEVNAME(sc));
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$OpenBSD: pcidevs,v 1.2039 2023/06/13 02:43:39 jcs Exp $
|
||||
$OpenBSD: pcidevs,v 1.2040 2023/06/27 15:30:25 stsp Exp $
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -5875,6 +5875,7 @@ product INTEL 600SERIES_LP_XHCI 0x51ed 600 Series xHCI
|
|||
product INTEL 600SERIES_LP_XDCI 0x51ee 600 Series xDCI
|
||||
product INTEL 600SERIES_LP_SRAM 0x51ef 600 Series SRAM
|
||||
product INTEL WL_22500_11 0x51f0 Wi-Fi 6 AX211
|
||||
product INTEL WL_22500_17 0x51f1 Wi-Fi 6 AX211
|
||||
product INTEL 600SERIES_LP_GSPI_2 0x51fb 600 Series GSPI
|
||||
product INTEL 600SERIES_LP_ISH 0x51fc 600 Series ISH
|
||||
product INTEL 600SERIES_LP_UFS 0x51ff 600 Series UFS
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
|
||||
*
|
||||
* generated from:
|
||||
* OpenBSD: pcidevs,v 1.2039 2023/06/13 02:43:39 jcs Exp
|
||||
* OpenBSD: pcidevs,v 1.2040 2023/06/27 15:30:25 stsp Exp
|
||||
*/
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
||||
|
|
@ -5880,6 +5880,7 @@
|
|||
#define PCI_PRODUCT_INTEL_600SERIES_LP_XDCI 0x51ee /* 600 Series xDCI */
|
||||
#define PCI_PRODUCT_INTEL_600SERIES_LP_SRAM 0x51ef /* 600 Series SRAM */
|
||||
#define PCI_PRODUCT_INTEL_WL_22500_11 0x51f0 /* Wi-Fi 6 AX211 */
|
||||
#define PCI_PRODUCT_INTEL_WL_22500_17 0x51f1 /* Wi-Fi 6 AX211 */
|
||||
#define PCI_PRODUCT_INTEL_600SERIES_LP_GSPI_2 0x51fb /* 600 Series GSPI */
|
||||
#define PCI_PRODUCT_INTEL_600SERIES_LP_ISH 0x51fc /* 600 Series ISH */
|
||||
#define PCI_PRODUCT_INTEL_600SERIES_LP_UFS 0x51ff /* 600 Series UFS */
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
|
||||
*
|
||||
* generated from:
|
||||
* OpenBSD: pcidevs,v 1.2039 2023/06/13 02:43:39 jcs Exp
|
||||
* OpenBSD: pcidevs,v 1.2040 2023/06/27 15:30:25 stsp Exp
|
||||
*/
|
||||
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
|
@ -20875,6 +20875,10 @@ static const struct pci_known_product pci_known_products[] = {
|
|||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_11,
|
||||
"Wi-Fi 6 AX211",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_17,
|
||||
"Wi-Fi 6 AX211",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_600SERIES_LP_GSPI_2,
|
||||
"600 Series GSPI",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: uaudio.c,v 1.172 2022/10/26 20:19:09 kn Exp $ */
|
||||
/* $OpenBSD: uaudio.c,v 1.173 2023/06/27 09:28:08 ratchov Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2018 Alexandre Ratchov <alex@caoua.org>
|
||||
*
|
||||
|
|
@ -2216,7 +2216,7 @@ uaudio_process_ac(struct uaudio_softc *sc, struct uaudio_blob *p, int ifnum)
|
|||
&u->rates)) {
|
||||
printf("%s: failed to read clock rates\n",
|
||||
DEVNAME(sc));
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
#ifdef UAUDIO_DEBUG
|
||||
if (uaudio_debug) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: kern_timeout.c,v 1.90 2022/12/31 16:06:24 cheloha Exp $ */
|
||||
/* $OpenBSD: kern_timeout.c,v 1.91 2023/06/26 16:26:20 cheloha Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2001 Thomas Nordin <nordin@openbsd.org>
|
||||
* Copyright (c) 2000-2001 Artur Grabowski <art@openbsd.org>
|
||||
|
|
@ -542,13 +542,11 @@ timeout_hardclock_update(void)
|
|||
{
|
||||
struct timespec elapsed, now;
|
||||
struct kclock *kc;
|
||||
struct timespec *lastscan;
|
||||
int b, done, first, i, last, level, need_softclock, off;
|
||||
struct timespec *lastscan = &timeout_kclock[KCLOCK_UPTIME].kc_lastscan;
|
||||
int b, done, first, i, last, level, need_softclock = 1, off;
|
||||
|
||||
nanouptime(&now);
|
||||
lastscan = &timeout_kclock[KCLOCK_UPTIME].kc_lastscan;
|
||||
timespecsub(&now, lastscan, &elapsed);
|
||||
need_softclock = 1;
|
||||
|
||||
mtx_enter(&timeout_mutex);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue