From nobody Mon Jun 9 15:45:49 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 4bGGV54DLhz5y481; Mon, 09 Jun 2025 15:45:49 +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 4bGGV53K89z45Jh; Mon, 09 Jun 2025 15:45:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749483949; 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=I9QBDoGSc82gTYgkfCHIfPeSGoORY0hsZ5lPVG2lKxw=; b=RgsFJUfv2ujAqfjUeHbQg1UJ0rfJykmHjPNYMUdfvI9uOhZRTzO+jE/MQfqtAZRpoYB2Vt yLCE8q/cZfRjHkE6XYlfWjHEPDf/kL0PD07A2pafSkOkkPSLe1b7JtZ9ZMZmprC6dLWR1r JMFfXo2Z1VP4Byi2IvlM2DKloyqcKJShNK2A2g8u1Z/Xaq8xVZGAl+cmJgrFP5wzvUTuGE vPlGSDv83bh/twYWaMmUIr/fqrrHcUvyDZLagr3UX1vhvlKRD0Dv+udlXeHLZJ8G4BUt1K Pjzan4Jgetes+ttmSl0wFkc0uZv8Kk1X6LaqQnt4Lsuh/kYstCgCp62fmnnMng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749483949; 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=I9QBDoGSc82gTYgkfCHIfPeSGoORY0hsZ5lPVG2lKxw=; b=Y2UGPMRrZtB5tPQw01faqDfSYI1RG6hlwm7XDPhbqDg3a1LDLjDio9QUM48NjR686FBZKL SD8PR61s895Xh3zU78PAI3q3ltd6r0JkvDKjqkU7fbzvThtHBfUmLNaGEL0VCXxy2eEj/2 UJ0+LWap9g81yaD9Z2KP5EyDAGjpWtCpp9vDAOuwcAvdwAt9vfUYZ/T6XXuXAtZHRuAtOr r4PzQDNZ3Vh8Wut8ULikHr/zrc3DVh0krOIhq5s+0Vs0Ee0QO6WBFCWeke+29vynhoewKI c37nhqD7Ti+dZHbF/kyaa/Oh3RZnZs9B6LcamjqTeefbVvUv8hqUBdQ42rtLCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749483949; a=rsa-sha256; cv=none; b=NpfQlxpw+F5zdGRwQTswT1/X20kzTS3gX4qvxIsuZvu0q/sfMZPaWU5N6zz0eSf7j4HB7U dR8GosFZoGC4gb/P+OpmkGft7SyLE7+iJO6AWDh4lC3VG3pDJiSfg2rF0ELE+fuNdSs0gL yLp5fOMGjig+zbb9tSvVc+3CTA0auY/qVZDjySbQrD/6bNavGqGjNxCsdTn9uEVumzZaMn V4qvS5XYISoEY8opuPKxDli+KMhWeBr/glPPYeP0kyi7gVpaYsQfI9t185VwhqW+heTdgN hrC6jz4+YxJRfkBVx6Wqjn6GcDXk7NsOXLrAUDoK8NZoy6Noh1B21CGtL4uv8Q== 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 4bGGV52x3vz12Dd; Mon, 09 Jun 2025 15:45:49 +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 559Fjnle088171; Mon, 9 Jun 2025 15:45:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 559FjnUt088168; Mon, 9 Jun 2025 15:45:49 GMT (envelope-from git) Date: Mon, 9 Jun 2025 15:45:49 GMT Message-Id: <202506091545.559FjnUt088168@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: ea334b979422 - main - Revert "scmi: Add sysctl transport properties" 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: ea334b9794228c3afc641b7088d93b1e4049b519 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=ea334b9794228c3afc641b7088d93b1e4049b519 commit ea334b9794228c3afc641b7088d93b1e4049b519 Author: Andrew Turner AuthorDate: 2025-06-09 13:18:47 +0000 Commit: Andrew Turner CommitDate: 2025-06-04 01:32:38 +0000 Revert "scmi: Add sysctl transport properties" Revert to reapply series as some patches were incorrect versions This reverts commit e6d0edd2fe8c3c15faa7c9c66703efa007a5fbe1. --- sys/dev/firmware/arm/scmi.c | 13 ------------- sys/dev/firmware/arm/scmi.h | 3 --- 2 files changed, 16 deletions(-) diff --git a/sys/dev/firmware/arm/scmi.c b/sys/dev/firmware/arm/scmi.c index b27f7211201e..2d9f6fa89d4b 100644 --- a/sys/dev/firmware/arm/scmi.c +++ b/sys/dev/firmware/arm/scmi.c @@ -44,7 +44,6 @@ #include #include #include -#include #include #include @@ -190,7 +189,6 @@ static void scmi_process_response(struct scmi_softc *, uint32_t, int scmi_attach(device_t dev) { - struct sysctl_oid *sysctl_trans; struct scmi_softc *sc; phandle_t node; int error; @@ -211,17 +209,6 @@ scmi_attach(device_t dev) device_printf(dev, "Transport - max_msg:%d max_payld_sz:%lu reply_timo_ms:%d\n", SCMI_MAX_MSG(sc), SCMI_MAX_MSG_PAYLD_SIZE(sc), SCMI_MAX_MSG_TIMEOUT_MS(sc)); - sc->sysctl_root = SYSCTL_ADD_NODE(NULL, SYSCTL_STATIC_CHILDREN(_hw), - OID_AUTO, "scmi", CTLFLAG_RD, 0, "SCMI root"); - sysctl_trans = SYSCTL_ADD_NODE(NULL, SYSCTL_CHILDREN(sc->sysctl_root), - OID_AUTO, "transport", CTLFLAG_RD, 0, "SCMI Transport properties"); - SYSCTL_ADD_INT(NULL, SYSCTL_CHILDREN(sysctl_trans), OID_AUTO, "max_msg", - CTLFLAG_RD, &sc->trs_desc.max_msg, 0, "SCMI Max number of inflight messages"); - SYSCTL_ADD_INT(NULL, SYSCTL_CHILDREN(sysctl_trans), OID_AUTO, "max_msg_size", - CTLFLAG_RD, &sc->trs_desc.max_payld_sz, 0, "SCMI Max message payload size"); - SYSCTL_ADD_INT(NULL, SYSCTL_CHILDREN(sysctl_trans), OID_AUTO, "max_rx_timeout_ms", - CTLFLAG_RD, &sc->trs_desc.reply_timo_ms, 0, "SCMI Max message RX timeout ms"); - /* * Allow devices to identify. */ diff --git a/sys/dev/firmware/arm/scmi.h b/sys/dev/firmware/arm/scmi.h index fc52732bd503..990759237964 100644 --- a/sys/dev/firmware/arm/scmi.h +++ b/sys/dev/firmware/arm/scmi.h @@ -32,8 +32,6 @@ #ifndef _ARM64_SCMI_SCMI_H_ #define _ARM64_SCMI_SCMI_H_ -#include - #include "scmi_if.h" #define SCMI_DEF_MAX_MSG 32 @@ -66,7 +64,6 @@ struct scmi_softc { struct mtx mtx; struct scmi_transport_desc trs_desc; struct scmi_transport *trs; - struct sysctl_oid *sysctl_root; }; struct scmi_msg {