The branch main has been updated by andrew:
URL:
https://cgit.FreeBSD.org/src/commit/?id=ea334b9794228c3afc641b7088d93b1e4049b519
commit ea334b9794228c3afc641b7088d93b1e4049b519
Author: Andrew Turner <and...@freebsd.org>
AuthorDate: 2025-06-09 13:18:47 +0000
Commit: Andrew Turner <and...@freebsd.org>
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 <sys/queue.h>
#include <sys/refcount.h>
#include <sys/sdt.h>
-#include <sys/sysctl.h>
#include <sys/taskqueue.h>
#include <dev/clk/clk.h>
@@ -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 <sys/sysctl.h>
-
#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 {
