From nobody Wed Jan 18 16:24:42 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Nxrgv22Wfz2yJSt; Wed, 18 Jan 2023 16:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nxrgv0Fhpz3Db2; Wed, 18 Jan 2023 16:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674059083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O8uBw/ON4w21frUHyxQiLzX7mqmTkTEkPQANuQbsYeQ=; b=ljz8qa49VMctqv1c9V9taVX6+1Jn2pjB5Qbf0mRLPRRI7Gb2XASvrDqxGu+HI0llG7g6At zDEVHkGImieH+S4RaezLEarIH21WhJC7P+wiptVnbo23an34zw+UfXeAWEDCyOprVpLCr7 7wwAPmrn/8IjANJP5CiVNlvBsdXb9z2DF5CXi05QvTdFV9VKuDyhekJIik3bjPklcSa13D /eqZUKZ8doSzEkrGCY1f7fbBuSGSfRJlYzoRhYLNv2DlEdY/2YlgdQdU4L0snE1wzBRv3E 0AMw8MIJ4uS0+12XRZlyh4OwEs1e2LdOzACb6F0HgyQrzrv899Z61mKotrbNWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674059083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O8uBw/ON4w21frUHyxQiLzX7mqmTkTEkPQANuQbsYeQ=; b=M+hSaozz2xQG6Z7yZKJPDWMFTPzAgz25iTI4VDLwLqPN3IKMGJU51j2gsIL6SZq1TOx1CQ yGsohY1wZaZM+fPpWE9SUuoYt38eWVL1pX7H5Zv9fj31Smu2rZM0qZiR40F36iNv16S7ek Ol7rm60tkVZhlJI5W6nurcgjv5w67A8L2VEP01yovY2yem9lSHdpgTZ1+HPGNd2fjL9tCu nm3GKE6BihSKHmAqjEwOGJFByfvcXI6HHKBVpO16iGiuOFYfuBQNrjmK9Fg5Nc149C0CYk rSNbq3/cszQHi5zkHxhxUkOpwFKf4Ui8E0RmstJVfylY/VpjNRbifgrxTFPndw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674059083; a=rsa-sha256; cv=none; b=YphQ1M3QT/DqaSEPshGDSdI0pB4qjEb+9zQBUBwDEPMS8iBuam16Qz3tBbVHZn8vFjMJeL KmdqepotTAFbwKFMQEcNGqhFT854EbTsdhhAbtu07l4latv8Vjkk0Dd8aPJ+q8fHZliFz7 HnyO1wjIlvGOWOcrTX4v7fbZy7CwobaLE1TFA7/W6nAOf8L7xXGEXk5AtcYeQDiepYJMsz XHnineqTjixeuhsZMer9joab5v5Mie/o0qX5OhbSwj7v4Ry7cG+G3BqMuA1cMzpt2HHLbw sG9pJn+FOELoEsXnIYs8pT3VBav3NTELxh6hd4murD3UH6ZHnfdaIgjAKQBKcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Nxrgt670qzHSb; Wed, 18 Jan 2023 16:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30IGOgjc037781; Wed, 18 Jan 2023 16:24:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30IGOgNE037780; Wed, 18 Jan 2023 16:24:42 GMT (envelope-from git) Date: Wed, 18 Jan 2023 16:24:42 GMT Message-Id: <202301181624.30IGOgNE037780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 95df5d822353 - stable/13 - LinuxKPI: iwlwifi: rtw88: rtw89: remove budget argument from netif_napi_add() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 95df5d822353e3fc8f7165df854040a726b8b65e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=95df5d822353e3fc8f7165df854040a726b8b65e commit 95df5d822353e3fc8f7165df854040a726b8b65e Author: Bjoern A. Zeeb AuthorDate: 2022-11-28 15:12:58 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-01-18 13:23:43 +0000 LinuxKPI: iwlwifi: rtw88: rtw89: remove budget argument from netif_napi_add() In preparation for future updates remove the budget argument from the netif_napi_add() in drivers and update LinuxKPI to reflect that it is gone and only set it internally. This required changes to the currently committed wireless drivers based on LinuxKPI (iwlwifi, rtw88, rtw89). Sponsored by: The FreeBSD Foundation (cherry picked from commit 23c73dbae7b2f64014b275643efbe92f449feaa2) --- sys/compat/linuxkpi/common/include/linux/netdevice.h | 6 +++--- sys/compat/linuxkpi/common/src/linux_netdev.c | 4 ++-- sys/contrib/dev/iwlwifi/pcie/rx.c | 3 +-- sys/contrib/dev/rtw88/pci.c | 3 +-- sys/contrib/dev/rtw89/core.c | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/netdevice.h b/sys/compat/linuxkpi/common/include/linux/netdevice.h index a904b7e70490..fdfd650a55e5 100644 --- a/sys/compat/linuxkpi/common/include/linux/netdevice.h +++ b/sys/compat/linuxkpi/common/include/linux/netdevice.h @@ -229,7 +229,7 @@ struct napi_struct { void linuxkpi_init_dummy_netdev(struct net_device *); void linuxkpi_netif_napi_add(struct net_device *, struct napi_struct *, - int(*napi_poll)(struct napi_struct *, int), int); + int(*napi_poll)(struct napi_struct *, int)); void linuxkpi_netif_napi_del(struct napi_struct *); bool linuxkpi_napi_schedule_prep(struct napi_struct *); void linuxkpi___napi_schedule(struct napi_struct *); @@ -243,8 +243,8 @@ void linuxkpi_napi_synchronize(struct napi_struct *); #define init_dummy_netdev(_n) \ linuxkpi_init_dummy_netdev(_n) -#define netif_napi_add(_nd, _ns, _p, _b) \ - linuxkpi_netif_napi_add(_nd, _ns, _p, _b) +#define netif_napi_add(_nd, _ns, _p) \ + linuxkpi_netif_napi_add(_nd, _ns, _p) #define netif_napi_del(_n) \ linuxkpi_netif_napi_del(_n) #define napi_schedule_prep(_n) \ diff --git a/sys/compat/linuxkpi/common/src/linux_netdev.c b/sys/compat/linuxkpi/common/src/linux_netdev.c index 3055b9c46767..69adcff67930 100644 --- a/sys/compat/linuxkpi/common/src/linux_netdev.c +++ b/sys/compat/linuxkpi/common/src/linux_netdev.c @@ -326,12 +326,12 @@ lkpi_napi_task(void *ctx, int pending) void linuxkpi_netif_napi_add(struct net_device *ndev, struct napi_struct *napi, - int(*napi_poll)(struct napi_struct *, int), int budget) + int(*napi_poll)(struct napi_struct *, int)) { napi->dev = ndev; napi->poll = napi_poll; - napi->budget = budget; + napi->budget = NAPI_POLL_WEIGHT; INIT_LIST_HEAD(&napi->rx_list); napi->rx_count = 0; diff --git a/sys/contrib/dev/iwlwifi/pcie/rx.c b/sys/contrib/dev/iwlwifi/pcie/rx.c index e91121dda102..480cc9c765d8 100644 --- a/sys/contrib/dev/iwlwifi/pcie/rx.c +++ b/sys/contrib/dev/iwlwifi/pcie/rx.c @@ -1113,8 +1113,7 @@ static int _iwl_pcie_rx_init(struct iwl_trans *trans) if (trans_pcie->msix_enabled) poll = iwl_pcie_napi_poll_msix; - netif_napi_add(&trans_pcie->napi_dev, &rxq->napi, - poll, NAPI_POLL_WEIGHT); + netif_napi_add(&trans_pcie->napi_dev, &rxq->napi, poll); napi_enable(&rxq->napi); } diff --git a/sys/contrib/dev/rtw88/pci.c b/sys/contrib/dev/rtw88/pci.c index bad6dd5b5b98..151400f6f892 100644 --- a/sys/contrib/dev/rtw88/pci.c +++ b/sys/contrib/dev/rtw88/pci.c @@ -1801,8 +1801,7 @@ static void rtw_pci_napi_init(struct rtw_dev *rtwdev) struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev->priv; init_dummy_netdev(&rtwpci->netdev); - netif_napi_add(&rtwpci->netdev, &rtwpci->napi, rtw_pci_napi_poll, - NAPI_POLL_WEIGHT); + netif_napi_add(&rtwpci->netdev, &rtwpci->napi, rtw_pci_napi_poll); } static void rtw_pci_napi_deinit(struct rtw_dev *rtwdev) diff --git a/sys/contrib/dev/rtw89/core.c b/sys/contrib/dev/rtw89/core.c index 98f47c4daeac..25940c141f84 100644 --- a/sys/contrib/dev/rtw89/core.c +++ b/sys/contrib/dev/rtw89/core.c @@ -1803,7 +1803,7 @@ void rtw89_core_napi_init(struct rtw89_dev *rtwdev) { init_dummy_netdev(&rtwdev->netdev); netif_napi_add(&rtwdev->netdev, &rtwdev->napi, - rtwdev->hci.ops->napi_poll, NAPI_POLL_WEIGHT); + rtwdev->hci.ops->napi_poll); } EXPORT_SYMBOL(rtw89_core_napi_init);