From patchwork Fri Oct 27 23:22:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 13439305 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3034A405FA for ; Fri, 27 Oct 2023 23:23:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="AAfZ0wu+" Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94B711BB for ; Fri, 27 Oct 2023 16:23:42 -0700 (PDT) Received: by mail-qk1-x735.google.com with SMTP id af79cd13be357-773ac11de71so188026685a.2 for ; Fri, 27 Oct 2023 16:23:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1698449021; x=1699053821; darn=vger.kernel.org; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=gek68+UrJUmq9fRMKpE+7Dgw62tXg5M4O35BPEBq5s0=; b=AAfZ0wu+z85EhsAIOITzp1+vUnTlL3JnOnIg1Ic5mjx3CwwVP7Bs3rQzuyxKb/PE92 BY1ky+wGgunp3fahPaIaflvG6fwXWM10RfviSKlomAFqa6ELcYU7/PM2RlBe38zuw5Y2 UqIBwD3pq7VAo6Yt5NV0gHFFNBBpITJaT8ulg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698449021; x=1699053821; h=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=gek68+UrJUmq9fRMKpE+7Dgw62tXg5M4O35BPEBq5s0=; b=X+dcdXleUXwaBXh0wO1NNpRyP6+SQiU9CKB6BT/Hq4w0gdoeQn4VevnZenZs1n1nWl sUXJwdWwkL+AXM1uq16Me415gAe3rl3ArGDQsN+7UhfYO9VYgZvEHsW6nABGxmcQ88J/ +20UChJLvmmtoSw+WZi7GMgh0OhwHQFmGSZHwrP+kkmamBpT61J/NhScfWpXaClPqObm LdV+jk71x8LzF1Gi92PQzNVJiAIyuoITlLz2rH//LQqA5Tm+UTnmeViy22ezwMGpFg4C r22VYyfF7NVqpW/8iHjClw96bXTM3sdZq5mHElzSU+2l7atLKLOy7LkpiXA1ExWWbJ5n 1Bnw== X-Gm-Message-State: AOJu0YwiXhwZoKR5dpUpH90bA7Jc8ZtkxLuz6jGl0Kb4Qu8L0OdOREs3 OVCe01pI8x7Uhb2iKZJZrvPkf1o+UO/7ZZGoFh0= X-Google-Smtp-Source: AGHT+IHxCkW2PO6lgkPvO/KQ/OFYnNRlePEsZFEMJsNtU+MuirjeQctTeFthX4OUNyz1RSD8VJ776Q== X-Received: by 2002:a05:620a:12dc:b0:76d:ada0:4c0 with SMTP id e28-20020a05620a12dc00b0076dada004c0mr3981872qkl.76.1698449020732; Fri, 27 Oct 2023 16:23:40 -0700 (PDT) Received: from lvnvda5233.lvn.broadcom.net ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id y27-20020a05620a09db00b007742ad3047asm984169qky.54.2023.10.27.16.23.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Oct 2023 16:23:40 -0700 (PDT) From: Michael Chan To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, gospo@broadcom.com, Andy Gospodarek Subject: [PATCH net-next 06/13] bnxt_en: Refactor bnxt_tx_int() Date: Fri, 27 Oct 2023 16:22:45 -0700 Message-Id: <20231027232252.36111-7-michael.chan@broadcom.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20231027232252.36111-1-michael.chan@broadcom.com> References: <20231027232252.36111-1-michael.chan@broadcom.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org bnxt_tx_int() processes the only one TX ring from the bnxt_napi pointer. To prepare for more TX rings associated with the bnxt_napi structure, add a new __bnxt_tx_int() function that takes the bnxt_tx_ring_info pointer to process that one TX ring. No functional change. Reviewed-by: Andy Gospodarek Signed-off-by: Michael Chan --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index a4f7fa17daf8..ad56ca9d3ceb 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -687,14 +687,14 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev) return NETDEV_TX_OK; } -static void bnxt_tx_int(struct bnxt *bp, struct bnxt_napi *bnapi, int budget) +static void __bnxt_tx_int(struct bnxt *bp, struct bnxt_tx_ring_info *txr, + int budget) { - struct bnxt_tx_ring_info *txr = bnapi->tx_ring; struct netdev_queue *txq = netdev_get_tx_queue(bp->dev, txr->txq_index); - u16 hw_cons = txr->tx_hw_cons; - u16 cons = txr->tx_cons; struct pci_dev *pdev = bp->pdev; + u16 hw_cons = txr->tx_hw_cons; unsigned int tx_bytes = 0; + u16 cons = txr->tx_cons; int tx_pkts = 0; while (cons != hw_cons) { @@ -749,7 +749,6 @@ static void bnxt_tx_int(struct bnxt *bp, struct bnxt_napi *bnapi, int budget) dev_consume_skb_any(skb); } - bnapi->events &= ~BNXT_TX_CMP_EVENT; WRITE_ONCE(txr->tx_cons, cons); __netif_txq_completed_wake(txq, tx_pkts, tx_bytes, @@ -757,6 +756,14 @@ static void bnxt_tx_int(struct bnxt *bp, struct bnxt_napi *bnapi, int budget) READ_ONCE(txr->dev_state) == BNXT_DEV_STATE_CLOSING); } +static void bnxt_tx_int(struct bnxt *bp, struct bnxt_napi *bnapi, int budget) +{ + struct bnxt_tx_ring_info *txr = bnapi->tx_ring; + + __bnxt_tx_int(bp, txr, budget); + bnapi->events &= ~BNXT_TX_CMP_EVENT; +} + static struct page *__bnxt_alloc_rx_page(struct bnxt *bp, dma_addr_t *mapping, struct bnxt_rx_ring_info *rxr, unsigned int *offset,