From nobody Thu Oct 2 20:45:52 2025 Received: from mail-pf1-f227.google.com (mail-pf1-f227.google.com [209.85.210.227]) (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 26DDD36CC78 for ; Thu, 11 Sep 2025 19:35:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.227 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757619355; cv=none; b=lwIY8R0rHVtGbWko5sN+qU+2IeoRg3+EVmu9xiHauqdI42rHh+Y8Obg5ZeKaainug0QnGFgOmdVO/oIQ/r5KSasKAsAHENk/xCYfSdkA11MaHYu6TScvLYs2s1A+OXLktTPthSbWU7I8ITOEfYAeXH9XAINGav43MWYjSl/Domo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757619355; c=relaxed/simple; bh=jMACtddO2Nyt6OuXa3Y+Beh4QEbbo8dKInRO8s1N3aU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ATmptATkNXTPjJVubvhLh2U/6yjDaoh2402C3JA06DsJ8cp8gkxwvPKdNl8Y6TkL9MT0sBcOwXgdBiZGpjzjmCUMC3fqIPS6QUcBoJCflZUxz0DUqZgXRpQaTDQpSdea+40ffvSe+UaM6YuAdYwSB+m/vkrQq5QqL8IpCOiNy2w= 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=g3ohRDMv; arc=none smtp.client-ip=209.85.210.227 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="g3ohRDMv" Received: by mail-pf1-f227.google.com with SMTP id d2e1a72fcca58-772481b2329so1332177b3a.2 for ; Thu, 11 Sep 2025 12:35:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757619353; x=1758224153; 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=zSkjXsBDFAsP29yzWlC1fHRSEWpM310BU6iAEk4rSPU=; b=tqQxMUCvCWhyvb0ydm/uz0hPMM5aDibaQSuqXNTn1nTVDRBnadlAijNy5UjuKu+ByP tvkfE8bAqmQ5Q0O099l03XWc/zl1EmfhWJuVhVaNFB3K2pmEgSdBF2KFF0WmhX4wei8t Bz9hSChC/JXvjPsO2jGxCKSheJwcGMSQ69fqQ5lTYZ5+/EmaZOJqXjN1nXoORBsqHNu7 Ic1n6IQI/KhNPnDR8/DjYBzHZ4WhxkO9vr6oyRmIsYRaPUh7UtwPXgcIgb+SRZVv0kIS 3QkBVeDcvn0xLk/YuDvhei1s1Xghwc9RIQn4O7sSFe/yuhdkgUPw50k9a5d8/cBiAPOn y7Ww== X-Forwarded-Encrypted: i=1; AJvYcCXA+/2c9yopNHQA5mHN/0hNE+ENTgUtPXl7XUXsPB8IKQiGI2gw8Ib0XJoylNSX4Smplota6eNbIYxFnH0=@vger.kernel.org X-Gm-Message-State: AOJu0YwRUniZg2r3QjNLNl52rL4/9P4KGGSaksW0nFy1Hk0qutUr4C1Y K1lzfz6znoSsBB+i1anKENUddCM+YD82m+0ACzbc1eY19C77XPwHZpYgPh30R4Q2zpQcoa8Iqam wEogt84jiQ+EsFf/VQJ80PsrY+ON0SQJnnzGku0TK1l/3wcP9ZS0if5UjtpbirHMQ3CARuKZnc5 spfz0/dtFVX6LxlNCv6rHON/IqyuJ9KGU44Qrbjud6CvsSCK1Vn8CZwMwAEik3fH/LfLvNNo+GT D2vdQnS+UHs+oQ9UbLHWIqjzgmf X-Gm-Gg: ASbGncvhewedFs5s5M8QeGKqJOdkJJi2MSpv4zOHCEIav5N/F8n5wGrUVabwCh8Xmqf 7ZcpDSPC9s681hd+qoYSNYIwpSfu+IfbAIBsHBHK+6J6gn3v39HgbT0D1ZaVJBo2bC170SFfr+K BlI5iT8/3C22Ls+Ip+AdAdKojB+bMNGQxUvnFO19nIRchtsBy8lg9dlXnz7g0CecdJyHpn6ruzj 8ztgxlxrxGSWkNTAYGXLLX0+1LsbJbZ+dJR+mBqYrXpfllSGWKpW61p8vv/PiAEBhDGSaE7bOjO IZ32pQZjG4rsXfBCZpfYO8gEDQftfoUEddnnxOHgmR9aEz9KcbCI3mzMlJ3nWCRIWaxOSr0HIwT IUlYjuelSe7o079IFE5yN6GK9yus6Bd1+SkGm/2AFLSd8Qj4izjIJlwlZsJrW0ebfi/lhYmsbIo KVyGtjegvT X-Google-Smtp-Source: AGHT+IHvHd3DYEuAxo95fOn6/K78TgJuqcoVftg3WaLJ2AXJzWW/YInt+EeMrJ2dF11tbpozenE60a+dGl9s X-Received: by 2002:a05:6a00:1389:b0:776:2e3:a95b with SMTP id d2e1a72fcca58-77612064904mr706096b3a.1.1757619353430; Thu, 11 Sep 2025 12:35:53 -0700 (PDT) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-100.dlp.protect.broadcom.com. [144.49.247.100]) by smtp-relay.gmail.com with ESMTPS id d2e1a72fcca58-77607b2d4c5sm171690b3a.11.2025.09.11.12.35.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Sep 2025 12:35:53 -0700 (PDT) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-24caf28cce0so25240655ad.0 for ; Thu, 11 Sep 2025 12:35:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1757619352; x=1758224152; 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=zSkjXsBDFAsP29yzWlC1fHRSEWpM310BU6iAEk4rSPU=; b=g3ohRDMvKlTSnpi/kpXVx82Lqn5eRQzq1GIecfn2u6psvf3ZcTnz5pJUji+DNAs6Ai S/GahzKMldTocWDLxrNCwN9uUdJ/A8/L5LkceTWQsNEZVODXl8bR3RDX0GAxkQy3mggN 3XXpE52DP9zazNPNPIj5JEs+OrihcEc6lbmoA= X-Forwarded-Encrypted: i=1; AJvYcCVkcjiszc4mXXKwdGxUr1m9uCm0fi6yvmn8pgdTKuriJ6pckbQYoxRw/GB3khwoEYGs4Jqs33eXhELYy9k=@vger.kernel.org X-Received: by 2002:a17:902:fc4d:b0:24c:a5f3:b901 with SMTP id d9443c01a7336-25d27c1df47mr5065325ad.40.1757619351834; Thu, 11 Sep 2025 12:35:51 -0700 (PDT) X-Received: by 2002:a17:902:fc4d:b0:24c:a5f3:b901 with SMTP id d9443c01a7336-25d27c1df47mr5065155ad.40.1757619351419; Thu, 11 Sep 2025 12:35:51 -0700 (PDT) Received: from hyd-csg-thor2-h1-server2.dhcp.broadcom.net ([192.19.203.250]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-25c3ad3404csm25839285ad.113.2025.09.11.12.35.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Sep 2025 12:35:50 -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, vikas.gupta@broadcom.com, Bhargava Marreddy , Rajashekar Hudumula Subject: [v7, net-next 07/10] bng_en: Allocate stat contexts Date: Fri, 12 Sep 2025 01:05:02 +0530 Message-ID: <20250911193505.24068-8-bhargava.marreddy@broadcom.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250911193505.24068-1-bhargava.marreddy@broadcom.com> References: <20250911193505.24068-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 | 56 ++++++++++ .../ethernet/broadcom/bnge/bnge_hwrm_lib.h | 2 + .../net/ethernet/broadcom/bnge/bnge_netdev.c | 104 ++++++++++++++++++ .../net/ethernet/broadcom/bnge/bnge_netdev.h | 12 ++ 4 files changed, 174 insertions(+) diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c b/drivers/n= et/ethernet/broadcom/bnge/bnge_hwrm_lib.c index 5c178fade06..8f20b880c11 100644 --- a/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c +++ b/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c @@ -701,3 +701,59 @@ 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 (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 6c03923eb55..1c3fd02d7e0 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 ee7cf8596cd..1d506e36af9 100644 --- a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c +++ b/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c @@ -30,6 +30,73 @@ #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) + goto err_free_ring_stats; + + nqr->hw_stats_ctx_id =3D INVALID_STATS_CTX_ID; + } + return 0; + +err_free_ring_stats: + bnge_free_ring_stats(bn); + return rc; +} + static void bnge_free_nq_desc_arr(struct bnge_nq_ring_info *nqr) { struct bnge_ring_struct *ring =3D &nqr->ring_struct; @@ -649,6 +716,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); @@ -737,6 +805,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; @@ -1138,6 +1210,11 @@ static int bnge_setup_interrupts(struct bnge_net *bn) return netif_set_real_num_queues(dev, bd->tx_nr_rings, bd->rx_nr_rings); } =20 +static void bnge_hwrm_resource_free(struct bnge_net *bn, bool close_path) +{ + bnge_hwrm_stat_ctx_free(bn); +} + static void bnge_free_irq(struct bnge_net *bn) { struct bnge_dev *bd =3D bn->bd; @@ -1205,6 +1282,25 @@ static int bnge_request_irq(struct bnge_net *bn) return rc; } =20 +static int bnge_init_chip(struct bnge_net *bn) +{ + int rc; + +#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; @@ -1259,6 +1355,14 @@ static int bnge_init_nic(struct bnge_net *bn) if (rc) return rc; bnge_init_vnics(bn); + + rc =3D bnge_init_chip(bn); + if (rc) + goto err_free_ring_grps; + return rc; + +err_free_ring_grps: + bnge_free_ring_grps(bn); return rc; } =20 diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.h b/drivers/net= /ethernet/broadcom/bnge/bnge_netdev.h index 234c0523547..56df0765bf0 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