From nobody Sun May 3 19:11:59 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 4g7vXc4D9Xz6btxn for ; Sun, 03 May 2026 19:12:00 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g7vXb6Tzjz3pp4 for ; Sun, 03 May 2026 19:11:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777835519; 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=PgkZMhN2W2LhkAwXdTkrMopXnyxR+GO2YscoNDPSJcQ=; b=ePcy2k0NDGM003xIKSJnAEWqMuO1d21+tuEB6G732A0gHKuG+1XnyUFfRxJcZ6I5+410Ef yqKEUb7GM00DDzKr4Hzqu4GP4dia5/VrF48SLvEywUqnWQ1rK6t9rF0/BnZf60UMQP1Vrk VMde0d8ibBh36uWFl4jpUOg8EbAAn/Uc/lmZKTesA6XPUu0DfVSaiZFt1oOH/fpnz+Ek4+ nKSceGAiViFsUCC0Q2RFP2Ix3E42UaN/pQmxNIuYxHmPTuMTYsQDJVXgLvNgD8Gfw7ZGr0 ewyRGqGNh+lKs3qWpQJjql2GRFq0JzsqzF7rr3l4gcSAuN641D1zjD5ctyu1Bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777835519; a=rsa-sha256; cv=none; b=KtG1DAlW0be9HJ5YWT7zvYIkyuJcwyWjJNT0Wml13JVgiSGOx42xiy9uIpLX4UhPHQ7zBj H71NWT/t09lock5rLA4tWVURtRZx36Tn9ckJsexlLRtdSMHyb7r40QPn6cc+uA7kBkkPOd VWWEL8FvRuphOnQCARLbgHI/hHR2fJNFVtx8tVEXpejFOzC17zDfzH869mlcD109/6nfmF rEq1mDV6QpV2Og4YJFJSjpaMPepU0CKcJDQV4Chikjy0bIMtMsN14CmYtrheG4fqxqTUKu Lcq9sDPOsD1v2fofSLlHf0CUYV5AyF/5llo66xRPIgB9zNvQSKOQFHGDges2Aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777835519; 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=PgkZMhN2W2LhkAwXdTkrMopXnyxR+GO2YscoNDPSJcQ=; b=gTRvBUhhJbvj+8gZ9Rl8fTDVBchf0906abkVgoMDJN/9Lucpqsms96Bhrpo0hfjpaSP4in j2rOFb5mDHutyZLXcYgystnNLCTGLCjJOTgCP7aT+FQC/DtYCtweQ8H7xeXoeRVRLhf+Sk LprV7Mtqhmk73cMhdoyk2kStUM5DcVG4U+I0WZkZueKdiQB18gi/pdMBpG9TOpB0r+13Ry NPpsFuJorbMTMCaWtfdbLoIp8Lxe1tpXVnTtB+MQs+FzD8Z+nvEUlgPYYpRDOcpECrWQM+ KLqFufM8RYSdezTmS6Skc3c7ZrSITdyyg+4Tb6jHpwkmuRQ7N8H41vBjNvGxqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g7vXb5x5nzmRN for ; Sun, 03 May 2026 19:11:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c75e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 03 May 2026 19:11:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 9d423705db8b - main - dpaa: Support jumbo frames as multi-buffer frames 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: 9d423705db8b4188ed7c02d31b93393f0f8e680e Auto-Submitted: auto-generated Date: Sun, 03 May 2026 19:11:59 +0000 Message-Id: <69f79dff.3c75e.55a019b1@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=9d423705db8b4188ed7c02d31b93393f0f8e680e commit 9d423705db8b4188ed7c02d31b93393f0f8e680e Author: Justin Hibbits AuthorDate: 2026-04-29 20:22:56 +0000 Commit: Justin Hibbits CommitDate: 2026-05-03 19:09:30 +0000 dpaa: Support jumbo frames as multi-buffer frames --- sys/dev/dpaa/dpaa_eth.c | 25 ++++++++++++++++++++++--- sys/dev/dpaa/if_memac.c | 3 ++- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/sys/dev/dpaa/dpaa_eth.c b/sys/dev/dpaa/dpaa_eth.c index 95e2c57e014e..6424a6e0b0c3 100644 --- a/sys/dev/dpaa/dpaa_eth.c +++ b/sys/dev/dpaa/dpaa_eth.c @@ -360,7 +360,8 @@ dpaa_eth_fq_rx_callback(device_t portal, struct qman_fq *fq, frame_va = DPAA_FD_GET_ADDR(frame); frame_ic = frame_va; /* internal context at head of the frame */ - KASSERT(frame->format == 0, + /* Only simple (single- or multi-) frames are supported. */ + KASSERT(frame->format == 0 || frame->format == 4, ("%s(): Got unsupported frame format 0x%02X!", __func__, frame->format)); @@ -374,8 +375,26 @@ dpaa_eth_fq_rx_callback(device_t portal, struct qman_fq *fq, if (m == NULL) goto err; - m_extadd(m, (char *)frame_va + frame->offset, frame->length, - dpaa_eth_fq_mext_free, frame_va, sc, 0, EXT_NET_DRV); + if (frame->format == 0) { + /* Single-frame format */ + m_extadd(m, (char *)frame_va + frame->offset, frame->length, + dpaa_eth_fq_mext_free, frame_va, sc, 0, EXT_NET_DRV); + } else { + struct dpaa_sgte *sgt = + (struct dpaa_sgte *)(char *)frame_va + frame->offset; + /* Simple multi-frame format */ + for (int i = 0; i < DPAA_NUM_OF_SG_TABLE_ENTRY; i++) { + if (sgt[i].length > 0) + m_extadd(m, PHYS_TO_DMAP(sgt[i].addr), + sgt[i].length, dpaa_eth_fq_mext_free, + PHYS_TO_DMAP(sgt[i].addr), sc, 0, + EXT_NET_DRV); + if (sgt[i].final) + break; + } + /* Free the SGT buffer, it's no longer needed. */ + bman_put_buffer(sc->sc_rx_pool, frame->addr, sc->sc_rx_bpid); + } if (if_getcapenable(sc->sc_ifnet) & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) dpaa_eth_update_csum_flags(frame, &frame_ic->prs, m); diff --git a/sys/dev/dpaa/if_memac.c b/sys/dev/dpaa/if_memac.c index ec216e8b2185..dd338b318492 100644 --- a/sys/dev/dpaa/if_memac.c +++ b/sys/dev/dpaa/if_memac.c @@ -617,7 +617,8 @@ memac_attach(device_t dev) device_get_unit(sc->sc_base.sc_dev)); - if_setcapabilities(ifp, IFCAP_VLAN_MTU | IFCAP_VLAN_HWCSUM | + if_setcapabilities(ifp, IFCAP_JUMBO_MTU | + IFCAP_VLAN_MTU | IFCAP_VLAN_HWCSUM | IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6 | IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6); if_setcapenable(ifp, if_getcapabilities(ifp));