amdsmu: Use devclass name instead of module name

The diagnostics array contained expected modules to be loaded but the
checking logic checked for if a devclass of that name existed instead.

Have the diagnostics array contain the devclass instead as well as the
module to load for the hint string.

Furthermore, check tha the number of devices is greater than 0 so that
leftover devclasses from unloaded modules don't skip the hint.

Reported by:	emaste
Reviewed by:	emaste
Fixes:	758578370f ("amdsmu: Hints on what to do if IP block blocking S0i3")
Sponsored by:	The FreeBSD Foundation
Pull Request:	https://ron-dev.freebsd.org/FreeBSD/src/pulls/70

lib/libc/gen/uexterr_gettext.3

@@ -59,8 +59,8 @@ and setting
 .Va errno
 to the corresponding value.
 .Sh SEE ALSO
-.Xr errno 3 ,
 .Xr err 3 ,
+.Xr errno 3 ,
 .Xr exterror 9
 .Sh STANDARDS
 The

lib/libc/gen/uexterror.3

@@ -118,8 +118,8 @@ was not compiled with the
 .Cd NO_UEXTERR_STRINGS
 macro defined.
 .Sh SEE ALSO
-.Xr errno 3 ,
 .Xr err 3 ,
+.Xr errno 3 ,
 .Xr uexterr_gettext 3 ,
 .Xr exterror 9
 .Sh HISTORY

lib/libc/stdbit/stdc_first_leading_one.3

@@ -72,9 +72,9 @@ is zero), zero is returned.
 .Sh SEE ALSO
 .Xr fls 3 ,
 .Xr stdbit 3 ,
-.Xr stdc_leading_zeros 3 ,
 .Xr stdc_first_leading_zero 3 ,
-.Xr stdc_first_trailing_one 3
+.Xr stdc_first_trailing_one 3 ,
+.Xr stdc_leading_zeros 3
 .Sh STANDARDS
 The
 .Nm stdc_first_leading_one_ Ns Em type Ns ()

lib/libc/stdbit/stdc_first_leading_zero.3

@@ -71,9 +71,9 @@ If no bits are clear in
 is the bitwise complement of zero), zero is returned.
 .Sh SEE ALSO
 .Xr stdbit 3 ,
-.Xr stdc_leading_ones 3 ,
 .Xr stdc_first_leading_ones 3 ,
-.Xr stdc_first_trailing_zero 3
+.Xr stdc_first_trailing_zero 3 ,
+.Xr stdc_leading_ones 3
 .Sh STANDARDS
 The
 .Nm stdc_first_leading_zero_ Ns Em type Ns ()

lib/libc/stdbit/stdc_first_trailing_one.3

@@ -89,9 +89,9 @@ is zero), one is returned.
 .Xr ffsl 3 ,
 .Xr ffsll 3 ,
 .Xr stdbit 3 ,
-.Xr stdc_trailing_zeros 3 ,
+.Xr stdc_first_leading_one 3 ,
 .Xr stdc_first_trailing_zero 3 ,
-.Xr stdc_first_leading_one 3
+.Xr stdc_trailing_zeros 3
 .Sh STANDARDS
 The
 .Nm stdc_first_trailing_one_ Ns Em type Ns ()

lib/libc/stdbit/stdc_first_trailing_zero.3

@@ -72,9 +72,9 @@ is the bitwise complement of zero), zero is returned.
 .Sh SEE ALSO
 .Xr bit_ffc 3 ,
 .Xr stdbit 3 ,
-.Xr stdc_trailing_ones 3 ,
+.Xr stdc_first_leading_zero 3 ,
 .Xr stdc_first_trailing_ones 3 ,
-.Xr stdc_first_leading_zero 3
+.Xr stdc_trailing_ones 3
 .Sh STANDARDS
 The
 .Nm stdc_first_trailing_zero_ Ns Em type Ns ()

lib/libc/stdbit/stdc_leading_ones.3

@@ -65,9 +65,9 @@ the total number of bits in the type of
 is returned.
 .Sh SEE ALSO
 .Xr stdbit 3 ,
+.Xr stdc_first_leading_zero 3 ,
 .Xr stdc_leading_zeros 3 ,
-.Xr stdc_trailing_ones 3 ,
-.Xr stdc_first_leading_zero 3
+.Xr stdc_trailing_ones 3
 .Sh STANDARDS
 The
 .Nm stdc_leading_ones_ Ns Em type Ns ()

lib/libc/stdbit/stdc_leading_zeros.3

@@ -65,9 +65,9 @@ the total number of bits in the type of
 is returned.
 .Sh SEE ALSO
 .Xr stdbit 3 ,
+.Xr stdc_first_leading_one 3 ,
 .Xr stdc_leading_ones 3 ,
-.Xr stdc_trailing_zeros 3 ,
-.Xr stdc_first_leading_one 3
+.Xr stdc_trailing_zeros 3
 .Sh STANDARDS
 The
 .Nm stdc_leading_zeros_ Ns Em type Ns ()

lib/libc/stdbit/stdc_trailing_ones.3

@@ -65,9 +65,9 @@ the total number of bits in the type of
 is returned.
 .Sh SEE ALSO
 .Xr stdbit 3 ,
+.Xr stdc_first_trailing_zero 3 ,
 .Xr stdc_leading_ones 3 ,
-.Xr stdc_trailing_zeros 3 ,
-.Xr stdc_first_trailing_zero 3
+.Xr stdc_trailing_zeros 3
 .Sh STANDARDS
 The
 .Nm stdc_trailing_ones_ Ns Em type Ns ()

lib/libc/stdbit/stdc_trailing_zeros.3

@@ -66,9 +66,9 @@ is returned.
 .Sh SEE ALSO
 .Xr ffs 3 ,
 .Xr stdbit 3 ,
+.Xr stdc_first_trailing_one 3 ,
 .Xr stdc_leading_zeros 3 ,
-.Xr stdc_trailing_ones 3 ,
-.Xr stdc_first_trailing_one 3
+.Xr stdc_trailing_ones 3
 .Sh STANDARDS
 The
 .Nm stdc_trailing_zeros_ Ns Em type Ns ()

lib/libc/stdio/printf.3

@@ -392,6 +392,12 @@ conversion:
 .It Sy Modifier Ta Cm c Ta Cm s
 .It Cm l No (ell) Ta Vt wint_t Ta Vt "wchar_t *"
 .El
+.Pp
+Compiler support for the
+.Cm w
+fixed-width integer type modifier is limited, and compilers may produce a
+warning when used (depending on compiler version and language standard
+settings).
 .It
 A character that specifies the type of conversion to be applied.
 .El

lib/libc/stdlib/malloc/free_sized.3

@@ -83,12 +83,12 @@ hints are used for performance and security benefits.
 That behaviour conforms to the practice recommended for each function in the
 C standard.
 .Sh SEE ALSO
-.Xr free 3 ,
-.Xr malloc 3 ,
-.Xr calloc 3 ,
-.Xr realloc 3 ,
 .Xr aligned_alloc 3 ,
-.Xr jemalloc 3
+.Xr calloc 3 ,
+.Xr free 3 ,
+.Xr jemalloc 3 ,
+.Xr malloc 3 ,
+.Xr realloc 3
 .Sh STANDARDS
 The
 .Fn free_sized

lib/libkvm/kvm_open.3

@@ -258,7 +258,6 @@ Full memory dumps have to be explicitly enabled by setting the
 .Xr sysctl 8
 to 0.
 .Sh SEE ALSO
-.Xr dumpon 8 ,
 .Xr close 2 ,
 .Xr open 2 ,
 .Xr kvm 3 ,
@@ -271,7 +270,8 @@ to 0.
 .Xr kvm_read 3 ,
 .Xr kvm_write 3 ,
 .Xr kmem 4 ,
-.Xr mem 4
+.Xr mem 4 ,
+.Xr dumpon 8
 .Sh BUGS
 There should not be three open calls.
 The ill-defined error semantics

lib/libsys/socket.2

@@ -488,13 +488,13 @@ The socket type is not supported by the protocol.
 .Xr send 2 ,
 .Xr sendmsg 2 ,
 .Xr sendto 2 ,
-.Xr signal 3 ,
 .Xr shutdown 2 ,
 .Xr socketpair 2 ,
 .Xr write 2 ,
 .Xr CMSG_DATA 3 ,
 .Xr getprotoent 3 ,
 .Xr netgraph 3 ,
+.Xr signal 3 ,
 .Xr divert 4 ,
 .Xr genetlink 4 ,
 .Xr icmp 4 ,

lib/msun/man/acospi.3

@@ -63,10 +63,10 @@ If
 .Fn acospi x
 raise an invalid exception and returns an \*(Na.
 .Sh SEE ALSO
+.Xr acos 3 ,
 .Xr asinpi 3 ,
 .Xr atanpi 3 ,
-.Xr acos 3 ,
-.Xr cospi 3 ,
+.Xr cospi 3
 .Sh STANDARDS
 The
 .Fn acospi ,

lib/msun/man/asinpi.3

@@ -64,9 +64,9 @@ If
 raises an invalid exception and returns an \*(Na.
 .Sh SEE ALSO
 .Xr acospi 3 ,
-.Xr atanpi 3 ,
 .Xr asin 3 ,
-.Xr sinpi 3 ,
+.Xr atanpi 3 ,
+.Xr sinpi 3
 .Sh STANDARDS
 The
 .Fn asinpi ,

lib/msun/man/fegetmode.3

@@ -55,8 +55,8 @@ and
 functions return 0 if they succeed, and non-zero otherwise;
 however, the present implementation always succeeds.
 .Sh SEE ALSO
-.Xr fenv 3 ,
 .Xr fegetround 3 ,
+.Xr fenv 3 ,
 .Xr fesetround 3
 .Sh STANDARDS
 The

lib/msun/man/fegetround.3

@@ -61,8 +61,8 @@ The
 function returns 0 on success and non-zero otherwise;
 however, the present implementation always succeeds.
 .Sh SEE ALSO
-.Xr fenv 3 ,
 .Xr fegetmode 3 ,
+.Xr fenv 3 ,
 .Xr fesetmode 3 ,
 .Xr fpgetround 3 ,
 .Xr fpsetround 3

lib/msun/man/fmaximum.3

@@ -84,8 +84,8 @@ is an \*(Na, then the result is an \*(Na.
 These routines do not raise any floating-point exceptions.
 .Sh SEE ALSO
 .Xr fmax 3 ,
-.Xr fmaximum_num 3 ,
 .Xr fmaximum_mag 3 ,
+.Xr fmaximum_num 3 ,
 .Xr math 3
 .Sh STANDARDS
 The

share/man/man3/pthread_signals_block_np.3

@@ -77,5 +77,5 @@ There are no errors reported by the functions.
 .Sh SEE ALSO
 .Xr sigfastblock 2 ,
 .Xr sigprocmask 2 ,
-.Xr pthread_sigmask 3 ,
-.Xr pthread_np 3
+.Xr pthread_np 3 ,
+.Xr pthread_sigmask 3

share/man/man3/stdbit.3

@@ -88,24 +88,24 @@ based on the type of
 .Fa value
 is provided.
 .Sh SEE ALSO
-.Xr arch 7 ,
 .Xr bitstring 3 ,
 .Xr ffs 3 ,
 .Xr fls 3 ,
-.Xr stdc_count_leading_zeros 3 ,
-.Xr stdc_count_leading_ones 3 ,
-.Xr stdc_count_trailing_zeros 3 ,
-.Xr stdc_count_trailing_ones 3 ,
-.Xr stdc_first_leading_zero 3 ,
-.Xr stdc_first_leading_one 3 ,
-.Xr stdc_first_trailing_zero 3 ,
-.Xr stdc_first_trailing_one 3 ,
-.Xr stdc_count_zeros 3 ,
-.Xr stdc_count_ones 3 ,
-.Xr stdc_has_single_bit 3 ,
-.Xr stdc_bit_width 3 ,
+.Xr stdc_bit_ceil 3 ,
 .Xr stdc_bit_floor 3 ,
-.Xr stdc_bit_ceil 3
+.Xr stdc_bit_width 3 ,
+.Xr stdc_count_leading_ones 3 ,
+.Xr stdc_count_leading_zeros 3 ,
+.Xr stdc_count_ones 3 ,
+.Xr stdc_count_trailing_ones 3 ,
+.Xr stdc_count_trailing_zeros 3 ,
+.Xr stdc_count_zeros 3 ,
+.Xr stdc_first_leading_one 3 ,
+.Xr stdc_first_leading_zero 3 ,
+.Xr stdc_first_trailing_one 3 ,
+.Xr stdc_first_trailing_zero 3 ,
+.Xr stdc_has_single_bit 3 ,
+.Xr arch 7
 .Sh STANDARDS
 The macros and functions of the
 .In stdbit.h

share/man/man4/dtrace_vfs.4

@@ -73,8 +73,8 @@ Check what lookups failed to be handled in a lockless manner:
 .Sh SEE ALSO
 .Xr dtrace 1 ,
 .Xr d 7 ,
-.Xr SDT 9 ,
 .Xr namei 9 ,
+.Xr SDT 9 ,
 .Xr VFS 9
 .Rs
 .%A Brendan Gregg

share/man/man4/mac.4

@@ -222,9 +222,9 @@ man page.
 .Xr mac_test 4 ,
 .Xr login.conf 5 ,
 .Xr maclabel 7 ,
-.Xr jail 8 ,
 .Xr getfmac 8 ,
 .Xr getpmac 8 ,
+.Xr jail 8 ,
 .Xr setfmac 8 ,
 .Xr setpmac 8 ,
 .Xr mac 9

share/man/man4/u2f.4

@@ -74,8 +74,8 @@ Default is 0.
 .El
 .Sh SEE ALSO
 .Xr uhid 4 ,
-.Xr usbhid 4 ,
-.Xr usb 4
+.Xr usb 4 ,
+.Xr usbhid 4
 .Sh HISTORY
 The
 .Nm

share/man/man7/environ.7

@@ -310,12 +310,12 @@ built-in command in
 .Xr cd 1 ,
 .Xr csh 1 ,
 .Xr env 1 ,
-.Xr err 3 ,
 .Xr ex 1 ,
 .Xr login 1 ,
 .Xr printenv 1 ,
 .Xr sh 1 ,
 .Xr execve 2 ,
+.Xr err 3 ,
 .Xr execle 3 ,
 .Xr getbsize 3 ,
 .Xr getenv 3 ,

share/man/man7/freebsd-base.7

@@ -273,9 +273,9 @@ This is a destructive action
 which will prevent updating the base system via
 .Xr pkg 8 .
 .Sh SEE ALSO
+.Xr src.conf 5 ,
 .Xr build 7 ,
-.Xr pkg 8 ,
-.Xr src.conf 5
+.Xr pkg 8
 .Sh HISTORY
 Support for installing the base system as packages was introduced in
 .Fx 15.0 .

share/man/man9/exterror.9

@@ -241,10 +241,10 @@ They pass
 .Vt kexterr
 from the failed request back to the thread that create the request.
 .Sh SEE ALSO
-.Xr errno 3 ,
 .Xr err 3 ,
+.Xr errno 3 ,
+.Xr uexterr 3 ,
 .Xr uexterr_gettext 3
-.Xr uexterr 3
 .Sh HISTORY
 The
 .Nm

share/man/man9/hashalloc.9

@@ -293,12 +293,12 @@ TAILQ_INSERT_HEAD(&table[hash].head, foo, next);
 hashfree(table, &args);
 .Ed
 .Sh SEE ALSO
+.Xr queue 3 ,
 .Xr malloc 9 ,
 .Xr mutex 9 ,
 .Xr rmlock 9 ,
 .Xr rwlock 9 ,
-.Xr sx 9 ,
-.Xr queue 3
+.Xr sx 9
 .Sh HISTORY
 The
 .Nm

share/man/man9/hashinit.9

@@ -184,8 +184,8 @@ pointed to by
 .Fa hashtbl
 is not empty.
 .Sh SEE ALSO
-.Xr hashalloc 9 ,
 .Xr LIST_HEAD 3 ,
+.Xr hashalloc 9 ,
 .Xr malloc 9
 .Sh BUGS
 There is no

sys/dev/amdsmu/amdsmu.c

@@ -320,6 +320,7 @@ amdsmu_resume_check(device_t dev, enum power_stype stype)
 	struct amdsmu_metrics *m = &sc->metrics;
 	bool any_blocking = false;
 	const struct amdsmu_diagnostics *d;
+	devclass_t dc;
 
 	if (stype != POWER_STYPE_SUSPEND_TO_IDLE)
 		return;
@@ -338,7 +339,11 @@ amdsmu_resume_check(device_t dev, enum power_stype stype)
 	    "failed to enter S0i3 during last suspend; "
 	    "battery drain will be excessive\n");
 
-	if (sc->product->amdsmu_deviceid != PCI_DEVICEID_AMD_PHOENIX_ROOT) {
+	switch (sc->product->amdsmu_deviceid) {
+	case PCI_DEVICEID_AMD_PHOENIX_ROOT:
+	case PCI_DEVICEID_AMD_KRACKAN_POINT_ROOT:
+		break;
+	default:
 		device_printf(dev, "only limited diagnostic information "
 		    "available for %x:%x; check dev.amdsmu.0 sysctl tree\n",
 		    sc->product->amdsmu_vendorid,
@@ -376,11 +381,13 @@ amdsmu_resume_check(device_t dev, enum power_stype stype)
 
 		if (d == NULL)
 			continue;
-		if (d->expected_module != NULL &&
-		    devclass_find(d->expected_module) == NULL)
-			device_printf(dev,
-			    "    hint: load %s to allow this block to "
-			    "suspend\n", d->expected_module);
+		if (d->expected_devclass != NULL) {
+			dc = devclass_find(d->expected_devclass);
+			if (dc == NULL || devclass_get_count(dc) == 0)
+				device_printf(dev,
+				    "    hint: load %s to allow this block to "
+				    "suspend\n", d->mod_to_load);
+		}
 		if (d->extra != NULL)
 			device_printf(dev, "    hint: %s\n", d->extra);
 	}

sys/dev/amdsmu/amdsmu.h

@@ -123,23 +123,28 @@ static const struct amdsmu_product {
 static const struct amdsmu_diagnostics {
 	const char	*blocking_ip_block;
 	bool		ignore;
-	const char	*expected_module;
+	const char	*expected_devclass;
+	/* mod_to_load must not be NULL if expected_devclass is not NULL. */
+	const char	*mod_to_load;
 	const char	*extra;
 } amdsmu_diagnostics[] = {
-	{ "CPU", false, NULL, "this can happen due to other IP blocks or "
+	{ "CPU", false, NULL, NULL, "this can happen due to other IP blocks or "
 	    "because the system was on AC power" },
-	{ "MPM", false, NULL, "this can happen due to other IP blocks or "
-	    "because the system was on AC power" },
-	{ "GFX", false, "amdgpu", NULL },
-	{ "DISPLAY", false, "amdgpu", NULL },
+	{ "MPM", false, NULL, NULL, "this can happen due to other IP blocks or "
+	    "because the CPU didn't properly idle" },
+	{ "GFX", false, "drmn", "amdgpu", NULL },
+	{ "DISPLAY", false, "drmn", "amdgpu", NULL },
 	/*
-	 * On Phoenix, these seem to report USB4, not USB3 as their names would
-	 * suggest.
+	 * On Phoenix and Krackan Point, these seem to report USB4, not USB3 as
+	 * their names would suggest.
 	 */
-	{ "USB3_0", false, "tb", "see thunderbolt(4)" },
-	{ "USB3_1", false, "tb", "see thunderbolt(4)" },
-	/* On Phoenix, the SMU seems to report garbage for this IP block. */
-	{ "USB4_0", true, NULL, NULL },
+	{ "USB3_0", false, "nhi", "tb", "see thunderbolt(4)" },
+	{ "USB3_1", false, "nhi", "tb", "see thunderbolt(4)" },
+	/*
+	 * On Phoenix and Krackan Point, the SMU seems to report garbage for
+	 * this IP block.
+	 */
+	{ "USB4_0", true, NULL, NULL, NULL },
 };
 
 struct amdsmu_softc {

sys/riscv/riscv/locore.S

@@ -127,7 +127,8 @@ _start:
 	 * starting from the first 2MB physical page into which the kernel was
 	 * loaded.
 	 *
-	 * We also use an L1 entry to create a 1GB identity map (1:1 PA->VA).
+	 * We also use L1 entries to create 1GB identity maps (1:1 PA->VA)
+	 * of the regions holding the kernel and the DTB.
 	 * This is useful for two reasons:
 	 *  - handling the DTB pointer passed from SBI firmware (physical addr)
 	 *  - simpler construction of pagetables in pmap_bootstrap()
@@ -162,6 +163,17 @@ pagetables:
 	add	t0, s1, a5
 	sd	t6, (t0)		/* Store new PTE */
 
+	/* Identity map the DTB's 1GB region too, if we were given a DTB */
+	beqz	s4, 1f
+	srli	s2, s4, L1_SHIFT	/* dtbp >> L1_SHIFT */
+	andi	a5, s2, Ln_ADDR_MASK	/* & Ln_ADDR_MASK */
+	slli	s2, s2, PTE_PPN2_S	/* (s2 << PTE_PPN2_S) */
+	or	t6, t4, s2
+	mulw	a5, a5, a6		/* calculate L1 slot */
+	add	t0, s1, a5
+	sd	t6, (t0)		/* Store new PTE */
+1:
+
 	/* Construct the virtual address space at KERNBASE */
 
 	/* Add L1 entry for kernel */
@@ -189,14 +201,14 @@ pagetables:
 	add	t3, t4, t2
 	li	t0, (PTE_KERN | PTE_X)
 	or	t0, t0, s8		/* t0 |= pte bits */
-1:
+2:
 	slli	t2, t4, PTE_PPN1_S	/* << PTE_PPN1_S */
 	or	t5, t0, t2
 	sd	t5, (s1)		/* Store PTE entry to position */
 	addi	s1, s1, PTE_SIZE
 
 	addi	t4, t4, 1
-	bltu	t4, t3, 1b
+	bltu	t4, t3, 2b
 
 	/* Page tables END */