git: 341d8fd90fa0 - main - scmi: Refactor scmi_request internal logic

[Andrew Turner]

The branch main has been updated by andrew:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=341d8fd90fa084d074059051478657cb45e53402

commit 341d8fd90fa084d074059051478657cb45e53402
Author:     Cristian Marussi <cristian.maru...@arm.com>
AuthorDate: 2025-01-23 13:24:39 +0000
Commit:     Andrew Turner <and...@freebsd.org>
CommitDate: 2025-01-23 17:26:27 +0000

    scmi: Refactor scmi_request internal logic
    
    Split scmi_request internals into a TX and an RX phase, which will be
    called, anyway, in sequence as before when a normal transmission is
    requested.
    
    No functional change.
    
    Tested on:      Arm Morello Board
    Reviewed by:    andrew
    Sponsored by:   Arm Ltd
    Differential Revision:  https://reviews.freebsd.org/D47425
    Signed-off-by: Cristian Marussi <cristian.maru...@arm.com>
---
 sys/dev/firmware/arm/scmi.c | 24 ++++++++++++++++++++++--
 sys/dev/firmware/arm/scmi.h |  1 +
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/sys/dev/firmware/arm/scmi.c b/sys/dev/firmware/arm/scmi.c
index c24768a5668a..950bbf94eeb6 100644
--- a/sys/dev/firmware/arm/scmi.c
+++ b/sys/dev/firmware/arm/scmi.c
@@ -717,7 +717,7 @@ scmi_msg_put(device_t dev, struct scmi_msg *msg)
 }
 
 int
-scmi_request(device_t dev, void *in, void **out)
+scmi_request_tx(device_t dev, void *in)
 {
        struct scmi_softc *sc;
        struct scmi_req *req;
@@ -732,8 +732,11 @@ scmi_request(device_t dev, void *in, void **out)
 
        /* Set inflight and send using transport specific method - refc-2 */
        error = scmi_req_track_inflight(sc, req);
-       if (error != 0)
+       if (error != 0) {
+               device_printf(dev, "Failed to build req with HDR |%0X|\n",
+                   req->msg.hdr);
                return (error);
+       }
 
        error = SCMI_XFER_MSG(sc->dev, &req->msg);
        if (error != 0) {
@@ -741,5 +744,22 @@ scmi_request(device_t dev, void *in, void **out)
                return (error);
        }
 
+       return (0);
+}
+
+int
+scmi_request(device_t dev, void *in, void **out)
+{
+       struct scmi_softc *sc;
+       struct scmi_req *req;
+       int error;
+
+       error = scmi_request_tx(dev, in);
+       if (error != 0)
+               return (error);
+
+       sc = device_get_softc(dev);
+       req = buf_to_req(in);
+
        return (scmi_wait_for_response(sc, req, out));
 }
diff --git a/sys/dev/firmware/arm/scmi.h b/sys/dev/firmware/arm/scmi.h
index f6aa072caeca..f5b4173272bb 100644
--- a/sys/dev/firmware/arm/scmi.h
+++ b/sys/dev/firmware/arm/scmi.h
@@ -83,6 +83,7 @@ void scmi_buf_put(device_t dev, void *buf);
 struct scmi_msg *scmi_msg_get(device_t dev, int tx_payld_sz, int rx_payld_sz);
 void scmi_msg_put(device_t dev, struct scmi_msg *msg);
 int scmi_request(device_t dev, void *in, void **);
+int scmi_request_tx(device_t dev, void *in);
 void scmi_rx_irq_callback(device_t dev, void *chan, uint32_t hdr, uint32_t 
rx_len);
 
 DECLARE_CLASS(scmi_driver);