From: jsg <jsg@openbsd.org>
Date: Sat, 6 Aug 2022 03:12:19 +0000 (+0000)
Subject: match recent Intel CPUs in fw_update(8)
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=821053784af723da881046e5345e4f66bd4bbcf3;p=openbsd

match recent Intel CPUs in fw_update(8)

Intel CPUs mostly used to have processor name strings of the form
cpu0: Intel(R) Pentium(R) M processor 1.60GHz ("GenuineIntel" 686-class) 1.60 GHz, 06-0d-06
cpu0: Intel(R) Core(TM) i7-5600U CPU @ 2.60GHz, 2494.61 MHz, 06-3d-04
recent CPUs use
cpu0: 11th Gen Intel(R) Core(TM) i5-1130G7 @ 1.10GHz, 30009.37 MHz, 06-8c-01
cpu0: 12th Gen Intel(R) Core(TM) i5-12400, 4390.71 MHz, 06-97-02
cpu0: 12th Gen Intel(R) Core(TM) i7-1260P, 1995.55 MHz, 06-9a-03

change pattern used to handle this

also covers oddities such as
cpu0: Genuine Intel(R) CPU @ 600MHz, 600.10 MHz
cpu0: Genuine Intel(R) CPU @ 1.00GHz, 1000.13 MHz, 06-26-01
cpu0: Genuine Intel(R) CPU L2400 @ 1.66GHz ("GenuineIntel" 686-class) 1.67 GHz, 06-0e-08

test chips use "Genuine Intel(R) CPU 0000"
---

diff --git a/usr.sbin/fw_update/patterns.c b/usr.sbin/fw_update/patterns.c
index d7cbab70c16..ce4bf5e108c 100644
--- a/usr.sbin/fw_update/patterns.c
+++ b/usr.sbin/fw_update/patterns.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: patterns.c,v 1.3 2022/03/10 07:12:13 hastings Exp $	*/
+/*	$OpenBSD: patterns.c,v 1.4 2022/08/06 03:12:19 jsg Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou.  All rights reserved.
@@ -94,7 +94,7 @@ main(void)
 	printf("%s\n", "bwfm");
 	printf("%s\n", "bwi");
 	printf("%s\n", "intel");
-	printf("%s\n", "intel ^cpu0: Intel");
+	printf("%s\n", "intel ^cpu0:*Intel(R)");
 	printf("%s\n", "inteldrm");
 	print_devices("inteldrm", i915_devices, nitems(i915_devices));
 	printf("%s\n", "ipw");