From nobody Tue Sep 9 21:36:13 2025 Received: from mail-il1-f225.google.com (mail-il1-f225.google.com [209.85.166.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 5DEFF31327A for ; Fri, 5 Sep 2025 17:20:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.225 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757092839; cv=none; b=Bn25NjIhiDVZZM938a+K7/720/kKcZ6WfJIjohEp3Fn5P2bzMsCvrJSFZmNnxOJgkaPPrL7NyQiIKuHECAnlMSyxTfi9qgLdlaEQDhN7TpvNMjGOq9q3hbnxznnfGv2gZfBepKj+mNoYHomtbt1dx9xjU2v7C110Mi6SWlgCKzQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757092839; c=relaxed/simple; bh=eufnIlDdzQKp6i2A9TCDu1kUPYy+lA6zsfZL57+bfdw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kXt0jdrZiX22o+dEl6JITufYS7J9fXjDCVZlNFc/CBXaAp2FhN4JzfqFXtBLGcjtljlIh9aDoMQCrOP5D52Cy2UzRSZDMaZxNJmrheo2TZVsFCX9NoySEXK2TM23JhSlLEPKCjMmB0DdBPMpxJ9jgDXj0T3G0mFEHRrdROHgBmI= 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=Vy3n6Hcw; arc=none smtp.client-ip=209.85.166.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="Vy3n6Hcw" Received: by mail-il1-f225.google.com with SMTP id e9e14a558f8ab-3f024dfdfdaso27034205ab.1 for ; Fri, 05 Sep 2025 10:20:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757092836; x=1757697636; 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=/bsIFgtVw5egZsMN6ZWhNgC2ShRSym6P/RcR6QHAMKM=; b=fQcW5QZxv8czojFy8aphe7k022jElp5y+3gQMu2K2jQL41hFr/pKB2HaK2j9sTLmgf 6WXfq6AzcKNC+uMo7RkmIl1szqB2Z8RVTHrWapWqdyCOBcOtNR8lEjf8gxdqefrqPfPz MdIOWRAcd+9/DvNUZUIKN60LAFpFiElK+k8utETmbDsTihUeWos7Z5KbkZlXCPXXQUNf kU23W20Kd/DoDaTNj9/fOvsD5sPP6KDfcFIfwnf1MDiQYT/hrsqj65xukDzTfuPPntrk ueyG6F8sYN1Me1oUZn6eUWLFCwZsQRaSn1AqFydR7eXvGqrL7UJZXx/63Z4CeFyLxHns wSMA== X-Forwarded-Encrypted: i=1; AJvYcCW1eZYi7mUpEyS8KLipba2muSZovPXPcssV0kt+0d1R9+I1qfTxbAxs9QNj+jSpT5ZOvYXWvR7JZSp6BT8=@vger.kernel.org X-Gm-Message-State: AOJu0Yyqz1Qnk1lqK2SXUvXvbMY42FY8e3+c/06TrO8RDru82Jlg5e8E 0HrgA7meu/l+aVCMSrhlGArzDujUzkcysvPxJPxfPzQLxOlKcnzv5fAitPI/diI0KG4+K8rbar3 CRTa07kOTFduBLY0gJBtw5vSWGCQn6XvqYktUKR6Papjq3rRZqRPFrijUo2K4b0sd8VHLg3oUh8 EptwWdSxE+7F9kDumStKZgvWAJG3VCsQgXPt6VZSx/W73TDrdxcesvP7MAQqOH46XH2gXkb/x3w acGhFO/dLzCiZZrtDh4hs9wRE18 X-Gm-Gg: ASbGncuYlyTQk+bwEnImSdXe3s2Rvon1fxVtztPU53bh7xKXM9u13g7VArRrXLhaYx5 RYS02VLG+/xxxEp4J+eICHQZoSc/+MetDvy07SFTod4XfdlkBFZldz3GMlULe7UKNBVJIMNkprh rj5FrqrarSZylKmsi0uVp2S+OumCaYtSfGcouWM9FLAHDcUXDlKGM6ErSC8Uwe9wxGoxIf7NLE5 07+LWxw8X29J1/Ges4IowZvSv6OiXfqiw+zoNJu8RDzT5cMnFDhmJwexOhlQTRrIDYd1W26bKtI tDzqQ1zTOuIgmYYtXoLuOsQL1IpcDoR5X1cAYI2TvI5daWKZ9OVGMIgRCji5rpjEFLugO0e4qO2 IQ1FQlZU3UIH8HgSB365mZyFoxZqrRi0lvKtOtN6WSCpgGFVjMEvcIxnkMfquqfEqfQwaev8uwc Gf4Z5Vjg== X-Google-Smtp-Source: AGHT+IF+2AqG+OMyaPBvndlcrNQY4k28fD1ejubuUnAV0kfFtzKFFZt0VdPmN1re4oiseoKAFnbDIPDPJLkv X-Received: by 2002:a92:ca4b:0:b0:3f6:6c03:18bc with SMTP id e9e14a558f8ab-3f66c031c75mr77406625ab.9.1757092836315; Fri, 05 Sep 2025 10:20:36 -0700 (PDT) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-16.dlp.protect.broadcom.com. [144.49.247.16]) by smtp-relay.gmail.com with ESMTPS id 8926c6da1cb9f-50d8f0ae72bsm1112520173.11.2025.09.05.10.20.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Sep 2025 10:20:36 -0700 (PDT) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-77288e1ce43so2505076b3a.1 for ; Fri, 05 Sep 2025 10:20:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1757092835; x=1757697635; 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=/bsIFgtVw5egZsMN6ZWhNgC2ShRSym6P/RcR6QHAMKM=; b=Vy3n6HcwXxtdQ8jGnevtXKfUJj6P1uUKHpvo2WlFQ45sPemPjOJ+UqhBDBYcSJEW/T Nc4cSIyJp2FNUXZw3aNbYIk2VIdWQIKO88+0vWMT71eLu3GzKBjmxx4amZJPQcUdtphb 5j7Xgifby4AYxJ1eb1YJCguplZCF7y3PhUCzo= X-Forwarded-Encrypted: i=1; AJvYcCWUW8ds+hjt+oOmifvgnGI5VhwpXC4O1Vw6/sw1ZCkguGE22rMC/JXhhot9FTv2y23fvYN0nqeBgR//l5Y=@vger.kernel.org X-Received: by 2002:a05:6a00:198f:b0:772:6493:7e67 with SMTP id d2e1a72fcca58-77264938010mr18846204b3a.3.1757092834617; Fri, 05 Sep 2025 10:20:34 -0700 (PDT) X-Received: by 2002:a05:6a00:198f:b0:772:6493:7e67 with SMTP id d2e1a72fcca58-77264938010mr18846173b3a.3.1757092834133; Fri, 05 Sep 2025 10:20:34 -0700 (PDT) Received: from hyd-csg-thor2-h1-server2.dhcp.broadcom.net ([192.19.203.250]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7722a2b78d7sm22678001b3a.30.2025.09.05.10.20.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Sep 2025 10:20:33 -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: [v6, net-next 05/10] bng_en: Initialise core resources Date: Fri, 5 Sep 2025 22:46:47 +0000 Message-ID: <20250905224652.48692-6-bhargava.marreddy@broadcom.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250905224652.48692-1-bhargava.marreddy@broadcom.com> References: <20250905224652.48692-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" Add initial settings to all core resources, such as the RX, AGG, TX, CQ, and NQ rings, as well as the VNIC. This will help enable these resources in future patches. Signed-off-by: Bhargava Marreddy Reviewed-by: Vikas Gupta Reviewed-by: Rajashekar Hudumula --- .../net/ethernet/broadcom/bnge/bnge_netdev.c | 219 ++++++++++++++++++ .../net/ethernet/broadcom/bnge/bnge_netdev.h | 48 ++++ .../net/ethernet/broadcom/bnge/bnge_rmem.h | 1 + 3 files changed, 268 insertions(+) diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c b/drivers/net= /ethernet/broadcom/bnge/bnge_netdev.c index c2c78df0e9c..ee0cdea6fc0 100644 --- a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c +++ b/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c @@ -712,6 +712,204 @@ static irqreturn_t bnge_msix(int irq, void *dev_insta= nce) return IRQ_HANDLED; } =20 +static void bnge_init_nq_tree(struct bnge_net *bn) +{ + struct bnge_dev *bd =3D bn->bd; + int i, j; + + for (i =3D 0; i < bd->nq_nr_rings; i++) { + struct bnge_nq_ring_info *nqr =3D &bn->bnapi[i]->nq_ring; + struct bnge_ring_struct *ring =3D &nqr->ring_struct; + + ring->fw_ring_id =3D INVALID_HW_RING_ID; + if (!nqr->cp_ring_arr) + continue; + for (j =3D 0; j < nqr->cp_ring_count; j++) { + struct bnge_cp_ring_info *cpr =3D &nqr->cp_ring_arr[j]; + + ring =3D &cpr->ring_struct; + ring->fw_ring_id =3D INVALID_HW_RING_ID; + } + } +} + +static void bnge_init_rxbd_pages(struct bnge_ring_struct *ring, u32 type) +{ + struct rx_bd **rx_desc_ring; + u32 prod; + int i; + + rx_desc_ring =3D (struct rx_bd **)ring->ring_mem.pg_arr; + for (i =3D 0, prod =3D 0; i < ring->ring_mem.nr_pages; i++) { + struct rx_bd *rxbd; + int j; + + rxbd =3D rx_desc_ring[i]; + if (!rxbd) + continue; + + for (j =3D 0; j < RX_DESC_CNT; j++, rxbd++, prod++) { + rxbd->rx_bd_len_flags_type =3D cpu_to_le32(type); + rxbd->rx_bd_opaque =3D prod; + } + } +} + +static void bnge_init_one_rx_ring_rxbd(struct bnge_net *bn, + struct bnge_rx_ring_info *rxr) +{ + struct bnge_ring_struct *ring; + u32 type; + + type =3D (bn->rx_buf_use_size << RX_BD_LEN_SHIFT) | + RX_BD_TYPE_RX_PACKET_BD | RX_BD_FLAGS_EOP; + + if (NET_IP_ALIGN =3D=3D 2) + type |=3D RX_BD_FLAGS_SOP; + + ring =3D &rxr->rx_ring_struct; + bnge_init_rxbd_pages(ring, type); + ring->fw_ring_id =3D INVALID_HW_RING_ID; +} + +static void bnge_init_one_rx_agg_ring_rxbd(struct bnge_net *bn, + struct bnge_rx_ring_info *rxr) +{ + struct bnge_ring_struct *ring; + u32 type; + + ring =3D &rxr->rx_agg_ring_struct; + ring->fw_ring_id =3D INVALID_HW_RING_ID; + if (bnge_is_agg_reqd(bn->bd)) { + type =3D ((u32)BNGE_RX_PAGE_SIZE << RX_BD_LEN_SHIFT) | + RX_BD_TYPE_RX_AGG_BD | RX_BD_FLAGS_SOP; + + bnge_init_rxbd_pages(ring, type); + } +} + +static int bnge_init_one_rx_ring(struct bnge_net *bn, int ring_nr) +{ + struct bnge_rx_ring_info *rxr; + + rxr =3D &bn->rx_ring[ring_nr]; + bnge_init_one_rx_ring_rxbd(bn, rxr); + + netif_queue_set_napi(bn->netdev, ring_nr, NETDEV_QUEUE_TYPE_RX, + &rxr->bnapi->napi); + + bnge_init_one_rx_agg_ring_rxbd(bn, rxr); + + return 0; +} + +static int bnge_init_rx_rings(struct bnge_net *bn) +{ + int i, rc =3D 0; + +#define BNGE_RX_OFFSET (NET_SKB_PAD + NET_IP_ALIGN) +#define BNGE_RX_DMA_OFFSET NET_SKB_PAD + bn->rx_offset =3D BNGE_RX_OFFSET; + bn->rx_dma_offset =3D BNGE_RX_DMA_OFFSET; + + for (i =3D 0; i < bn->bd->rx_nr_rings; i++) { + rc =3D bnge_init_one_rx_ring(bn, i); + if (rc) + break; + } + + return rc; +} + +static int bnge_init_tx_rings(struct bnge_net *bn) +{ + int i; + + bn->tx_wake_thresh =3D max_t(int, bn->tx_ring_size / 2, + BNGE_MIN_TX_DESC_CNT); + + for (i =3D 0; i < bn->bd->tx_nr_rings; i++) { + struct bnge_tx_ring_info *txr =3D &bn->tx_ring[i]; + struct bnge_ring_struct *ring =3D &txr->tx_ring_struct; + + ring->fw_ring_id =3D INVALID_HW_RING_ID; + + netif_queue_set_napi(bn->netdev, i, NETDEV_QUEUE_TYPE_TX, + &txr->bnapi->napi); + } + + return 0; +} + +static int bnge_init_ring_grps(struct bnge_net *bn) +{ + struct bnge_dev *bd =3D bn->bd; + int i; + + bn->grp_info =3D kcalloc(bd->nq_nr_rings, + sizeof(struct bnge_ring_grp_info), + GFP_KERNEL); + if (!bn->grp_info) + return -ENOMEM; + for (i =3D 0; i < bd->nq_nr_rings; i++) { + bn->grp_info[i].fw_stats_ctx =3D INVALID_HW_RING_ID; + bn->grp_info[i].fw_grp_id =3D INVALID_HW_RING_ID; + bn->grp_info[i].rx_fw_ring_id =3D INVALID_HW_RING_ID; + bn->grp_info[i].agg_fw_ring_id =3D INVALID_HW_RING_ID; + bn->grp_info[i].nq_fw_ring_id =3D INVALID_HW_RING_ID; + } + + return 0; +} + +static void bnge_init_vnics(struct bnge_net *bn) +{ + struct bnge_vnic_info *vnic0 =3D &bn->vnic_info[BNGE_VNIC_DEFAULT]; + int i; + + for (i =3D 0; i < bn->nr_vnics; i++) { + struct bnge_vnic_info *vnic =3D &bn->vnic_info[i]; + int j; + + vnic->fw_vnic_id =3D INVALID_HW_RING_ID; + vnic->vnic_id =3D i; + for (j =3D 0; j < BNGE_MAX_CTX_PER_VNIC; j++) + vnic->fw_rss_cos_lb_ctx[j] =3D INVALID_HW_RING_ID; + + if (bn->vnic_info[i].rss_hash_key) { + if (i =3D=3D BNGE_VNIC_DEFAULT) { + u8 *key =3D (void *)vnic->rss_hash_key; + int k; + + if (!bn->rss_hash_key_valid && + !bn->rss_hash_key_updated) { + get_random_bytes(bn->rss_hash_key, + HW_HASH_KEY_SIZE); + bn->rss_hash_key_updated =3D true; + } + + memcpy(vnic->rss_hash_key, bn->rss_hash_key, + HW_HASH_KEY_SIZE); + + if (!bn->rss_hash_key_updated) + continue; + + bn->rss_hash_key_updated =3D false; + bn->rss_hash_key_valid =3D true; + + bn->toeplitz_prefix =3D 0; + for (k =3D 0; k < 8; k++) { + bn->toeplitz_prefix <<=3D 8; + bn->toeplitz_prefix |=3D key[k]; + } + } else { + memcpy(vnic->rss_hash_key, vnic0->rss_hash_key, + HW_HASH_KEY_SIZE); + } + } + } +} + static void bnge_setup_msix(struct bnge_net *bn) { struct net_device *dev =3D bn->netdev; @@ -871,6 +1069,20 @@ static void bnge_free_irq(struct bnge_net *bn) } } =20 +static int bnge_init_nic(struct bnge_net *bn) +{ + int rc; + + bnge_init_nq_tree(bn); + bnge_init_rx_rings(bn); + bnge_init_tx_rings(bn); + rc =3D bnge_init_ring_grps(bn); + if (rc) + return rc; + bnge_init_vnics(bn); + return rc; +} + static int bnge_open_core(struct bnge_net *bn) { struct bnge_dev *bd =3D bn->bd; @@ -897,9 +1109,16 @@ static int bnge_open_core(struct bnge_net *bn) goto err_del_napi; } =20 + rc =3D bnge_init_nic(bn); + if (rc) { + netdev_err(bn->netdev, "bnge_init_nic err: %d\n", rc); + goto err_free_irq; + } set_bit(BNGE_STATE_OPEN, &bd->state); return 0; =20 +err_free_irq: + bnge_free_irq(bn); err_del_napi: bnge_del_napi(bn); bnge_free_core(bn); diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.h b/drivers/net= /ethernet/broadcom/bnge/bnge_netdev.h index 7c56786f5a7..234c0523547 100644 --- a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.h +++ b/drivers/net/ethernet/broadcom/bnge/bnge_netdev.h @@ -118,6 +118,20 @@ struct bnge_sw_rx_agg_bd { dma_addr_t mapping; }; =20 +#define HWRM_RING_ALLOC_TX 0x1 +#define HWRM_RING_ALLOC_RX 0x2 +#define HWRM_RING_ALLOC_AGG 0x4 +#define HWRM_RING_ALLOC_CMPL 0x8 +#define HWRM_RING_ALLOC_NQ 0x10 + +struct bnge_ring_grp_info { + u16 fw_stats_ctx; + u16 fw_grp_id; + u16 rx_fw_ring_id; + u16 agg_fw_ring_id; + u16 nq_fw_ring_id; +}; + #define BNGE_RX_COPY_THRESH 256 =20 #define BNGE_HW_FEATURE_VLAN_ALL_RX \ @@ -133,6 +147,28 @@ enum { =20 #define BNGE_NET_EN_TPA (BNGE_NET_EN_GRO | BNGE_NET_EN_LRO) =20 +/* Minimum TX BDs for a TX packet with MAX_SKB_FRAGS + 1. We need one extra + * BD because the first TX BD is always a long BD. + */ +#define BNGE_MIN_TX_DESC_CNT (MAX_SKB_FRAGS + 2) + +#define RX_RING(bn, x) (((x) & (bn)->rx_ring_mask) >> (BNGE_PAGE_SHIFT - 4= )) +#define RX_AGG_RING(bn, x) (((x) & (bn)->rx_agg_ring_mask) >> \ + (BNGE_PAGE_SHIFT - 4)) +#define RX_IDX(x) ((x) & (RX_DESC_CNT - 1)) + +#define TX_RING(bn, x) (((x) & (bn)->tx_ring_mask) >> (BNGE_PAGE_SHIFT - 4= )) +#define TX_IDX(x) ((x) & (TX_DESC_CNT - 1)) + +#define CP_RING(x) (((x) & ~(CP_DESC_CNT - 1)) >> (BNGE_PAGE_SHIFT - 4)) +#define CP_IDX(x) ((x) & (CP_DESC_CNT - 1)) + +#define RING_RX(bn, idx) ((idx) & (bn)->rx_ring_mask) +#define NEXT_RX(idx) ((idx) + 1) + +#define RING_RX_AGG(bn, idx) ((idx) & (bn)->rx_agg_ring_mask) +#define NEXT_RX_AGG(idx) ((idx) + 1) + #define BNGE_NQ_HDL_TYPE_RX 0x00 #define BNGE_NQ_HDL_TYPE_TX 0x01 =20 @@ -181,6 +217,14 @@ struct bnge_net { struct bnge_vnic_info *vnic_info; int nr_vnics; int total_irqs; + + int tx_wake_thresh; + u16 rx_offset; + u16 rx_dma_offset; + + u8 rss_hash_key[HW_HASH_KEY_SIZE]; + u8 rss_hash_key_valid:1; + u8 rss_hash_key_updated:1; }; =20 #define BNGE_DEFAULT_RX_RING_SIZE 511 @@ -309,6 +353,9 @@ struct bnge_napi { #define BNGE_MAX_UC_ADDRS 4 =20 struct bnge_vnic_info { + u16 fw_vnic_id; +#define BNGE_MAX_CTX_PER_VNIC 8 + u16 fw_rss_cos_lb_ctx[BNGE_MAX_CTX_PER_VNIC]; u8 *uc_list; dma_addr_t rss_table_dma_addr; __le16 *rss_table; @@ -331,5 +378,6 @@ struct bnge_vnic_info { #define BNGE_VNIC_RSS_FLAG 1 #define BNGE_VNIC_MCAST_FLAG 4 #define BNGE_VNIC_UCAST_FLAG 8 + u32 vnic_id; }; #endif /* _BNGE_NETDEV_H_ */ diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_rmem.h b/drivers/net/e= thernet/broadcom/bnge/bnge_rmem.h index 162a66c7983..0e7684e2071 100644 --- a/drivers/net/ethernet/broadcom/bnge/bnge_rmem.h +++ b/drivers/net/ethernet/broadcom/bnge/bnge_rmem.h @@ -184,6 +184,7 @@ struct bnge_ctx_mem_info { struct bnge_ring_struct { struct bnge_ring_mem_info ring_mem; =20 + u16 fw_ring_id; union { u16 grp_idx; u16 map_idx; /* Used by NQs */ --=20 2.47.3