CVS commit: src/usr.sbin/cpuctl

[Thomas Klausner]

Module Name:    src
Committed By:   wiz
Date:           Tue Sep 12 20:43:38 UTC 2023

Modified Files:
        src/usr.sbin/cpuctl: cpuctl.c
        src/usr.sbin/cpuctl/arch: i386.c

Log Message:
cpuctl: be more verbose about problems and diagnosing them


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/usr.sbin/cpuctl/cpuctl.c
cvs rdiff -u -r1.139 -r1.140 src/usr.sbin/cpuctl/arch/i386.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.sbin/cpuctl/cpuctl.c
diff -u src/usr.sbin/cpuctl/cpuctl.c:1.33 src/usr.sbin/cpuctl/cpuctl.c:1.34
--- src/usr.sbin/cpuctl/cpuctl.c:1.33	Mon Mar  6 01:28:54 2023
+++ src/usr.sbin/cpuctl/cpuctl.c	Tue Sep 12 20:43:38 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpuctl.c,v 1.33 2023/03/06 01:28:54 kre Exp $	*/
+/*	$NetBSD: cpuctl.c,v 1.34 2023/09/12 20:43:38 wiz Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2008, 2009, 2012, 2015 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #ifndef lint
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: cpuctl.c,v 1.33 2023/03/06 01:28:54 kre Exp $");
+__RCSID("$NetBSD: cpuctl.c,v 1.34 2023/09/12 20:43:38 wiz Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -247,7 +247,8 @@ cpu_ucode(char **argv)
 		cpuset_destroy(cpuset);
 	}
 	error = ioctl(fd, IOC_CPU_UCODE_APPLY, &uc);
-	if (error < 0 && (verbose || errno != EEXIST)) {
+        if (error < 0 && (verbose || errno != EEXIST)) {
+                warnx("please also check dmesg(8) output for additional error information");
 		if (uc.fwname[0])
 			err(EXIT_FAILURE, "%s", uc.fwname);
 		else

Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.139 src/usr.sbin/cpuctl/arch/i386.c:1.140
--- src/usr.sbin/cpuctl/arch/i386.c:1.139	Fri Jul 21 10:26:36 2023
+++ src/usr.sbin/cpuctl/arch/i386.c	Tue Sep 12 20:43:38 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: i386.c,v 1.139 2023/07/21 10:26:36 msaitoh Exp $	*/
+/*	$NetBSD: i386.c,v 1.140 2023/09/12 20:43:38 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.139 2023/07/21 10:26:36 msaitoh Exp $");
+__RCSID("$NetBSD: i386.c,v 1.140 2023/09/12 20:43:38 wiz Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -2584,8 +2584,8 @@ ucodeupdate_check(int fd, struct cpu_uco
 
 	switch (loader_version) {
 	case CPU_UCODE_LOADER_AMD:
-		if (uc->cpu_nr != -1) {
-			/* printf? */
+                if (uc->cpu_nr != -1) {
+                        warnx("ucode updates on AMD can only be done on all CPUs at once");
 			return -1;
 		}
 		uc->cpu_nr = CPU_UCODE_ALL_CPUS;