From nobody Tue Feb 13 16:18:30 2024 X-Original-To: dev-commits-src-main@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 4TZ62G70rFz599Rt; Tue, 13 Feb 2024 16:18:30 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZ62G6WVfz4l1m; Tue, 13 Feb 2024 16:18:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707841110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d4MTj1xLAHiHjrMhDnO9aR12PwIwd++rMcvv06PF59c=; b=JOfNw/oa6zRjSLSlpKTwiLtprhIyUyf4ov082V4nfDH+y9h7gsX8JFiYFQuW6BIc4BxJJN 5JA1UmirBH81gD9abCHnLhcQoMBXJ3uy/WftuX7EIwiL2KgzbAuXmJFvgQ8PmSvM0klLeP u7yVNxprl083QY2ClDgOGf3Hy9m/4RBzO7TtBN5fmxlIz2D9Uh3t2lHTvkZ8nLBKACNmX2 m+9P5hIHxWASnjTKophGElMA2XxuhJ41U26Mm3+y0R+fOdGDLslA5RlBgNv7biKOsYHZfM MGGHB+jC9La8zJma/xivMZcFFPzodetkQMMvOR0MIbplNsfkxdDRQfxzyPAmKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707841110; a=rsa-sha256; cv=none; b=SOJhHzqnH8MDUrHNFtO/Njfj8D/oDhuizcFRVoLbPQWgf9zEykRLgCloZQohsx3q78IylO wrF6SXAxBYUzJq7uXTKX2PZHwsPB9BlFk6YALodZd3NK6JOXCbVu+WDcxIww2fwHKaRiqe 2SplHojP5AKDy7Oe6C6HSwxcijPpNpg7Hq05uuTKHu7vek4O37PUeN6ULX0YKop7a1Yc2m j5/YqGVUvEchqpNssI2RC8z4lF2mIaliLgmonBE+Z+QY9gOWzpL6GaBjCIchD4bpcXsZfB gFpwmz/rAKSLOiAzFXAv5bXsjEGl7uflSIXpng4pCRmVaQfN44dtbEZ4bKOyxw== 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=1707841110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d4MTj1xLAHiHjrMhDnO9aR12PwIwd++rMcvv06PF59c=; b=VlRZ6/5MTYBtsssqQWt6cE8xcHEzJ0fgKELb/GjUHbVi3DKgg3CnkhZ+n5YD7xHncLyL0g GMwnV10cybYRQY8LQn64ZqUnaIAMEfGAYmxM4LmhCcMOa6vb6f71ly+RZEkQVf3dII+MJl udw1HNYaLHDf6Sm6GsttcNFxY9IwlC1UsPXmu5VNnZn9noiITItZWuX9JBWEEnkrVU1ZWe P6q+oMVipxlLsYI+tk89lAXrEiVwKB7cVE7zqlBxm3ot6T1bFOUct/1qXAfeUcWQMIqvo/ 0mm1A1maElrusLWPKkzc/zQCpU25VNgP788DuSBgA6e/9QTR9IIfYlzgvTODHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZ62G5ZxmzMT1; Tue, 13 Feb 2024 16:18:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41DGIUSC087643; Tue, 13 Feb 2024 16:18:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DGIUgX087640; Tue, 13 Feb 2024 16:18:30 GMT (envelope-from git) Date: Tue, 13 Feb 2024 16:18:30 GMT Message-Id: <202402131618.41DGIUgX087640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Silvers Subject: git: fd24a63a38d0 - main - x86/ucode: add const where appropriate List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd24a63a38d0d4cb4f5041ef232036abe09d9d4f Auto-Submitted: auto-generated The branch main has been updated by chs: URL: https://cgit.FreeBSD.org/src/commit/?id=fd24a63a38d0d4cb4f5041ef232036abe09d9d4f commit fd24a63a38d0d4cb4f5041ef232036abe09d9d4f Author: Chuck Silvers AuthorDate: 2024-02-13 16:15:25 +0000 Commit: Chuck Silvers CommitDate: 2024-02-13 16:18:06 +0000 x86/ucode: add const where appropriate Sponsored by: Netflix Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43865 --- 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 1366c50f9ae5..8e9f8e113c40 100644 --- a/sys/x86/x86/ucode.c +++ b/sys/x86/x86/ucode.c @@ -50,14 +50,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, @@ -67,8 +67,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. */ @@ -103,7 +103,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]; @@ -140,9 +140,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)) @@ -160,7 +161,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) @@ -168,12 +169,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; @@ -186,7 +187,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; @@ -200,8 +201,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; @@ -317,7 +318,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;