From nobody Sat Sep 12 02:40:43 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 4hhbJ11SM7z6rmVj for ; Sat, 12 Sep 2026 02:40:49 +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 4hhbJ10PJvz4DkY for ; Sat, 12 Sep 2026 02:40:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789180849; 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=KlXsq1gz7kmQI7l45bcnr5Zy6Awfuul9vf7xuDf+piU=; b=KLRvR6IIyO48A1eUQPrt0KwBMtmjvWgfW0t0oDfQXpJvzK5pk4/bIxn10TFldasP0DCFMv z33DErKELGlrpIjuR5ouXb+phbzueUE7rF2BTzY5qLuzN8LaqeflkpoYEJqUw8kito9O/u 5U/67bPezf8V9jlR4oHHxLHbPNkurYS6I/0wpQ/NyJA0rhCgd5b/cO6PYF/Kd5EiT48b0g HmZi6iKLY5BqwbAsco7Ae6Y1JbhtOSAmMKvj40F3+CU5niwyZq8XTUI0dwoWAessZxs5p9 WE0tmqPPzpjyJqBYj4QDzt4FpGkyPIae19sAGOHtJjM384vdy3lXQ8unjS8dNg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789180849; b=P/GOGMdIYATd1pmAa9874B8YKUBnVoe2k0stj9TIp9774N4bn9/ZiRgHFH40RNIjDwgX83 9KKL6BUqL6JmvLRuZ8kjvcGMrUxMumG11yB9/Azmajvzdq1HuVQC7sQ8tQn7btjNrWO53i a+4diBRo5vWPy8pJjvwtsoTUajuR5uDZZA2dBfuCzPQUdq+G9EFd+UO/n9XIvMh78TeqbD SEW21lj021ECcJP+9dSPyAeBAi4s0WpHCL4sA+cZbClM9cEHv8F+hJa/yTXVjoezJNae27 P/HGo1Tz1/Mm8j9OeLVD9jy4x0BRfZuDcxDYTo8c/TuuPCCtI7RrkrRLuwiJLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789180849; 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=KlXsq1gz7kmQI7l45bcnr5Zy6Awfuul9vf7xuDf+piU=; b=VaEcPnsw1fuJisAThX/MNkvbRoyc1bJ6ll0/eHIDgOtogv0w4zLCy2h56wv2YRRzv02AMJ GseUL5W3FxLODK4hM7X6HjA+QWJTw+TGNj4vO1g48/ywxLfAssIZV4yxvTt088UaTZa8Pt UtshYn96uBeQJiQ0z48ahG59WEKMhVf+RkmXWnK+PNUna6mvbN1fx4JiE8aJVcMV09ExaF TltlKbnHBqBGHI9soUx3m3iHcW46GDD4yIk+JpbpPoOHGzDP3fJprNYP5EOJWsLZ2MgCVx 6dlNxlFUhCC9tKaFvWrsM06n0gJZVXvRGD1Xxr0uR17bNl3JZ+XEkCw5FSibQA== 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 4hhbJ06Br4zhjP for ; Sat, 12 Sep 2026 02:40:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27608 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 12 Sep 2026 02:40:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 4f9de24ae983 - main - dpaa/fman: Clean up port config code 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: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f9de24ae98384fced8114a4ee331c87e90ca814 Auto-Submitted: auto-generated Date: Sat, 12 Sep 2026 02:40:43 +0000 Message-Id: <6aa4bbab.27608.3d57a85c@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=4f9de24ae98384fced8114a4ee331c87e90ca814 commit 4f9de24ae98384fced8114a4ee331c87e90ca814 Author: Justin Hibbits AuthorDate: 2026-08-27 22:02:30 +0000 Commit: Justin Hibbits CommitDate: 2026-09-12 02:40:29 +0000 dpaa/fman: Clean up port config code No functional change, just simplify the code flow a little. --- sys/dev/dpaa/fman_port_rx.c | 39 ++++++++++++++++----------------------- sys/dev/dpaa/fman_port_tx.c | 30 +++++++++--------------------- 2 files changed, 25 insertions(+), 44 deletions(-) diff --git a/sys/dev/dpaa/fman_port_rx.c b/sys/dev/dpaa/fman_port_rx.c index 5499e5e1599d..ebb9b3af6f20 100644 --- a/sys/dev/dpaa/fman_port_rx.c +++ b/sys/dev/dpaa/fman_port_rx.c @@ -150,20 +150,31 @@ fman_port_rx_config(device_t dev, struct fman_port_params *params) fman_port_config_common(base, params); base->sc_tasks.extra = 0; + base->sc_open_dmas.extra = 0; switch (base->sc_port_speed) { case 10000: if (base->sc_revision_major < 6) { base->sc_tasks.num = 16; - base->sc_tasks.extra = 8; - } else + base->sc_open_dmas.num = 8; + base->sc_open_dmas.extra = 8; + base->sc_fifo_bufs.num = 48; + } else { base->sc_tasks.num = 14; + base->sc_open_dmas.num = 8; + base->sc_fifo_bufs.num = 96; + } break; case 1000: - if (base->sc_revision_major >= 6) - base->sc_tasks.num = 4; - else { + if (base->sc_revision_major < 6) { base->sc_tasks.num = 3; base->sc_tasks.extra = 2; + base->sc_open_dmas.num = 1; + base->sc_open_dmas.extra = 1; + base->sc_fifo_bufs.num = 45; + } else { + base->sc_tasks.num = 4; + base->sc_open_dmas.num = 2; + base->sc_fifo_bufs.num = 50; } break; default: @@ -171,24 +182,6 @@ fman_port_rx_config(device_t dev, struct fman_port_params *params) break; } - if (base->sc_revision_major >= 6) { - base->sc_open_dmas.extra = 0; - base->sc_open_dmas.num = - (base->sc_port_speed == 10000) ? 8 : 2; - } else if (base->sc_port_speed == 10000) { - base->sc_open_dmas.num = 8; - base->sc_open_dmas.extra = 8; - } else { - base->sc_open_dmas.num = 1; - base->sc_open_dmas.extra = 1; - } - - if (base->sc_revision_major >= 6) - base->sc_fifo_bufs.num = - (base->sc_port_speed == 10000) ? 96 : 50; - else - base->sc_fifo_bufs.num = - (base->sc_port_speed == 10000) ? 48 : 45; base->sc_fifo_bufs.extra = 0; base->sc_fifo_bufs.num *= FMAN_BMI_FIFO_UNITS; diff --git a/sys/dev/dpaa/fman_port_tx.c b/sys/dev/dpaa/fman_port_tx.c index 715786b50964..708656a058d8 100644 --- a/sys/dev/dpaa/fman_port_tx.c +++ b/sys/dev/dpaa/fman_port_tx.c @@ -137,6 +137,7 @@ fman_port_tx_config(device_t dev, struct fman_port_params *params) { struct fman_port_tx_softc *sc = device_get_softc(dev); struct fman_port_softc *base = &sc->sc_base; + bool fman_v3 = (base->sc_revision_major >= 6); fman_port_config_common(base, params); @@ -145,37 +146,24 @@ fman_port_tx_config(device_t dev, struct fman_port_params *params) bus_write_4(base->sc_mem, FMBM_TFP, 0x00001013); base->sc_tasks.extra = 0; + base->sc_open_dmas.extra = 0; + base->sc_fifo_bufs.extra = 0; switch (base->sc_port_speed) { case 10000: - base->sc_tasks.num = (base->sc_revision_major < 6) ? 16 : 14; + base->sc_tasks.num = fman_v3 ? 14 : 16; + base->sc_open_dmas.num = fman_v3 ? 12 : 8; + base->sc_fifo_bufs.num = fman_v3 ? 64 : 48; break; case 1000: - base->sc_tasks.num = (base->sc_revision_major >= 6) ? 4 : 3; + base->sc_tasks.num = fman_v3 ? 4 : 3; + base->sc_open_dmas.num = fman_v3 ? 3 : 1; + base->sc_fifo_bufs.num = fman_v3 ? 50 : 44; break; default: base->sc_tasks.num = 0; break; } - if (base->sc_revision_major >= 6) { - base->sc_open_dmas.extra = 0; - base->sc_open_dmas.num = - (base->sc_port_speed == 10000) ? 12 : 3; - } else if (base->sc_port_speed == 10000) { - base->sc_open_dmas.num = 8; - base->sc_open_dmas.extra = 8; - } else { - base->sc_open_dmas.num = 1; - base->sc_open_dmas.extra = 1; - } - - if (base->sc_revision_major >= 6) - base->sc_fifo_bufs.num = - (base->sc_port_speed == 10000) ? 64 : 50; - else - base->sc_fifo_bufs.num = - (base->sc_port_speed == 10000) ? 48 : 44; - base->sc_fifo_bufs.extra = 0; base->sc_fifo_bufs.num *= FMAN_BMI_FIFO_UNITS; /* TODO: buf_margins? See fman_sp_build_buffer_struct */