From nobody Thu Jan 19 03:52:17 2023 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 4Ny7xF5Mqzz2svWq; Thu, 19 Jan 2023 03:52:17 +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 4Ny7xF4D3fz3j2J; Thu, 19 Jan 2023 03:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674100337; 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=9Cm5H3/wm7glkrMHHL7WjSFYHwUwUCgG6NKkpl23aIM=; b=tnrDvto1tt4dp7fBugapflU5he6VDHV9zTuNrO+9gRADUklDH+C94bJDZV2BIlYSRievpU fg2Ln2TwI9psrNCphPhkzFCG1aa/TFo10h2QmLFcidAtgKnI7EBVaV2g2L0PqFEGdBpZ6p 0CB3GGov7nUBRyoAt9gG42klcLRKkEQelSLEA2hJCYQqXyRh5jbGJCd9BRFZfmAJ04XWlr TYsSKpMBTaKkIf8GtAHhuJPyv7bEKNHfNEna3Sph9zhNwAo/RzXXKkxJOdm8KshgW0B0uL 1QnJdnCrulyJ6Bu5H1PELwZBCMPfeE7Pekwu0TnAQyICnz5zu632P5XcZUwxhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674100337; 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=9Cm5H3/wm7glkrMHHL7WjSFYHwUwUCgG6NKkpl23aIM=; b=QDytTLXxvbIlTr20serJAUacbXViH4V9qH8fmQdIUQtimEPmvZ9FZo5Wk4qN0PHco3bBR6 NaSc84xvxFOlWL/OjIgfPBXdRxKpqtlDkfZMEh1vZDajg14r5yDgguvsYcYoXAR/ajjbKh bzmQoE13odvV7g5iOOpMaECAWMNQmphbVTJJ6gbgGb2KswGrWthO76mifYdcf/d5aIJGED XFZa+0xm/8tC5tVi//kg+d5BHqm3ceu2M4OYRaVgnjFhcqOdEcJ6r4OoM/g6SpEIYEf8z4 KbIRirTeOeBzGEWI6C8a4XhZrFyH27MHcyaDinxtXPThac0maCRNoMdsAI0jaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674100337; a=rsa-sha256; cv=none; b=Fg2TRvENYjEfLUdnGtyLdLUuxUjELXwJGkSYtjRjAGQt8c0HmOSWnRjKxBx4Lp5vtBLDBy 9PGZk1UsDs8CSPMCv9uJIDfzc3LTd473YpZTGa5MQxfV2EoaTXkc9fN76SopZCCnIxEwot WrrWxgtEG6E8XhyYkSuVFTqtC7FWUIGtNao1tq/Siihd25LUB2Bzr1CWqOfeKUrlP9sgdH CNOq26dwkRaVDpMS6UaNyb4UpxEsI3QMbA9FlTswCoXM7c0rkkEmJEEolHHv/AR/fkKpnh jLRWCo1WJZn2lumQfV7614r3kMdtTG4AUed7YVBG8InyalByb0NJCgb8Xa0fXg== 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 4Ny7xF2Rw8zcfh; Thu, 19 Jan 2023 03:52:17 +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 30J3qHnL022727; Thu, 19 Jan 2023 03:52:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30J3qHtt022726; Thu, 19 Jan 2023 03:52:17 GMT (envelope-from git) Date: Thu, 19 Jan 2023 03:52:17 GMT Message-Id: <202301190352.30J3qHtt022726@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 2bab173f73dc - stable/13 - if_bnxt: Add support for RSS on Thor 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2bab173f73dc9b849da18bf4884e9ed6711e678c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2bab173f73dc9b849da18bf4884e9ed6711e678c commit 2bab173f73dc9b849da18bf4884e9ed6711e678c Author: Sumit Saxena AuthorDate: 2022-11-04 22:21:20 +0000 Commit: Warner Losh CommitDate: 2023-01-19 01:00:06 +0000 if_bnxt: Add support for RSS on Thor Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D36442 (cherry picked from commit cfdca95f7834d2c10749fb14e12495d8aa7d1be0) --- sys/dev/bnxt/bnxt_hwrm.c | 9 +++++---- sys/dev/bnxt/if_bnxt.c | 28 +++++++++++++++++++--------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/sys/dev/bnxt/bnxt_hwrm.c b/sys/dev/bnxt/bnxt_hwrm.c index 91e6865449ac..ebcfc5ef03ff 100644 --- a/sys/dev/bnxt/bnxt_hwrm.c +++ b/sys/dev/bnxt/bnxt_hwrm.c @@ -1494,16 +1494,17 @@ bnxt_hwrm_rss_cfg(struct bnxt_softc *softc, struct bnxt_vnic_info *vnic, { struct hwrm_vnic_rss_cfg_input req = {0}; - /* TBD */ - if (BNXT_CHIP_P5(softc)) - return 0; - bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_VNIC_RSS_CFG); req.hash_type = htole32(hash_type); req.ring_grp_tbl_addr = htole64(vnic->rss_grp_tbl.idi_paddr); req.hash_key_tbl_addr = htole64(vnic->rss_hash_key_tbl.idi_paddr); req.rss_ctx_idx = htole16(vnic->rss_id); + req.hash_mode_flags = HWRM_FUNC_SPD_CFG_INPUT_HASH_MODE_FLAGS_DEFAULT; + if (BNXT_CHIP_P5(softc)) { + req.vnic_id = htole16(vnic->id); + req.ring_table_pair_index = 0x0; + } return hwrm_send_message(softc, &req, sizeof(req)); } diff --git a/sys/dev/bnxt/if_bnxt.c b/sys/dev/bnxt/if_bnxt.c index 6b4e7b516b67..c63b47da4a89 100644 --- a/sys/dev/bnxt/if_bnxt.c +++ b/sys/dev/bnxt/if_bnxt.c @@ -1719,6 +1719,23 @@ bnxt_func_reset(struct bnxt_softc *softc) return; } +static void +bnxt_rss_grp_tbl_init(struct bnxt_softc *softc) +{ + uint16_t *rgt = (uint16_t *) softc->vnic_info.rss_grp_tbl.idi_vaddr; + int i, j; + + for (i = 0, j = 0; i < HW_HASH_INDEX_SIZE; i++) { + if (BNXT_CHIP_P5(softc)) { + rgt[i++] = htole16(softc->rx_rings[j].phys_id); + rgt[i] = htole16(softc->rx_cp_rings[j].ring.phys_id); + } else { + rgt[i] = htole16(softc->grp_info[j].grp_id); + } + if (++j == softc->nrxqsets) + j = 0; + } +} /* Device configuration */ static void @@ -1726,7 +1743,7 @@ bnxt_init(if_ctx_t ctx) { struct bnxt_softc *softc = iflib_get_softc(ctx); struct ifmediareq ifmr; - int i, j; + int i; int rc; if (!BNXT_CHIP_P5(softc)) { @@ -1837,14 +1854,7 @@ skip_def_cp_ring: if (rc) goto fail; - /* Enable RSS on the VNICs */ - for (i = 0, j = 0; i < HW_HASH_INDEX_SIZE; i++) { - ((uint16_t *) - softc->vnic_info.rss_grp_tbl.idi_vaddr)[i] = - htole16(softc->grp_info[j].grp_id); - if (++j == softc->nrxqsets) - j = 0; - } + bnxt_rss_grp_tbl_init(softc); rc = bnxt_hwrm_rss_cfg(softc, &softc->vnic_info, softc->vnic_info.rss_hash_type);