From nobody Mon Jun 9 15:45:57 2025 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 4bGGVF4sy1z5y4bZ; Mon, 09 Jun 2025 15:45:57 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bGGVF2XgPz45cy; Mon, 09 Jun 2025 15:45:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749483957; 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=Zoq+wTmL6yaX7j3kUHNDGrYOubPZhoItMkew6fUkTgE=; b=rpKBOp1OklhTPzWiyEldBuHhxKXZc3ER4seuIYOeR/fVp2+RxCzgTdtplTOScouP3Q8K3i cRiVOEyEA1rfAViB1GAP7gfb+gex2M7zQ9ZsZc4bVjLww6wTQ7ECNSPYQTc+vdWnfbs2xx stxNN3KSRKyyGdQSlkOdCw8Y2w+2H468jCwntNqOI/RspFBiQucbJSMRFLGmwlJ9sL2YYJ IHFch91oADeItLZ2jqASvXOQo/HdfYqZ6mR5n7FjUbbxq0iN1aSWzvTuIUWqWTaNkMCuaX 6RAKay0VO4wZMSTx7qYlqGLTkfdn7xT9mweGP2L8CDINnmlI1WDnxrXtA4K73A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749483957; 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=Zoq+wTmL6yaX7j3kUHNDGrYOubPZhoItMkew6fUkTgE=; b=H1S3fv4ctKZeewmAknt4B+S7Ou5aYx2EnkNpHCG9fUOjzr/RimnaU4yjTJunDj9UG1cOiz AMoMWjjfdqtXRiSi+pCJj2Hatz2oxNRBu7PRJIHkNkKDNiWVe43ZM2yKeH6D6Qiex8NhvR Mw+WRLPbgZgPCE8uA+5dImc6ubQDfep+gRi7u5DXLsfcNAJmKZCIg8f8xIqRbPDuCyG963 enEssecygb6gTheV4Gww/iODRMp/5An2c2Z7OvwtcLL7vA59khJ+JulLE3gbQ8+ArefqXP IYlQUVliXgkSeUFBKc3JvPlK0SPHJZOA4tWUpiNoizl57P/a5tHg8dZkW2AFvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749483957; a=rsa-sha256; cv=none; b=VjpyQSZyKQRaJ8t8/5l2IXUhtY8Um1lW8DbVB3KB1tkDBgK/LADEFxoFfIk3yRvRuTf5g/ f0MAdmrRdvy+YHFcUH3dJCrw688ploOfiPoM+jMWInqYzUv1BeDS7jKoHEZgkB2ajh6lc2 OZCxSfqDlbiPi3duegcpAa8NTDAkthIy7T6axHewQhRHZXTpho8VMOLMj/YTLfdXWbiyx7 6TCZCgB4rCv57B5aaiPDI2y6xeDAcHHJcfetQ6Yo56/MohnyPeMQh2BhEZ+8Npe7ldEQ8Y aa+FNS5+QogHZoMBDGKdH1TDYNSyPdyb9xo2wF2rNU1fByDLW9ypJDyeIUZpmg== 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 4bGGVF28Mqz12Dh; Mon, 09 Jun 2025 15:45:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 559FjvdL088425; Mon, 9 Jun 2025 15:45:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 559FjvSS088422; Mon, 9 Jun 2025 15:45:57 GMT (envelope-from git) Date: Mon, 9 Jun 2025 15:45:57 GMT Message-Id: <202506091545.559FjvSS088422@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 3550c47a96b5 - main - Revert "scmi: Redefine max message payload size" 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3550c47a96b5cc6ab07fca7fdfbd9043f12f58c2 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=3550c47a96b5cc6ab07fca7fdfbd9043f12f58c2 commit 3550c47a96b5cc6ab07fca7fdfbd9043f12f58c2 Author: Andrew Turner AuthorDate: 2025-06-09 13:21:49 +0000 Commit: Andrew Turner CommitDate: 2025-06-04 01:32:39 +0000 Revert "scmi: Redefine max message payload size" Revert to reapply series as some patches were incorrect versions This reverts commit f0216239492579022982d94e04090f1333fee5a5. --- sys/dev/firmware/arm/scmi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/firmware/arm/scmi.h b/sys/dev/firmware/arm/scmi.h index 73b49f099ad8..5ad7b0db3f5f 100644 --- a/sys/dev/firmware/arm/scmi.h +++ b/sys/dev/firmware/arm/scmi.h @@ -36,8 +36,8 @@ #define SCMI_MAX_MSG 32 #define SCMI_MAX_MSG_PAYLD_SIZE 128 -#define SCMI_MAX_MSG_REPLY_SIZE (SCMI_MAX_MSG_PAYLD_SIZE + sizeof(uint32_t)) -#define SCMI_MAX_MSG_SIZE (SCMI_MAX_MSG_REPLY_SIZE + sizeof(uint32_t)) +#define SCMI_MAX_MSG_REPLY_SIZE (SCMI_MAX_MSG_PAYLD_SIZE - sizeof(uint32_t)) +#define SCMI_MAX_MSG_SIZE (SCMI_MAX_MSG_PAYLD_SIZE + sizeof(uint32_t)) enum scmi_chan { SCMI_CHAN_A2P,