From nobody Fri Oct 3 16:42:43 2025 Received: from mail-qk1-f225.google.com (mail-qk1-f225.google.com [209.85.222.225]) (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 B6B82314A7A for ; Thu, 28 Aug 2025 13:19:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.225 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756387165; cv=none; b=B2U7mN5u6FiIHYocDwgojg5aQwWeQJF4GcnVCz0AAYL7UswFo4phSgxMUZafP8ZaJOEqcr+tkO/rg4/sWV6ba+w+nMPkzovQkoZJraCQDlPczpb/d/hpWhaVyB2j8WCnm/4nC5g9iDD5LjWx+02MVfx0J4cWmrJc8VXHR0DmJuY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756387165; c=relaxed/simple; bh=wt7H6WrlTUBOZOEXyyztddWA5rZ2/td9ibJggmsZDmI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uwlV8hAgAwZuKRyd6W0mkPgy3I+nZdJ2xawywtk7r12+mTZxEqagZJ218QFBU5+br/nUejF58Hn2UIcVDalAvqLNRznVqZ7GfcgQvP20CAdDkVf71W0G8/eQgDFma6fuloFwDXjF3sQr9YWuabmA4kE7EwoKfKOQwk+aeQ73SxA= 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=XfNO6O5L; arc=none smtp.client-ip=209.85.222.225 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="XfNO6O5L" Received: by mail-qk1-f225.google.com with SMTP id af79cd13be357-7fac8fdea9fso35128085a.2 for ; Thu, 28 Aug 2025 06:19:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756387162; x=1756991962; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=uAWi7UVXiv6SuLJZ4LuOBWunnxptN+n6wY0zQecIEX0=; b=LdpDVAhbmvbMEwA/U8vGzRYAaJHLcGa9mDoP7uvX5PS0omHBExpoBCMhU9EKEkoins f0DcE6KTxLW7ZqTaPq9iUgB+U4J/kCRXj9EslrAHF1QEjLOsJuSQsW8dMpDqG1gl5j9B Ojq1YAcM3NsKMMRZMEwppSGfuHDUQRY04HE6CmMVrhC4F7T8KL985MxQVlPOvI+g7O4V YHXMRLgwaaN4lTZrD5hhf3RFaMVqvF4dxfWa/JHE3i8C1J59zDsdi9wpNhtOQ/vZ/ws8 J1sQK3/mZcL93BmP+AMd2gK3W0zh/MvCnk+MusXRCqVL4uXpQioVEC0yYj7uofQp4ghB 21aQ== X-Forwarded-Encrypted: i=1; AJvYcCUfyIJGDywJ31pxqdhB/Eb6QMBPciCET0idoU4yQXdEm60fuoRyUuHVmKNLFnOZioyrh1QAnyA4JW0se/U=@vger.kernel.org X-Gm-Message-State: AOJu0Yzg6FtfcI/oM+bJg1/NLSW3/zL6Tcyo1HTfGsynN7PU1w8CISMp Y1x0IUMC+AnC50bf3kVAtfW+kT3FakpTz8APRQ/PAgdCAfqtWnFFUAld9TEgz4aVCEoMQXZEr6n ivLn2QMJOVhAkEyjK7/hjmzaeYhcwz0b73l1zL8JXc/iAne6TI05SQiTdjmYBL0Si9OVtYn3CHm pWhfvnoInKMZUVRru34D6/Puj0dnWThskZK0sR8toG3GPO2NQ0pVbVOn7RJJ9tlhdoVEL1kO7r5 Og6f2jNsj5/NA54dohQDMwUMQ== X-Gm-Gg: ASbGncuo9nTBkN+cz73HyYpSOZqZ5rLMe3FvamxdIKw1UU34n/SfUw/UCE5KuiHd751 qWxycU2dLSQYLtc+7eQOwlTAf/xPZm/iN01yt1ofkmE5pG6nwQndIZb3KsLe1VhxwlFpf0GWpxu 5sMgVKT5lNN9rfYFyRAjCcxL7lQdHsIJvTwl9+Nz646HatdbOGhNnFWSlJIMlSdlBdUDzkr8awd t+2uWoGKKCX5z60HfRhe+nfAWVsUUKBxupSttKdF7rxJCPw16gZfnEc2WE7IMjyWB1y8dxC/Riz DQRBtp3witDYaDzvSdOoRzeD8rP5ad8/8GO/S7ssE/fiFLKrOBba5vR+Th3kazNGrj1ZsLKXnJC oZPfRoHxOisaMnpw36fO8Ave/J1Tc11h4msIzihgFbGVr0I6YubZSvvKKQeqw7zPsI5lbfv4IWw i9EOxbnQ== X-Google-Smtp-Source: AGHT+IG3WFpXzjbyFm1AGDPihPc8m4rUgbEeXmBC761gaMqGP2LqRpb6X51jNja70Ds4hWThwZw/gACYGHyX X-Received: by 2002:a05:620a:1999:b0:7f6:f9cc:676c with SMTP id af79cd13be357-7f6f9cc681emr852286085a.54.1756387162383; Thu, 28 Aug 2025 06:19:22 -0700 (PDT) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-11.dlp.protect.broadcom.com. [144.49.247.11]) by smtp-relay.gmail.com with ESMTPS id af79cd13be357-7ebe6068059sm50845785a.0.2025.08.28.06.19.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Aug 2025 06:19:22 -0700 (PDT) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2461c537540so12972135ad.0 for ; Thu, 28 Aug 2025 06:19:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1756387161; x=1756991961; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uAWi7UVXiv6SuLJZ4LuOBWunnxptN+n6wY0zQecIEX0=; b=XfNO6O5LOO4e/AFwryVPM6LNGgVCZH9t1BdlooCKpjp8LLh+h/JQUuIn/uHpThUtmG FVEtzdVHj5X8TYZDGoxJg5GyUu+mQ4rdtFIZfGVq6sVXSMS5ydiwCq3R8uyQ0rphvTOy A0eZcwLNMcmfEP1Fn5gYwPLY0hvwDJ8foH9vI= X-Forwarded-Encrypted: i=1; AJvYcCXK7J1NIBxlrnqQ3ynHkAL2HrdiMTclyzyoqkVr14UTpZAOWhpVSLv6yRCz6DavsX/dkW2lXguQMqdH6Z0=@vger.kernel.org X-Received: by 2002:a17:903:2f08:b0:246:3583:394d with SMTP id d9443c01a7336-2463583555emr298116025ad.29.1756387161004; Thu, 28 Aug 2025 06:19:21 -0700 (PDT) X-Received: by 2002:a17:903:2f08:b0:246:3583:394d with SMTP id d9443c01a7336-2463583555emr298115535ad.29.1756387160417; Thu, 28 Aug 2025 06:19:20 -0700 (PDT) Received: from hyd-csg-thor2-h1-server2.dhcp.broadcom.net ([192.19.203.250]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-248b6a16ae3sm36468705ad.137.2025.08.28.06.19.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Aug 2025 06:19:19 -0700 (PDT) From: Bhargava Marreddy To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, andrew+netdev@lunn.ch, horms@kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, michael.chan@broadcom.com, pavan.chebbi@broadcom.com, vsrama-krishna.nemani@broadcom.com, Bhargava Marreddy , Vikas Gupta , Rajashekar Hudumula Subject: [v5, net-next 6/9] bng_en: Allocate stat contexts Date: Thu, 28 Aug 2025 18:45:44 +0000 Message-ID: <20250828184547.242496-7-bhargava.marreddy@broadcom.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250828184547.242496-1-bhargava.marreddy@broadcom.com> References: <20250828184547.242496-1-bhargava.marreddy@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e Content-Type: text/plain; charset="utf-8" Allocate the hardware statistics context with the firmware and register DMA memory required for ring statistics. This helps the driver to collect ring statistics provided by the firmware. Signed-off-by: Bhargava Marreddy Reviewed-by: Vikas Gupta Reviewed-by: Rajashekar Hudumula --- .../ethernet/broadcom/bnge/bnge_hwrm_lib.c | 59 +++++++++++ .../ethernet/broadcom/bnge/bnge_hwrm_lib.h | 2 + .../net/ethernet/broadcom/bnge/bnge_netdev.c | 97 ++++++++++++++++++- .../net/ethernet/broadcom/bnge/bnge_netdev.h | 12 +++ 4 files changed, 169 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c b/drivers/n= et/ethernet/broadcom/bnge/bnge_hwrm_lib.c index 6992066690bd..d77ea5536e7c 100644 --- a/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c +++ b/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c @@ -701,3 +701,62 @@ int bnge_hwrm_queue_qportcfg(struct bnge_dev *bd) bnge_hwrm_req_drop(bd, req); return rc; } + +void bnge_hwrm_stat_ctx_free(struct bnge_net *bn) +{ + struct hwrm_stat_ctx_free_input *req; + struct bnge_dev *bd =3D bn->bd; + int i; + + if (!bn->bnapi) + return; + + if (bnge_hwrm_req_init(bd, req, HWRM_STAT_CTX_FREE)) + return; + + bnge_hwrm_req_hold(bd, req); + for (i =3D 0; i < bd->nq_nr_rings; i++) { + struct bnge_napi *bnapi =3D bn->bnapi[i]; + struct bnge_nq_ring_info *nqr =3D &bnapi->nq_ring; + + if (nqr->hw_stats_ctx_id !=3D INVALID_STATS_CTX_ID) { + req->stat_ctx_id =3D cpu_to_le32(nqr->hw_stats_ctx_id); + bnge_hwrm_req_send(bd, req); + + nqr->hw_stats_ctx_id =3D INVALID_STATS_CTX_ID; + } + } + bnge_hwrm_req_drop(bd, req); +} + +int bnge_hwrm_stat_ctx_alloc(struct bnge_net *bn) +{ + struct hwrm_stat_ctx_alloc_output *resp; + struct hwrm_stat_ctx_alloc_input *req; + struct bnge_dev *bd =3D bn->bd; + int rc, i; + + rc =3D bnge_hwrm_req_init(bd, req, HWRM_STAT_CTX_ALLOC); + if (rc) + return rc; + + req->stats_dma_length =3D cpu_to_le16(bd->hw_ring_stats_size); + req->update_period_ms =3D cpu_to_le32(bn->stats_coal_ticks / 1000); + + resp =3D bnge_hwrm_req_hold(bd, req); + for (i =3D 0; i < bd->nq_nr_rings; i++) { + struct bnge_napi *bnapi =3D bn->bnapi[i]; + struct bnge_nq_ring_info *nqr =3D &bnapi->nq_ring; + + req->stats_dma_addr =3D cpu_to_le64(nqr->stats.hw_stats_map); + + rc =3D bnge_hwrm_req_send(bd, req); + if (rc) + break; + + nqr->hw_stats_ctx_id =3D le32_to_cpu(resp->stat_ctx_id); + bn->grp_info[i].fw_stats_ctx =3D nqr->hw_stats_ctx_id; + } + bnge_hwrm_req_drop(bd, req); + return rc; +} diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.h b/drivers/n= et/ethernet/broadcom/bnge/bnge_hwrm_lib.h index 6c03923eb559..1c3fd02d7e0a 100644 --- a/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.h +++ b/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.h @@ -24,4 +24,6 @@ int bnge_hwrm_func_qcfg(struct bnge_dev *bd); int bnge_hwrm_func_resc_qcaps(struct bnge_dev *bd); int bnge_hwrm_queue_qportcfg(struct bnge_dev *bd); =20 +void bnge_hwrm_stat_ctx_free(struct bnge_net *bn); +int bnge_hwrm_stat_ctx_alloc(struct bnge_net *bn); #endif /* _BNGE_HWRM_LIB_H_ */ diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c b/drivers/net= /ethernet/broadcom/bnge/bnge_netdev.c index 4305d02072c6..501d8b832492 100644 --- a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c +++ b/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c @@ -30,6 +30,70 @@ #define BNGE_TC_TO_RING_BASE(bd, tc) \ ((tc) * (bd)->tx_nr_rings_per_tc) =20 +static void bnge_free_stats_mem(struct bnge_net *bn, + struct bnge_stats_mem *stats) +{ + struct bnge_dev *bd =3D bn->bd; + + if (stats->hw_stats) { + dma_free_coherent(bd->dev, stats->len, stats->hw_stats, + stats->hw_stats_map); + stats->hw_stats =3D NULL; + } +} + +static int bnge_alloc_stats_mem(struct bnge_net *bn, + struct bnge_stats_mem *stats) +{ + struct bnge_dev *bd =3D bn->bd; + + stats->hw_stats =3D dma_alloc_coherent(bd->dev, stats->len, + &stats->hw_stats_map, GFP_KERNEL); + if (!stats->hw_stats) + return -ENOMEM; + + return 0; +} + +static void bnge_free_ring_stats(struct bnge_net *bn) +{ + struct bnge_dev *bd =3D bn->bd; + int i; + + if (!bn->bnapi) + return; + + for (i =3D 0; i < bd->nq_nr_rings; i++) { + struct bnge_napi *bnapi =3D bn->bnapi[i]; + struct bnge_nq_ring_info *nqr =3D &bnapi->nq_ring; + + bnge_free_stats_mem(bn, &nqr->stats); + } +} + +static int bnge_alloc_ring_stats(struct bnge_net *bn) +{ + struct bnge_dev *bd =3D bn->bd; + u32 size, i; + int rc; + + size =3D bd->hw_ring_stats_size; + + for (i =3D 0; i < bd->nq_nr_rings; i++) { + struct bnge_napi *bnapi =3D bn->bnapi[i]; + struct bnge_nq_ring_info *nqr =3D &bnapi->nq_ring; + + nqr->stats.len =3D size; + rc =3D bnge_alloc_stats_mem(bn, &nqr->stats); + if (rc) + return rc; + + nqr->hw_stats_ctx_id =3D INVALID_STATS_CTX_ID; + } + + return 0; +} + static void bnge_free_nq_desc_arr(struct bnge_nq_ring_info *nqr) { struct bnge_ring_struct *ring =3D &nqr->ring_struct; @@ -634,6 +698,7 @@ static void bnge_free_core(struct bnge_net *bn) bnge_free_rx_rings(bn); bnge_free_nq_tree(bn); bnge_free_nq_arrays(bn); + bnge_free_ring_stats(bn); bnge_free_ring_grps(bn); bnge_free_vnics(bn); kfree(bn->tx_ring_map); @@ -723,6 +788,10 @@ static int bnge_alloc_core(struct bnge_net *bn) txr->bnapi =3D bnapi2; } =20 + rc =3D bnge_alloc_ring_stats(bn); + if (rc) + goto err_free_core; + rc =3D bnge_alloc_vnics(bn); if (rc) goto err_free_core; @@ -1179,6 +1248,11 @@ static int bnge_setup_interrupts(struct bnge_net *bn) return bnge_set_real_num_queues(bn); } =20 +static void bnge_hwrm_resource_free(struct bnge_net *bn, bool close_path) +{ + bnge_hwrm_stat_ctx_free(bn); +} + static int bnge_request_irq(struct bnge_net *bn) { struct bnge_dev *bd =3D bn->bd; @@ -1220,6 +1294,27 @@ static int bnge_request_irq(struct bnge_net *bn) return rc; } =20 +static int bnge_init_chip(struct bnge_net *bn) +{ + int rc =3D 0; + +#define BNGE_DEF_STATS_COAL_TICKS 1000000 + bn->stats_coal_ticks =3D BNGE_DEF_STATS_COAL_TICKS; + + rc =3D bnge_hwrm_stat_ctx_alloc(bn); + if (rc) { + netdev_err(bn->netdev, "hwrm stat ctx alloc failure rc: %d\n", + rc); + goto err_out; + } + + return 0; +err_out: + bnge_hwrm_resource_free(bn, 0); + + return rc; +} + static int bnge_napi_poll(struct napi_struct *napi, int budget) { int work_done =3D 0; @@ -1300,7 +1395,7 @@ static int bnge_init_nic(struct bnge_net *bn) bnge_init_ring_grps(bn); bnge_init_vnics(bn); =20 - return 0; + return bnge_init_chip(bn); } =20 static int bnge_open_core(struct bnge_net *bn) diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.h b/drivers/net= /ethernet/broadcom/bnge/bnge_netdev.h index 234c0523547a..56df0765bf0a 100644 --- a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.h +++ b/drivers/net/ethernet/broadcom/bnge/bnge_netdev.h @@ -225,6 +225,7 @@ struct bnge_net { u8 rss_hash_key[HW_HASH_KEY_SIZE]; u8 rss_hash_key_valid:1; u8 rss_hash_key_updated:1; + u32 stats_coal_ticks; }; =20 #define BNGE_DEFAULT_RX_RING_SIZE 511 @@ -271,6 +272,14 @@ void bnge_set_ring_params(struct bnge_dev *bd); txr =3D (iter < BNGE_MAX_TXR_PER_NAPI - 1) ? \ (bnapi)->tx_ring[++iter] : NULL) =20 +struct bnge_stats_mem { + u64 *sw_stats; + u64 *hw_masks; + void *hw_stats; + dma_addr_t hw_stats_map; + int len; +}; + struct bnge_cp_ring_info { struct bnge_napi *bnapi; dma_addr_t *desc_mapping; @@ -286,6 +295,9 @@ struct bnge_nq_ring_info { struct nqe_cn **desc_ring; struct bnge_ring_struct ring_struct; =20 + struct bnge_stats_mem stats; + u32 hw_stats_ctx_id; + int cp_ring_count; struct bnge_cp_ring_info *cp_ring_arr; }; --=20 2.47.3