From nobody Wed Aug 24 17:36:00 2022 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 4MCYD06Dcrz4ZRLc; Wed, 24 Aug 2022 17:36: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MCYD05W2Bz3DVF; Wed, 24 Aug 2022 17:36:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661362560; 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=CSG5ADJOAUYL5DP2FejGKkayl8vR2MUENSD4D7C4LHE=; b=ZmZqY2R0MYXLsqirq5MLjo/csCQ4TEO8U3QNqmNxENaY0gDeZCuDQE10O4+48Q9R+0D3Sq MlWo6yZobJW3RRX2hDq6ZNb48wwQ9Wa1WEKn8Wq8JzCPI46KFbPMupB/hEyTAgB6uB/3pE Pi+5bDw/9LO4uejLeWE8IkJx6dJClVhEbH5ZTdLpxkURuL1x7IOqFHY9FY8dsxD+MHz7O5 whp2+YiUD5YBq+RmwiWc+opeqLBqCcggc7eTL3WdzTjYaCS0Ozx8JgS1ON2N8ovlXpGq4S frYTWi7uq2Lxn+4RUwzDx3oJuWD2YusqPhfqMS9f2s8eGcXe/JKmO5RVVcQPJw== 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 4MCYD04YnQzHM4; Wed, 24 Aug 2022 17:36:00 +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 27OHa0Ck013267; Wed, 24 Aug 2022 17:36:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27OHa0El013266; Wed, 24 Aug 2022 17:36:00 GMT (envelope-from git) Date: Wed, 24 Aug 2022 17:36:00 GMT Message-Id: <202208241736.27OHa0El013266@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 9c3ad5ba932b - main - cxgbe: don't support MJUMPAGESIZE != MCLBYTES 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c3ad5ba932b5ed8d176a498155925cef69f7d62 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661362560; 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=CSG5ADJOAUYL5DP2FejGKkayl8vR2MUENSD4D7C4LHE=; b=SjS6OX642qYHN+/Xosp8WEX1TjzR7Qf/pdcdO9jv0UXwJyqY+NSn0LHeKt9l79VbX2rR6j rNBSZUk25jGTJws1+NCR/A00Svsmd9lMn0UL22a9AtgO+8ZeJUAwnj00+XjU7EY+QcVs54 UkFhzWcF+w4Ja1olmWXCPNYZSBAqwNFouHpMfrAJ6SzykFtcIc7MmSUbtAK8fbQ6XJrEvX GV1oAD/5TjIgVw5bioZ6vGiE6x8bIY2ERUWSs3Uwf6fE1qENki6s40exvkITmDFwWyhBy1 NiExEPutg9x4n8LK388IQ26SoPfbQfb4+1mRSj9bCjmK3uP3dyPSorxA7ELmag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661362560; a=rsa-sha256; cv=none; b=typhQdMhek3SDiyNyFvF4YspLv5uq2VotWdnDNv/96pbfXc8K2jdUyroBfdLyZmjT/NykA LNxwgvXjt8RBFPXEQ+KY+nAmyjlG3qPCCTeMYT5X6YD7xELzyhXh8kgA3Di+Y4xWjpCEaA 4ydgkQ5QE3WRpzmG/AVMi4WadydXsl+gl+rL50htkPlwSbB6zCJ2QmBel+BP75pzY8fesf E/YE/KOROtXvL2WesPrieyXOvmmlPVJFE9iTQesoPtRFTbIpztzZbB+0GJMhVjcdqAlqXN Jn9uzS/XoZP8+Ck7bVoycIkbNNwvYw8cImJ54iZWiUL7QWhfOGEObLPv8ex32w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=9c3ad5ba932b5ed8d176a498155925cef69f7d62 commit 9c3ad5ba932b5ed8d176a498155925cef69f7d62 Author: Brooks Davis AuthorDate: 2022-08-24 17:34:25 +0000 Commit: Brooks Davis CommitDate: 2022-08-24 17:34:25 +0000 cxgbe: don't support MJUMPAGESIZE != MCLBYTES This could only happen on systems with PAGE_SIZE < 4K and FreeBSD doesn't support such systems. Reviewed by: np, imp, jhb Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D36321 --- sys/dev/cxgbe/adapter.h | 4 ---- sys/dev/cxgbe/t4_sge.c | 8 -------- 2 files changed, 12 deletions(-) diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h index 555f8b36531d..66074749044a 100644 --- a/sys/dev/cxgbe/adapter.h +++ b/sys/dev/cxgbe/adapter.h @@ -108,11 +108,7 @@ enum { CTRL_EQ_QSIZE = 1024, TX_EQ_QSIZE = 1024, -#if MJUMPAGESIZE != MCLBYTES SW_ZONE_SIZES = 4, /* cluster, jumbop, jumbo9k, jumbo16k */ -#else - SW_ZONE_SIZES = 3, /* cluster, jumbo9k, jumbo16k */ -#endif CL_METADATA_SIZE = CACHE_LINE_SIZE, SGE_MAX_WR_NDESC = SGE_MAX_WR_LEN / EQ_ESIZE, /* max WR size in desc */ diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c index 163ba0ed8c26..8def1e6122cb 100644 --- a/sys/dev/cxgbe/t4_sge.c +++ b/sys/dev/cxgbe/t4_sge.c @@ -567,9 +567,7 @@ t4_sge_modload(void) } if (largest_rx_cluster != MCLBYTES && -#if MJUMPAGESIZE != MCLBYTES largest_rx_cluster != MJUMPAGESIZE && -#endif largest_rx_cluster != MJUM9BYTES && largest_rx_cluster != MJUM16BYTES) { printf("Invalid hw.cxgbe.largest_rx_cluster value (%d)," @@ -578,9 +576,7 @@ t4_sge_modload(void) } if (safest_rx_cluster != MCLBYTES && -#if MJUMPAGESIZE != MCLBYTES safest_rx_cluster != MJUMPAGESIZE && -#endif safest_rx_cluster != MJUM9BYTES && safest_rx_cluster != MJUM16BYTES) { printf("Invalid hw.cxgbe.safest_rx_cluster value (%d)," @@ -719,9 +715,7 @@ t4_tweak_chip_settings(struct adapter *sc) uint16_t indsz = min(RX_COPY_THRESHOLD - 1, M_INDICATESIZE); static int sw_buf_sizes[] = { MCLBYTES, -#if MJUMPAGESIZE != MCLBYTES MJUMPAGESIZE, -#endif MJUM9BYTES, MJUM16BYTES }; @@ -858,9 +852,7 @@ t4_init_rx_buf_info(struct adapter *sc) int i, j, n; static int sw_buf_sizes[] = { /* Sorted by size */ MCLBYTES, -#if MJUMPAGESIZE != MCLBYTES MJUMPAGESIZE, -#endif MJUM9BYTES, MJUM16BYTES };