sync with OpenBSD -current

games/cribbage/cribbage.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: cribbage.h,v 1.12 2015/12/31 18:10:19 mestre Exp $	*/
+/*	$OpenBSD: cribbage.h,v 1.13 2024/05/23 00:45:08 jsg Exp $	*/
 /*	$NetBSD: cribbage.h,v 1.3 1995/03/21 15:08:46 cgd Exp $	*/
 
 /*
@@ -60,7 +60,6 @@ extern  bool		explain;		/* player mistakes explained */
 extern  bool		muggins;		/* player mistakes exploited */
 extern  bool		rflag;			/* if all cuts random */
 extern  bool		quiet;			/* if suppress random mess */
-extern	bool		playing;		/* currently playing game */
 
 extern  char		expl_string[128];		/* string for explanation */
 

lib/libcrypto/evp/e_chacha20poly1305.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: e_chacha20poly1305.c,v 1.35 2024/04/09 13:52:41 beck Exp $ */
+/* $OpenBSD: e_chacha20poly1305.c,v 1.36 2024/05/22 14:02:08 tb Exp $ */
 
 /*
  * Copyright (c) 2022 Joel Sing <jsing@openbsd.org>
@@ -493,6 +493,8 @@ chacha20_poly1305_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
 	/* Update with AD or plaintext/ciphertext. */
 	if (in != NULL) {
+		if (!ctx->encrypt || out == NULL)
+			CRYPTO_poly1305_update(&cpx->poly1305, in, len);
 		if (out == NULL) {
 			cpx->ad_len += len;
 			cpx->in_ad = 1;
@@ -502,8 +504,6 @@ chacha20_poly1305_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 		}
 		if (ctx->encrypt && out != NULL)
 			CRYPTO_poly1305_update(&cpx->poly1305, out, len);
-		else
-			CRYPTO_poly1305_update(&cpx->poly1305, in, len);
 
 		return len;
 	}

lib/libcrypto/man/X509v3_get_ext_by_NID.3

@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509v3_get_ext_by_NID.3,v 1.13 2021/07/12 14:54:00 schwarze Exp $
+.\" $OpenBSD: X509v3_get_ext_by_NID.3,v 1.15 2024/05/22 09:44:10 tb Exp $
 .\" full merge up to: OpenSSL fd38836b Jun 20 15:25:43 2018 +0100
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 12 2021 $
+.Dd $Mdocdate: May 22 2024 $
 .Dt X509V3_GET_EXT_BY_NID 3
 .Os
 .Sh NAME
@@ -248,7 +248,7 @@ from
 The index
 .Fa loc
 can take any value from 0 to
-.Fn X509_get_ext_count x No - 1 .
+.Fn X509_get_ext_count x No \- 1 .
 The returned extension is an internal pointer which must not be
 freed up by the application.
 .Pp
@@ -265,9 +265,9 @@ The search starts from the extension after
 .Fa lastpos
 or from the beginning if
 .Fa lastpos
-is -1.
-If the extension is found, its index is returned; otherwise, -1 is
-returned.
+is \-1.
+If the extension is found, its index is returned; otherwise, a negative
+value is returned.
 .Pp
 .Fn X509v3_get_ext_by_critical
 is similar to
@@ -300,7 +300,7 @@ at position
 .Fa loc .
 If
 .Fa loc
-is -1, the new extension is added to the end.
+is \-1, the new extension is added to the end.
 If
 .Pf * Fa x
 is
@@ -358,7 +358,7 @@ These search functions start from the extension
 .Em after
 the
 .Fa lastpos
-parameter, so it should initially be set to -1.
+parameter, so it should initially be set to \-1.
 If it is set to 0, the initial extension will not be checked.
 .Sh RETURN VALUES
 .Fn X509v3_get_ext_count
@@ -378,7 +378,13 @@ if an error occurs.
 .Fn X509v3_get_ext_by_OBJ ,
 and
 .Fn X509v3_get_ext_by_critical
-return the extension index or -1 if an error occurs.
+return the extension index or \-1 if an error occurs.
+In addition,
+.Fn X509v3_get_ext_by_NID
+returns \-2 if
+.Xr OBJ_nid2obj 3
+fails on the requested
+.Fa nid .
 .Pp
 .Fn X509v3_add_ext
 returns a stack of extensions or
@@ -388,6 +394,7 @@ on error.
 .Fn X509_add_ext
 returns 1 on success or 0 on error.
 .Sh SEE ALSO
+.Xr OBJ_nid2obj 3 ,
 .Xr X509_CRL_new 3 ,
 .Xr X509_EXTENSION_new 3 ,
 .Xr X509_new 3 ,

lib/libcrypto/x509/x509_v3.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_v3.c,v 1.22 2024/05/16 13:19:09 tb Exp $ */
+/* $OpenBSD: x509_v3.c,v 1.30 2024/05/23 02:00:38 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -69,23 +69,24 @@
 #include "x509_local.h"
 
 int
-X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x)
+X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *sk)
 {
-	if (x == NULL)
+	if (sk == NULL)
 		return 0;
-	return sk_X509_EXTENSION_num(x);
+
+	return sk_X509_EXTENSION_num(sk);
 }
 LCRYPTO_ALIAS(X509v3_get_ext_count);
 
 int
-X509v3_get_ext_by_NID(const STACK_OF(X509_EXTENSION) *x, int nid, int lastpos)
+X509v3_get_ext_by_NID(const STACK_OF(X509_EXTENSION) *sk, int nid, int lastpos)
 {
-	ASN1_OBJECT *obj;
+	const ASN1_OBJECT *obj;
 
-	obj = OBJ_nid2obj(nid);
-	if (obj == NULL)
+	if ((obj = OBJ_nid2obj(nid)) == NULL)
 		return -2;
-	return X509v3_get_ext_by_OBJ(x, obj, lastpos);
+
+	return X509v3_get_ext_by_OBJ(sk, obj, lastpos);
 }
 LCRYPTO_ALIAS(X509v3_get_ext_by_NID);
 
@@ -94,7 +95,7 @@ X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *sk,
     const ASN1_OBJECT *obj, int lastpos)
 {
 	int n;
-	X509_EXTENSION *ex;
+	X509_EXTENSION *ext;
 
 	if (sk == NULL)
 		return -1;
@@ -103,8 +104,8 @@ X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *sk,
 		lastpos = 0;
 	n = sk_X509_EXTENSION_num(sk);
 	for (; lastpos < n; lastpos++) {
-		ex = sk_X509_EXTENSION_value(sk, lastpos);
-		if (OBJ_cmp(ex->object, obj) == 0)
+		ext = sk_X509_EXTENSION_value(sk, lastpos);
+		if (OBJ_cmp(ext->object, obj) == 0)
 			return lastpos;
 	}
 	return -1;
@@ -116,7 +117,7 @@ X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *sk, int crit,
     int lastpos)
 {
 	int n;
-	X509_EXTENSION *ex;
+	X509_EXTENSION *ext;
 
 	if (sk == NULL)
 		return -1;
@@ -125,9 +126,9 @@ X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *sk, int crit,
 		lastpos = 0;
 	n = sk_X509_EXTENSION_num(sk);
 	for (; lastpos < n; lastpos++) {
-		ex = sk_X509_EXTENSION_value(sk, lastpos);
-		if ((ex->critical > 0 && crit) ||
-		    (ex->critical <= 0 && !crit))
+		ext = sk_X509_EXTENSION_value(sk, lastpos);
+		if ((ext->critical > 0 && crit) ||
+		    (ext->critical <= 0 && !crit))
 			return lastpos;
 	}
 	return -1;
@@ -135,31 +136,29 @@ X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *sk, int crit,
 LCRYPTO_ALIAS(X509v3_get_ext_by_critical);
 
 X509_EXTENSION *
-X509v3_get_ext(const STACK_OF(X509_EXTENSION) *x, int loc)
+X509v3_get_ext(const STACK_OF(X509_EXTENSION) *sk, int loc)
 {
-	if (x == NULL || sk_X509_EXTENSION_num(x) <= loc || loc < 0)
+	if (sk == NULL || sk_X509_EXTENSION_num(sk) <= loc || loc < 0)
 		return NULL;
-	else
-		return sk_X509_EXTENSION_value(x, loc);
+
+	return sk_X509_EXTENSION_value(sk, loc);
 }
 LCRYPTO_ALIAS(X509v3_get_ext);
 
 X509_EXTENSION *
-X509v3_delete_ext(STACK_OF(X509_EXTENSION) *x, int loc)
+X509v3_delete_ext(STACK_OF(X509_EXTENSION) *sk, int loc)
 {
-	X509_EXTENSION *ret;
-
-	if (x == NULL || sk_X509_EXTENSION_num(x) <= loc || loc < 0)
+	if (sk == NULL || sk_X509_EXTENSION_num(sk) <= loc || loc < 0)
 		return NULL;
-	ret = sk_X509_EXTENSION_delete(x, loc);
-	return ret;
+
+	return sk_X509_EXTENSION_delete(sk, loc);
 }
 LCRYPTO_ALIAS(X509v3_delete_ext);
 
 STACK_OF(X509_EXTENSION) *
-X509v3_add_ext(STACK_OF(X509_EXTENSION) **x, X509_EXTENSION *ex, int loc)
+X509v3_add_ext(STACK_OF(X509_EXTENSION) **x, X509_EXTENSION *ext, int loc)
 {
-	X509_EXTENSION *new_ex = NULL;
+	X509_EXTENSION *new_ext = NULL;
 	int n;
 	STACK_OF(X509_EXTENSION) *sk = NULL;
 
@@ -180,19 +179,19 @@ X509v3_add_ext(STACK_OF(X509_EXTENSION) **x, X509_EXTENSION *ex, int loc)
 	else if (loc < 0)
 		loc = n;
 
-	if ((new_ex = X509_EXTENSION_dup(ex)) == NULL)
+	if ((new_ext = X509_EXTENSION_dup(ext)) == NULL)
 		goto err2;
-	if (!sk_X509_EXTENSION_insert(sk, new_ex, loc))
+	if (!sk_X509_EXTENSION_insert(sk, new_ext, loc))
 		goto err;
 	if (*x == NULL)
 		*x = sk;
 	return sk;
 
-err:
+ err:
 	X509error(ERR_R_MALLOC_FAILURE);
-err2:
-	if (new_ex != NULL)
-		X509_EXTENSION_free(new_ex);
+ err2:
+	if (new_ext != NULL)
+		X509_EXTENSION_free(new_ext);
 	if (sk != NULL && x != NULL && sk != *x)
 		sk_X509_EXTENSION_free(sk);
 	return NULL;
@@ -200,7 +199,7 @@ err2:
 LCRYPTO_ALIAS(X509v3_add_ext);
 
 X509_EXTENSION *
-X509_EXTENSION_create_by_NID(X509_EXTENSION **ex, int nid, int crit,
+X509_EXTENSION_create_by_NID(X509_EXTENSION **ext, int nid, int crit,
     ASN1_OCTET_STRING *data)
 {
 	ASN1_OBJECT *obj;
@@ -211,7 +210,7 @@ X509_EXTENSION_create_by_NID(X509_EXTENSION **ex, int nid, int crit,
 		X509error(X509_R_UNKNOWN_NID);
 		return NULL;
 	}
-	ret = X509_EXTENSION_create_by_OBJ(ex, obj, crit, data);
+	ret = X509_EXTENSION_create_by_OBJ(ext, obj, crit, data);
 	if (ret == NULL)
 		ASN1_OBJECT_free(obj);
 	return ret;
@@ -219,18 +218,18 @@ X509_EXTENSION_create_by_NID(X509_EXTENSION **ex, int nid, int crit,
 LCRYPTO_ALIAS(X509_EXTENSION_create_by_NID);
 
 X509_EXTENSION *
-X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex, const ASN1_OBJECT *obj,
+X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ext, const ASN1_OBJECT *obj,
     int crit, ASN1_OCTET_STRING *data)
 {
 	X509_EXTENSION *ret;
 
-	if (ex == NULL || *ex == NULL) {
+	if (ext == NULL || *ext == NULL) {
 		if ((ret = X509_EXTENSION_new()) == NULL) {
 			X509error(ERR_R_MALLOC_FAILURE);
 			return NULL;
 		}
 	} else
-		ret= *ex;
+		ret= *ext;
 
 	if (!X509_EXTENSION_set_object(ret, obj))
 		goto err;
@@ -239,76 +238,78 @@ X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex, const ASN1_OBJECT *obj,
 	if (!X509_EXTENSION_set_data(ret, data))
 		goto err;
 
-	if (ex != NULL && *ex == NULL)
-		*ex = ret;
+	if (ext != NULL && *ext == NULL)
+		*ext = ret;
 	return ret;
 
-err:
-	if (ex == NULL || ret != *ex)
+ err:
+	if (ext == NULL || ret != *ext)
 		X509_EXTENSION_free(ret);
 	return NULL;
 }
 LCRYPTO_ALIAS(X509_EXTENSION_create_by_OBJ);
 
 int
-X509_EXTENSION_set_object(X509_EXTENSION *ex, const ASN1_OBJECT *obj)
+X509_EXTENSION_set_object(X509_EXTENSION *ext, const ASN1_OBJECT *obj)
 {
-	if (ex == NULL || obj == NULL)
+	if (ext == NULL || obj == NULL)
 		return 0;
-	ASN1_OBJECT_free(ex->object);
-	ex->object = OBJ_dup(obj);
-	return ex->object != NULL;
+
+	ASN1_OBJECT_free(ext->object);
+	ext->object = OBJ_dup(obj);
+
+	return ext->object != NULL;
 }
 LCRYPTO_ALIAS(X509_EXTENSION_set_object);
 
 int
-X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit)
+X509_EXTENSION_set_critical(X509_EXTENSION *ext, int crit)
 {
-	if (ex == NULL)
+	if (ext == NULL)
 		return 0;
-	ex->critical = crit ? 0xFF : -1;
+
+	ext->critical = crit ? 0xFF : -1;
+
 	return 1;
 }
 LCRYPTO_ALIAS(X509_EXTENSION_set_critical);
 
 int
-X509_EXTENSION_set_data(X509_EXTENSION *ex, ASN1_OCTET_STRING *data)
+X509_EXTENSION_set_data(X509_EXTENSION *ext, ASN1_OCTET_STRING *data)
 {
-	int i;
+	if (ext == NULL)
+		return 0;
 
-	if (ex == NULL)
-		return 0;
-	i = ASN1_STRING_set(ex->value, data->data, data->length);
-	if (!i)
-		return 0;
-	return 1;
+	return ASN1_STRING_set(ext->value, data->data, data->length);
 }
 LCRYPTO_ALIAS(X509_EXTENSION_set_data);
 
 ASN1_OBJECT *
-X509_EXTENSION_get_object(X509_EXTENSION *ex)
+X509_EXTENSION_get_object(X509_EXTENSION *ext)
 {
-	if (ex == NULL)
+	if (ext == NULL)
 		return NULL;
-	return ex->object;
+
+	return ext->object;
 }
 LCRYPTO_ALIAS(X509_EXTENSION_get_object);
 
 ASN1_OCTET_STRING *
-X509_EXTENSION_get_data(X509_EXTENSION *ex)
+X509_EXTENSION_get_data(X509_EXTENSION *ext)
 {
-	if (ex == NULL)
+	if (ext == NULL)
 		return NULL;
-	return ex->value;
+
+	return ext->value;
 }
 LCRYPTO_ALIAS(X509_EXTENSION_get_data);
 
 int
-X509_EXTENSION_get_critical(const X509_EXTENSION *ex)
+X509_EXTENSION_get_critical(const X509_EXTENSION *ext)
 {
-	if (ex == NULL)
+	if (ext == NULL)
 		return 0;
-	if (ex->critical > 0)
+	if (ext->critical > 0)
 		return 1;
 	return 0;
 }

lib/libssl/man/SSL_COMP_add_compression_method.3

@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_COMP_add_compression_method.3,v 1.5 2019/06/12 09:36:30 schwarze Exp $
+.\" $OpenBSD: SSL_COMP_add_compression_method.3,v 1.6 2024/05/23 06:49:55 tb Exp $
 .\"
 .\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: June 12 2019 $
+.Dd $Mdocdate: May 23 2024 $
 .Dt SSL_COMP_ADD_COMPRESSION_METHOD 3
 .Os
 .Sh NAME
@@ -24,7 +24,7 @@
 .Sh SYNOPSIS
 .In openssl/ssl.h
 .Ft int
-.Fn SSL_COMP_add_compression_method "int id" "COMP_METHOD *cm"
+.Fn SSL_COMP_add_compression_method "int id" "void *cm"
 .Ft STACK_OF(SSL_COMP) *
 .Fn SSL_COMP_get_compression_methods void
 .Sh DESCRIPTION

libexec/snmpd/snmpd_metrics/mib.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: mib.c,v 1.8 2024/04/28 16:42:53 florian Exp $	*/
+/*	$OpenBSD: mib.c,v 1.9 2024/05/22 08:44:02 martijn Exp $	*/
 
 /*
  * Copyright (c) 2022 Martijn van Duren <martijn@openbsd.org>
@@ -296,29 +296,31 @@ mib_hrsystemdate(struct agentx_varbind *vb)
 	int		 tzoffset;
 	unsigned short	 year;
 
-	memset(s, 0, sizeof(s));
 	(void)time(&now);
 	ptm = localtime(&now);
 
-	if (ptm != NULL) {
-		year = htons(ptm->tm_year + 1900);
-		memcpy(s, &year, 2);
-		s[2] = ptm->tm_mon + 1;
-		s[3] = ptm->tm_mday;
-		s[4] = ptm->tm_hour;
-		s[5] = ptm->tm_min;
-		s[6] = ptm->tm_sec;
-		s[7] = 0;
-
-		tzoffset = ptm->tm_gmtoff;
-		if (tzoffset < 0)
-			s[8] = '-';
-		else
-			s[8] = '+';
-
-		s[9] = abs(tzoffset) / 3600;
-		s[10] = (abs(tzoffset) - (s[9] * 3600)) / 60;
+	if (ptm == NULL) {
+		log_warnx("localtime");
+		agentx_varbind_error(vb);
+		return;
 	}
+	year = htons(ptm->tm_year + 1900);
+	memcpy(s, &year, 2);
+	s[2] = ptm->tm_mon + 1;
+	s[3] = ptm->tm_mday;
+	s[4] = ptm->tm_hour;
+	s[5] = ptm->tm_min;
+	s[6] = ptm->tm_sec;
+	s[7] = 0;
+
+	tzoffset = ptm->tm_gmtoff;
+	if (tzoffset < 0)
+		s[8] = '-';
+	else
+		s[8] = '+';
+
+	s[9] = abs(tzoffset) / 3600;
+	s[10] = (abs(tzoffset) - (s[9] * 3600)) / 60;
 	agentx_varbind_nstring(vb, s, sizeof(s));
 }
 

regress/lib/libcrypto/wycheproof/wycheproof.go

@@ -1,7 +1,7 @@
-/* $OpenBSD: wycheproof.go,v 1.159 2023/11/07 21:22:34 tb Exp $ */
+/* $OpenBSD: wycheproof.go,v 1.160 2024/05/22 14:03:24 tb Exp $ */
 /*
  * Copyright (c) 2018,2023 Joel Sing <jsing@openbsd.org>
- * Copyright (c) 2018,2019,2022,2023 Theo Buehler <tb@openbsd.org>
+ * Copyright (c) 2018,2019,2022-2024 Theo Buehler <tb@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -1215,6 +1215,138 @@ func runChaCha20Poly1305Test(algorithm string, wt *wycheproofTestAead) bool {
 	return openSuccess && sealSuccess
 }
 
+func runEvpChaCha20Poly1305Test(ctx *C.EVP_CIPHER_CTX, algorithm string, wt *wycheproofTestAead) bool {
+	var aead *C.EVP_CIPHER
+	switch algorithm {
+	case "CHACHA20-POLY1305":
+		aead = C.EVP_chacha20_poly1305()
+	case "XCHACHA20-POLY1305":
+		return true
+	}
+
+	key, _ := mustDecodeHexString(wt.Key, "key")
+	iv, ivLen := mustDecodeHexString(wt.IV, "iv")
+	aad, aadLen := mustDecodeHexString(wt.AAD, "aad")
+	msg, msgLen := mustDecodeHexString(wt.Msg, "msg")
+
+	ct, err := hex.DecodeString(wt.CT)
+	if err != nil {
+		log.Fatalf("Failed to decode ct %q: %v", wt.CT, err)
+	}
+	tag, err := hex.DecodeString(wt.Tag)
+	if err != nil {
+		log.Fatalf("Failed to decode tag %q: %v", wt.Tag, err)
+	}
+	ctLen, tagLen := len(ct), len(tag)
+
+	if C.EVP_EncryptInit_ex(ctx, aead, nil, nil, nil) != 1 {
+		log.Fatal("Failed to initialize EVP_CIPHER_CTX with cipher")
+	}
+	if C.EVP_CIPHER_CTX_ctrl(ctx, C.EVP_CTRL_AEAD_SET_IVLEN, C.int(ivLen), nil) != 1 {
+		log.Fatal("Failed EVP_CTRL_AEAD_SET_IVLEN")
+	}
+	if C.EVP_EncryptInit_ex(ctx, nil, nil, (*C.uchar)(unsafe.Pointer(&key[0])), nil) != 1 {
+		log.Fatal("Failed EVP_EncryptInit_ex key")
+	}
+	if C.EVP_EncryptInit_ex(ctx, nil, nil, nil, (*C.uchar)(unsafe.Pointer(&iv[0]))) != 1 {
+		log.Fatal("Failed EVP_EncryptInit_ex iv")
+	}
+
+	var len C.int
+
+	if C.EVP_EncryptUpdate(ctx, nil, (*C.int)(unsafe.Pointer(&len)), (*C.uchar)(&aad[0]), (C.int)(aadLen)) != 1 {
+		log.Fatal("Failed EVP_EncryptUpdate aad")
+	}
+
+	sealed := make([]byte, ctLen + tagLen)
+	copy(sealed, msg)
+	if C.EVP_EncryptUpdate(ctx, (*C.uchar)(unsafe.Pointer(&sealed[0])), (*C.int)(unsafe.Pointer(&len)), (*C.uchar)(unsafe.Pointer(&sealed[0])), (C.int)(msgLen)) != 1 {
+		log.Fatal("Failed EVP_EncryptUpdate msg")
+	}
+	outLen := len
+	if C.EVP_EncryptFinal_ex(ctx, (*C.uchar)(unsafe.Pointer(&sealed[outLen])), (*C.int)(unsafe.Pointer(&len))) != 1 {
+		log.Fatal("Failed EVP_EncryptFinal msg")
+	}
+	outLen += len
+	if C.EVP_CIPHER_CTX_ctrl(ctx, C.EVP_CTRL_AEAD_GET_TAG, (C.int)(tagLen), unsafe.Pointer(&sealed[outLen])) != 1 {
+		log.Fatal("Failed EVP_CTRL_AEAD_GET_TAG")
+	}
+	outLen += (C.int)(tagLen)
+
+	if (C.int)(ctLen + tagLen) != outLen {
+		fmt.Printf("%s\n", wt)
+	}
+
+	sealSuccess := false
+	ctMatch := bytes.Equal(ct, sealed[:ctLen])
+	tagMatch := bytes.Equal(tag, sealed[ctLen:])
+	if (ctMatch && tagMatch) == (wt.Result != "invalid") {
+		sealSuccess = true
+	} else  {
+		fmt.Printf("%s - ct match: %t tag match: %t\n", wt, ctMatch, tagMatch)
+	}
+
+	if C.EVP_DecryptInit_ex(ctx, aead, nil, nil, nil) != 1 {
+		log.Fatal("Failed to initialize EVP_CIPHER_CTX with cipher")
+	}
+	if C.EVP_DecryptInit_ex(ctx, nil, nil, (*C.uchar)(unsafe.Pointer(&key[0])), nil) != 1 {
+		log.Fatal("Failed EVP_EncryptInit_ex key")
+	}
+
+	if C.EVP_CIPHER_CTX_ctrl(ctx, C.EVP_CTRL_AEAD_SET_IVLEN, C.int(ivLen), nil) != 1 {
+		log.Fatal("Failed EVP_CTRL_AEAD_SET_IVLEN")
+	}
+	if C.EVP_DecryptInit_ex(ctx, nil, nil, nil, (*C.uchar)(unsafe.Pointer(&iv[0]))) != 1 {
+		log.Fatal("Failed EVP_EncryptInit_ex iv")
+	}
+
+	if C.EVP_CIPHER_CTX_ctrl(ctx, C.EVP_CTRL_AEAD_SET_TAG, (C.int)(tagLen), unsafe.Pointer(&tag[0])) != 1 {
+		log.Fatal("Failed EVP_CTRL_AEAD_SET_TAG")
+	}
+
+	if ctLen == 0 {
+		ct = append(ct, 0)
+	}
+
+	opened := make([]byte, msgLen + tagLen)
+	copy(opened, ct)
+	if msgLen + aadLen == 0 {
+		opened = append(opened, 0)
+	}
+
+	if C.EVP_DecryptUpdate(ctx, nil, (*C.int)(unsafe.Pointer(&len)), (*C.uchar)(unsafe.Pointer(&aad[0])), C.int(aadLen)) != 1 {
+		log.Fatal("Failed EVP_EncryptUpdate msg")
+	}
+
+	if C.EVP_DecryptUpdate(ctx, (*C.uchar)(unsafe.Pointer(&opened[0])), (*C.int)(unsafe.Pointer(&len)), (*C.uchar)(unsafe.Pointer(&opened[0])), (C.int)(ctLen)) != 1 {
+		log.Fatal("Failed EVP_EncryptUpdate msg")
+	}
+	outLen = len
+
+	var ret C.int
+	if wt.Result != "invalid" {
+		ret = 1
+	}
+
+	if C.EVP_DecryptFinal_ex(ctx, (*C.uchar)(unsafe.Pointer(&opened[outLen])), (*C.int)(unsafe.Pointer(&len))) != ret {
+		log.Fatalf("Failed EVP_EncryptFinal msg %s\n", wt)
+	}
+	outLen += len
+
+	openSuccess := true
+	if (C.int)(msgLen) != outLen {
+		openSuccess = false
+		fmt.Printf("%s\n", wt)
+	}
+
+	if wt.Result != "invalid" && !bytes.Equal(opened[:outLen], msg[:msgLen]) {
+		fmt.Printf("failed %s\n", wt)
+		openSuccess = false
+	}
+
+	return sealSuccess && openSuccess
+}
+
 func (wtg *wycheproofTestGroupChaCha) run(algorithm string, variant testVariant) bool {
 	// ChaCha20-Poly1305 currently only supports nonces of length 12 (96 bits)
 	if algorithm == "CHACHA20-POLY1305" && wtg.IVSize != 96 {
@@ -1223,11 +1355,20 @@ func (wtg *wycheproofTestGroupChaCha) run(algorithm string, variant testVariant)
 
 	fmt.Printf("Running %v test group %v with IV size %d, key size %d, tag size %d...\n", algorithm, wtg.Type, wtg.IVSize, wtg.KeySize, wtg.TagSize)
 
+	ctx := C.EVP_CIPHER_CTX_new()
+	if ctx == nil {
+		log.Fatal("EVP_CIPHER_CTX_new() failed")
+	}
+	defer C.EVP_CIPHER_CTX_free(ctx)
+
 	success := true
 	for _, wt := range wtg.Tests {
 		if !runChaCha20Poly1305Test(algorithm, wt) {
 			success = false
 		}
+		if !runEvpChaCha20Poly1305Test(ctx, algorithm, wt) {
+			success = false
+		}
 	}
 	return success
 }

regress/usr.bin/ssh/rekey.sh

@@ -1,4 +1,4 @@
-#	$OpenBSD: rekey.sh,v 1.19 2021/07/19 05:08:54 dtucker Exp $
+#	$OpenBSD: rekey.sh,v 1.20 2024/05/22 04:20:00 djm Exp $
 #	Placed in the Public Domain.
 
 tid="rekey"
@@ -14,7 +14,7 @@ ssh_data_rekeying()
 {
 	_kexopt=$1 ; shift
 	_opts="$@"
-	if ! test -z "$_kexopts" ; then
+	if ! test -z "$_kexopt" ; then
 		cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
 		echo "$_kexopt" >> $OBJ/sshd_proxy
 		_opts="$_opts -o$_kexopt"

share/man/man4/umb.4

@@ -1,4 +1,4 @@
-.\"	$OpenBSD: umb.4,v 1.18 2024/04/15 06:12:46 jmc Exp $
+.\"	$OpenBSD: umb.4,v 1.19 2024/05/23 08:06:22 kevlo Exp $
 .\"
 .\" Copyright (c) 2016 genua mbH
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 15 2024 $
+.Dd $Mdocdate: May 23 2024 $
 .Dt UMB 4
 .Os
 .Sh NAME
@@ -56,6 +56,7 @@ The following devices should work:
 .\" .It Huawei ME906s -- attaches but needs more work
 .It Medion Mobile S4222 (MediaTek OEM)
 .It Quectel EC25
+.It Quectel EM060K
 .It Quectel RM500Q
 .It SIMCom SIM7600
 .It SIMCom SIM8262E-M2

share/man/man4/umsm.4

@@ -1,4 +1,4 @@
-.\"	$OpenBSD: umsm.4,v 1.96 2021/05/18 14:23:03 kevlo Exp $
+.\"	$OpenBSD: umsm.4,v 1.97 2024/05/23 08:06:22 kevlo Exp $
 .\"
 .\" Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 18 2021 $
+.Dd $Mdocdate: May 23 2024 $
 .Dt UMSM 4
 .Os
 .Sh NAME
@@ -101,6 +101,7 @@ driver:
 .It Li "Option iCON 505" Ta "USB"
 .It Li "Option GlobeTrotter HSUPA 380E" Ta "PCI Express Mini Card"
 .It Li "Quectel EC25" Ta "PCI Express Mini Card"
+.It Li "Quectel EM060K" Ta "M.2"
 .It Li "Sierra Wireless MC8755" Ta "PCI Express Mini Card"
 .It Li "Sierra Wireless MC8775" Ta "PCI Express Mini Card"
 .It Li "Sierra Wireless MC8790" Ta "PCI Express Mini Card"

sys/arch/amd64/include/i82093var.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82093var.h,v 1.5 2016/05/04 14:30:00 kettenis Exp $	*/
+/*	$OpenBSD: i82093var.h,v 1.6 2024/05/22 05:51:49 jsg Exp $	*/
 /* $NetBSD: i82093var.h,v 1.1 2003/02/26 21:26:10 fvdl Exp $ */
 
 /*-
@@ -81,16 +81,11 @@ struct ioapic_softc {
 #define APIC_IRQ_ISLEGACY(x) (!((x) & APIC_INT_VIA_APIC))
 #define APIC_IRQ_LEGACY_IRQ(x) ((x) & 0xff)
 
-void *apic_intr_establish(int, int, int, int (*)(void *), void *);
-void apic_intr_disestablish(void *);
-
 void ioapic_print_redir(struct ioapic_softc *, char *, int);
-void ioapic_format_redir(char *, char *, int, u_int32_t, u_int32_t);
 struct ioapic_softc *ioapic_find(int);
 struct ioapic_softc *ioapic_find_bybase(int);
 
 void ioapic_enable(void);
-void lapic_vectorset(void); /* XXX */
 
 extern int ioapic_bsp_id;
 extern int nioapics;

sys/arch/amd64/include/isa_machdep.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa_machdep.h,v 1.10 2024/05/13 00:16:09 jsg Exp $	*/
+/*	$OpenBSD: isa_machdep.h,v 1.11 2024/05/22 05:51:49 jsg Exp $	*/
 /*	$NetBSD: isa_machdep.h,v 1.2 2003/05/09 23:51:28 fvdl Exp $	*/
 
 /*-
@@ -107,18 +107,9 @@ int	isa_intr_alloc(isa_chipset_tag_t, int, int, int *);
 void	*isa_intr_establish(isa_chipset_tag_t ic, int irq, int type,
 	    int level, int (*ih_fun)(void *), void *ih_arg, char *);
 void	isa_intr_disestablish(isa_chipset_tag_t ic, void *handler);
-int	isa_mem_alloc(bus_space_tag_t, bus_size_t, bus_size_t,
-	    bus_addr_t, int, bus_addr_t *, bus_space_handle_t *);
-void	isa_mem_free(bus_space_tag_t, bus_space_handle_t, bus_size_t);
 
 int isa_intr_check(isa_chipset_tag_t, int, int);
 
-/*
- * for ACPI code
- */
-
-void	isa_reinit_irq(void);
-
 /*
  * ALL OF THE FOLLOWING ARE MACHINE-DEPENDENT, AND SHOULD NOT BE USED
  * BY PORTABLE CODE.

sys/arch/amd64/include/rbus_machdep.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: rbus_machdep.h,v 1.7 2011/03/23 16:54:34 pirofti Exp $	*/
+/*	$OpenBSD: rbus_machdep.h,v 1.8 2024/05/22 05:51:49 jsg Exp $	*/
 /*	$NetBSD: rbus_machdep.h,v 1.2 1999/10/15 06:43:05 haya Exp $	*/
 
 /*
@@ -42,8 +42,6 @@ rbus_tag_t	rbus_pccbb_parent_io(struct device *,
 rbus_tag_t	rbus_pccbb_parent_mem(struct device *,
 		    struct pci_attach_args *);
 
-bus_addr_t	rbus_min_start_hint(void);
-
 void		pccbb_attach_hook(struct device *, struct device *,
 		    struct pci_attach_args *);
 

sys/arch/arm64/arm64/acpi_machdep.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: acpi_machdep.c,v 1.21 2022/11/26 17:23:15 tobhe Exp $	*/
+/*	$OpenBSD: acpi_machdep.c,v 1.22 2024/05/22 05:51:49 jsg Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis
  *
@@ -40,7 +40,6 @@ int	pwr_action = 1;
 
 int	acpi_fdt_match(struct device *, void *, void *);
 void	acpi_fdt_attach(struct device *, struct device *, void *);
-void	acpi_attach(struct device *, struct device *, void *);
 
 const struct cfattach acpi_fdt_ca = {
 	sizeof(struct acpi_softc), acpi_fdt_match, acpi_fdt_attach

sys/arch/arm64/arm64/db_interface.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.15 2024/02/23 18:19:03 cheloha Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.16 2024/05/22 05:51:49 jsg Exp $	*/
 /*	$NetBSD: db_interface.c,v 1.34 2003/10/26 23:11:15 chris Exp $	*/
 
 /*
@@ -56,12 +56,6 @@
 #include <ddb/db_run.h>
 #include <ddb/db_variables.h>
 
-
-int db_access_und_sp (struct db_variable *, db_expr_t *, int);
-int db_access_abt_sp (struct db_variable *, db_expr_t *, int);
-int db_access_irq_sp (struct db_variable *, db_expr_t *, int);
-u_int db_fetch_reg (int, db_regs_t *);
-
 int db_trapper (vaddr_t, u_int, trapframe_t *, int);
 
 struct db_variable db_regs[] = {

sys/arch/arm64/include/db_machdep.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.5 2021/08/30 08:11:12 jasper Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.6 2024/05/22 05:51:49 jsg Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.5 2001/11/22 18:00:00 thorpej Exp $	*/
 
 /*
@@ -87,8 +87,6 @@ void db_machine_init (void);
 #define branch_taken(ins, pc, fun, regs) \
 	db_branch_taken((ins), (pc), (regs))
 
-void db_show_frame_cmd(db_expr_t, int, db_expr_t, char *);
-
 #define DDB_STATE_NOT_RUNNING	0
 #define DDB_STATE_RUNNING	1
 #define DDB_STATE_EXITING	2

sys/arch/armv7/omap/ommmc.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ommmc.c,v 1.40 2021/10/24 17:52:27 mpi Exp $	*/
+/*	$OpenBSD: ommmc.c,v 1.41 2024/05/22 05:51:49 jsg Exp $	*/
 
 /*
  * Copyright (c) 2009 Dale Rahn <drahn@openbsd.org>
@@ -206,8 +206,6 @@ struct ommmc_softc {
 
 
 /* Host controller functions called by the attachment driver. */
-int	ommmc_host_found(struct ommmc_softc *, bus_space_tag_t,
-	    bus_space_handle_t, bus_size_t, int);
 void	ommmc_power(int, void *);
 void	ommmc_shutdown(void *);
 int	ommmc_intr(void *);

sys/arch/i386/i386/ipifuncs.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipifuncs.c,v 1.35 2023/10/30 12:50:59 mvs Exp $	*/
+/*	$OpenBSD: ipifuncs.c,v 1.36 2024/05/22 05:51:49 jsg Exp $	*/
 /* $NetBSD: ipifuncs.c,v 1.1.2.3 2000/06/26 02:04:06 sommerfeld Exp $ */
 
 /*-
@@ -73,11 +73,7 @@ void (*ipifunc[I386_NIPI])(struct cpu_info *) =
 	i386_ipi_flush_fpu,
 	i386_ipi_synch_fpu,
 	i386_ipi_reload_mtrr,
-#if 0
-	gdt_reload_cpu,
-#else
 	NULL,
-#endif
 #ifdef DDB
 	i386_ipi_db,
 #else

sys/arch/i386/include/gdt.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: gdt.h,v 1.17 2018/04/11 15:44:08 bluhm Exp $	*/
+/*	$OpenBSD: gdt.h,v 1.18 2024/05/22 05:51:49 jsg Exp $	*/
 /*	$NetBSD: gdt.h,v 1.7.10.6 2002/08/19 01:22:36 sommerfeld Exp $	*/
 
 /*-
@@ -39,6 +39,5 @@ struct pmap;
 void gdt_alloc_cpu(struct cpu_info *);
 void gdt_init(void);
 void gdt_init_cpu(struct cpu_info *);
-void gdt_reload_cpu(/* XXX struct cpu_info * */ void);
 void setgdt(int, void *, size_t, int, int, int, int);
 #endif

sys/arch/i386/include/i82093var.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82093var.h,v 1.11 2011/05/21 15:14:57 kettenis Exp $	*/
+/*	$OpenBSD: i82093var.h,v 1.12 2024/05/22 05:51:49 jsg Exp $	*/
 /* $NetBSD: i82093var.h,v 1.1 2003/02/26 21:26:10 fvdl Exp $ */
 
 /*-
@@ -86,12 +86,10 @@ void   *apic_intr_establish(int, int, int, int (*)(void *), void *,
 void	apic_intr_disestablish(void *);
 
 void	ioapic_print_redir(struct ioapic_softc *, char *, int);
-void	ioapic_format_redir(char *, char *, int, u_int32_t, u_int32_t);
 struct ioapic_softc *ioapic_find(int);
 struct ioapic_softc *ioapic_find_bybase(int);
 
 void	ioapic_enable(void);
-void	lapic_vectorset(void); /* XXX */
 
 extern int ioapic_bsp_id;
 extern int nioapics;

sys/arch/i386/include/rbus_machdep.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: rbus_machdep.h,v 1.9 2011/03/23 16:54:35 pirofti Exp $	*/
+/*	$OpenBSD: rbus_machdep.h,v 1.10 2024/05/22 05:51:49 jsg Exp $	*/
 /*	$NetBSD: rbus_machdep.h,v 1.2 1999/10/15 06:43:05 haya Exp $	*/
 
 /*
@@ -42,8 +42,6 @@ rbus_tag_t	rbus_pccbb_parent_io(struct device *,
 rbus_tag_t	rbus_pccbb_parent_mem(struct device *,
 		    struct pci_attach_args *);
 
-bus_addr_t	rbus_min_start_hint(void);
-
 void		pccbb_attach_hook(struct device *, struct device *,
 		    struct pci_attach_args *);
 

sys/dev/ic/ufshci.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufshci.c,v 1.29 2024/05/21 18:19:22 mglocker Exp $ */
+/*	$OpenBSD: ufshci.c,v 1.30 2024/05/22 11:46:06 mglocker Exp $ */
 
 /*
  * Copyright (c) 2022 Marcus Glocker <mglocker@openbsd.org>
@@ -55,7 +55,7 @@ struct cfdriver ufshci_cd = {
 };
 
 int			 ufshci_reset(struct ufshci_softc *);
-int			 ufshci_uccs_poll(struct ufshci_softc *);
+int			 ufshci_is_poll(struct ufshci_softc *, uint32_t);
 struct ufshci_dmamem	*ufshci_dmamem_alloc(struct ufshci_softc *, size_t);
 void			 ufshci_dmamem_free(struct ufshci_softc *,
 			     struct ufshci_dmamem *);
@@ -269,7 +269,7 @@ ufshci_reset(struct ufshci_softc *sc)
 }
 
 int
-ufshci_uccs_poll(struct ufshci_softc *sc)
+ufshci_is_poll(struct ufshci_softc *sc, uint32_t type)
 {
 	uint32_t status;
 	int i, retry = 25;
@@ -278,7 +278,7 @@ ufshci_uccs_poll(struct ufshci_softc *sc)
 
 	for (i = 0; i < retry; i++) {
 		status = UFSHCI_READ_4(sc, UFSHCI_REG_IS);
-		if (status & UFSHCI_REG_IS_UCCS)
+		if (status & type)
 			break;
 		delay(10);
 	}
@@ -369,7 +369,7 @@ ufshci_init(struct ufshci_softc *sc)
 	/* 7.1.1 Host Controller Initialization: 6) */
 	UFSHCI_WRITE_4(sc, UFSHCI_REG_UICCMD,
 	    UFSHCI_REG_UICCMD_CMDOP_DME_LINKSTARTUP);
-	if (ufshci_uccs_poll(sc) != 0)
+	if (ufshci_is_poll(sc, UFSHCI_REG_IS_UCCS) != 0)
 		return -1;
 
 	/*

sys/dev/ic/ufshcireg.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufshcireg.h,v 1.10 2024/05/20 20:08:04 mglocker Exp $ */
+/*	$OpenBSD: ufshcireg.h,v 1.11 2024/05/22 18:10:00 mglocker Exp $ */
 
 /*
  * Copyright (c) 2022 Marcus Glocker <mglocker@openbsd.org>
@@ -99,10 +99,10 @@
 #define  UFSHCI_REG_IE_UTRCE		(1 <<  0) /* RW */
 /* Host Controller Status */
 #define UFSHCI_REG_HCS			0x30
-#define  UFSHCI_REG_HCS_TLUNUTPE(x)	((x << 24) & 0xff000000) /* RO */
-#define  UFSHCI_REG_HCS_TTAGUTPE(x)	((x << 16) & 0x00ff0000) /* RO */
-#define  UFSHCI_REG_HCS_UTPEC(x)	((x << 12) & 0x0000f000) /* RO */
-#define  UFSHCI_REG_HCS_UPMCRS(x)	((x <<  8) & 0x00000700) /* RO */
+#define  UFSHCI_REG_HCS_TLUNUTPE(x)	((x >> 24) & 0x000000ff) /* RO */
+#define  UFSHCI_REG_HCS_TTAGUTPE(x)	((x >> 16) & 0x000000ff) /* RO */
+#define  UFSHCI_REG_HCS_UTPEC(x)	((x >> 12) & 0x0000000f) /* RO */
+#define  UFSHCI_REG_HCS_UPMCRS(x)	((x >>  8) & 0x00000007) /* RO */
 #define  UFSHCI_REG_HCS_UCRDY		(1 << 3) /* RO */
 #define  UFSHCI_REG_HCS_UTMRLRDY	(1 << 2) /* RO */
 #define  UFSHCI_REG_HCS_UTRLRDY		(1 << 1) /* RO */

sys/dev/pci/if_mwx.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mwx.c,v 1.3 2024/05/20 21:22:43 martijn Exp $ */
+/*	$OpenBSD: if_mwx.c,v 1.5 2024/05/22 16:24:59 martijn Exp $ */
 /*
  * Copyright (c) 2022 Claudio Jeker <claudio@openbsd.org>
  * Copyright (c) 2021 MediaTek Inc.
@@ -52,6 +52,7 @@
 static const struct pci_matchid mwx_devices[] = {
 	{ PCI_VENDOR_MEDIATEK, PCI_PRODUCT_MEDIATEK_MT7921 },
 	{ PCI_VENDOR_MEDIATEK, PCI_PRODUCT_MEDIATEK_MT7921K },
+	{ PCI_VENDOR_MEDIATEK, PCI_PRODUCT_MEDIATEK_MT7922 },
 };
 
 #define MWX_DEBUG	1
@@ -158,10 +159,17 @@ struct mwx_vif {
 	uint8_t			scan_seq_num;
 };
 
+enum mwx_hw_type {
+	MWX_HW_MT7921,
+	MWX_HW_MT7922,
+};
+
 struct mwx_softc {
 	struct device		sc_dev;
 	struct ieee80211com	sc_ic;
 
+	enum mwx_hw_type	sc_hwtype;
+
 	struct mwx_queue	sc_txq;
 	struct mwx_queue	sc_txmcuq;
 	struct mwx_queue	sc_txfwdlq;
@@ -375,6 +383,8 @@ int	mwx_mcu_wait_resp_msg(struct mwx_softc *, uint32_t, int,
 
 int		mt7921_dma_disable(struct mwx_softc *sc, int force);
 void		mt7921_dma_enable(struct mwx_softc *sc);
+int		mt7921_e_mcu_fw_pmctrl(struct mwx_softc *);
+int		mt7921_e_mcu_drv_pmctrl(struct mwx_softc *);
 int		mt7921_wfsys_reset(struct mwx_softc *sc);
 uint32_t	mt7921_reg_addr(struct mwx_softc *, uint32_t);
 int		mt7921_init_hardware(struct mwx_softc *);
@@ -1179,6 +1189,10 @@ mwx_attach(struct device *parent, struct device *self, void *aux)
 	sc->sc_pc = pa->pa_pc;
 	sc->sc_tag = pa->pa_tag;
 	sc->sc_dmat = pa->pa_dmat;
+	if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_MEDIATEK_MT7922)
+		sc->sc_hwtype = MWX_HW_MT7922;
+	else
+		sc->sc_hwtype = MWX_HW_MT7921;
 
 	memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, PCI_MAPREG_START);
 	if (pci_mapreg_map(pa, PCI_MAPREG_START, memtype, 0,
@@ -1207,6 +1221,10 @@ mwx_attach(struct device *parent, struct device *self, void *aux)
 	sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_NET,
 	    mwx_intr, sc, DEVNAME(sc));
 
+	if (mt7921_e_mcu_fw_pmctrl(sc) != 0 ||
+	    mt7921_e_mcu_drv_pmctrl(sc) != 0)
+		goto fail;
+
 	if ((error = mwx_txwi_alloc(sc, MWX_TXWI_MAX)) != 0) {
 		printf("%s: failed to allocate DMA resources %d\n",
 		    DEVNAME(sc), error);
@@ -2590,6 +2608,46 @@ mt7921_dma_enable(struct mwx_softc *sc)
 	mwx_write(sc, MT_PCIE_MAC_INT_ENABLE, 0xff);
 }
 
+int
+mt7921_e_mcu_fw_pmctrl(struct mwx_softc *sc)
+{
+	int i;
+
+	for (i = 0; i < MT7921_MCU_INIT_RETRY_COUNT; i++) {
+		mwx_write(sc, MT_CONN_ON_LPCTL, PCIE_LPCR_HOST_SET_OWN);
+		if (mwx_poll(sc, MT_CONN_ON_LPCTL, PCIE_LPCR_HOST_OWN_SYNC,
+		    4, 50) == 0)
+			break;
+	}
+
+	if (i == MT7921_MCU_INIT_RETRY_COUNT) {
+		printf("%s: firmware own failed\n", DEVNAME(sc));
+		return EIO;
+	}
+
+	return 0;
+}
+
+int
+mt7921_e_mcu_drv_pmctrl(struct mwx_softc *sc)
+{
+	int i;
+
+	for (i = 0; i < MT7921_MCU_INIT_RETRY_COUNT; i++) {
+		mwx_write(sc, MT_CONN_ON_LPCTL, PCIE_LPCR_HOST_CLR_OWN);
+		if (mwx_poll(sc, MT_CONN_ON_LPCTL, 0,
+		    PCIE_LPCR_HOST_OWN_SYNC, 50) == 0)
+			break;
+	}
+
+	if (i == MT7921_MCU_INIT_RETRY_COUNT) {
+		printf("%s: driver own failed\n", DEVNAME(sc));
+		return EIO;
+	}
+
+	return 0;
+}
+
 int
 mt7921_wfsys_reset(struct mwx_softc *sc)
 {
@@ -2802,6 +2860,7 @@ mt7921_load_firmware(struct mwx_softc *sc)
 {
 	struct mt7921_patch_hdr *hdr;
 	struct mt7921_fw_trailer *fwhdr;
+	const char *rompatch, *fw;
 	u_char *buf, *fwbuf, *dl;
 	size_t buflen, fwlen, offset = 0;
 	uint32_t reg, override = 0, option = 0;
@@ -2813,8 +2872,18 @@ mt7921_load_firmware(struct mwx_softc *sc)
 		return 0;
 	}
 
-	if ((rv = loadfirmware(MT7921_ROM_PATCH, &buf, &buflen)) != 0 ||
-	    (rv = loadfirmware(MT7921_FIRMWARE_WM, &fwbuf, &fwlen)) != 0) {
+	switch (sc->sc_hwtype) {
+	case MWX_HW_MT7921:
+		rompatch = MT7921_ROM_PATCH;
+		fw = MT7921_FIRMWARE_WM;
+		break;
+	case MWX_HW_MT7922:
+		rompatch = MT7922_ROM_PATCH;
+		fw = MT7922_FIRMWARE_WM;
+		break;
+	}
+	if ((rv = loadfirmware(rompatch, &buf, &buflen)) != 0 ||
+	    (rv= loadfirmware(fw, &fwbuf, &fwlen)) != 0) {
 		printf("%s: loadfirmware error %d\n", DEVNAME(sc), rv);
 		return rv;
 	}

sys/dev/pci/if_mwxreg.h

@@ -300,6 +300,11 @@
 #define	MT_CONN_ON_MISC			0x7c0600f0
 #define	MT_TOP_MISC2_FW_N9_RDY		0x3
 
+#define	MT_CONN_ON_LPCTL		0x7c060010
+#define	PCIE_LPCR_HOST_SET_OWN		(1U << 0)
+#define	PCIE_LPCR_HOST_CLR_OWN		(1U << 1)
+#define	PCIE_LPCR_HOST_OWN_SYNC		(1U << 2)
+
 #define	MT_WFSYS_SW_RST_B		0x18000140
 #define	WFSYS_SW_RST_B			(1U << 0)
 #define	WFSYS_SW_INIT_DONE		(1U << 4)

sys/dev/pci/pcidevs

@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.2075 2024/05/21 07:03:55 jsg Exp $
+$OpenBSD: pcidevs,v 1.2076 2024/05/22 16:24:59 martijn Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
 /*
@@ -7552,6 +7552,7 @@ product MATROX MARV_G200_SD	0xff04	MGA Marvel G200 SD
 
 /* MediaTek products */
 product MEDIATEK MT7921K	0x0608	MT7921K
+product MEDIATEK MT7922		0x0616	MT7922
 product MEDIATEK MT7921		0x7961	MT7921
 
 /* Meinberg Funkuhren */

sys/dev/pci/pcidevs.h

@@ -7557,6 +7557,7 @@
 
 /* MediaTek products */
 #define	PCI_PRODUCT_MEDIATEK_MT7921K	0x0608		/* MT7921K */
+#define	PCI_PRODUCT_MEDIATEK_MT7922	0x0616		/* MT7922 */
 #define	PCI_PRODUCT_MEDIATEK_MT7921	0x7961		/* MT7921 */
 
 /* Meinberg Funkuhren */

sys/dev/pci/pcidevs_data.h

@@ -27335,6 +27335,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    PCI_VENDOR_MEDIATEK, PCI_PRODUCT_MEDIATEK_MT7921K,
 	    "MT7921K",
 	},
+	{
+	    PCI_VENDOR_MEDIATEK, PCI_PRODUCT_MEDIATEK_MT7922,
+	    "MT7922",
+	},
 	{
 	    PCI_VENDOR_MEDIATEK, PCI_PRODUCT_MEDIATEK_MT7921,
 	    "MT7921",

sys/dev/usb/ehci.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ehci.c,v 1.219 2022/04/12 19:41:11 naddy Exp $ */
+/*	$OpenBSD: ehci.c,v 1.220 2024/05/23 03:21:08 jsg Exp $ */
 /*	$NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $	*/
 
 /*
@@ -57,7 +57,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/rwlock.h>
 #include <sys/malloc.h>
 #include <sys/device.h>

sys/dev/usb/fido.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: fido.c,v 1.5 2022/07/02 08:50:42 visa Exp $	*/
+/*	$OpenBSD: fido.c,v 1.6 2024/05/23 03:21:08 jsg Exp $	*/
 
 /*
  * Copyright (c) 2019 Reyk Floeter <reyk@openbsd.org>
@@ -20,22 +20,15 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/signalvar.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
-#include <sys/proc.h>
-#include <sys/vnode.h>
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbhid.h>
 
-#include <dev/usb/usbdevs.h>
 #include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
 
 #include <dev/usb/uhidev.h>
 #include <dev/usb/uhid.h>

sys/dev/usb/if_athn_usb.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_athn_usb.c,v 1.65 2022/07/10 21:13:41 bluhm Exp $	*/
+/*	$OpenBSD: if_athn_usb.c,v 1.66 2024/05/23 03:21:08 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2011 Damien Bergamini <damien.bergamini@free.fr>
@@ -26,11 +26,8 @@
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 
@@ -58,7 +55,6 @@
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 
 #include <dev/usb/if_athn_usb.h>

sys/dev/usb/if_atu.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_atu.c,v 1.134 2022/04/21 21:03:03 stsp Exp $ */
+/*	$OpenBSD: if_atu.c,v 1.135 2024/05/23 03:21:08 jsg Exp $ */
 /*
  * Copyright (c) 2003, 2004
  *	Daan Vreeken <Danovitsch@Vitsch.net>.  All rights reserved.
@@ -50,10 +50,7 @@
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
-#include <sys/timeout.h>
 #include <sys/queue.h>
 #include <sys/device.h>
 

sys/dev/usb/if_aue.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_aue.c,v 1.112 2021/08/09 07:21:48 jmatthew Exp $ */
+/*	$OpenBSD: if_aue.c,v 1.113 2024/05/23 03:21:08 jsg Exp $ */
 /*	$NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -84,8 +84,6 @@
 #include <sys/sockio.h>
 #include <sys/rwlock.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 
 #include <sys/device.h>
 

sys/dev/usb/if_axe.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_axe.c,v 1.142 2020/07/31 10:49:32 mglocker Exp $	*/
+/*	$OpenBSD: if_axe.c,v 1.143 2024/05/23 03:21:08 jsg Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org>
@@ -94,8 +94,6 @@
 #include <sys/sockio.h>
 #include <sys/rwlock.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 
 #include <sys/device.h>
 

sys/dev/usb/if_axen.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_axen.c,v 1.32 2024/01/04 08:41:59 kevlo Exp $	*/
+/*	$OpenBSD: if_axen.c,v 1.33 2024/05/23 03:21:08 jsg Exp $	*/
 
 /*
  * Copyright (c) 2013 Yojiro UO <yuo@openbsd.org>
@@ -28,8 +28,6 @@
 #include <sys/sockio.h>
 #include <sys/rwlock.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 
 #include <sys/device.h>
 

sys/dev/usb/if_bwfm_usb.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bwfm_usb.c,v 1.20 2021/11/05 11:38:51 mpi Exp $ */
+/* $OpenBSD: if_bwfm_usb.c,v 1.21 2024/05/23 03:21:08 jsg Exp $ */
 /*
  * Copyright (c) 2010-2016 Broadcom Corporation
  * Copyright (c) 2016,2017 Patrick Wildt <patrick@blueri.se>
@@ -16,22 +16,13 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "bpfilter.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/buf.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/queue.h>
-#include <sys/socket.h>
 
-#if NBPFILTER > 0
-#include <net/bpf.h>
-#endif
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
 
 #include <netinet/in.h>
@@ -43,7 +34,6 @@
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdivar.h>
 #include <dev/usb/usb_mem.h>
 #include <dev/usb/usbdevs.h>

sys/dev/usb/if_cdce.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cdce.c,v 1.82 2024/01/04 08:41:59 kevlo Exp $ */
+/*	$OpenBSD: if_cdce.c,v 1.83 2024/05/23 03:21:08 jsg Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
@@ -46,8 +46,6 @@
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/device.h>
 
 #include <net/if.h>

sys/dev/usb/if_cue.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cue.c,v 1.80 2020/07/31 10:49:32 mglocker Exp $ */
+/*	$OpenBSD: if_cue.c,v 1.81 2024/05/23 03:21:08 jsg Exp $ */
 /*	$NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -62,8 +62,6 @@
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/timeout.h>
 #include <sys/device.h>
 

sys/dev/usb/if_kue.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_kue.c,v 1.92 2020/07/31 10:49:32 mglocker Exp $ */
+/*	$OpenBSD: if_kue.c,v 1.93 2024/05/23 03:21:08 jsg Exp $ */
 /*	$NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -77,8 +77,6 @@
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/device.h>
 
 #include <net/if.h>

sys/dev/usb/if_mos.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mos.c,v 1.43 2020/07/31 10:49:32 mglocker Exp $	*/
+/*	$OpenBSD: if_mos.c,v 1.44 2024/05/23 03:21:08 jsg Exp $	*/
 
 /*
  * Copyright (c) 2008 Johann Christian Rode <jcrode@gmx.net>
@@ -77,8 +77,6 @@
 #include <sys/sockio.h>
 #include <sys/rwlock.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 
 #include <sys/device.h>
 
@@ -99,7 +97,6 @@
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdivar.h>
 #include <dev/usb/usbdevs.h>
 
 #include <dev/usb/if_mosreg.h>

sys/dev/usb/if_mtw.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mtw.c,v 1.10 2024/04/14 03:26:25 jsg Exp $	*/
+/*	$OpenBSD: if_mtw.c,v 1.11 2024/05/23 03:21:08 jsg Exp $	*/
 /*
  * Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr>
  * Copyright (c) 2013-2014 Kevin Lo
@@ -26,11 +26,8 @@
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 

sys/dev/usb/if_mue.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mue.c,v 1.11 2021/07/25 06:43:04 mglocker Exp $	*/
+/*	$OpenBSD: if_mue.c,v 1.12 2024/05/23 03:21:08 jsg Exp $	*/
 
 /*
  * Copyright (c) 2018 Kevin Lo <kevlo@openbsd.org>
@@ -25,8 +25,6 @@
 #include <sys/sockio.h>
 #include <sys/rwlock.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 
 #include <sys/device.h>
 

sys/dev/usb/if_otus.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_otus.c,v 1.72 2023/03/08 04:43:08 guenther Exp $	*/
+/*	$OpenBSD: if_otus.c,v 1.73 2024/05/23 03:21:08 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -25,11 +25,8 @@
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 

sys/dev/usb/if_ral.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ral.c,v 1.149 2022/04/21 21:03:03 stsp Exp $	*/
+/*	$OpenBSD: if_ral.c,v 1.150 2024/05/23 03:21:08 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006
@@ -27,11 +27,8 @@
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 
@@ -53,7 +50,6 @@
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 
 #include <dev/usb/if_ralreg.h>

sys/dev/usb/if_rsu.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rsu.c,v 1.52 2023/03/08 04:43:08 guenther Exp $	*/
+/*	$OpenBSD: if_rsu.c,v 1.53 2024/05/23 03:21:08 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -25,11 +25,8 @@
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 

sys/dev/usb/if_rum.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rum.c,v 1.128 2024/04/14 03:26:25 jsg Exp $	*/
+/*	$OpenBSD: if_rum.c,v 1.129 2024/05/23 03:21:08 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -27,11 +27,8 @@
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 
@@ -53,7 +50,6 @@
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 
 #include <dev/usb/if_rumreg.h>

sys/dev/usb/if_run.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_run.c,v 1.139 2024/04/14 03:26:25 jsg Exp $	*/
+/*	$OpenBSD: if_run.c,v 1.140 2024/05/23 03:21:08 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -27,11 +27,8 @@
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 

sys/dev/usb/if_smsc.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_smsc.c,v 1.38 2022/01/09 05:43:00 jsg Exp $	*/
+/*	$OpenBSD: if_smsc.c,v 1.39 2024/05/23 03:21:08 jsg Exp $	*/
 /* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
 /*-
  * Copyright (c) 2012
@@ -65,8 +65,6 @@
 #include <sys/sockio.h>
 #include <sys/rwlock.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 
 #include <sys/device.h>
 

sys/dev/usb/if_uaq.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_uaq.c,v 1.5 2022/09/01 17:07:09 mlarkin Exp $	*/
+/*	$OpenBSD: if_uaq.c,v 1.6 2024/05/23 03:21:08 jsg Exp $	*/
 /*-
  * Copyright (c) 2021 Jonathan Matthew <jonathan@d14n.org>
  * All rights reserved.
@@ -31,10 +31,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
-#include <sys/rwlock.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/device.h>
 
 #include <machine/bus.h>

sys/dev/usb/if_uath.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_uath.c,v 1.88 2022/04/21 21:03:03 stsp Exp $	*/
+/*	$OpenBSD: if_uath.c,v 1.89 2024/05/23 03:21:08 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2006
@@ -31,11 +31,8 @@
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 
@@ -58,7 +55,6 @@
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>	/* needs_reattach() */
-#include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 
 #include <dev/usb/if_uathreg.h>

sys/dev/usb/if_udav.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_udav.c,v 1.85 2021/08/09 07:21:48 jmatthew Exp $ */
+/*	$OpenBSD: if_udav.c,v 1.86 2024/05/23 03:21:09 jsg Exp $ */
 /*	$NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $	*/
 /*	$nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $	*/
 /*
@@ -51,8 +51,6 @@
 #include <sys/systm.h>
 #include <sys/rwlock.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 
 #include <sys/device.h>
 

sys/dev/usb/if_ugl.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ugl.c,v 1.27 2021/08/09 07:21:48 jmatthew Exp $	*/
+/*	$OpenBSD: if_ugl.c,v 1.28 2024/05/23 03:21:09 jsg Exp $	*/
 /*	$NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 2013 SASANO Takayoshi <uaa@uaa.org.uk>
@@ -58,8 +58,6 @@
 #include <sys/timeout.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 
 #include <sys/device.h>
 
@@ -74,7 +72,6 @@
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 
 #define UGL_INTR_PKTLEN		8

sys/dev/usb/if_umb.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_umb.c,v 1.57 2024/04/13 23:44:11 jsg Exp $ */
+/*	$OpenBSD: if_umb.c,v 1.58 2024/05/23 03:21:09 jsg Exp $ */
 
 /*
  * Copyright (c) 2016 genua mbH
@@ -29,7 +29,6 @@
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/syslog.h>
 #include <sys/kstat.h>
@@ -44,12 +43,9 @@
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
-#include <netinet/ip.h>
 
 #ifdef INET6
-#include <netinet/ip6.h>
 #include <netinet6/in6_var.h>
-#include <netinet6/ip6_var.h>
 #include <netinet6/in6_ifattach.h>
 #include <netinet6/nd6.h>
 #endif

sys/dev/usb/if_upgt.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_upgt.c,v 1.89 2022/04/21 21:03:03 stsp Exp $ */
+/*	$OpenBSD: if_upgt.c,v 1.90 2024/05/23 03:21:09 jsg Exp $ */
 
 /*
  * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
@@ -21,11 +21,8 @@
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 

sys/dev/usb/if_upl.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_upl.c,v 1.79 2021/08/09 07:21:48 jmatthew Exp $ */
+/*	$OpenBSD: if_upl.c,v 1.80 2024/05/23 03:21:09 jsg Exp $ */
 /*	$NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -41,8 +41,6 @@
 #include <sys/timeout.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 
 #include <sys/device.h>
 
@@ -58,7 +56,6 @@
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 
 /*

sys/dev/usb/if_ure.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ure.c,v 1.34 2024/04/13 23:44:11 jsg Exp $	*/
+/*	$OpenBSD: if_ure.c,v 1.35 2024/05/23 03:21:09 jsg Exp $	*/
 /*-
  * Copyright (c) 2015, 2016, 2019 Kevin Lo <kevlo@openbsd.org>
  * Copyright (c) 2020 Jonathon Fletcher <jonathon.fletcher@gmail.com>
@@ -34,8 +34,6 @@
 #include <sys/sockio.h>
 #include <sys/rwlock.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/device.h>
 
 #include <machine/bus.h>

sys/dev/usb/if_url.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_url.c,v 1.89 2021/08/09 07:21:48 jmatthew Exp $ */
+/*	$OpenBSD: if_url.c,v 1.90 2024/05/23 03:21:09 jsg Exp $ */
 /*	$NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $	*/
 /*
  * Copyright (c) 2001, 2002
@@ -48,8 +48,6 @@
 #include <sys/systm.h>
 #include <sys/rwlock.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 
 #include <sys/device.h>
 

sys/dev/usb/if_urndis.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_urndis.c,v 1.73 2021/11/05 11:38:52 mpi Exp $ */
+/*	$OpenBSD: if_urndis.c,v 1.74 2024/05/23 03:21:09 jsg Exp $ */
 
 /*
  * Copyright (c) 2010 Jonathan Armani <armani@openbsd.org>
@@ -24,17 +24,13 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
-#include <sys/rwlock.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 
 #include <sys/device.h>
 
 #include <machine/bus.h>
 
 #include <net/if.h>
-#include <net/if_media.h>
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
@@ -45,8 +41,6 @@
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdivar.h>
 #include <dev/usb/usbdevs.h>
 
 #include <dev/rndis.h>

sys/dev/usb/if_urtw.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_urtw.c,v 1.72 2022/04/21 21:03:03 stsp Exp $	*/
+/*	$OpenBSD: if_urtw.c,v 1.73 2024/05/23 03:21:09 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org>
@@ -22,11 +22,8 @@
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 

sys/dev/usb/if_urtwn.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_urtwn.c,v 1.109 2024/05/06 05:02:25 jsg Exp $	*/
+/*	$OpenBSD: if_urtwn.c,v 1.110 2024/05/23 03:21:09 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -26,13 +26,9 @@
 #include "bpfilter.h"
 
 #include <sys/param.h>
-#include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 
@@ -43,7 +39,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
 
 #include <netinet/in.h>
@@ -56,7 +51,6 @@
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>
-#include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 
 #include <dev/ic/r92creg.h>

sys/dev/usb/if_wi_usb.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_usb.c,v 1.76 2022/01/09 05:43:00 jsg Exp $ */
+/*	$OpenBSD: if_wi_usb.c,v 1.77 2024/05/23 03:21:09 jsg Exp $ */
 
 /*
  * Copyright (c) 2003 Dale Rahn. All rights reserved.
@@ -27,19 +27,13 @@
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F30602-01-2-0537.
  */
-#include "bpfilter.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/sockio.h>
-#include <sys/mbuf.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
 #include <sys/kthread.h>
-#include <sys/tree.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
@@ -57,10 +51,6 @@
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_ioctl.h>
 
-#if NBPFILTER > 0
-#include <net/bpf.h>
-#endif
-
 #include <machine/bus.h>
 
 #include <dev/ic/if_wireg.h>

sys/dev/usb/if_zyd.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_zyd.c,v 1.128 2022/04/21 21:03:03 stsp Exp $	*/
+/*	$OpenBSD: if_zyd.c,v 1.129 2024/05/23 03:21:09 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
@@ -26,12 +26,9 @@
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 

sys/dev/usb/moscom.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: moscom.c,v 1.25 2022/04/09 20:07:44 naddy Exp $	*/
+/*	$OpenBSD: moscom.c,v 1.26 2024/05/23 03:21:09 jsg Exp $	*/
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -18,13 +18,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/tty.h>
 #include <sys/device.h>
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 
 #include <dev/usb/ucomvar.h>

sys/dev/usb/uark.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: uark.c,v 1.25 2022/04/09 20:07:44 naddy Exp $	*/
+/*	$OpenBSD: uark.c,v 1.26 2024/05/23 03:21:09 jsg Exp $	*/
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -18,13 +18,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/tty.h>
 #include <sys/device.h>
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 
 #include <dev/usb/ucomvar.h>

sys/dev/usb/ubcmtp.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ubcmtp.c,v 1.25 2023/07/02 21:44:04 bru Exp $ */
+/*	$OpenBSD: ubcmtp.c,v 1.26 2024/05/23 03:21:09 jsg Exp $ */
 
 /*
  * Copyright (c) 2013-2014, joshua stein <jcs@openbsd.org>
@@ -27,9 +27,7 @@
 #include <sys/errno.h>
 #include <sys/malloc.h>
 
-#include <sys/ioctl.h>
 #include <sys/systm.h>
-#include <sys/tty.h>
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>

sys/dev/usb/uberry.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: uberry.c,v 1.24 2016/11/06 12:58:01 mpi Exp $	*/
+/*	$OpenBSD: uberry.c,v 1.25 2024/05/23 03:21:09 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2006 Theo de Raadt <deraadt@openbsd.org>
@@ -17,18 +17,10 @@
  */
 
 #include <sys/param.h>
-#include <sys/sockio.h>
-#include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
-#include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
-#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>

sys/dev/usb/ubsa.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ubsa.c,v 1.69 2022/07/02 08:50:42 visa Exp $ 	*/
+/*	$OpenBSD: ubsa.c,v 1.70 2024/05/23 03:21:09 jsg Exp $ 	*/
 /*	$NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $	*/
 /*-
  * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
@@ -56,12 +56,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/ioccom.h>
-#include <sys/fcntl.h>
-#include <sys/conf.h>
 #include <sys/tty.h>
 
 #include <dev/usb/usb.h>

sys/dev/usb/uchcom.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: uchcom.c,v 1.35 2024/05/15 01:41:19 kevlo Exp $	*/
+/*	$OpenBSD: uchcom.c,v 1.36 2024/05/23 03:21:09 jsg Exp $	*/
 /*	$NetBSD: uchcom.c,v 1.1 2007/09/03 17:57:37 tshiozak Exp $	*/
 
 /*
@@ -36,7 +36,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/tty.h>
 #include <sys/device.h>
@@ -46,7 +45,6 @@
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>
-#include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 #include <dev/usb/ucomvar.h>
 

sys/dev/usb/ucom.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ucom.c,v 1.78 2023/10/06 16:06:11 krw Exp $ */
+/*	$OpenBSD: ucom.c,v 1.79 2024/05/23 03:21:09 jsg Exp $ */
 /*	$NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $	*/
 
 /*
@@ -36,7 +36,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/rwlock.h>
 #include <sys/ioctl.h>
 #include <sys/conf.h>
@@ -51,7 +50,6 @@
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
 #include <dev/usb/uhidev.h>
-#include <dev/usb/usbdevs.h>
 
 #include <dev/usb/ucomvar.h>
 

sys/dev/usb/ucrcom.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ucrcom.c,v 1.2 2022/04/09 20:07:44 naddy Exp $	*/
+/*	$OpenBSD: ucrcom.c,v 1.3 2024/05/23 03:21:09 jsg Exp $	*/
 
 /*
  * Copyright (c) 2019 Mark Kettenis <kettenis@openbsd.org>
@@ -18,13 +18,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/tty.h>
 #include <sys/device.h>
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 
 #include <dev/usb/ucomvar.h>

sys/dev/usb/ucycom.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ucycom.c,v 1.41 2022/04/09 20:07:44 naddy Exp $	*/
+/*	$OpenBSD: ucycom.c,v 1.42 2024/05/23 03:21:09 jsg Exp $	*/
 /*	$NetBSD: ucycom.c,v 1.3 2005/08/05 07:27:47 skrll Exp $	*/
 
 /*
@@ -40,8 +40,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/tty.h>
@@ -50,7 +48,6 @@
 #include <dev/usb/usbhid.h>
 
 #include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 #include <dev/usb/uhidev.h>
 

sys/dev/usb/udcf.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: udcf.c,v 1.65 2022/07/02 08:50:42 visa Exp $ */
+/*	$OpenBSD: udcf.c,v 1.66 2024/05/23 03:21:09 jsg Exp $ */
 
 /*
  * Copyright (c) 2006, 2007, 2008 Marc Balmer <mbalmer@openbsd.org>
@@ -18,7 +18,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/time.h>
 #include <sys/sensors.h>
@@ -26,7 +25,6 @@
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 
 #ifdef UDCF_DEBUG

sys/dev/usb/udl.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: udl.c,v 1.99 2023/05/10 18:28:04 miod Exp $ */
+/*	$OpenBSD: udl.c,v 1.100 2024/05/23 03:21:09 jsg Exp $ */
 
 /*
  * Copyright (c) 2009 Marcus Glocker <mglocker@openbsd.org>
@@ -30,7 +30,6 @@
 
 #include <sys/param.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 

sys/dev/usb/uftdi.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: uftdi.c,v 1.78 2022/12/30 00:54:09 kevlo Exp $ 	*/
+/*	$OpenBSD: uftdi.c,v 1.79 2024/05/23 03:21:09 jsg Exp $ 	*/
 /*	$NetBSD: uftdi.c,v 1.14 2003/02/23 04:20:07 simonb Exp $	*/
 
 /*
@@ -41,15 +41,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
-#include <sys/conf.h>
 #include <sys/tty.h>
 
 #include <dev/usb/usb.h>
 
 #include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 
 #include <dev/usb/ucomvar.h>

sys/dev/usb/ugen.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ugen.c,v 1.117 2022/12/19 15:10:40 visa Exp $ */
+/*	$OpenBSD: ugen.c,v 1.118 2024/05/23 03:21:09 jsg Exp $ */
 /*	$NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $	*/
 
@@ -35,7 +35,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
@@ -50,7 +49,6 @@
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdivar.h>
 
 #ifdef UGEN_DEBUG
 #define DPRINTF(x)	do { if (ugendebug) printf x; } while (0)

sys/dev/usb/ugold.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ugold.c,v 1.27 2023/12/21 19:40:47 miod Exp $   */
+/*	$OpenBSD: ugold.c,v 1.28 2024/05/23 03:21:09 jsg Exp $   */
 
 /*
  * Copyright (c) 2013 Takayoshi SASANO <uaa@openbsd.org>
@@ -26,7 +26,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/sensors.h>
 

sys/dev/usb/uhid.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhid.c,v 1.90 2023/04/20 10:49:57 brynet Exp $ */
+/*	$OpenBSD: uhid.c,v 1.91 2024/05/23 03:21:09 jsg Exp $ */
 /*	$NetBSD: uhid.c,v 1.57 2003/03/11 16:44:00 augustss Exp $	*/
 
 /*
@@ -40,21 +40,16 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <sys/signalvar.h>
 #include <sys/device.h>
-#include <sys/ioctl.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/selinfo.h>
-#include <sys/proc.h>
 #include <sys/vnode.h>
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbhid.h>
 
-#include <dev/usb/usbdevs.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
 

sys/dev/usb/uhidev.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhidev.c,v 1.109 2023/08/12 20:47:06 miod Exp $	*/
+/*	$OpenBSD: uhidev.c,v 1.110 2024/05/23 03:21:09 jsg Exp $	*/
 /*	$NetBSD: uhidev.c,v 1.14 2003/03/11 16:44:00 augustss Exp $	*/
 
 /*
@@ -37,12 +37,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <sys/signalvar.h>
 #include <sys/device.h>
-#include <sys/ioctl.h>
-#include <sys/conf.h>
 
 #include <machine/bus.h>
 

sys/dev/usb/uhidpp.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhidpp.c,v 1.43 2023/01/08 06:54:51 anton Exp $	*/
+/*	$OpenBSD: uhidpp.c,v 1.44 2024/05/23 03:21:09 jsg Exp $	*/
 
 /*
  * Copyright (c) 2021 Anton Lindqvist <anton@openbsd.org>
@@ -18,7 +18,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/mutex.h>
 #include <sys/sensors.h>

sys/dev/usb/uhub.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhub.c,v 1.97 2022/09/04 08:42:39 mglocker Exp $ */
+/*	$OpenBSD: uhub.c,v 1.98 2024/05/23 03:21:09 jsg Exp $ */
 /*	$NetBSD: uhub.c,v 1.64 2003/02/08 03:32:51 ichiro Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $	*/
 
@@ -34,7 +34,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 

sys/dev/usb/uipaq.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipaq.c,v 1.28 2022/04/09 20:07:44 naddy Exp $	*/
+/*	$OpenBSD: uipaq.c,v 1.29 2024/05/23 03:21:09 jsg Exp $	*/
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -42,9 +42,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
-#include <sys/conf.h>
 #include <sys/tty.h>
 
 #include <dev/usb/usb.h>
@@ -52,7 +50,6 @@
 #include <dev/usb/usbcdc.h>	/*UCDC_* stuff */
 
 #include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 
 #include <dev/usb/ucomvar.h>

sys/dev/usb/ujoy.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ujoy.c,v 1.4 2022/07/02 08:50:42 visa Exp $ */
+/*	$OpenBSD: ujoy.c,v 1.5 2024/05/23 03:21:09 jsg Exp $ */
 
 /*
  * Copyright (c) 2021 Thomas Frohwein	<thfr@openbsd.org>
@@ -19,23 +19,16 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/signalvar.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
-#include <sys/proc.h>
-#include <sys/vnode.h>
 #include <sys/fcntl.h>
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbhid.h>
 
-#include <dev/usb/usbdevs.h>
 #include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
 
 #include <dev/usb/uhidev.h>
 #include <dev/usb/uhid.h>

sys/dev/usb/ukbd.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ukbd.c,v 1.89 2023/12/05 20:49:31 miod Exp $	*/
+/*	$OpenBSD: ukbd.c,v 1.90 2024/05/23 03:21:09 jsg Exp $	*/
 /*      $NetBSD: ukbd.c,v 1.85 2003/03/11 16:44:00 augustss Exp $        */
 
 /*
@@ -53,9 +53,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/timeout.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
-#include <sys/ioctl.h>
 
 #include <machine/bus.h>
 

sys/dev/usb/umass.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: umass.c,v 1.81 2022/08/23 15:58:57 anton Exp $ */
+/*	$OpenBSD: umass.c,v 1.82 2024/05/23 03:21:09 jsg Exp $ */
 /*	$NetBSD: umass.c,v 1.116 2004/06/30 05:53:46 mycroft Exp $	*/
 
 /*
@@ -126,11 +126,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/conf.h>
-#include <sys/buf.h>
 #include <sys/device.h>
-#include <sys/timeout.h>
 #include <machine/bus.h>
 
 #include <scsi/scsi_all.h>

sys/dev/usb/umass_quirks.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: umass_quirks.c,v 1.34 2020/08/26 13:57:20 krw Exp $	*/
+/*	$OpenBSD: umass_quirks.c,v 1.35 2024/05/23 03:21:09 jsg Exp $	*/
 /*	$NetBSD: umass_quirks.c,v 1.67 2004/06/28 07:49:16 mycroft Exp $	*/
 
 /*
@@ -33,7 +33,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/buf.h>
 
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>

sys/dev/usb/umass_scsi.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: umass_scsi.c,v 1.64 2023/05/10 15:28:26 krw Exp $ */
+/*	$OpenBSD: umass_scsi.c,v 1.65 2024/05/23 03:21:09 jsg Exp $ */
 /*	$NetBSD: umass_scsipi.c,v 1.9 2003/02/16 23:14:08 augustss Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -32,11 +32,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/conf.h>
-#include <sys/buf.h>
 #include <sys/device.h>
-#include <sys/ioctl.h>
 #include <sys/malloc.h>
 
 #include <dev/usb/usb.h>
@@ -48,7 +44,6 @@
 
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
-#include <scsi/scsi_disk.h>
 #include <machine/bus.h>
 
 struct umass_scsi_softc {

sys/dev/usb/umbg.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: umbg.c,v 1.28 2022/07/02 08:50:42 visa Exp $ */
+/*	$OpenBSD: umbg.c,v 1.29 2024/05/23 03:21:09 jsg Exp $ */
 
 /*
  * Copyright (c) 2007 Marc Balmer <mbalmer@openbsd.org>
@@ -18,8 +18,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/time.h>
 #include <sys/sensors.h>
@@ -27,7 +25,6 @@
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 
 #ifdef UMBG_DEBUG

sys/dev/usb/umcs.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: umcs.c,v 1.11 2023/04/10 12:11:22 jsg Exp $ */
+/* $OpenBSD: umcs.c,v 1.12 2024/05/23 03:21:09 jsg Exp $ */
 /* $NetBSD: umcs.c,v 1.8 2014/08/23 21:37:56 martin Exp $ */
 /* $FreeBSD: head/sys/dev/usb/serial/umcs.c 260559 2014-01-12 11:44:28Z hselasky $ */
 
@@ -42,7 +42,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/tty.h>
 #include <sys/device.h>
@@ -50,7 +49,6 @@
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 
 #include <dev/usb/ucomvar.h>

sys/dev/usb/umct.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: umct.c,v 1.50 2022/07/02 08:50:42 visa Exp $	*/
+/*	$OpenBSD: umct.c,v 1.51 2024/05/23 03:21:09 jsg Exp $	*/
 /*	$NetBSD: umct.c,v 1.10 2003/02/23 04:20:07 simonb Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,10 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <sys/ioctl.h>
-#include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/device.h>
 
@@ -48,7 +45,6 @@
 #include <dev/usb/usbcdc.h>
 
 #include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 
 #include <dev/usb/ucomvar.h>

sys/dev/usb/umidi.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: umidi.c,v 1.56 2022/07/02 08:50:42 visa Exp $	*/
+/*	$OpenBSD: umidi.c,v 1.57 2024/05/23 03:21:09 jsg Exp $	*/
 /*	$NetBSD: umidi.c,v 1.16 2002/07/11 21:14:32 augustss Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,16 +31,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/ioctl.h>
-#include <sys/conf.h>
 #include <sys/fcntl.h>
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
 
 #include <dev/usb/umidireg.h>
 #include <dev/usb/umidivar.h>

sys/dev/usb/umidi_quirks.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: umidi_quirks.c,v 1.17 2022/07/02 08:50:42 visa Exp $	*/
+/*	$OpenBSD: umidi_quirks.c,v 1.18 2024/05/23 03:21:09 jsg Exp $	*/
 /*	$NetBSD: umidi_quirks.c,v 1.4 2002/06/19 13:55:30 tshiozak Exp $	*/
 
 /*
@@ -32,18 +32,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/device.h>
-#include <sys/ioctl.h>
-#include <sys/conf.h>
-
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
 
 #include <dev/usb/usbdevs.h>
-#include <dev/usb/umidireg.h>
-#include <dev/usb/umidivar.h>
 #include <dev/usb/umidi_quirks.h>
 
 /*

sys/dev/usb/umodem.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: umodem.c,v 1.69 2022/07/02 08:50:42 visa Exp $ */
+/*	$OpenBSD: umodem.c,v 1.70 2024/05/23 03:21:09 jsg Exp $ */
 /*	$NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $	*/
 
 /*
@@ -46,8 +46,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/device.h>
 

sys/dev/usb/ums.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ums.c,v 1.51 2021/11/22 11:29:17 anton Exp $ */
+/*	$OpenBSD: ums.c,v 1.52 2024/05/23 03:21:09 jsg Exp $ */
 /*	$NetBSD: ums.c,v 1.60 2003/03/11 16:44:00 augustss Exp $	*/
 
 /*
@@ -37,9 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
-#include <sys/ioctl.h>
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbhid.h>

sys/dev/usb/umsm.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: umsm.c,v 1.125 2023/04/02 23:57:57 dlg Exp $	*/
+/*	$OpenBSD: umsm.c,v 1.127 2024/05/23 08:06:22 kevlo Exp $	*/
 
 /*
  * Copyright (c) 2008 Yojiro UO <yuo@nui.org>
@@ -21,10 +21,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/conf.h>
 #include <sys/tty.h>
 
 #include <dev/usb/usb.h>
@@ -179,6 +177,7 @@ static const struct umsm_type umsm_devs[] = {
 	{{ USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_EG95 }, 0},
 	{{ USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_BG96 }, 0},
 	{{ USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_EG06 }, 0},
+	{{ USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_EM060K }, 0},
 	{{ USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_AG15 }, 0},
 	{{ USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_AG35 }, 0},
 	{{ USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_AG520R }, 0},

sys/dev/usb/umstc.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: umstc.c,v 1.7 2021/11/22 11:29:18 anton Exp $ */
+/*	$OpenBSD: umstc.c,v 1.8 2024/05/23 03:21:09 jsg Exp $ */
 
 /*
  * Copyright (c) 2020 joshua stein <jcs@jcs.org>
@@ -24,7 +24,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/atomic.h>
 #include <sys/task.h>
@@ -36,7 +35,6 @@
 #include <dev/usb/usbdevs.h>
 #include <dev/usb/uhidev.h>
 
-#include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
 
 #include "audio.h"

sys/dev/usb/umt.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: umt.c,v 1.6 2024/05/13 01:15:53 jsg Exp $ */
+/* $OpenBSD: umt.c,v 1.7 2024/05/23 03:21:09 jsg Exp $ */
 /*
  * USB multitouch touchpad driver for devices conforming to
  * Windows Precision Touchpad standard
@@ -22,15 +22,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
-#include <sys/ioctl.h>
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbhid.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdevs.h>
 #include <dev/usb/usb_quirks.h>
 #include <dev/usb/uhidev.h>
 

sys/dev/usb/uoak_subr.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: uoak_subr.c,v 1.10 2022/01/09 05:43:01 jsg Exp $   */
+/*	$OpenBSD: uoak_subr.c,v 1.11 2024/05/23 03:21:09 jsg Exp $   */
 
 /*
  * Copyright (c) 2012 Yojiro UO <yuo@nui.org>
@@ -21,16 +21,13 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
-#include <sys/conf.h>
 #include <sys/sensors.h>
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbhid.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdevs.h>
 #include <dev/usb/uhidev.h>
 #include "uoak.h"
 

sys/dev/usb/uoaklux.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: uoaklux.c,v 1.17 2022/04/09 20:09:03 naddy Exp $   */
+/*	$OpenBSD: uoaklux.c,v 1.18 2024/05/23 03:21:09 jsg Exp $   */
 
 /*
  * Copyright (c) 2012 Yojiro UO <yuo@nui.org>
@@ -21,10 +21,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/conf.h>
 #include <sys/sensors.h>
 
 #include <dev/usb/usb.h>

sys/dev/usb/uoakrh.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: uoakrh.c,v 1.19 2022/04/09 20:09:03 naddy Exp $   */
+/*	$OpenBSD: uoakrh.c,v 1.20 2024/05/23 03:21:09 jsg Exp $   */
 
 /*
  * Copyright (c) 2012 Yojiro UO <yuo@nui.org>
@@ -21,10 +21,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/conf.h>
 #include <sys/sensors.h>
 
 #include <dev/usb/usb.h>

sys/dev/usb/uoakv.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: uoakv.c,v 1.17 2022/04/09 20:09:03 naddy Exp $   */
+/*	$OpenBSD: uoakv.c,v 1.18 2024/05/23 03:21:09 jsg Exp $   */
 
 /*
  * Copyright (c) 2012 Yojiro UO <yuo@nui.org>
@@ -21,10 +21,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/conf.h>
 #include <sys/sensors.h>
 
 #include <dev/usb/usb.h>