From nobody Mon Jun 9 15:45:50 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 4bGGV66HzMz5y4Yb; Mon, 09 Jun 2025 15:45:50 +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 4bGGV64xxYz45DC; Mon, 09 Jun 2025 15:45:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749483950; 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=EKSXI/tK5oddWMU5/SaCjI6CD/GucE2Yy5ZF4DQmXcQ=; b=otbIbtbyRNrHSuPKVw0Q4dqwKicnXeXtVPHlF7xQWO/wRWvsFtLxzPqS2+RRpkVTGopEK4 Y0BL2Kw/KxMeWSKaHDi90oEeKjObhNakn6n48hSqOmC+92BYJvudrHd9swiQGH9GWRaG/r WeZaPocVBOmq5qZ2FaqTJN8wddz/vY2wZ8UfmYyTapPviJM+QIJWFOXbCGoDaj4p8m6lHn kEWMcRfN4p9p0WpvTGEkYHjG1r0rskz0Dy11Wu9gIvMS1qx6V1/ev1GPvrhbAy+jeZ8tng evmAqPR3GhBXaePC93g5bZxkU5/XT0BIhPcj7mnxSk82+HIxrmNrLLdkw2u/Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749483950; 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=EKSXI/tK5oddWMU5/SaCjI6CD/GucE2Yy5ZF4DQmXcQ=; b=ZfbtsJEdT6i5/MFYiFn+xlTRkH4lKfta6XsRYedYvMjdO7aniAlar1uF/kSVLZ+MRkOAJK PCZMYfn7CiAJhhoyeXBnGezCnXLUq5W5bQhf7VF979G3k0OYwcfMx0qKK/QKhSEjL/7JU0 8sPkyNGBX8qNJ7Ipfpfvc9uW3eWWm8OTl+Dnz2lQDz7DeRxeEI+aqejJXJK1vyu1dqFHzj tPvWX+8qYBJLBm4sshrlFWpkHrTXAyJ0Q23A9lieBQ0CEP6wQ1gzfoIQDnYWgw1kmbndqt r5eRCmP1zeJRk81kMuyNJ9cwNhV/WXco2b1eMHySttMuHbIfP3QuBG2YVq3TKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749483950; a=rsa-sha256; cv=none; b=nkvtcvd3Av9+cI3oyl8bTqIsNYvmX5lNyHMMD+KL3px//GfBx4gWALoKQp47G0AN40+4bD 3XJ5TWWtCZhR6EpujeKrLCgfJPlraDub5NB+KTLrh63K0Z/t4XGgoKLlYrmfyjdocgGJNv ewYXA7pU5f0xMR4axZlSuqPnnil50LeFmSmtISXhpTTl8GfAWZrDfZ+p54ZvqP/E3j+O3s dzIJ2mtKPT4BjGYIpKhzxmh0W2zK0dD4NLUiH+O4bFprwTL9cvpuF5FmgESizgH1VpmrAe S/k650yyVLMF0O38ZRa2nb99hSoPpjBE1Mipc2svrkazGUrepCw65/V87dXszg== 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 4bGGV647x5z12BD; Mon, 09 Jun 2025 15:45:50 +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 559FjotK088206; Mon, 9 Jun 2025 15:45:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 559Fjoi8088203; Mon, 9 Jun 2025 15:45:50 GMT (envelope-from git) Date: Mon, 9 Jun 2025 15:45:50 GMT Message-Id: <202506091545.559Fjoi8088203@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: c4629b0f2b45 - main - Revert "scmi: Add SDT traces to the core stack" 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: c4629b0f2b450d99ac99ff16d5dae11f1cdb23e2 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c4629b0f2b450d99ac99ff16d5dae11f1cdb23e2 commit c4629b0f2b450d99ac99ff16d5dae11f1cdb23e2 Author: Andrew Turner AuthorDate: 2025-06-09 13:21:31 +0000 Commit: Andrew Turner CommitDate: 2025-06-04 01:32:38 +0000 Revert "scmi: Add SDT traces to the core stack" Revert to reapply series as some patches were incorrect versions This reverts commit 984f9fb81a9dfb9780c9bcc99607ad7cac3a72dd. --- sys/dev/firmware/arm/scmi.c | 59 +-------------------------------------------- 1 file changed, 1 insertion(+), 58 deletions(-) diff --git a/sys/dev/firmware/arm/scmi.c b/sys/dev/firmware/arm/scmi.c index 2d9f6fa89d4b..0b165e413674 100644 --- a/sys/dev/firmware/arm/scmi.c +++ b/sys/dev/firmware/arm/scmi.c @@ -43,7 +43,6 @@ #include #include #include -#include #include #include @@ -54,26 +53,6 @@ #include "scmi.h" #include "scmi_protocols.h" -SDT_PROVIDER_DEFINE(scmi); -SDT_PROBE_DEFINE3(scmi, func, scmi_req_alloc, req_alloc, - "int", "int", "int"); -SDT_PROBE_DEFINE3(scmi, func, scmi_req_free_unlocked, req_alloc, - "int", "int", "int"); -SDT_PROBE_DEFINE3(scmi, func, scmi_req_get, req_alloc, - "int", "int", "int"); -SDT_PROBE_DEFINE3(scmi, func, scmi_req_put, req_alloc, - "int", "int", "int"); -SDT_PROBE_DEFINE5(scmi, func, scmi_request_tx, xfer_track, - "int", "int", "int", "int", "int"); -SDT_PROBE_DEFINE5(scmi, entry, scmi_wait_for_response, xfer_track, - "int", "int", "int", "int", "int"); -SDT_PROBE_DEFINE5(scmi, exit, scmi_wait_for_response, xfer_track, - "int", "int", "int", "int", "int"); -SDT_PROBE_DEFINE2(scmi, func, scmi_rx_irq_callback, hdr_dump, - "int", "int"); -SDT_PROBE_DEFINE5(scmi, func, scmi_process_response, xfer_track, - "int", "int", "int", "int", "int"); - #define SCMI_MAX_TOKEN 1024 #define SCMI_HDR_TOKEN_S 18 @@ -109,12 +88,6 @@ SDT_PROBE_DEFINE5(scmi, func, scmi_process_response, xfer_track, #define SCMI_MSG_TOKEN(_hdr) \ (((_hdr) & SCMI_HDR_TOKEN_M) >> SCMI_HDR_TOKEN_S) -#define SCMI_MSG_PROTOCOL_ID(_hdr) \ - (((_hdr) & SCMI_HDR_PROTOCOL_ID_M) >> SCMI_HDR_PROTOCOL_ID_S) -#define SCMI_MSG_MESSAGE_ID(_hdr) \ - (((_hdr) & SCMI_HDR_MESSAGE_ID_M) >> SCMI_HDR_MESSAGE_ID_S) -#define SCMI_MSG_TYPE(_hdr) \ - (((_hdr) & SCMI_HDR_TYPE_ID_M) >> SCMI_HDR_TYPE_ID_S) struct scmi_req { int cnt; @@ -399,11 +372,8 @@ scmi_req_alloc(struct scmi_softc *sc, enum scmi_chan ch_idx) } mtx_unlock_spin(&rp->mtx); - if (req != NULL) { + if (req != NULL) refcount_init(&req->cnt, 1); - SDT_PROBE3(scmi, func, scmi_req_alloc, req_alloc, - req, refcount_load(&req->cnt), -1); - } return (req); } @@ -422,9 +392,6 @@ scmi_req_free_unlocked(struct scmi_softc *sc, enum scmi_chan ch_idx, refcount_init(&req->cnt, 0); LIST_INSERT_HEAD(&rp->head, req, next); mtx_unlock_spin(&rp->mtx); - - SDT_PROBE3(scmi, func, scmi_req_free_unlocked, req_alloc, - req, refcount_load(&req->cnt), -1); } static void @@ -439,9 +406,6 @@ scmi_req_get(struct scmi_softc *sc, struct scmi_req *req) if (!ok) device_printf(sc->dev, "%s() -- BAD REFCOUNT\n", __func__); - SDT_PROBE3(scmi, func, scmi_req_get, req_alloc, - req, refcount_load(&req->cnt), SCMI_MSG_TOKEN(req->msg.hdr)); - return; } @@ -456,9 +420,6 @@ scmi_req_put(struct scmi_softc *sc, struct scmi_req *req) req->header = 0; bzero(&req->msg, sizeof(req->msg) + SCMI_MAX_MSG_PAYLD_SIZE(sc)); scmi_req_free_unlocked(sc, SCMI_CHAN_A2P, req); - } else { - SDT_PROBE3(scmi, func, scmi_req_put, req_alloc, - req, refcount_load(&req->cnt), SCMI_MSG_TOKEN(req->msg.hdr)); } mtx_unlock_spin(&req->mtx); } @@ -610,10 +571,6 @@ scmi_process_response(struct scmi_softc *sc, uint32_t hdr, uint32_t rx_len) return; } - SDT_PROBE5(scmi, func, scmi_process_response, xfer_track, req, - SCMI_MSG_PROTOCOL_ID(req->msg.hdr), SCMI_MSG_MESSAGE_ID(req->msg.hdr), - SCMI_MSG_TOKEN(req->msg.hdr), req->timed_out); - mtx_lock_spin(&req->mtx); req->done = true; req->msg.rx_len = rx_len; @@ -651,8 +608,6 @@ scmi_rx_irq_callback(device_t dev, void *chan, uint32_t hdr, uint32_t rx_len) sc = device_get_softc(dev); - SDT_PROBE2(scmi, func, scmi_rx_irq_callback, hdr_dump, hdr, rx_len); - if (SCMI_IS_MSG_TYPE_NOTIF(hdr) || SCMI_IS_MSG_TYPE_DRESP(hdr)) { device_printf(dev, "DRESP/NOTIF unsupported. Drop.\n"); SCMI_CLEAR_CHANNEL(dev, chan); @@ -668,10 +623,6 @@ 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; - SDT_PROBE5(scmi, entry, scmi_wait_for_response, xfer_track, req, - SCMI_MSG_PROTOCOL_ID(req->msg.hdr), SCMI_MSG_MESSAGE_ID(req->msg.hdr), - SCMI_MSG_TOKEN(req->msg.hdr), reply_timo_ms); - if (req->msg.polling) { bool needs_drop; @@ -716,10 +667,6 @@ scmi_wait_for_response(struct scmi_softc *sc, struct scmi_req *req, void **out) SCMI_TX_COMPLETE(sc->dev, NULL); - SDT_PROBE5(scmi, exit, scmi_wait_for_response, xfer_track, req, - SCMI_MSG_PROTOCOL_ID(req->msg.hdr), SCMI_MSG_MESSAGE_ID(req->msg.hdr), - SCMI_MSG_TOKEN(req->msg.hdr), req->timed_out); - return (ret); } @@ -822,10 +769,6 @@ scmi_request_tx(device_t dev, void *in) return (error); } - SDT_PROBE5(scmi, func, scmi_request_tx, xfer_track, req, - SCMI_MSG_PROTOCOL_ID(req->msg.hdr), SCMI_MSG_MESSAGE_ID(req->msg.hdr), - SCMI_MSG_TOKEN(req->msg.hdr), req->msg.polling); - return (0); }