From nobody Mon Nov 28 18:43:59 2022 X-Original-To: dev-commits-src-all@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 4NLZB76Mn7z4hbv5; Mon, 28 Nov 2022 18:43:59 +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 4NLZB75z1fz4MjD; Mon, 28 Nov 2022 18:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669661039; 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=kjJp7BIOJfLGDjZqh28FWxQEjCEuHpyeZmb3Jr37GG4=; b=k5DvJJBvfzQCTDN34vkVqGqxW0HlG/fGJGEnP6NhbU7bYwBWNthuf2RIDCbt/nfNPCpbMo hBAU87fDEYMggxB8i8eqkJ8P9qC6cmUlBt/4BfovUngKKhmiVHw9+wuh3IArQXzSw8dAtQ AHyyQ/tz9wVLWCLyzvxoTOpkv4R93sV5TYqhxwvtEqnURgxFPdZxxn8Dt7FFVf9Wg/QqhC 8rMhUfI8/m2co/PUXWwfb1u1jYt89La/+YsrvLxtYk4C6P+fWZb9IU6WWVe4tcCxXfNU34 8p5TNrr+YKm3w3Kn5qhj7q9NNBjEi9zxxRNAKfpRDvF+mFQfWCSjmnag9DL78g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669661039; 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=kjJp7BIOJfLGDjZqh28FWxQEjCEuHpyeZmb3Jr37GG4=; b=i0VYXxsZ85tJAPnUlEcYq2gmdrD9hoJ8F80gRJWkAsobPXUh9iOFwl2aqlQp11j1Lk9xGq 1E4zYMRVDo/kYBYd3FcOFSTKzmcqluxgFsP2dg7Zc33U4R7jtjtBlpD/ZGTe8QgKrpYe27 zhjLp/Fm1vWrBoKO5iuijFTEayb5WRIVBxPIqDqVqGD8+lUkk95K77bpo/XFzR92i0Yyn4 HAtwv74fezgo25t9/NQXz7jtxlChriBi9HQf6q9oVqgqI89nMZ9QR1rSjWmhjXSR1gom7H zk49zFqwWskJc9hOTndR8ei7Cc/dVty/F8w3XPTbl+hLVSXN4nywflUMZqoEiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669661039; a=rsa-sha256; cv=none; b=SuMvs0CisJd1KVXY5NR1J10PuQvBtrZb0rPVa2RmiLzm7AfRmWIDkOeIv4X/9Gcf6L5Vml ZZf8CFlX7YAvxdmvVp/8wD4URM4cowGlzkJqDsG80FkONNfPvyi++v7ehtcW7BanABgjmt F+Jo/kiBOg3m67h4wxndwBS/jZqDP7i0Wz48C8e9TrEQk7pGpQkmyGfdzerLmiCj1Z1vKR oUF+/yhuwbItvamDQokXnIx5Ih/Hz2pZkP16hDcTUngVCCvxExmR9ZQm0MnWibcMjLDba0 x1yrXbtSK5c6vqO5Crzi5x5bq7yJPuCM+ALKm1NMHv1+PILZ+s3MuB0LSqbl8g== 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 4NLZB753KSznVs; Mon, 28 Nov 2022 18:43:59 +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 2ASIhxA1095092; Mon, 28 Nov 2022 18:43:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ASIhxKT095091; Mon, 28 Nov 2022 18:43:59 GMT (envelope-from git) Date: Mon, 28 Nov 2022 18:43:59 GMT Message-Id: <202211281843.2ASIhxKT095091@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 23c73dbae7b2 - main - LinuxKPI: iwlwifi: rtw88: rtw89: remove budget argument from netif_napi_add() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 23c73dbae7b2f64014b275643efbe92f449feaa2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=23c73dbae7b2f64014b275643efbe92f449feaa2 commit 23c73dbae7b2f64014b275643efbe92f449feaa2 Author: Bjoern A. Zeeb AuthorDate: 2022-11-28 15:12:58 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-11-28 17:30:40 +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 MFC after: 3 days --- 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);