From nobody Mon Sep 14 15:48:46 2026 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 4hk8hG3b5pz6rH5L for ; Mon, 14 Sep 2026 15:48:46 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hk8hG2xdDz4pLN for ; Mon, 14 Sep 2026 15:48:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789400926; 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=n7WTcpnxCxw55DbGc9X+WClTGKJufjGjbwuTo8OyNeA=; b=C0Ha8YSs7kFGXdQCTZ06tAsLxljEjgGJptGIc30WdXVlbzqWh4Li2f0+6Hyx1tx48plnPV /SMgj5TXlIY3MGT0P5Okz2nfKM2dQW91mtf2CkxQSlnRm5SDUnwBJmt00T/JzvD375GFaH Q5rm9hB0WK8dD+z5TDqP8wf8gmjIpyzArkoECDCvbba0mO6TNXhg5Mzbq9u3D7UpZ99MNH iTw+SKN3r9y8z+1D7nI+KP3a4gWqBfwcI3WFglwBWnLwVEjIfWQrA7K56RAl745bNSA4N3 Jg3v9I+F8Q+siTi9JrIRvjRIs8ctpmHgAS/9oXH2anyI9HVj69GfmCKqJgkFoQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789400926; b=i74hT+geoor1MIwvh8Tu0idL+1cUMXHIVEUS4MGHTCGiyXi8ssW4h+mXrEDo1pQu3xdq4A XaGgyuMZnEyvJ22UJ1GFBVhvoah34gyIq0nbEiQWRkxOdy4hCJTCEEdCinnjSprFNendkr T+aVuYTiFqBbJ9m0J0jOE/xS+2WBola5qwIS5PLnmUFz4wACFPkIAkl4omr6nJOFzmbZqh jQBFQpG/Fqhn32DFkNutkc5jd8vDSjmZjbi64Az6bVeYZA8BhOqBoCt+MlhAOfRirB6z+t QoYGUhQSxh3P9q9QrOzC1Zao3oFUPWBdVSusLuCMaSeawsahOmEnC2TCzP9J0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789400926; 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=n7WTcpnxCxw55DbGc9X+WClTGKJufjGjbwuTo8OyNeA=; b=WBeN3TXvDDV8tALL4/YCOE5SeAXfj0w+ZWa2fpOPpZdvNE1ZLLyL42Kvmj2E8L+l9zs7CZ vV27PH+hsLbouwYvykveyGliGZbDGXxVBH88Wb9lItPd5hkJHP1ddBCz/YZTBSdN/EbxUi tZUI4wR3+VxUl5uoznNteA/i47o5Pxvac5gBoQFVD6TWpEStR5zPKRVyMB9sQ3KW/+GlnT ZpNVklkfrydTl+YBwOONf4+NFWiex+w8QEacpOmJpueJy2yDkISCufafqIJMtjiwvZb2vm p3RvIa4t/5TdPkLuBf15mCVgS15XzPAjjkhg2+qCnrw5mz7jjfcHq0GI7Valdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hk8hG1l3VzJwQ for ; Mon, 14 Sep 2026 15:48:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 399fd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 14 Sep 2026 15:48:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: 9c6e9bfb3474 - main - thunderbolt: Support writing to router config space 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c6e9bfb347428457d2061411cbfc8922dc5f7f2 Auto-Submitted: auto-generated Date: Mon, 14 Sep 2026 15:48:46 +0000 Message-Id: <6aa8175e.399fd.4bc05345@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=9c6e9bfb347428457d2061411cbfc8922dc5f7f2 commit 9c6e9bfb347428457d2061411cbfc8922dc5f7f2 Author: Aymeric Wibo AuthorDate: 2026-08-12 17:37:30 +0000 Commit: Aymeric Wibo CommitDate: 2026-09-14 15:43:37 +0000 thunderbolt: Support writing to router config space Reviewed by: adrian, ngie Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49452 --- sys/dev/thunderbolt/router.c | 97 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 1 deletion(-) diff --git a/sys/dev/thunderbolt/router.c b/sys/dev/thunderbolt/router.c index 68c5bcd227c9..52b092d09ae7 100644 --- a/sys/dev/thunderbolt/router.c +++ b/sys/dev/thunderbolt/router.c @@ -63,8 +63,12 @@ static void router_free_cmd(struct router_softc *, struct router_command *); static int _tb_router_attach(struct router_softc *); static void router_prepare_read(struct router_softc *, struct router_command *, int); +static void router_prepare_write(struct router_softc *, struct router_command *, + int); static int _tb_config_read(struct router_softc *, u_int, u_int, u_int, u_int, uint32_t *, void *, struct router_command **); +static int _tb_config_write(struct router_softc *, u_int, u_int, u_int, u_int, + uint32_t *, void *, struct router_command **); static int router_schedule(struct router_softc *, struct router_command *); static int router_schedule_locked(struct router_softc *, struct router_command *); @@ -492,8 +496,64 @@ int tb_config_write(struct router_softc *sc, u_int space, u_int adapter, u_int offset, u_int dwlen, uint32_t *buf) { + struct router_command *cmd; + int error, retries; - return(0); + if ((error = _tb_config_write(sc, space, adapter, offset, dwlen, buf, + router_get_config_cb, &cmd)) != 0) + return (error); + + retries = cmd->retries; + mtx_lock(&sc->mtx); + while (retries-- >= 0) { + error = router_schedule_locked(sc, cmd); + if (error) + break; + + error = msleep(cmd, &sc->mtx, 0, "tbtcfg", cmd->timeout * hz); + if (error != EWOULDBLOCK) + break; + sc->inflight_cmd = NULL; + tb_debug(sc, DBG_ROUTER, "Config command timed out, " + "retries=%d\n", retries); + } + + if (cmd->ev != 0) + error = EINVAL; + router_free_cmd(sc, cmd); + mtx_unlock(&sc->mtx); + return (error); +} + +static int +_tb_config_write(struct router_softc *sc, u_int space, u_int adapter, + u_int offset, u_int dwlen, uint32_t *buf, void *cb, + struct router_command **rcmd) +{ + struct router_command *cmd; + struct tb_cfg_write *msg; + size_t msglen = sizeof(*msg) + dwlen * 4; + int error; + + if ((error = router_alloc_cmd(sc, &cmd)) != 0) + return (error); + + msg = router_get_frame_data(cmd); + bzero(msg, msglen); + msg->route.hi = sc->route.hi; + msg->route.lo = sc->route.lo; + msg->addr_attrs = TB_CONFIG_ADDR(0, space, adapter, dwlen, offset); + for (size_t i = 0; i < dwlen; i++) + msg->data[i] = buf[i]; + cmd->callback = cb; + cmd->callback_arg = buf; + cmd->dwlen = dwlen; + router_prepare_write(sc, cmd, msglen); + + if (rcmd != NULL) + *rcmd = cmd; + + return (0); } static int @@ -578,6 +638,41 @@ router_prepare_read(struct router_softc *sc, struct router_command *cmd, return; } +static void +router_prepare_write(struct router_softc *sc, struct router_command *cmd, + int len) +{ + struct nhi_cmd_frame *nhicmd; + uint32_t *msg; + int msglen, i; + + KASSERT(cmd != NULL, ("cmd cannot be NULL\n")); + KASSERT(len != 0, ("Invalid zero-length command\n")); + KASSERT(len % 4 == 0, ("Message must be 32bit padded\n")); + + nhicmd = cmd->nhicmd; + msglen = (len - 4) / 4; + for (i = 0; i < msglen; i++) + nhicmd->data[i] = htobe32(nhicmd->data[i]); + + msg = (uint32_t *)nhicmd->data; + msg[msglen] = htobe32(tb_calc_crc(nhicmd->data, len - 4)); + + nhicmd->pdf = PDF_WRITE; + nhicmd->req_len = len; + + nhicmd->timeout = NHI_CMD_TIMEOUT; + nhicmd->retries = 0; + nhicmd->resp_buffer = (uint32_t *)cmd->resp_buffer; + nhicmd->resp_len = (cmd->dwlen + 3) * 4; + nhicmd->context = cmd; + + cmd->retries = CFG_DEFAULT_RETRIES; + cmd->timeout = CFG_DEFAULT_TIMEOUT; + + return; +} + static int router_schedule(struct router_softc *sc, struct router_command *cmd) {