From patchwork Wed May 4 16:33:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 12838170 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 687CAC433FE for ; Wed, 4 May 2022 16:33:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353499AbiEDQhA (ORCPT ); Wed, 4 May 2022 12:37:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353489AbiEDQg5 (ORCPT ); Wed, 4 May 2022 12:36:57 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F0E146B15 for ; Wed, 4 May 2022 09:33:20 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 82FD661720 for ; Wed, 4 May 2022 16:33:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C2AEDC385A4; Wed, 4 May 2022 16:33:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1651681999; bh=wbusJfoYZehqiS4XJgZraes4GLnlWPmLjAAcZQ2pDaI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=InCTidC7UEbF1/EziZJGus5yTq7DnbHqhPpAOI+wqExRZjjkmyTqfvKGHqKBg6o0s +H6kp6hPI41vN49bdkHUzzt2+AZJM6SeeNcd2SRt3/v8WPPCnQwk5IwtyIvZ/jnHJa tuJucmYlexTe35LUBFYql83CDWipt0K4kW3BBO9VVJ+Tl97KVDbENs07ssdeJqinUK NTwazla4k4C2Vgac2ra8L5ojL87Qd1Z4ZKZrj/SmfPvALp9faPtkPzRTYDKcvyEVoq J55X0xxm0xL/9h93hAU2ZNKvoeU7zUPbUk1ocPUzNzb5TfFQRMNsLNSHBrV4dDfotV wDN4Zg3EXBakg== From: Jakub Kicinski To: kvalo@kernel.org Cc: linux-wireless@vger.kernel.org, Jakub Kicinski Subject: [PATCH wireless-next 1/3] wifi: wil6210: switch to netif_napi_add_tx() Date: Wed, 4 May 2022 09:33:14 -0700 Message-Id: <20220504163316.549648-2-kuba@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220504163316.549648-1-kuba@kernel.org> References: <20220504163316.549648-1-kuba@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Switch to the new API not requiring passing in NAPI_POLL_WEIGHT. Signed-off-by: Jakub Kicinski --- CC: kvalo@kernel.org CC: linux-wireless@vger.kernel.org --- drivers/net/wireless/ath/wil6210/netdev.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/ath/wil6210/netdev.c b/drivers/net/wireless/ath/wil6210/netdev.c index 390648066382..87a88f26233e 100644 --- a/drivers/net/wireless/ath/wil6210/netdev.c +++ b/drivers/net/wireless/ath/wil6210/netdev.c @@ -458,16 +458,14 @@ int wil_if_add(struct wil6210_priv *wil) netif_napi_add(&wil->napi_ndev, &wil->napi_rx, wil6210_netdev_poll_rx_edma, NAPI_POLL_WEIGHT); - netif_tx_napi_add(&wil->napi_ndev, - &wil->napi_tx, wil6210_netdev_poll_tx_edma, - NAPI_POLL_WEIGHT); + netif_napi_add_tx(&wil->napi_ndev, + &wil->napi_tx, wil6210_netdev_poll_tx_edma); } else { netif_napi_add(&wil->napi_ndev, &wil->napi_rx, wil6210_netdev_poll_rx, NAPI_POLL_WEIGHT); - netif_tx_napi_add(&wil->napi_ndev, - &wil->napi_tx, wil6210_netdev_poll_tx, - NAPI_POLL_WEIGHT); + netif_napi_add_tx(&wil->napi_ndev, + &wil->napi_tx, wil6210_netdev_poll_tx); } wil_update_net_queues_bh(wil, vif, NULL, true); From patchwork Wed May 4 16:33:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 12838171 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 334AEC433F5 for ; Wed, 4 May 2022 16:33:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353485AbiEDQhC (ORCPT ); Wed, 4 May 2022 12:37:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353484AbiEDQg6 (ORCPT ); Wed, 4 May 2022 12:36:58 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A490546674 for ; Wed, 4 May 2022 09:33:21 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 33A5D6173F for ; Wed, 4 May 2022 16:33:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20801C385B1; Wed, 4 May 2022 16:33:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1651682000; bh=1b32rzGazO9pHfwZeTeTHbpy2Na8Yj3Jvnfqlt+8Gg8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kdO3jEW4iB7+/+PyYMLFe0n8xrFtanyrlOs/35RgmBgqsnVL5NZz28A3vM45uxZ9E XuZTsVI2UaWfhwz3KsPhRrV+cPwqc8MwPs5X4YbPgBkbnrd8FrifrC7n2bKwOCWRUm InRtsrf9JsumWh33aALOQOywoDCrisgBJGUD9gwxEfbqFKhXXPiX7Q/PIvR8MA6lG/ 7bgNPDKOvvPuJGUls4OSNXAe3vpyCw9kKehOYL59eOBc9Lp+DbNWJ7SOFIfz/kgE/A 4n/fkqVzKLffyN650LJ/tYs5Z4w2CB4EiozgzhVGTsCLmCsKtVnhs2sx2httXlBm8q nq/CNUrEBR3Vg== From: Jakub Kicinski To: kvalo@kernel.org Cc: linux-wireless@vger.kernel.org, Jakub Kicinski , nbd@nbd.name, lorenzo@kernel.org, ryder.lee@mediatek.com, shayne.chen@mediatek.com, sean.wang@mediatek.com, matthias.bgg@gmail.com, Bo.Jiao@mediatek.com, sujuan.chen@mediatek.com, linux-mediatek@lists.infradead.org Subject: [PATCH wireless-next 2/3] wifi: mt76: switch to netif_napi_add_tx() Date: Wed, 4 May 2022 09:33:15 -0700 Message-Id: <20220504163316.549648-3-kuba@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220504163316.549648-1-kuba@kernel.org> References: <20220504163316.549648-1-kuba@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Switch to the new API not requiring passing in NAPI_POLL_WEIGHT. Signed-off-by: Jakub Kicinski --- CC: nbd@nbd.name CC: lorenzo@kernel.org CC: ryder.lee@mediatek.com CC: shayne.chen@mediatek.com CC: sean.wang@mediatek.com CC: kvalo@kernel.org CC: matthias.bgg@gmail.com CC: Bo.Jiao@mediatek.com CC: sujuan.chen@mediatek.com CC: linux-wireless@vger.kernel.org CC: linux-mediatek@lists.infradead.org --- drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 4 ++-- drivers/net/wireless/mediatek/mt76/mt7615/dma.c | 4 ++-- drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 4 ++-- drivers/net/wireless/mediatek/mt76/mt7915/dma.c | 4 ++-- drivers/net/wireless/mediatek/mt76/mt7921/dma.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c index 37b092e3ea51..2c1c79dc7fda 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c +++ b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c @@ -223,8 +223,8 @@ int mt7603_dma_init(struct mt7603_dev *dev) if (ret) return ret; - netif_tx_napi_add(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi, - mt7603_poll_tx, NAPI_POLL_WEIGHT); + netif_napi_add_tx(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi, + mt7603_poll_tx); napi_enable(&dev->mt76.tx_napi); return 0; diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/dma.c b/drivers/net/wireless/mediatek/mt76/mt7615/dma.c index 00aefea1bf61..95dbb413678a 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/dma.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/dma.c @@ -284,8 +284,8 @@ int mt7615_dma_init(struct mt7615_dev *dev) if (ret < 0) return ret; - netif_tx_napi_add(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi, - mt7615_poll_tx, NAPI_POLL_WEIGHT); + netif_napi_add_tx(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi, + mt7615_poll_tx); napi_enable(&dev->mt76.tx_napi); mt76_poll(dev, MT_WPDMA_GLO_CFG, diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c index 8bcd8afa0d3a..23d2864d37fb 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c @@ -230,8 +230,8 @@ int mt76x02_dma_init(struct mt76x02_dev *dev) if (ret) return ret; - netif_tx_napi_add(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi, - mt76x02_poll_tx, NAPI_POLL_WEIGHT); + netif_napi_add_tx(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi, + mt76x02_poll_tx); napi_enable(&dev->mt76.tx_napi); return 0; diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/dma.c b/drivers/net/wireless/mediatek/mt76/mt7915/dma.c index 49b4d8ade16b..75678aabff32 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/dma.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/dma.c @@ -434,8 +434,8 @@ int mt7915_dma_init(struct mt7915_dev *dev) if (ret < 0) return ret; - netif_tx_napi_add(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi, - mt7915_poll_tx, NAPI_POLL_WEIGHT); + netif_napi_add_tx(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi, + mt7915_poll_tx); napi_enable(&dev->mt76.tx_napi); mt7915_dma_enable(dev); diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/dma.c b/drivers/net/wireless/mediatek/mt76/mt7921/dma.c index ca7e20fb5fc0..34b3effe14f3 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/dma.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/dma.c @@ -296,8 +296,8 @@ int mt7921_dma_init(struct mt7921_dev *dev) if (ret < 0) return ret; - netif_tx_napi_add(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi, - mt7921_poll_tx, NAPI_POLL_WEIGHT); + netif_napi_add_tx(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi, + mt7921_poll_tx); napi_enable(&dev->mt76.tx_napi); return mt7921_dma_enable(dev); From patchwork Wed May 4 16:33:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 12838172 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35607C433EF for ; Wed, 4 May 2022 16:33:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353494AbiEDQhC (ORCPT ); Wed, 4 May 2022 12:37:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353501AbiEDQhA (ORCPT ); Wed, 4 May 2022 12:37:00 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 087D746B1E for ; Wed, 4 May 2022 09:33:23 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 408D6B82794 for ; Wed, 4 May 2022 16:33:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C381CC385A5; Wed, 4 May 2022 16:33:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1651682001; bh=si/jNKIZjWSD/yUoWGMbT7rlQSbsfPJ27eDg3wHOTDU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X1LQ1trrmK7l2ixEtDc9/JShSJkVrmkvVHDTlNjwgic9sYRN91ix7vzGkH96Irq1i NGhO8krj95jR0BZbXM+wdZ+32Gw5pP6CSqOucLiaerzRgBnhAIg/VjitPi9D8Q68Im Pp0g2ObO7BWRbhrZyemeWxLiVA3c6nITQI+Ry+eZ3oTvnoaPvvxV9O76EO+MEPKf+/ ERY8mzUAoonEoBmzymzRJDV++7qpW+8+q5VjJwlUz4ksngfq2nuKP6s76jhXjivF3C xryWO9K26jOtIhxcdnPQxP/uLltYCR6S6DcugjwnP5jDxaL3Omr6hebK7MaZdIJBCg E/xjyoxFqoZZQ== From: Jakub Kicinski To: kvalo@kernel.org Cc: linux-wireless@vger.kernel.org, Jakub Kicinski , imitsyanko@quantenna.com, geomatsi@gmail.com Subject: [PATCH wireless-next 3/3] wifi: qtnfmac: switch to netif_napi_add_weight() Date: Wed, 4 May 2022 09:33:16 -0700 Message-Id: <20220504163316.549648-4-kuba@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220504163316.549648-1-kuba@kernel.org> References: <20220504163316.549648-1-kuba@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org qtnfmac chooses its own magic NAPI weight so switch to the new API created for those who don't use NAPI_POLL_WEIGHT. Signed-off-by: Jakub Kicinski --- CC: imitsyanko@quantenna.com CC: geomatsi@gmail.com CC: kvalo@kernel.org CC: linux-wireless@vger.kernel.org --- drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 4 ++-- drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c b/drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c index 840728ed57b2..8c23a77d1671 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c +++ b/drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c @@ -1146,8 +1146,8 @@ static int qtnf_pcie_pearl_probe(struct qtnf_bus *bus, unsigned int tx_bd_size, } tasklet_setup(&ps->base.reclaim_tq, qtnf_pearl_reclaim_tasklet_fn); - netif_napi_add(&bus->mux_dev, &bus->mux_napi, - qtnf_pcie_pearl_rx_poll, 10); + netif_napi_add_weight(&bus->mux_dev, &bus->mux_napi, + qtnf_pcie_pearl_rx_poll, 10); ipc_int.fn = qtnf_pcie_pearl_ipc_gen_ep_int; ipc_int.arg = ps; diff --git a/drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c b/drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c index 9534e1b33780..d83362578374 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c +++ b/drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c @@ -1159,8 +1159,8 @@ static int qtnf_pcie_topaz_probe(struct qtnf_bus *bus, } tasklet_setup(&ts->base.reclaim_tq, qtnf_reclaim_tasklet_fn); - netif_napi_add(&bus->mux_dev, &bus->mux_napi, - qtnf_topaz_rx_poll, 10); + netif_napi_add_weight(&bus->mux_dev, &bus->mux_napi, + qtnf_topaz_rx_poll, 10); ipc_int.fn = qtnf_topaz_ipc_gen_ep_int; ipc_int.arg = ts;