The branch main has been updated by andrew:
URL:
https://cgit.FreeBSD.org/src/commit/?id=04a83b8b5e5b2d68649743739e07f7da5699d838
commit 04a83b8b5e5b2d68649743739e07f7da5699d838
Author: Andrew Turner <and...@freebsd.org>
AuthorDate: 2025-06-09 13:21:46 +0000
Commit: Andrew Turner <and...@freebsd.org>
CommitDate: 2025-06-04 01:32:39 +0000
Revert "scmi: Add devicetree transport properties"
Revert to reapply series as some patches were incorrect versions
This reverts commit 103ea03e6713a0f3bb874472fbd9fd81e2278805.
---
sys/dev/firmware/arm/scmi.c | 52 +++++++++++++-------------------------
sys/dev/firmware/arm/scmi.h | 14 +++-------
sys/dev/firmware/arm/scmi_virtio.c | 12 ++++-----
3 files changed, 27 insertions(+), 51 deletions(-)
diff --git a/sys/dev/firmware/arm/scmi.c b/sys/dev/firmware/arm/scmi.c
index cf5a678370fd..00a229762414 100644
--- a/sys/dev/firmware/arm/scmi.c
+++ b/sys/dev/firmware/arm/scmi.c
@@ -127,8 +127,7 @@ struct scmi_transport {
struct mtx mtx;
};
-static void scmi_transport_configure(struct scmi_transport_desc *,
phandle_t);
-static int scmi_transport_init(struct scmi_softc *, phandle_t);
+static int scmi_transport_init(struct scmi_softc *);
static void scmi_transport_cleanup(struct scmi_softc *);
static struct scmi_reqs_pool *scmi_reqs_pool_allocate(const int, const int);
static void scmi_reqs_pool_free(struct scmi_reqs_pool *);
@@ -166,12 +165,12 @@ scmi_attach(device_t dev)
simplebus_init(dev, node);
- error = scmi_transport_init(sc, node);
+ error = scmi_transport_init(sc);
if (error != 0)
return (error);
- 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));
+ device_printf(dev, "Transport reply timeout initialized to %dms\n",
+ sc->trs_desc.reply_timo_ms);
/*
* Allow devices to identify.
@@ -249,42 +248,29 @@ scmi_reqs_pool_free(struct scmi_reqs_pool *rp)
free(rp, M_DEVBUF);
}
-static void
-scmi_transport_configure(struct scmi_transport_desc *td, phandle_t node)
-{
- if (OF_getencprop(node, "arm,max-msg", &td->max_msg,
sizeof(td->max_msg)) == -1)
- td->max_msg = SCMI_DEF_MAX_MSG;
-
- if (OF_getencprop(node, "arm,max-msg-size", &td->max_payld_sz,
- sizeof(td->max_payld_sz)) == -1)
- td->max_payld_sz = SCMI_DEF_MAX_MSG_PAYLD_SIZE;
-}
-
static int
-scmi_transport_init(struct scmi_softc *sc, phandle_t node)
+scmi_transport_init(struct scmi_softc *sc)
{
- struct scmi_transport_desc *td = &sc->trs_desc;
struct scmi_transport *trs;
int ret;
trs = malloc(sizeof(*trs), M_DEVBUF, M_ZERO | M_WAITOK);
- scmi_transport_configure(td, node);
-
BIT_FILL(SCMI_MAX_TOKEN, &trs->avail_tokens);
mtx_init(&trs->mtx, "tokens", "SCMI", MTX_SPIN);
- trs->inflight_ht = hashinit(td->max_msg, M_DEVBUF, &trs->inflight_mask);
+ trs->inflight_ht = hashinit(SCMI_MAX_MSG, M_DEVBUF,
+ &trs->inflight_mask);
trs->chans[SCMI_CHAN_A2P] =
- scmi_reqs_pool_allocate(td->max_msg, td->max_payld_sz);
+ scmi_reqs_pool_allocate(SCMI_MAX_MSG, SCMI_MAX_MSG_PAYLD_SIZE);
if (trs->chans[SCMI_CHAN_A2P] == NULL) {
free(trs, M_DEVBUF);
return (ENOMEM);
}
trs->chans[SCMI_CHAN_P2A] =
- scmi_reqs_pool_allocate(td->max_msg, td->max_payld_sz);
+ scmi_reqs_pool_allocate(SCMI_MAX_MSG, SCMI_MAX_MSG_PAYLD_SIZE);
if (trs->chans[SCMI_CHAN_P2A] == NULL) {
scmi_reqs_pool_free(trs->chans[SCMI_CHAN_A2P]);
free(trs, M_DEVBUF);
@@ -300,13 +286,8 @@ scmi_transport_init(struct scmi_softc *sc, phandle_t node)
return (ret);
}
- /* Use default transport timeout if not overridden by OF */
- OF_getencprop(node, "arm,max-rx-timeout-ms", &td->reply_timo_ms,
- sizeof(td->reply_timo_ms));
-
return (0);
}
-
static void
scmi_transport_cleanup(struct scmi_softc *sc)
{
@@ -374,7 +355,7 @@ scmi_req_put(struct scmi_softc *sc, struct scmi_req *req)
{
mtx_lock_spin(&req->mtx);
if (!refcount_release_if_not_last(&req->cnt)) {
- bzero(&req->msg, sizeof(req->msg) +
SCMI_MAX_MSG_PAYLD_SIZE(sc));
+ bzero(&req->msg, sizeof(req->msg) + SCMI_MAX_MSG_PAYLD_SIZE);
scmi_req_free_unlocked(sc, SCMI_CHAN_A2P, req);
}
mtx_unlock_spin(&req->mtx);
@@ -551,13 +532,13 @@ scmi_rx_irq_callback(device_t dev, void *chan, uint32_t
hdr, uint32_t rx_len)
static int
scmi_wait_for_response(struct scmi_softc *sc, struct scmi_req *req, void **out)
{
- unsigned int reply_timo_ms = SCMI_MAX_MSG_TIMEOUT_MS(sc);
int ret;
if (req->msg.polling) {
bool needs_drop;
- ret = SCMI_POLL_MSG(sc->dev, &req->msg, reply_timo_ms);
+ ret = SCMI_POLL_MSG(sc->dev, &req->msg,
+ sc->trs_desc.reply_timo_ms);
/*
* Drop reference to successfully polled req unless it had
* already also been processed on the IRQ path.
@@ -576,7 +557,8 @@ scmi_wait_for_response(struct scmi_softc *sc, struct
scmi_req *req, void **out)
le32toh(req->msg.hdr), le32toh(req->header));
}
} else {
- ret = tsleep(req, 0, "scmi_wait4", (reply_timo_ms * hz) / 1000);
+ ret = tsleep(req, 0, "scmi_wait4",
+ (sc->trs_desc.reply_timo_ms * hz) / 1000);
/* Check for lost wakeups since there is no associated lock */
mtx_lock_spin(&req->mtx);
if (ret != 0 && req->done)
@@ -609,8 +591,8 @@ scmi_buf_get(device_t dev, uint8_t protocol_id, uint8_t
message_id,
sc = device_get_softc(dev);
- if (tx_payld_sz > SCMI_MAX_MSG_PAYLD_SIZE(sc) ||
- rx_payld_sz > SCMI_MAX_MSG_REPLY_SIZE(sc)) {
+ if (tx_payld_sz > SCMI_MAX_MSG_PAYLD_SIZE ||
+ rx_payld_sz > SCMI_MAX_MSG_REPLY_SIZE) {
device_printf(dev, "Unsupported payload size. Drop.\n");
return (NULL);
}
@@ -624,7 +606,7 @@ scmi_buf_get(device_t dev, uint8_t protocol_id, uint8_t
message_id,
req->message_id = message_id & SCMI_HDR_MESSAGE_ID_BF;
req->msg.tx_len = sizeof(req->msg.hdr) + tx_payld_sz;
req->msg.rx_len = rx_payld_sz ?
- rx_payld_sz + 2 * sizeof(uint32_t) : SCMI_MAX_MSG_SIZE(sc);
+ rx_payld_sz + 2 * sizeof(uint32_t) : SCMI_MAX_MSG_SIZE;
return (&req->msg.payld[0]);
}
diff --git a/sys/dev/firmware/arm/scmi.h b/sys/dev/firmware/arm/scmi.h
index 135b49c3b05b..73b49f099ad8 100644
--- a/sys/dev/firmware/arm/scmi.h
+++ b/sys/dev/firmware/arm/scmi.h
@@ -34,14 +34,10 @@
#include "scmi_if.h"
-#define SCMI_DEF_MAX_MSG 32
-#define SCMI_DEF_MAX_MSG_PAYLD_SIZE 128
-
-#define SCMI_MAX_MSG_PAYLD_SIZE(sc) ((sc)->trs_desc.max_payld_sz +
sizeof(uint32_t))
-#define SCMI_MAX_MSG_REPLY_SIZE(sc) (SCMI_MAX_MSG_PAYLD_SIZE((sc)) +
sizeof(uint32_t))
-#define SCMI_MAX_MSG_SIZE(sc) (SCMI_MAX_MSG_REPLY_SIZE(sc) +
sizeof(uint32_t))
-#define SCMI_MAX_MSG(sc) ((sc)->trs_desc.max_msg)
-#define SCMI_MAX_MSG_TIMEOUT_MS(sc) ((sc)->trs_desc.reply_timo_ms)
+#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))
enum scmi_chan {
SCMI_CHAN_A2P,
@@ -51,8 +47,6 @@ enum scmi_chan {
struct scmi_transport_desc {
bool no_completion_irq;
- unsigned int max_msg;
- unsigned int max_payld_sz;
unsigned int reply_timo_ms;
};
diff --git a/sys/dev/firmware/arm/scmi_virtio.c
b/sys/dev/firmware/arm/scmi_virtio.c
index 5252ad9cf9a4..8714fee2ec87 100644
--- a/sys/dev/firmware/arm/scmi_virtio.c
+++ b/sys/dev/firmware/arm/scmi_virtio.c
@@ -83,19 +83,19 @@ static void *
scmi_virtio_p2a_pool_init(device_t dev, unsigned int max_msg)
{
struct scmi_virtio_softc *sc;
- unsigned int max_msg_sz;
void *pool;
uint8_t *buf;
int i;
sc = device_get_softc(dev);
- max_msg_sz = SCMI_MAX_MSG_SIZE(&sc->base);
- pool = mallocarray(max_msg, max_msg_sz, M_DEVBUF, M_ZERO | M_WAITOK);
- for (i = 0, buf = pool; i < max_msg; i++, buf += max_msg_sz) {
+ pool = mallocarray(max_msg, SCMI_MAX_MSG_SIZE, M_DEVBUF,
+ M_ZERO | M_WAITOK);
+
+ for (i = 0, buf = pool; i < max_msg; i++, buf += SCMI_MAX_MSG_SIZE) {
/* Feed platform with pre-allocated P2A buffers */
virtio_scmi_message_enqueue(sc->virtio_dev,
- VIRTIO_SCMI_CHAN_P2A, buf, 0, max_msg_sz);
+ VIRTIO_SCMI_CHAN_P2A, buf, 0, SCMI_MAX_MSG_SIZE);
}
device_printf(dev,
@@ -111,7 +111,7 @@ scmi_virtio_clear_channel(device_t dev, void *msg)
sc = device_get_softc(dev);
virtio_scmi_message_enqueue(sc->virtio_dev, VIRTIO_SCMI_CHAN_P2A,
- msg, 0, SCMI_MAX_MSG_SIZE(&sc->base));
+ msg, 0, SCMI_MAX_MSG_SIZE);
}
static int
