From nobody Mon Jun 9 15:45:52 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 4bGGVB1xV9z5y4dV; Mon, 09 Jun 2025 15:45:54 +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 4bGGV931Dwz459W; Mon, 09 Jun 2025 15:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749483953; 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=OnV0kwLOSeYt7XxklmAk0j6nq1CruVLt87e+o6X7kv4=; b=dZr4kXU4t9S/qDdLOSYKPZRLxbbxG+capaw05rqzg6qRVhfTm03ksosStvF8oPrLPTZcve HF7JDC0o/sZ9hdbsjJ7ddPgcLky5kDKG/Qdw7ZiS34K1ilVB3Vq0lGzU3ihpZk2Jwvfsl2 wLpb0Fc/jrTQy25SD86nH1J+PqMhFoqv0vRL5EBCCp5BXFR7K2A19uHszywFMN9IvGi7+F tmQA35d6yx9j4exReMlkwYSUJMYS7FbCp+kVR4+99IzhZrB3Ze9NfsTVwjMx7EQ9ZZHmiO cLdWlgu1trrB62IkoaNRIy0s7zG73mNZWyeO8SwJkbk5VHLPfrHepKoxcgmHkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749483953; 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=OnV0kwLOSeYt7XxklmAk0j6nq1CruVLt87e+o6X7kv4=; b=rqHbjsc/QlXhg9/NrAdT+NAsNVKtt6BURw/DPbDAjyvjhxCJUyxXHzJrkyS1wJOsobPFv6 zih+pFpwSwN5zwbAe/c8zkajUcx7QeI4c3H5gGV/5CdeTVJsKFhtxNta5cgf7UL2H2vRHG yM1OfWU+1l4e6SsC+u2motgkM0YQzMY8c4Gy3A8R9KNdf5xzWZuTKjnOfNmLTuY37763hA BxFk+gz1iESwROgMugekXeHbtMFxb8c4wst5YcKolcFv/srRTSDMc14T8tILvoMTXy2Pr8 sYmZuvPhwhSGDJ1o+/2n+q/XCstbmP5AksntXTuyyZUFZ2Pks4BpRY4T2/l/GA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749483953; a=rsa-sha256; cv=none; b=Tno6smoVBXXBic3bz29heGS2oaO8ZdZtj2FJ5SmnFgAKpEPgSDDHB465Zy6yNAlyS7m5vB 6vvOdxUtIw3L2cYAR3t50LLYwNnGMw5+Elemi/csLhYFw2gB1LKIYNeZUC7Rfsg7Lp8iiA QbtAuAxSGlbBZBYAH8oTjPjck/nvoIfCK01Ep/v8FlMZcDKYu8HwmNgzgq+kwoWZubHmJV rM22o1r7ajrWDeqChc5USK5XmLxHTUjLvqfZ/odwQZwx8Y1uWU34Wcw5K27avy535YB2KE G3qtfEI8GytvktEsRyJrqeCPJHYiO0vNZW5oK/A3AlZuXHlqtzEOoRbNbfImRA== 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 4bGGV862X8z12Df; Mon, 09 Jun 2025 15:45:52 +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 559FjqCO088277; Mon, 9 Jun 2025 15:45:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 559Fjq7m088272; Mon, 9 Jun 2025 15:45:52 GMT (envelope-from git) Date: Mon, 9 Jun 2025 15:45:52 GMT Message-Id: <202506091545.559Fjq7m088272@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: b65172cb9ebd - main - Revert "scmi: Refactor scmi_request internal logic" 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: b65172cb9ebd704661dfa917e30af6658f8799f6 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=b65172cb9ebd704661dfa917e30af6658f8799f6 commit b65172cb9ebd704661dfa917e30af6658f8799f6 Author: Andrew Turner AuthorDate: 2025-06-09 13:21:37 +0000 Commit: Andrew Turner CommitDate: 2025-06-04 01:32:39 +0000 Revert "scmi: Refactor scmi_request internal logic" Revert to reapply series as some patches were incorrect versions This reverts commit 341d8fd90fa084d074059051478657cb45e53402. --- sys/dev/firmware/arm/scmi.c | 24 ++---------------------- sys/dev/firmware/arm/scmi.h | 1 - 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/sys/dev/firmware/arm/scmi.c b/sys/dev/firmware/arm/scmi.c index 950bbf94eeb6..c24768a5668a 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_tx(device_t dev, void *in) +scmi_request(device_t dev, void *in, void **out) { struct scmi_softc *sc; struct scmi_req *req; @@ -732,11 +732,8 @@ scmi_request_tx(device_t dev, void *in) /* Set inflight and send using transport specific method - refc-2 */ error = scmi_req_track_inflight(sc, req); - if (error != 0) { - device_printf(dev, "Failed to build req with HDR |%0X|\n", - req->msg.hdr); + if (error != 0) return (error); - } error = SCMI_XFER_MSG(sc->dev, &req->msg); if (error != 0) { @@ -744,22 +741,5 @@ scmi_request_tx(device_t dev, void *in) 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 f5b4173272bb..f6aa072caeca 100644 --- a/sys/dev/firmware/arm/scmi.h +++ b/sys/dev/firmware/arm/scmi.h @@ -83,7 +83,6 @@ 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);