From nobody Thu Jan 23 17:27:37 2025 X-Original-To: dev-commits-src-all@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 4Yf7Dp0CW8z5lD8M; Thu, 23 Jan 2025 17:27:38 +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 4Yf7Dn3qj4z43rT; Thu, 23 Jan 2025 17:27:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737653257; 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=UgTYKRlP/iQGQ321pODW58ZjoTzn0OHIPldmToSqKiE=; b=NkO/nvXgcO8UdqwXD4ipAJuUrftDHcZ8RRTPKxJ5050D5cY4VZIOTFNdDhFmEUlbSWH0YS tujyK7VpP7Rwva6IlY4hvCpsSJgD4sKar9wrwFLis4LBgRMkTBIdVq92f2/zZK0xCx5Euo Dq4Z8SJRtANYbMj5QpVz3UtPdE9h82DWr3DrktEOkgT8O2SY+ZPhEFAZx2LsB2Qumf6P+3 foDn+T+XuM6Lh2+UCexxDhL0QcHAFWb2/jkHpUoR+u17pMN2oC1hNXlxdeEUShtwW/0JlC LBs2GGyqXyG745wQk/y/WsFcwYGa22qKBZqoWsxG/g5IjDcpu1KDRWlRNVKh3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737653257; 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=UgTYKRlP/iQGQ321pODW58ZjoTzn0OHIPldmToSqKiE=; b=Nki0u9xoWFOwJ+nwUAsHdEJTIj6JzuAk9J0w2Ba11J1IQVlLOscsQPpNjcM1yzo9HFG12e GyJa+Zrxv7AzrETSH4twBmM2IfwfKFNEMJLkXZwq0+nnhNg+BtMUtCsiHuWvmIDUsXlfyy qDpyiJ3RJ20LXJLsGTsKBK0MXFx+0bD9Fqnuu1YpE8Ye/hHkBWN7ojVvDxk56I+XMpUJPZ 5Loue5yPN4QEzMt690SeD8Hj1BZ1V3sovPkezDNKaRuml9jr3LQYubvDFPJZqoHXza7u3U 0lMX2u1dtudfm9fC7gYgSOjFzUcOKUVGtSHI0Ihv3gm59XtXCen0L+MRI26/5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737653257; a=rsa-sha256; cv=none; b=GfSxDiFWv0xfYM+cOl/ZTDRzdRo741Xiqv4wLsNLodtnifPE4MLrcFBLx0K73lGn2rkKyb AjcGBwIXDZ5IOaw/gIRu4bbxavouyTcwt/VNW8wVBDhvbArnQ6uNtebOG1tBt+tK0DyV4E ufwW0r0lPj1BmQ/eCAtMMfEYFoF+9b50NToHGyB8b6NOoKQ/BE5ee0YdIcxGMu4O+5OK2E Mu6Sfs+bn5W2DLxjJMSahezh4FcKmczUfzumJZKbDMJhnts06zLsy6BCYXJBEDbNu2Tgqu KPREGkomJJUu+ddYwr1nyCx7VpkaZTFVC89T6i2fU5cBj0kn+tnPa1YuiaaQlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yf7Dn36v1zpF7; Thu, 23 Jan 2025 17:27:37 +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 50NHRbuw022778; Thu, 23 Jan 2025 17:27:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50NHRbMs022775; Thu, 23 Jan 2025 17:27:37 GMT (envelope-from git) Date: Thu, 23 Jan 2025 17:27:37 GMT Message-Id: <202501231727.50NHRbMs022775@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: 341d8fd90fa0 - main - scmi: Refactor scmi_request internal logic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 341d8fd90fa084d074059051478657cb45e53402 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=341d8fd90fa084d074059051478657cb45e53402 commit 341d8fd90fa084d074059051478657cb45e53402 Author: Cristian Marussi AuthorDate: 2025-01-23 13:24:39 +0000 Commit: Andrew Turner 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 --- 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);