From patchwork Tue Feb 20 23:03:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 13564717 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6665D154455 for ; Tue, 20 Feb 2024 23:04:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708470243; cv=none; b=W86f0wzHFmXWYM0KFer6oEeKcEUahwtJLQk3YpJC7z/iFcW9NedbDlNv48u5elLWHhteesVL+no9mzM/NHvVFEqi/oB6CLkY1hvuEW6cZwid+f5itD9lMIK5uQgTYQCOuVaJ0WjWf6d8IB4YuIgUwrSB9GkuXAsu+U9vfNYZcZw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708470243; c=relaxed/simple; bh=1uyL9IY1Ne7c45MjT3KHggTZA60eXpO3Lt6t8NRUAh4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=Dgm6inoXHEhCTxxPjFenCaV7IBAEt9p3D7OZcsw5I4bo9isWI0nnt5IaKlotq0nQrAChmfFAg0eJvHms0pPoBFPGjzEfRvnisfEs4e8T0n/MudrOz9cQuupZQRvFW6NnNyHiITkjcL7oIj84WB1gahkR4I26wzAQ4U+VKiCESNY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=O4q/sOLT; arc=none smtp.client-ip=209.85.222.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="O4q/sOLT" Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-78684496b10so1569985a.3 for ; Tue, 20 Feb 2024 15:04:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1708470240; x=1709075040; darn=vger.kernel.org; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=u4oxeiF5UPoKYfyChWLVMKnJVekMXEQrVU653k+GzRg=; b=O4q/sOLTv5zjvL0WY3+wXe/AjAPpOe5NOs2LNm0/KVwZlAHoazLa1PaoWhBIR+rTv5 5MvRHtjLaOWkani0+1J826LkYrJwVZ/mqBYmdSpVZ6NuuPeKUPotXOLrLoX/4TyOBJya lugi4Ig6iBO0csxusWlm2e+/Vg7bNSO/W2wHc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708470240; x=1709075040; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=u4oxeiF5UPoKYfyChWLVMKnJVekMXEQrVU653k+GzRg=; b=agdINpaXyTtIZID++E94whxV9XusZR+az/p7YHdkYbmo0/xZZmtoGHQQe7Zmg2scvK MJW2XxIw7y58ic3sE+Ys1F0JIxy/cRKRtJ1NkIp97tA0xHtu7IWZs2gXkBKqsvYPzypZ RdnOe2z+RFnq0BWwUqeSeCXPfuW7heGMwpDocdb2AP4jeciwh8kTy5UvlBAE5a316Zbf AQxnda83/bCQCaoifemzzTwdHBcaYjPeCuIci47bLR7mHwv9fC+/9krgbDRKijfJ7wxx 9+2Br4PS6phJSCP59TtFoPjvxyS93J5L9sVINO2AIgh3/W38qklI2JGR0xVrzbqwVf9E ny9A== X-Gm-Message-State: AOJu0YxRck6QgGwQD6WtUrHBSiROXZThnHEZsl9U6yNHdTsKMum0oSVq RV/6FMi8FhoiPiNKiN2XFMX0zpISXnJAIrsQ0LAHQnZle18danvqO90F7bBI2Q== X-Google-Smtp-Source: AGHT+IEMejSw2yv8eK35NrmOBKX48BbP0lHTBMaORrUcR5t7UkoAsmbPCPtxinUmn4Jad/nRycPp5w== X-Received: by 2002:a05:620a:1a1e:b0:785:97f4:501a with SMTP id bk30-20020a05620a1a1e00b0078597f4501amr21490626qkb.3.1708470238635; Tue, 20 Feb 2024 15:03:58 -0800 (PST) Received: from lvnvda5233.lvn.broadcom.net ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id g10-20020ae9e10a000000b00785d7dda9easm3797966qkm.28.2024.02.20.15.03.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Feb 2024 15:03:58 -0800 (PST) From: Michael Chan To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, pavan.chebbi@broadcom.com, andrew.gospodarek@broadcom.com, Somnath Kotur , Kalesh AP Subject: [PATCH net-next 10/10] bnxt_en: Use the new VNIC to create ntuple filters Date: Tue, 20 Feb 2024 15:03:17 -0800 Message-Id: <20240220230317.96341-11-michael.chan@broadcom.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20240220230317.96341-1-michael.chan@broadcom.com> References: <20240220230317.96341-1-michael.chan@broadcom.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Pavan Chebbi The newly created vnic (BNXT_VNIC_NTUPLE) is ready to be used to create ntuple filters when supported by firmware. All RX rings can be used regardless of the RSS indirection setting on the default VNIC. Reviewed-by: Somnath Kotur Reviewed-by: Kalesh AP Signed-off-by: Pavan Chebbi Signed-off-by: Michael Chan --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 33 ++++++++++++++++++----- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index b8ef6c2ba40c..9968d67e6c77 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -5785,6 +5785,29 @@ void bnxt_fill_ipv6_mask(__be32 mask[4]) mask[i] = cpu_to_be32(~0); } +static void +bnxt_cfg_rfs_ring_tbl_idx(struct bnxt *bp, + struct hwrm_cfa_ntuple_filter_alloc_input *req, + u16 rxq) +{ + if (BNXT_SUPPORTS_NTUPLE_VNIC(bp)) { + struct bnxt_vnic_info *vnic; + u32 enables; + + vnic = &bp->vnic_info[BNXT_VNIC_NTUPLE]; + req->dst_id = cpu_to_le16(vnic->fw_vnic_id); + enables = CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_RFS_RING_TBL_IDX; + req->enables |= cpu_to_le32(enables); + req->rfs_ring_tbl_idx = cpu_to_le16(rxq); + } else { + u32 flags; + + flags = CFA_NTUPLE_FILTER_ALLOC_REQ_FLAGS_DEST_RFS_RING_IDX; + req->flags |= cpu_to_le32(flags); + req->dst_id = cpu_to_le16(rxq); + } +} + int bnxt_hwrm_cfa_ntuple_filter_alloc(struct bnxt *bp, struct bnxt_ntuple_filter *fltr) { @@ -5794,7 +5817,6 @@ int bnxt_hwrm_cfa_ntuple_filter_alloc(struct bnxt *bp, struct flow_keys *keys = &fltr->fkeys; struct bnxt_l2_filter *l2_fltr; struct bnxt_vnic_info *vnic; - u32 flags = 0; int rc; rc = hwrm_req_init(bp, req, HWRM_CFA_NTUPLE_FILTER_ALLOC); @@ -5805,16 +5827,15 @@ int bnxt_hwrm_cfa_ntuple_filter_alloc(struct bnxt *bp, req->l2_filter_id = l2_fltr->base.filter_id; if (fltr->base.flags & BNXT_ACT_DROP) { - flags = CFA_NTUPLE_FILTER_ALLOC_REQ_FLAGS_DROP; + req->flags = + cpu_to_le32(CFA_NTUPLE_FILTER_ALLOC_REQ_FLAGS_DROP); } else if (bp->fw_cap & BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX_V2) { - flags = CFA_NTUPLE_FILTER_ALLOC_REQ_FLAGS_DEST_RFS_RING_IDX; - req->dst_id = cpu_to_le16(fltr->base.rxq); + bnxt_cfg_rfs_ring_tbl_idx(bp, req, fltr->base.rxq); } else { vnic = &bp->vnic_info[fltr->base.rxq + 1]; req->dst_id = cpu_to_le16(vnic->fw_vnic_id); } - req->flags = cpu_to_le32(flags); - req->enables = cpu_to_le32(BNXT_NTP_FLTR_FLAGS); + req->enables |= cpu_to_le32(BNXT_NTP_FLTR_FLAGS); req->ethertype = htons(ETH_P_IP); req->ip_addr_type = CFA_NTUPLE_FILTER_ALLOC_REQ_IP_ADDR_TYPE_IPV4;