From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.216.100 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794896310; b=zSHf4sbmpfzoma0w8263maM6jb+oHHa4NwSjYJQE7Fnyd2Mio7izAO2IYBLC4Bm2aeZ3 hOmFRk7DgrBNLovSWypZ+IdDIUJ6n9Bl/qlGgKq3xNyqKUOTtzeIP/gfTJ14Wn8rp3klQ qlvYw00aIsyXG7Dsln2M3ZM65H/+nd3xfjO5xeCSjd24X2EDkyS4OC3tupbjSpXGm3U0y szkFClt7RNxskZLdCNom38CfSnlxrdwKmi2MH9MoTZ/DaLLQjsXd2frWw2c4hlsFMcvFx eaYzmE6TEZ/hXJJv49RE/fr/pBDmtv4ClCnEiPasuSkMJkawNpwwy7cYzBvYCRAoGWw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794896310; h=DMARC-Filter:Received:X-Google-DKIM-Signature:X-Forwarded-Encrypted: X-Gm-Message-State:X-Gm-Gg:X-Received:Received:X-Relaying-Domain: X-CFilter-Loop:Received:DKIM-Signature:X-Forwarded-Encrypted: X-Received:X-Received:Received:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-DetectorID-Processed; bh=3F4fvy7pR5JySBIIeLV6EJkprBWoCpKbk4kI746JJ9Y=; b=kKn7GkPKpMO2LFPM0S/NCQp+aRKw2mhzlnHCq5XAwkp6ftZsVnFMMOXjIaK2f7SqvMvN rXHRqny1rC9+mWZ7+pVvGQNEEYr2o5GljCFf9WGuTCpF78B31GNcZd/0pFn58onkXIDEO LZbrkO27p99TlBE6h6HJ2g/uIeq5k8Aao2u/FCmrhyPuO9Iw/UxAqajeHKK/nhSRIbUc5 WxXi4PpBGHIfA81Fod103F9E8mr57PmWgEHH7W4Z3j0jj1PN5Omk2u7BrVuHQVb5sLpiV AaZ0ZnQDBoKdfizL9AJJ9DOtdF8wYAvqvLLL5baEa43RPDez8Zmbu6CtRzaupLbhhqw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass header.d=broadcom.com header.i=@broadcom.com header.a=rsa-sha256 header.s=google header.b=BfX0K+FP; arc=none smtp.remote-ip=209.85.216.100 Received: from mail-pj1-f100.google.com (mail-pj1-f100.google.com [209.85.216.100]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 88C8C606A31C for ; Tue, 17 Nov 2026 06:18:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 88C8C606A31C Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject 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.a=rsa-sha256 header.s=google header.b=BfX0K+FP Received: by mail-pj1-f100.google.com with SMTP id 98e67ed59e1d1-3b0d0b80fb9so2951344a91.1 for ; Mon, 16 Nov 2026 22:18:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794896309; x=1795501109; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=3F4fvy7pR5JySBIIeLV6EJkprBWoCpKbk4kI746JJ9Y=; b=et22FLMNKJc4uwRNXcfOdUhcogsPkwUh4gocKwLETJpGXd4qRHJN0LcXpCVHMmKH+z ueyAVBgV6AZhregYxUlJl4UMfnQ6rL2jWhNnAkJ/j53NEhWynpaJDUPBHPHe5oUxYRTs tV+1v9iNrhwZY3GedD71oWOW4g8iTjYksVeziPR/Rbj4qS3oWEtpe9R0NxgnvysKjdbL ZYZ8i7S7huFxmuYSsrVQhvllE0NWcUNrZVzuvnWON7dYn33LK3hl2SmURZSgYdwUzJKb I9xA4P7bakMeSBqto0Tl1ThESJJJWJkE+3nWD2zEDr6HQJDBSha+vZRkYOLCS6a3F+hn 3gug== X-Forwarded-Encrypted: i=1; AL+hErGORB1Icn6+aMp4lUj/a+aV2mXgVb5z4v6xPntV/ryAL1QZ9SGi4Py38jflE4RokwKV0KDE1hmpH9c1c9U=@vger.kernel.org X-Gm-Message-State: APuU4Z/MpDP3UImRw5cv4z4BwDlE8IjTHmdd1bKBj6a8B/sAYMcySjh7 2mWe1OMU40a5iB0VkQueGmMPbEUT19JH95pJU7yGz3JLtQVQUc433tlTm/WZwwCbxKiGMqL4p1K UADDv7oOl7JDoesJ+PSlQk3zSOAijE2+eY0mdNpM6kzrYS5MqHfwnMFcvrhGXYHCOfxlNMLzhJB X+6K5PW/u73loMOqeSOO7ML6J/Eu0MaaCvTPe0tJ0b2u4n7jIK6HBezoG7FZmWYt1//34KFd32g jFfYZN5GmrkXRfhKMjfWVM3qCPI X-Gm-Gg: AZFdTZcXbYzoOYXmD0vVN0/r1DdTAhEJMfCsj/jWCRDbBqr6kRFjQYEoSdPDMl16vB2 doHd9lmECJWLEOIApu6vKbjRW4Krjjg3QjI44TAo6JPEeIBpFAufjiR1+aMo+hS42/VOAPRtDEg sr70sLAKPkn8asIZWbnPTzsTJ8cfSzpmOAW9aFy4t0ZT1lYKpq+hUZrWIUdccWEixnCH7nSmJpx aG5iahZUcaX5dS7BAdPsE5quMIu+gdnHefhPME1KuyJcSfOEApHArZL7U30oJt2Xzcihge+4f/v qljjUzAzqabgBCyGttdX7KUpWttpI+M2B+5CAjKlmRycRqrcp5UQpfuxg9+WmdY2viFtUDQlG0R 5VT3R40j6E8xLWiUC2mRLxS+s+gn3kPrmz17m6H27BmseRbU5CMWPzb6OyQh1t1NX7/HFwRqNPu jsiyHg1JSNB+cqSlcmDqVfXCOwUyOPJn5/VNGWFIOEWQ== X-Received: by 2002:a17:90b:4ec5:b0:3ad:b86d:dbad with SMTP id 98e67ed59e1d1-3b1b0a0dd02mr10959745a91.30.1794896308624; Mon, 16 Nov 2026 22:18:28 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-26.dlp.protect.broadcom.com. [144.49.247.26]) by smtp-relay.gmail.com with ESMTPS id 98e67ed59e1d1-3b3ab9f98bdsm1276651a91.0.2026.11.16.22.18.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Nov 2026 22:18:28 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-8a06da65d92so3270446b3a.0 for ; Mon, 16 Nov 2026 22:18:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1794896306; x=1795501106; 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:content-type; bh=3F4fvy7pR5JySBIIeLV6EJkprBWoCpKbk4kI746JJ9Y=; b=BfX0K+FPzNHbRMif6OeusGkdM2BA/HbY3bdnpO5/d8OWheBC2Qb1TOMItEbBqC/fmB OvtHp8Hf97R+gTsMG4l5G7J1ECMVeISaV1x8dfeBJVPjJQDm5MZli6A34vOJA2z5vzmq 1XFfrrL1/rwuUggF0AhnxsbIKPzXUpBIx2t2s= X-Forwarded-Encrypted: i=1; AL+hErEB3TRmkU++xYX9Anv2GVoWeL43FjUE8yaH0CPnInfonz9efXeAsii1yxlrwiDsQ4Z07RjTAEcdCr0i3vw=@vger.kernel.org X-Received: by 2002:a17:903:1ad0:b0:2e9:3f5a:de9b with SMTP id d9443c01a7336-2ee0de41d9bmr125979865ad.9.1794896306397; Mon, 16 Nov 2026 22:18:26 -0800 (PST) X-Received: by 2002:a17:903:1ad0:b0:2e9:3f5a:de9b with SMTP id d9443c01a7336-2ee0de41d9bmr125979695ad.9.1794896305884; Mon, 16 Nov 2026 22:18:25 -0800 (PST) Received: from localhost.localdomain ([192.19.203.250]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2efd76d8668sm8669335ad.6.2026.11.16.22.18.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 22:18:25 -0800 (PST) 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 , Dharmender Garg , Rajashekar Hudumula , Ramakrishna Koduri Subject: [PATCH net-next v5 1/5] bnge: factor out per-NQ alloc/free helpers Date: Tue, 17 Nov 2026 06:16:37 +0000 Message-ID: <20261117061641.122942-2-bhargava.marreddy@broadcom.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261117061641.122942-1-bhargava.marreddy@broadcom.com> References: <20261117061641.122942-1-bhargava.marreddy@broadcom.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e The descriptor array, ring memory, firmware ring and IRQ of an NQ are allocated and released inside loops over all NQs, and the NQ ring memory is set up with the completion rings. Factor the per-NQ parts out into bnge_alloc_nq()/bnge_free_nq(), bnge_hwrm_nq_alloc()/bnge_hwrm_nq_free() and bnge_nq_request_irq()/bnge_nq_free_irq() so a single NQ can be created and destroyed independently of the others. Rename bnge_{alloc,free}_nq_arrays() to bnge_{alloc,free}_nqs(). The NQ ring_mem setup, ring allocation and fw_ring_id initialization move into bnge_alloc_nq(), so the NQ ring memory is allocated with the NQ descriptor arrays rather than with the completion rings. The fw_ring_id initialization thus moves from bnge_init_nic(), which runs on every open, to bnge_alloc_core(), which also runs on every open. The IRQ map index is also set there; the value is unchanged. The aux vector count it depends on is sampled once in bnge_alloc_nqs() and passed to bnge_alloc_nq(), so every NQ of one allocation gets a distinct irq_tbl index even if RoCE is disabled concurrently. The affinity hint is now derived from bnapi->index, which equals the loop index used before. The error path of bnge_alloc_nqs() now unwinds only the NQs allocated so far. Also rename bnge_{alloc,free,init}_nq_tree() to bnge_{alloc,free,init}_cp_rings(), since they no longer touch the NQ itself, only the completion rings hanging off it. One behavioral difference: bnge_hwrm_ring_free() now resets grp_info[i].nq_fw_ring_id to INVALID_HW_RING_ID for every NQ, not only for the NQs that had a valid firmware ring ID. Otherwise there is no functional change. Signed-off-by: Bhargava Marreddy Reviewed-by: Dharmender Garg Reviewed-by: Rajashekar Hudumula Reviewed-by: Ramakrishna Koduri --- .../net/ethernet/broadcom/bnge/bnge_netdev.c | 290 ++++++++++-------- .../net/ethernet/broadcom/bnge/bnge_rmem.c | 10 - 2 files changed, 169 insertions(+), 131 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c b/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c index 25f844e6f6d3..04f5aa75f70e 100644 --- a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c +++ b/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c @@ -503,61 +503,95 @@ static int bnge_alloc_cp_desc_arr(struct bnge_cp_ring_info *cpr, int n) return -ENOMEM; } -static void bnge_free_nq_arrays(struct bnge_net *bn) +static void bnge_free_nq(struct bnge_net *bn, struct bnge_napi *bnapi) { - struct bnge_dev *bd = bn->bd; - int i; + struct bnge_nq_ring_info *nqr = &bnapi->nq_ring; - for (i = 0; i < bd->nq_nr_rings; i++) { - struct bnge_napi *bnapi = bn->bnapi[i]; + bnge_free_ring(bn->bd, &nqr->ring_struct.ring_mem); + bnge_free_nq_desc_arr(nqr); +} + +static int bnge_alloc_nq(struct bnge_net *bn, struct bnge_napi *bnapi, + u16 aux_msix) +{ + struct bnge_nq_ring_info *nqr = &bnapi->nq_ring; + struct bnge_ring_mem_info *rmem; + struct bnge_ring_struct *ring; + int rc; + + ring = &nqr->ring_struct; + rmem = &ring->ring_mem; - bnge_free_nq_desc_arr(&bnapi->nq_ring); + rc = bnge_alloc_nq_desc_arr(nqr, bn->cp_nr_pages); + if (rc) + return rc; + + nqr->bnapi = bnapi; + rmem->nr_pages = bn->cp_nr_pages; + rmem->page_size = HW_CMPD_RING_SIZE; + rmem->pg_arr = (void **)nqr->desc_ring; + rmem->dma_arr = nqr->desc_mapping; + rmem->vmem_size = 0; + rmem->flags = BNGE_RMEM_RING_PTE_FLAG; + rc = bnge_alloc_ring(bn->bd, rmem); + if (rc) { + bnge_free_nq_desc_arr(nqr); + return rc; } + + ring->fw_ring_id = INVALID_HW_RING_ID_32BIT; + ring->map_idx = aux_msix + bnapi->index; + return 0; } -static int bnge_alloc_nq_arrays(struct bnge_net *bn) +static void bnge_free_nqs(struct bnge_net *bn) { struct bnge_dev *bd = bn->bd; + int i; + + for (i = 0; i < bd->nq_nr_rings; i++) + bnge_free_nq(bn, bn->bnapi[i]); +} + +static int bnge_alloc_nqs(struct bnge_net *bn) +{ + struct bnge_dev *bd = bn->bd; + u16 aux_msix; int i, rc; + /* RoCE can be disabled concurrently; sample the aux vector count once + * so every NQ gets a distinct irq_tbl index. + */ + aux_msix = bnge_aux_get_msix(bd); for (i = 0; i < bd->nq_nr_rings; i++) { - struct bnge_napi *bnapi = bn->bnapi[i]; - - rc = bnge_alloc_nq_desc_arr(&bnapi->nq_ring, bn->cp_nr_pages); + rc = bnge_alloc_nq(bn, bn->bnapi[i], aux_msix); if (rc) - goto err_free_nq_arrays; + goto err_free_nqs; } return 0; -err_free_nq_arrays: - bnge_free_nq_arrays(bn); +err_free_nqs: + while (--i >= 0) + bnge_free_nq(bn, bn->bnapi[i]); return rc; } -static void bnge_free_nq_tree(struct bnge_net *bn) +static void bnge_free_cp_rings(struct bnge_net *bn) { struct bnge_dev *bd = bn->bd; int i; for (i = 0; i < bd->nq_nr_rings; i++) { - struct bnge_napi *bnapi = bn->bnapi[i]; - struct bnge_nq_ring_info *nqr; - struct bnge_ring_struct *ring; + struct bnge_nq_ring_info *nqr = &bn->bnapi[i]->nq_ring; int j; - nqr = &bnapi->nq_ring; - ring = &nqr->ring_struct; - - bnge_free_ring(bd, &ring->ring_mem); - if (!nqr->cp_ring_arr) continue; for (j = 0; j < nqr->cp_ring_count; j++) { struct bnge_cp_ring_info *cpr = &nqr->cp_ring_arr[j]; - ring = &cpr->ring_struct; - bnge_free_ring(bd, &ring->ring_mem); + bnge_free_ring(bd, &cpr->ring_struct.ring_mem); bnge_free_cp_desc_arr(cpr); } kfree(nqr->cp_ring_arr); @@ -594,31 +628,21 @@ static int alloc_one_cp_ring(struct bnge_net *bn, return rc; } -static int bnge_alloc_nq_tree(struct bnge_net *bn) +static int bnge_alloc_cp_rings(struct bnge_net *bn) { struct bnge_dev *bd = bn->bd; - int i, j, ulp_msix, rc; + int i, j, rc; int tcs = 1; - ulp_msix = bnge_aux_get_msix(bd); for (i = 0, j = 0; i < bd->nq_nr_rings; i++) { bool sh = !!(bd->flags & BNGE_EN_SHARED_CHNL); struct bnge_napi *bnapi = bn->bnapi[i]; struct bnge_nq_ring_info *nqr; struct bnge_cp_ring_info *cpr; - struct bnge_ring_struct *ring; int cp_count = 0, k; int rx = 0, tx = 0; nqr = &bnapi->nq_ring; - nqr->bnapi = bnapi; - ring = &nqr->ring_struct; - - rc = bnge_alloc_ring(bd, &ring->ring_mem); - if (rc) - goto err_free_nq_tree; - - ring->map_idx = ulp_msix + i; if (i < bd->rx_nr_rings) { cp_count++; @@ -634,7 +658,7 @@ static int bnge_alloc_nq_tree(struct bnge_net *bn) nqr->cp_ring_arr = kzalloc_objs(*cpr, cp_count); if (!nqr->cp_ring_arr) { rc = -ENOMEM; - goto err_free_nq_tree; + goto err_free_cp_rings; } nqr->cp_ring_count = cp_count; @@ -643,7 +667,7 @@ static int bnge_alloc_nq_tree(struct bnge_net *bn) cpr = &nqr->cp_ring_arr[k]; rc = alloc_one_cp_ring(bn, cpr); if (rc) - goto err_free_nq_tree; + goto err_free_cp_rings; cpr->bnapi = bnapi; cpr->cp_idx = k; @@ -663,8 +687,8 @@ static int bnge_alloc_nq_tree(struct bnge_net *bn) } return 0; -err_free_nq_tree: - bnge_free_nq_tree(bn); +err_free_cp_rings: + bnge_free_cp_rings(bn); return rc; } @@ -1200,8 +1224,8 @@ static void bnge_free_core(struct bnge_net *bn) bnge_free_vnic_attributes(bn); bnge_free_tx_rings(bn); bnge_free_rx_rings(bn); - bnge_free_nq_tree(bn); - bnge_free_nq_arrays(bn); + bnge_free_cp_rings(bn); + bnge_free_nqs(bn); bnge_free_ring_stats(bn); bnge_free_ring_grps(bn); bnge_free_vnics(bn); @@ -1232,13 +1256,9 @@ static int bnge_alloc_core(struct bnge_net *bn) bn->bnapi = bnapi; bnapi += arr_size; for (i = 0; i < bd->nq_nr_rings; i++, bnapi += size) { - struct bnge_nq_ring_info *nqr; - bn->bnapi[i] = bnapi; bn->bnapi[i]->index = i; bn->bnapi[i]->bn = bn; - nqr = &bn->bnapi[i]->nq_ring; - nqr->ring_struct.ring_mem.flags = BNGE_RMEM_RING_PTE_FLAG; } bn->rx_ring = kzalloc_objs(struct bnge_rx_ring_info, bd->rx_nr_rings); @@ -1297,7 +1317,7 @@ static int bnge_alloc_core(struct bnge_net *bn) if (rc) goto err_free_ring_stats; - rc = bnge_alloc_nq_arrays(bn); + rc = bnge_alloc_nqs(bn); if (rc) goto err_free_vnics; @@ -1305,13 +1325,13 @@ static int bnge_alloc_core(struct bnge_net *bn) rc = bnge_alloc_rx_rings(bn); if (rc) - goto err_free_nq_arrays; + goto err_free_nqs; rc = bnge_alloc_tx_rings(bn); if (rc) goto err_free_rx_rings; - rc = bnge_alloc_nq_tree(bn); + rc = bnge_alloc_cp_rings(bn); if (rc) goto err_free_tx_rings; @@ -1320,17 +1340,17 @@ static int bnge_alloc_core(struct bnge_net *bn) BNGE_VNIC_UCAST_FLAG; rc = bnge_alloc_vnic_attributes(bn); if (rc) - goto err_free_nq_tree; + goto err_free_cp_rings; return 0; -err_free_nq_tree: - bnge_free_nq_tree(bn); +err_free_cp_rings: + bnge_free_cp_rings(bn); err_free_tx_rings: bnge_free_tx_rings(bn); err_free_rx_rings: bnge_free_rx_rings(bn); -err_free_nq_arrays: - bnge_free_nq_arrays(bn); +err_free_nqs: + bnge_free_nqs(bn); err_free_vnics: bnge_free_vnics(bn); err_free_ring_stats: @@ -1389,21 +1409,18 @@ static int bnge_cp_num_to_irq_num(struct bnge_net *bn, int n) return nqr->ring_struct.map_idx; } -static void bnge_init_nq_tree(struct bnge_net *bn) +static void bnge_init_cp_rings(struct bnge_net *bn) { struct bnge_dev *bd = bn->bd; int i, j; for (i = 0; i < bd->nq_nr_rings; i++) { struct bnge_nq_ring_info *nqr = &bn->bnapi[i]->nq_ring; - struct bnge_ring_struct *ring = &nqr->ring_struct; - ring->fw_ring_id = INVALID_HW_RING_ID_32BIT; for (j = 0; j < nqr->cp_ring_count; j++) { struct bnge_cp_ring_info *cpr = &nqr->cp_ring_arr[j]; - ring = &cpr->ring_struct; - ring->fw_ring_id = INVALID_HW_RING_ID_32BIT; + cpr->ring_struct.fw_ring_id = INVALID_HW_RING_ID_32BIT; } } } @@ -1914,6 +1931,44 @@ static int bnge_hwrm_rx_ring_alloc(struct bnge_net *bn, return 0; } +static int bnge_hwrm_nq_alloc(struct bnge_net *bn, struct bnge_napi *bnapi) +{ + struct bnge_nq_ring_info *nqr = &bnapi->nq_ring; + u32 type = HWRM_RING_ALLOC_NQ; + struct bnge_ring_struct *ring; + unsigned int vector; + u32 map_idx; + int rc; + + ring = &nqr->ring_struct; + map_idx = ring->map_idx; + + vector = bn->bd->irq_tbl[map_idx].vector; + disable_irq_nosync(vector); + rc = hwrm_ring_alloc_send_msg(bn, ring, type, map_idx); + if (rc) { + enable_irq(vector); + return rc; + } + bnge_set_db(bn, &nqr->nq_db, type, map_idx, ring->fw_ring_id); + bnge_db_nq(bn, &nqr->nq_db, nqr->nq_raw_cons); + enable_irq(vector); + + return 0; +} + +static void bnge_hwrm_nq_free(struct bnge_net *bn, struct bnge_napi *bnapi) +{ + struct bnge_ring_struct *ring = &bnapi->nq_ring.ring_struct; + + if (ring->fw_ring_id == INVALID_HW_RING_ID_32BIT) + return; + + hwrm_ring_free_send_msg(bn, ring, RING_FREE_REQ_RING_TYPE_NQ, + INVALID_HW_RING_ID); + ring->fw_ring_id = INVALID_HW_RING_ID_32BIT; +} + static int bnge_hwrm_ring_alloc(struct bnge_net *bn) { struct bnge_dev *bd = bn->bd; @@ -1923,22 +1978,11 @@ static int bnge_hwrm_ring_alloc(struct bnge_net *bn) agg_rings = !!(bnge_is_agg_reqd(bd)); for (i = 0; i < bd->nq_nr_rings; i++) { struct bnge_napi *bnapi = bn->bnapi[i]; - struct bnge_nq_ring_info *nqr = &bnapi->nq_ring; - struct bnge_ring_struct *ring = &nqr->ring_struct; - u32 type = HWRM_RING_ALLOC_NQ; - u32 map_idx = ring->map_idx; - unsigned int vector; + struct bnge_ring_struct *ring = &bnapi->nq_ring.ring_struct; - vector = bd->irq_tbl[map_idx].vector; - disable_irq_nosync(vector); - rc = hwrm_ring_alloc_send_msg(bn, ring, type, map_idx); - if (rc) { - enable_irq(vector); + rc = bnge_hwrm_nq_alloc(bn, bnapi); + if (rc) goto err_out; - } - bnge_set_db(bn, &nqr->nq_db, type, map_idx, ring->fw_ring_id); - bnge_db_nq(bn, &nqr->nq_db, nqr->nq_raw_cons); - enable_irq(vector); bn->grp_info[i].nq_fw_ring_id = (u16)ring->fw_ring_id; if (!i) { @@ -2566,23 +2610,14 @@ static void bnge_hwrm_ring_free(struct bnge_net *bn, bool close_path) bnge_disable_int_sync(bn); for (i = 0; i < bd->nq_nr_rings; i++) { - struct bnge_napi *bnapi = bn->bnapi[i]; - struct bnge_nq_ring_info *nqr; - struct bnge_ring_struct *ring; + struct bnge_nq_ring_info *nqr = &bn->bnapi[i]->nq_ring; int j; - nqr = &bnapi->nq_ring; for (j = 0; j < nqr->cp_ring_count && nqr->cp_ring_arr; j++) bnge_hwrm_cp_ring_free(bn, &nqr->cp_ring_arr[j]); - ring = &nqr->ring_struct; - if (ring->fw_ring_id != INVALID_HW_RING_ID_32BIT) { - hwrm_ring_free_send_msg(bn, ring, - RING_FREE_REQ_RING_TYPE_NQ, - INVALID_HW_RING_ID); - ring->fw_ring_id = INVALID_HW_RING_ID_32BIT; - bn->grp_info[i].nq_fw_ring_id = INVALID_HW_RING_ID; - } + bnge_hwrm_nq_free(bn, bn->bnapi[i]); + bn->grp_info[i].nq_fw_ring_id = INVALID_HW_RING_ID; } } @@ -2627,27 +2662,60 @@ 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) +static void bnge_nq_free_irq(struct bnge_net *bn, struct bnge_napi *bnapi) { + int map_idx = bnapi->nq_ring.ring_struct.map_idx; + struct bnge_irq *irq = &bn->bd->irq_tbl[map_idx]; + + if (irq->requested) { + if (irq->have_cpumask) { + irq_set_affinity_hint(irq->vector, NULL); + free_cpumask_var(irq->cpu_mask); + irq->have_cpumask = 0; + } + free_irq(irq->vector, bnapi); + } + + irq->requested = 0; +} + +static int bnge_nq_request_irq(struct bnge_net *bn, struct bnge_napi *bnapi) +{ + int map_idx = bnapi->nq_ring.ring_struct.map_idx; struct bnge_dev *bd = bn->bd; struct bnge_irq *irq; - int i; + int rc; - for (i = 0; i < bd->nq_nr_rings; i++) { - int map_idx = bnge_cp_num_to_irq_num(bn, i); + irq = &bd->irq_tbl[map_idx]; - irq = &bd->irq_tbl[map_idx]; - if (irq->requested) { - if (irq->have_cpumask) { - irq_set_affinity_hint(irq->vector, NULL); - free_cpumask_var(irq->cpu_mask); - irq->have_cpumask = 0; - } - free_irq(irq->vector, bn->bnapi[i]); - } + rc = request_irq(irq->vector, irq->handler, 0, irq->name, bnapi); + if (rc) + return rc; + + netif_napi_set_irq_locked(&bnapi->napi, irq->vector); + irq->requested = 1; + + if (zalloc_cpumask_var(&irq->cpu_mask, GFP_KERNEL)) { + int numa_node = dev_to_node(&bd->pdev->dev); - irq->requested = 0; + irq->have_cpumask = 1; + cpumask_set_cpu(cpumask_local_spread(bnapi->index, numa_node), + irq->cpu_mask); + if (irq_set_affinity_hint(irq->vector, irq->cpu_mask)) + netdev_warn(bn->netdev, + "Set affinity failed, IRQ = %d\n", + irq->vector); } + return 0; +} + +static void bnge_free_irq(struct bnge_net *bn) +{ + struct bnge_dev *bd = bn->bd; + int i; + + for (i = 0; i < bd->nq_nr_rings; i++) + bnge_nq_free_irq(bn, bn->bnapi[i]); } static int bnge_request_irq(struct bnge_net *bn) @@ -2661,29 +2729,9 @@ static int bnge_request_irq(struct bnge_net *bn) return rc; } for (i = 0; i < bd->nq_nr_rings; i++) { - int map_idx = bnge_cp_num_to_irq_num(bn, i); - struct bnge_irq *irq = &bd->irq_tbl[map_idx]; - - rc = request_irq(irq->vector, irq->handler, 0, irq->name, - bn->bnapi[i]); + rc = bnge_nq_request_irq(bn, bn->bnapi[i]); if (rc) goto err_free_irq; - - netif_napi_set_irq_locked(&bn->bnapi[i]->napi, irq->vector); - irq->requested = 1; - - if (zalloc_cpumask_var(&irq->cpu_mask, GFP_KERNEL)) { - int numa_node = dev_to_node(&bd->pdev->dev); - - irq->have_cpumask = 1; - cpumask_set_cpu(cpumask_local_spread(i, numa_node), - irq->cpu_mask); - if (irq_set_affinity_hint(irq->vector, irq->cpu_mask)) { - netdev_warn(bn->netdev, - "Set affinity failed, IRQ = %d\n", - irq->vector); - } - } } return 0; @@ -2830,7 +2878,7 @@ static int bnge_init_nic(struct bnge_net *bn) { int rc; - bnge_init_nq_tree(bn); + bnge_init_cp_rings(bn); bnge_init_rx_rings(bn); rc = bnge_alloc_rx_ring_pair_bufs(bn); diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_rmem.c b/drivers/net/ethernet/broadcom/bnge/bnge_rmem.c index b066ee887a09..bbae84b4157e 100644 --- a/drivers/net/ethernet/broadcom/bnge/bnge_rmem.c +++ b/drivers/net/ethernet/broadcom/bnge/bnge_rmem.c @@ -431,20 +431,10 @@ void bnge_init_ring_struct(struct bnge_net *bn) for (i = 0; i < bd->nq_nr_rings; i++) { struct bnge_napi *bnapi = bn->bnapi[i]; struct bnge_ring_mem_info *rmem; - struct bnge_nq_ring_info *nqr; struct bnge_rx_ring_info *rxr; struct bnge_tx_ring_info *txr; struct bnge_ring_struct *ring; - nqr = &bnapi->nq_ring; - ring = &nqr->ring_struct; - rmem = &ring->ring_mem; - rmem->nr_pages = bn->cp_nr_pages; - rmem->page_size = HW_CMPD_RING_SIZE; - rmem->pg_arr = (void **)nqr->desc_ring; - rmem->dma_arr = nqr->desc_mapping; - rmem->vmem_size = 0; - rxr = bnapi->rx_ring; if (!rxr) goto skip_rx; -- 2.47.3