From nobody Mon Sep 14 15:48:47 2026 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 4hk8hJ0pMpz6rHFl for ; Mon, 14 Sep 2026 15:48:48 +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 4hk8hH51dYz4pJF for ; Mon, 14 Sep 2026 15:48:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789400927; 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=get2KEjEJkkyEVL9rjnwBHdBbC7p7lFZ+HxeWF98eyk=; b=D+j5/23v63LWK3cLOVFJausovC1AcSNpkn+D5N2wb2if/EWyJGYPALJNl+d7d9Z2JmiS46 olsxHhezpKCi0UTFMZsr4Sxo46dhVDupUbOgO0XFMLLjHMKzE40wmaFua4L/eiCU2XlUPv leoYOBPvw9ZxvvzNscKtBo5Uz+WTDEvX48vWqfcAz4cjde+0WBVBW4JMbgQC4w4vJ7hKB4 dpdRvqZx/ffEmzpuC4hT8U69RjHYO80dqiwR5zYxeLNexXfs+n4IxiF0PjfJgohXz1yH1c teDishJbfegCg6ogPEcXjyJ/ZkBztFio/zbTQ29Q/K0uKWnnuVJ4IWThc4H7zg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789400927; b=yzd5qKJKkV4j+SoLQZVhU/D5ZBBq1xElM9bDxEfwIDRNcL4BV/3rD+1kUxXAzS5uMZSDme 90j6b9Ll6BnragZDqlkqof85ONgs5pfpXTbTVc3C80t+qS0xn4Uzq7rcrRpK1B2N/uxnAU LPfX76OHYevsfPpewKPpt7pvzt8sZxwIL3QZCuO1eXkZcHr39m6wmqO6oY3ToZPZSRdO9R k8eL9YQvslTe/QZ5Fhv+KbEUafJUGFQGzq3aA9BFI7ZbJ/kx3zk/fQT3zyecDXwGDNztOe 0rD+Cc5SYRCC/n+oWrnh43syK59cLlomvQUxt7/3YFTLrgGC1OVcg6egpE7pKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789400927; 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=get2KEjEJkkyEVL9rjnwBHdBbC7p7lFZ+HxeWF98eyk=; b=IHwzJl1DCnKqFguNUJ+aEge4NKBtZ6lIdXEawOY8g7y3Hz+66m1eiOZ342JeqGKjB+odXU nWTlA+CaL9Zww24ve5vhyy8ZEhe20JziBVtMizqWHkIp3dl2rekF32Q9QqgqOEFkOATzsf lIdNU3XGTU9gYwaR8m0wSrUXvShV+TANQylGTwrF+qDrjA3e+r1T5HFabPHOAZ6gwcCsAO eGOU59dDAeHaRyaHcIs7Be89DxPqjJsByRNbo0YHS42dMhq9zksQCLLJPJacoc8cdZipS1 pCNnpA5s4SeibiNpRK+4lP8CHs0/h6RWg2BNEyyYScRzwngwk0raJOKkhWjPyw== 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 4hk8hH2M2YzKPd for ; Mon, 14 Sep 2026 15:48:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3aac7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 14 Sep 2026 15:48:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: 808c82daab85 - main - thunderbolt: Factor out router_prepare_cmd() 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 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: 808c82daab85c2c5576f37bcf371c3e1a51f71d9 Auto-Submitted: auto-generated Date: Mon, 14 Sep 2026 15:48:47 +0000 Message-Id: <6aa8175f.3aac7.18096ea9@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=808c82daab85c2c5576f37bcf371c3e1a51f71d9 commit 808c82daab85c2c5576f37bcf371c3e1a51f71d9 Author: Aymeric Wibo AuthorDate: 2026-09-14 14:19:49 +0000 Commit: Aymeric Wibo CommitDate: 2026-09-14 15:44:00 +0000 thunderbolt: Factor out router_prepare_cmd() Common code between router_prepare_read() & router_prepare_write(). Eventually will be used by other commands (e.g. hotplugging) aswell. Reviewed by: ngie Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59668 --- sys/dev/thunderbolt/router.c | 54 ++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 35 deletions(-) diff --git a/sys/dev/thunderbolt/router.c b/sys/dev/thunderbolt/router.c index 52b092d09ae7..22377533dcc6 100644 --- a/sys/dev/thunderbolt/router.c +++ b/sys/dev/thunderbolt/router.c @@ -61,6 +61,8 @@ static int router_alloc_cmd(struct router_softc *, struct router_command **); static void router_free_cmd(struct router_softc *, struct router_command *); static int _tb_router_attach(struct router_softc *); +static void router_prepare_cmd(struct router_softc *, struct router_command *, + size_t, uint16_t); static void router_prepare_read(struct router_softc *, struct router_command *, int); static void router_prepare_write(struct router_softc *, struct router_command *, @@ -604,8 +606,8 @@ router_free_cmd(struct router_softc *sc, struct router_command *cmd) } static void -router_prepare_read(struct router_softc *sc, struct router_command *cmd, - int len) +router_prepare_cmd(struct router_softc *sc, struct router_command *cmd, + size_t len, uint16_t pdf) { struct nhi_cmd_frame *nhicmd; uint32_t *msg; @@ -621,56 +623,38 @@ router_prepare_read(struct router_softc *sc, struct router_command *cmd, nhicmd->data[i] = htobe32(nhicmd->data[i]); msg = (uint32_t *)nhicmd->data; - msg[msglen] = htobe32(tb_calc_crc(nhicmd->data, len-4)); + /* The last 4 bytes of data is the CRC. Compute CRC for just data. */ + msg[msglen] = htobe32(tb_calc_crc(nhicmd->data, len - 4)); - nhicmd->pdf = PDF_READ; + nhicmd->pdf = pdf; 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 void -router_prepare_write(struct router_softc *sc, struct router_command *cmd, +router_prepare_read(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")); + router_prepare_cmd(sc, cmd, len, PDF_READ); - 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->nhicmd->resp_buffer = (uint32_t *)cmd->resp_buffer; + cmd->nhicmd->resp_len = (cmd->dwlen + 3) * 4; +} - cmd->retries = CFG_DEFAULT_RETRIES; - cmd->timeout = CFG_DEFAULT_TIMEOUT; +static void +router_prepare_write(struct router_softc *sc, struct router_command *cmd, + int len) +{ + router_prepare_cmd(sc, cmd, len, PDF_WRITE); - return; + cmd->nhicmd->resp_buffer = (uint32_t *)cmd->resp_buffer; + cmd->nhicmd->resp_len = (cmd->dwlen + 3) * 4; } static int