From nobody Sat Oct 4 09:41:00 2025 Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) (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 AFCBE3375A7 for ; Mon, 18 Aug 2025 14:21:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755526868; cv=none; b=b3JIW0w9VAJgPDzDjlDhN/yGfTmyhue8g0KV5G1JMtgoh1mCWQzwThyR4NcGAe4aE82MvNYNcnSOSPnydpn6fHvJfeTM+jE1kfXMsJtI9hnEO1gPR3goS6WvSDw0jbhRIUYiISdNjTMBf9D5xf7KkLagqQ2jVSG6aAA9EuLXHxY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755526868; c=relaxed/simple; bh=rGMS6gPmVSlTGU3QkzsL0ylWMv376nrmje27629qj/4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HcTE8Aum7eOl2HaDfK/MeqMkFi/5Ky5VlQd5C/X5+zqq03IZYq9nStCVmLRoAckwbmzLiK6xUiovrtiGdUye6b6p1BEI6H75cvD+bxPBZNTvFG31MjZHzVLEPjbxmmz1V8fdtuqsnz7X9MAogkaLFLfcPoS27kEkigNzi84zaPs= 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=EaNhqc4D; arc=none smtp.client-ip=209.85.215.174 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="EaNhqc4D" Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-b47175d02dcso3627297a12.3 for ; Mon, 18 Aug 2025 07:21:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1755526866; x=1756131666; 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=A0zjJdqUgKg5fNhBHXiPJYOjP/CIQkOoEvpNq9npbm4=; b=EaNhqc4DsCrGHOyASowepsXvAe7PROdnJn+TJEKoJIg7k6d2sZDRDdMeEN/gSb+gQ1 R8hPEN6bBmsTqoZSg1zniW+8Nwzawudcq9nrWPk1AL7gp1cWY17+X9xUGJH2GTJKvIQd YEuvWnIiaJLiJ5G7+OjaYqTHD1cuHQy9iUV2c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755526866; x=1756131666; h=content-transfer-encoding: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=A0zjJdqUgKg5fNhBHXiPJYOjP/CIQkOoEvpNq9npbm4=; b=wJjuqu71MpfxGq93CfiG4NjUmLoB/4fzeaB3PV+FM5OOk631ZAB2LK48Wv25INoH37 QnOcojGFl5flMc9xzXcFisQesAHCYDA88mpNklwU+oROvjW1RZOXEAxFBeJP5gM4vKvf btOxoPwe/3Apq1GAm4dkGKIZ08iwXZR5zoYqN7WCbWd2IzPn3YuTc/UAJxDJHKI8H6iY CcbOk7qovKxEI9WFAqc66KOm2brtmri2nUJpAMtfyFwTaLA/rq0uH5y+Hy6zQ9GSRL8I YILA81DtkHE6b9/3b4vryQlkw0hANLvM1hYfugPKpl1hzCM2rLsMBbWhZpCHNChfeB7W TZOQ== X-Forwarded-Encrypted: i=1; AJvYcCVp9orsPCXD/bZCsTpZyr7U1ew3VWMNYGPHdUFX+RrfZzLmH124NO6wr24lbx8c5cyJwkb/ID6PzT9Vrak=@vger.kernel.org X-Gm-Message-State: AOJu0YwpiVaNriC/fjoYAOiy6nhEIhn0Otu7Lrv3rQT+mkXqzq4pMygp hDcQ7e4mVbKoIUAgBxRONcydhiaZ9HuY5lW9+qnl6DQUZ7HeUTh/iQgkIfZALN9S2g== X-Gm-Gg: ASbGncugJeJMJELTVEezZHxXs0ZO7F/6D+/uvJ+qnB0lGhNMudlqhLZgQnQf5DZQSP3 +Qf9pOAbVeWMkfAbtJNhStaMhrJ/cbV4ORTmrSqTbmCzU2OfgX32pF5ZfIm7QRdWLEt+KAn8NM/ D+Z0nI8RIVlS+1e9druU8F0cT2drzbHXHTnVmWz48DzvZq5312gmt4JkC0ncSubjrfMmKvMqp0K kvCU2Y460g/g6JopiwFlphT5FTof4j3wWNobYktd+2ZACa4JMbwhrVuW+qBnn6RPHbrT5EHzHeo Q1FbCHl/gYlgmPT27B6s2Fk3z+gLfwElrOJxjWfvUGEBqpH45uZsNUnGIFOOb0c8oy9AFjmZlHN VbEpmAEUu3nPGRDXU2WY60EFvokmcFfOWeIMCFrSbw+GzcsLbQnDVaQsBDcTmOhh/OB6n0G3+xQ 76ysq/YBOtPl2xOQzI8w9lQkH5WA== X-Google-Smtp-Source: AGHT+IGJuHtKjc/ZwBo5El4b6KCEQyZAD9K+7vXD1TX3hpzmTDkaUIXJxj8LUMs6O/3E9YUF6H6HNQ== X-Received: by 2002:a17:902:da8b:b0:244:9c08:a7a4 with SMTP id d9443c01a7336-2449c08a7c3mr501465ad.48.1755526865817; Mon, 18 Aug 2025 07:21:05 -0700 (PDT) Received: from hyd-csg-thor2-h1-server2.dhcp.broadcom.net ([192.19.203.250]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2446d578aa4sm81947835ad.153.2025.08.18.07.21.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Aug 2025 07:21:05 -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: [v2, net-next 6/9] bng_en: Allocate stat contexts Date: Mon, 18 Aug 2025 19:47:13 +0000 Message-ID: <20250818194716.15229-7-bhargava.marreddy@broadcom.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250818194716.15229-1-bhargava.marreddy@broadcom.com> References: <20250818194716.15229-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 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 5c178fade06..eb72b7ec555 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 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 d1674408d6a..046219c11f9 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; @@ -628,6 +692,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); @@ -717,6 +782,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; @@ -1164,6 +1233,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; @@ -1205,6 +1279,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; @@ -1285,7 +1380,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 0859f500b3f..387f68d24a4 100644 --- a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.h +++ b/drivers/net/ethernet/broadcom/bnge/bnge_netdev.h @@ -224,6 +224,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 @@ -270,6 +271,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; @@ -285,6 +294,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