diff --git a/etc/group b/etc/group
index 30c4313d2..55db71f90 100644
--- a/etc/group
+++ b/etc/group
@@ -81,5 +81,6 @@ _sndiop:*:110:
 _syspatch:*:112:
 _slaacd:*:115:
 dialer:*:117:
+_shutdown:*:118:
 nogroup:*:32766:
 nobody:*:32767:
diff --git a/lib/libcrypto/ecdsa/ecdsa.h b/lib/libcrypto/ecdsa/ecdsa.h
index 6139dbac1..2e6b67262 100644
--- a/lib/libcrypto/ecdsa/ecdsa.h
+++ b/lib/libcrypto/ecdsa/ecdsa.h
@@ -1,7 +1,6 @@
-/* $OpenBSD: ecdsa.h,v 1.15 2023/04/18 08:47:28 tb Exp $ */
-/**
- * \file   crypto/ecdsa/ecdsa.h Include file for the OpenSSL ECDSA functions
- * \author Written by Nils Larsch for the OpenSSL project
+/* $OpenBSD: ecdsa.h,v 1.16 2023/06/19 09:12:41 tb Exp $ */
+/*
+ * Written by Nils Larsch for the OpenSSL project
  */
 /* ====================================================================
  * Copyright (c) 2000-2005 The OpenSSL Project.  All rights reserved.
@@ -88,7 +87,8 @@ struct ecdsa_method {
 	char *app_data;
 };
 
-/* If this flag is set the ECDSA method is FIPS compliant and can be used
+/*
+ * If this flag is set, the ECDSA method is FIPS compliant and can be used
  * in FIPS mode. This is set in the validated module method. If an
  * application sets this flag in its own methods it is its responsibility
  * to ensure the result is compliant.
@@ -96,172 +96,44 @@ struct ecdsa_method {
 
 #define ECDSA_FLAG_FIPS_METHOD  0x1
 
-/** Allocates and initialize a ECDSA_SIG structure
- *  \return pointer to a ECDSA_SIG structure or NULL if an error occurred
- */
 ECDSA_SIG *ECDSA_SIG_new(void);
-
-/** frees a ECDSA_SIG structure
- *  \param  sig  pointer to the ECDSA_SIG structure
- */
 void ECDSA_SIG_free(ECDSA_SIG *sig);
-
-/** DER encode content of ECDSA_SIG object (note: this function modifies *pp
- *  (*pp += length of the DER encoded signature)).
- *  \param  sig  pointer to the ECDSA_SIG object
- *  \param  pp   pointer to a unsigned char pointer for the output or NULL
- *  \return the length of the DER encoded ECDSA_SIG object or 0
- */
 int i2d_ECDSA_SIG(const ECDSA_SIG *sig, unsigned char **pp);
-
-/** Decodes a DER encoded ECDSA signature (note: this function changes *pp
- *  (*pp += len)).
- *  \param  sig  pointer to ECDSA_SIG pointer (may be NULL)
- *  \param  pp   memory buffer with the DER encoded signature
- *  \param  len  length of the buffer
- *  \return pointer to the decoded ECDSA_SIG structure (or NULL)
- */
 ECDSA_SIG *d2i_ECDSA_SIG(ECDSA_SIG **sig, const unsigned char **pp, long len);
-
-/** Accessor for r and s fields of ECDSA_SIG
- *  \param  sig  pointer to ECDSA_SIG pointer
- *  \param  pr   pointer to BIGNUM pointer for r (may be NULL)
- *  \param  ps   pointer to BIGNUM pointer for s (may be NULL)
- */
 void ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps);
 
 const BIGNUM *ECDSA_SIG_get0_r(const ECDSA_SIG *sig);
 const BIGNUM *ECDSA_SIG_get0_s(const ECDSA_SIG *sig);
-
-/** Setter for r and s fields of ECDSA_SIG
- *  \param  sig  pointer to ECDSA_SIG pointer
- *  \param  r    pointer to BIGNUM for r (may be NULL)
- *  \param  s    pointer to BIGNUM for s (may be NULL)
- */
 int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s);
 
-/** Computes the ECDSA signature of the given hash value using
- *  the supplied private key and returns the created signature.
- *  \param  dgst      pointer to the hash value
- *  \param  dgst_len  length of the hash value
- *  \param  eckey     EC_KEY object containing a private EC key
- *  \return pointer to a ECDSA_SIG structure or NULL if an error occurred
- */
 ECDSA_SIG *ECDSA_do_sign(const unsigned char *dgst, int dgst_len,
     EC_KEY *eckey);
-
-/** Computes ECDSA signature of a given hash value using the supplied
- *  private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
- *  \param  dgst     pointer to the hash value to sign
- *  \param  dgstlen  length of the hash value
- *  \param  kinv     BIGNUM with a pre-computed inverse k (optional)
- *  \param  rp       BIGNUM with a pre-computed rp value (optional),
- *                   see ECDSA_sign_setup
- *  \param  eckey    EC_KEY object containing a private EC key
- *  \return pointer to a ECDSA_SIG structure or NULL if an error occurred
- */
 ECDSA_SIG *ECDSA_do_sign_ex(const unsigned char *dgst, int dgstlen,
     const BIGNUM *kinv, const BIGNUM *rp, EC_KEY *eckey);
-
-/** Verifies that the supplied signature is a valid ECDSA
- *  signature of the supplied hash value using the supplied public key.
- *  \param  dgst      pointer to the hash value
- *  \param  dgst_len  length of the hash value
- *  \param  sig       ECDSA_SIG structure
- *  \param  eckey     EC_KEY object containing a public EC key
- *  \return 1 if the signature is valid, 0 if the signature is invalid
- *          and -1 on error
- */
 int ECDSA_do_verify(const unsigned char *dgst, int dgst_len,
     const ECDSA_SIG *sig, EC_KEY* eckey);
 
 const ECDSA_METHOD *ECDSA_OpenSSL(void);
-
-/** Sets the default ECDSA method
- *  \param  meth  new default ECDSA_METHOD
- */
 void ECDSA_set_default_method(const ECDSA_METHOD *meth);
-
-/** Returns the default ECDSA method
- *  \return pointer to ECDSA_METHOD structure containing the default method
- */
 const ECDSA_METHOD *ECDSA_get_default_method(void);
-
-/** Sets method to be used for the ECDSA operations
- *  \param  eckey  EC_KEY object
- *  \param  meth   new method
- *  \return 1 on success and 0 otherwise
- */
 int ECDSA_set_method(EC_KEY *eckey, const ECDSA_METHOD *meth);
-
-/** Returns the maximum length of the DER encoded signature
- *  \param  eckey  EC_KEY object
- *  \return numbers of bytes required for the DER encoded signature
- */
 int ECDSA_size(const EC_KEY *eckey);
 
-/** Precompute parts of the signing operation
- *  \param  eckey  EC_KEY object containing a private EC key
- *  \param  ctx    BN_CTX object (optional)
- *  \param  kinv   BIGNUM pointer for the inverse of k
- *  \param  rp     BIGNUM pointer for x coordinate of k * generator
- *  \return 1 on success and 0 otherwise
- */
 int ECDSA_sign_setup(EC_KEY *eckey, BN_CTX *ctx, BIGNUM **kinv,
     BIGNUM **rp);
-
-/** Computes ECDSA signature of a given hash value using the supplied
- *  private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
- *  \param  type     this parameter is ignored
- *  \param  dgst     pointer to the hash value to sign
- *  \param  dgstlen  length of the hash value
- *  \param  sig      memory for the DER encoded created signature
- *  \param  siglen   pointer to the length of the returned signature
- *  \param  eckey    EC_KEY object containing a private EC key
- *  \return 1 on success and 0 otherwise
- */
 int ECDSA_sign(int type, const unsigned char *dgst, int dgstlen,
     unsigned char *sig, unsigned int *siglen, EC_KEY *eckey);
-
-
-/** Computes ECDSA signature of a given hash value using the supplied
- *  private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
- *  \param  type     this parameter is ignored
- *  \param  dgst     pointer to the hash value to sign
- *  \param  dgstlen  length of the hash value
- *  \param  sig      buffer to hold the DER encoded signature
- *  \param  siglen   pointer to the length of the returned signature
- *  \param  kinv     BIGNUM with a pre-computed inverse k (optional)
- *  \param  rp       BIGNUM with a pre-computed rp value (optional),
- *                   see ECDSA_sign_setup
- *  \param  eckey    EC_KEY object containing a private EC key
- *  \return 1 on success and 0 otherwise
- */
 int ECDSA_sign_ex(int type, const unsigned char *dgst, int dgstlen,
     unsigned char *sig, unsigned int *siglen, const BIGNUM *kinv,
     const BIGNUM *rp, EC_KEY *eckey);
-
-/** Verifies that the given signature is valid ECDSA signature
- *  of the supplied hash value using the specified public key.
- *  \param  type     this parameter is ignored
- *  \param  dgst     pointer to the hash value
- *  \param  dgstlen  length of the hash value
- *  \param  sig      pointer to the DER encoded signature
- *  \param  siglen   length of the DER encoded signature
- *  \param  eckey    EC_KEY object containing a public EC key
- *  \return 1 if the signature is valid, 0 if the signature is invalid
- *          and -1 on error
- */
 int ECDSA_verify(int type, const unsigned char *dgst, int dgstlen,
     const unsigned char *sig, int siglen, EC_KEY *eckey);
 
-/* the standard ex_data functions */
 int ECDSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
     CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
 int ECDSA_set_ex_data(EC_KEY *d, int idx, void *arg);
 void *ECDSA_get_ex_data(EC_KEY *d, int idx);
 
-
 /* XXX should be in ec.h, but needs ECDSA_SIG */
 void EC_KEY_METHOD_set_sign(EC_KEY_METHOD *meth,
     int (*sign)(int type, const unsigned char *dgst,
diff --git a/lib/libtls/tls_signer.c b/lib/libtls/tls_signer.c
index 372fa7781..177c9d07a 100644
--- a/lib/libtls/tls_signer.c
+++ b/lib/libtls/tls_signer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls_signer.c,v 1.6 2023/06/18 11:43:03 op Exp $ */
+/* $OpenBSD: tls_signer.c,v 1.9 2023/06/18 19:12:58 tb Exp $ */
 /*
  * Copyright (c) 2021 Eric Faurot <eric@openbsd.org>
  *
@@ -392,8 +392,8 @@ tls_ecdsa_do_sign(const unsigned char *dgst, int dgst_len, const BIGNUM *inv,
 	 * to its calling convention/signature.
 	 */
 
-	pubkey_hash = ECDSA_get_ex_data(eckey, 0);
-	config = ECDSA_get_ex_data(eckey, 1);
+	pubkey_hash = EC_KEY_get_ex_data(eckey, 0);
+	config = EC_KEY_get_ex_data(eckey, 1);
 
 	if (pubkey_hash == NULL || config == NULL)
 		goto err;
@@ -423,17 +423,26 @@ EC_KEY_METHOD *
 tls_signer_ecdsa_method(void)
 {
 	static EC_KEY_METHOD *ecdsa_method = NULL;
+	const EC_KEY_METHOD *default_method;
+	int (*sign)(int type, const unsigned char *dgst, int dlen,
+	    unsigned char *sig, unsigned int *siglen,
+	    const BIGNUM *kinv, const BIGNUM *r, EC_KEY *eckey);
+	int (*sign_setup)(EC_KEY *eckey, BN_CTX *ctx_in,
+	    BIGNUM **kinvp, BIGNUM **rp);
 
 	pthread_mutex_lock(&signer_method_lock);
 
 	if (ecdsa_method != NULL)
 		goto out;
 
-	ecdsa_method = EC_KEY_METHOD_new(NULL);
+	default_method = EC_KEY_get_default_method();
+	ecdsa_method = EC_KEY_METHOD_new(default_method);
 	if (ecdsa_method == NULL)
 		goto out;
 
-	EC_KEY_METHOD_set_sign(ecdsa_method, NULL, NULL, tls_ecdsa_do_sign);
+	EC_KEY_METHOD_get_sign(default_method, &sign, &sign_setup, NULL);
+	EC_KEY_METHOD_set_sign(ecdsa_method, sign, sign_setup,
+	    tls_ecdsa_do_sign);
 
  out:
 	pthread_mutex_unlock(&signer_method_lock);
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index de1f28030..031e91975 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.c,v 1.249 2023/05/13 18:13:42 krw Exp $	*/
+/*	$OpenBSD: disklabel.c,v 1.250 2023/06/19 13:45:19 krw Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993
@@ -367,13 +367,13 @@ parsefstab(void)
 
 	i = asprintf(&partname, "/dev/%s%c", dkname, 'a');
 	if (i == -1)
-		err(4, NULL);
+		err(1, NULL);
 	i = asprintf(&partduid,
 	    "%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx.a",
 	    lab.d_uid[0], lab.d_uid[1], lab.d_uid[2], lab.d_uid[3],
 	    lab.d_uid[4], lab.d_uid[5], lab.d_uid[6], lab.d_uid[7]);
 	if (i == -1)
-		err(4, NULL);
+		err(1, NULL);
 	setfsent();
 	for (i = 0; i < MAXPARTITIONS; i++) {
 		partname[strlen(dkname) + 5] = 'a' + i;
@@ -812,7 +812,7 @@ getasciilabel(FILE *f, struct disklabel *lp)
 	lp->d_version = 1;
 
 	if (!(omountpoints = calloc(MAXPARTITIONS, sizeof(char *))))
-		errx(4, "out of memory");
+		err(1, NULL);
 
 	mpcopy(omountpoints, mountpoints);
 	for (part = 0; part < MAXPARTITIONS; part++) {
diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c
index 785b1157f..183f7e6de 100644
--- a/sbin/disklabel/editor.c
+++ b/sbin/disklabel/editor.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: editor.c,v 1.407 2023/05/23 13:20:31 krw Exp $	*/
+/*	$OpenBSD: editor.c,v 1.410 2023/06/19 13:45:19 krw Exp $	*/
 
 /*
  * Copyright (c) 1997-2000 Todd C. Miller <millert@openbsd.org>
@@ -44,6 +44,7 @@
 
 #define	ROUNDUP(_s, _a)		((((_s) + (_a) - 1) / (_a)) * (_a))
 #define	ROUNDDOWN(_s, _a)	(((_s) / (_a)) * (_a))
+#define	CHUNKSZ(_c)		((_c)->stop - (_c)->start)
 
 /* flags for getuint64() */
 #define	DO_CONVERSIONS	0x00000001
@@ -197,7 +198,7 @@ editor(int f)
 	if (!(omountpoints = calloc(MAXPARTITIONS, sizeof(char *))) ||
 	    !(origmountpoints = calloc(MAXPARTITIONS, sizeof(char *))) ||
 	    !(tmpmountpoints = calloc(MAXPARTITIONS, sizeof(char *))))
-		errx(4, "out of memory");
+		err(1, NULL);
 
 	/* How big is the OpenBSD portion of the disk?  */
 	find_bounds(&newlab);
@@ -404,11 +405,11 @@ editor(int f)
 			/* Display free space. */
 			chunk = free_chunks(&newlab, -1);
 			for (; chunk->start != 0 || chunk->stop != 0; chunk++) {
-				total += chunk->stop - chunk->start;
+				total += CHUNKSZ(chunk);
 				fprintf(stderr, "Free sectors: %16llu - %16llu "
 				    "(%16llu)\n",
 				    chunk->start, chunk->stop - 1,
-				    chunk->stop - chunk->start);
+				    CHUNKSZ(chunk));
 			}
 			fprintf(stderr, "Total free sectors: %llu.\n", total);
 			break;
@@ -566,7 +567,7 @@ again:
 		goto again;
 	alloc = reallocarray(NULL, lastalloc, sizeof(struct space_allocation));
 	if (alloc == NULL)
-		errx(4, "out of memory");
+		err(1, NULL);
 	memcpy(alloc, alloc_table[index].table,
 	    lastalloc * sizeof(struct space_allocation));
 
@@ -674,7 +675,7 @@ again:
 			}
 			free(*partmp);
 			if ((*partmp = strdup(ap->mp)) == NULL)
-				errx(4, "out of memory");
+				err(1, NULL);
 		}
 	}
 
@@ -788,8 +789,8 @@ editor_add(struct disklabel *lp, const char *p)
 	chunk = free_chunks(lp, -1);
 	new_size = new_offset = 0;
 	for (; chunk->start != 0 || chunk->stop != 0; chunk++) {
-		if (chunk->stop - chunk->start > new_size) {
-			new_size = chunk->stop - chunk->start;
+		if (CHUNKSZ(chunk) > new_size) {
+			new_size = CHUNKSZ(chunk);
 			new_offset = chunk->start;
 		}
 	}
@@ -1413,7 +1414,7 @@ editor_countfree(const struct disklabel *lp)
 	chunk = free_chunks(lp, -1);
 
 	for (; chunk->start != 0 || chunk->stop != 0; chunk++)
-		freesectors += chunk->stop - chunk->start;
+		freesectors += CHUNKSZ(chunk);
 
 	return (freesectors);
 }
@@ -1454,7 +1455,7 @@ mpcopy(char **to, char **from)
 		if (from[i] != NULL) {
 			to[i] = strdup(from[i]);
 			if (to[i] == NULL)
-				errx(4, "out of memory");
+				err(1, NULL);
 		}
 	}
 }
@@ -1752,7 +1753,7 @@ get_mp(const struct disklabel *lp, int partno)
 			/* XXX - might as well realloc */
 			free(mountpoints[partno]);
 			if ((mountpoints[partno] = strdup(p)) == NULL)
-				errx(4, "out of memory");
+				err(1, NULL);
 			break;
 		}
 		fputs("Mount points must start with '/'\n", stderr);
@@ -1979,7 +1980,7 @@ parse_sizerange(char *buf, u_int64_t *min, u_int64_t *max)
 		return (-1);
 	if (p != NULL && p[0] != '\0') {
 		if (p[0] == '*')
-			*max = -1;
+			*max = UINT64_MAX;
 		else
 			if (parse_sizespec(p, &val2, &unit2) == -1)
 				return (-1);
diff --git a/sbin/shutdown/Makefile b/sbin/shutdown/Makefile
index a4fb13e8f..d2d1138f2 100644
--- a/sbin/shutdown/Makefile
+++ b/sbin/shutdown/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.3 1997/09/21 11:38:13 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 2023/06/19 13:05:25 deraadt Exp $
 
 PROG=	shutdown
 MAN=	shutdown.8
 BINOWN=	root
-BINGRP=	operator
+BINGRP=	_shutdown
 BINMODE=4550
 
 .include <bsd.prog.mk>
diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8
index 5f6ae5624..275c55637 100644
--- a/sbin/shutdown/shutdown.8
+++ b/sbin/shutdown/shutdown.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: shutdown.8,v 1.43 2023/02/04 13:03:58 jsg Exp $
+.\"	$OpenBSD: shutdown.8,v 1.44 2023/06/19 13:05:25 deraadt Exp $
 .\"	$NetBSD: shutdown.8,v 1.6 1995/03/18 15:01:07 cgd Exp $
 .\"
 .\" Copyright (c) 1988, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)shutdown.8	8.1 (Berkeley) 6/5/93
 .\"
-.Dd $Mdocdate: February 4 2023 $
+.Dd $Mdocdate: June 19 2023 $
 .Dt SHUTDOWN 8
 .Os
 .Sh NAME
@@ -54,6 +54,15 @@ command is issued without options, the system is placed in single
 user mode at the indicated time after shutting down all system
 services.
 .Pp
+Users in the
+.Va _shutdown
+group can also run the
+.Nm
+command.
+Historically this permission was tied to the
+.Va operator
+group.
+.Pp
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl d
diff --git a/sys/arch/arm64/dev/agintc.c b/sys/arch/arm64/dev/agintc.c
index 47c43ebf7..b053d6a47 100644
--- a/sys/arch/arm64/dev/agintc.c
+++ b/sys/arch/arm64/dev/agintc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: agintc.c,v 1.49 2023/06/17 22:10:19 kettenis Exp $ */
+/* $OpenBSD: agintc.c,v 1.50 2023/06/18 16:25:21 kettenis Exp $ */
 /*
  * Copyright (c) 2007, 2009, 2011, 2017 Dale Rahn <drahn@dalerahn.com>
  * Copyright (c) 2018 Mark Kettenis <kettenis@openbsd.org>
@@ -843,8 +843,6 @@ agintc_enable_wakeup(void)
 		cpu_dcache_wb_range((vaddr_t)&prop[irq],
 		    sizeof(*prop));
 		__asm volatile("dsb sy");
-
-		/* XXX: Invalidate cache? */
 	}
 
 	/* Invalidate cache. */
diff --git a/sys/dev/acpi/ccpmic.c b/sys/dev/acpi/ccpmic.c
index 396ac7c02..180f66fca 100644
--- a/sys/dev/acpi/ccpmic.c
+++ b/sys/dev/acpi/ccpmic.c
@@ -311,7 +311,7 @@ ccpmic_power_opreg_handler(void *cookie, int iodir, uint64_t address,
 	return 0;
 }
 
-/* 
+/*
  * We have 16 real GPIOs and a bunch of virtual ones.  The virtual
  * ones are mostly there to deal with a limitation of Microsoft
  * Windows.  We only implement the "panel" control GPIO, which
diff --git a/sys/dev/acpi/chvgpio.c b/sys/dev/acpi/chvgpio.c
index 78bfae352..d83ebe5d9 100644
--- a/sys/dev/acpi/chvgpio.c
+++ b/sys/dev/acpi/chvgpio.c
@@ -356,7 +356,7 @@ chvgpio_intr_enable(void *cookie, int pin)
 	    CHVGPIO_INTERRUPT_MASK);
 	bus_space_write_4(sc->sc_memt, sc->sc_memh,
 	    CHVGPIO_INTERRUPT_MASK, reg | (1 << line));
-}	
+}
 
 void
 chvgpio_intr_disable(void *cookie, int pin)
@@ -375,7 +375,7 @@ chvgpio_intr_disable(void *cookie, int pin)
 	    CHVGPIO_INTERRUPT_MASK);
 	bus_space_write_4(sc->sc_memt, sc->sc_memh,
 	    CHVGPIO_INTERRUPT_MASK, reg & ~(1 << line));
-}	
+}
 
 int
 chvgpio_intr(void *arg)
diff --git a/sys/dev/acpi/dwgpio.c b/sys/dev/acpi/dwgpio.c
index 8dd10dbaf..87a3cbc61 100644
--- a/sys/dev/acpi/dwgpio.c
+++ b/sys/dev/acpi/dwgpio.c
@@ -135,7 +135,7 @@ dwgpio_attach(struct device *parent, struct device *self, void *aux)
 		printf(": too many pins\n");
 		return;
 	}
-	
+
 	sc->sc_pin_ih = mallocarray(sc->sc_npins, sizeof(*sc->sc_pin_ih),
 	    M_DEVBUF, M_WAITOK | M_ZERO);
 
diff --git a/sys/dev/acpi/iosf_acpi.c b/sys/dev/acpi/iosf_acpi.c
index f39419181..fd8e3eab8 100644
--- a/sys/dev/acpi/iosf_acpi.c
+++ b/sys/dev/acpi/iosf_acpi.c
@@ -125,7 +125,7 @@ iosf_acpi_mbi_mdr_rd(struct iosf_mbi *mbi, uint32_t mcr, uint32_t mcrx)
 	struct iosf_acpi_softc *sc = (struct iosf_acpi_softc *)mbi->mbi_dev;
 
 	if (mcrx != 0) {
-		bus_space_write_4(sc->sc_iot, sc->sc_ioh, 
+		bus_space_write_4(sc->sc_iot, sc->sc_ioh,
 		    IOSF_ACPI_MBI_MCRX, mcrx);
 	}
 	bus_space_write_4(sc->sc_iot, sc->sc_ioh, IOSF_ACPI_MBI_MCR, mcr);
diff --git a/sys/dev/acpi/pchgpio.c b/sys/dev/acpi/pchgpio.c
index 0e689768a..5f203785e 100644
--- a/sys/dev/acpi/pchgpio.c
+++ b/sys/dev/acpi/pchgpio.c
@@ -130,7 +130,7 @@ const struct pchgpio_group spt_lp_groups[] =
 	{ 1, 0, 48, 71, 48 },		/* GPP_C */
 	{ 1, 1, 72, 95, 72 },		/* GPP_D */
 	{ 1, 2, 96, 119, 96 },		/* GPP_E */
-	
+
 	/* Community 3 */
 	{ 2, 0, 120, 143, 120 },	/* GPP_F */
 	{ 2, 1, 144, 151, 144 },	/* GPP_G */
diff --git a/sys/dev/acpi/tipmic.c b/sys/dev/acpi/tipmic.c
index 0b882e594..e3fc3a5d9 100644
--- a/sys/dev/acpi/tipmic.c
+++ b/sys/dev/acpi/tipmic.c
@@ -435,7 +435,7 @@ tipmic_power_opreg_handler(void *cookie, int iodir, uint64_t address,
 	return 0;
 }
 
-/* 
+/*
  * Allegedly the GPIOs are virtual and only there to deal with a
  * limitation of Microsoft Windows.
  */
diff --git a/sys/dev/adb/akbdmap.h b/sys/dev/adb/akbdmap.h
index 14a08e53c..077161cf0 100644
--- a/sys/dev/adb/akbdmap.h
+++ b/sys/dev/adb/akbdmap.h
@@ -620,7 +620,7 @@ static const keysym_t akbd_keydesc_sg_nodead[] = {
     KC(30),	KS_diaeresis,	KS_exclam,	KS_bracketright,KS_braceright,
     KC(45),	KS_n,		KS_N,		KS_asciitilde,
 };
- 
+
 #define KBD_MAP(name, base, map) \
 			{ name, base, sizeof(map)/sizeof(keysym_t), map }
 
diff --git a/sys/dev/ata/atareg.h b/sys/dev/ata/atareg.h
index 80c0feb67..b414661c8 100644
--- a/sys/dev/ata/atareg.h
+++ b/sys/dev/ata/atareg.h
@@ -16,7 +16,7 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,     
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
@@ -186,7 +186,7 @@ struct ataparams {
 #define ATA_CMD2_RWQ	0x0002
 #define WDC_CMD2_DM	0x0001 /* Download Microcode supported */
     u_int16_t	atap_cmd_ext;		/* 84: command/features supp. ext. */
-#define ATAPI_CMDE_IIUF	0x2000 /* IDLE IMMEDIATE with UNLOAD FEATURE */	
+#define ATAPI_CMDE_IIUF	0x2000 /* IDLE IMMEDIATE with UNLOAD FEATURE */
 #define ATAPI_CMDE_MSER	0x0004 /* Media serial number supported */
 #define ATAPI_CMDE_TEST	0x0002 /* SMART self-test supported */
 #define ATAPI_CMDE_SLOG	0x0001 /* SMART error logging supported */
diff --git a/sys/dev/ata/atascsi.h b/sys/dev/ata/atascsi.h
index e33b91dbf..903e348ae 100644
--- a/sys/dev/ata/atascsi.h
+++ b/sys/dev/ata/atascsi.h
@@ -271,7 +271,7 @@ struct ata_fis_d2h {
 } __packed;
 
 /*
- * SATA log page 10h - 
+ * SATA log page 10h -
  * looks like a D2H FIS, with errored tag number in first byte.
  */
 struct ata_log_page_10h {
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 6a89ea34d..94947661f 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -294,7 +294,7 @@ wdattach(struct device *parent, struct device *self, void *aux)
 		wdc_c.r_features = WDSF_EN_WR_CACHE;
 		wdc_c.timeout = 1000;
 		wdc_c.flags = at_poll;
-	
+
 		if (wdc_exec_command(wd->drvp, &wdc_c) != WDC_COMPLETE) {
 			printf("%s: enable write cache command didn't "
 			    "complete\n", wd->sc_dev.dv_xname);
diff --git a/sys/dev/cardbus/ehci_cardbus.c b/sys/dev/cardbus/ehci_cardbus.c
index 59332abd7..0bae8463f 100644
--- a/sys/dev/cardbus/ehci_cardbus.c
+++ b/sys/dev/cardbus/ehci_cardbus.c
@@ -78,7 +78,7 @@ ehci_cardbus_match(struct device *parent, void *match, void *aux)
 	    PCI_SUBCLASS(ca->ca_class) == PCI_SUBCLASS_SERIALBUS_USB &&
 	    PCI_INTERFACE(ca->ca_class) == PCI_INTERFACE_EHCI)
 		return (1);
- 
+
 	return (0);
 }
 
@@ -138,7 +138,7 @@ ehci_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	else
 		snprintf(sc->sc.sc_vendor, sizeof(sc->sc.sc_vendor),
 		    "vendor 0x%04x", PCI_VENDOR(ca->ca_id));
-	
+
 	r = ehci_init(&sc->sc);
 	if (r != USBD_NORMAL_COMPLETION) {
 		printf("%s: init failed, error=%d\n", devname, r);
diff --git a/sys/dev/cardbus/if_ath_cardbus.c b/sys/dev/cardbus/if_ath_cardbus.c
index 917a4bf8b..91f83662c 100644
--- a/sys/dev/cardbus/if_ath_cardbus.c
+++ b/sys/dev/cardbus/if_ath_cardbus.c
@@ -33,8 +33,8 @@
  */
 
 #include <sys/param.h>
-#include <sys/systm.h> 
-#include <sys/mbuf.h>   
+#include <sys/systm.h>
+#include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
@@ -43,11 +43,11 @@
 #include <sys/device.h>
 #include <sys/gpio.h>
 #include <sys/endian.h>
- 
+
 #include <net/if.h>
 #include <net/if_media.h>
 
-#include <netinet/in.h> 
+#include <netinet/in.h>
 #include <netinet/if_ether.h>
 
 #include <net80211/ieee80211_var.h>
diff --git a/sys/dev/cardbus/if_atw_cardbus.c b/sys/dev/cardbus/if_atw_cardbus.c
index 1c3245a65..62910698d 100644
--- a/sys/dev/cardbus/if_atw_cardbus.c
+++ b/sys/dev/cardbus/if_atw_cardbus.c
@@ -39,8 +39,8 @@
 #include "bpfilter.h"
 
 #include <sys/param.h>
-#include <sys/systm.h> 
-#include <sys/mbuf.h>   
+#include <sys/systm.h>
+#include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
@@ -48,7 +48,7 @@
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/endian.h>
- 
+
 #include <net/if.h>
 #include <net/if_media.h>
 
@@ -58,9 +58,9 @@
 #include <net80211/ieee80211_radiotap.h>
 #include <net80211/ieee80211_var.h>
 
-#if NBPFILTER > 0 
+#if NBPFILTER > 0
 #include <net/bpf.h>
-#endif 
+#endif
 
 #include <machine/bus.h>
 #include <machine/intr.h>
diff --git a/sys/dev/cardbus/if_fxp_cardbus.c b/sys/dev/cardbus/if_fxp_cardbus.c
index b6221922a..5cc5b745c 100644
--- a/sys/dev/cardbus/if_fxp_cardbus.c
+++ b/sys/dev/cardbus/if_fxp_cardbus.c
@@ -168,7 +168,7 @@ fxp_cardbus_attach(struct device *parent, struct device *self, void *aux)
 		return;
 	}
 	snprintf(intrstr, sizeof(intrstr), "irq %d", ca->ca_intrline);
-	
+
 	sc->sc_revision = PCI_REVISION(ca->ca_class);
 
 	fxp_attach(sc, intrstr);
diff --git a/sys/dev/cardbus/if_rl_cardbus.c b/sys/dev/cardbus/if_rl_cardbus.c
index 2d4eb393a..52ceca6ea 100644
--- a/sys/dev/cardbus/if_rl_cardbus.c
+++ b/sys/dev/cardbus/if_rl_cardbus.c
@@ -31,7 +31,7 @@
 /*
  * if_rl_cardbus.c:
  *	Cardbus specific routines for Realtek 8139 ethernet adapter.
- *	Tested for 
+ *	Tested for
  *		- elecom-Laneed	LD-10/100CBA (Accton MPX5030)
  *		- MELCO		LPC3-TX-CB   (Realtek 8139)
  */
@@ -79,7 +79,7 @@
  * on the part of Realtek. Memory mapped mode does appear to work on
  * uniprocessor systems though.
  */
-#define RL_USEIOSPACE 
+#define RL_USEIOSPACE
 
 #include <dev/ic/rtl81x9reg.h>
 
@@ -99,7 +99,7 @@ const struct pci_matchid rl_cardbus_devices[] = {
 };
 
 struct rl_cardbus_softc {
-	struct rl_softc sc_rl;	/* real rtk softc */ 
+	struct rl_softc sc_rl;	/* real rtk softc */
 
 	/* CardBus-specific goo. */
 	cardbus_devfunc_t sc_ct;
@@ -141,7 +141,7 @@ rl_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	struct cardbus_softc		*psc =
 	    (struct cardbus_softc *)sc->sc_dev.dv_parent;
 	cardbus_chipset_tag_t		cc = psc->sc_cc;
-	cardbus_function_tag_t		cf = psc->sc_cf;                            
+	cardbus_function_tag_t		cf = psc->sc_cf;
 	cardbus_devfunc_t		ct = ca->ca_ct;
 	bus_addr_t			adr;
 
@@ -199,7 +199,7 @@ rl_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	rl_attach(sc);
 }
 
-int 
+int
 rl_cardbus_detach(struct device *self, int flags)
 {
 	struct rl_cardbus_softc	*csc = (void *) self;
@@ -219,7 +219,7 @@ rl_cardbus_detach(struct device *self, int flags)
 	 */
 	if (sc->sc_ih != NULL)
 		cardbus_intr_disestablish(ct->ct_cc, ct->ct_cf, sc->sc_ih);
-	
+
 	/*
 	 * Release bus space and close window.
 	 */
@@ -230,7 +230,7 @@ rl_cardbus_detach(struct device *self, int flags)
 	return (0);
 }
 
-void 
+void
 rl_cardbus_setup(struct rl_cardbus_softc *csc)
 {
 	struct rl_softc		*sc = &csc->sc_rl;
@@ -284,11 +284,11 @@ rl_cardbus_setup(struct rl_cardbus_softc *csc)
 		csc->sc_bar_reg, csc->sc_bar_val);
 
 	/* Enable the appropriate bits in the CARDBUS CSR. */
-	reg = pci_conf_read(pc, csc->sc_tag, 
+	reg = pci_conf_read(pc, csc->sc_tag,
 	    PCI_COMMAND_STATUS_REG);
 	reg &= ~(PCI_COMMAND_IO_ENABLE|PCI_COMMAND_MEM_ENABLE);
 	reg |= csc->sc_csr;
-	pci_conf_write(pc, csc->sc_tag, 
+	pci_conf_write(pc, csc->sc_tag,
 	    PCI_COMMAND_STATUS_REG, reg);
 
 	/*
diff --git a/sys/dev/cardbus/if_rtw_cardbus.c b/sys/dev/cardbus/if_rtw_cardbus.c
index 5bbb126fa..c5ec8d964 100644
--- a/sys/dev/cardbus/if_rtw_cardbus.c
+++ b/sys/dev/cardbus/if_rtw_cardbus.c
@@ -70,8 +70,8 @@
 #include "bpfilter.h"
 
 #include <sys/param.h>
-#include <sys/systm.h> 
-#include <sys/mbuf.h>   
+#include <sys/systm.h>
+#include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
@@ -89,9 +89,9 @@
 #include <net80211/ieee80211_radiotap.h>
 #include <net80211/ieee80211_var.h>
 
-#if NBPFILTER > 0 
+#if NBPFILTER > 0
 #include <net/bpf.h>
-#endif 
+#endif
 
 #include <machine/bus.h>
 
@@ -257,7 +257,7 @@ rtw_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	csc->sc_intrline = ca->ca_intrline;
 
 	printf(": irq %d\n", csc->sc_intrline);
-	    
+
 	/*
 	 * Finish off the attach.
 	 */
diff --git a/sys/dev/cardbus/if_xl_cardbus.c b/sys/dev/cardbus/if_xl_cardbus.c
index 06b6256cf..91f40557b 100644
--- a/sys/dev/cardbus/if_xl_cardbus.c
+++ b/sys/dev/cardbus/if_xl_cardbus.c
@@ -237,7 +237,7 @@ xl_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	(ct->ct_cf->cardbus_ctrl)(cc, CARDBUS_BM_ENABLE);
 	pci_conf_write(ca->ca_pc, ca->ca_tag, PCI_COMMAND_STATUS_REG,
 	    command);
-  
+
  	/*
 	 * set latency timer
 	 */
diff --git a/sys/dev/cardbus/ohci_cardbus.c b/sys/dev/cardbus/ohci_cardbus.c
index 633195aa4..a69481efa 100644
--- a/sys/dev/cardbus/ohci_cardbus.c
+++ b/sys/dev/cardbus/ohci_cardbus.c
@@ -85,7 +85,7 @@ ohci_cardbus_match(struct device *parent, void *match, void *aux)
 	    PCI_SUBCLASS(ca->ca_class) == PCI_SUBCLASS_SERIALBUS_USB &&
 	    PCI_INTERFACE(ca->ca_class) == PCI_INTERFACE_OHCI)
 		return (1);
- 
+
 	return (0);
 }
 
diff --git a/sys/dev/cardbus/rbus.h b/sys/dev/cardbus/rbus.h
index f620780bf..96064e165 100644
--- a/sys/dev/cardbus/rbus.h
+++ b/sys/dev/cardbus/rbus.h
@@ -44,7 +44,7 @@
  * Why recursive?
  *
  *  The recursive bus-space administration has two reasons. For one
- *  this modelling matches the actual memory and io space management 
+ *  this modelling matches the actual memory and io space management
  *  of bridge devices quite well. Furthermore  is the rbus a
  *  distributed management system, as such it plays well with
  *  multi-thread kernel.
@@ -54,7 +54,7 @@
  *  rbus can model a bus-to-bus bridge in two ways: dedicated or shared
  *  Dedicated: the bridge has its own bus space.
  *  Shared: the bridge has bus space, but this bus space is
- *  shared with other bus bridges. 
+ *  shared with other bus bridges.
  */
 
 
diff --git a/sys/dev/cardbus/uhci_cardbus.c b/sys/dev/cardbus/uhci_cardbus.c
index d6aa0a8f2..319ab96f8 100644
--- a/sys/dev/cardbus/uhci_cardbus.c
+++ b/sys/dev/cardbus/uhci_cardbus.c
@@ -75,7 +75,7 @@ uhci_cardbus_match(struct device *parent, void *match, void *aux)
 	    PCI_SUBCLASS(ca->ca_class) == PCI_SUBCLASS_SERIALBUS_USB &&
 	    PCI_INTERFACE(ca->ca_class) == PCI_INTERFACE_UHCI)
 		return (1);
- 
+
 	return (0);
 }
 
@@ -159,7 +159,7 @@ uhci_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	else
 		snprintf(sc->sc.sc_vendor, sizeof(sc->sc.sc_vendor),
 		    "vendor 0x%04x", PCI_VENDOR(ca->ca_id));
-	
+
 	r = uhci_init(&sc->sc);
 	if (r != USBD_NORMAL_COMPLETION) {
 		printf("%s: init failed, error=%d\n", devname, r);
diff --git a/sys/dev/dec/clockvar.h b/sys/dev/dec/clockvar.h
index b314d74fe..f706bc186 100644
--- a/sys/dev/dec/clockvar.h
+++ b/sys/dev/dec/clockvar.h
@@ -6,17 +6,17 @@
  * All rights reserved.
  *
  * Author: Chris G. Demetriou
- * 
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
  * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
  *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
diff --git a/sys/dev/eisa/ahc_eisa.c b/sys/dev/eisa/ahc_eisa.c
index 0ebfaa182..55104c380 100644
--- a/sys/dev/eisa/ahc_eisa.c
+++ b/sys/dev/eisa/ahc_eisa.c
@@ -72,11 +72,11 @@ ahc_eisa_irq(bus_space_tag_t iot, bus_space_handle_t ioh)
 	int irq;
 	u_char intdef;
 	u_char hcntrl;
-	
+
 	/* Pause the card preserving the IRQ type */
 	hcntrl = bus_space_read_1(iot, ioh, HCNTRL) & IRQMS;
 	bus_space_write_1(iot, ioh, HCNTRL, hcntrl | PAUSE);
-	
+
 	intdef = bus_space_read_1(iot, ioh, INTDEF);
 	switch (irq = (intdef & VECTOR)) {
 	case 9:
@@ -145,10 +145,10 @@ ahc_eisa_attach(struct device *parent, struct device *self, void *aux)
 	u_int scsiconf1;
 	u_int intdef;
 	int i;
-	
+
 	ahc_set_name(ahc, ahc->sc_dev.dv_xname);
 	ahc_set_unit(ahc, ahc->sc_dev.dv_unit);
-	
+
 	/* set dma tags */
 	ahc->parent_dmat = ea->ea_dmat;
 
@@ -167,7 +167,7 @@ ahc_eisa_attach(struct device *parent, struct device *self, void *aux)
 				ea->ea_idstring);
 	}
 	printf(": %s\n", model);
-	
+
 	/*
 	 * Instead of ahc_alloc() as in FreeBSD, do the few relevant
 	 * initializations manually.
@@ -194,15 +194,15 @@ ahc_eisa_attach(struct device *parent, struct device *self, void *aux)
 
 	if (ahc_softc_init(ahc) != 0)
 		return;
-	
+
 	if (ahc_reset(ahc, /*reinit*/FALSE) != 0)
 		return;
-	
+
 	/* See if we are edge triggered */
 	intdef = ahc_inb(ahc, INTDEF);
 	if ((intdef & EDGE_TRIG) != 0)
 		ahc->flags |= AHC_EDGE_INTERRUPT;
-	
+
 	if (eisa_intr_map(ec, irq, &ih)) {
 		printf("%s: couldn't map interrupt (%d)\n",
 		       ahc->sc_dev.dv_xname, irq);
@@ -221,7 +221,7 @@ ahc_eisa_attach(struct device *parent, struct device *self, void *aux)
 	}
 
 	/*
-	 * Now that we know we own the resources we need, do the 
+	 * Now that we know we own the resources we need, do the
 	 * card initialization.
 	 *
 	 * First, the aic7770 card specific setup.
@@ -229,7 +229,7 @@ ahc_eisa_attach(struct device *parent, struct device *self, void *aux)
 	biosctrl = ahc_inb(ahc, HA_274_BIOSCTRL);
 	scsiconf = ahc_inb(ahc, SCSICONF);
 	scsiconf1 = ahc_inb(ahc, SCSICONF + 1);
-	
+
 	/* Get the primary channel information */
 	if ((biosctrl & CHANNEL_B_PRIMARY) != 0)
 		ahc->flags |= AHC_PRIMARY_CHANNEL;
@@ -252,10 +252,10 @@ ahc_eisa_attach(struct device *parent, struct device *self, void *aux)
 	 * We have no way to tell, so assume extended
 	 * translation is enabled.
 	 */
-	
+
 	ahc->flags |= AHC_EXTENDED_TRANS_A|AHC_EXTENDED_TRANS_B;
-	
-	/*      
+
+	/*
 	 * See if we have a Rev E or higher aic7770. Anything below a
 	 * Rev E will have a R/O autoflush disable configuration bit.
 	 * It's still not clear exactly what is different about the Rev E.
@@ -303,12 +303,12 @@ ahc_eisa_attach(struct device *parent, struct device *self, void *aux)
 		ahc_free(ahc);
 		return;
 	}
- 
+
 	/*
 	 * Link this softc in with all other ahc instances.
 	 */
 	ahc_softc_insert(ahc);
-	
+
 	/*
 	 * Enable the board's BUS drivers
 	 */
@@ -334,7 +334,7 @@ ahc_eisa_attach(struct device *parent, struct device *self, void *aux)
 	if (intrstr != NULL)
 		printf("%s: interrupting at %s\n", ahc->sc_dev.dv_xname,
 		    intrstr);
-	
+
 	ahc_intr_enable(ahc, TRUE);
 
 	/* Attach sub-devices - always succeeds */
diff --git a/sys/dev/eisa/cac_eisa.c b/sys/dev/eisa/cac_eisa.c
index 00f53f16f..24c72af81 100644
--- a/sys/dev/eisa/cac_eisa.c
+++ b/sys/dev/eisa/cac_eisa.c
@@ -143,12 +143,12 @@ cac_eisa_attach(struct device *parent, struct device *self, void *aux)
 	bus_space_tag_t iot;
 	const char *intrstr;
 	int irq, i;
-	
+
 	ea = aux;
 	sc = (struct cac_softc *)self;
 	iot = ea->ea_iot;
 	ec = ea->ea_ec;
-	
+
 	if (bus_space_map(iot, EISA_SLOT_ADDR(ea->ea_slot) +
 	    CAC_EISA_SLOT_OFFSET, CAC_EISA_IOSIZE, 0, &ioh)) {
 		printf(": can't map i/o space\n");
@@ -171,7 +171,7 @@ cac_eisa_attach(struct device *parent, struct device *self, void *aux)
 	sc->sc_ioh = ioh;
 	sc->sc_dmat = ea->ea_dmat;
 
-	/* 
+	/*
 	 * Map and establish the interrupt.
 	 */
 	switch (bus_space_read_1(iot, ioh, CAC_EISA_IOCONF) & 0xf0) {
@@ -196,7 +196,7 @@ cac_eisa_attach(struct device *parent, struct device *self, void *aux)
 		printf(": can't map interrupt (%d)\n", irq);
 		return;
 	}
-	
+
 	intrstr = eisa_intr_string(ec, ih);
 	if ((sc->sc_ih = eisa_intr_establish(ec, ih, IST_LEVEL, IPL_BIO,
 	    cac_intr, sc, sc->sc_dv.dv_xname)) == NULL) {
diff --git a/sys/dev/eisa/eisa.c b/sys/dev/eisa/eisa.c
index 76c055d66..cacb30a48 100644
--- a/sys/dev/eisa/eisa.c
+++ b/sys/dev/eisa/eisa.c
@@ -82,7 +82,7 @@ int
 eisaprint(void *aux, const char *pnp)
 {
 	register struct eisa_attach_args *ea = aux;
-	char devinfo[256]; 
+	char devinfo[256];
 
 	if (pnp) {
 		eisa_devinfo(ea->ea_idstring, devinfo, sizeof devinfo);
diff --git a/sys/dev/eisa/eisadevs b/sys/dev/eisa/eisadevs
index fc4fec4b0..e4b51581f 100644
--- a/sys/dev/eisa/eisadevs
+++ b/sys/dev/eisa/eisadevs
@@ -236,7 +236,7 @@ product ASU 4701	Mini 486AS Main Board
 product ASU 4901	VL/EISA-486SV1 Main Board
 product ASU 5101	PCI/E-P5MP4 or PCI/E-P54NP4 Main Board V2.3
 product ASU 5201	P/E-P55T2P4D  Main Board (CFG File V1.2)
- 
+
 /* ATI products */
 product ATI 1500	AT-1500 Ethernet
 product ATI 1700	AT-1700 Ethernet
diff --git a/sys/dev/eisa/eisavar.h b/sys/dev/eisa/eisavar.h
index e48cfa8f5..82c68403f 100644
--- a/sys/dev/eisa/eisavar.h
+++ b/sys/dev/eisa/eisavar.h
@@ -46,7 +46,7 @@
 #include <machine/bus.h>
 #include <dev/eisa/eisareg.h>		/* For ID register & string info. */
 
-/* 
+/*
  * Structures and definitions needed by the machine-dependent header.
  */
 struct eisabus_attach_args;
diff --git a/sys/dev/fdt/amlclock.c b/sys/dev/fdt/amlclock.c
index e07792ddf..e3807ecfe 100644
--- a/sys/dev/fdt/amlclock.c
+++ b/sys/dev/fdt/amlclock.c
@@ -254,7 +254,7 @@ amlclock_set_cpu_freq(struct amlclock_softc *sc, bus_size_t offset,
 	 */
 	reg = HREAD4(sc, offset);
 	if (freq > 1000000000) {
-		/* 
+		/*
 		 * Switch to a fixed clock if we're currently using
 		 * SYS_PLL/SYS1_PLL.  Doesn't really matter which one.
 		 */
@@ -296,7 +296,7 @@ amlclock_set_cpu_freq(struct amlclock_softc *sc, bus_size_t offset,
 	if ((div % 2) == 0) {
 		parent_freq /= 2;
 		div /= 2;
-	} else {	
+	} else {
 		parent_freq /= 3;
 		div /= 3;
 	}
diff --git a/sys/dev/fdt/amlmmc.c b/sys/dev/fdt/amlmmc.c
index c7da8cc61..93789c70a 100644
--- a/sys/dev/fdt/amlmmc.c
+++ b/sys/dev/fdt/amlmmc.c
@@ -510,7 +510,7 @@ amlmmc_bus_clock(sdmmc_chipset_handle_t sch, int freq, int timing)
 		freq = 150000;
 
 	pinctrl_byname(sc->sc_node, "clk-gate");
-	
+
 	if (freq == 0)
 		return 0;
 
@@ -547,7 +547,7 @@ amlmmc_bus_clock(sdmmc_chipset_handle_t sch, int freq, int timing)
 	HCLR4(sc, SD_EMMC_CFG, SD_EMMC_CFG_STOP_CLOCK);
 
 	pinctrl_byname(sc->sc_node, "default");
-	
+
 	return 0;
 }
 
diff --git a/sys/dev/fdt/amlpciephy.c b/sys/dev/fdt/amlpciephy.c
index e879f9c54..d1c721ae0 100644
--- a/sys/dev/fdt/amlpciephy.c
+++ b/sys/dev/fdt/amlpciephy.c
@@ -191,7 +191,7 @@ void
 amlpciephy_addr(struct amlpciephy_softc *sc, bus_addr_t addr)
 {
 	int timo;
-	
+
 	HWRITE4(sc, PHY_R4, addr << 2);
 	HWRITE4(sc, PHY_R4, addr << 2);
 	HWRITE4(sc, PHY_R4, (addr << 2) | PHY_R4_PHY_CR_CAP_ADDR);
diff --git a/sys/dev/fdt/amlpwrc.c b/sys/dev/fdt/amlpwrc.c
index 585705f30..e8a2b3730 100644
--- a/sys/dev/fdt/amlpwrc.c
+++ b/sys/dev/fdt/amlpwrc.c
@@ -119,7 +119,7 @@ static inline void
 amlpwrc_toggle(struct regmap *rm, bus_size_t reg, uint32_t mask, int on)
 {
 	uint32_t val;
-	
+
 	val = regmap_read_4(rm, reg << 2);
 	if (on)
 		val &= ~mask;
diff --git a/sys/dev/fdt/amlsm.c b/sys/dev/fdt/amlsm.c
index 29e541885..8a92ea4ed 100644
--- a/sys/dev/fdt/amlsm.c
+++ b/sys/dev/fdt/amlsm.c
@@ -108,7 +108,7 @@ amlsm_attach(struct device *parent, struct device *self, void *aux)
 		ret = smc_call(AML_SM_GET_CHIP_ID, 0, 0, 0);
 
 	printf(": ver %u\n", info->version);
-	
+
 	if (ret != -1) {
 		for (i = 0; i < nitems(info->chip_id); i++)
 			enqueue_randomness(info->chip_id[i]);
diff --git a/sys/dev/fdt/amltemp.c b/sys/dev/fdt/amltemp.c
index d996edf33..c4514a178 100644
--- a/sys/dev/fdt/amltemp.c
+++ b/sys/dev/fdt/amltemp.c
@@ -183,7 +183,7 @@ amltemp_calc_temp(struct amltemp_softc *sc, int32_t code)
 	const uint32_t m = 424;
 	const uint32_t n = 324;
 	int64_t tmp1, tmp2;
-	
+
 	tmp1 = (code * m) / 100;
 	tmp2 = (code * n) / 100;
 	tmp1 = (tmp1 * (1 << 16)) / ((1 << 16) + tmp2);
diff --git a/sys/dev/fdt/amluart.c b/sys/dev/fdt/amluart.c
index 7c9aaa9b0..5b3508ebe 100644
--- a/sys/dev/fdt/amluart.c
+++ b/sys/dev/fdt/amluart.c
@@ -392,7 +392,7 @@ amluartopen(dev_t dev, int flag, int mode, struct proc *p)
 		tp->t_lflag = TTYDEF_LFLAG;
 		tp->t_ispeed = tp->t_ospeed =
 		    sc->sc_conspeed ? sc->sc_conspeed : B115200;
-		
+
 		s = spltty();
 
 		amluart_param(tp, &tp->t_termios);
@@ -481,7 +481,7 @@ amluartread(dev_t dev, struct uio *uio, int flag)
 
 	if (tp == NULL)
 		return ENODEV;
-	
+
 	return (*linesw[tp->t_line].l_read)(tp, uio, flag);
 }
 
@@ -492,7 +492,7 @@ amluartwrite(dev_t dev, struct uio *uio, int flag)
 
 	if (tp == NULL)
 		return ENODEV;
-	
+
 	return (*linesw[tp->t_line].l_write)(tp, uio, flag);
 }
 
@@ -598,7 +598,7 @@ int
 amluartcngetc(dev_t dev)
 {
 	uint8_t c;
-	
+
 	while (bus_space_read_4(amluartconsiot, amluartconsioh, UART_STATUS) &
 	    UART_STATUS_RX_FIFO_EMPTY)
 		CPU_BUSY_CYCLE();
diff --git a/sys/dev/fdt/axppmic.c b/sys/dev/fdt/axppmic.c
index 43afc6c62..d11d3ce9e 100644
--- a/sys/dev/fdt/axppmic.c
+++ b/sys/dev/fdt/axppmic.c
@@ -278,7 +278,7 @@ const struct axppmic_sensdata axp803_sensdata[] = {
 	{ "", SENSOR_TEMP, 0x56, 5450000, 106250 },
 	{ NULL }
 };
-	
+
 const struct axppmic_sensdata axp803_battery_sensdata[] = {
 	{ "ACIN", SENSOR_INDICATOR, 0x00, (1 << 7), (1 << 6) },
 	{ "VBUS", SENSOR_INDICATOR, 0x00, (1 << 5), (1 << 4) },
diff --git a/sys/dev/fdt/bcm2711_pcie.c b/sys/dev/fdt/bcm2711_pcie.c
index c8d9225d0..b96fec4f4 100644
--- a/sys/dev/fdt/bcm2711_pcie.c
+++ b/sys/dev/fdt/bcm2711_pcie.c
@@ -469,7 +469,7 @@ bcmpcie_bs_iomap(bus_space_tag_t t, bus_addr_t addr, bus_size_t size,
 			    addr - pci_start + phys_start, size, flags, bshp);
 		}
 	}
-	
+
 	return ENXIO;
 }
 
@@ -491,7 +491,7 @@ bcmpcie_bs_memmap(bus_space_tag_t t, bus_addr_t addr, bus_size_t size,
 			    addr - pci_start + phys_start, size, flags, bshp);
 		}
 	}
-	
+
 	return ENXIO;
 }
 
diff --git a/sys/dev/fdt/bcm2711_tmon.c b/sys/dev/fdt/bcm2711_tmon.c
index 8863342cf..32469c5cd 100644
--- a/sys/dev/fdt/bcm2711_tmon.c
+++ b/sys/dev/fdt/bcm2711_tmon.c
@@ -77,7 +77,7 @@ bcmtmon_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct bcmtmon_softc *sc = (struct bcmtmon_softc *)self;
 	struct fdt_attach_args *faa = aux;
-	
+
 	if (faa->fa_nreg < 1) {
 		printf(": no registers\n");
 		return;
diff --git a/sys/dev/fdt/dwdog.c b/sys/dev/fdt/dwdog.c
index 61fb2c8ba..ac4b36acc 100644
--- a/sys/dev/fdt/dwdog.c
+++ b/sys/dev/fdt/dwdog.c
@@ -103,7 +103,7 @@ dwdog_reset(void)
 {
 	struct dwdog_softc *sc = dwdog_cd.cd_devs[0];
 
-	/* 
+	/*
 	 * Generate system reset when timer expires and select
 	 * smallest timeout.
 	 */
diff --git a/sys/dev/fdt/dwmmc.c b/sys/dev/fdt/dwmmc.c
index 9c5860fde..5229c8c19 100644
--- a/sys/dev/fdt/dwmmc.c
+++ b/sys/dev/fdt/dwmmc.c
@@ -554,7 +554,7 @@ dwmmc_intr(void *arg)
 		sdmmc_card_intr(sc->sc_sdmmc);
 		handled = 1;
 	}
-		
+
 	return handled;
 }
 
@@ -656,7 +656,7 @@ dwmmc_bus_clock(sdmmc_chipset_handle_t sch, int freq, int timing)
 
 	if (freq == 0)
 		return 0;
-	
+
 	if (sc->sc_clkbase / 1000 > freq) {
 		for (div = 1; div < 256; div++)
 			if (sc->sc_clkbase / (2 * 1000 * div) <= freq)
@@ -705,7 +705,7 @@ int
 dwmmc_bus_width(sdmmc_chipset_handle_t sch, int width)
 {
 	struct dwmmc_softc *sc = sch;
-	
+
 	switch (width) {
 	case 1:
 		HCLR4(sc, SDMMC_CTYPE, SDMMC_CTYPE_8BIT|SDMMC_CTYPE_4BIT);
@@ -929,7 +929,7 @@ dwmmc_exec_command(sdmmc_chipset_handle_t sch, struct sdmmc_command *cmd)
 
 		if (ISSET(cmd->c_flags, SCF_CMD_READ)) {
 			/* Set card read threshold to the size of a block. */
-			HWRITE4(sc, SDMMC_CARDTHRCTL, 
+			HWRITE4(sc, SDMMC_CARDTHRCTL,
 			    cmd->c_blklen << SDMMC_CARDTHRCTL_RDTHR_SHIFT |
 			    SDMMC_CARDTHRCTL_RDTHREN);
 		}
@@ -1010,7 +1010,7 @@ dwmmc_exec_command(sdmmc_chipset_handle_t sch, struct sdmmc_command *cmd)
 
 	if (cmd->c_datalen > 0 && !cmd->c_dmamap)
 		dwmmc_transfer_data(sc, cmd);
-	
+
 	if (cmd->c_datalen > 0 && cmd->c_dmamap) {
 		while (sc->sc_idsts == 0) {
 			error = tsleep_nsec(&sc->sc_idsts, PWAIT, "idsts",
@@ -1021,7 +1021,7 @@ dwmmc_exec_command(sdmmc_chipset_handle_t sch, struct sdmmc_command *cmd)
 				goto done;
 			}
 		}
-		
+
 		for (timeout = 10000; timeout > 0; timeout--) {
 			status = HREAD4(sc, SDMMC_RINTSTS);
 			if (status & SDMMC_RINTSTS_DTO)
diff --git a/sys/dev/fdt/dwmshc.c b/sys/dev/fdt/dwmshc.c
index 9a7ffdd16..d5de236ab 100644
--- a/sys/dev/fdt/dwmshc.c
+++ b/sys/dev/fdt/dwmshc.c
@@ -42,7 +42,7 @@
 #define  EMMC_HOST_CTRL3_CMD_CONFLICT_CHECK	(1U << 0)
 #define  EMMC_HOST_CTRL3_SW_CG_DIS		(1U << 4)
 #define EMMC_EMMC_CTRL			0x52c /* HW */
-#define  EMMC_EMMC_CTRL_CARD_IS_EMMC		(1U << 0) 
+#define  EMMC_EMMC_CTRL_CARD_IS_EMMC		(1U << 0)
 #define  EMMC_EMMC_CTRL_DISABLE_DATA_CRC_CHK	(1U << 1)
 #define  EMMC_EMMC_CTRL_EMMC_RST_N		(1U << 2)
 #define  EMMC_EMMC_CTRL_EMMC_RST_N_OE		(1U << 3)
diff --git a/sys/dev/fdt/dwpcie.c b/sys/dev/fdt/dwpcie.c
index bfcd83f76..d443f6f6d 100644
--- a/sys/dev/fdt/dwpcie.c
+++ b/sys/dev/fdt/dwpcie.c
@@ -1392,7 +1392,7 @@ dwpcie_rk3568_init(struct dwpcie_softc *sc)
 err:
 	if (reset_gpiolen > 0)
 		free(reset_gpio, M_TEMP, reset_gpiolen);
-	
+
 	return error;
 }
 
diff --git a/sys/dev/fdt/fanpwr.c b/sys/dev/fdt/fanpwr.c
index 4f828a0c2..58cb8bc8e 100644
--- a/sys/dev/fdt/fanpwr.c
+++ b/sys/dev/fdt/fanpwr.c
@@ -271,7 +271,7 @@ fanpwr_get_voltage(void *cookie)
 {
 	struct fanpwr_softc *sc = cookie;
 	uint8_t vsel;
-	
+
 	vsel = fanpwr_read(sc, sc->sc_vsel);
 	return sc->sc_vbase + (vsel & sc->sc_vsel_nsel_mask) * sc->sc_vstep;
 }
diff --git a/sys/dev/fdt/files.fdt b/sys/dev/fdt/files.fdt
index 5089bcc92..0bd990baa 100644
--- a/sys/dev/fdt/files.fdt
+++ b/sys/dev/fdt/files.fdt
@@ -257,7 +257,7 @@ attach	amldwusb at fdt
 file	dev/fdt/amldwusb.c		amldwusb
 
 device	amliic: i2cbus
-attach	amliic at fdt			
+attach	amliic at fdt
 file	dev/fdt/amliic.c		amliic
 
 device	amlmmc: sdmmcbus
diff --git a/sys/dev/fdt/if_fec.c b/sys/dev/fdt/if_fec.c
index 1aec711cb..cce2d54b4 100644
--- a/sys/dev/fdt/if_fec.c
+++ b/sys/dev/fdt/if_fec.c
@@ -330,7 +330,7 @@ fec_attach(struct device *parent, struct device *self, void *aux)
 		 * active-low, even if it is marked as active-high in
 		 * the device tree.  As a result the device tree for
 		 * many boards incorrectly marks the gpio as
-		 * active-high.  
+		 * active-high.
 		 */
 		phy_reset_gpio[2] = GPIO_ACTIVE_LOW;
 		gpio_controller_config_pin(phy_reset_gpio, GPIO_CONFIG_OUTPUT);
diff --git a/sys/dev/fdt/if_mvneta.c b/sys/dev/fdt/if_mvneta.c
index dbf9261c5..f65ceee32 100644
--- a/sys/dev/fdt/if_mvneta.c
+++ b/sys/dev/fdt/if_mvneta.c
@@ -1872,42 +1872,42 @@ static const struct mvneta_counter mvneta_counters[] = {
 	    { "1024-maxB",	KSTAT_KV_U_PACKETS,	0x3034 },
 	[mvneta_stat_good_octets_sent] =
 	    { "tx good",	KSTAT_KV_U_BYTES,	0x0 /* 64bit */ },
-	[mvneta_stat_good_frames_sent] = 
+	[mvneta_stat_good_frames_sent] =
 	    { "tx good",	KSTAT_KV_U_PACKETS,	0x3040 },
-	[mvneta_stat_excessive_collision] = 
+	[mvneta_stat_excessive_collision] =
 	    { "tx excess coll",	KSTAT_KV_U_PACKETS,	0x3044 },
-	[mvneta_stat_multicast_frames_sent] = 
+	[mvneta_stat_multicast_frames_sent] =
 	    { "tx mcast",	KSTAT_KV_U_PACKETS,	0x3048 },
-	[mvneta_stat_broadcast_frames_sent] = 
+	[mvneta_stat_broadcast_frames_sent] =
 	    { "tx bcast",	KSTAT_KV_U_PACKETS,	0x304c },
-	[mvneta_stat_unrecog_mac_control_received] = 
+	[mvneta_stat_unrecog_mac_control_received] =
 	    { "rx unknown fc",	KSTAT_KV_U_PACKETS,	0x3050 },
-	[mvneta_stat_good_fc_received] = 
+	[mvneta_stat_good_fc_received] =
 	    { "rx fc good",	KSTAT_KV_U_PACKETS,	0x3058 },
-	[mvneta_stat_bad_fc_received] = 
+	[mvneta_stat_bad_fc_received] =
 	    { "rx fc bad",	KSTAT_KV_U_PACKETS,	0x305c },
-	[mvneta_stat_undersize] = 
+	[mvneta_stat_undersize] =
 	    { "rx undersize",	KSTAT_KV_U_PACKETS,	0x3060 },
-	[mvneta_stat_fc_sent] = 
+	[mvneta_stat_fc_sent] =
 	    { "tx fc",		KSTAT_KV_U_PACKETS,	0x3054 },
-	[mvneta_stat_fragments] = 
+	[mvneta_stat_fragments] =
 	    { "rx fragments",	KSTAT_KV_U_NONE,	0x3064 },
-	[mvneta_stat_oversize] = 
+	[mvneta_stat_oversize] =
 	    { "rx oversize",	KSTAT_KV_U_PACKETS,	0x3068 },
-	[mvneta_stat_jabber] = 
+	[mvneta_stat_jabber] =
 	    { "rx jabber",	KSTAT_KV_U_PACKETS,	0x306c },
-	[mvneta_stat_mac_rcv_error] = 
+	[mvneta_stat_mac_rcv_error] =
 	    { "rx mac errors",	KSTAT_KV_U_PACKETS,	0x3070 },
-	[mvneta_stat_bad_crc] = 
+	[mvneta_stat_bad_crc] =
 	    { "rx bad crc",	KSTAT_KV_U_PACKETS,	0x3074 },
-	[mvneta_stat_collisions] = 
+	[mvneta_stat_collisions] =
 	    { "rx colls",	KSTAT_KV_U_PACKETS,	0x3078 },
-	[mvneta_stat_late_collisions] = 
+	[mvneta_stat_late_collisions] =
 	    { "rx late colls",	KSTAT_KV_U_PACKETS,	0x307c },
 
-	[mvneta_stat_port_discard] = 
+	[mvneta_stat_port_discard] =
 	    { "rx discard",	KSTAT_KV_U_PACKETS,	MVNETA_PXDFC },
-	[mvneta_stat_port_overrun] = 
+	[mvneta_stat_port_overrun] =
 	    { "rx overrun",	KSTAT_KV_U_PACKETS,	MVNETA_POFC },
 };
 
diff --git a/sys/dev/fdt/imxccm.c b/sys/dev/fdt/imxccm.c
index b7c386a81..6b7e99a5f 100644
--- a/sys/dev/fdt/imxccm.c
+++ b/sys/dev/fdt/imxccm.c
@@ -453,7 +453,7 @@ imxccm_get_periphclk(struct imxccm_softc *sc)
 		default:
 			return 0;
 		}
-	
+
 	} else {
 		switch((HREAD4(sc, CCM_CBCMR)
 		    >> CCM_CBCMR_PRE_PERIPH_CLK_SEL_SHIFT) & CCM_CBCMR_PRE_PERIPH_CLK_SEL_MASK) {
diff --git a/sys/dev/fdt/imxsrc.c b/sys/dev/fdt/imxsrc.c
index e025761ee..de5b696b9 100644
--- a/sys/dev/fdt/imxsrc.c
+++ b/sys/dev/fdt/imxsrc.c
@@ -125,7 +125,7 @@ imxsrc_match(struct device *parent, void *match, void *aux)
 	struct fdt_attach_args *faa = aux;
 
 	if (OF_is_compatible(faa->fa_node, "fsl,imx51-src") ||
-	    OF_is_compatible(faa->fa_node, "fsl,imx8mq-src"))		
+	    OF_is_compatible(faa->fa_node, "fsl,imx8mq-src"))
 		return 10;	/* Must beat syscon(4). */
 
 	return 0;
diff --git a/sys/dev/fdt/pinctrl.c b/sys/dev/fdt/pinctrl.c
index 8ff4dbb1a..8092b5613 100644
--- a/sys/dev/fdt/pinctrl.c
+++ b/sys/dev/fdt/pinctrl.c
@@ -139,7 +139,7 @@ pinctrl_pinctrl(uint32_t phandle, void *cookie)
 	struct pinctrl_softc *sc = cookie;
 	uint32_t *pins;
 	int node, len, i;
-	
+
 	node = OF_getnodebyphandle(phandle);
 	if (node == 0)
 		return -1;
@@ -158,7 +158,7 @@ pinctrl_pinctrl(uint32_t phandle, void *cookie)
 
 		if (sc->sc_ncells == 2)
 			func |= pins[i + 2];
-		
+
 		if (sc->sc_reg_width == 16)
 			val = HREAD2(sc, reg);
 		else if (sc->sc_reg_width == 32)
diff --git a/sys/dev/fdt/pwmreg.c b/sys/dev/fdt/pwmreg.c
index b88f36120..6ec589b5f 100644
--- a/sys/dev/fdt/pwmreg.c
+++ b/sys/dev/fdt/pwmreg.c
@@ -155,7 +155,7 @@ pwmreg_enable(void *cookie, int on)
 
 	if (ps.ps_enabled == on)
 		return 0;
-	
+
 	ps.ps_enabled = on;
 	return pwm_set_state(sc->sc_pwm, &ps);
 }
diff --git a/sys/dev/fdt/rkclock.c b/sys/dev/fdt/rkclock.c
index dfa79af90..c4ef4b765 100644
--- a/sys/dev/fdt/rkclock.c
+++ b/sys/dev/fdt/rkclock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rkclock.c,v 1.76 2023/04/27 08:55:59 kettenis Exp $	*/
+/*	$OpenBSD: rkclock.c,v 1.77 2023/06/19 09:54:15 kettenis Exp $	*/
 /*
  * Copyright (c) 2017, 2018 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -500,7 +500,7 @@ rkclock_div_con(struct rkclock_softc *sc, const struct rkclock *clk,
 
 	/* Derive maximum value from mask. */
 	max_div_con = clk->div_mask >> (ffs(clk->div_mask) - 1);
-	
+
 	parent_freq = sc->sc_cd.cd_get_frequency(sc, &idx);
 	div = (parent_freq + freq - 1) / freq;
 	div_con = (div > 0 ? div - 1 : 0);
@@ -706,7 +706,7 @@ rk3288_init(struct rkclock_softc *sc)
 	node = OF_finddevice("/");
 	if (OF_is_compatible(node, "rockchip,rk3288-tinker")) {
 		uint32_t idx;
-		
+
 		/* Run at 1.2 GHz. */
 		idx = RK3288_ARMCLK;
 		rk3288_set_frequency(sc, &idx, 1200000000);
@@ -1106,7 +1106,7 @@ const struct rkclock rk3308_clocks[] = {
 		RK3308_PCLK_MAC, 0, 0, 0,
 		{ RK3308_PCLK_PERI }
 	},
-	
+
 	{
 		/* Sentinel */
 	}
@@ -2221,8 +2221,8 @@ rk3328_reset(void *cookie, uint32_t *cells, int on)
 	    mask << 16 | (on ? mask : 0));
 }
 
-/* 
- * Rockchip RK3399 
+/*
+ * Rockchip RK3399
  */
 
 const struct rkclock rk3399_clocks[] = {
@@ -2692,7 +2692,7 @@ rk3399_get_armclk(struct rkclock_softc *sc, bus_size_t clksel)
 	div_con = (reg & RK3399_CRU_CLK_CORE_DIV_CON_MASK) >>
 	    RK3399_CRU_CLK_CORE_DIV_CON_SHIFT;
 	idx = rk3399_armclk_parent(mux);
-	
+
 	return rk3399_get_frequency(sc, &idx) / (div_con + 1);
 }
 
@@ -2817,7 +2817,7 @@ rk3399_set_frac(struct rkclock_softc *sc, uint32_t parent, bus_size_t base,
 		if (q2 > 0xffff)
 			break;
 
-		p0 = p1; p1 = p2; 
+		p0 = p1; p1 = p2;
 		q0 = q1; q1 = q2;
 	}
 
@@ -3008,7 +3008,7 @@ const struct rkclock rk3399_pmu_clocks[] = {
 		/* Sentinel */
 	}
 };
-	
+
 void
 rk3399_pmu_init(struct rkclock_softc *sc)
 {
@@ -3077,8 +3077,8 @@ rk3399_pmu_reset(void *cookie, uint32_t *cells, int on)
 	printf("%s: 0x%08x\n", __func__, idx);
 }
 
-/* 
- * Rockchip RK3568 
+/*
+ * Rockchip RK3568
  */
 
 const struct rkclock rk3568_clocks[] = {
@@ -3829,8 +3829,8 @@ rk3568_pmu_reset(void *cookie, uint32_t *cells, int on)
 	printf("%s: 0x%08x\n", __func__, idx);
 }
 
-/* 
- * Rockchip RK3588 
+/*
+ * Rockchip RK3588
  */
 
 const struct rkclock rk3588_clocks[] = {
@@ -4217,7 +4217,7 @@ rk3588_set_pll(struct rkclock_softc *sc, bus_size_t base, uint32_t freq)
 	/* Power down PLL. */
 	HWRITE4(sc, base + 0x0004,
 	    RK3588_CRU_PLL_RESETB << 16 | RK3588_CRU_PLL_RESETB);
-	
+
 	/* Set PLL rate. */
 	HWRITE4(sc, base + 0x0000,
 	    RK3588_CRU_PLL_M_MASK << 16 | m << RK3588_CRU_PLL_M_SHIFT);
@@ -4341,6 +4341,10 @@ rk3588_reset(void *cookie, uint32_t *cells, int on)
 		reg = RK3588_CRU_SOFTRST_CON(33);
 		bit = 1;
 		break;
+	case RK3588_SRST_P_PCIE4:
+		reg = RK3588_CRU_SOFTRST_CON(34);
+		bit = 0;
+		break;
 	case RK3588_SRST_REF_PIPE_PHY0:
 		reg = RK3588_CRU_SOFTRST_CON(77);
 		bit = 6;
diff --git a/sys/dev/fdt/rkclock_clocks.h b/sys/dev/fdt/rkclock_clocks.h
index 94faf47b5..f506b0b43 100644
--- a/sys/dev/fdt/rkclock_clocks.h
+++ b/sys/dev/fdt/rkclock_clocks.h
@@ -468,5 +468,6 @@
 #define RK3588_XIN24M			1023
 
 #define RK3588_SRST_PCIE4_POWER_UP	298
+#define RK3588_SRST_P_PCIE4		303
 #define RK3588_SRST_REF_PIPE_PHY0	572
 #define RK3588_SRST_P_PCIE2_PHY0	579
diff --git a/sys/dev/fdt/rkiic.c b/sys/dev/fdt/rkiic.c
index ab07e951a..11c405ab1 100644
--- a/sys/dev/fdt/rkiic.c
+++ b/sys/dev/fdt/rkiic.c
@@ -191,7 +191,7 @@ void
 rkiic_release_bus(void *cookie, int flags)
 {
 	struct rkiic_softc *sc = cookie;
-	
+
 	HCLR4(sc, RKI2C_CON, RKI2C_CON_I2C_EN);
 }
 
@@ -241,7 +241,7 @@ rkiic_write(struct rkiic_softc *sc, i2c_addr_t addr, const void *cmd,
 	int len = 0;
 	int timo, i;
 
-	/* 
+	/*
 	 * Lump slave address, command and data into one single buffer
 	 * and transfer it in a single operation.
 	 */
diff --git a/sys/dev/fdt/rkpcie.c b/sys/dev/fdt/rkpcie.c
index 78fe0a493..af73e98f0 100644
--- a/sys/dev/fdt/rkpcie.c
+++ b/sys/dev/fdt/rkpcie.c
@@ -153,7 +153,7 @@ void	rkpcie_intr_disestablish(void *, void *);
  * When link training, the LTSSM configuration state exits to L0 state upon
  * success. Wait for L0 state before proceeding after link training has been
  * initiated either by PCIE_CLIENT_LINK_TRAIN_EN or when triggered via
- * LCSR Retrain Link bit. See PCIE 2.0 Base Specification, 4.2.6.3.6 
+ * LCSR Retrain Link bit. See PCIE 2.0 Base Specification, 4.2.6.3.6
  * Configuration.Idle.
  *
  * Checking link up alone is not sufficient for checking for L0 state. LTSSM
@@ -256,7 +256,7 @@ rkpcie_attach(struct device *parent, struct device *self, void *aux)
 	reset_assert(sc->sc_node, "pipe");
 
 	delay(10);
-	
+
 	reset_deassert(sc->sc_node, "pm");
 	reset_deassert(sc->sc_node, "aclk");
 	reset_deassert(sc->sc_node, "pclk");
@@ -305,7 +305,7 @@ rkpcie_attach(struct device *parent, struct device *self, void *aux)
 	if (max_link_speed > 1) {
 		status = HREAD4(sc, PCIE_RC_LCSR);
 		if ((status & PCI_PCIE_LCSR_CLS) == PCI_PCIE_LCSR_CLS_2_5) {
-			HWRITE4(sc, PCIE_RC_LCSR, HREAD4(sc, PCIE_RC_LCSR) | 
+			HWRITE4(sc, PCIE_RC_LCSR, HREAD4(sc, PCIE_RC_LCSR) |
 			    PCI_PCIE_LCSR_RL);
 
 			if (rkpcie_link_training_wait(sc)) {
@@ -534,7 +534,7 @@ rkpcie_conf_read(void *v, pcitag_t tag, int reg)
 		KASSERT(dev == 0);
 		return bus_space_read_4(sc->sc_iot, sc->sc_axi_ioh, tag | reg);
 	}
-	
+
 	return 0xffffffff;
 }
 
@@ -750,7 +750,7 @@ rkpcie_phy_poweron(struct rkpcie_softc *sc)
 	regmap_write_4(rm, RK3399_GRF_SOC_CON8,
 	    RK3399_PCIE_TEST_ADDR_MASK |
 	    RK3399_PCIE_PHY_CFG_PLL_LOCK << RK3399_PCIE_TEST_ADDR_SHIFT);
-		
+
 	for (timo = 50; timo > 0; timo--) {
 		status = regmap_read_4(rm, RK3399_GRF_SOC_STATUS1);
 		if (status & RK3399_PCIE_PHY_PLL_LOCKED)
diff --git a/sys/dev/fdt/rkpinctrl.c b/sys/dev/fdt/rkpinctrl.c
index b98a88d48..6c00073de 100644
--- a/sys/dev/fdt/rkpinctrl.c
+++ b/sys/dev/fdt/rkpinctrl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rkpinctrl.c,v 1.11 2023/03/04 22:51:12 kettenis Exp $	*/
+/*	$OpenBSD: rkpinctrl.c,v 1.12 2023/06/19 13:37:22 kettenis Exp $	*/
 /*
  * Copyright (c) 2017, 2018 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -407,7 +407,7 @@ rk3308_pinctrl(uint32_t phandle, void *cookie)
 		mux = pins[i + 2];
 		pull = rk3308_pull(bank, idx, pins[i + 3]);
 		strength = rk3308_strength(bank, idx, pins[i + 3]);
- 
+
 		if (bank > 4 || idx > 32 || mux > 7)
 			continue;
 
@@ -626,8 +626,8 @@ fail:
 	return -1;
 }
 
-/* 
- * Rockchip RK3399 
+/*
+ * Rockchip RK3399
  */
 
 int
@@ -801,7 +801,7 @@ fail:
 	return -1;
 }
 
-/* 
+/*
  * Rockchip RK3568
  */
 
@@ -874,7 +874,7 @@ struct rockchip_route_table rk3568_route_table[] = {
 	{ 4, RK_PD0, 2, ROUTE_GRF, 0x0304, ROUTE_VAL(4, 1) }, /* I2C5 M1 */
 	{ 3, RK_PB1, 5, ROUTE_GRF, 0x0304, ROUTE_VAL(14, 0) }, /* PWM8 M0 */
 	{ 1, RK_PD5, 4, ROUTE_GRF, 0x0304, ROUTE_VAL(14, 1) }, /* PWM8 M1 */
-	
+
 	{ 3, RK_PB2, 5, ROUTE_GRF, 0x0308, ROUTE_VAL(0, 0) }, /* PWM9 M0 */
 	{ 1, RK_PD6, 4, ROUTE_GRF, 0x0308, ROUTE_VAL(0, 1) }, /* PWM9 M1 */
 	{ 3, RK_PB5, 5, ROUTE_GRF, 0x0308, ROUTE_VAL(2, 0) }, /* PWM10 M0 */
@@ -1058,7 +1058,7 @@ fail:
 }
 
 
-/* 
+/*
  * Rockchip RK3588
  */
 
@@ -1114,7 +1114,7 @@ rk3588_schmitt(uint32_t bank, uint32_t idx, uint32_t phandle)
 #define RK3588_PMU2_IOC		0x4000
 #define RK3588_BUS_IOC		0x8000
 #define RK3588_VCCIO1_4_IOC	0x9000
-#define RK3588_VCCIO3_5_IOC	0xa000	
+#define RK3588_VCCIO3_5_IOC	0xa000
 #define RK3588_VCCIO2_IOC	0xb000
 #define RK3588_VCCIO6_IOC	0xc000
 #define RK3588_EMMC_IOC		0xd000
@@ -1174,9 +1174,9 @@ rk3588_pinctrl(uint32_t phandle, void *cookie)
 		bank = pins[i];
 		idx = pins[i + 1];
 		mux = pins[i + 2];
-		pull = rk3568_pull(bank, idx, pins[i + 3]);
-		strength = rk3568_strength(bank, idx, pins[i + 3]);
-		schmitt = rk3568_schmitt(bank, idx, pins[i + 3]);
+		pull = rk3588_pull(bank, idx, pins[i + 3]);
+		strength = rk3588_strength(bank, idx, pins[i + 3]);
+		schmitt = rk3588_schmitt(bank, idx, pins[i + 3]);
 
 		if (bank > 5 || idx > 32 || mux > 15)
 			continue;
@@ -1237,7 +1237,7 @@ rk3588_pinctrl(uint32_t phandle, void *cookie)
 		if (strength >= 0) {
 			off = bank * 0x20 + (idx / 4) * 0x04;
 			mask = (0xf << ((idx % 4) * 4));
-			bits = ((1 << (strength + 1)) - 1) << ((idx % 4) * 4);
+			bits = (strength << ((idx % 4) * 4));
 			regmap_write_4(rm, ds_base + off, mask << 16 | bits);
 		}
 
@@ -1245,7 +1245,7 @@ rk3588_pinctrl(uint32_t phandle, void *cookie)
 		if (schmitt >= 0) {
 			off = bank * 0x10 + (idx / 8) * 0x04;
 			mask = (0x1 << (idx % 8));
-			bits = schmitt << (idx % 8);
+			bits = (schmitt << (idx % 8));
 			regmap_write_4(rm, smt_base + off, mask << 16 | bits);
 		}
 
diff --git a/sys/dev/fdt/rkpmic.c b/sys/dev/fdt/rkpmic.c
index 3863b793b..4b467270b 100644
--- a/sys/dev/fdt/rkpmic.c
+++ b/sys/dev/fdt/rkpmic.c
@@ -58,7 +58,7 @@ struct rkpmic_regdata {
 	const struct rkpmic_vsel_range *vsel_range;
 };
 
-/* 
+/*
  * Used by RK805 for BUCK1, BUCK2
  *  0-59:	0.7125V-1.45V, step=12.5mV
  *  60-62:	1.8V-2.2V, step=200mV
@@ -72,7 +72,7 @@ const struct rkpmic_vsel_range rk805_vsel_range1[] = {
 };
 
 /*
- * Used by RK805 for BUCK4 
+ * Used by RK805 for BUCK4
  *  0-27:	0.8V-3.5V, step=100mV
  */
 const struct rkpmic_vsel_range rk805_vsel_range2[] = {
@@ -81,7 +81,7 @@ const struct rkpmic_vsel_range rk805_vsel_range2[] = {
 };
 
 /*
- * Used by RK805 for LDO1-3 
+ * Used by RK805 for LDO1-3
  *  0-26:	0.8V-3.4V, step=100mV
  */
 const struct rkpmic_vsel_range rk805_vsel_range3[] = {
@@ -393,7 +393,7 @@ rkpmic_get_voltage(void *cookie)
 	uint32_t ret = 0;
 
 	vsel = rkpmic_reg_read(rr->rr_sc, rr->rr_reg) & rr->rr_mask;
-	
+
 	while (vsel_range->base) {
 		ret = vsel_range->base;
 		if (vsel >= vsel_range->vsel_min &&
@@ -405,7 +405,7 @@ rkpmic_get_voltage(void *cookie)
 			ret += (vsel_range->vsel_max - vsel_range->vsel_min) *
 			    vsel_range->delta;
 		vsel_range++;
-			
+
 	}
 
 	return ret;
diff --git a/sys/dev/fdt/rktemp.c b/sys/dev/fdt/rktemp.c
index 155431d9e..fb8cd2a57 100644
--- a/sys/dev/fdt/rktemp.c
+++ b/sys/dev/fdt/rktemp.c
@@ -453,7 +453,7 @@ rktemp_rk3568_init(struct rktemp_softc *sc)
 	rm = regmap_byphandle(grf);
 	if (rm == 0)
 		return;
-	
+
 	regmap_write_4(rm, RK3568_GRF_TSADC_CON,
 	    RK3568_GRF_TSADC_EN << 16 | RK3568_GRF_TSADC_EN);
 	delay(15);
diff --git a/sys/dev/fdt/simplefb.c b/sys/dev/fdt/simplefb.c
index 48c00d3d8..671d5a82d 100644
--- a/sys/dev/fdt/simplefb.c
+++ b/sys/dev/fdt/simplefb.c
@@ -316,7 +316,7 @@ simplefb_alloc_screen(void *v, const struct wsscreen_descr *type,
     void **cookiep, int *curxp, int *curyp, uint32_t *attrp)
 {
 	return rasops_alloc_screen(v, cookiep, curxp, curyp, attrp);
-} 
+}
 
 void
 simplefb_burn_screen(void *v, u_int on, u_int flags)
@@ -343,7 +343,7 @@ simplefb_init_cons(bus_space_tag_t iot)
 	node = fdt_find_cons("simple-framebuffer");
 	if (node == NULL)
 		return;
-	
+
 	if (fdt_get_reg(node, 0, &reg))
 		return;
 
diff --git a/sys/dev/fdt/sncodec.c b/sys/dev/fdt/sncodec.c
index c2fc01ac1..956d02067 100644
--- a/sys/dev/fdt/sncodec.c
+++ b/sys/dev/fdt/sncodec.c
@@ -66,7 +66,7 @@ uint8_t sncodec_bop_cfg[] = {
 	0x32, 0x40, 0x30, 0x02, 0x06, 0x38, 0x40, 0x30, 0x02,
 	0x06, 0x3e, 0x37, 0x30, 0xff, 0xe6
 };
-	
+
 
 struct sncodec_softc {
 	struct device		sc_dev;
diff --git a/sys/dev/fdt/sxiccmu.c b/sys/dev/fdt/sxiccmu.c
index 641e797c0..917eebc9b 100644
--- a/sys/dev/fdt/sxiccmu.c
+++ b/sys/dev/fdt/sxiccmu.c
@@ -627,11 +627,11 @@ sxiccmu_pll6_get_frequency(void *cookie, uint32_t *cells)
 
 	freq = clock_get_frequency_idx(sc->sc_node, 0);
 	switch (idx) {
-	case 0:	
+	case 0:
 		return (freq * n * k) / m / 6;		/* pll6_sata */
-	case 1:	
+	case 1:
 		return (freq * n * k) / 2;		/* pll6_other */
-	case 2:	
+	case 2:
 		return (freq * n * k);			/* pll6 */
 	case 3:
 		return (freq * n * k) / 4;		/* pll6_div_4 */
@@ -647,7 +647,7 @@ sxiccmu_pll6_enable(void *cookie, uint32_t *cells, int on)
 	uint32_t idx = cells[0];
 	uint32_t reg;
 
-	/* 
+	/*
 	 * Since this clock has several outputs, we never turn it off.
 	 */
 
@@ -1878,7 +1878,7 @@ sxiccmu_ccu_reset(void *cookie, uint32_t *cells, int assert)
 
 	reset_deassert_all(sc->sc_node);
 
-	if (idx >= sc->sc_nresets || 
+	if (idx >= sc->sc_nresets ||
 	    (sc->sc_resets[idx].reg == 0 && sc->sc_gates[idx].bit == 0)) {
 		printf("%s: 0x%08x\n", __func__, cells[0]);
 		return;
@@ -1886,7 +1886,7 @@ sxiccmu_ccu_reset(void *cookie, uint32_t *cells, int assert)
 
 	reg = sc->sc_resets[idx].reg;
 	bit = sc->sc_resets[idx].bit;
-	
+
 	if (assert)
 		SXICLR4(sc, reg, (1U << bit));
 	else
diff --git a/sys/dev/fdt/sximmc.c b/sys/dev/fdt/sximmc.c
index 59aec9358..43f179277 100644
--- a/sys/dev/fdt/sximmc.c
+++ b/sys/dev/fdt/sximmc.c
@@ -201,7 +201,7 @@ struct sximmc_idma_descriptor {
 } __packed;
 
 #define SXIMMC_NDESC		32
- 
+
 #define SXIMMC_DMA_FTRGLEVEL_A20	0x20070008
 #define SXIMMC_DMA_FTRGLEVEL_A80	0x200f0010
 
@@ -1019,7 +1019,7 @@ sximmc_exec_command(sdmmc_chipset_handle_t sch, struct sdmmc_command *cmd)
 #endif
 		goto done;
 	}
-		
+
 	if (cmd->c_datalen > 0) {
 		cmd->c_error = sximmc_wait_rint(sc,
 		    SXIMMC_INT_ERROR|
diff --git a/sys/dev/fdt/sxipio.c b/sys/dev/fdt/sxipio.c
index fac9eb415..393dc6505 100644
--- a/sys/dev/fdt/sxipio.c
+++ b/sys/dev/fdt/sxipio.c
@@ -582,7 +582,7 @@ sxipio_attach_gpio(struct device *parent)
 		gba.gba_gc = &sc->sc_gpio_tag[i];
 		gba.gba_pins = &sc->sc_gpio_pins[i][0];
 		gba.gba_npins = 32;
-		
+
 #if NGPIO > 0
 		config_found(&sc->sc_dev, &gba, gpiobus_print);
 #endif
diff --git a/sys/dev/fdt/sxirtc.c b/sys/dev/fdt/sxirtc.c
index 06c294827..a53008796 100644
--- a/sys/dev/fdt/sxirtc.c
+++ b/sys/dev/fdt/sxirtc.c
@@ -44,7 +44,7 @@
 #define LEAPYEAR(y)        \
     (((y) % 4 == 0 &&    \
     (y) % 100 != 0) ||    \
-    (y) % 400 == 0) 
+    (y) % 400 == 0)
 
 struct sxirtc_softc {
 	struct device		sc_dev;
diff --git a/sys/dev/fdt/sxitwi.c b/sys/dev/fdt/sxitwi.c
index 2564f346b..32a8f4143 100644
--- a/sys/dev/fdt/sxitwi.c
+++ b/sys/dev/fdt/sxitwi.c
@@ -245,7 +245,7 @@ sxitwi_attach(struct device *parent, struct device *self, void *aux)
 
 	rw_init(&sc->sc_buslock, sc->sc_dev.dv_xname);
 
-	/* 
+	/*
 	 * On the Allwinner A31 we need to write 1 to clear a pending
 	 * interrupt.
 	 */
diff --git a/sys/dev/fdt/sypwr.c b/sys/dev/fdt/sypwr.c
index 08b5bedd7..fa468e481 100644
--- a/sys/dev/fdt/sypwr.c
+++ b/sys/dev/fdt/sypwr.c
@@ -172,7 +172,7 @@ sypwr_get_voltage(void *cookie)
 {
 	struct sypwr_softc *sc = cookie;
 	uint8_t value;
-	
+
 	value = sypwr_read(sc, SY8106A_VOUT1_SEL);
 	if (value & SY8106A_VOUT1_SEL_I2C)
 		return 680000 + (value & SY8106A_VOUT1_SEL_MASK) * 10000;
diff --git a/sys/dev/fdt/tipd.c b/sys/dev/fdt/tipd.c
index 6f7a3cb97..711be1756 100644
--- a/sys/dev/fdt/tipd.c
+++ b/sys/dev/fdt/tipd.c
@@ -160,7 +160,7 @@ tipd_intr(void *arg)
 		error = tipd_read_4(sc, TPS_STATUS, &status);
 		if (error)
 			goto fail;
-			
+
 		if (status & TPS_STATUS_PLUG_PRESENT)
 			tipd_connect(sc);
 		else
diff --git a/sys/dev/fdt/xhci_fdt.c b/sys/dev/fdt/xhci_fdt.c
index 3c172bcfa..73b7e8ad4 100644
--- a/sys/dev/fdt/xhci_fdt.c
+++ b/sys/dev/fdt/xhci_fdt.c
@@ -133,7 +133,7 @@ xhci_fdt_attach(struct device *parent, struct device *self, void *aux)
 	clock_set_assigned(sc->sc_node);
 	clock_enable_all(sc->sc_node);
 
-	/* 
+	/*
 	 * Cadence and Synopsys DesignWare USB3 controllers need some
 	 * extra attention because of the additional OTG
 	 * functionality.
@@ -233,7 +233,7 @@ void
 xhci_snps_do_connect(void *arg)
 {
 	struct xhci_fdt_softc *sc = arg;
-	
+
 	xhci_reinit(&sc->sc);
 }
 
diff --git a/sys/dev/gpio/gpio.c b/sys/dev/gpio/gpio.c
index 51b2d3ace..81f3019fd 100644
--- a/sys/dev/gpio/gpio.c
+++ b/sys/dev/gpio/gpio.c
@@ -500,7 +500,7 @@ gpio_ioctl(struct gpio_softc *sc, u_long cmd, caddr_t data, int flag)
 				return (EINVAL);
 		} else
 			pin = set->gp_pin;
-		
+
 		if (pin < 0 || pin >= sc->sc_npins)
 			return (EINVAL);
 		if (sc->sc_pins[pin].pin_mapped)
diff --git a/sys/dev/gpio/gpiodcf.c b/sys/dev/gpio/gpiodcf.c
index bc83c70e4..2a3c70d7c 100644
--- a/sys/dev/gpio/gpiodcf.c
+++ b/sys/dev/gpio/gpiodcf.c
@@ -45,7 +45,7 @@ int gpiodcfdebug = 0;
 
 struct gpiodcf_softc {
 	struct device		sc_dev;		/* base device */
-	void			*sc_gpio; 
+	void			*sc_gpio;
 	struct gpio_pinmap	sc_map;
 	int			__map[GPIODCF_NPINS];
 	u_char			sc_dying;	/* disconnecting */
@@ -96,10 +96,10 @@ void	gpiodcf_mg_probe(void *);
 void	gpiodcf_sl_probe(void *);
 void	gpiodcf_invalidate(void *);
 
-int gpiodcf_match(struct device *, void *, void *); 
-void gpiodcf_attach(struct device *, struct device *, void *); 
-int gpiodcf_detach(struct device *, int); 
-int gpiodcf_activate(struct device *, int); 
+int gpiodcf_match(struct device *, void *, void *);
+void gpiodcf_attach(struct device *, struct device *, void *);
+int gpiodcf_detach(struct device *, int);
+int gpiodcf_activate(struct device *, int);
 
 int gpiodcf_signal(struct gpiodcf_softc *);
 
@@ -316,7 +316,7 @@ gpiodcf_bv_probe(void *xsc)
 	if (data == -1) {
 		DPRINTF(("bit detection failed\n"));
 		return;
-	}	
+	}
 
 	DPRINTFN(1, (data ? "0" : "1"));
 	if (!(data))
@@ -364,7 +364,7 @@ gpiodcf_mg_probe(void *xsc)
 	p2_bit = sc->sc_tbits >> 35 & 1;
 	p3_bit = sc->sc_tbits >> 58 & 1;
 
-	minute_bits = sc->sc_tbits >> 21 & 0x7f;	
+	minute_bits = sc->sc_tbits >> 21 & 0x7f;
 	hour_bits = sc->sc_tbits >> 29 & 0x3f;
 	day_bits = sc->sc_tbits >> 36 & 0x3f;
 	wday = (sc->sc_tbits >> 42) & 0x07;
diff --git a/sys/dev/gpio/gpioiic.c b/sys/dev/gpio/gpioiic.c
index 3c5f8e047..317328cec 100644
--- a/sys/dev/gpio/gpioiic.c
+++ b/sys/dev/gpio/gpioiic.c
@@ -126,7 +126,7 @@ gpioiic_attach(struct device *parent, struct device *self, void *aux)
 		printf(": can't map pins\n");
 		return;
 	}
-	
+
 	if (ga->ga_flags & GPIOIIC_PIN_REVERSE) {
 		sc->sc_pin_sda = GPIOIIC_PIN_SCL;
 		sc->sc_pin_scl = GPIOIIC_PIN_SDA;
diff --git a/sys/dev/hid/hid.c b/sys/dev/hid/hid.c
index c758764f1..40ec12468 100644
--- a/sys/dev/hid/hid.c
+++ b/sys/dev/hid/hid.c
@@ -467,9 +467,9 @@ hid_get_item(struct hid_data *s, struct hid_item *h)
 				if ((s->nusage < MAXUSAGE) &&
 				    (c->usage_minimum <= c->usage_maximum)) {
 					/* add usage range */
-					s->usages_min[s->nusage] = 
+					s->usages_min[s->nusage] =
 					    c->usage_minimum;
-					s->usages_max[s->nusage] = 
+					s->usages_max[s->nusage] =
 					    c->usage_maximum;
 					s->nusage ++;
 				} else {
diff --git a/sys/dev/hid/hidms.c b/sys/dev/hid/hidms.c
index 622d5d9bc..011139a76 100644
--- a/sys/dev/hid/hidms.c
+++ b/sys/dev/hid/hidms.c
@@ -189,7 +189,7 @@ hidms_setup(struct device *self, struct hidms *ms, uint32_t quirks,
 			break;
 	ms->sc_num_buttons = i - 1;
 
-	/* 
+	/*
 	 * The Kensington Slimblade reports some of its buttons as binary
 	 * inputs in the first vendor usage page (0xff00). Add such inputs
 	 * as buttons if the device has this quirk.
diff --git a/sys/dev/hil/hil.c b/sys/dev/hil/hil.c
index cc654a4a4..15c92541b 100644
--- a/sys/dev/hil/hil.c
+++ b/sys/dev/hil/hil.c
@@ -353,7 +353,7 @@ hil_process_int(struct hil_softc *sc, u_int8_t stat, u_int8_t c)
 				if (sc->sc_cmdending) {
 					sc->sc_cmddone = 1;
 					sc->sc_cmdending = 0;
-				} else  
+				} else
 					*sc->sc_cmdbp++ = c;
 		        }
 		}
@@ -516,7 +516,7 @@ hilconfig(struct hil_softc *sc, u_int knowndevs)
 	for (id = knowndevs + 1; id <= sc->sc_maxdev; id++) {
 		int len;
 		const struct hildevice *hd;
-		
+
 		if (send_device_cmd(sc, id, HIL_IDENTIFY) != 0) {
 			printf("%s: no answer from device %d\n",
 			    sc->sc_dev.dv_xname, id);
@@ -650,7 +650,7 @@ send_hil_cmd(struct hil_softc *sc, u_int cmd, u_int8_t *data, u_int dlen,
 {
 	u_int8_t status;
 	int s;
-	
+
 	s = splhil();
 
 	if (hilwait(sc) == 0) {
@@ -760,7 +760,7 @@ send_hildev_cmd(struct hildev_softc *dev, u_int cmd,
 {
 	struct hil_softc *sc = (struct hil_softc *)dev->sc_dev.dv_parent;
 	int s, rc;
-       
+
 	s = splhil();
 
 	if ((rc = send_device_cmd(sc, dev->sc_code, cmd)) == 0) {
@@ -811,7 +811,7 @@ polloff(struct hil_softc *sc)
 	/*
 	 * Must wait until polling is really stopped
 	 */
-	do {	
+	do {
 		hilwait(sc);
 		bus_space_write_1(sc->sc_bst, sc->sc_bsh, HILP_CMD, HIL_READBUSY);
 		hildatawait(sc);
diff --git a/sys/dev/hil/hilms.c b/sys/dev/hil/hilms.c
index c13d1bd45..e78d35693 100644
--- a/sys/dev/hil/hilms.c
+++ b/sys/dev/hil/hilms.c
@@ -327,7 +327,7 @@ hilms_callback(struct hildev_softc *dev, u_int buflen, u_int8_t *buf)
 		}
 		/* buf++; */
 	}
-	
+
 	if (sc->sc_wsmousedev == NULL)
 		return;
 
diff --git a/sys/dev/hil/hilreg.h b/sys/dev/hil/hilreg.h
index 39c36a5e0..1be8903e0 100644
--- a/sys/dev/hil/hilreg.h
+++ b/sys/dev/hil/hilreg.h
@@ -129,7 +129,7 @@
 /* HIL packet headers */
 #define	HIL_MOUSEDATA   0x02
 #define	HIL_KBDDATA     0x70
-  
+
 #define	HIL_MOUSEMOTION	0x02	/* mouse movement event */
 #define	HIL_TABLET      0x02	/* tablet motion event */
 #define	HIL_KNOBBOX     0x03	/* knob box motion data */
diff --git a/sys/dev/i2c/adt7460.c b/sys/dev/i2c/adt7460.c
index bc11b6344..b16d57b89 100644
--- a/sys/dev/i2c/adt7460.c
+++ b/sys/dev/i2c/adt7460.c
@@ -208,7 +208,7 @@ adt_attach(struct device *parent, struct device *self, void *aux)
 	sc->sc_sensor[ADT_2_5V].type = SENSOR_VOLTS_DC;
 	strlcpy(sc->sc_sensor[ADT_2_5V].desc, "+2.5Vin",
 	    sizeof(sc->sc_sensor[ADT_2_5V].desc));
-		
+
 	if (sc->chip->type == 5017)
 		strlcpy(sc->sc_sensor[ADT_2_5V].desc, "+5VTR",
 		    sizeof(sc->sc_sensor[ADT_2_5V].desc));
diff --git a/sys/dev/i2c/fintek.c b/sys/dev/i2c/fintek.c
index 46d14de4d..0f85df7fa 100644
--- a/sys/dev/i2c/fintek.c
+++ b/sys/dev/i2c/fintek.c
@@ -268,4 +268,4 @@ fintek_fullspeed(struct fintek_softc *sc)
 	data = 0xff;		/* Maximum voltage */
 	fintek_write_reg(sc, FINTEK_PWM_DUTY1, &data, sizeof data);
 	fintek_write_reg(sc, FINTEK_PWM_DUTY2, &data, sizeof data);
-}	
+}
diff --git a/sys/dev/i2c/gl518sm.c b/sys/dev/i2c/gl518sm.c
index 9159293fa..ad5037f27 100644
--- a/sys/dev/i2c/gl518sm.c
+++ b/sys/dev/i2c/gl518sm.c
@@ -107,7 +107,7 @@ glenv_attach(struct device *parent, struct device *self, void *aux)
 		printf(": cannot read revision register\n");
 		return;
 	}
-	
+
 	printf(": GL518SM rev 0x%02x", data);
 
 	cmd = GL518SM_MISC;
@@ -184,7 +184,7 @@ glenv_refresh(void *arg)
 		sc->sc_sensor[GLENV_VIN3].flags &= ~SENSOR_FINVALID;
 		sc->sc_sensor[GLENV_VIN3].value = data * 19000;
 	}
-	
+
 	cmd = GL518SM_TEMP;
 	if (iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP,
 	    sc->sc_addr, &cmd, sizeof cmd, &data, sizeof data, 0)) {
diff --git a/sys/dev/i2c/pca9532.c b/sys/dev/i2c/pca9532.c
index 1299f3c7b..38a570037 100644
--- a/sys/dev/i2c/pca9532.c
+++ b/sys/dev/i2c/pca9532.c
@@ -179,6 +179,6 @@ fail:
 void
 pcaled_gpio_pin_ctl (void *arg, int pin, int flags)
 {
-	/* XXX all pins are inout */ 
+	/* XXX all pins are inout */
 }
 
diff --git a/sys/dev/i2c/spdmem_i2c.c b/sys/dev/i2c/spdmem_i2c.c
index a04e0afcb..a55e13262 100644
--- a/sys/dev/i2c/spdmem_i2c.c
+++ b/sys/dev/i2c/spdmem_i2c.c
@@ -78,7 +78,7 @@ spdmem_iic_match(struct device *parent, void *match, void *aux)
 	struct i2c_attach_args *ia = aux;
 	struct spdmem_iic_softc sc;
 
-	/* clever attachments like openfirmware informed macppc */	
+	/* clever attachments like openfirmware informed macppc */
 	if (strcmp(ia->ia_name, "spd") == 0)
 		return (1);
 
diff --git a/sys/dev/i2c/thmc50.c b/sys/dev/i2c/thmc50.c
index 8c5068c89..abf15eb4c 100644
--- a/sys/dev/i2c/thmc50.c
+++ b/sys/dev/i2c/thmc50.c
@@ -139,7 +139,7 @@ thmc_refresh(void *arg)
 	} else
 		sc->sc_sensor[THMC_TEMP1].flags |= SENSOR_FINVALID;
 
-	if (sc->sc_sensor[THMC_TEMP2].type > 0) { 
+	if (sc->sc_sensor[THMC_TEMP2].type > 0) {
 		cmd = THMC50_TEMP2;
 		if (iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP,
 		    sc->sc_addr, &cmd, sizeof cmd, &sdata, sizeof sdata, 0) == 0) {
diff --git a/sys/dev/midi.c b/sys/dev/midi.c
index 14b3fbbf2..64f4dc7db 100644
--- a/sys/dev/midi.c
+++ b/sys/dev/midi.c
@@ -192,7 +192,7 @@ midi_ointr(void *addr)
 	MUTEX_ASSERT_LOCKED(&audio_lock);
 	if (!(sc->dev.dv_flags & DVF_ACTIVE) || !(sc->flags & FWRITE))
 		return;
-	
+
 	mb = &sc->outbuf;
 	if (mb->used > 0) {
 #ifdef MIDI_DEBUG
diff --git a/sys/dev/midivar.h b/sys/dev/midivar.h
index ff14ecbb3..c6070df50 100644
--- a/sys/dev/midivar.h
+++ b/sys/dev/midivar.h
@@ -37,7 +37,7 @@ struct midi_buffer {
 	void	     *softintr;		/* context to call selwakeup() */
 	struct	      selinfo sel;	/* to record & wakeup poll(2) */
 	int	      blocking;		/* read/write blocking */
-	unsigned char data[MIDIBUF_SIZE]; 
+	unsigned char data[MIDIBUF_SIZE];
 	unsigned      start, used;
 };
 
@@ -68,7 +68,7 @@ struct midi_buffer {
 	do {							\
 		(buf)->start = (buf)->used = 0;			\
 	} while(0)
-	
+
 
 struct midi_softc {
 	struct device	    dev;
diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_device.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_device.c
index 9693660ac..f4581db1d 100644
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_device.c
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_device.c
@@ -2544,8 +2544,6 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)
 	amdgpu_fru_get_product_info(adev);
 
 init_failed:
-	if (amdgpu_sriov_vf(adev))
-		amdgpu_virt_release_full_gpu(adev, true);
 
 	return r;
 }
@@ -3593,6 +3591,7 @@ int amdgpu_device_init(struct amdgpu_device *adev,
 	int r, i;
 	bool px = false;
 	u32 max_MBps;
+	int tmp;
 
 	adev->shutdown = false;
 	adev->flags = flags;
@@ -3774,6 +3773,12 @@ int amdgpu_device_init(struct amdgpu_device *adev,
 		adev->have_atomics_support = ((struct amd_sriov_msg_pf2vf_info *)
 			adev->virt.fw_reserve.p_pf2vf)->pcie_atomic_ops_support_flags ==
 			(PCI_EXP_DEVCAP2_ATOMIC_COMP32 | PCI_EXP_DEVCAP2_ATOMIC_COMP64);
+	/* APUs w/ gfx9 onwards doesn't reply on PCIe atomics, rather it is a
+	 * internal path natively support atomics, set have_atomics_support to true.
+	 */
+	else if ((adev->flags & AMD_IS_APU) &&
+		(adev->ip_versions[GC_HWIP][0] > IP_VERSION(9, 0, 0)))
+		adev->have_atomics_support = true;
 	else
 		adev->have_atomics_support =
 			!pci_enable_atomic_ops_to_root(adev->pdev,
@@ -3782,7 +3787,14 @@ int amdgpu_device_init(struct amdgpu_device *adev,
 	if (!adev->have_atomics_support)
 		dev_info(adev->dev, "PCIE atomic ops is not supported\n");
 #else
-	adev->have_atomics_support = false;
+	/* APUs w/ gfx9 onwards doesn't reply on PCIe atomics, rather it is a
+	 * internal path natively support atomics, set have_atomics_support to true.
+	 */
+	if ((adev->flags & AMD_IS_APU) &&
+		(adev->ip_versions[GC_HWIP][0] > IP_VERSION(9, 0, 0)))
+		adev->have_atomics_support = true;
+	else
+		adev->have_atomics_support = false;
 #endif
 
 	/* doorbell bar mapping and doorbell index init*/
@@ -3820,7 +3832,13 @@ int amdgpu_device_init(struct amdgpu_device *adev,
 				}
 			}
 		} else {
+			tmp = amdgpu_reset_method;
+			/* It should do a default reset when loading or reloading the driver,
+			 * regardless of the module parameter reset_method.
+			 */
+			amdgpu_reset_method = AMD_RESET_METHOD_NONE;
 			r = amdgpu_asic_reset(adev);
+			amdgpu_reset_method = tmp;
 			if (r) {
 				dev_err(adev->dev, "asic reset on init failed\n");
 				goto failed;
@@ -3880,18 +3898,6 @@ fence_driver_init:
 
 	r = amdgpu_device_ip_init(adev);
 	if (r) {
-		/* failed in exclusive mode due to timeout */
-		if (amdgpu_sriov_vf(adev) &&
-		    !amdgpu_sriov_runtime(adev) &&
-		    amdgpu_virt_mmio_blocked(adev) &&
-		    !amdgpu_virt_wait_reset(adev)) {
-			dev_err(adev->dev, "VF exclusive mode timeout\n");
-			/* Don't send request since VF is inactive. */
-			adev->virt.caps &= ~AMDGPU_SRIOV_CAPS_RUNTIME;
-			adev->virt.ops = NULL;
-			r = -EAGAIN;
-			goto release_ras_con;
-		}
 		dev_err(adev->dev, "amdgpu_device_ip_init failed\n");
 		amdgpu_vf_error_put(adev, AMDGIM_ERROR_VF_AMDGPU_INIT_FAIL, 0, 0);
 		goto release_ras_con;
@@ -4000,8 +4006,10 @@ fence_driver_init:
 				   msecs_to_jiffies(AMDGPU_RESUME_MS));
 	}
 
-	if (amdgpu_sriov_vf(adev))
+	if (amdgpu_sriov_vf(adev)) {
+		amdgpu_virt_release_full_gpu(adev, true);
 		flush_delayed_work(&adev->delayed_init_work);
+	}
 
 	r = sysfs_create_files(&adev->dev->kobj, amdgpu_dev_attributes);
 	if (r)
@@ -4043,6 +4051,20 @@ fence_driver_init:
 	return 0;
 
 release_ras_con:
+	if (amdgpu_sriov_vf(adev))
+		amdgpu_virt_release_full_gpu(adev, true);
+
+	/* failed in exclusive mode due to timeout */
+	if (amdgpu_sriov_vf(adev) &&
+		!amdgpu_sriov_runtime(adev) &&
+		amdgpu_virt_mmio_blocked(adev) &&
+		!amdgpu_virt_wait_reset(adev)) {
+		dev_err(adev->dev, "VF exclusive mode timeout\n");
+		/* Don't send request since VF is inactive. */
+		adev->virt.caps &= ~AMDGPU_SRIOV_CAPS_RUNTIME;
+		adev->virt.ops = NULL;
+		r = -EAGAIN;
+	}
 	amdgpu_release_ras_context(adev);
 
 failed:
diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_fence.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_fence.c
index 605b4c1b2..8770aa59d 100644
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_fence.c
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_fence.c
@@ -545,7 +545,8 @@ void amdgpu_fence_driver_hw_fini(struct amdgpu_device *adev)
 		if (r)
 			amdgpu_fence_driver_force_completion(ring);
 
-		if (ring->fence_drv.irq_src)
+		if (!drm_dev_is_unplugged(adev_to_drm(adev)) &&
+		    ring->fence_drv.irq_src)
 			amdgpu_irq_put(adev, ring->fence_drv.irq_src,
 				       ring->fence_drv.irq_type);
 
diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_gmc.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_gmc.c
index 82be027f6..c19241fed 100644
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_gmc.c
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_gmc.c
@@ -526,6 +526,8 @@ void amdgpu_gmc_tmz_set(struct amdgpu_device *adev)
 	case IP_VERSION(9, 3, 0):
 	/* GC 10.3.7 */
 	case IP_VERSION(10, 3, 7):
+	/* GC 11.0.1 */
+	case IP_VERSION(11, 0, 1):
 		if (amdgpu_tmz == 0) {
 			adev->gmc.tmz_enabled = false;
 			dev_info(adev->dev,
@@ -548,7 +550,6 @@ void amdgpu_gmc_tmz_set(struct amdgpu_device *adev)
 	case IP_VERSION(10, 3, 1):
 	/* YELLOW_CARP*/
 	case IP_VERSION(10, 3, 3):
-	case IP_VERSION(11, 0, 1):
 	case IP_VERSION(11, 0, 4):
 		/* Don't enable it by default yet.
 		 */
diff --git a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 0aca5c3b7..b3d59c158 100644
--- a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2765,7 +2765,7 @@ static int dm_resume(void *handle)
 		 * this is the case when traversing through already created
 		 * MST connectors, should be skipped
 		 */
-		if (aconnector->dc_link->type == dc_connection_mst_branch)
+		if (aconnector && aconnector->mst_port)
 			continue;
 
 		mutex_lock(&aconnector->hpd_lock);
@@ -6494,7 +6494,7 @@ static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder,
 	int clock, bpp = 0;
 	bool is_y420 = false;
 
-	if (!aconnector->port || !aconnector->dc_sink)
+	if (!aconnector->port)
 		return 0;
 
 	mst_port = aconnector->port;
diff --git a/sys/dev/pci/drm/amd/pm/legacy-dpm/amdgpu_si_dpm.c b/sys/dev/pci/drm/amd/pm/legacy-dpm/amdgpu_si_dpm.c
index 49c398ec0..c89cfef7c 100644
--- a/sys/dev/pci/drm/amd/pm/legacy-dpm/amdgpu_si_dpm.c
+++ b/sys/dev/pci/drm/amd/pm/legacy-dpm/amdgpu_si_dpm.c
@@ -6925,23 +6925,6 @@ static int si_dpm_enable(struct amdgpu_device *adev)
 	return 0;
 }
 
-static int si_set_temperature_range(struct amdgpu_device *adev)
-{
-	int ret;
-
-	ret = si_thermal_enable_alert(adev, false);
-	if (ret)
-		return ret;
-	ret = si_thermal_set_temperature_range(adev, R600_TEMP_RANGE_MIN, R600_TEMP_RANGE_MAX);
-	if (ret)
-		return ret;
-	ret = si_thermal_enable_alert(adev, true);
-	if (ret)
-		return ret;
-
-	return ret;
-}
-
 static void si_dpm_disable(struct amdgpu_device *adev)
 {
 	struct rv7xx_power_info *pi = rv770_get_pi(adev);
@@ -7626,18 +7609,6 @@ static int si_dpm_process_interrupt(struct amdgpu_device *adev,
 
 static int si_dpm_late_init(void *handle)
 {
-	int ret;
-	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
-
-	if (!adev->pm.dpm_enabled)
-		return 0;
-
-	ret = si_set_temperature_range(adev);
-	if (ret)
-		return ret;
-#if 0 //TODO ?
-	si_dpm_powergate_uvd(adev, true);
-#endif
 	return 0;
 }
 
diff --git a/sys/dev/pci/drm/amd/pm/swsmu/smu11/vangogh_ppt.c b/sys/dev/pci/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
index d63531578..5bc1eba77 100644
--- a/sys/dev/pci/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
+++ b/sys/dev/pci/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
@@ -588,7 +588,7 @@ static int vangogh_print_legacy_clk_levels(struct smu_context *smu,
 	DpmClocks_t *clk_table = smu->smu_table.clocks_table;
 	SmuMetrics_legacy_t metrics;
 	struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);
-	int i, size = 0, ret = 0;
+	int i, idx, size = 0, ret = 0;
 	uint32_t cur_value = 0, value = 0, count = 0;
 	bool cur_value_match_level = false;
 
@@ -662,7 +662,8 @@ static int vangogh_print_legacy_clk_levels(struct smu_context *smu,
 	case SMU_MCLK:
 	case SMU_FCLK:
 		for (i = 0; i < count; i++) {
-			ret = vangogh_get_dpm_clk_limited(smu, clk_type, i, &value);
+			idx = (clk_type == SMU_FCLK || clk_type == SMU_MCLK) ? (count - i - 1) : i;
+			ret = vangogh_get_dpm_clk_limited(smu, clk_type, idx, &value);
 			if (ret)
 				return ret;
 			if (!value)
@@ -689,7 +690,7 @@ static int vangogh_print_clk_levels(struct smu_context *smu,
 	DpmClocks_t *clk_table = smu->smu_table.clocks_table;
 	SmuMetrics_t metrics;
 	struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);
-	int i, size = 0, ret = 0;
+	int i, idx, size = 0, ret = 0;
 	uint32_t cur_value = 0, value = 0, count = 0;
 	bool cur_value_match_level = false;
 	uint32_t min, max;
@@ -771,7 +772,8 @@ static int vangogh_print_clk_levels(struct smu_context *smu,
 	case SMU_MCLK:
 	case SMU_FCLK:
 		for (i = 0; i < count; i++) {
-			ret = vangogh_get_dpm_clk_limited(smu, clk_type, i, &value);
+			idx = (clk_type == SMU_FCLK || clk_type == SMU_MCLK) ? (count - i - 1) : i;
+			ret = vangogh_get_dpm_clk_limited(smu, clk_type, idx, &value);
 			if (ret)
 				return ret;
 			if (!value)
diff --git a/sys/dev/pci/drm/amd/pm/swsmu/smu12/renoir_ppt.c b/sys/dev/pci/drm/amd/pm/swsmu/smu12/renoir_ppt.c
index 5cdc07165..8a8ba25c9 100644
--- a/sys/dev/pci/drm/amd/pm/swsmu/smu12/renoir_ppt.c
+++ b/sys/dev/pci/drm/amd/pm/swsmu/smu12/renoir_ppt.c
@@ -494,7 +494,7 @@ static int renoir_set_fine_grain_gfx_freq_parameters(struct smu_context *smu)
 static int renoir_print_clk_levels(struct smu_context *smu,
 			enum smu_clk_type clk_type, char *buf)
 {
-	int i, size = 0, ret = 0;
+	int i, idx, size = 0, ret = 0;
 	uint32_t cur_value = 0, value = 0, count = 0, min = 0, max = 0;
 	SmuMetrics_t metrics;
 	struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);
@@ -594,7 +594,8 @@ static int renoir_print_clk_levels(struct smu_context *smu,
 	case SMU_VCLK:
 	case SMU_DCLK:
 		for (i = 0; i < count; i++) {
-			ret = renoir_get_dpm_clk_limited(smu, clk_type, i, &value);
+			idx = (clk_type == SMU_FCLK || clk_type == SMU_MCLK) ? (count - i - 1) : i;
+			ret = renoir_get_dpm_clk_limited(smu, clk_type, idx, &value);
 			if (ret)
 				return ret;
 			if (!value)
diff --git a/sys/dev/pci/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c b/sys/dev/pci/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c
index 8fa9a36c3..6d9760eac 100644
--- a/sys/dev/pci/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c
+++ b/sys/dev/pci/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c
@@ -478,7 +478,7 @@ static int smu_v13_0_4_get_dpm_level_count(struct smu_context *smu,
 static int smu_v13_0_4_print_clk_levels(struct smu_context *smu,
 					enum smu_clk_type clk_type, char *buf)
 {
-	int i, size = 0, ret = 0;
+	int i, idx, size = 0, ret = 0;
 	uint32_t cur_value = 0, value = 0, count = 0;
 	uint32_t min, max;
 
@@ -512,7 +512,8 @@ static int smu_v13_0_4_print_clk_levels(struct smu_context *smu,
 			break;
 
 		for (i = 0; i < count; i++) {
-			ret = smu_v13_0_4_get_dpm_freq_by_index(smu, clk_type, i, &value);
+			idx = (clk_type == SMU_FCLK || clk_type == SMU_MCLK) ? (count - i - 1) : i;
+			ret = smu_v13_0_4_get_dpm_freq_by_index(smu, clk_type, idx, &value);
 			if (ret)
 				break;
 
diff --git a/sys/dev/pci/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c b/sys/dev/pci/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c
index 66445964e..0081fa607 100644
--- a/sys/dev/pci/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c
+++ b/sys/dev/pci/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c
@@ -866,7 +866,7 @@ out:
 static int smu_v13_0_5_print_clk_levels(struct smu_context *smu,
 				enum smu_clk_type clk_type, char *buf)
 {
-	int i, size = 0, ret = 0;
+	int i, idx, size = 0, ret = 0;
 	uint32_t cur_value = 0, value = 0, count = 0;
 	uint32_t min = 0, max = 0;
 
@@ -898,7 +898,8 @@ static int smu_v13_0_5_print_clk_levels(struct smu_context *smu,
 			goto print_clk_out;
 
 		for (i = 0; i < count; i++) {
-			ret = smu_v13_0_5_get_dpm_freq_by_index(smu, clk_type, i, &value);
+			idx = (clk_type == SMU_MCLK) ? (count - i - 1) : i;
+			ret = smu_v13_0_5_get_dpm_freq_by_index(smu, clk_type, idx, &value);
 			if (ret)
 				goto print_clk_out;
 
diff --git a/sys/dev/pci/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c b/sys/dev/pci/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
index 04e56b0b3..798f36cfc 100644
--- a/sys/dev/pci/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
+++ b/sys/dev/pci/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
@@ -1000,7 +1000,7 @@ out:
 static int yellow_carp_print_clk_levels(struct smu_context *smu,
 				enum smu_clk_type clk_type, char *buf)
 {
-	int i, size = 0, ret = 0;
+	int i, idx, size = 0, ret = 0;
 	uint32_t cur_value = 0, value = 0, count = 0;
 	uint32_t min, max;
 
@@ -1033,7 +1033,8 @@ static int yellow_carp_print_clk_levels(struct smu_context *smu,
 			goto print_clk_out;
 
 		for (i = 0; i < count; i++) {
-			ret = yellow_carp_get_dpm_freq_by_index(smu, clk_type, i, &value);
+			idx = (clk_type == SMU_FCLK || clk_type == SMU_MCLK) ? (count - i - 1) : i;
+			ret = yellow_carp_get_dpm_freq_by_index(smu, clk_type, idx, &value);
 			if (ret)
 				goto print_clk_out;
 
diff --git a/sys/dev/radio_if.h b/sys/dev/radio_if.h
index 9223d0f09..491b40e0b 100644
--- a/sys/dev/radio_if.h
+++ b/sys/dev/radio_if.h
@@ -37,7 +37,7 @@
 
 struct radio_hw_if {
 	/* open hardware */
-	int	(*open)(void *, int, int, struct proc *);	
+	int	(*open)(void *, int, int, struct proc *);
 
 	/* close hardware */
 	int	(*close)(void *, int, int, struct proc *);
diff --git a/sys/kern/kern_clockintr.c b/sys/kern/kern_clockintr.c
index bcd583c19..22a21996d 100644
--- a/sys/kern/kern_clockintr.c
+++ b/sys/kern/kern_clockintr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_clockintr.c,v 1.22 2023/06/15 22:18:06 cheloha Exp $ */
+/* $OpenBSD: kern_clockintr.c,v 1.24 2023/06/18 23:19:01 cheloha Exp $ */
 /*
  * Copyright (c) 2003 Dale Rahn <drahn@openbsd.org>
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
@@ -64,6 +64,7 @@ uint64_t clockintr_nsecuptime(const struct clockintr *);
 void clockintr_schedclock(struct clockintr *, void *);
 void clockintr_schedule(struct clockintr *, uint64_t);
 void clockintr_schedule_locked(struct clockintr *, uint64_t);
+void clockintr_stagger(struct clockintr *, uint64_t, u_int, u_int);
 void clockintr_statclock(struct clockintr *, void *);
 void clockintr_statvar_init(int, uint32_t *, uint32_t *, uint32_t *);
 uint64_t clockqueue_next(const struct clockintr_queue *);
@@ -106,7 +107,7 @@ clockintr_init(u_int flags)
 void
 clockintr_cpu_init(const struct intrclock *ic)
 {
-	uint64_t multiplier = 0, offset;
+	uint64_t multiplier = 0;
 	struct cpu_info *ci = curcpu();
 	struct clockintr_queue *cq = &ci->ci_queue;
 	int reset_cq_intrclock = 0;
@@ -169,8 +170,8 @@ clockintr_cpu_init(const struct intrclock *ic)
 			clockintr_advance(cq->cq_hardclock, hardclock_period);
 	} else {
 		if (cq->cq_hardclock->cl_expiration == 0) {
-			offset = hardclock_period / ncpus * multiplier;
-			cq->cq_hardclock->cl_expiration =  offset;
+			clockintr_stagger(cq->cq_hardclock, hardclock_period,
+			    multiplier, ncpus);
 		}
 		clockintr_advance(cq->cq_hardclock, hardclock_period);
 	}
@@ -178,12 +179,16 @@ clockintr_cpu_init(const struct intrclock *ic)
 	/*
 	 * We can always advance the statclock and schedclock.
 	 */
-	offset = statclock_avg / ncpus * multiplier;
-	clockintr_schedule(cq->cq_statclock, offset);
+	if (cq->cq_statclock->cl_expiration == 0) {
+		clockintr_stagger(cq->cq_statclock, statclock_avg, multiplier,
+		    ncpus);
+	}
 	clockintr_advance(cq->cq_statclock, statclock_avg);
 	if (schedhz != 0) {
-		offset = schedclock_period / ncpus * multiplier;
-		clockintr_schedule(cq->cq_schedclock, offset);
+		if (cq->cq_schedclock->cl_expiration == 0) {
+			clockintr_stagger(cq->cq_schedclock, schedclock_period,
+			    multiplier, ncpus);
+		}
 		clockintr_advance(cq->cq_schedclock, schedclock_period);
 	}
 
@@ -459,6 +464,20 @@ clockintr_schedule_locked(struct clockintr *cl, uint64_t expiration)
 	SET(cl->cl_flags, CLST_PENDING);
 }
 
+void
+clockintr_stagger(struct clockintr *cl, uint64_t period, u_int n, u_int count)
+{
+	struct clockintr_queue *cq = cl->cl_queue;
+
+	KASSERT(n < count);
+
+	mtx_enter(&cq->cq_mtx);
+	if (ISSET(cl->cl_flags, CLST_PENDING))
+		panic("%s: clock interrupt pending", __func__);
+	cl->cl_expiration = period / count * n;
+	mtx_leave(&cq->cq_mtx);
+}
+
 /*
  * Compute the period (avg) for the given frequency and a range around
  * that period.  The range is [min + 1, min + mask].  The range is used
diff --git a/usr.sbin/smtpd/ca.c b/usr.sbin/smtpd/ca.c
index 5c163ef70..ccbcb10e3 100644
--- a/usr.sbin/smtpd/ca.c
+++ b/usr.sbin/smtpd/ca.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ca.c,v 1.44 2023/06/18 11:43:49 op Exp $	*/
+/*	$OpenBSD: ca.c,v 1.45 2023/06/18 19:08:52 op Exp $	*/
 
 /*
  * Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org>
@@ -29,8 +29,6 @@
 #include "log.h"
 #include "ssl.h"
 
-static int	 ca_verify_cb(int, X509_STORE_CTX *);
-
 static int	 rsae_send_imsg(int, const unsigned char *, unsigned char *,
 		    RSA *, int, unsigned int);
 static int	 rsae_pub_enc(int, const unsigned char *, unsigned char *,
@@ -152,26 +150,6 @@ ca_init(void)
 	}
 }
 
-static int
-ca_verify_cb(int ok, X509_STORE_CTX *ctx)
-{
-	switch (X509_STORE_CTX_get_error(ctx)) {
-	case X509_V_OK:
-		break;
-        case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
-		break;
-        case X509_V_ERR_CERT_NOT_YET_VALID:
-        case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD:
-		break;
-        case X509_V_ERR_CERT_HAS_EXPIRED:
-        case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD:
-		break;
-        case X509_V_ERR_NO_EXPLICIT_POLICY:
-		break;
-	}
-	return ok;
-}
-
 int
 ca_X509_verify(void *certificate, void *chain, const char *CAfile,
     const char *CRLfile, const char **errstr)
@@ -196,8 +174,6 @@ ca_X509_verify(void *certificate, void *chain, const char *CAfile,
 	if (X509_STORE_CTX_init(xsc, store, certificate, chain) != 1)
 		goto end;
 
-	X509_STORE_CTX_set_verify_cb(xsc, ca_verify_cb);
-
 	ret = X509_verify_cert(xsc);
 
 end:
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c
index df569963a..d663efcfa 100644
--- a/usr.sbin/smtpd/smtpd.c
+++ b/usr.sbin/smtpd/smtpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtpd.c,v 1.345 2023/05/31 16:51:46 op Exp $	*/
+/*	$OpenBSD: smtpd.c,v 1.346 2023/06/18 17:28:42 op Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -2081,19 +2081,22 @@ imsg_to_str(int type)
 
 	CASE(IMSG_REPORT_SMTP_LINK_CONNECT);
 	CASE(IMSG_REPORT_SMTP_LINK_DISCONNECT);
-	CASE(IMSG_REPORT_SMTP_LINK_TLS);
 	CASE(IMSG_REPORT_SMTP_LINK_GREETING);
 	CASE(IMSG_REPORT_SMTP_LINK_IDENTIFY);
+	CASE(IMSG_REPORT_SMTP_LINK_TLS);
 	CASE(IMSG_REPORT_SMTP_LINK_AUTH);
-
 	CASE(IMSG_REPORT_SMTP_TX_RESET);
 	CASE(IMSG_REPORT_SMTP_TX_BEGIN);
+	CASE(IMSG_REPORT_SMTP_TX_MAIL);
+	CASE(IMSG_REPORT_SMTP_TX_RCPT);
 	CASE(IMSG_REPORT_SMTP_TX_ENVELOPE);
+	CASE(IMSG_REPORT_SMTP_TX_DATA);
 	CASE(IMSG_REPORT_SMTP_TX_COMMIT);
 	CASE(IMSG_REPORT_SMTP_TX_ROLLBACK);
-
 	CASE(IMSG_REPORT_SMTP_PROTOCOL_CLIENT);
 	CASE(IMSG_REPORT_SMTP_PROTOCOL_SERVER);
+	CASE(IMSG_REPORT_SMTP_FILTER_RESPONSE);
+	CASE(IMSG_REPORT_SMTP_TIMEOUT);
 
 	CASE(IMSG_FILTER_SMTP_BEGIN);
 	CASE(IMSG_FILTER_SMTP_END);
@@ -2104,6 +2107,7 @@ imsg_to_str(int type)
 	CASE(IMSG_CA_RSA_PRIVENC);
 	CASE(IMSG_CA_RSA_PRIVDEC);
 	CASE(IMSG_CA_ECDSA_SIGN);
+
 	default:
 		(void)snprintf(buf, sizeof(buf), "IMSG_??? (%d)", type);