From nobody Mon Jan 31 08:00:02 2022 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 F13EA1991B1D; Mon, 31 Jan 2022 08:00:02 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JnL823tpWz4yKp; Mon, 31 Jan 2022 08:00:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643616002; 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=gPyNfPIS43xMfJj97wDkSSJcV0dUHhlO+0Oje5Tp8eE=; b=nlSqIznZyA5FV5bj9RM0q6AXJz2zx5N4xDVuRY1v2FM8+0ygzHcjrdh+gak5exXvLJD/2S qTQAmu+nbPFpAen598II3A+HjMqYmvlWJUtDSwk96zJC950a/F6IZ5IQSoj5Kjb8ATdMQQ w5YpDM54w0AoDf93rSPdZTLfBKDjI+XypnGECsKHc+1CPN7qy5pjrlQCeoUuVxuGKCUwwj cMCBZBD3GrnhekL6eaw+HUCGhOZiWTG3Ro4aXSQSm+fXy7YJmifbHXWyCiP83ySv62bC43 jw0f/Ys0ttCn6GCkR8DMLNxbFm1s8BV6rt2EG7uo93wWNEB5J0LKnJ5VjMO4Xg== 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 665D318D25; Mon, 31 Jan 2022 08:00:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20V802vV024498; Mon, 31 Jan 2022 08:00:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20V802vM024495; Mon, 31 Jan 2022 08:00:02 GMT (envelope-from git) Date: Mon, 31 Jan 2022 08:00:02 GMT Message-Id: <202201310800.20V802vM024495@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wojciech Macek Subject: git: f485d733e87e - main - enetc: Disable HW IP packet alignment 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wma X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f485d733e87ec555fc97c3db020f13d61665d9ca Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643616002; 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=gPyNfPIS43xMfJj97wDkSSJcV0dUHhlO+0Oje5Tp8eE=; b=ZfEVGKGlMPEsroxg0cgMy/FP1zk2arqr8eJ23m+pr81jZFTIM+R/+L2DkoSTJDGe3gpdsw Cj1XIAdKCINBAAzhXmthipxgxgXItOrdiS5nFdd/hC+ohU3hgTWnL7ODb/1LoN3j/zn1Wd uu+LK0iL3NDug6ej24BlYsDkG9jQqHxCG8wjQmeKeQmeHXADSJgPYgNO+3o0cC6PmN46jC o9ErhNTZHgnEWDcFIabFeRQKEnjxA9a0H0ZoC2LcmilqHKI6UIEp45fub+sj+2mD0AoMgA Sw2ow/DP7e2K3DTK5cD9cqjFtCvTNFnESLeSH4Dgt/3HKdTin6vYt1QlynsDNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643616002; a=rsa-sha256; cv=none; b=JQr9drzPB9iciRrHbE2UnKMK9eN9UVT4tPsgusiiUOYKCUzu4BCAuueupLfTRG+/vSza8V EIEAQP9ZqwtYICnUbAXmWCg2TDthZopphL8nNTWnZujfwlMyrnLtApZh0jzb/AJWeF2tH7 HMUZx+PXyNftUnc5OxP7Lz07nbyRrw8fzb1kHk18A1rhgGAYgrdijqT9ntJqPhkA1zU7gE 8syV0CgC+RhdAjq2kxjwDysa9Md0LcdEL+Na9ai5LqoBijOE/m0orM2h0IUn/tv+H8fL3g nl7kexqWbuLXto+Zdh/Aos7S4ShvlmtU+gVncLE9ExeS/juYpYFB/QPL71gqCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wma: URL: https://cgit.FreeBSD.org/src/commit/?id=f485d733e87ec555fc97c3db020f13d61665d9ca commit f485d733e87ec555fc97c3db020f13d61665d9ca Author: Kornel Duleba AuthorDate: 2022-01-27 08:26:07 +0000 Commit: Wojciech Macek CommitDate: 2022-01-31 07:57:48 +0000 enetc: Disable HW IP packet alignment The NIC can IP align received packets. It was observed that it caused some rare stalls, that required full board reset. Disable this feature for now. It doesn't provide any significant performance improvement anyway. Obtained from: Semihalf Sponsored by: Alstom Group --- sys/dev/enetc/if_enetc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/dev/enetc/if_enetc.c b/sys/dev/enetc/if_enetc.c index e5337319fbbb..6f15db3ffe6c 100644 --- a/sys/dev/enetc/if_enetc.c +++ b/sys/dev/enetc/if_enetc.c @@ -933,7 +933,7 @@ enetc_init(if_ctx_t ctx) ENETC_PORT_WR4(sc, ENETC_PSIPVMR, ENETC_PSIPVMR_SET_VUTA(1)); - sc->rbmr = ENETC_RBMR_EN | ENETC_RBMR_AL; + sc->rbmr = ENETC_RBMR_EN; if (if_getcapenable(ifp) & IFCAP_VLAN_HWTAGGING) sc->rbmr |= ENETC_RBMR_VTE; @@ -1255,8 +1255,7 @@ enetc_isc_rxd_pkt_get(void *data, if_rxd_info_t ri) desc = &queue->ring[cidx]; } ri->iri_nfrags = i + 1; - ri->iri_len = pkt_size + ENETC_RX_IP_ALIGN; - ri->iri_pad = ENETC_RX_IP_ALIGN; + ri->iri_len = pkt_size; MPASS(desc->r.lstatus & ENETC_RXBD_LSTATUS_F); if (status & ENETC_RXBD_LSTATUS(ENETC_RXBD_ERR_MASK))