From nobody Tue Jul 14 14:56:06 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4h02SD33qqz6kqdf for ; Tue, 14 Jul 2026 14:56:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h02SD0ThTz3LgC for ; Tue, 14 Jul 2026 14:56:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784040972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZNRJQJTR2/kNPzxSQBu1aFs/5Ib1/5vLLefg1TLzpXk=; b=NDzOFUIWsr1c5veo5+l1zYENzUw2WEGhvZPzp/e/ZVAAE0nsVTOOt9vHZQCsQ85QKnL6FX YAzbfd7tBSfCoyySw8IOSW7n73jEZPtzskupQKDcJC5UEQdynOOo+XZuNALiXJsD5462An ztj5f55CTZozlJHuOIBWJIystAi9Rlv+so923ssumZU+TTSuVW4PW4EBDVcPF2juVjGv2W 8+tjxPft30F2CXJtxEmG2d8/RBCgkrpBZXfntAGZT8Jb13hktOcOVLr7KXrvD7hAhQTq59 VUSl3btcKPg2uIlTXSn78Qjsd5rsk2p88do8OgxvuuyVHECBC60/2zGIY0yXaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784040972; a=rsa-sha256; cv=none; b=UE65UcXCkghASSV3mvf/sedvjN1oxrasr9MIZq76jxBazIHOKH+2EyyW7O46OvxLBV8Ss9 sqNrWpHBaJavjmhmnoPTHJ3q0p0X8X2yWgr2MyYx32pTMVzK8scsmrw84q1564S397yc3O 7b0M30vskGo4Il8G+PIWyTNIDXZIlbvLBVwW0DMrawgJybMF6j0IVEFyyf719JW4lZAWcD K1BsuSMZ5bVF/tBorrWA2Cn+LECIOQJD0zSkwy/W6b6N0tCvcgXf8IJney4V2OhXQj2525 9F90hPQ0NNDbt4MBZkI5cXNC+eSMzEZAMGhb1h5KL59l7mwtcmBQPlflJ85PFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784040972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZNRJQJTR2/kNPzxSQBu1aFs/5Ib1/5vLLefg1TLzpXk=; b=HVokmipP20vcpvO0nGRfyop233VMkGORJ4GDdO8rjcdm3uG5n6ZRDTaQZQhdt2QkyWG7Qt 0VfuXAaR70/YhnmxiGADlbG4GBg4iEk3+QfIt+SaIjxFw9yljiVQ4PkRTVRrVEvsWF/OND oMla8OkLtENNzIUMkVPiQHIFGgqY1GfkLdqC1u5ur1RnfomsBS4pRRH90dfkauyYNJKkdm yURkO1qHdQQqynObt5iH7aMIEr+peuzz4RIJ5UP9OTDWPs3yherk1fzV4O/+2kWwLOHCHl Omme+oNcD/txj5i7ju4gfjiZ3R1KZQfbsI/DvKeXmhmTFXzJKmAzKLmpINv71w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h02SC5l3mzpn1 for ; Tue, 14 Jul 2026 14:56:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d688 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Jul 2026 14:56:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Chuck Silvers From: Mark Johnston Subject: git: 1e857a99478b - stable/14 - x86/ucode: add const where appropriate List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1e857a99478b77b862380d5f64c127bde0f7c9ac Auto-Submitted: auto-generated Date: Tue, 14 Jul 2026 14:56:06 +0000 Message-Id: <6a564e06.3d688.5f1ad6a7@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1e857a99478b77b862380d5f64c127bde0f7c9ac commit 1e857a99478b77b862380d5f64c127bde0f7c9ac Author: Chuck Silvers AuthorDate: 2024-02-13 16:15:25 +0000 Commit: Mark Johnston CommitDate: 2026-07-14 13:02:07 +0000 x86/ucode: add const where appropriate Sponsored by: Netflix Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43865 (cherry picked from commit fd24a63a38d0d4cb4f5041ef232036abe09d9d4f) --- sys/x86/include/ucode.h | 2 +- sys/x86/x86/ucode.c | 40 +++++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/sys/x86/include/ucode.h b/sys/x86/include/ucode.h index cf9c756fc8f3..e97d41c89ed0 100644 --- a/sys/x86/include/ucode.h +++ b/sys/x86/include/ucode.h @@ -56,7 +56,7 @@ struct ucode_intel_extsig_table { } entries[0]; }; -int ucode_intel_load(void *data, bool unsafe, +int ucode_intel_load(const void *data, bool unsafe, uint64_t *nrevp, uint64_t *orevp); size_t ucode_load_bsp(uintptr_t free); void ucode_load_ap(int cpu); diff --git a/sys/x86/x86/ucode.c b/sys/x86/x86/ucode.c index ee398921a243..298ce5448853 100644 --- a/sys/x86/x86/ucode.c +++ b/sys/x86/x86/ucode.c @@ -51,14 +51,14 @@ #include #include -static void *ucode_intel_match(uint8_t *data, size_t *len); -static int ucode_intel_verify(struct ucode_intel_header *hdr, +static const void *ucode_intel_match(const uint8_t *data, size_t *len); +static int ucode_intel_verify(const struct ucode_intel_header *hdr, size_t resid); static struct ucode_ops { const char *vendor; - int (*load)(void *, bool, uint64_t *, uint64_t *); - void *(*match)(uint8_t *, size_t *); + int (*load)(const void *, bool, uint64_t *, uint64_t *); + const void *(*match)(const uint8_t *, size_t *); } loaders[] = { { .vendor = INTEL_VENDOR_ID, @@ -68,8 +68,8 @@ static struct ucode_ops { }; /* Selected microcode update data. */ -static void *early_ucode_data; -static void *ucode_data; +static const void *early_ucode_data; +static const void *ucode_data; static struct ucode_ops *ucode_loader; /* Variables used for reporting success or failure. */ @@ -104,7 +104,7 @@ log_msg(void *arg __unused) SYSINIT(ucode_log, SI_SUB_CPU, SI_ORDER_FIRST, log_msg, NULL); int -ucode_intel_load(void *data, bool unsafe, uint64_t *nrevp, uint64_t *orevp) +ucode_intel_load(const void *data, bool unsafe, uint64_t *nrevp, uint64_t *orevp) { uint64_t nrev, orev; uint32_t cpuid[4]; @@ -141,9 +141,10 @@ ucode_intel_load(void *data, bool unsafe, uint64_t *nrevp, uint64_t *orevp) } static int -ucode_intel_verify(struct ucode_intel_header *hdr, size_t resid) +ucode_intel_verify(const struct ucode_intel_header *hdr, size_t resid) { - uint32_t cksum, *data, size; + const uint32_t *data; + uint32_t cksum, size; int i; if (resid < sizeof(struct ucode_intel_header)) @@ -161,7 +162,7 @@ ucode_intel_verify(struct ucode_intel_header *hdr, size_t resid) return (1); cksum = 0; - data = (uint32_t *)hdr; + data = (const uint32_t *)hdr; for (i = 0; i < size / sizeof(uint32_t); i++) cksum += data[i]; if (cksum != 0) @@ -169,12 +170,12 @@ ucode_intel_verify(struct ucode_intel_header *hdr, size_t resid) return (0); } -static void * -ucode_intel_match(uint8_t *data, size_t *len) +static const void * +ucode_intel_match(const uint8_t *data, size_t *len) { - struct ucode_intel_header *hdr; - struct ucode_intel_extsig_table *table; - struct ucode_intel_extsig *entry; + const struct ucode_intel_header *hdr; + const struct ucode_intel_extsig_table *table; + const struct ucode_intel_extsig *entry; uint64_t platformid; size_t resid; uint32_t data_size, flags, regs[4], sig, total_size; @@ -187,7 +188,7 @@ ucode_intel_match(uint8_t *data, size_t *len) flags = 1 << ((platformid >> 50) & 0x7); for (resid = *len; resid > 0; data += total_size, resid -= total_size) { - hdr = (struct ucode_intel_header *)data; + hdr = (const struct ucode_intel_header *)data; if (ucode_intel_verify(hdr, resid) != 0) { ucode_error = VERIFICATION_FAILED; break; @@ -201,8 +202,8 @@ ucode_intel_match(uint8_t *data, size_t *len) total_size = UCODE_INTEL_DEFAULT_DATA_SIZE + sizeof(struct ucode_intel_header); if (data_size > total_size + sizeof(struct ucode_intel_header)) - table = (struct ucode_intel_extsig_table *) - ((uint8_t *)(hdr + 1) + data_size); + table = (const struct ucode_intel_extsig_table *) + ((const uint8_t *)(hdr + 1) + data_size); else table = NULL; @@ -318,7 +319,8 @@ ucode_load_bsp(uintptr_t free) uint32_t regs[4]; char vendor[13]; } cpuid; - uint8_t *addr, *fileaddr, *match; + const uint8_t *fileaddr, *match; + uint8_t *addr; char *type; uint64_t nrev, orev; caddr_t file;